From 77a2f484a22f72728f9c4705bbab650fb4966db4 Mon Sep 17 00:00:00 2001 From: bb Date: Wed, 15 Nov 2017 21:16:17 +0000 Subject: [PATCH] Rearrange tower templates Rename tower techs to tower_{tech} Remove duplication in tower templates Create tower parent, with sentry, stone and outpost as childs Move all outpost as child of tower Add a sentry tower default building refs #4849 Patch By: Nescio Differential Revision: https://code.wildfiregames.com/D914 This was SVN commit r20459. --- .../attack_tower_crenellations.json | 13 ----- .../technologies/attack_tower_defense.json | 15 ----- .../attack_tower_murderholes.json | 13 ----- .../data/technologies/attack_tower_range.json | 16 ------ .../data/technologies/attack_tower_watch.json | 21 ------- .../data/technologies/decay_outpost.json | 13 ----- .../data/technologies/tower_armour.json | 17 ++++++ .../technologies/tower_crenellations.json | 15 +++++ .../data/technologies/tower_decay.json | 15 +++++ .../data/technologies/tower_murderholes.json | 15 +++++ .../data/technologies/tower_range.json | 16 ++++++ .../data/technologies/tower_vision.json | 14 +++++ .../data/technologies/tower_watch.json | 23 ++++++++ .../data/technologies/vision_outpost.json | 12 ---- .../templates/other/palisades_rocks_fort.xml | 2 +- .../structures/default_defense_tower.xml | 2 +- .../skirmish/structures/default_outpost.xml | 2 +- .../structures/default_sentry_tower.xml | 12 ++++ .../structures/athen_defense_tower.xml | 4 +- .../templates/structures/athen_outpost.xml | 2 +- .../structures/athen_sentry_tower.xml | 2 +- .../structures/baby_defense_tower.xml | 4 +- .../structures/brit_defense_tower.xml | 5 +- .../templates/structures/brit_outpost.xml | 2 +- .../structures/brit_sentry_tower.xml | 2 +- .../structures/cart_defense_tower.xml | 4 +- .../templates/structures/cart_outpost.xml | 2 +- .../structures/cart_sentry_tower.xml | 2 +- .../structures/gaul_defense_tower.xml | 5 +- .../templates/structures/gaul_outpost.xml | 2 +- .../structures/gaul_sentry_tower.xml | 2 +- .../structures/iber_defense_tower.xml | 4 +- .../templates/structures/iber_outpost.xml | 2 +- .../structures/iber_sentry_tower.xml | 2 +- .../structures/mace_defense_tower.xml | 4 +- .../templates/structures/mace_outpost.xml | 2 +- .../structures/mace_sentry_tower.xml | 2 +- .../structures/maur_defense_tower.xml | 4 +- .../templates/structures/maur_outpost.xml | 2 +- .../structures/maur_sentry_tower.xml | 2 +- .../structures/pers_defense_tower.xml | 4 +- .../templates/structures/pers_outpost.xml | 2 +- .../structures/pers_sentry_tower.xml | 2 +- .../structures/ptol_defense_tower.xml | 4 +- .../templates/structures/ptol_outpost.xml | 2 +- .../structures/ptol_sentry_tower.xml | 2 +- .../structures/rome_defense_tower.xml | 4 +- .../templates/structures/rome_outpost.xml | 2 +- .../structures/rome_sentry_tower.xml | 2 +- .../structures/sele_defense_tower.xml | 4 +- .../templates/structures/sele_outpost.xml | 2 +- .../structures/sele_sentry_tower.xml | 2 +- .../structures/spart_defense_tower.xml | 4 +- .../templates/structures/spart_outpost.xml | 2 +- .../structures/spart_sentry_tower.xml | 2 +- ...l => template_structure_defense_tower.xml} | 51 ++--------------- ...plate_structure_defense_tower_outpost.xml} | 49 +++------------- ...mplate_structure_defense_tower_sentry.xml} | 38 +++++-------- ...template_structure_defense_tower_stone.xml | 57 +++++++++++++++++++ 59 files changed, 259 insertions(+), 274 deletions(-) delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/decay_outpost.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_armour.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_decay.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_range.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_vision.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/tower_watch.json delete mode 100644 binaries/data/mods/public/simulation/data/technologies/vision_outpost.json create mode 100644 binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml rename binaries/data/mods/public/simulation/templates/{template_structure_defense_defense_tower.xml => template_structure_defense_tower.xml} (57%) rename binaries/data/mods/public/simulation/templates/{template_structure_defense_outpost.xml => template_structure_defense_tower_outpost.xml} (50%) rename binaries/data/mods/public/simulation/templates/{template_structure_defense_sentry_tower.xml => template_structure_defense_tower_sentry.xml} (61%) create mode 100644 binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json deleted file mode 100644 index 9728e5324e..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "genericName": "Crenellations", - "description": "Crenellations on the battlements allow soldiers wider range of fire in defending a keep.", - "cost": {"food": 0, "wood": 0, "stone": 500, "metal": 250}, - "requirements": {"tech": "phase_town"}, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "crenelations.png", - "researchTime": 40, - "tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.", - "modifications": [{"value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4}], - "affects": ["DefenseTower"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json deleted file mode 100644 index 1a54964f14..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "genericName": "Sturdy Foundations", - "description": "Reinforce the foundations in preparation of an attack.", - "cost": {"food": 0, "wood": 500, "stone": 500, "metal": 500}, - "requirements": {"tech": "phase_city"}, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "architecture.png", - "researchTime": 40, - "tooltip": "Increases armor level of the defense tower by 2 levels.", - "modifications": [{"value": "Armour/Hack", "add": 2}, - {"value": "Armour/Pierce", "add": 2}, - {"value": "Armour/Crush", "add": 2}], - "affects": ["DefenseTower"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json deleted file mode 100644 index 29a055c684..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "genericName": "Murder Holes", - "description": "Murder holes allow hitting enemies at the foot of the tower.", - "cost": {"food": 0, "wood": 250, "stone": 100, "metal": 0}, - "requirements": {"tech": "phase_city"}, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "murder_holes.png", - "researchTime": 40, - "tooltip": "Removes defense tower minimum range.", - "modifications": [{"value": "Attack/Ranged/MinRange", "replace": 0}], - "affects": ["DefenseTower"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json deleted file mode 100644 index 92cfa3a2dc..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "genericName": "Arrow Shooters", - "description": "Arrow shooters increase the maximum range of the fire arrows.", - "cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250}, - "requirements": {"tech": "phase_town"}, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "arrow.png", - "researchTime": 40, - "tooltip": "Increases defense tower maximum range by 8 meters.", - "modifications": [ - { "value": "Attack/Ranged/MaxRange", "add": 8 }, - { "value": "Vision/Range","add": 8 } - ], - "affects": ["DefenseTower"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json deleted file mode 100644 index cbe69a560f..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "genericName": "Sentries", - "specificName": { - "mace": "Nyktophýlakes", - "spart": "Nyktophýlakes", - "athen": "Nyktophýlakes", - "ptol": "Nyktophýlakes", - "sele": "Nyktophýlakes", - "rome": "Vigiles" - }, - "description": "A night's watch increases vigilance.", - "cost": {"food": 500, "wood": 0, "stone": 0, "metal": 0}, - "requirements": {"tech": "phase_village"}, - "requirementsTooltip": "Unlocked in Village Phase.", - "icon": "helmet_corinthian_bronze.png", - "researchTime": 40, - "tooltip": "Post sentries to add one arrow to towers.", - "modifications": [{"value": "BuildingAI/DefaultArrowCount", "add": 1.0}], - "affects": ["DefenseTower"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/decay_outpost.json b/binaries/data/mods/public/simulation/data/technologies/decay_outpost.json deleted file mode 100644 index 68605ca4f2..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/decay_outpost.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "genericName": "Stone Foundations", - "description": "Outposts survive twice as long in neutral territory.", - "cost": {"food": 0, "wood": 0, "stone": 100, "metal": 0}, - "requirements": {"tech": "phase_village"}, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "blocks_three.png", - "researchTime": 40, - "tooltip": "Territory decay rate -50% for outposts.", - "modifications": [{"value": "TerritoryDecay/DecayRate", "multiply": 0.5}], - "affects": ["Outpost"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_armour.json b/binaries/data/mods/public/simulation/data/technologies/tower_armour.json new file mode 100644 index 0000000000..eaed89cdc3 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_armour.json @@ -0,0 +1,17 @@ +{ + "genericName": "Sturdy Foundations", + "description": "Reinforce the foundations in preparation of an attack.", + "cost": { "food": 0, "wood": 500, "stone": 500, "metal": 500 }, + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "architecture.png", + "researchTime": 40, + "tooltip": "Increases armor of defensive towers by 2 levels.", + "modifications": [ + { "value": "Armour/Hack", "add": 2 }, + { "value": "Armour/Pierce", "add": 2 }, + { "value": "Armour/Crush", "add": 2 } + ], + "affects": ["DefenseTower"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json b/binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json new file mode 100644 index 0000000000..67637a4b0f --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json @@ -0,0 +1,15 @@ +{ + "genericName": "Crenellations", + "description": "Crenellations on the battlements allow soldiers wider range of fire in defending a keep.", + "cost": { "food": 0, "wood": 0, "stone": 500, "metal": 250 }, + "requirements": { "tech": "phase_town" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "crenelations.png", + "researchTime": 40, + "tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.", + "modifications": [ + { "value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4 } + ], + "affects": ["DefenseTower"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_decay.json b/binaries/data/mods/public/simulation/data/technologies/tower_decay.json new file mode 100644 index 0000000000..6112690f03 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_decay.json @@ -0,0 +1,15 @@ +{ + "genericName": "Stone Foundations", + "description": "Outposts survive twice as long in neutral territory.", + "cost": { "food": 0, "wood": 0, "stone": 100, "metal": 0 }, + "requirements": { "tech": "phase_village" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "blocks_three.png", + "researchTime": 40, + "tooltip": "Outposts -50% territory decay rate.", + "modifications": [ + { "value": "TerritoryDecay/DecayRate", "multiply": 0.5 } + ], + "affects": ["Outpost"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json b/binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json new file mode 100644 index 0000000000..36606768bd --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json @@ -0,0 +1,15 @@ +{ + "genericName": "Murder Holes", + "description": "Murder holes allow hitting enemies at the foot of the tower.", + "cost": { "food": 0, "wood": 250, "stone": 100, "metal": 0 }, + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "murder_holes.png", + "researchTime": 40, + "tooltip": "Removes defensive towers' minimum range.", + "modifications": [ + { "value": "Attack/Ranged/MinRange", "replace": 0 } + ], + "affects": ["DefenseTower"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_range.json b/binaries/data/mods/public/simulation/data/technologies/tower_range.json new file mode 100644 index 0000000000..db82dd6b96 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_range.json @@ -0,0 +1,16 @@ +{ + "genericName": "Arrow Shooters", + "description": "Arrow shooters increase the maximum range of the fire arrows.", + "cost": { "food": 0, "wood": 500, "stone": 0, "metal": 250 }, + "requirements": { "tech": "phase_town" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "arrow.png", + "researchTime": 40, + "tooltip": "Increases defensive towers' maximum range by 8 meters.", + "modifications": [ + { "value": "Attack/Ranged/MaxRange", "add": 8 }, + { "value": "Vision/Range","add": 8 } + ], + "affects": ["DefenseTower"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_vision.json b/binaries/data/mods/public/simulation/data/technologies/tower_vision.json new file mode 100644 index 0000000000..20824dacf1 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_vision.json @@ -0,0 +1,14 @@ +{ + "genericName": "Carrier Pigeons", + "description": "Outposts gain longer vision for scouting.", + "cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 }, + "requirements": { "tech": "phase_village" }, + "icon": "pigeon.png", + "researchTime": 40, + "tooltip": "Outposts +50% vision range.", + "modifications": [ + { "value": "Vision/Range", "multiply": 1.5 } + ], + "affects": ["Outpost"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/tower_watch.json b/binaries/data/mods/public/simulation/data/technologies/tower_watch.json new file mode 100644 index 0000000000..959890fcb7 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/tower_watch.json @@ -0,0 +1,23 @@ +{ + "genericName": "Sentries", + "specificName": { + "mace": "Nyktophýlakes", + "spart": "Nyktophýlakes", + "athen": "Nyktophýlakes", + "ptol": "Nyktophýlakes", + "sele": "Nyktophýlakes", + "rome": "Vigiles" + }, + "description": "A night's watch increases vigilance.", + "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 }, + "requirements": { "tech": "phase_village" }, + "requirementsTooltip": "Unlocked in Village Phase.", + "icon": "helmet_corinthian_bronze.png", + "researchTime": 40, + "tooltip": "Post sentries to add one arrow to defensive towers.", + "modifications": [ + { "value": "BuildingAI/DefaultArrowCount", "add": 1 } + ], + "affects": ["DefenseTower"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/vision_outpost.json b/binaries/data/mods/public/simulation/data/technologies/vision_outpost.json deleted file mode 100644 index 59047c92e7..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/vision_outpost.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "genericName": "Carrier Pigeons", - "description": "Outposts gain longer vision for scouting.", - "cost": {"food": 100, "wood": 0, "stone": 0, "metal": 0}, - "requirements": {"tech": "phase_village"}, - "icon": "pigeon.png", - "researchTime": 40, - "tooltip": "Vision Range +50% for Outposts.", - "modifications": [{"value": "Vision/Range", "multiply": 1.5}], - "affects": ["Outpost"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml index 821d9fe0ed..f54b0468b7 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml @@ -1,5 +1,5 @@ - + gaia diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml index e580189d3c..50dfe7c778 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml @@ -1,5 +1,5 @@ - + 12.0 diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml index ee8be1b52e..c2dc2f3d47 100644 --- a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml @@ -1,5 +1,5 @@ - + skirm diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml new file mode 100644 index 0000000000..6dc41371d9 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml @@ -0,0 +1,12 @@ + + + + skirm + + + structures/{civ}_sentry_tower + + + structures/hellenes/wooden_tower.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml index f3269899f9..3afa5a09e5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 22.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml index c2feb7677a..03d0667df6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml @@ -1,5 +1,5 @@ - + athen Greek Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml index de24fff120..6b09feb4fc 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml @@ -1,5 +1,5 @@ - + athen diff --git a/binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml index 50ce32e1d3..00a1e27096 100644 --- a/binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml @@ -1,12 +1,10 @@  - + pers Pāyaud - 6.0 - 0.6 19.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml index 369ecd738e..2cc4ea98be 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml @@ -1,5 +1,5 @@ - + 10.0 @@ -11,6 +11,9 @@ + + 21.0 + structures/britons/scout_tower.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml index e45f00577f..195022cef7 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml @@ -1,5 +1,5 @@ - + brit Brythonic Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml index 40b1128f0e..3aa08b4e3f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml @@ -1,5 +1,5 @@ - + brit diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml index 2df159aef1..de049640a5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml @@ -1,5 +1,5 @@ - + 18.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 20.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml index c0234043a4..2d8d433365 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml @@ -1,5 +1,5 @@ - + cart Carthaginian Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml index 566f807907..8c18412182 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml @@ -1,5 +1,5 @@ - + cart diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml index e10ca3bf22..2dae6034ea 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -11,6 +11,9 @@ + + 21.0 + structures/gauls/scout_tower.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml index a23437625a..f557fd08e6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml @@ -1,5 +1,5 @@ - + gaul Gallic Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml index 7a178e5128..b34a19317d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml @@ -1,5 +1,5 @@ - + gaul diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml index ef0cae8734..4f07ce2a63 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml @@ -1,5 +1,5 @@ - + 12.0 @@ -35,8 +35,6 @@ - 6.0 - 0.6 17.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml index b6ec9351cb..f3cfebca1e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml @@ -1,5 +1,5 @@ - + iber Iberian Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml index 8e81829fb2..baac21a6ed 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml @@ -1,5 +1,5 @@ - + iber diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml index 632430980c..7a699479ca 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 22.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml index b67c36c181..b01907bf29 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml @@ -1,5 +1,5 @@ - + mace Greek Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml index 420650fde6..13c65dd87f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml @@ -1,5 +1,5 @@ - + mace diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml index 3c81d92339..aa6b08bfe0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml @@ -1,12 +1,10 @@ - + maur Udarka - 6.0 - 0.6 19.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml index af85e3c9c6..6d9c3680c8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml @@ -1,5 +1,5 @@ - + maur Uparaksana diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml index 3e744860b8..da7a474923 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml @@ -1,5 +1,5 @@ - + maur diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml index 6d93853e01..89319d8c2b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml @@ -1,12 +1,10 @@ - + pers Pāyaud - 6.0 - 0.6 19.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml index 38ec7ee89e..dd69d1fa9c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml @@ -1,5 +1,5 @@ - + pers Didebani diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml index 2b7a7f7491..d8c12d2a82 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml @@ -1,5 +1,5 @@ - + pers diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml index 8d4a384767..aed84c298c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml @@ -1,5 +1,5 @@ - + 18.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 22.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml index 01bf3e87f1..7d359f7c92 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml @@ -1,5 +1,5 @@ - + ptol mktr-n-ḫt diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml index 2e5336bedb..47b9d3acd6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml @@ -1,5 +1,5 @@ - + ptol diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml index 2d34ae7260..167826015d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 19.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml index 5dbd452d24..882ec631b6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml @@ -1,5 +1,5 @@ - + rome Vigilarium diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml index bf2ef6523d..4fb6ee9b94 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml @@ -1,5 +1,5 @@ - + rome diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml index a788262ee8..a09a18dba4 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 22.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml index bc08aa7d30..bf3536f8c5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml @@ -1,5 +1,5 @@ - + sele Prophylax diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml index 36815f6c31..375f0d776b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml @@ -1,5 +1,5 @@ - + sele diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml index c12774d712..9c44816d94 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml @@ -1,5 +1,5 @@ - + 15.0 @@ -12,8 +12,6 @@ - 6.0 - 0.6 22.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml index fedd93dd8e..cb43ac7614 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml @@ -1,5 +1,5 @@ - + spart Greek Outpost diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml index 4f4c9cd7ac..c56c1ada56 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml @@ -1,5 +1,5 @@ - + spart diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml similarity index 57% rename from binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml rename to binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml index 0d925b1b1a..e956b230a9 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml @@ -2,12 +2,9 @@ - 0.0 - 12.0 - 0.0 - 76.0 - 10.0 - 15 + 0 + 0 + 0 75.0 9.81 1200 @@ -29,19 +26,7 @@ 60 - - 150 - - 100 - 100 - - - - - 15.0 - - 5 0.1 Unit Support Infantry @@ -53,47 +38,23 @@ decay|rubble/rubble_stone_2x2 - Defense Tower - Shoots arrows. Garrison to provide extra defense. Needs the murder holes tech to protect its foot. - Tower GarrisonTower -ConquestCritical - Town DefenseTower - structures/defense_tower.png - phase_town + Tower -ConquestCritical - - 0 - 20 - - - - 0.7 - - attack_tower_watch - attack_tower_crenellations - attack_tower_range - attack_tower_murderholes - attack_tower_defense - - interface/complete/building/complete_tower.xml attack/destruction/building_collapse_large.xml + 6.0 0.6 - 21.0 + 18.0 - - false - 32 - 30000 - 80 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml similarity index 50% rename from binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml rename to binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml index 55a0abd3f3..c9f5a884c4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml @@ -1,5 +1,5 @@ - + 5 20 @@ -12,22 +12,14 @@ - 0.0 - 16.0 - 0.0 - 55.0 - 13.0 - 75.0 - 9.81 - 1200 - 2000 - 1.5 - 0 - Human + 16 + 55 + 13 + 0 - 1 + 0 Outpost @@ -41,7 +33,6 @@ 40 80 - 0 @@ -50,20 +41,13 @@ 1 - 0.1 - Unit - Support Infantry - 0 - 2 800 - decay|rubble/rubble_stone_2x2 Outpost Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory. - -ConquestCritical Village Outpost structures/outpost.png @@ -74,32 +58,15 @@ - 0.7 - vision_outpost - decay_outpost + tower_vision + tower_decay - - - - interface/complete/building/complete_tower.xml - attack/destruction/building_collapse_large.xml - - - - 6.0 - 0.6 - 18.0 - 2 - - 80 - props/special/palisade_rocks_outpost.xml - structures/fndn_2x2.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml similarity index 61% rename from binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml rename to binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml index bc4514924b..c21885e099 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml @@ -1,18 +1,16 @@ - + - -5.0 - -5.0 - -2.0 + -5 + -5 + -2 - 0.0 - 9.0 - 0.0 - 70.0 - 0.0 - 9.0 + 9 + 70 + 0 + 9 @@ -22,7 +20,6 @@ 40 100 - 0 @@ -36,32 +33,27 @@ 250 - Sentry Tower Sentry Tower structures/sentry_tower.png - Village -Town SentryTower - phase_village + GarrisonTower + Village DefenseTower SentryTower + Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. Upgradeable to stone tower. 20 - 0 - -attack_tower_crenellations - -attack_tower_range - -attack_tower_murderholes - -attack_tower_defense + tower_watch - - 18.0 - - 0.5 + false + 16 + 30000 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml new file mode 100644 index 0000000000..22c1be1db9 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml @@ -0,0 +1,57 @@ + + + + + 12 + 76 + 10 + 15 + + + + 150 + + 100 + 100 + + + + + 15.0 + + + 5 + + + 1000 + + + Defense Tower + Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. + GarrisonTower + Town DefenseTower StoneTower + structures/defense_tower.png + phase_town + + + 0 + 20 + + + + + + + tower_watch + tower_crenellations + tower_range + tower_murderholes + tower_armour + + + + false + 32 + 30000 + +