Page MenuHomeWildfire Games

rename palisades_fort to wooden_tower, deprecate palisades_outpost and palisades_watchtower
Needs ReviewPublic

Authored by Nescio on May 17 2020, 1:42 PM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Summary

The palisades_watchtower is, rather confusingly, not a tower: it is not garrisonable, has no attack, and no significant vision; its parent is template_structure_defensive_palisade.xml. The same is true for the palisades_outpost.
The desired template is palisades_fort, which is not a fort, but a tower, it has template_structure_defensive_tower_sentry.xml as its parent.
The templates follow the naming scheme of their corresponding art actors, which were added in rP9915 and last touched in rP12183 (eight years ago). From left to right: watchtower, outpost, fort:

This patch renames palisades_fort to wooden_tower, replaces the palisades_outpost and palisades_watchtower with the wooden_tower in the few map files that use them (most used the palisade_fort), and removes the palisades_watchtower and palisades_outpost templates, to avoid future confusion. The art actors are kept.

Test Plan

Check for completeness and mistakes.

Event Timeline

Nescio created this revision.May 17 2020, 1:42 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.May 17 2020, 1:42 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2143/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/729/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1617/display/redirect

Nescio updated this revision to Diff 12085.Jun 1 2020, 11:42 AM

rebased

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/885/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2283/display/redirect

FeXoR added a subscriber: FeXoR.EditedJun 5 2020, 1:09 PM

What confusion?
There are different entities that are - or at least where - fully functional. I see no reason to replace them.

EDIT: Increasing the watchtower's view range would be a good idea ;)
BTW: The palisades_tower is a tower in the concept of placing walls. It has also no attack and is not garrisonable.
And what about decay? Are they all the same when owned by a non-gaia player and outside of territory?

Nescio added a comment.Jun 5 2020, 8:41 PM

What confusion?

That the palisades_watchtower.xml template is not a tower and the palisades_outpost.xml not an outpost. From the danubius.js and wall_builder.js scripts it's clear what's wanted is a tower, hence palisades_fort.xml (which is a tower, not a fortress); see also the extinct_volcano.js script. This is presumably also true for the other maps; cf. zagros_mountains_2p.xml etc.
Moreover, if one wants to use these art assets merely to decorate maps, one can use e.g.

<Template>actor|props/special/palisade_rocks_watchtower.xml</Template>
Nescio added a comment.Jun 5 2020, 8:43 PM

The palisades_tower is a tower in the concept of placing walls.

Yes, it's a wall tower, and thus appropiately named; cf. other wall templates.

Nescio updated this revision to Diff 12237.Jun 9 2020, 7:55 PM
Nescio retitled this revision from deprecate “watchtower” to rename palisades_fort to wooden_tower, deprecate palisades_outpost and palisades_watchtower.
Nescio edited the summary of this revision. (Show Details)
  • palisades_fort → wooden_tower
Vulcan added a comment.Jun 9 2020, 8:00 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 303| 303| Engine.SetProgress(67);
| 304| 304| 
| 305| 305| createDecoration(
| 306|    |-		[
|    | 306|+	[
| 307| 307| 			[
| 308| 308| 				new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309| 309| 			],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 304| 304| 
| 305| 305| createDecoration(
| 306| 306| 		[
| 307|    |-			[
|    | 307|+		[
| 308| 308| 				new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309| 309| 			],
| 310| 310| 			[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 305| 305| createDecoration(
| 306| 306| 		[
| 307| 307| 			[
| 308|    |-				new SimpleObject(aGrassShort, 1, 2, 0, 1)
|    | 308|+			new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309| 309| 			],
| 310| 310| 			[
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 306| 306| 		[
| 307| 307| 			[
| 308| 308| 				new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309|    |-			],
|    | 309|+		],
| 310| 310| 			[
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 307| 307| 			[
| 308| 308| 				new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309| 309| 			],
| 310|    |-			[
|    | 310|+		[
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313| 313| 			],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 308| 308| 				new SimpleObject(aGrassShort, 1, 2, 0, 1)
| 309| 309| 			],
| 310| 310| 			[
| 311|    |-				new SimpleObject(aGrass, 2, 4, 0, 1.8),
|    | 311|+			new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313| 313| 			],
| 314| 314| 			[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 309| 309| 			],
| 310| 310| 			[
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312|    |-				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
|    | 312|+			new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313| 313| 			],
| 314| 314| 			[
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 310| 310| 			[
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313|    |-			],
|    | 313|+		],
| 314| 314| 			[
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 311| 311| 				new SimpleObject(aGrass, 2, 4, 0, 1.8),
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313| 313| 			],
| 314|    |-			[
|    | 314|+		[
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317| 317| 			]
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 312| 312| 				new SimpleObject(aGrassShort, 3, 6, 1.2, 2.5)
| 313| 313| 			],
| 314| 314| 			[
| 315|    |-				new SimpleObject(aBushMedium, 1, 2, 0, 2),
|    | 315|+			new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317| 317| 			]
| 318| 318| 		],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 313| 313| 			],
| 314| 314| 			[
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316|    |-				new SimpleObject(aBushSmall, 2, 4, 0, 2)
|    | 316|+			new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317| 317| 			]
| 318| 318| 		],
| 319| 319| 		[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 314| 314| 			[
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317|    |-			]
|    | 317|+		]
| 318| 318| 		],
| 319| 319| 		[
| 320| 320| 			scaleByMapSize(15, 200),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 315| 315| 				new SimpleObject(aBushMedium, 1, 2, 0, 2),
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317| 317| 			]
| 318|    |-		],
|    | 318|+	],
| 319| 319| 		[
| 320| 320| 			scaleByMapSize(15, 200),
| 321| 321| 			scaleByMapSize(15, 200),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 316| 316| 				new SimpleObject(aBushSmall, 2, 4, 0, 2)
| 317| 317| 			]
| 318| 318| 		],
| 319|    |-		[
|    | 319|+	[
| 320| 320| 			scaleByMapSize(15, 200),
| 321| 321| 			scaleByMapSize(15, 200),
| 322| 322| 			scaleByMapSize(15, 200)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 317| 317| 			]
| 318| 318| 		],
| 319| 319| 		[
| 320|    |-			scaleByMapSize(15, 200),
|    | 320|+		scaleByMapSize(15, 200),
| 321| 321| 			scaleByMapSize(15, 200),
| 322| 322| 			scaleByMapSize(15, 200)
| 323| 323| 		],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 318| 318| 		],
| 319| 319| 		[
| 320| 320| 			scaleByMapSize(15, 200),
| 321|    |-			scaleByMapSize(15, 200),
|    | 321|+		scaleByMapSize(15, 200),
| 322| 322| 			scaleByMapSize(15, 200)
| 323| 323| 		],
| 324| 324| 		[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 319| 319| 		[
| 320| 320| 			scaleByMapSize(15, 200),
| 321| 321| 			scaleByMapSize(15, 200),
| 322|    |-			scaleByMapSize(15, 200)
|    | 322|+		scaleByMapSize(15, 200)
| 323| 323| 		],
| 324| 324| 		[
| 325| 325| 			stayClasses(clGrass, 0),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 320| 320| 			scaleByMapSize(15, 200),
| 321| 321| 			scaleByMapSize(15, 200),
| 322| 322| 			scaleByMapSize(15, 200)
| 323|    |-		],
|    | 323|+	],
| 324| 324| 		[
| 325| 325| 			stayClasses(clGrass, 0),
| 326| 326| 			avoidClasses(
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 321| 321| 			scaleByMapSize(15, 200),
| 322| 322| 			scaleByMapSize(15, 200)
| 323| 323| 		],
| 324|    |-		[
|    | 324|+	[
| 325| 325| 			stayClasses(clGrass, 0),
| 326| 326| 			avoidClasses(
| 327| 327| 				clWater, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 322| 322| 			scaleByMapSize(15, 200)
| 323| 323| 		],
| 324| 324| 		[
| 325|    |-			stayClasses(clGrass, 0),
|    | 325|+		stayClasses(clGrass, 0),
| 326| 326| 			avoidClasses(
| 327| 327| 				clWater, 0,
| 328| 328| 				clForest, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 323| 323| 		],
| 324| 324| 		[
| 325| 325| 			stayClasses(clGrass, 0),
| 326|    |-			avoidClasses(
|    | 326|+		avoidClasses(
| 327| 327| 				clWater, 0,
| 328| 328| 				clForest, 0,
| 329| 329| 				clPlayer, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 324| 324| 		[
| 325| 325| 			stayClasses(clGrass, 0),
| 326| 326| 			avoidClasses(
| 327|    |-				clWater, 0,
|    | 327|+			clWater, 0,
| 328| 328| 				clForest, 0,
| 329| 329| 				clPlayer, 0,
| 330| 330| 				clHill, 0)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 325| 325| 			stayClasses(clGrass, 0),
| 326| 326| 			avoidClasses(
| 327| 327| 				clWater, 0,
| 328|    |-				clForest, 0,
|    | 328|+			clForest, 0,
| 329| 329| 				clPlayer, 0,
| 330| 330| 				clHill, 0)
| 331| 331| 		]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 326| 326| 			avoidClasses(
| 327| 327| 				clWater, 0,
| 328| 328| 				clForest, 0,
| 329|    |-				clPlayer, 0,
|    | 329|+			clPlayer, 0,
| 330| 330| 				clHill, 0)
| 331| 331| 		]);
| 332| 332| Engine.SetProgress(70);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 327| 327| 				clWater, 0,
| 328| 328| 				clForest, 0,
| 329| 329| 				clPlayer, 0,
| 330|    |-				clHill, 0)
|    | 330|+			clHill, 0)
| 331| 331| 		]);
| 332| 332| Engine.SetProgress(70);
| 333| 333| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 328| 328| 				clForest, 0,
| 329| 329| 				clPlayer, 0,
| 330| 330| 				clHill, 0)
| 331|    |-		]);
|    | 331|+	]);
| 332| 332| Engine.SetProgress(70);
| 333| 333| 
| 334| 334| createDecoration(
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 332| 332| Engine.SetProgress(70);
| 333| 333| 
| 334| 334| createDecoration(
| 335|    |-		[
|    | 335|+	[
| 336| 336| 			[
| 337| 337| 				new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338| 338| 			],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 333| 333| 
| 334| 334| createDecoration(
| 335| 335| 		[
| 336|    |-			[
|    | 336|+		[
| 337| 337| 				new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338| 338| 			],
| 339| 339| 			[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 334| 334| createDecoration(
| 335| 335| 		[
| 336| 336| 			[
| 337|    |-				new SimpleObject(aRockMedium, 1, 3, 0, 1)
|    | 337|+			new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338| 338| 			],
| 339| 339| 			[
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 335| 335| 		[
| 336| 336| 			[
| 337| 337| 				new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338|    |-			],
|    | 338|+		],
| 339| 339| 			[
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 336| 336| 			[
| 337| 337| 				new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338| 338| 			],
| 339|    |-			[
|    | 339|+		[
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342| 342| 			]
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 337| 337| 				new SimpleObject(aRockMedium, 1, 3, 0, 1)
| 338| 338| 			],
| 339| 339| 			[
| 340|    |-				new SimpleObject(aRockLarge, 1, 2, 0, 1),
|    | 340|+			new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342| 342| 			]
| 343| 343| 		],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 338| 338| 			],
| 339| 339| 			[
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341|    |-				new SimpleObject(aRockMedium, 1, 3, 0, 2)
|    | 341|+			new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342| 342| 			]
| 343| 343| 		],
| 344| 344| 		[
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 339| 339| 			[
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342|    |-			]
|    | 342|+		]
| 343| 343| 		],
| 344| 344| 		[
| 345| 345| 			scaleByMapSize(15, 250),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 340| 340| 				new SimpleObject(aRockLarge, 1, 2, 0, 1),
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342| 342| 			]
| 343|    |-		],
|    | 343|+	],
| 344| 344| 		[
| 345| 345| 			scaleByMapSize(15, 250),
| 346| 346| 			scaleByMapSize(15, 150)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 341| 341| 				new SimpleObject(aRockMedium, 1, 3, 0, 2)
| 342| 342| 			]
| 343| 343| 		],
| 344|    |-		[
|    | 344|+	[
| 345| 345| 			scaleByMapSize(15, 250),
| 346| 346| 			scaleByMapSize(15, 150)
| 347| 347| 		],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 342| 342| 			]
| 343| 343| 		],
| 344| 344| 		[
| 345|    |-			scaleByMapSize(15, 250),
|    | 345|+		scaleByMapSize(15, 250),
| 346| 346| 			scaleByMapSize(15, 150)
| 347| 347| 		],
| 348| 348| 		avoidClasses(
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 343| 343| 		],
| 344| 344| 		[
| 345| 345| 			scaleByMapSize(15, 250),
| 346|    |-			scaleByMapSize(15, 150)
|    | 346|+		scaleByMapSize(15, 150)
| 347| 347| 		],
| 348| 348| 		avoidClasses(
| 349| 349| 			clWater, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 344| 344| 		[
| 345| 345| 			scaleByMapSize(15, 250),
| 346| 346| 			scaleByMapSize(15, 150)
| 347|    |-		],
|    | 347|+	],
| 348| 348| 		avoidClasses(
| 349| 349| 			clWater, 0,
| 350| 350| 			clForest, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 345| 345| 			scaleByMapSize(15, 250),
| 346| 346| 			scaleByMapSize(15, 150)
| 347| 347| 		],
| 348|    |-		avoidClasses(
|    | 348|+	avoidClasses(
| 349| 349| 			clWater, 0,
| 350| 350| 			clForest, 0,
| 351| 351| 			clPlayer, 0,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 346| 346| 			scaleByMapSize(15, 150)
| 347| 347| 		],
| 348| 348| 		avoidClasses(
| 349|    |-			clWater, 0,
|    | 349|+		clWater, 0,
| 350| 350| 			clForest, 0,
| 351| 351| 			clPlayer, 0,
| 352| 352| 			clHill, 0
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 347| 347| 		],
| 348| 348| 		avoidClasses(
| 349| 349| 			clWater, 0,
| 350|    |-			clForest, 0,
|    | 350|+		clForest, 0,
| 351| 351| 			clPlayer, 0,
| 352| 352| 			clHill, 0
| 353| 353| 		));
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 348| 348| 		avoidClasses(
| 349| 349| 			clWater, 0,
| 350| 350| 			clForest, 0,
| 351|    |-			clPlayer, 0,
|    | 351|+		clPlayer, 0,
| 352| 352| 			clHill, 0
| 353| 353| 		));
| 354| 354| Engine.SetProgress(75);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 349| 349| 			clWater, 0,
| 350| 350| 			clForest, 0,
| 351| 351| 			clPlayer, 0,
| 352|    |-			clHill, 0
|    | 352|+		clHill, 0
| 353| 353| 		));
| 354| 354| Engine.SetProgress(75);
| 355| 355| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/extinct_volcano.js
| 350| 350| 			clForest, 0,
| 351| 351| 			clPlayer, 0,
| 352| 352| 			clHill, 0
| 353|    |-		));
|    | 353|+	));
| 354| 354| Engine.SetProgress(75);
| 355| 355| 
| 356| 356| createFood(

binaries/data/mods/public/maps/random/extinct_volcano.js
| 193| for·(let·size·of·[scaleByMapSize(3,·48),·scaleByMapSize(5,·84),·scaleByMapSize(8,·128)])
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'size' is already declared in the upper scope.
|    | [NORMAL] ESLintBear (yoda):
|    | Expected literal to be on the right side of <.
|----|    | /zpool0/trunk/binaries/data/mods/public/maps/random/danubius.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/maps/random/danubius.js
| 382| 382| 	"waterFunc": (position, height, riverFraction) => {
| 383| 383| 		let origPos = position.clone().rotateAround(-startAngle, mapCenter);
| 384| 384| 		// Distinguish left and right shoreline
| 385|    |-		if (0 < height && height < 1 &&
|    | 385|+		if (height > 0 && height < 1 &&
| 386| 386| 			origPos.y > ShorelineDistance && origPos.y < mapSize - ShorelineDistance)
| 387| 387| 			clShore[origPos.x < mapCenter.x ? 0 : 1].add(position);
| 388| 388| 	},

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
|  85| »   let·addFortress·=·(type,·walls)·=>·defaultFortresses[type]·=·{·"wall":·walls.concat(walls,·walls,·walls)·};
|    | [NORMAL] ESLintBear (no-return-assign):
|    | Arrow function should not return assignment.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 410| function·placeWall(position,·wall·=·[],·style,·playerId·=·0,·orientation·=·0,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 464| function·placeFortress(centerPosition,·type·=·"medium",·style,·playerId·=·0,·orientation·=·0,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 481| function·placeLinearWall(startPosition,·targetPosition,·wallPart·=·undefined,·style,·playerId·=·0,·endWithFirst·=·true,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 565| function·placeCircularWall(center,·radius,·wallPart,·style,·playerId·=·0,·orientation·=·0,·maxAngle·=·2·*·Math.PI,·endWithFirst,·maxBendOff·=·0,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 652| function·placePolygonalWall(centerPosition,·radius,·wallPart,·cornerWallElement·=·"tower",·style,·playerId·=·0,·orientation·=·0,·numCorners·=·8,·skipFirstWall·=·true,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 714| function·placeIrregularPolygonalWall(centerPosition,·radius,·cornerWallElement·=·"tower",·style,·playerId·=·0,·orientation·=·0,·numCorners,·irregularity·=·0.5,·skipFirstWall·=·false,·wallPartsAssortment·=·undefined,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 714| function·placeIrregularPolygonalWall(centerPosition,·radius,·cornerWallElement·=·"tower",·style,·playerId·=·0,·orientation·=·0,·numCorners,·irregularity·=·0.5,·skipFirstWall·=·false,·wallPartsAssortment·=·undefined,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js
| 849| function·placeGenericFortress(center,·radius·=·20,·playerId·=·0,·style,·irregularity·=·0.5,·gateOccurence·=·3,·maxTries·=·100,·constraints·=·undefined)
|    | [NORMAL] JSHintBear:
|    | Regular parameters should not come after default parameters.
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2387/display/redirect

Nescio edited the summary of this revision. (Show Details)Jun 9 2020, 8:03 PM
Nescio removed a subscriber: Restricted Owners Package.