Merge pull request #2226 from hawkthorne/master

Bug fix
hawkthorne · Sep 24, 2014 · 8e2d57a · 8e2d57a
2 parents 77ea5f6 + 2629b39
commit 8e2d57a
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 21 deletions.
diff --git a/src/images/mayorjuan.png b/src/images/mayorjuan.png
diff --git a/src/images/npc/mayorjuan.png b/src/images/npc/mayorjuan.png
diff --git a/src/images/basketball.png → src/images/weapons/basketball.png b/src/images/basketball.png → src/images/weapons/basketball.png
diff --git a/src/images/bicycle.png → src/images/weapons/bicycle.png b/src/images/bicycle.png → src/images/weapons/bicycle.png
diff --git a/src/images/computer.png → src/images/weapons/computer.png b/src/images/computer.png → src/images/weapons/computer.png
diff --git a/src/images/money.png → src/images/weapons/money.png b/src/images/money.png → src/images/weapons/money.png
diff --git a/src/images/rainbowbeam.png → src/images/weapons/rainbowbeam.png b/src/images/rainbowbeam.png → src/images/weapons/rainbowbeam.png
diff --git a/src/maps/valley-tacotown.tmx b/src/maps/valley-tacotown.tmx
@@ -109,15 +109,6 @@
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="sprite" x="264" y="384" width="48" height="48">
-   <properties>
-    <property name="animation" value="1-2,1"/>
-    <property name="height" value="48"/>
-    <property name="sheet" value="images/mayorjuan.png"/>
-    <property name="speed" value="0.4"/>
-    <property name="width" value="48"/>
-   </properties>
-  </object>
   <object name="mayorjuan" type="npc" x="264" y="384" width="48" height="48"/>
   <object name="next" type="door" x="2304" y="336" width="48" height="48"/>
   <object type="enemy" x="1600" y="272" width="14" height="25">

diff --git a/src/nodes/building.lua b/src/nodes/building.lua
@@ -111,7 +111,9 @@ end
 function Building:burn()
   self:burned()
   Timer.add(3, function()
-    self:burn_row(1)
+    if self.containerLevel:hasNode(self) then
+      self:burn_row(1)
+    end
   end)
 end
 
@@ -129,7 +131,9 @@ function Building:burn_row(row)
     local tile = self.tiles[(row * self.tileColumns - self.tileColumns) + (column[i] - 1)]
     if tile.state ~= 'burned' and tile.state ~= 'burning' then
       Timer.add(math.random(0.5,1), function()
-        self:burn_tile(tile)
+        if self.containerLevel:hasNode(self) then
+          self:burn_tile(tile)
+        end
       end)
     end
   end

diff --git a/src/nodes/weapon.lua b/src/nodes/weapon.lua
@@ -130,13 +130,13 @@ function Weapon:draw()
     local offsetY = 0
     if self.flipY == 'true' then
         scaley = -1
-        offsetY = self.boxHeight
+        offsetY = self.boxHeight or 0
     end
 
     -- Flipping an image moves it, this adjust for that image flip offset
     local offsetX = 0
     if self.direction == 'left' then
-        offsetX = self.boxWidth
+        offsetX = self.boxWidth or 0
     end
 
     if self.image then

diff --git a/src/npcs/mayorjuan.lua b/src/npcs/mayorjuan.lua
@@ -1,19 +1,15 @@
 -- inculdes
 
 return {
-    width = 32,
+    width = 48,
     height = 48,  
     greeting = 'My name is {{red_light}}Juan{{white}}, I am the mayor of {{olive}}Tacotown{{white}}.',  
     animations = {
         default = {
-            'loop',{'1,1','11,1'},.5,
-        },
-        walking = {
-            'loop',{'1,1','2,1','3,1'},.2,
-        },
-
+            'loop',{'1-2,1'},.4,
+        }
     },
-
+    donotfacewhentalking = true,
     talk_items = {
         { ['text']='i am done with you' },
         { ['text']='Sick moustache!' },