HomeWildfire Games
Diffusion 0 A.D. Public Repository rP26015

Some fixes after the ProductionQueue split.
rP26015
Actions

Description

Some fixes after the ProductionQueue split.

r26000 / rP2600 introduced a serialisation error (#6391).
Also the templates and the code could be improved.

Differential revision: https://code.wildfiregames.com/D4352
Comments by: @Silier, @Stan
Fixes: #6391

Details

Auditors
Langbart
Committed
FreagarachNov 26 2021, 6:12 PM
Differential Revision
D4352: Some fixes after r26000.
Parents
rP26014: [i18n] Updated POT and PO files.
Branches
Unknown
Tags
Unknown
Build Status
Buildable 18759
Build 44479: Post-Commit BuildJenkins
Build 44478: Post-Commit Build (macOS)Jenkins

Event Timeline

Freagarach committed rP26015: Some fixes after the ProductionQueue split..Nov 26 2021, 6:12 PM
Freagarach added an edge: D4352: Some fixes after r26000..
Freagarach added subscribers: Silier, Stan.
Harbormaster completed building B18759: rP26015: Some fixes after the ProductionQueue split..Nov 26 2021, 6:24 PM
Freagarach mentioned this in D4392: Add Production Queue to the Mauryan Palace..Dec 25 2021, 11:26 AM
Freagarach mentioned this in rP26131: Add missing ProductionQueue component to the Mauryan Palace..Dec 28 2021, 9:12 AM
Freagarach mentioned this in D4409: Fix modifications to unspecified techCostMultipliers..Dec 30 2021, 7:27 AM
Freagarach mentioned this in rP26192: Fix modifications to unspecified techCostMultipliers..Jan 9 2022, 7:33 AM
Langbart raised a concern with this commit.Jul 21 2022, 1:13 PM
Langbart added a subscriber: Langbart.

#6587
s0600204 wrote:

The issue with the Structure Tree is that r26015 removed default Researcher/TechCostMultiplier values; and whilst r26192 fixed that for the simulation, a fix was not applied to globalscripts which expects there to be values for each possible resource specified within templates.
This is causing other technology costs to be displayed incorrectly within the Structure Tree, such as those of the Mauryan temple and the Gallic forge

This commit now has outstanding concerns.Jul 21 2022, 1:13 PM
marder mentioned this in rP27042: [Fix] Patch globalscripts technology template helper after rP26015 and the….Aug 10 2022, 11:49 PM
Freagarach requested verification of this commit.Aug 11 2022, 6:40 AM
This commit now requires verification by auditors.Aug 11 2022, 6:40 AM
Langbart resigned from this commit.Aug 16 2022, 4:43 PM
This commit no longer requires audit.Aug 16 2022, 4:43 PM

Changes (40)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
components/
templates/
structures/
athen/
gaul/
pers/
rome/
spart/

rP26015

View Options

ps/trunk/binaries/data/mods/public/simulation/components/ProductionQueue.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/Researcher.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml

Loading...
Wildfire Games · Phabricator