diff --git a/fcore/level/player/player.sml b/fcore/level/player/player.sml index c882434..2acd8a3 100644 --- a/fcore/level/player/player.sml +++ b/fcore/level/player/player.sml @@ -501,7 +501,7 @@ struct val boxes = case facing of FACING_RIGHT => Vector.sub (Whip.rightFrames, frame) - | FACING_LEFT => Vector.sub (Whip.leftFrames, frame div 2) + | FACING_LEFT => Vector.sub (Whip.leftFrames, frame) in helpGetWhipVec (x, y, wratio, 0.0, yOffset, 0, boxes, width, height, []) @@ -517,7 +517,7 @@ struct val boxes = case facing of FACING_RIGHT => Vector.sub (Whip.rightFrames, frame) - | FACING_LEFT => Vector.sub (Whip.leftFrames, frame div 2) + | FACING_LEFT => Vector.sub (Whip.leftFrames, frame) in helpGetWhipVec (x, y, hratio, xOffset, 0.0, 0, boxes, width, height, []) diff --git a/fcore/level/player/whip.sml b/fcore/level/player/whip.sml index 67f7bd9..286cb7c 100644 --- a/fcore/level/player/whip.sml +++ b/fcore/level/player/whip.sml @@ -181,78 +181,162 @@ struct ] val lf2 = + #[ {x = ~17, y = ~15} + , {x = ~16, y = 2} + , {x = ~15, y = 18} + , {x = ~1, y = 25} + ] + + val lf3 = #[ {x = ~18, y = ~15} , {x = ~17, y = 2} , {x = ~15, y = 18} , {x = ~1, y = 25} ] - val lf3 = + val lf4 = + #[ {x = ~21, y = ~15} + , {x = ~19, y = 2} + , {x = ~15, y = 18} + , {x = ~1, y = 25} + ] + + val lf5 = #[ {x = ~24, y = ~15} , {x = ~21, y = 2} , {x = ~15, y = 18} , {x = ~1, y = 25} ] - val lf4 = - #[ {x = ~34, y = ~15} - , {x = ~26, y = 2} - , {x = ~15, y = 18} - , {x = ~1, y = 25} - ] - - val lf5 = - #[ {x = ~38, y = ~5} - , {x = ~30, y = 6} - , {x = ~15, y = 18} - , {x = ~1, y = 25} - ] - val lf6 = - #[ {x = ~47, y = 10} - , {x = ~31, y = 15} - , {x = ~15, y = 20} + #[ {x = ~28, y = ~15} + , {x = ~24, y = 2} + , {x = ~15, y = 18} , {x = ~1, y = 25} ] val lf7 = - #[ {x = ~63, y = 25} - , {x = ~47, y = 28} - , {x = ~31, y = 25} - , {x = ~15, y = 22} + #[ {x = ~34, y = ~15} + , {x = ~28, y = 2} + , {x = ~15, y = 18} , {x = ~1, y = 25} ] val lf8 = - #[ {x = ~63, y = 25} - , {x = ~47, y = 28} - , {x = ~31, y = 25} - , {x = ~15, y = 25} + #[ {x = ~36, y = ~15} + , {x = ~30, y = 2} + , {x = ~15, y = 18} , {x = ~1, y = 25} ] val lf9 = - #[ {x = ~47, y = 31} - , {x = ~31, y = 29} - , {x = ~15, y = 27} + #[ {x = ~38, y = ~5} + , {x = ~32, y = 6} + , {x = ~15, y = 18} , {x = ~1, y = 25} ] val lf10 = - #[ {x = ~31, y = 33} - , {x = ~15, y = 29} + #[ {x = ~42, y = ~3} + , {x = ~33, y = 3} + , {x = ~15, y = 18} , {x = ~1, y = 25} ] val lf11 = - #[ {x = ~15, y = 31} + #[ {x = ~47, y = 5} + , {x = ~34, y = 10} + , {x = ~15, y = 15} , {x = ~1, y = 25} ] val lf12 = + #[ {x = ~47, y = 10} + , {x = ~34, y = 15} + , {x = ~15, y = 20} + , {x = ~1, y = 25} + ] + + val lf13 = + #[ {x = ~47, y = 15} + , {x = ~32, y = 20} + , {x = ~15, y = 23} + , {x = ~1, y = 25} + ] + + val lf14 = + #[ {x = ~63, y = 25} + , {x = ~47, y = 28} + , {x = ~32, y = 25} + , {x = ~15, y = 22} + , {x = ~1, y = 25} + ] + + val lf15 = + #[ {x = ~63, y = 25} + , {x = ~47, y = 23} + , {x = ~32, y = 25} + , {x = ~15, y = 23} + , {x = ~1, y = 25} + ] + + val lf16 = + #[ {x = ~63, y = 25} + , {x = ~47, y = 28} + , {x = ~32, y = 25} + , {x = ~15, y = 25} + , {x = ~1, y = 25} + ] + + val lf17 = + #[ {x = ~63, y = 31} + , {x = ~47, y = 29} + , {x = ~32, y = 27} + , {x = ~15, y = 27} + , {x = ~1, y = 25} + ] + + val lf18 = + #[ {x = ~47, y = 31} + , {x = ~32, y = 29} + , {x = ~15, y = 27} + , {x = ~1, y = 25} + ] + + val lf19 = + #[ {x = ~50, y = 33} + , {x = ~32, y = 29} + , {x = ~15, y = 27} + , {x = ~1, y = 25} + ] + + val lf20 = + #[ {x = ~32, y = 33} + , {x = ~15, y = 29} + , {x = ~1, y = 25} + ] + + val lf21 = + #[ {x = ~35, y = 35} + , {x = ~15, y = 29} + , {x = ~1, y = 25} + ] + + val lf22 = + #[ {x = ~15, y = 31} + , {x = ~1, y = 25} + ] + + val lf23 = + #[ {x = ~18, y = 34} + , {x = ~1, y = 25} + ] + + val lf24 = #[ {x = ~1, y = 25} ] val leftFrames = #[ - lf1, lf2, lf3, lf4, lf5, lf6, lf7, lf8, lf9, lf10, lf11, lf12 + lf1, lf2, lf3, lf4, lf5, lf6, lf7, lf8, lf9, lf10, lf11, lf12, lf13, lf14, + lf15, lf16, lf17, lf18, lf19, lf20, lf21, lf22, lf23, lf24 ] end