Index: ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
@@ -6487,7 +6487,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -48403,7 +48403,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -66947,7 +66947,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -75144,7 +75144,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -76159,7 +76159,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -79303,7 +79303,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
@@ -88355,7 +88355,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
0
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12442,7 +12442,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
1
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -7355,7 +7355,7 @@
- structures/mace_workshop
+ structures/mace_arsenal
1
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -101323,7 +101323,7 @@
- structures/kush_workshop
+ structures/kush_arsenal
2
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1992,9 +1992,9 @@
return;
}
- if (this.canBuild(gameState, "structures/{civ}_workshop") && !gameState.getOwnEntitiesByClass("Workshop", true).hasEntities())
+ if (this.canBuild(gameState, "structures/{civ}_arsenal") && !gameState.getOwnEntitiesByClass("Arsenal", true).hasEntities())
{
- queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_workshop", { "militaryBase": true }));
+ queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_arsenal", { "militaryBase": true }));
return;
}
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
@@ -315,7 +315,7 @@
// obstructions.dumpIm(template.buildPlacementType() + "_obstructions.png");
let radius = 0;
- if (template.hasClass("Fortress") || template.hasClass("Workshop") ||
+ if (template.hasClass("Fortress") || template.hasClass("Arsenal") ||
this.type == gameState.applyCiv("structures/{civ}_elephant_stables"))
radius = Math.floor((template.obstructionRadius().max + 8) / obstructions.cellSize);
else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") &&
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
@@ -65,7 +65,7 @@
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
@@ -0,0 +1,9 @@
+{
+ "type": "garrisonedUnits",
+ "affects": ["Siege"],
+ "modifications": [
+ { "value": "Health/RegenRate", "add": 3 }
+ ],
+ "auraName": "Arsenal Repairs",
+ "auraDescription": "Garrisoned Siege Engines +3 health regeneration rate."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
@@ -1,9 +0,0 @@
-{
- "type": "garrisonedUnits",
- "affects": ["Siege"],
- "modifications": [
- { "value": "Health/RegenRate", "add": 3 }
- ],
- "auraName": "Workshop Repairs",
- "auraDescription": "Garrisoned Siege Engines +3 health regeneration rate."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
@@ -0,0 +1,13 @@
+
+
+
+ skirm
+
+
+
+ structures/{civ}_arsenal
+
+
+ structures/hellenes/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
@@ -1,13 +0,0 @@
-
-
-
- skirm
-
-
-
- structures/{civ}_workshop
-
-
- structures/hellenes/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ athen
+ Hoplothēkē
+
+
+ structures/hellenes/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- athen
- Hoplothēkē
-
-
- structures/hellenes/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ brit
+ Miletucerdon
+
+
+ structures/britons/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- brit
- Miletucerdon
-
-
- structures/britons/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
@@ -0,0 +1,9 @@
+
+
+
+ cart
+
+
+ structures/carthaginians/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
@@ -1,9 +0,0 @@
-
-
-
- cart
-
-
- structures/carthaginians/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ gaul
+ Miletucerdon
+
+
+ structures/gauls/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- gaul
- Miletucerdon
-
-
- structures/gauls/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
@@ -0,0 +1,9 @@
+
+
+
+ iber
+
+
+ structures/iberians/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
@@ -1,9 +0,0 @@
-
-
-
- iber
-
-
- structures/iberians/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ kush
+ Pr-ỉwn n ms
+
+
+ structures/kushites/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- kush
- Pr-ỉwn n ms
-
-
- structures/kushites/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ mace
+ Hoplothēkē
+
+
+ structures/hellenes/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- mace
- Hoplothēkē
-
-
- structures/hellenes/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
@@ -0,0 +1,9 @@
+
+
+
+ maur
+
+
+ structures/mauryas/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
@@ -1,9 +0,0 @@
-
-
-
- maur
-
-
- structures/mauryas/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
@@ -0,0 +1,9 @@
+
+
+
+ pers
+
+
+ structures/persians/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
@@ -1,9 +0,0 @@
-
-
-
- pers
-
-
- structures/persians/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ ptol
+ Hoplothēkē
+
+
+ structures/ptolemies/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- ptol
- Hoplothēkē
-
-
- structures/ptolemies/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ rome
+ Ballistārium
+
+
+ structures/romans/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- rome
- Ballistārium
-
-
- structures/romans/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ sele
+ Hoplothēkē
+
+
+ structures/seleucids/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- sele
- Hoplothēkē
-
-
- structures/seleucids/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
@@ -0,0 +1,10 @@
+
+
+
+ spart
+ Hoplothēkē
+
+
+ structures/spartans/workshop.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
@@ -1,10 +0,0 @@
-
-
-
- spart
- Hoplothēkē
-
-
- structures/spartans/workshop.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
@@ -0,0 +1,70 @@
+
+
+
+ structures/arsenal_repair
+
+
+ 180
+
+ 300
+
+
+
+
+ 12.0
+
+
+ 2
+ Siege
+
+
+ 2000
+ decay|rubble/rubble_stone_5x5
+
+
+ Arsenal
+ template_structure_military_arsenal
+ Train Champion Infantry Crossbowmen, construct Siege Engines, and research Siege Engine technologies.
+ City Arsenal
+ structures/siege_workshop.png
+ phase_city
+
+
+ 60
+
+
+
+
+
+ 0.7
+
+ units/{civ}_champion_infantry_crossbowman
+ units/{civ}_siege_scorpio_packed
+ units/{civ}_siege_polybolos_packed
+ units/{civ}_siege_oxybeles_packed
+ units/{civ}_siege_lithobolos_packed
+ units/{civ}_siege_ballista_packed
+ units/{civ}_siege_ram
+ units/{civ}_siege_tower
+
+
+ siege_attack
+ siege_armor
+ siege_cost_metal
+ siege_cost_wood
+ siege_bolt_accuracy
+
+
+
+
+ interface/complete/building/complete_barracks.xml
+
+
+
+
+ 38
+
+
+ structures/fndn_8x8.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -1,70 +0,0 @@
-
-
-
- structures/workshop_repair
-
-
- 180
-
- 300
-
-
-
-
- 12.0
-
-
- 2
- Siege
-
-
- 2000
- decay|rubble/rubble_stone_5x5
-
-
- Siege Workshop
- template_structure_military_workshop
- Train Champion Infantry Crossbowmen, construct Siege Engines, and research Siege Engine technologies.
- City Workshop
- structures/siege_workshop.png
- phase_city
-
-
- 60
-
-
-
-
-
- 0.7
-
- units/{civ}_champion_infantry_crossbowman
- units/{civ}_siege_scorpio_packed
- units/{civ}_siege_polybolos_packed
- units/{civ}_siege_oxybeles_packed
- units/{civ}_siege_lithobolos_packed
- units/{civ}_siege_ballista_packed
- units/{civ}_siege_ram
- units/{civ}_siege_tower
-
-
- siege_attack
- siege_armor
- siege_cost_metal
- siege_cost_wood
- siege_bolt_accuracy
-
-
-
-
- interface/complete/building/complete_barracks.xml
-
-
-
-
- 38
-
-
- structures/fndn_8x8.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -42,7 +42,7 @@
structures/{civ}_market
structures/{civ}_defense_tower
structures/{civ}_wallset_stone
- structures/{civ}_workshop
+ structures/{civ}_arsenal
structures/{civ}_fortress
structures/{civ}_wonder
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -44,7 +44,7 @@
structures/{civ}_market
structures/{civ}_defense_tower
structures/{civ}_wallset_stone
- structures/{civ}_workshop
+ structures/{civ}_arsenal
structures/{civ}_fortress
structures/{civ}_wonder
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -21,7 +21,7 @@
structures/{civ}_market
structures/{civ}_defense_tower
structures/{civ}_wallset_stone
- structures/{civ}_workshop
+ structures/{civ}_arsenal
structures/{civ}_fortress
structures/{civ}_wonder