Diffusion 0 A.D. Public Repository rP22204

Rename generic ballista template to boltshooter and onager to stonethrower to…
AuditedrP22204
Actions

Description

Rename generic ballista template to boltshooter and onager to stonethrower to avoid ambiguity. Remove template_unit_mechanical.xml and remove '_mechanical' from ship and siege template paths.

The template tree included 'template_unit_mechanical.xml', which had two children, '*_ship.xml' and '*_siege.xml'.
This template did little and implied a relevant common ancestor to ship and siege units. As organic units do not descend from a generic 'Organic', this was not necessary.

This commit removes this template and the '_mechanical' bit from children templates to simplify.

Additionally, this renames:

template_unit_mechanical_siege_ballista.xml to template_unit_siege_boltshooter.xml
template_unit_mechanical_siege_onager.xml to template_unit_siege_stonethrower.xml

This helps avoid ambiguity, as our Roman ballista for example throws stones (even if it is a torsion engine), and 'ballista' refers to a bolt shooter in Age of Empires 1 (and in AoE 2 for the Elephant Ballista, confusingly not named a scorpion like other bolt shooters in that game).

Patch By: Nescio

Reviewers: Wraitii

Subscribers: Itms, O14 Maps, wraitii, elexis, Vulcan, Stan

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

Details

Auditors

Polakrity

Committed

wraitii

Apr 21 2019, 7:04 PM

Differential Revision

D1760: Remove template_unit_mechanical.xml

Parents

rP22203: Communicate field diminishing returns to the player in the fields tooltip

Branches

Unknown

Tags

Unknown

Build Status

Buildable 7238
Build 11797: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP22204: Rename generic ballista template to boltshooter and onager to stonethrower to….Apr 21 2019, 7:04 PM

I'm wondering the real usefulness of the bolt shooter vs stonethrower templates also. It seems to me basically all "shooter" siege engines of the time were torsion engines, which could fire smaller or bigger projectiles and arrows or stone sort of indifferently.
The main difference was mostly whether they could shoot precisely (aka be used as a marksman's tool) and mostly horizontally to target enemy units, which was in general a factor of size it seems.
Might be more interesting to have a "light" and "heavy" variant or something. Or just merge them and specialize derived templates since siege engines were kind of civ-specific beyond rams.

Harbormaster completed building B7238: rP22204: Rename generic ballista template to boltshooter and onager to stonethrower to….Apr 21 2019, 7:39 PM

The Icons of units concerned are no longer displayed.
You forgot to include the renaming pictures with the new names.
Eg: hele_mechanical_siege_lithobolos_packed.png -> hele_siege_lithobolos_packed.png

This commit now has outstanding concerns.Apr 22 2019, 5:24 PM

Missing file 'art/textures/ui/session/portraits/units/cart_siege_ballista.png' referenced by: 'public/simulation/templates/units/cart_siege_ballista_unpacked.xml'
Missing file 'art/textures/ui/session/portraits/units/cart_siege_ballista_packed.png' referenced by: 'public/simulation/templates/units/cart_siege_ballista_packed.xml'
Missing file 'art/textures/ui/session/portraits/units/cart_siege_oxybeles.png' referenced by: 'public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml'
Missing file 'art/textures/ui/session/portraits/units/celt_siege_ram.png' referenced by: 'public/simulation/templates/units/brit_siege_ram.xml', 'public/simulation/templates/units/gaul_siege_ram.xml'
Missing file 'art/textures/ui/session/portraits/units/hele_siege_lithobolos.png' referenced by: 'public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml', 'public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml', 'public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml', 'public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml', 'public/simulation/templates/units/theb_siege_fireraiser.xml'
Missing file 'art/textures/ui/session/portraits/units/hele_siege_lithobolos_packed.png' referenced by: 'public/simulation/templates/units/athen_siege_lithobolos_packed.xml', 'public/simulation/templates/units/mace_siege_lithobolos_packed.xml', 'public/simulation/templates/units/ptol_siege_lithobolos_packed.xml', 'public/simulation/templates/units/sele_siege_lithobolos_packed.xml'
Missing file 'art/textures/ui/session/portraits/units/hele_siege_oxybeles.png' referenced by: 'public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml', 'public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml', 'public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml', 'public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml'
Missing file 'art/textures/ui/session/portraits/units/hele_siege_oxybeles_packed.png' referenced by: 'public/simulation/templates/units/athen_siege_oxybeles_packed.xml', 'public/simulation/templates/units/cart_siege_oxybeles_packed.xml', 'public/simulation/templates/units/mace_siege_oxybeles_packed.xml', 'public/simulation/templates/units/ptol_siege_polybolos_packed.xml', 'public/simulation/templates/units/spart_siege_oxybeles_packed.xml'
Missing file 'art/textures/ui/session/portraits/units/hele_siege_tower.png' referenced by: 'public/simulation/templates/units/kush_siege_tower.xml', 'public/simulation/templates/units/mace_siege_tower.xml', 'public/simulation/templates/units/ptol_siege_tower.xml', 'public/simulation/templates/units/sele_siege_tower.xml'

Thanks, checkrefs.pl

Mh, didn't think of running that script indeed. I'll fix it, thanks.

No problem, I believe Itms will add it to the automatic scripts.

wraitii mentioned this in rP22209: Fix portrait icons of mechanical units broken by rP22204. Reported by Polakrity..Apr 22 2019, 5:53 PM

Polakrity accepted this commit.Apr 22 2019, 6:21 PM

All concerns with this commit have now been addressed.Apr 22 2019, 6:21 PM

In rP22204#32955, @Stan wrote:

No problem, I believe Itms will add it to the automatic scripts.

It is in the automatic scripts already, but D1760 couldn't be tested by Jenkins because of the file names. The bug shows up in the Checks step of https://jenkins.wildfiregames.com/blue/organizations/jenkins/svn/detail/svn/912/pipeline, but I made it non-breaking (like the linter). I could make it breaking, since art files are likely to be committed without going through the differential step.

Nescio mentioned this in D2201: deprecate Mechanical class.Aug 20 2019, 10:51 AM

wraitii mentioned this in rP22810: Remove Mechanical class in favour or using Siege and Ship..Aug 31 2019, 2:45 PM

Nescio mentioned this in D2959: deprecate template_unit_cavalry_melee.xml and *_ranged.xml.Aug 16 2020, 10:04 PM

Nescio mentioned this in D2991: split template_gaia_geo*.Sep 4 2020, 8:04 PM

Nescio mentioned this in D2990: split template_gaia_flora*.

Changes (176)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

maps/

random/

hellas_biomes.json

jebel_barkal.js

scenarios/

Pathfinding_demo.xml

Pathfinding_terrain_demo.xml

Sandbox - Britons.xml

Sandbox - Gauls.xml

Sandbox - Iberians.xml

Sandbox - Kushites.xml

Sandbox - Macedonians.xml

Sandbox - Ptolemies 2.xml

Sandbox - Seleucids.xml

tutorials/

Introductory_Tutorial.js

simulation/

templates/

skirmish/

units/

default_ship_trireme.xml

structures/

mace_fortress.xml

maur_fortress.xml

rome_army_camp.xml

template_structure_military_fortress.xml

template_structure_military_workshop.xml

template_unit_mechanical.xml

template_unit_mechanical_ship.xml

template_unit_mechanical_ship_bireme.xml

template_unit_mechanical_ship_fire.xml

template_unit_mechanical_ship_fishing.xml

template_unit_mechanical_ship_merchant.xml

template_unit_mechanical_ship_quinquereme.xml

template_unit_mechanical_ship_trireme.xml

template_unit_mechanical_siege.xml

template_unit_mechanical_siege_ballista.xml

template_unit_mechanical_siege_onager.xml

template_unit_mechanical_siege_ram.xml

template_unit_mechanical_siege_tower.xml

	template_unit_ship.xml
	template_unit_mechanical_ship.xml

	template_unit_ship_bireme.xml
	template_unit_mechanical_ship_bireme.xml

	template_unit_ship_fire.xml
	template_unit_mechanical_ship_fire.xml

	template_unit_ship_fishing.xml
	template_unit_mechanical_ship_fishing.xml

	template_unit_ship_merchant.xml
	template_unit_mechanical_ship_merchant.xml

	template_unit_ship_quinquereme.xml
	template_unit_mechanical_ship_quinquereme.xml

	template_unit_ship_trireme.xml
	template_unit_mechanical_ship_trireme.xml

	template_unit_siege.xml
	template_unit_mechanical_siege.xml

	template_unit_siege_boltshooter.xml
	template_unit_mechanical_siege_ballista.xml

	template_unit_siege_ram.xml
	template_unit_mechanical_siege_ram.xml

	template_unit_siege_stonethrower.xml
	template_unit_mechanical_siege_onager.xml

	template_unit_siege_tower.xml
	template_unit_mechanical_siege_tower.xml

units/

athen_mechanical_siege_lithobolos_packed.xml

athen_mechanical_siege_lithobolos_unpacked.xml

athen_mechanical_siege_oxybeles_packed.xml

athen_mechanical_siege_oxybeles_unpacked.xml

athen_ship_bireme.xml

athen_ship_fishing.xml

athen_ship_merchant.xml

athen_ship_trireme.xml

	athen_siege_lithobolos_packed.xml
	athen_mechanical_siege_lithobolos_packed.xml

	athen_siege_lithobolos_unpacked.xml
	athen_mechanical_siege_lithobolos_unpacked.xml

	athen_siege_oxybeles_packed.xml
	athen_mechanical_siege_oxybeles_packed.xml

	athen_siege_oxybeles_unpacked.xml
	athen_mechanical_siege_oxybeles_unpacked.xml

brit_mechanical_siege_ram.xml

brit_ship_fishing.xml

brit_ship_merchant.xml

brit_ship_trireme.xml

	brit_siege_ram.xml
	brit_mechanical_siege_ram.xml

cart_mechanical_siege_ballista_packed.xml

cart_mechanical_siege_ballista_unpacked.xml

cart_mechanical_siege_oxybeles_packed.xml

cart_mechanical_siege_oxybeles_unpacked.xml

cart_ship_bireme.xml

cart_ship_fishing.xml

cart_ship_merchant.xml

cart_ship_quinquereme.xml

cart_ship_trireme.xml

	cart_siege_ballista_packed.xml
	cart_mechanical_siege_ballista_packed.xml

	cart_siege_ballista_unpacked.xml
	cart_mechanical_siege_ballista_unpacked.xml

	cart_siege_oxybeles_packed.xml
	cart_mechanical_siege_oxybeles_packed.xml

	cart_siege_oxybeles_unpacked.xml
	cart_mechanical_siege_oxybeles_unpacked.xml

gaul_mechanical_siege_ram.xml

gaul_ship_fishing.xml

gaul_ship_merchant.xml

gaul_ship_trireme.xml

	gaul_siege_ram.xml
	gaul_mechanical_siege_ram.xml

iber_mechanical_siege_ram.xml

iber_ship_fire.xml

iber_ship_fishing.xml

iber_ship_merchant.xml

iber_ship_trireme.xml

	iber_siege_ram.xml
	iber_mechanical_siege_ram.xml

kush_mechanical_siege_tower.xml

kush_ship_bireme.xml

kush_ship_fishing.xml

kush_ship_merchant.xml

kush_ship_trireme.xml

	kush_siege_tower.xml
	kush_mechanical_siege_tower.xml

mace_mechanical_siege_lithobolos_packed.xml

mace_mechanical_siege_lithobolos_unpacked.xml

mace_mechanical_siege_oxybeles_packed.xml

mace_mechanical_siege_oxybeles_unpacked.xml

mace_mechanical_siege_ram.xml

mace_mechanical_siege_tower.xml

mace_ship_bireme.xml

mace_ship_fishing.xml

mace_ship_merchant.xml

mace_ship_trireme.xml

	mace_siege_lithobolos_packed.xml
	mace_mechanical_siege_lithobolos_packed.xml

	mace_siege_lithobolos_unpacked.xml
	sele_mechanical_siege_lithobolos_unpacked.xml

	mace_siege_oxybeles_packed.xml
	mace_mechanical_siege_oxybeles_packed.xml

	mace_siege_oxybeles_unpacked.xml
	spart_mechanical_siege_oxybeles_unpacked.xml

	mace_siege_ram.xml
	mace_mechanical_siege_ram.xml

	mace_siege_tower.xml
	mace_mechanical_siege_tower.xml

maur_mechanical_siege_ram.xml

maur_ship_bireme.xml

maur_ship_fishing.xml

maur_ship_merchant.xml

maur_ship_trireme.xml

	maur_siege_ram.xml
	maur_mechanical_siege_ram.xml

noldor_ship_bireme.xml

pers_mechanical_siege_ram.xml

pers_ship_bireme.xml

pers_ship_fishing.xml

pers_ship_merchant.xml

pers_ship_trireme.xml

	pers_siege_ram.xml
	pers_mechanical_siege_ram.xml

ptol_champion_juggernaut.xml

ptol_mechanical_siege_lithobolos_packed.xml

ptol_mechanical_siege_lithobolos_unpacked.xml

ptol_mechanical_siege_polybolos_packed.xml

ptol_mechanical_siege_polybolos_unpacked.xml

ptol_mechanical_siege_tower.xml

ptol_ship_bireme.xml

ptol_ship_fishing.xml

ptol_ship_merchant.xml

ptol_ship_quinquereme.xml

ptol_ship_trireme.xml

	ptol_siege_lithobolos_packed.xml
	ptol_mechanical_siege_lithobolos_packed.xml

	ptol_siege_lithobolos_unpacked.xml
	ptol_mechanical_siege_lithobolos_unpacked.xml

	ptol_siege_polybolos_packed.xml
	ptol_mechanical_siege_polybolos_packed.xml

	ptol_siege_polybolos_unpacked.xml
	ptol_mechanical_siege_polybolos_unpacked.xml

	ptol_siege_tower.xml
	ptol_mechanical_siege_tower.xml

rome_mechanical_siege_ballista_packed.xml

rome_mechanical_siege_ballista_unpacked.xml

rome_mechanical_siege_onager.xml

rome_mechanical_siege_ram.xml

rome_mechanical_siege_scorpio_packed.xml

rome_mechanical_siege_scorpio_unpacked.xml

rome_ship_bireme.xml

rome_ship_fishing.xml

rome_ship_merchant.xml

rome_ship_quinquereme.xml

rome_ship_trireme.xml

	rome_siege_ballista_packed.xml
	rome_mechanical_siege_ballista_packed.xml

	rome_siege_ballista_unpacked.xml
	rome_mechanical_siege_ballista_unpacked.xml

	rome_siege_onager.xml
	rome_mechanical_siege_onager.xml

	rome_siege_ram.xml
	rome_mechanical_siege_ram.xml

	rome_siege_scorpio_packed.xml
	rome_mechanical_siege_scorpio_packed.xml

	rome_siege_scorpio_unpacked.xml
	rome_mechanical_siege_scorpio_unpacked.xml

sele_mechanical_siege_lithobolos_packed.xml

sele_mechanical_siege_lithobolos_unpacked.xml

sele_mechanical_siege_tower.xml

sele_ship_bireme.xml

sele_ship_fishing.xml

sele_ship_merchant.xml

sele_ship_quinquereme.xml

sele_ship_trireme.xml

	sele_siege_lithobolos_packed.xml
	sele_mechanical_siege_lithobolos_packed.xml

	sele_siege_lithobolos_unpacked.xml
	mace_mechanical_siege_lithobolos_unpacked.xml

	sele_siege_tower.xml
	sele_mechanical_siege_tower.xml

spart_mechanical_siege_oxybeles_packed.xml

spart_mechanical_siege_oxybeles_unpacked.xml

spart_mechanical_siege_ram.xml

spart_ship_bireme.xml

spart_ship_fishing.xml

spart_ship_merchant.xml

spart_ship_trireme.xml

	spart_siege_oxybeles_packed.xml
	spart_mechanical_siege_oxybeles_packed.xml

	spart_siege_oxybeles_unpacked.xml
	mace_mechanical_siege_oxybeles_unpacked.xml

	spart_siege_ram.xml
	spart_mechanical_siege_ram.xml

theb_mechanical_siege_fireraiser.xml

	theb_siege_fireraiser.xml
	theb_mechanical_siege_fireraiser.xml

Rename generic ballista template to boltshooter and onager to stonethrower to…AuditedrP22204Actions

Description

Details

Event Timeline

Changes (176)

rP22204

ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json

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

ps/trunk/binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Pathfinding_terrain_demo.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml

ps/trunk/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_mechanical_siege_ram.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_merchant.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_siege_ram.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_bireme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml

ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_mechanical_siege_ram.xml

Rename generic ballista template to boltshooter and onager to stonethrower to…
AuditedrP22204
Actions