Diffusion 0 A.D. Public Repository rP23392

Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea…
AuditedrP23392
Actions

Description

Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea, refs #4838.

Allow gamesetup options other than biome to determine the map peview image, refs #4962, rP21523.
Add previews for the 12 Unknown, 2 Danubius and 2 Polar Sea variations.
Concludes deduplication of the Unknown (rP12545), Unknown Land (rP12654) and Unknown Nomad (rP12747), refs #4317.

Differential Revision: https://code.wildfiregames.com/D2564

Details

Auditors

Silier
bb

Committed

elexis

Jan 14 2020, 8:02 AM

Differential Revision

D2564: Gamesetup map specific options - Landscape, Daytime

Parents

rP23391: Fix gamesetup infinite loop when selecting a falsy (sandbox) AI difficulty…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 10789
Build 18778: Post-Commit Build	Jenkins
Build 18777: Post-Commit Build (macOS)	Jenkins

Event Timeline

elexis committed rP23392: Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea….Jan 14 2020, 8:02 AM

elexis added an edge: D2564: Gamesetup map specific options - Landscape, Daytime.

Harbormaster completed building B10789: rP23392: Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea….Jan 14 2020, 8:07 AM

When starting a SP match

ERROR: JavaScript error: gui/gamesetup/GameSettings/Single/Dropdowns/Landscape.js line 97
TypeError: this.mapData is undefined
  onPickRandomItems@gui/gamesetup/GameSettings/Single/Dropdowns/Landscape.js:97:7
  pickRandomItems@gui/gamesetup/Controls/GameSettingsControl.js:247:4
  onLaunchGame@gui/gamesetup/Controls/GameSettingsControl.js:255:3
  launchGame@gui/gamesetup/Controls/StartGameControl.js:35:4
  onPress@gui/gamesetup/Panels/Buttons/StartGameButton.js:61:3

isn't due to matchsettingsfile

This commit now has outstanding concerns.Jan 14 2020, 12:17 PM

Do you have a replay for that match? Or do you know which map it was? I cant reproduce with or without the persist file for skirmish maps, random maps and the unknown map, nor tutorial.

(Until then unverifiable patch

landscape1 KBDownload

)

elexis mentioned this in D1634: Fert random map..Jan 14 2020, 3:21 PM

The random Random map ;)

elexis mentioned this in rP23398: Fix some oversights in the gamesetup class rewrite rP23374/D2483 and one in the….Jan 15 2020, 12:51 PM

elexis requested verification of this commit.Jan 15 2020, 12:51 PM

This commit now requires verification by auditors.Jan 15 2020, 12:51 PM

bug disappeared

All concerns with this commit have now been addressed.Jan 21 2020, 4:55 PM

elexis mentioned this in D2593: Map specific Gamesetup option: SeaLevelRise for Extinct Volcano map.Jan 23 2020, 9:14 AM

elexis mentioned this in rP23470: Fix missing translate calls and typo in Gamesetup Landscape/Daytime….Jan 31 2020, 7:49 PM

elexis mentioned this in rP23472: Fix autocomplete of Landscape/Daytime in rP23392/D2564 as well..Jan 31 2020, 10:02 PM

Silier raised a concern with this commit.Oct 4 2020, 11:29 AM

Silier added a subscriber: Silier.

Silier added inline comments.

/ps/trunk/binaries/data/mods/public/gui/gamesetup/Panels/MapPreview.js
18	this is somewhat incorrect causing https://trac.wildfiregames.com/ticket/5785. It has correct preview without this replacement

This commit now has outstanding concerns.Oct 4 2020, 11:29 AM

Silier mentioned this in D3041: Always update preview in biome and landscape.Oct 17 2020, 2:51 PM

Silier added inline comments.Oct 19 2020, 1:30 PM

/ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Landscape.js
65	? . Landscape

Silier mentioned this in rP24139: Always update preview in biome and landscape.Nov 7 2020, 4:26 PM

Silier accepted this commit.Nov 7 2020, 4:31 PM

All concerns with this commit have now been addressed.Nov 7 2020, 4:31 PM

Changes (35)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

art/

textures/

ui/

session/

icons/

mappreview/

danubius.png

danubius_day.png

	danubius_night.png
	danubius.png

polar_sea.png

polar_sea_dawn.png

	polar_sea_daylight.png
	polar_sea.png

unknown_archipelago.png

unknown_central_river.png

unknown_central_sea.png

unknown_continent.png

unknown_edge_seas.png

unknown_rivers_and_lake.png

gui/

common/

MapCache.js

gamesetup/

GameSettings/

GameSettingsLayout.js

MapSpecific

Single/

Dropdowns/

Panels/

maps/

random/

	unknown.js/
	the_unknown/


	unknown_common.js

unknown.json

unknown_land.js

unknown_land.json

rP23392

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius_day.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius_night.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea_dawn.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea_daylight.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_archipelago.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_central_river.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_central_sea.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_continent.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_edge_seas.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_gulf.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_isthmus.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_lakes.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_lowlands.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_mainland.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_passes.png

View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_rivers_and_lake.png

View Options

ps/trunk/binaries/data/mods/public/gui/common/MapCache.js

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/GameSettingsLayout.js

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/MapSpecific/

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Biome.js

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Daytime.js

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Landscape.js

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/Panels/MapPreview.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/danubius.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/danubius.json

View Options

ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/polar_sea.json

View Options

ps/trunk/binaries/data/mods/public/maps/random/the_unknown/

View Options

ps/trunk/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/unknown.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/unknown.json

View Options

ps/trunk/binaries/data/mods/public/maps/random/unknown_land.js

View Options

ps/trunk/binaries/data/mods/public/maps/random/unknown_land.json

Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea…AuditedrP23392Actions

Description

Details

Event Timeline

Changes (35)

rP23392

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius_day.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/danubius_night.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea_dawn.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/polar_sea_daylight.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_archipelago.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_central_river.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_central_sea.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_continent.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_edge_seas.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_gulf.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_isthmus.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_lakes.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_lowlands.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_mainland.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_passes.png

ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/unknown_rivers_and_lake.png

ps/trunk/binaries/data/mods/public/gui/common/MapCache.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/GameSettingsLayout.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/MapSpecific/

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Biome.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Daytime.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/GameSettings/Single/Dropdowns/Landscape.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/Panels/MapPreview.js

ps/trunk/binaries/data/mods/public/maps/random/danubius.js

ps/trunk/binaries/data/mods/public/maps/random/danubius.json

ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js

ps/trunk/binaries/data/mods/public/maps/random/polar_sea.json

ps/trunk/binaries/data/mods/public/maps/random/the_unknown/

ps/trunk/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js

ps/trunk/binaries/data/mods/public/maps/random/unknown.js

ps/trunk/binaries/data/mods/public/maps/random/unknown.json

ps/trunk/binaries/data/mods/public/maps/random/unknown_land.js

ps/trunk/binaries/data/mods/public/maps/random/unknown_land.json

Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea…
AuditedrP23392
Actions