More bugfixes

data/levels/world.lua

@@ -643,7 +643,7 @@ return {
           visible = true,
           properties = {
             ["dir"] = "2",
-            ["id"] = "ghostkid3"
+            ["id"] = "ghostkid2"
           }
         },
         {
@@ -659,7 +659,7 @@ return {
           visible = true,
           properties = {
             ["dir"] = "0",
-            ["id"] = "ghostkid3"
+            ["id"] = "ghostdog1"
           }
         },
         {
@@ -675,7 +675,7 @@ return {
           visible = true,
           properties = {
             ["dir"] = "3",
-            ["id"] = "ghostkid4"
+            ["id"] = "ghostdog2"
           }
         },
         {

main.lua

@@ -33,7 +33,6 @@ function love.load()
 
 	gamestate.registerEvents()
 	gamestate.push(require("scenes.title.TitleScene")())
-
 	Resources.playMusic("overworld.mp3")
 end
 

scenes/minigame/door/Controller.lua

@@ -67,7 +67,7 @@ function Controller:draw()
 		local frame = math.floor(self.hits / self.required * 4) + 1
 		frame = math.min(frame, 4)
 
-		love.graphics.draw(self.hole[frame], self.holex, self.holy, 0, 1, 1, 32, -20)
+		love.graphics.draw(self.hole[frame], self.holex-32, self.holey-50)
 	end
 
 	if self:isSuccess() then

scenes/minigame/sling/Controller.lua

@@ -73,7 +73,7 @@ function Controller:update(dt)
 		self.cockroachy = self.slingy+2*self.power
 
 	elseif self.state == 1 then
-		self.pos = self.pos + 2*dt
+		self.pos = self.pos + ice_speed[self.level]*dt
 		self.rot = math.sin(self.pos)-0.1
 
 		self.yspeed = self.yspeed + GRAVITY*dt

scenes/world/NPCData.lua

@@ -187,25 +187,53 @@ NPCData["ghostkid2"] = {
 	end
 }
 
-NPCData["ghostkid3"] = {
+NPCData["ghostdog1"] = {
 	type = NPCData.TYPE_ENEMY,
-	name = "GHOST KID",
-	sprite = "ghost",
-	costume = NPCData.COSTUME_GHOST,
+	name = "GHOST DOG",
+	sprite = "ghostdog",
+	costume = NPCData.COSTUME_GHOST_CRITTER,
 	state = 0,
 	range = 4,
-	hp = 80,
-	damage = 25,
+	hp = 200,
+	damage = 35,
+
+	interact = {
+		[0] = function(self)
+			self.scene:add(Dialog({"GHOST DOG: I'M A GHOST DOG!"}, function()
+				self:startBattle()
+			end))
+		end,
+	},
+
+	onWin = function(self)
+		self:setNPCState(1, 0)
+	end
+}
+
+-- GHOST DOG WHO GIVES YOU WOLF SUIT
+NPCData["ghostdog2"] = {
+	type = NPCData.TYPE_ENEMY,
+	name = "GHOST DOG",
+	sprite = "ghostdog",
+	costume = NPCData.COSTUME_GHOST_CRITTER,
+	state = 0,
+	range = 4,
+	hp = 230,
+	damage = 40,
 
 	interact = {
 		[0] = function(self)
-			self.scene:add(Dialog({"GHOST KID: YOU WON'T STAND", "A CHANCE IN THE ALLEY ALLEY", "WITHOUT A SPLATTER COSTUME!"}, function()
+			self.scene:add(Dialog({"GHOST DOG: I'M NOT AFRAID","OF YOU!"}, function()
 				self:startBattle()
 			end))
 		end,
 	},
 
 	onWin = function(self)
+		self.scene:add(Dialog({"GHOST DOG: HERE. HAVE THIS.","THAT WILL HELP YOU SCARE","THE BULLIES IN THE FOREST!"}, function()
+			self.scene:find("player"):giveCostume("wolf")
+		end))
+		self.scene:add(Dialog({"GHOST DOG GAVE YOU A WOLF"," COSTUME."}))
 		self:setNPCState(1, 0)
 	end
 }
@@ -275,34 +303,6 @@ NPCData["dad"] = {
 	}
 }
 
--- GHOST DOG WHO GIVES YOU WOLF SUIT
-NPCData["ghostkid4"] = {
-	type = NPCData.TYPE_ENEMY,
-	name = "GHOST DOG",
-	sprite = "ghostdog",
-	costume = NPCData.COSTUME_GHOST_CRITTER,
-	state = 0,
-	range = 4,
-	hp = 230,
-	damage = 40,
-
-	interact = {
-		[0] = function(self)
-			self.scene:add(Dialog({"GHOST DOG: I'M A GHOST DOG!"}, function()
-				self:startBattle()
-			end))
-		end,
-	},
-
-	onWin = function(self)
-		self.scene:add(Dialog({"GHOST DOG: HERE. HAVE THIS.","THAT WILL HELP YOU SCARE","THE BULLIES IN THE FOREST!"}, function()
-			self.scene:find("player"):giveCostume("wolf")
-		end))
-		self.scene:add(Dialog({"GHOST DOG GAVE YOU A WOLF"," COSTUME."}))
-		self:setNPCState(1, 0)
-	end
-}
-
 -- Old man in house with apples
 NPCData["oldman"] = {
 	type = NPCData.TYPE_NPC,