Fix hollow collision for clearpipes

Removed new falling object detection for potential issues (shoes)
Fix fireballs on slopes (might need a bounces property for other entity)
Tweak thwomp direction correction speed
Tweak GLaDOS collision to ignore mario
Tweak Mario's hammers y velocity

Author: alesan99

enemies/glados.lua

@@ -13,7 +13,7 @@ function glados:init(x, y, r)
 	self.category = 4
 	self.gravity = 0
 
-	self.mask = {true, true, false, false}
+	self.mask = {true, true, true, false}
 
 	self.emancipatecheck = false
 	self.autodelete = false

enemies/thwomp.lua

@@ -249,7 +249,8 @@ function thwomp:update(dt)
 		--slow down if being flung in wrong direction
 		if (self.t == "left" or self.t == "right") and (not self.track) then
 			if self.speedy ~= 0 then
-				self.speedy = math.max(0,math.abs(self.speedy)-4*dt)*(self.speedy/math.abs(self.speedy))
+				self.speedy = math.max(0,math.abs(self.speedy)-10*dt)*(self.speedy/math.abs(self.speedy))
+				print("hey")
 			end
 		end
 

fireball.lua

@@ -214,6 +214,9 @@ function fireball:floorcollide(a, b)
 	else
 		self.speedy = -fireballjumpforce
 	end
+	if b.SLOPE then
+		self.speedy = self.speedy -b.incline*10
+	end
 	return false
 end
 

main.lua

@@ -56,7 +56,7 @@ local debugGraph,fpsGraph,memGraph,drawGraph
 local debugGraphs = false
 
 VERSION = 13.0124
-VERSIONSTRING = "13e (3/7/22)"
+VERSIONSTRING = "13.1 (2/6/23)"
 
 android = (love.system.getOS() == "Android" or love.system.getOS() == "iOS") --[DROID]
 androidtest = false--testing android on pc

mariohammer.lua

@@ -3,7 +3,7 @@ mariohammer = class:new()
 function mariohammer:init(x, y, dir, v)
 	--PHYSICS STUFF
 	self.y = y+4/16
-	self.speedy = (-math.sqrt(2*yacceleration*3.5))+v.speedy --bobthelawyer?
+	self.speedy = (-math.sqrt(2*yacceleration*3.5))--+v.speedy --bobthelawyer?
 	if dir == "right" then
 		self.speedx = hammerspeed+v.speedx
 		self.x = x+3/16

physics.lua

@@ -340,16 +340,16 @@ function physicsupdate(dt)
 								if v.startfall then
 									if (not (v.stopjump and v.jumping)) and (not v.quicksand) then
 										if v.gravitydir then
-											if (v.gravitydir == "down" and v.speedy == oldspeedy + v.gravity*dt) or (v.gravitydir == "up" and v.speedy == oldspeedy - v.gravity*dt) then
+											if (v.gravitydir == "down" and v.speedy == v.gravity*dt) or (v.gravitydir == "up" and v.speedy == -v.gravity*dt) then
 												v:startfall(i)
 											end
-										elseif v.speedy == oldspeedy + v.gravity*dt then
+										elseif v.speedy == v.gravity*dt then
 											v:startfall(i)
 										end
 									end
 								end
 							else
-								if v.speedy == oldspeedy + yacceleration*dt and v.startfall then
+								if v.speedy == yacceleration*dt and v.startfall then
 									v:startfall(i)
 								end
 							end
@@ -373,7 +373,7 @@ function physicsupdate(dt)
 						if v.gravity then
 							if v.startfall then
 								if v.gravitydir then
-									if (v.gravitydir == "right" and v.speedx == oldspeedx + v.gravity*dt) or (v.gravitydir == "left" and v.speedx == oldspeedx - v.gravity*dt) then
+									if (v.gravitydir == "right" and v.speedx == v.gravity*dt) or (v.gravitydir == "left" and v.speedx == -v.gravity*dt) then
 										v:startfall(i)
 									end
 								end
@@ -481,7 +481,7 @@ function cancollideside(t, side, v)
 	elseif side == "right" then
 		return (safe or t.PLATFORMRIGHT)
 	elseif side =="passive" then
-		return safe and (not t.hollow)
+		return safe
 	end
 end