HomeWildfire Games
Diffusion 0 A.D. Public Repository rP19329

Rename the Female identity class to FemaleCitizen, because it is intended for…
AuditedrP19329
Actions

Description

Rename the Female identity class to FemaleCitizen, because it is intended for female support units only.

Thus prevent template editors from adding that tag to female military units and
allow modders to add a Female class for wider purposes.
Remove the FemaleCitizen training restriction category that was added for debug purposes but forgotton to be removed in rP12832.

Differential Revision: https://code.wildfiregames.com/D244
Reviewed By: fatherbushido
Refs: #1432 #4490

Details

Auditors
user1
Committed
elexisMar 23 2017, 6:54 PM
Reviewer
fatherbushido
Differential Revision
D244: Prevent template editors from tagging military units as female support units
Parents
rP19328: Revert the addition of the Female identity class to the Boudica heroine from…
Branches
Unknown
Tags
Unknown
Build Status
Buildable 857
Build 1350: Post-Commit BuildJenkins

Event Timeline

elexis committed rP19329: Rename the Female identity class to FemaleCitizen, because it is intended for….Mar 23 2017, 6:54 PM
Harbormaster completed building B857: rP19329: Rename the Female identity class to FemaleCitizen, because it is intended for….Mar 23 2017, 8:37 PM
elexis added a comment.Mar 30 2017, 2:37 PM

While trac is down:

Replying to #4490 [comment:18 fatherbushido]:

not related but as it's modified in the diff above, !EjectClassesOnDestroy should be cleaned a bit

appeared like the intention was to eject non-mounted units, as mounted-units might be too slow to accomplish that

As mentioned by you in IRC today:

the specific eject classes on destroy for ships are indeed intended. see #2242 and the related commit

Thanks for looking that up

user1 raised a concern with this commit.Apr 18 2017, 12:01 AM
user1 added a subscriber: user1.

This is breaking the ratings bot.

In D244#13751, @user1 wrote:

Turns out this change breaks the ratings bot.

The statistics that are gathered and ultimately stored are generated from the class names and the ratings bot uses these same names in its database.

This is breaking ratings bot becase the sqlite db keys are hardcoded when the ratings db is created by source/tools/XpartaMuPP/LobbyRanking.py and EcheLOn.py is using the generated names to lookup(and store) these ratings.

femaleUnitsTrained, femaleUnitsLost, and enemyFemaleUnitsKilled become femaleCitizenUnitsTrained, femaleCitizenUnitsLost, and enemyFemaleCitizienUnitsKilled.

LobbyRanking.py and EcheLOn.py need to be updated as well as the sqlite db being updated to reflect the new name.

This commit now has outstanding concerns.Apr 18 2017, 12:01 AM
elexis mentioned this in D144: Show all summary values as a graph.Apr 22 2017, 5:15 AM
elexis mentioned this in rP19457: Fix the lobby bot following the entity class rename in rP19329.Apr 25 2017, 6:53 PM
elexis requested verification of this commit.Apr 26 2017, 3:27 PM

Should be fixed by rP19457

This commit now requires verification by auditors.Apr 26 2017, 3:27 PM
elexis mentioned this in D386: Sort and update help list of category build and training restrictions..Apr 26 2017, 3:46 PM
user1 accepted this commit.Apr 26 2017, 6:36 PM

It's probably fine. The only thing is that there's been no testing of the fix and testing it might be tricky prior to release... maybe I should raise a concern on that commit instead..

All concerns with this commit have now been addressed.Apr 26 2017, 6:36 PM

Changes (17)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
gui/
session/
summary/
maps/
random/
simulation/
ai/
petra/
components/
tests/
data/
technologies/
templates/

rP19329

View Options

ps/trunk/binaries/data/mods/public/gui/session/session.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/summary/counters.js

Loading...
View Options

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

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackPlan.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/ai/petra/baseManager.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Attack.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_females_01.json

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
Wildfire Games · Phabricator