Diffusion 0 A.D. Public Repository rP22809

Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies.
rP22809
Actions

Description

Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies.

Usage of these classes was inconsistent, and CitizenSoldier is a non-visible class so should not be used in data files.

Reviewed By: wraitii

Patch By: Nescio

Differential Revision: https://code.wildfiregames.com/D2200

Details

Committed

wraitii

Aug 31 2019, 2:41 PM

Reviewer

wraitii

Differential Revision

D2200: fix a wrong class (CitizenSoldier)

Parents

rP22808: Fix rP22753 error in Promotion when promoting an entity that died on the same…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 9123
Build 14952: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP22809: Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies..Aug 31 2019, 2:41 PM

wraitii added an edge: D2200: fix a wrong class (CitizenSoldier).

Harbormaster completed building B9123: rP22809: Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies..Aug 31 2019, 2:45 PM

Nescio mentioned this in D1815: match unit classes with templates.Aug 31 2019, 4:56 PM

Nescio mentioned this in D1808: standardized hero aura descriptions.Aug 31 2019, 5:12 PM

Changes (13)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

session/

session.js

simulation/

data/

auras/

teambonuses/

iber_player_teambonus.json

rome_player_teambonus.json

spart_player_teambonus.json

units/

catafalques/

iber_catafalque_1.json

spart_catafalque_1.json

civs/

iber.json

rome.json

spart.json

technologies/

phase_city_athen.json

phase_city_generic.json

phase_town_athen.json

phase_town_generic.json

rP22809

View Options

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

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/rome_player_teambonus.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json

View Options

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

View Options

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

View Options

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

View Options

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

Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies.rP22809Actions

Description

Details

Event Timeline

Changes (13)

rP22809

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

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/rome_player_teambonus.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json

ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json

ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json

ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json

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

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

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

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

Change CitizenSoldier class to Citizen and/or Soldier in auras and technologies.
rP22809
Actions