Index: binaries/data/mods/public/art/actors/props/special/palisade_rocks_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/props/special/palisade_rocks_long.xml
+++ binaries/data/mods/public/art/actors/props/special/palisade_rocks_long.xml
@@ -1,14 +1,32 @@
-
-
props/palisade_rocks_long.dae
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ default.xml
\ No newline at end of file
Index: binaries/data/mods/public/art/actors/structures/britons/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/britons/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/britons/wall_long.xml
@@ -22,8 +22,13 @@
-
-
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_long.xml
@@ -15,7 +15,7 @@
-
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wooden_tower.xml
@@ -27,7 +27,7 @@
-
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/scout_tower.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/short_wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/short_wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/short_wall_long.xml
@@ -13,6 +13,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/wall_long.xml
@@ -19,6 +19,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/carthaginians/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/wooden_tower.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/gauls/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/gauls/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/gauls/wall_long.xml
@@ -13,6 +13,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/hellenes/scout_tower.xml
@@ -23,6 +23,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/hellenes/wall_long.xml
@@ -5,14 +5,23 @@
structural/hele_wall_long.dae
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/hellenes/wooden_tower.xml
@@ -22,6 +22,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/iberians/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/iberians/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/iberians/scout_tower.xml
@@ -25,6 +25,15 @@
+
+
+
+
+
+
+
+
+
structural/iber_tower_1.dae
Index: binaries/data/mods/public/art/actors/structures/iberians/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/iberians/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/iberians/wall_long.xml
@@ -12,6 +12,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/iberians/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/iberians/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/iberians/wooden_tower.xml
@@ -22,6 +22,15 @@
+
+
+
+
+
+
+
+
+
structural/iber_wooden_tower.dae
Index: binaries/data/mods/public/art/actors/structures/kushites/defense_tower_stone.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/defense_tower_stone.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/defense_tower_stone.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/kushites/defense_tower_wood.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/defense_tower_wood.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/defense_tower_wood.xml
@@ -20,6 +20,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/kushites/outpost_stone.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/outpost_stone.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/outpost_stone.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/kushites/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/scout_tower.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/kushites/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/wall_long.xml
@@ -13,6 +13,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/mauryas/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/mauryas/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/mauryas/scout_tower.xml
@@ -8,24 +8,39 @@
structural/maur_scout_tower.dae
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,12 +56,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/mauryas/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/mauryas/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/mauryas/wall_long.xml
@@ -4,26 +4,37 @@
structural/maur_wall_long_struct.dae
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
Index: binaries/data/mods/public/art/actors/structures/mauryas/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/mauryas/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/mauryas/wooden_tower.xml
@@ -21,6 +21,16 @@
+
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
@@ -27,6 +27,15 @@
+
+
+
+
+
+
+
+
+
@@ -45,5 +54,5 @@
- player_trans_ao_parallax_spec.xml
+ player_trans_ao_parallax_spec.xml
Index: binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
@@ -12,6 +12,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
@@ -24,6 +24,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
+++ binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
@@ -32,6 +32,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
@@ -22,6 +22,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
@@ -18,6 +18,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/romans/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/romans/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/romans/scout_tower.xml
@@ -37,6 +37,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/romans/siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/romans/siege_wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/romans/siege_wall_long.xml
@@ -15,5 +15,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
basic_trans_parallax_spec.xml
Index: binaries/data/mods/public/art/actors/structures/romans/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/romans/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/romans/wall_long.xml
@@ -5,14 +5,23 @@
structural/rome_wall_long.dae
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -22,5 +31,5 @@
- player_trans_ao_parallax_spec.xml
+ player_trans_ao_parallax_spec.xml
Index: binaries/data/mods/public/art/actors/structures/romans/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/romans/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/romans/wooden_tower.xml
@@ -22,6 +22,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/seleucids/scout_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/seleucids/scout_tower.xml
+++ binaries/data/mods/public/art/actors/structures/seleucids/scout_tower.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
+++ binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
@@ -16,6 +16,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/seleucids/wooden_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/seleucids/wooden_tower.xml
+++ binaries/data/mods/public/art/actors/structures/seleucids/wooden_tower.xml
@@ -25,6 +25,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/spartans/defense_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/spartans/defense_tower.xml
+++ binaries/data/mods/public/art/actors/structures/spartans/defense_tower.xml
@@ -23,6 +23,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/art/actors/structures/spartans/sentry_tower.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/spartans/sentry_tower.xml
+++ binaries/data/mods/public/art/actors/structures/spartans/sentry_tower.xml
@@ -21,6 +21,15 @@
+
+
+
+
+
+
+
+
+
Index: binaries/data/mods/public/simulation/components/Upgrade.js
===================================================================
--- binaries/data/mods/public/simulation/components/Upgrade.js
+++ binaries/data/mods/public/simulation/components/Upgrade.js
@@ -16,6 +16,11 @@
"" +
"" +
"" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "" +
"" +
"" +
"" +
@@ -232,6 +237,7 @@
}
this.upgrading = template;
+ this.SetUpgradeAnimationVariant();
// Prevent cheating
this.ChangeUpgradedEntityCount(1);
@@ -259,6 +265,15 @@
this.expendedResources = {};
this.ChangeUpgradedEntityCount(-1);
+ // Do not update visual actor if the animation didn't change.
+ let choice = this.upgradeTemplates[this.upgrading];
+ if (choice && this.upgradeTemplates[choice].Variant)
+ {
+ let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
+ if (cmpVisual)
+ cmpVisual.SelectAnimation("idle", false, 1.0);
+ }
+
this.upgrading = false;
this.CancelTimer();
this.SetElapsedTime(0);
@@ -295,6 +310,26 @@
this.elapsedTime = time;
};
+/**
+ * @param {Object} templateArg - The object containing the upgrade data.
+ */
+Upgrade.prototype.SetUpgradeAnimationVariant = function()
+{
+ let choice = this.upgradeTemplates[this.upgrading];
+
+ if (!choice)
+ return;
+
+ if (!this.template[choice].Variant)
+ return;
+
+ let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
+ if (!cmpVisual)
+ return;
+
+ cmpVisual.SelectAnimation(this.template[choice].Variant, false, 1.0);
+};
+
Upgrade.prototype.UpgradeProgress = function(data, lateness)
{
if (this.elapsedTime/1000.0 < this.GetUpgradeTime())
Index: binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -27,6 +27,7 @@
100
+ Upgrading
structures/{civ}_tower_bolt
@@ -37,6 +38,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
@@ -28,6 +28,7 @@
100
+ Upgrading
structures/{civ}_tower_bolt
@@ -38,6 +39,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
@@ -24,6 +24,7 @@
100
+ Upgrading
structures/{civ}_tower_bolt
@@ -34,6 +35,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
@@ -31,6 +31,7 @@
This will allow you to let units circulate through your fortifications.
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
@@ -27,6 +27,7 @@
100
+ Upgrading
structures/{civ}_tower_bolt
@@ -37,6 +38,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
@@ -27,6 +27,7 @@
100
+ Upgrading
structures/{civ}_tower_bolt
@@ -37,6 +38,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
@@ -26,19 +26,29 @@
- 05.70
+ 0
+ 5.7
+ 0
- 85.70
+ 8
+ 5.7
+ 0
- -85.70
+ -8
+ 5.7
+ 0
- 45.70
+ 4
+ 5.7
+ 0
- -45.70
+ -4
+ 5.7
+ 0
@@ -70,6 +80,7 @@
0
+ Upgrading
structures/romans/siege_wall_long.xml
Index: binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
@@ -27,6 +27,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
@@ -27,6 +27,7 @@
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -63,6 +63,7 @@
50
100
+ Upgrading
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
@@ -51,6 +51,7 @@
60
+ Upgrading
Index: binaries/data/tools/atlas/lists.xml
===================================================================
--- binaries/data/tools/atlas/lists.xml
+++ binaries/data/tools/atlas/lists.xml
@@ -82,6 +82,7 @@
- syntagma_med_idle
- syntagma_med_run
- syntagma_med_walk
+ - Upgrading
- walk
- walk_testudo_front
- walk_testudo_front_left