hawkthorne#166 Britta fix and Buddy

Protuhj · Sep 14, 2012 · c620356 · c620356
1 parent 69e0f17
commit c620356
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/characters/britta.lua b/src/characters/britta.lua
@@ -36,7 +36,6 @@ function plyr.new(sheet)
     local warp = anim8.newGrid(36, 223, beam:getWidth(),
         beam:getHeight())
 
-    new_plyr.beam = beam
     new_plyr.hand_offsets = {
         { { 9,41},{13,36},{ 7,39},{-2,37},{ 9,41},{ 0, 0},{16,30},{ 9,41},{ 9,41},{ 0, 0} },
         { { 9,41},{15,31},{ 8,39},{ 2,37},{ 9,41},{ 0, 0},{17,30},{ 0, 0},{ 0, 0},{ 0, 0} },
@@ -54,6 +53,7 @@ function plyr.new(sheet)
         { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
         { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} }
     }
+    new_plyr.beam = beam
     new_plyr.animations = {
         dead = {
             right = anim8.newAnimation('once', g('10,2'), 1),

diff --git a/src/characters/buddy.lua b/src/characters/buddy.lua
@@ -22,21 +22,21 @@ function plyr.new(sheet)
         beam:getHeight())
 
     new_plyr.hand_offsets = {
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 6,32},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{12,32},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{10, 7},{ 5, 5},{ 5, 5} },
-        { { 5, 3},{ 5, 5},{ 5, 3},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { {10, 5},{10, 7},{10, 5},{10, 7},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} },
-        { { 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5},{ 5, 5} }
+        { { 9,39},{ 9,39},{ 9,39},{ 9,39},{ 9,39},{ 9,39},{10,39},{ 9,29},{ 8,20} },
+        { {10,39},{10,39},{10,39},{10,39},{10,39},{ 9,39},{10,39},{ 4,26},{ 4,23} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{11,17},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 6,16},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{11,17},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 6,16},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{13, 8},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 4, 9},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} },
+        { { 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0} }
     }
     new_plyr.beam = beam
     new_plyr.animations = {