Merge branch 'master' into color-revert

Author: qixils

animation.lua

@@ -79,6 +79,7 @@ instantkillplayer[:player]			kills player(s)
 disablejumping						disable jumping
 enablejumping						enables jumping
 
+autosave							saves mappack progress
 changebackground:background			changes background
 changeforeground:background	 	    changes foreground
 removecoins:amount					removes coins
@@ -755,6 +756,18 @@ function animation:update(dt)
 						objects["player"][i].speedy = tonumber(sy) or 0
 					end
 				end
+			elseif v[1] == "autosave" then
+				-- only save if the game is being played offline
+				if not (CLIENT or SERVER or dcplaying) then
+					-- don't save if the game is being played in the editor
+					if not testlevel then
+						writesuspendfile()
+					end
+					-- show notice regardless of whether player is in editor or not, to prove the function works while testing
+					if v[2] == true then
+						notice.new(TEXT["game saved!"], notice.white, 3)
+					end
+				end
 			elseif v[1] == "changebackground" then
 				if v[2] then
 					loadcustombackground(v[2])

animationguiline.lua

@@ -1390,6 +1390,22 @@ table.insert(toenter, {name = "changebackground",
 	}
 })
 
+table.insert(toenter, {name = "autosave", 
+	t = {
+		t="action",
+		nicename="save game progress",
+		entries={
+			{
+				t="text",
+				value=" and "
+			},
+			{
+				t="notifyplayer"
+			}
+		}
+	}
+})
+
 table.insert(toenter, {name = "changeforeground", 
 	t = {
 		t="action",
@@ -2144,6 +2160,12 @@ function animationguiline:init(tabl, t2)
 					dropwidth = 6
 					args = {"both","none","1 only","2 only","gel"}
 					displayargs = {"both","none","1 only","2 only","gel"}
+				
+				elseif v.t == "notifyplayer" then
+					dropdown = true
+					dropwidth = 24
+					args = {true, false}
+					displayargs = {"notify the player", "don't notify the player"}
 				end
 
 				if dropdown then

game.lua

@@ -1,6 +1,6 @@
 local queuespritebatchupdate = false
 
-function game_load(suspended)
+function game_load(suspended, deletesuspend)
 	scrollfactor = 0
 	scrollfactory = 0
 	scrollfactor2 = 0
@@ -48,6 +48,7 @@ function game_load(suspended)
 	continuesublevelmusic = false
 	nolowtime = false
 	nocoinlimit = false
+	alwaysdeletesuspend = false
 	setphysics(1)
 	if not dcplaying then
 		loadmappacksettings()
@@ -97,6 +98,11 @@ function game_load(suspended)
 		marioworld = suspended
 	end
 
+	if deletesuspend or alwaysdeletesuspend then
+		-- On starting a new game, remove the old save
+		love.filesystem.remove(savesfolder .. "/" .. mappack .. ".suspend")
+	end
+
 	--remove custom sprites
 	for i = smbtilecount+portaltilecount+1, #tilequads do
 		tilequads[i] = nil
@@ -2862,13 +2868,10 @@ function game_draw()
 				love.graphics.setColor(255, 255, 255, 255)
 				properprint(">", (width*8*scale)-45*scale, (112*scale)-60*scale+(i-1)*25*scale)
 			end
-			if dcplaying and pausemenuoptions[i] == "suspend" then --restart instead of suspend
+			if dcplaying and pausemenuoptions[i] == "save game" then --restart instead of suspend
 				properprintF(TEXT["restart"], (width*8*scale)-35*scale, (112*scale)-60*scale+(i-1)*25*scale)
-			elseif (collectablescount[1] > 0 or collectablescount[2] > 0 or collectablescount[3] > 0 or collectablescount[4] > 0 or
-			collectablescount[5] > 0 or collectablescount[6] > 0 or collectablescount[7] > 0 or collectablescount[8] > 0 or
-			collectablescount[9] > 0 or collectablescount[10] > 0)
-				and pausemenuoptions[i] == "suspend" then --make it more obvious that you can save your progress
-				properprintF(TEXT["save game"], (width*8*scale)-35*scale, (112*scale)-60*scale+(i-1)*25*scale)
+			elseif alwaysdeletesuspend and pausemenuoptions[i] == "save game" then
+				properprintF(TEXT["suspend"], (width*8*scale)-35*scale, (112*scale)-60*scale+(i-1)*25*scale)
 			else
 				properprintF(TEXT[pausemenuoptions[i]], (width*8*scale)-35*scale, (112*scale)-60*scale+(i-1)*25*scale)
 			end
@@ -2929,14 +2932,12 @@ function game_draw()
 			love.graphics.rectangle("fill", (width*8*scale)-100*scale, (112*scale)-25*scale, 200*scale, 50*scale)
 			love.graphics.setColor(255, 255, 255, 255)
 			drawrectangle((width*8)-99, 112-24, 198, 48)
-			if (collectablescount[1] > 0 or collectablescount[2] > 0 or collectablescount[3] > 0 or collectablescount[4] > 0 or
-			collectablescount[5] > 0 or collectablescount[6] > 0 or collectablescount[7] > 0 or collectablescount[8] > 0 or
-			collectablescount[9] > 0 or collectablescount[10] > 0) then --make it more obvious that you can save your progress
-				properprintF(TEXT["save game? this will"], (width*8*scale)-utf8.len(TEXT["save game? this will"])*4*scale, (112*scale)-20*scale)
-				properprintF(TEXT["overwrite last save."], (width*8*scale)-utf8.len(TEXT["overwrite last save."])*4*scale, (112*scale)-10*scale)
-			else
+			if alwaysdeletesuspend then
 				properprintF(TEXT["suspend game? this can"], (width*8*scale)-utf8.len(TEXT["suspend game? this can"])*4*scale, (112*scale)-20*scale)
 				properprintF(TEXT["only be loaded once!"], (width*8*scale)-utf8.len(TEXT["only be loaded once!"])*4*scale, (112*scale)-10*scale)
+			else
+				properprintF(TEXT["save game? this will"], (width*8*scale)-utf8.len(TEXT["save game? this will"])*4*scale, (112*scale)-20*scale)
+				properprintF(TEXT["overwrite last save."], (width*8*scale)-utf8.len(TEXT["overwrite last save."])*4*scale, (112*scale)-10*scale)
 			end
 			if pausemenuselected2 == 1 then
 				properprintF(">", (width*8*scale)-51*scale, (112*scale)+4*scale)
@@ -5060,7 +5061,7 @@ function game_keypressed(key, textinput)
 				else
 					playmusic()
 				end
-			elseif pausemenuoptions[pausemenuselected] == "suspend" then
+			elseif pausemenuoptions[pausemenuselected] == "save game" then
 				if dcplaying then
 					pausemenuopen = false
 					updatesizes("reset")

gui.lua

@@ -991,7 +991,7 @@ function guielement:keypress(key,textinput)
 						if not (textinput and textinput == "forcetextinput") then
 							local justchanged = false
 							if not doubleinput then
-								if doubleinputcheck and doubleinputcheck == key then
+								if doubleinputcheck and key and doubleinputcheck:lower() == key:lower() then
 									doubleinput = true
 									justchanged = true
 								end

languages/english.json

@@ -5,6 +5,10 @@
 	"level editor": "level editor",
 	"select mappack": "select mappack",
 	"options": "options",
+	"starting a new game will": "starting a new game will",
+	"delete your existing save!": "delete your existing save!",
+	"new game": "new game",
+	"go back": "go back",
 	"select world": "select world",
 
 "^_Settings":"",
@@ -342,4 +346,5 @@
 
 "^_Notices":"",
 	"Map saved!": "Map saved!",
+	"game saved!": "game saved!",
 }

main.lua

@@ -445,9 +445,11 @@ function love.load()
 		soundenabled = true
 	end
 	love.filesystem.createDirectory("mappacks")
+	love.filesystem.createDirectory("saves")
 
 	love.filesystem.createDirectory("alesans_entities")
 	love.filesystem.createDirectory("alesans_entities/mappacks")
+	love.filesystem.createDirectory("alesans_entities/saves")
 	love.filesystem.createDirectory("alesans_entities/onlinemappacks")
 	love.filesystem.createDirectory("alesans_entities/characters")
 	love.filesystem.createDirectory("alesans_entities/hats")
@@ -477,6 +479,10 @@ function love.load()
 		saveconfig()
 	end
 
+	if love.filesystem.getInfo("suspend") then
+		convertoldsuspendfile()
+	end
+
 	loadingbardraw(1)
 
 	--check date for daily challenges
@@ -1601,6 +1607,7 @@ function loadconfig(nodefaultconfig)
 			end
 		elseif s2[1] == "modmappacks" then
 			mappackfolder = "alesans_entities/mappacks"
+			savesfolder = "alesans_entities/saves"
 		elseif s2[1] == "resizable" then
 			if s2[2] then
 				resizable = (s2[2] == "true")
@@ -1732,13 +1739,14 @@ function defaultconfig()
 	mappack = "smb"
 	vsync = false
 	mappackfolder = "mappacks"
+	savesfolder = "saves"
 	fourbythree = false
 	localnick = false
 
 	reachedworlds = {}
 end
 
-function suspendgame()
+function writesuspendfile()
 	local st = {}
 	if marioworld == "M" then
 		marioworld = 8
@@ -1788,18 +1796,22 @@ function suspendgame()
 	st.mappackfolder = mappackfolder
 
 	local s = JSON:encode_pretty(st)
-	love.filesystem.write("suspend", s)
-	
+	love.filesystem.write(savesfolder .. "/" .. mappack .. ".suspend", s)
+end
+
+function suspendgame()
+	writesuspendfile()
 	love.audio.stop()
 	menu_load()
 end
 
 function continuegame()
-	if not love.filesystem.getInfo("suspend") then
+	savefile = savesfolder .. "/" .. mappack .. ".suspend"
+	if not love.filesystem.getInfo(savefile) then
 		return
 	end
 
-	local s = love.filesystem.read("suspend")
+	local s = love.filesystem.read(savefile)
 	local st = JSON:decode(s)
 
 	mariosizes = {}
@@ -1836,10 +1848,6 @@ function continuegame()
 	end
 	mappack = st.mappack
 	mappackfolder = st.mappackfolder
-	
-	if (not st.collectables) then	--save the game if collectables are involved
-		love.filesystem.remove("suspend")
-	end
 
 	loadbackground("1-1.txt")
 
@@ -3110,6 +3118,17 @@ function disablecheats()
 	darkmode = false
 end
 
+function convertoldsuspendfile()
+	local s = love.filesystem.read("suspend")
+	local st = JSON:decode(s)
+
+	-- *ahem* sus. [crowd cheering]
+	local suspendedmappackfolder = st.mappackfolder
+	local suspendedmappack = st.mappack
+	love.filesystem.write(suspendedmappackfolder:gsub("mappacks", "saves") .. "/" .. suspendedmappack .. ".suspend", s)
+	love.filesystem.remove("suspend")
+end
+
 --sausage (don't ask)
 function dothesausage(i)
 	if i then

mappack.lua

@@ -26,6 +26,8 @@ function loadmappacksettings(suspended)
 			continuesublevelmusic = true
 		elseif s2[1] == "nolowtime" then
 			nolowtime = true
+		elseif s2[1] == "usesuspends" then
+			alwaysdeletesuspend = true
 		elseif s2[1] == "character" then
 			for i = 1, players do
 				setcustomplayer(s2[2], i)