/ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json
6–8	Aura modifications are supposed to be sorted alphabetically.
/ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
6–8	Technology modifications are supposed to be sorted alphabetically.
/ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml
3–10	Template nodes are supposed to be sorted alphabetically.

Freagarach mentioned this in D2976: Sort templates and data..Aug 27 2020, 12:44 PM

Freagarach added inline comments.Aug 27 2020, 5:55 PM

/ps/trunk/binaries/data/mods/public/simulation/helpers/Attacking.js
199	Should be "ApplyStatus". (See D2808.)

Freagarach mentioned this in D2977: Fix StatusEffects not being applied after rP24001..Aug 27 2020, 6:51 PM

Freagarach added inline comments.Aug 28 2020, 8:36 AM

/ps/trunk/binaries/data/mods/public/simulation/helpers/Attacking.js
199	D2977 Has the fix.

Given that Armo(u)r was renamed to Resistance/Damage Resistance in the GUI tooltip, it should probably be renamed in the aura descriptions and technology tooltips too, and the https://trac.wildfiregames.com/wiki/EnglishStyleGuide ought to be updated accordingly.

That is a good one! Do you have any proposition how to properly refer to that? I'll make a minimalistic diff to discuss it there. [EDIT]: D2978.

Freagarach mentioned this in D2978: [WIP] - Update tooltips after rP24001..Aug 28 2020, 10:17 AM

Freagarach mentioned this in rP24004: Fix applying StatusEffects after rP24001..Aug 28 2020, 2:43 PM

(I can't raise a concern on my own commit ^^ )

/ps/trunk/binaries/data/mods/public/simulation/helpers/Attacking.js
346	While this may technically correct, it breaks capturing invulnerable targets (e.g. relics),,, See D1268 for a proper fix.

bb raised a concern with this commit.Aug 28 2020, 9:16 PM

This commit now has outstanding concerns.Aug 28 2020, 9:16 PM

Silier raised a concern with this commit.Aug 28 2020, 10:40 PM

Silier added a subscriber: Silier.

Silier added inline comments.

/ps/trunk/binaries/data/mods/public/simulation/components/Health.js
190	you just removed safe guard of multiple killing

myou5e added a subscriber: myou5e.Aug 29 2020, 12:16 AM

Freagarach mentioned this in D2981: Add back safeguard against killing an entity multiple times..Aug 29 2020, 7:14 AM

Freagarach added inline comments.Aug 29 2020, 7:15 AM

/ps/trunk/binaries/data/mods/public/simulation/components/Health.js
190	D2981

Nescio mentioned this in D2875: [gui] shrink selection panel icons.Aug 29 2020, 10:14 AM

Silier resigned from this commit.Aug 29 2020, 12:22 PM

Silier removed an auditor: Silier.

Freagarach marked an inline comment as done.Aug 29 2020, 1:10 PM

Freagarach mentioned this in rP24006: Readd safeguard against killing an entity multiple times..

Nescio mentioned this in D2984: [gui] combine attack tooltips.Sep 3 2020, 12:08 PM

wraitii mentioned this in D1268: Remove health component from relics..Dec 3 2020, 2:07 PM

Freagarach mentioned this in rP24327: Remove health component from relics..Dec 6 2020, 8:23 AM

Fixed in rP24327

This commit no longer requires audit.Dec 28 2020, 10:47 AM

Nescio mentioned this in D3403: fix aura descriptions.Jan 17 2021, 7:41 PM

Freagarach mentioned this in rP24717: Armour -> Resistance in aura descriptions..Jan 20 2021, 8:11 AM

Changes (142)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

ps/

trunk/

binaries/

data/

mods/

_test.sim/

simulation/

templates/

special/

filter/

foundation.xml

public/

globalscripts/

Templates.js

gui/

common/

tooltips.js

reference/

common/

session/

selection_panels_middle/

single_details_area.xml

simulation/

ai/

common-api/

petra/

components/

	Resistance.js
	Armour.js

StatusEffectsReceiver.js

interfaces/

tests/

data/

auras/

structures/

kush_pyramids_military.json

wall_garrisoned.json

units/

catafalques/

cart_catafalque.json

rome_catafalque_2.json

heroes/

athen_hero_iphicrates_1.json

brit_hero_caratacos.json

iber_hero_caros_2.json

mace_hero_demetrius.json

rome_hero_maximus.json

sele_hero_antiochus_great.json

spart_hero_brasidas.json

technologies/

armor_cav_01.json

armor_cav_02.json

armor_hero_01.json

armor_infantry_01.json

armor_infantry_02.json

armor_ship_hullsheathing.json

armor_ship_hypozomata.json

armor_ship_reinforcedhull.json

siege_armor.json

tower_armour.json

trade_convoys_armor.json

helpers/

tests/

templates/

campaigns/

army_mace_hero_alexander.xml

army_spart_hero_leonidas.xml

gaia/

fauna_hippopotamus.xml

fauna_walrus.xml

other/

bench.xml

column_doric.xml

column_doric_fallen.xml

column_doric_fallen_b.xml

special/

filter/

foundation.xml

structures/

cart_super_dock.xml

rome_army_camp.xml

rome_siege_wall_gate.xml

rome_siege_wall_long.xml

rome_siege_wall_medium.xml

rome_siege_wall_short.xml

rome_siege_wall_tower.xml

template_structure.xml

template_structure_civic.xml

template_structure_civic_civil_centre.xml

template_structure_defensive.xml

template_structure_defensive_palisade.xml

template_structure_defensive_tower_outpost.xml

template_structure_defensive_tower_sentry.xml

template_structure_economic.xml

template_structure_military.xml

template_structure_military_embassy.xml

template_structure_military_fortress.xml

template_structure_resource.xml

template_structure_resource_field.xml

template_structure_special.xml

template_structure_wonder.xml

template_unit.xml

template_unit_cavalry.xml

template_unit_cavalry_melee_axeman.xml

template_unit_cavalry_melee_spearman.xml

template_unit_cavalry_melee_swordsman.xml

template_unit_champion_cavalry.xml

template_unit_champion_cavalry_axeman.xml

template_unit_champion_cavalry_spearman.xml

template_unit_champion_cavalry_swordsman.xml

template_unit_champion_elephant.xml

template_unit_champion_infantry.xml

template_unit_champion_infantry_axeman.xml

template_unit_champion_infantry_maceman.xml

template_unit_champion_infantry_pikeman.xml

template_unit_champion_infantry_spearman.xml

template_unit_champion_infantry_swordsman.xml

template_unit_dog.xml

template_unit_fauna_hunt_defensive_elephant.xml

template_unit_fauna_hunt_skittish_elephant_infant.xml

template_unit_hero.xml

template_unit_hero_cavalry.xml

template_unit_hero_cavalry_axeman.xml

template_unit_hero_cavalry_spearman.xml

template_unit_hero_cavalry_swordsman.xml

template_unit_hero_elephant_melee.xml

template_unit_hero_healer.xml

template_unit_hero_infantry.xml

template_unit_hero_infantry_axeman.xml

template_unit_hero_infantry_pikeman.xml

template_unit_hero_infantry_spearman.xml

template_unit_hero_infantry_swordsman.xml

template_unit_infantry.xml

template_unit_infantry_melee_axeman.xml

template_unit_infantry_melee_pikeman.xml

template_unit_infantry_melee_spearman.xml

template_unit_infantry_melee_swordsman.xml

template_unit_infantry_ranged.xml

template_unit_infantry_ranged_archer.xml

template_unit_infantry_ranged_javelineer.xml

template_unit_infantry_ranged_slinger.xml

template_unit_ship.xml

template_unit_ship_fishing.xml

template_unit_ship_merchant.xml

template_unit_siege.xml

template_unit_support.xml

units/

gaul_champion_fanatic.xml

kush_infantry_clubman_b.xml

maur_elephant_archer_b.xml

maur_support_elephant.xml

Rename Armour to Resistance and change the way it is processed.rP24001Actions

Description

Details

Event Timeline

Changes (142)Show All Changes

Very Large Commit

rP24001

ps/trunk/binaries/data/mods/_test.sim/simulation/templates/special/filter/foundation.xml

ps/trunk/binaries/data/mods/public/globalscripts/Templates.js

ps/trunk/binaries/data/mods/public/gui/common/tooltips.js

ps/trunk/binaries/data/mods/public/gui/reference/common/ReferencePage.js

ps/trunk/binaries/data/mods/public/gui/reference/common/TemplateParser.js

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

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

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

ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml

ps/trunk/binaries/data/mods/public/simulation/ai/common-api/entity.js

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

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

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

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

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

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

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

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

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

ps/trunk/binaries/data/mods/public/simulation/components/interfaces/Attack.js

ps/trunk/binaries/data/mods/public/simulation/components/interfaces/Resistance.js

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

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

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

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

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

ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json

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

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

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/iber_hero_caros_2.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json

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

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

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

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

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

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

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

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

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

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

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

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

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

ps/trunk/binaries/data/mods/public/simulation/helpers/Attacking.js

ps/trunk/binaries/data/mods/public/simulation/helpers/tests/test_Attacking.js

ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml

ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/bench.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_short.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/fence_stone.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/table_square.xml

ps/trunk/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml

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

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

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

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

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

Rename Armour to Resistance and change the way it is processed.
rP24001
Actions

Changes (142)
Show All Changes