Opened 6 years ago

Closed 3 years ago

#4504 closed defect (fixed)

[PATCH] Insufficient DisabledTechnologies, DisabledTemplates, GatherRateMultiplier, StartingTechnologies, StartingResources, PopulationCap implementation

Reported by: elexis Owned by: elexis
Priority: Should Have Milestone: Alpha 24
Component: Simulation Keywords: patch
Cc: Patch:

Description (last modified by elexis)

DisabledTechnologies can only be set from JS trigger scripts, but not from the JSON / XML mapfile, because r16632 only implemented the code for DisabledTemplates.

Same is true for StartingTechnologies.

GatherRateMultiplier seems to be implemented, but commented out.

StartingResources implementation is bad as the global property is done in InitGame.js and sets all resources equally by one number, while the player-individual property is done in Player.js and can specify different resource counts per type.

Population limitation is badly implemented, the global one is called PopulationCap and done in InitGame.js, the local one is called PopulationLimit and done in Player.js. This part doesn't have to be unified in this ticket.

To avoid copy & pasting, helper functions should be used.

Halfway finished patch I lost interest in at https://code.wildfiregames.com/P32

Change History (5)

comment:1 by elexis, 5 years ago

Description: modified (diff)

Nomad / rmgen code needs a way to get the starting resources that works equally in atlas, gamesetup.cpp and gamesetup.js https://code.wildfiregames.com/rP16447#23777

comment:2 by Imarok, 4 years ago

Component: UI & SimulationSimulation

Move tickets to Simulation as UI & Simulation got some sub components.

comment:3 by elexis, 3 years ago

Keywords: simple removed
Milestone: BacklogAlpha 24
Owner: set to elexis

r22964 removed the GatherRateMultiplier.

Phab:D2483 implements DisabledTechnologies, StartingTechnologies, StartingTechnologies, StartingResources, PopulationCap such that the gamesetup will consume the per-player specified value if it exists, then the player-independent value if the map specifies it, otherwise the player defaults value, and displays this correctly in the gamedescription.js used in the gamesetup and session ObjectivesDialog for the PopulationCap and StartingResources.

I suppose for Atlas there should also be a field to specify DisabledTechs/DisabledTemplates/StartingTechnologies, but I wrote this ticket for the broken simulation helper code following the Skirmish map introduction that broke it.

comment:4 by elexis, 3 years ago

Summary: [PATCH] Insufficient DisabledTechnologies, StartingTechnologies, GatherRateMultiplier, StartingTechnologies, StartingResources, PopulationCap implementation[PATCH] Insufficient DisabledTechnologies, DisabledTemplates, GatherRateMultiplier, StartingTechnologies, StartingResources, PopulationCap implementation

comment:5 by elexis, 3 years ago

Resolution: fixed
Status: newclosed

In 23374:

Gamesetup class rewrite, fixes #5322, refs #5387.

  • Decouples settings logically which in turn allows fixing many problems arising from previous coupling.
  • Fixes the persist-match-settings feature, refs #2963, refs #3049.
  • Improves performance of the matchsetup by rebuilding GUI objects only when necessary.

Provides groundwork for:

  • UI to control per-player handicap, such as StartingResources, PopulationCap, StartingTechnologies, DisabledTechnologies, DisabledTemplates, ..., refs #812.
  • Map specific settings (onMapChange event), refs #4838.
  • Chat notifications announcing which settings changed, refs D1195,
  • Multiple controllers setting up the game (since setting types can check for permissions in onUpdateGameAttributes without the need for a new data model or a second gamesetup data network message type), refs #3806, subsequently dedicated server, refs #3556.
  • MapBrowser (MapCache, MapTypes, onUpdateGameAttributes interface), refs D1703 and D1777,
  • Multiplayer saved games (decoupling and setting dependent unique logic), refs #1088.

Refs https://wildfiregames.com/forum/index.php?/topic/20787-paid-development-2016/ https://wildfiregames.com/forum/index.php?/topic/20789-paid-development-2016/

Enable maps to restrict setting values:

  • If a map specifies an AI or Civs for a playerslot, the controller can't assign a player/other AI or Civ to that slot, refs #3049, #3013.

Fix per player StartingResources, PopulationCap, StartingTechnologies, DisabledTechnologies, DisabledTemplates following rP12756, refs #812, fixes #4504. Use this for DisabledTechnologies on Polar Sea.

Persist user settings for Skirmish maps:

  • All user chosen settings are persisted when changing the selected map or maptype, except where the selected map overwrites the setting value and except for Scenario maps which still use the default value where the map doesn't specify the setting value.
  • Tickets relating to that Skirmish mapchange user setting persistance:
    • Selecting a map doesn't change the selected civilizations, fixes #3120 (together with r23279 removing map specified Civs).
    • Selecting a map type doesn't reset the selected settings, fixes #5372.
    • Selecting a map doesn't change the selected victory conditions, unless the map specifies those, refs #4661, #3209. (Atlas still writes VictoryConditions to every map.)
    • Consume the player color palette from Skirmish maps, refs rP17040 / #1580. Preserve the selected playercolors when switching the Skirmish/Random map by chosing the most similar colors if the map comes with a different palette.

Rated games:

  • Hide and disable Rated game setting unless there are exactly two players, fixes #3950, supersedes D2117.
  • Display conspicuous warning if the game is rated, so players are perfectly aware.

Autostarted games:

  • Allow using the gamesetup page to autostart matches with arbitrary maps, not only this one tutorial, as reported in D194 and rP19599, refs D11.

Networking:

  • Keep gamesetup page open after disconnect, allowing players to read chat messages indicating why the host stopped the server, fixes #4114.
  • The message subscription system allows new and mod settings to run custom logic on arbitrary setting changes (most importantly on map change). This removes hardcoded logic restrictions from the gamesetup option unification rewrite in rP19504/D322, refs #3994, such as the hardcoding of setting references in selectMap to biomes from rP20115/D852 and the difficulty from rP20760/D1189, RelicDuration, WonderDuration, LastManStanding, RegicideGarrison, TriggerScripts, CircularMap, Garrison, DisabledTemplates.

Checkboxes:

  • Display values of disabled checkboxes with Yes/No labels, fixes D2349, reviewed by nani.

Clean g_GameAttributes of invalid values and gamesetup GUI temporaries, refs #3049, #3883:

MapCache:

  • Refactor to MapCache class, store maps of all types and use it in the replaymenu, lobby and session as well.

SettingTabsPanel:

  • Remove hardcodings and coupling of the SettingTabsPanel with biomes/difficulties/chat UI from D1027/rP20945.

GamesetupPage.xml:

  • Restructure the page to use hierarchical object organization (topPanel, centerPanel, centerLeftPanel, bottomPanel, centerCenterPanel, centerRightPanel, bottomLeftPanel, bottomRightPanel), allowing to deduplicate object position margins and size math and ease navigation.

New defaults:

  • Check LockedTeams default in multiplayer (not only rated games).
  • Persist the rated game setting instead of defaulting to true when restarting a match, which often lead to unintentional rated games when rehosting.
  • 60 FPS in menus since they are animated

Autocomplete sorting fixed (playernames should be completed first).
Refactoring encompasses the one proposed in Polakrity and bb D1651.

Differential Revision: https://code.wildfiregames.com/D2483
Tested by: nani
Discussed with:

Emojis by: asterix, Imarok, fpre, nani, Krinkle, Stan, Angen, Freagarach

Note: See TracTickets for help on using tickets.