[PATCH] Move gamesetup strings to simulation/data/settings/

[elexis]

Many strings are hardcoded in the gamesetup and used in other places like the lobby, session and summary screen and will also be used in the visual replay menu (#3258).

The affected settings are:

• AI Difficulties
• Ceasefire
• GameSpeeds
• GameTypes
• MapTypes
• MapSizes
• PlayerDefaults
• PopulationCapacity
• StartingResources

The strings should be moved to simulation/data/settings/ and treated consistently, so that redundant code can be removed.

Notice: For visual replay menu, MapSizes and PlayerDefaults are not required to be moved, as they are present in functions_utility.js

Refs #3049

[elexis]

Moves all the hardcoded values from lobby/gamesetup/session/summary to simulation/data. Doesn't break atlas. Notice that the AI difficulties, ceasefire times, starting resources and maptypes have their translation context removed. Includes some more ceasefire times desired by the community.

Reintroduces the code that was removed in r16840 for non-random maps, so that both #3001 and #3209 are covered. That code was necessary for a bug that was explained in IRC on 2015-01-27 at 4pm: < niektb> Pick a skirmish map, set the conditions to None and then change to a scenario that has a Conquest condition. You'll see that when you load the map no victory conditions are set.

You can test that all settings are accepted correctly by starting a game and comparing the settings in the commands.txt (improve json readability with ​http://jsonlint.com/)

[elexis]

# 1. After applying the patch make sure the old files are actually removed
rm binaries/data/mods/public/simulation/data/game_speeds.json
rm binaries/data/mods/public/simulation/data/map_sizes.json
rm binaries/data/mods/public/simulation/data/player_defaults.json
rm -R binaries/data/mods/public/gui/gamesetup/victory_conditions

# AI difficulties were hardcoded in aiconfig.js
# Map types were hardcoded in gamesetup.js and lobby.js
# Ceasefire, starting resources, population capacity were hardcoded in gamesetup.js

# 2. Make sure the removed files are unrevisioned too
svn rm binaries/data/mods/public/simulation/data/game_speeds.json
svn rm binaries/data/mods/public/simulation/data/map_sizes.json
svn rm binaries/data/mods/public/simulation/data/player_defaults.json
svn rm binaries/data/mods/public/gui/gamesetup/victory_conditions/

# 3. Make sure the new files are all revisioned
svn add binaries/data/mods/public/gui/common/settings.js
svn add binaries/data/mods/public/simulation/data/settings/

Also "map_sizes.json" and "player_defaults.json" in ​http://trac.wildfiregames.com/wiki/Random_Map_Generator_Internals should be updated.

[elexis]

Doesn't remove the context of existing translation.

[elexis]

Updates the translation extractor to support context for json files (to correctly extract the translated strings of our new files). To quickly verify the function, insert if templateSettings["output"] != "public-simulation-other.pot": continue; to L74 of updateTemplates.py.

[elexis]

Now saves each GameType as an individual json file (better for mods). Atlas now properly recognizes MapSizes. Uses find and findIndex. More cleanup in aiconfig.js. Some issues leper noticed in irc thir morning.

[elexis]

Fixes wrong TranslatedKeys entry in the GameTypes json files.

[elexis]

Splitting the patch into many parts now. This patch allows translating JSON files with context. It tells the translation extractor to add the context, which is given as a parameter in the binaries/data/mods/mod/l10n/messages.json file.

[leper]

In 16942:

Enhance i18n extractor to support a single context for a json file. Patch by elexis. Refs #3355.

[elexis]

Moves "MaxPlayers": 8 and MaxTeams": 4 and creates the settings.js file needed for all further patches.

[elexis]

Doesn't create player_limit.json but moves the constant to settings.js. Doesn't show a popup anymore, but returns immediatel on error. Needs to wait one onTick in session.js, otherwise it segfaults.

[elexis]

Renamed variables, changed comments, added newlines.

[elexis]

Split once more. This is the smallest patch possible to move the player limits.

[elexis]

Rebased.

[Itms]

In 16975:

Move player and team number limits to a centralized file which will also eventually hold various kinds of settings.
Patch by elexis, refs #3355

[Itms]

In 16979:

Apparently SVN messed up when I applied the patch for r16975, so fix it.
Also include some fixes to elexis's oversights, refs #3355.

[elexis]

Also includes the 1-4min ceasefire options the community wished for.

[elexis]

Makes the translation context coherent for the case unknown.

[elexis]

Removes unused function translateCeasefire.

[elexis]

Broke uniform loading of files to remove redundant ceasefire translations. Also a simplification in gamesetup error handling and made g_Ceasefire const.

[elexis]

Alternative version where undefined instead of false is returned in case of error.

[elexis]

Uses lowercase filename dammit.

[Itms]

In 17006:

Add the ceasefire settings to the new simulation settings system.
Patch by elexis, refs #3355.

[elexis]

After a review by mimo: Renamed loadAvailableSettings and in case of error, print all erroneous files.

[mimo]

In 17007:

Add the starting resources to the new simulation settings system, refs #3355, patch by elexis

[leper]

In 17012:

Move the population cap to the new simulation settings system. Patch by elexis. Refs #3355.

[elexis]

Simplifies that changed line in settings.js, renames m_IsReplay to m_IsVisualReplay and CGame::StartReplay to CGame::StartVisualReplay so that it's clear that this code is not run in non-visual replaymode (after a review by mimo).

[mimo]

In 17017:

Rename some variables to point out that they are only used in visual replay. Add script function IsVisualReplay. Refs #9 #3355, patch by elexis

[mimo]

In 17019:

Move the game speeds to the new simulation settings system. Patch by elexis. Refs #3355

[elexis]

Don't forget to delete gui/gamesetup/victory_conditions/

[elexis]

Derives the name element from the filename and changes variable names to "victory conditions", as we might support having multiple of them simultaneously in the future.

[elexis]

Corrects the entries in atlas and finds a solution to both r16238 and r16840

[mimo]

In 17026:

Move the victory conditions to the new simulation settings system. Patch by elexis. Refs #3355,#3001

[mimo]

In 17031:

Move the map types to the new simulation settings system. Patch by elexis. Refs #3355.

[elexis]

Some comments for that patch:

• aiconfig.js
  • function init(settings): moved both arrays used to settings.js and simplified
  • function selectAI(idx): id and name were unused
  • function returnAI(): only simplifications and style fix

• gamesetup.js
  • doesn't transfer g_AIs anymore, since it is accessible from g_Settings
  • aiCodes: unused variable

Notice: For visual replay menu, MapSizes and PlayerDefaults are not required to be moved, as they are present in functions_utility.js. We might push this to A20 after the next commit.

[Itms]

In 17034:

Move the AI data to the new simulation settings system. Patch by elexis. Refs #3355.

[elexis]

The translations of the starting resources were still extracted correctly after r17052, but the translation context wasn't handed over anymore to the actual translation call.

[Itms]

In 17064:

Fix translation of starting resources, patch by elexis, refs #3355

[elexis]

In 17332:

Move the playerdefaults to the settings directory. Refs #3355

[elexis]

In 17345:

Don't break the translation of the playerdefaults. Refs #3355

[elexis]

In 17373:

Move mapsizes to the new simulation settings system. Fixes #3355.

Notice that initMapSizes() confusingly mapped from "LongName" to "names" and from "Name" to "shortnames".
Now it's identical in both parts.

Also fixes a bug in the summary screen where it would show "Scenario" for a skirmish map.

[elexis]

In 17374:

Actually remove the old file from the repository. Refs #3355

[elexis]

In 17379:

Update atlas with the new map_sizes.json format. Refs #3355.