Merge branch 'master' of https://github.com/MillaBasset/cambridge

scene/game.lua

@@ -27,6 +27,9 @@ function GameScene:new(game_mode, ruleset, inputs)
 	DiscordRPC:update({
 		details = self.game.rpc_details,
 		state = self.game.name,
+		--largeImageText = "Level "..self.game.level????
+		largeImageKey = "ingame-0"
+		--largeImageKey = ingame-<section>
 	})
 end
 

scene/game_config.lua

@@ -27,9 +27,9 @@ function ConfigScene:new()
 	-- load current config
 	self.config = config.input
 	self.highlight = 1
-	
+
 	DiscordRPC:update({
-		details = "In menus",
+		details = "In settings",
 		state = "Changing game settings",
 	})
 
@@ -52,7 +52,7 @@ function ConfigScene:render()
 
 	love.graphics.setFont(font_3x5_4)
 	love.graphics.print("GAME SETTINGS", 80, 40)
-	
+
 	--Lazy check to see if we're on the SFX or BGM slider. Probably will need to be rewritten if more options get added.
 	love.graphics.setColor(1, 1, 1, 0.5)
 	if not ConfigScene.options[self.highlight][3] then
@@ -60,7 +60,7 @@ function ConfigScene:render()
 	else
 		love.graphics.rectangle("fill", 65 + (1+self.highlight-#self.options) * 300, 342, 215, 33)
 	end
-	
+
 	love.graphics.setFont(font_3x5_2)
 	for i, option in ipairs(ConfigScene.options) do
 		if not option[3] then

scene/input_config.lua

@@ -10,7 +10,7 @@ local menu_screens = {
 function ConfigScene:new()
     self.menu_state = 1
     DiscordRPC:update({
-        details = "In menus",
+        details = "In settings",
         state = "Changing input config",
     })
 end
@@ -63,4 +63,4 @@ function ConfigScene:onInputPress(e)
 	end
 end
 
-return ConfigScene
+return ConfigScene

scene/key_config.lua

@@ -35,7 +35,7 @@ function KeyConfigScene:new()
 	self.new_input = {}
 
 	DiscordRPC:update({
-		details = "In menus",
+		details = "In settings",
 		state = "Changing key config",
 	})
 end

scene/mode_select.lua

@@ -39,6 +39,7 @@ function ModeSelectScene:new()
 	DiscordRPC:update({
 		details = "In menus",
 		state = "Choosing a mode",
+		largeImageKey = "icon2"
 	})
 end
 

scene/settings.lua

@@ -8,11 +8,20 @@ local menu_screens = {
     TuningScene
 }
 
+local settingsidle = {
+  "Tweaking some knobs",
+  "Tuning up",
+  "Adjusting options",
+  "Setting up",
+  "Setting the settings"
+}
+
 function SettingsScene:new()
     self.menu_state = 1
     DiscordRPC:update({
-        details = "In menus",
+        details = "In settings",
-        state = "Changing settings",
+        state = settingsidle[math.random(#settingsidle)],
+        largeImageKey = "settings",
     })
 end
 
@@ -62,4 +71,4 @@ function SettingsScene:onInputPress(e)
 	end
 end
 
-return SettingsScene
+return SettingsScene

scene/title.lua

@@ -23,6 +23,10 @@ local mainmenuidle = {
 	"Having a nap",
 	"In menus",
 	"Bottom text",
+	"Trying to see all the funny rpc messages (maybe)",
+	"Not not not playing",
+	"AFK",
+	"Preparing for their next game"
 }
 
 function TitleScene:new()
@@ -35,6 +39,7 @@ function TitleScene:new()
 	DiscordRPC:update({
 		details = "In menus",
 		state = mainmenuidle[math.random(#mainmenuidle)],
+		largeImageKey = "icon2",
 	})
 end