Index: binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml
===================================================================
--- binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml
+++ binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml
@@ -1,15 +0,0 @@
-
-
- 1
- owner
- 1
- 30
- 1
- 0
- 1
- 1
- 1
- 1
- audio/interface/complete/building
- complete_cavalry_stables.ogg
-
Index: binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stable.xml
===================================================================
--- binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stable.xml
+++ binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stable.xml
@@ -11,5 +11,5 @@
1
1
audio/interface/complete/building
- complete_elephant_stables.ogg
+ complete_elephant_stable.ogg
Index: binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml
+++ binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml
@@ -1,15 +0,0 @@
-
-
- 1
- owner
- 1
- 30
- 1
- 0
- 1
- 1
- 1
- 1
- audio/interface/complete/building
- complete_elephant_stables.ogg
-
Index: binaries/data/mods/public/audio/interface/complete/building/complete_stable.xml
===================================================================
--- binaries/data/mods/public/audio/interface/complete/building/complete_stable.xml
+++ binaries/data/mods/public/audio/interface/complete/building/complete_stable.xml
@@ -11,5 +11,5 @@
1
1
audio/interface/complete/building
- complete_cavalry_stables.ogg
+ complete_stable.ogg
Index: binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml
===================================================================
--- binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml
+++ binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml
@@ -1,14 +0,0 @@
-
-
- 1
- 1
- 70
- 1
- 0
- 1
- 1
- 1
- 1
- audio/interface/select/building
- sel_cavalry_stables.ogg
-
Index: binaries/data/mods/public/audio/interface/select/building/sel_elephant_stable.xml
===================================================================
--- binaries/data/mods/public/audio/interface/select/building/sel_elephant_stable.xml
+++ binaries/data/mods/public/audio/interface/select/building/sel_elephant_stable.xml
@@ -10,5 +10,5 @@
1
1
audio/interface/select/building
- sel_elephant_stables.ogg
+ sel_elephant_stable.ogg
Index: binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml
+++ binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml
@@ -1,14 +0,0 @@
-
-
- 1
- 1
- 70
- 1
- 0
- 1
- 1
- 1
- 1
- audio/interface/select/building
- sel_elephant_stables.ogg
-
Index: binaries/data/mods/public/audio/interface/select/building/sel_stable.xml
===================================================================
--- binaries/data/mods/public/audio/interface/select/building/sel_stable.xml
+++ binaries/data/mods/public/audio/interface/select/building/sel_stable.xml
@@ -10,5 +10,5 @@
1
1
audio/interface/select/building
- sel_cavalry_stables.ogg
+ sel_stable.ogg
Index: binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- binaries/data/mods/public/maps/random/jebel_barkal.js
+++ binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -77,7 +77,7 @@
const oCivicCenter = "structures/kush/civil_centre";
const oBarracks = "structures/kush/barracks";
const oStable = "structures/kush/stable";
-const oElephantStables = "structures/kush/elephant_stables";
+const oElephantStable = "structures/kush/elephant_stable";
const oWallMedium = "structures/kush/wall_medium";
const oWallGate = "structures/kush/wall_gate";
const oWallTower = "structures/kush/wall_tower";
@@ -183,7 +183,7 @@
const clHouse = g_Map.createTileClass();
const clForge = g_Map.createTileClass();
const clStable = g_Map.createTileClass();
-const clElephantStables = g_Map.createTileClass();
+const clElephantStable = g_Map.createTileClass();
const clCivicCenter = g_Map.createTileClass();
const clBarracks = g_Map.createTileClass();
const clBlemmyeCamp = g_Map.createTileClass();
@@ -270,10 +270,10 @@
"painters": new TileClassPainter(clCivicCenter)
},
{
- "templateName": oElephantStables,
+ "templateName": oElephantStable,
"difficulty": "Easy",
- "constraints": avoidClasses(clElephantStables, 10),
- "painters": new TileClassPainter(clElephantStables)
+ "constraints": avoidClasses(clElephantStable, 10),
+ "painters": new TileClassPainter(clElephantStable)
},
{
"templateName": oStable,
@@ -1062,7 +1062,7 @@
clFortress, 1,
clHouse, 1,
clForge, 1,
- clElephantStables, 1,
+ clElephantStable, 1,
clStable, 1,
clCivicCenter, 1,
clBarracks, 1,
@@ -1078,7 +1078,7 @@
undefined,
[
new StayAreasConstraint([areaCityBushes]),
- avoidClasses(clElephantStables, 3)
+ avoidClasses(clElephantStable, 3)
]);
g_Map.log("Placing city palms");
Index: binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12448,7 +12448,7 @@
- structures/kush/elephant_stables
+ structures/kush/elephant_stable
1
Index: binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
@@ -29826,7 +29826,7 @@
- structures/maur/elephant_stables
+ structures/maur/elephant_stable
1
Index: binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -62832,7 +62832,7 @@
- structures/maur/elephant_stables
+ structures/maur/elephant_stable
0
@@ -101337,7 +101337,7 @@
- structures/kush/elephant_stables
+ structures/kush/elephant_stable
2
Index: binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1910,7 +1910,7 @@
};
/**
- * Deals with constructing military buildings (barracks, stables…)
+ * Deals with constructing military buildings (e.g. barracks, stable).
* They are mostly defined by Config.js. This is unreliable since changes could be done easily.
*/
PETRA.HQ.prototype.constructTrainingBuildings = function(gameState, queues)
@@ -1933,7 +1933,7 @@
if (this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks1 ||
this.phasing == 2 && gameState.getOwnStructures().filter(API3.Filters.byClass("Village")).length < 5)
{
- // first barracks/range and stables.
+ // First barracks/range and stable.
if (numBarracks + numRanges == 0)
{
let template = barracksTemplate || rangeTemplate;
@@ -1952,7 +1952,7 @@
return;
}
- // Second range/barracks and stables
+ // Second barracks/range and stable.
if (numBarracks + numRanges == 1 && this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks2)
{
let template = numBarracks == 0 ? (barracksTemplate || rangeTemplate) : (rangeTemplate || barracksTemplate);
@@ -1968,7 +1968,7 @@
return;
}
- // Then 3rd barracks/range/stables if needed
+ // Third barracks/range and stable, if needed.
if (numBarracks + numRanges + numStables == 2 && this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks2 + 30)
{
let template = barracksTemplate || stableTemplate || rangeTemplate;
@@ -1986,9 +1986,9 @@
if (this.currentPhase < 3)
return;
- if (this.canBuild(gameState, "structures/{civ}/elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities())
+ if (this.canBuild(gameState, "structures/{civ}/elephant_stable") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities())
{
- queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}/elephant_stables", { "militaryBase": true }));
+ queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}/elephant_stable", { "militaryBase": true }));
return;
}
Index: binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
+++ binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
@@ -316,7 +316,7 @@
let radius = 0;
if (template.hasClass("Fortress") || template.hasClass("Arsenal") ||
- this.type == gameState.applyCiv("structures/{civ}/elephant_stables"))
+ this.type == gameState.applyCiv("structures/{civ}/elephant_stable"))
radius = Math.floor((template.obstructionRadius().max + 8) / obstructions.cellSize);
else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") &&
!template.hasClass("Field") && !template.hasClass("Market"))
Index: binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
cart
Index: binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
@@ -1,9 +0,0 @@
-
-
-
- cart
-
-
- structures/carthaginians/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
kush
Ỉḥ Abu
Index: binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
@@ -1,10 +0,0 @@
-
-
-
- kush
- Ỉḥ Abu
-
-
- structures/kushites/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
maur
Vāraṇaśālā
Index: binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
@@ -1,13 +0,0 @@
-
-
-
- maur
- Vāraṇaśālā
- phase_town
- CivSpecific
- -City Town
-
-
- structures/mauryas/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
pers
Index: binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
@@ -1,9 +0,0 @@
-
-
-
- pers
-
-
- structures/persians/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
ptol
Stathmos tōn Elepantōn
Index: binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
@@ -1,10 +0,0 @@
-
-
-
- ptol
- Stathmos tōn Elepantōn
-
-
- structures/ptolemies/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
@@ -1,5 +1,5 @@
-
+
sele
Stathmos tōn Elepantōn
Index: binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
@@ -1,10 +0,0 @@
-
-
-
- sele
- Stathmos tōn Elepantōn
-
-
- structures/seleucids/stable_elephant.xml
-
-
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -27,7 +27,7 @@
template_structure_military_barracks
Train Infantry and research Infantry technologies.
Village Barracks
- structures/pers_barracks.png
+ structures/barracks.png
phase_village
Index: binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml
@@ -21,7 +21,7 @@
Elephant Stable
- template_structure_military_elephant_stables
+ template_structure_military_elephant_stable
Train Elephants and research Elephant technologies.
City ElephantStable
phase_city
@@ -44,8 +44,8 @@
- interface/complete/building/complete_elephant_stables.xml
-
+ interface/complete/building/complete_elephant_stable.xml
+
Index: binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -1,60 +0,0 @@
-
-
-
- 180
-
- 200
- 200
-
-
-
-
- 8.0
-
-
- 5
- Elephant
-
-
- 3000
- decay|rubble/rubble_stone_6x6
-
-
- Elephant Stable
- template_structure_military_elephant_stables
- Train Elephants and research Elephant technologies.
- City ElephantStable
- phase_city
- structures/stable_elephant.png
-
-
- 40
- 40
-
-
-
-
-
- 0.7
-
- units/{civ}/support_elephant
- units/{civ}/elephant_archer_b
- units/{civ}/champion_elephant
-
-
-
-
- interface/complete/building/complete_elephant_stables.xml
-
-
-
-
- 38
-
-
- 40
-
-
- structures/fndn_9x8.xml
-
-
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -24,7 +24,7 @@
template_structure_military_stable
Train Cavalry and research Cavalry technologies.
Village Stable
- structures/pers_stable.png
+ structures/stable.png
phase_village
@@ -58,8 +58,8 @@
-
- interface/complete/building/complete_cavalry_stables.xml
+
+ interface/complete/building/complete_stable.xml
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -31,7 +31,7 @@
structures/{civ}/dock
structures/{civ}/barracks
structures/{civ}/stable
- structures/{civ}/elephant_stables
+ structures/{civ}/elephant_stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple
Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -35,7 +35,7 @@
structures/{civ}/dock
structures/{civ}/barracks
structures/{civ}/stable
- structures/{civ}/elephant_stables
+ structures/{civ}/elephant_stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -15,7 +15,7 @@
structures/{civ}/dock
structures/{civ}/barracks
structures/{civ}/stable
- structures/{civ}/elephant_stables
+ structures/{civ}/elephant_stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple