Paths

Table of Contentst

Differential D3015

[art] correct a few weapon prop names
ClosedPublic
Actions

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

Tags

None

Subscribers

Restricted Owners Package

Details

Reviewers

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

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 13231
Build 26400: Vulcan Build	Jenkins
Build 26399: Vulcan Build (macOS)	Jenkins
Build 26398: Vulcan Build (Windows)	Jenkins
Build 26397: arc lint + arc unit

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

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

Path

Size

binaries/

data/

mods/

public/

art/

actors/

props/

units/

kush_meroitic_scabbard.xml

2 lines

weapons/

	akinakes.xml
	akin.xml

18 lines

axe_sagaris.xml

10 lines

	dagger.xml
	knife.xml

4 lines

	gladius.xml
	gladus.xml

16 lines

	khopesh.xml
	kush_khopesh_bronze.xml

2 lines

kush_gladius.xml

kush_khopesh_bronze.xml

rome_cav_gladius.xml

sheath_celt_iron.xml

4 lines

sheath_gladius.xml

2 lines

21 lines

units/

iberians/

hero_infantry_swordsman_caros.xml

4 lines

hero_infantry_swordsman_viriato.xml

2 lines

kushites/

camelry_javelinist_b_r.xml

4 lines

infantry_swordsman_a.xml

2 lines

infantry_swordsman_b.xml

2 lines

infantry_swordsman_c.xml

2 lines

infantry_swordsman_e.xml

2 lines

ptolemies/

camelry_archer_a_r.xml

4 lines

camelry_archer_b_r.xml

4 lines

camelry_archer_e_r.xml

4 lines

romans/

hero_cavalry_swordsman_marcellus_r.xml

2 lines

hero_cavalry_swordsman_maximus_r.xml

2 lines

hero_infantry_swordsman_marcellus.xml

2 lines

hero_infantry_swordsman_maximus.xml

2 lines

infantry_gladiator_swordsman.xml

2 lines

infantry_swordsman_a.xml

2 lines

infantry_swordsman_b.xml

2 lines

infantry_swordsman_c.xml

2 lines

infantry_swordsman_c2.xml

2 lines

infantry_swordsman_c3.xml

2 lines

infantry_swordsman_c4.xml

2 lines

infantry_swordsman_c5.xml

2 lines

infantry_swordsman_e.xml

2 lines

infantry_swordsman_servus.xml

2 lines

meshes/

props/

ax_sagaris_a.dae

ax_sagaris_b.dae

kush_khopesh.dae

weap_akin_c.dae

weap_gladus_a.dae

weap_gladus_b.dae

weap_gladus_c.dae

weap_gladus_d.dae

weap_gladus_e.dae

weap_gladus_f.dae

weap_gladus_g.dae

weap_gladus_h.dae

	weapons/

	akinakes_01.dae
	weap_akin_c.dae

	dagger_01.dae
	knife.dae

	gladius_01.dae
	weap_gladus_a.dae

	gladius_02.dae
	weap_gladus_b.dae

	gladius_03.dae
	weap_gladus_c.dae

	gladius_04.dae
	weap_gladus_d.dae

	gladius_05.dae
	weap_gladus_e.dae

	gladius_06.dae
	weap_gladus_f.dae

	gladius_07.dae
	weap_gladus_g.dae

	gladius_08.dae
	weap_gladus_h.dae

	khopesh.dae
	kush_khopesh.dae

2 lines

	sagaris_01.dae
	ax_sagaris_a.dae

	sagaris_02.dae
	ax_sagaris_b.dae

weapons/

2 lines

2 lines

bow_long_indian.dae

2 lines

bow_recurve_pers.dae

2 lines

sheath_celt_a.dae

2 lines

sheath_celt_b.dae

2 lines

sheath_falcata.dae

2 lines

sheath_gladius_01.dae

2 lines

sheath_xiphos.dae

2 lines

variants/

biped/

approach_meat.xml

2 lines

attack_melee_female.xml

2 lines

attack_slaughter.xml

2 lines

female_gather_meat.xml

2 lines

gather_meat.xml

2 lines

rider/

attack_slaughter_kush.xml

2 lines

attack_slaughter_shield_kush.xml

2 lines

attack_slaughter_shield_rome.xml

2 lines

camelry/

attack_slaughter.xml

2 lines

attack_slaughter_kush.xml

attack_slaughter_ptol.xml

gather_meat.xml

1 line

gather_meat_kush.xml

gather_meat_ptol.xml

Diff 13532

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...