Frozen enemies can collect collectables

Fix running into koopas when flipping with racoon tail

Author: alesan99

ice.lua

@@ -73,7 +73,23 @@ function ice:update(dt)
 
 	if math.abs(self.speedx) < 1 then
 		self.timer = self.timer + dt
+	else
+		--collect collectables if moving
+		local x = math.floor(self.x+self.width/2)+1
+		local y = math.floor(self.y+self.height)+1
+		if ismaptile(x, y) then
+			if objects["collectable"][tilemap(x, y)] then
+				getcollectable(x, y)
+			end
+		end
+		local y = math.floor(self.y+self.height/2)+1
+		if ismaptile(x, y) then
+			if objects["collectable"][tilemap(x, y)] then
+				getcollectable(x, y)
+			end
+		end
 	end
+
 	if self.static and (not self.dontfallafterfreeze) then
 		--start falling if static
 		if self.timer > iceblockairtime then

mariotail.lua

@@ -9,6 +9,7 @@ function mariotail:init(x, y, dir, v)
 	self.width = 2
 	self.height = 8/16
 	if v and v.size == 10 then
+		--should be cape instead
 		self.height = 1
 		self.y = self.y - 8/16
 	end
@@ -116,6 +117,9 @@ function mariotail:hitstuff(a, b)
 			end
 			b:flipshell(dir)
 			self.destroy = true
+			if (dir == "right" and self.player.speedx >= 0) or (dir == "left" and self.player.speedx <= 0) then
+				b.speedx = b.speedx + self.player.speedx
+			end
 		else
 			--kill normally
 			b:shotted(dir)
@@ -148,6 +152,9 @@ function mariotail:hitstuff(a, b)
 			else
 				makepoof(self.x, self.y+self.height/2, "pow")
 			end
+			if (dir == "right" and self.player.speedx >= 0) or (dir == "left" and self.player.speedx <= 0) then
+				b.speedx = b.speedx + self.player.speedx
+			end
 		elseif b:shotted(dir, false, false, true) ~= false then
 			--kill normally
 			addpoints(b.firepoints or 200, self.x, self.y)