Merge branch 'master' into color-revert

Author: qixils

README.md

@@ -6,8 +6,10 @@
 Bug fixes and quality of life improvements are welcome!
 This includes stuff like custom enemy properties and new animations.
 
-Avoid major additions that will potentially cause bugs or complicate the game/code (Stuff like powerups).
-I appreciate the help, but the goal is to continue the mod while I am busy. Major changes will only increase my workload and make the mod even buggier.
+Please avoid major additions or refactors that will potentially cause bugs or complicate the game/code (Stuff like powerups).  
+While I appreciate the help, the game is no longer under active development so patches won't be released as glitches are found as a result of a new feature, so please keep this in mind.
+
+Suggest downloadable game content here: https://github.com/qixils/mari0pository
 
 ## 📥 Downloads
 

alesans_entities/mappacks/alesans_entities_mappack/text.txt

@@ -11,5 +11,5 @@ hudsimple=false
 toadtext=thank you mario!,but our princess is in,another castle!
 peachtext=thank you mario!,your quest is over.,we present you a new quest.,push button b,to play as steve
 steve=true
-levelscreen=1|1|
+levelscreen=1|1|mappack by alesan99
 hudhidecollectables=f,f,f,f,f,f,f,f,f,f

editor.lua

@@ -4362,8 +4362,10 @@ function placetile(x, y, tilei)
 	elseif editentities == false then
 		if tilequads[currenttile].collision == true and (tilequads[map[cox][coy][1]].collision == false or (objects["tile"][tilemap(cox, coy)] and objects["tile"][tilemap(cox, coy)].slant)) then
 			local oldtile
-			if tilequads[currenttile].leftslant or tilequads[currenttile].halfleftslant1 or tilequads[currenttile].halfleftslant2 or
-				tilequads[currenttile].rightslant or tilequads[currenttile].halfrightslant1 or tilequads[currenttile].halfrightslant2 then
+			local tilequad = tilequads[currenttile]
+			if tilequad.platform or tilequad.leftslant or tilequad.halfleftslant1 or tilequad.halfleftslant2 or
+				tilequad.rightslant or tilequad.halfrightslant1 or tilequads.halfrightslant2 then
+				--fix platforms and slants acting like solid blocks when first placed in editor
 				--so many people complained about this minor oddity
 				--guess i have to do a wack workaround
 				oldtile = map[cox][coy][1]

enemy.lua

@@ -2584,67 +2584,58 @@ function enemy:customtimeraction(action, arg, arg2)
 end
 
 function enemy:ifstatement(t, action, arg)
-	--EXAMPLE: ["if","speedx","==","speedy"],["set","speedy"],10
-	--EXAMPLE: ["if","speedx","==","speedy","and","jumping","~=",false],["set","speedy"],10
+	--EXAMPLE: ["if","speedx","==","speedy"],["set","speedy"],10],
+	--EXAMPLE: ["if","speedx","==","speedy","and","jumping","~=",false],["set","speedy"],10],
 	local statementPass = false
 	for step = 1, math.floor(#t/4) do
 		local i = 1+(step-1)*4
-		local check = t[i]
+		local check = t[i]:lower()
 
-		--get properties needed for comparison
-		local prop1,prop2 = t[i+1], t[i+3]
-		if (type(prop1) == "table" and prop1[1] and prop1[2] and prop1[1] == "property") then
-			prop1 = self[prop1[2]]
-		else
-			prop1 = self[prop1]	
-		end
-		if (type(prop2) == "string" and self[prop2] ~= nil) then
-			prop2 = self[prop2]
-		elseif (type(prop2) == "table" and prop2[1] and prop2[2] and prop2[1] == "property") then
-			prop2 = self[prop2[2]]
-		end
-
-		--comparison
-		local comparison = t[i+2]
-		if (not comparison) or (type(comparison) ~= "string") then
-			return false
+		--logic
+		if check == "or" and statementPass then
+			break
 		end
-		comparison = comparison:lower()
-
-		local pass 
-		if (comparison == "equal" or comparison == "==") and (prop1 == prop2) then
-			pass = true
-		elseif (comparison == "notequal" or comparison == "~=" or comparison == "!=") and (prop1 ~= prop2) then
-			pass = true
-
-		elseif (comparison == "greater" or comparison == ">") and (prop1 > prop2) then
-			pass = true
-		elseif (comparison == "less" or comparison == "<") and (prop1 < prop2) then
-			pass = true
-		elseif (comparison == "greaterequal" or comparison == ">=") and (prop1 >= prop2) then
-			pass = true
-		elseif (comparison == "lessequal" or comparison == "<=") and (prop1 <= prop2) then
-			pass = true
-
-		elseif (comparison == "exists") and prop1 ~= nil then
-			pass = true
-		elseif (comparison == "notexists") and prop1 == nil then
-			pass = true
-		end
-
-		--logical operators
-		if check == "if" or check == "and" then
-			if pass then
-				statementPass = true
+		if statementPass == true or check == "or" or step == 1 then
+			--get properties needed for comparison
+			local prop1,prop2 = t[i+1], t[i+3]
+			if (type(prop1) == "table" and prop1[1] and prop1[2] and prop1[1] == "property") then
+				prop1 = self[prop1[2]]
 			else
-				statementPass = false
-				break
+				prop1 = self[prop1]	
+			end
+			if (type(prop2) == "string" and self[prop2] ~= nil) then
+				prop2 = self[prop2]
+			elseif (type(prop2) == "table" and prop2[1] and prop2[2] and prop2[1] == "property") then
+				prop2 = self[prop2[2]]
 			end
-		elseif check == "or" then
-			if pass then
-				statementPass = true
-				break
+
+			--comparison
+			local comparison = t[i+2]
+			if (not comparison) or (type(comparison) ~= "string") then
+				return false
 			end
+			comparison = comparison:lower()
+
+			local pass = false
+			if (comparison == "equal" or comparison == "==") and (prop1 == prop2) then
+				pass = true
+			elseif (comparison == "notequal" or comparison == "~=" or comparison == "!=") and (prop1 ~= prop2) then
+				pass = true
+			elseif (comparison == "greater" or comparison == ">") and (prop1 > prop2) then
+				pass = true
+			elseif (comparison == "less" or comparison == "<") and (prop1 < prop2) then
+				pass = true
+			elseif (comparison == "greaterequal" or comparison == ">=") and (prop1 >= prop2) then
+				pass = true
+			elseif (comparison == "lessequal" or comparison == "<=") and (prop1 <= prop2) then
+				pass = true
+			elseif (comparison == "exists") and prop1 ~= nil then
+				pass = true
+			elseif (comparison == "notexists") and prop1 == nil then
+				pass = true
+			end
+
+			statementPass = pass
 		end
 	end
 

levelscreen.lua

@@ -335,9 +335,6 @@ function levelscreen_draw()
 					end
 				end
 				properprintfunc(s, (width/2*16)*scale-string.len(s)*4*scale, 200*scale)
-			elseif mappack == "only_for_alesans_entities" and marioworld == 1 and mariolevel == 1 then
-				local s = "mappack by alesan99"
-				properprintfunc(s, (width/2*16)*scale-string.len(s)*4*scale, 200*scale)
 			elseif levelscreentext[marioworld .. "-" .. mariolevel] then
 				local s = levelscreentext[marioworld .. "-" .. mariolevel]
 				properprintbasicfunc(s, (width/2*16)*scale-string.len(s)*4*scale, 200*scale)

mappacks/alesans_entities_mappack/text.txt

@@ -11,5 +11,5 @@ hudsimple=false
 toadtext=thank you mario!,but our princess is in,another castle!
 peachtext=thank you mario!,your quest is over.,we present you a new quest.,push button b,to play as steve
 steve=true
-levelscreen=1|1|
+levelscreen=1|1|mappack by alesan99
 hudhidecollectables=f,f,f,f,f,f,f,f,f,f

menu.lua

@@ -3082,7 +3082,6 @@ end
 function reset_mappacks()
 	delete_mappack("smb")
 	delete_mappack("portal")
-	delete_mappack("only_for_alesans_entities")
 	delete_mappack("alesans_entities_mappack")
 
 	--[[local dlclist = love.filesystem.getDirectoryItems("alesans_entities/onlinemappacks/")