HomeWildfire Games

Clean Skirmish maps of default and invalid gamesetting values.

Description

Clean Skirmish maps of default and invalid gamesetting values.

  • The gamesetup class rewrite in D2483 will enable Skirmish and Random maps to fix AIs and Civs by specifying them. Hence remove them from all maps that don't intend to fix them (i.e. all except Egypt 3v3).
  • Remove default values (and the few irrelevant non-default values) so that the player-chosen settings may be persisted between Skirmish map selection changes, refs #3120, D2483.
  • Remove invalid settings: mapType, AISeed and random map settings Script, Size, Seed, Nomad, BaseHeight, BaseTerrain, refs rP20726, rP21274.
  • Remove StartingCamera values since they are useless, refs #4839, D1098.
  • Add the "new" keyword to Atlas Valleys and Vesuvius from rP23278, so they appear in the "new" filter.
  • Unhide Barcania (3)

Details

Committed
elexisDec 24 2019, 5:38 AM
Parents
rP23278: Atlas Valleys and Vesuvius skirmish maps
Branches
Unknown
Tags
Unknown
Build Status
Buildable 10503
Build 18006: Post-Commit BuildJenkins

Event Timeline

Stan raised a concern with this commit.Nov 25 2020, 10:50 PM
Stan added a subscriber: Stan.

Sicilia nomad starting camera position was broken by this commit. Raising a concern so it's somewhere.

/ps/trunk/binaries/data/mods/public/maps/skirmishes/Sicilia_Nomad.xml
53

This broke the starting camera position.

MapReader.cpp:1106

			if (PlayerID == m_MapReader.m_PlayerID && (boost::algorithm::ends_with(TemplateName, L"civil_centre") || m_MapReader.m_StartingCameraTarget == INVALID_ENTITY))
			{
				// Focus on civil centre or first entity owned by player
				m_MapReader.m_StartingCameraTarget = ent;
			}

The above code fails, because player 1 has no CC.

Then MapReader calls ApplyData, and no longer has any way to fix the camera, so you're in the SOW.

This commit now has outstanding concerns.Nov 25 2020, 10:50 PM
Stan removed an auditor: Stan.Jan 21 2021, 2:35 PM
Stan added inline comments.
/ps/trunk/binaries/data/mods/public/maps/skirmishes/Sicilia_Nomad.xml
53

This broke the starting camera position.

MapReader.cpp:1106

			if (PlayerID == m_MapReader.m_PlayerID && (boost::algorithm::ends_with(TemplateName, L"civil_centre") || m_MapReader.m_StartingCameraTarget == INVALID_ENTITY))
			{
				// Focus on civil centre or first entity owned by player
				m_MapReader.m_StartingCameraTarget = ent;
			}

The above code fails, because player 1 has no CC.

Then MapReader calls ApplyData, and no longer has any way to fix the camera, so you're in the SOW.

This commit no longer requires audit.Jan 21 2021, 2:35 PM