Page MenuHomeWildfire Games
Differential D3015

[art] correct a few weapon prop names
ClosedPublic
Actions

Authored by Nescio on Sep 24 2020, 12:42 PM.

Details

Reviewers
Stan
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24196: Correct a few weapon prop names.
Summary

This patch:

  • renames a few weapon props:
    • akin → akinakes
    • gladus → gladius
    • kush_khopesh_bronze → khopesh
    • knife → dagger
  • merges kush_gladius.xml, rome_cav_gladius.xml, and spatha.xml, since they're essentially the same
  • deprecates *_kush.xml and *_ptol.xml variants of camelry slaughter attack and gather meat, since their generic camel parent variant is more appropiate
Test Plan

Verify correctness, agree with the changes.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Sep 24 2020, 12:42 PM
Owners added a subscriber: Restricted Owners Package.Sep 24 2020, 12:42 PM
Harbormaster completed remote builds in B13231: Diff 13532.Sep 24 2020, 12:49 PM
Nescio requested review of this revision.Sep 24 2020, 12:49 PM
Stan accepted this revision.Nov 17 2020, 11:05 AM

Change is correct. I'm gonna make a few small changes and commit this.

This revision is now accepted and ready to land.Nov 17 2020, 11:05 AM
Closed by commit rP24196: Correct a few weapon prop names. (authored by Stan). · Explain WhyNov 17 2020, 11:06 AM
This revision was automatically updated to reflect the committed changes.
Stan added a commit: rP24196: Correct a few weapon prop names..

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
art/
actors/
props/
units/
6 lines
weapons/
18 lines
13 lines
11 lines
4 lines
13 lines
32 lines
30 lines
15 lines
13 lines
20 lines
15 lines
20 lines
50 lines
2 lines
21 lines
units/
iberians/
4 lines
2 lines
kushites/
4 lines
2 lines
2 lines
2 lines
2 lines
ptolemies/
4 lines
4 lines
4 lines
romans/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
meshes/
props/
1115 lines
1115 lines
551 lines
109 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
weapons/
67 lines
2 lines
2 lines
2 lines
2 lines
551 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
67 lines
109 lines
1115 lines
1115 lines
2 lines
2 lines
2 lines
2 lines
2 lines
variants/
biped/
2 lines
2 lines
2 lines
2 lines
2 lines
rider/
2 lines
2 lines
2 lines
camelry/
2 lines
6 lines
6 lines
1 line
6 lines
6 lines

Diff 13983

View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/kush_meroitic_scabbard.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/akin.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/akinakes.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/axe_sagaris.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/broadsword.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/dagger.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/gladius.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/gladus.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/khopesh.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/knife.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/kush_gladius.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/kush_khopesh_bronze.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rome_cav_gladius.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/sheath_celt_iron.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/sheath_gladius.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/spatha.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_viriato.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_a.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_c.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_e.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_marcellus.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_maximus.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_gladiator_swordsman.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c5.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_servus.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/ax_sagaris_a.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/ax_sagaris_b.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/knife.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/kush_khopesh.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_akin_c.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_a.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_b.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_c.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_d.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_e.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_f.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_g.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weap_gladus_h.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/akinakes_01.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/bow_bamboo.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/bow_greek.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/bow_long_indian.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/bow_recurve_pers.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/dagger_01.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_01.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_02.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_03.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_04.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_05.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_06.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_07.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/gladius_08.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/khopesh.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sagaris_01.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sagaris_02.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sheath_celt_a.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sheath_celt_b.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sheath_falcata.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sheath_gladius_01.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/props/weapons/sheath_xiphos.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/approach_meat.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/attack_melee_female.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/gather_meat.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_kush.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_kush.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_rome.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/attack_slaughter.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/attack_slaughter_kush.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/attack_slaughter_ptol.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat_kush.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat_ptol.xml

Loading...
Wildfire Games · Phabricator