Merge pull request #1059 from NimbusBP1729/animation_tweaks

removed attack skating changed troy's jump back to its original
hawkthorne · Mar 24, 2013 · 2c5fe66 · 2c5fe66
2 parents fde82e4 + 8c9cd67
commit 2c5fe66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/character_map.lua b/src/character_map.lua
@@ -145,16 +145,16 @@ return {
 
     --rows 9 & 10
     attack = {
-        left = {'once', {'1,9', '5,9'}, 0.16},
-        right = {'once', {'1,10', '5,10'}, 0.16}
+        left = {'loop', {'1,9', '5,9'}, 0.16},
+        right = {'loop', {'1,10', '5,10'}, 0.16}
     },
     attackjump = {
-        left = {'once', {'4,9', '8,9'}, 0.16},
-        right = {'once', {'4,10', '8,10'}, 0.16}
+        left = {'loop', {'4,9', '8,9'}, 0.16},
+        right = {'loop', {'4,10', '8,10'}, 0.16}
     },
     attackwalk = {
-        left = {'once', {'2,9', '7,9'}, 0.16},
-        right = {'once', {'2,10', '7,10'}, 0.16}
+        left = {'loop', {'2,9', '7,9'}, 0.16},
+        right = {'loop', {'2,10', '7,10'}, 0.16}
     },
     wieldwalk = { --state for walking while holding a weapon
         left = {'loop', {'2-3,9'}, 0.16},
@@ -169,8 +169,8 @@ return {
         right = {'once', {'4,10'}, 1},
     },
     wieldaction = { --state for swinging a weapon
-        left = {'once', {'2,9','10,9','6,9','2,9'}, 0.09},
-        right = {'once', {'2,10','10,10','6,10','2,10'}, 0.09},
+        left = {'once', {'2,9','11,9','8,7','2,9'}, 0.09},
+        right = {'once', {'2,10','11,10','8,8','2,10'}, 0.09},
     },
 
     --rows 11 & 12

diff --git a/src/characters/troy.lua b/src/characters/troy.lua
@@ -33,6 +33,10 @@ return {
             left = {'loop', {'1-3,3'}, 0.16},
             right = {'loop', {'1-3,4'}, 0.16}
         },
+        wieldjump = {
+            left = {'loop', {'1-3,3'}, 0.16},
+            right = {'loop', {'1-3,4'}, 0.16}
+        },
         hurt = {
             left = {'once', {'4-5,3'}, 1},
             right = {'once', {'4-5,4'}, 1}