Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removed attack skating changed troy's jump back to its original #1059

Merged
merged 1 commit into from Mar 24, 2013
Merged

removed attack skating changed troy's jump back to its original #1059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/character_map.lua
View file
Open in desktop
Expand Up @@ -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},
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/characters/troy.lua
View file
Open in desktop
Expand Up @@ -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}
Expand Down