From 1bfb913a6936fbba3c8e5e2b14ee1ee42dd4fc4f Mon Sep 17 00:00:00 2001 From: WhiteTreePaladin Date: Tue, 6 Jul 2010 01:23:50 +0000 Subject: [PATCH] Fixed attempt to perform a string operation on a template instead of the template name Worked on Hellene actor animation speeds (They will still need some more tweaking) This was SVN commit r7702. --- .../art/actors/units/hellenes/alexander.xml | 4 +-- .../units/hellenes/cavalry_swordsman_a.xml | 4 +-- .../units/hellenes/cavalry_swordsman_a_r.xml | 4 +-- .../units/hellenes/cavalry_swordsman_b.xml | 4 +-- .../units/hellenes/cavalry_swordsman_b_r.xml | 4 +-- .../units/hellenes/cavalry_swordsman_e.xml | 4 +-- .../units/hellenes/cavalry_swordsman_e_r.xml | 4 +-- .../art/actors/units/hellenes/demetrius.xml | 4 +-- .../actors/units/hellenes/female_citizen.xml | 10 +++---- .../units/hellenes/infantry_archer_a.xml | 4 +-- .../units/hellenes/infantry_archer_b.xml | 6 ++-- .../units/hellenes/infantry_archer_e.xml | 6 ++-- .../units/hellenes/infantry_javelinist_a.xml | 22 +++++++------- .../units/hellenes/infantry_javelinist_b.xml | 22 +++++++------- .../units/hellenes/infantry_javelinist_e.xml | 20 ++++++------- .../units/hellenes/infantry_spearman_a.xml | 30 +++++++++---------- .../units/hellenes/infantry_spearman_b.xml | 30 +++++++++---------- .../units/hellenes/infantry_spearman_e.xml | 18 +++++------ .../art/actors/units/hellenes/leonidas.xml | 2 +- .../actors/units/hellenes/philip_horse.xml | 4 +-- .../actors/units/hellenes/super_unit_1.xml | 4 +-- .../actors/units/hellenes/super_unit_2.xml | 8 ++--- .../actors/units/hellenes/super_unit_3.xml | 4 +-- .../actors/units/hellenes/super_unit_4.xml | 4 +-- .../actors/units/hellenes/themistocles.xml | 6 ++-- .../art/actors/units/hellenes/trader.xml | 2 +- .../art/actors/units/hellenes/xenophon.xml | 4 +-- .../public/gui/session_new/unit_commands.js | 2 +- 28 files changed, 120 insertions(+), 120 deletions(-) diff --git a/binaries/data/mods/public/art/actors/units/hellenes/alexander.xml b/binaries/data/mods/public/art/actors/units/hellenes/alexander.xml index d165834d2e..af3fecfc9e 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/alexander.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/alexander.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml index fd1c2cbc6f..196cc9431d 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml index a6ba69189c..ea2c64cc94 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml index f74ce42955..4ae1d7c6ca 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml index 42c5c54524..96a1ab8798 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml index fcb8a31ba7..6029c0143f 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml index 00768af994..3d7a17680a 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/demetrius.xml b/binaries/data/mods/public/art/actors/units/hellenes/demetrius.xml index 274eeb38a4..2cdf84db9c 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/demetrius.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/demetrius.xml @@ -7,9 +7,9 @@ - + - + skeletal/m_tunic_short.dae diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml index 4a3e4ffaed..b77e68f9cd 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml @@ -5,14 +5,14 @@ - + - - - - + + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml index 33f2746cf4..e486bd211f 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml @@ -8,13 +8,13 @@ - + - + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml index 4389568326..1d5dbd908d 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml @@ -8,12 +8,12 @@ - + - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml index 31b6bab02d..b509eefe3b 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml @@ -8,12 +8,12 @@ - + - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml index 6e685fce29..f5be1e36fa 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml @@ -6,17 +6,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml index 620b5212db..36a88aa98b 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml @@ -6,17 +6,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml index 631ee929dd..3dde0a1566 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml @@ -6,17 +6,17 @@ - - - - - - - + + + + + + + - - - + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml index 83297661a1..68dd2442d4 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml @@ -5,22 +5,22 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + skeletal/m_tunic_short.dae diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml index c2ee7e5895..ac06d56d7d 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml @@ -5,22 +5,22 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + skeletal/m_tunic_short.dae diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml index d2693b7e28..da2303ddb0 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml @@ -5,16 +5,16 @@ - + - - - - - - - - + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/leonidas.xml b/binaries/data/mods/public/art/actors/units/hellenes/leonidas.xml index 75f70c5297..c1a5078379 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/leonidas.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/leonidas.xml @@ -50,7 +50,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/philip_horse.xml b/binaries/data/mods/public/art/actors/units/hellenes/philip_horse.xml index dedc02e390..5f1edf8d61 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/philip_horse.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/philip_horse.xml @@ -11,8 +11,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml index f6cc067b87..11c8ab9c6f 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml @@ -5,7 +5,7 @@ - + @@ -13,7 +13,7 @@ - + skeletal/m_tunic_short.dae diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml index f0287fbfae..2c51b2ce81 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml @@ -9,11 +9,11 @@ - + - - - + + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml index cfe8c80635..1174e91df2 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml @@ -5,8 +5,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml index 9727df251a..5534023667 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/themistocles.xml b/binaries/data/mods/public/art/actors/units/hellenes/themistocles.xml index 24902a4fb9..897d1674f8 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/themistocles.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/themistocles.xml @@ -9,10 +9,10 @@ - + - - + + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/trader.xml b/binaries/data/mods/public/art/actors/units/hellenes/trader.xml index ff75b21bd1..b1daa8d682 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/trader.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/trader.xml @@ -7,7 +7,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml index 176ef9a6a4..2ffd6fbdf6 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml @@ -7,8 +7,8 @@ - - + + diff --git a/binaries/data/mods/public/gui/session_new/unit_commands.js b/binaries/data/mods/public/gui/session_new/unit_commands.js index f48d0683e0..a267397155 100644 --- a/binaries/data/mods/public/gui/session_new/unit_commands.js +++ b/binaries/data/mods/public/gui/session_new/unit_commands.js @@ -104,7 +104,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c button.onpress = (function(e) { return function() { callback(e) } })(item); // (need nested functions to get the closure right) // Get icon sheet - icon.sprite = getPortraitSheetName(getTemplateCategory(item)); + icon.sprite = getPortraitSheetName(getTemplateCategory(entType)); if (typeof template.icon_cell == "undefined") icon.cell_id = 0;