Merge pull request #1073 from NimbusBP1729/blacksmith_cleanup

delayed blacksmith speech
hawkthorne · Mar 24, 2013 · b2d7a6d · b2d7a6d
2 parents fa31405 + 26376d3
commit b2d7a6d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/audio/sfx/sword_hit.ogg b/src/audio/sfx/sword_hit.ogg
diff --git a/src/maps/blacksmith.tmx b/src/maps/blacksmith.tmx
@@ -56,7 +56,12 @@
    </properties>
    <polygon points="-21,-4 81,-4 101,15 -5,15"/>
   </object>
-  <object x="408" y="259" width="71" height="3">
+  <object x="407" y="256" width="71" height="6">
+   <properties>
+    <property name="blocks" value="true"/>
+   </properties>
+  </object>
+  <object x="214" y="226" width="75" height="14">
    <properties>
     <property name="blocks" value="true"/>
    </properties>

diff --git a/src/nodes/activenpc.lua b/src/nodes/activenpc.lua
@@ -73,7 +73,7 @@ end
 
 function Activenpc:enter( previous )
     if self.props.enter then
-        self.props.enter(self)
+        self.props.enter(self, previous)
     end
 end
 

diff --git a/src/nodes/activenpcs/blacksmith.lua b/src/nodes/activenpcs/blacksmith.lua
@@ -25,10 +25,16 @@ return {
             file = 'sword_hit',
         }
     },
-    enter = function(activenpc)
-        activenpc.state = 'talking'
-        sound.playSfx("ibuyandsell")
-        Timer.add(2.8,function() activenpc.state = 'default' end)
+    enter = function(activenpc, previous)
+        if not previous.isLevel and previous~=Gamestate.get("overworld") then return end
+
+        Timer.add(1,function()
+            activenpc.state = 'talking'
+            sound.playSfx("ibuyandsell")
+            Timer.add(2.8,function()
+                activenpc.state = 'default'
+            end)
+        end)
     end,
     onInteract = function(activenpc, player)
         local options = {"YES","NO"}