Merge pull request #490 from besteon/dev

8.9.0 Release
besteon · Nov 12, 2024 · e607a4f · e607a4f
2 parents 236afab + 89f1c65
commit e607a4f
Show file tree

Hide file tree

Showing 27 changed files with 1,444 additions and 836 deletions.
diff --git a/ironmon_tracker/Constants.lua b/ironmon_tracker/Constants.lua
@@ -131,6 +131,7 @@ Constants.OrderedLists = {
 		"Override Button Mode to LR",
 		"Show last damage calcs",
 		"Reveal info if randomized",
+		"Game Over condition",
 		"Show experience points bar",
 		"Animated Pokemon popout",
 		"Refocus emulator after load",
@@ -398,6 +399,18 @@ Constants.PixelImages = {
 		{0,0,0,0,0,0,0,0,0,0},
 		{0,0,0,0,0,0,0,0,0,0},
 	},
+	REFERENCE_RIGHT = { -- 10x10,
+		{0,0,0,0,0,0,0,0,0,0},
+		{0,0,1,0,0,0,0,0,0,0},
+		{0,0,1,0,0,0,0,0,0,0},
+		{0,0,1,0,0,0,1,0,0,0},
+		{0,0,1,0,0,0,1,1,0,0},
+		{0,0,1,0,0,0,0,1,1,0},
+		{0,0,0,1,1,1,1,1,1,1},
+		{0,0,0,0,0,0,0,1,1,0},
+		{0,0,0,0,0,0,1,1,0,0},
+		{0,0,0,0,0,0,1,0,0,0},
+	},
 	MAP_PINDROP = { -- 8x12
 		{0,0,1,1,1,1,0,0},
 		{0,1,1,1,1,1,1,0},
@@ -749,6 +762,8 @@ Constants.Char = {
 	["."] = { width = 1, },
 	["("] = { width = 2, },
 	[")"] = { width = 2, },
+	["["] = { width = 2, },
+	["]"] = { width = 2, },
 	["#"] = { width = 5, },
 	["&"] = { width = 5, },
 	["?"] = { width = 4, },

diff --git a/ironmon_tracker/Drawing.lua b/ironmon_tracker/Drawing.lua
@@ -421,13 +421,13 @@ function Drawing.drawButton(button, shadowcolor)
 		Drawing.drawText(x + 1, y, text, textColor, shadowcolor)
 	elseif button.type == Constants.ButtonTypes.CHECKBOX then
 		if button.disabled then
-			textColor = "Negative text"
+			textColor = Theme.COLORS["Negative text"]
 		end
 		Drawing.drawText(x + width + 1, y - 2, text, textColor, shadowcolor)
 
 		-- Draw a mark if the checkbox button is toggled on
 		if button.toggleState then
-			local toggleColor = Utils.inlineIf(button.disabled, "Negative text", button.toggleColor or "Positive text")
+			local toggleColor = (button.disabled and "Negative text") or button.toggleColor or "Positive text"
 			gui.drawLine(x + 1, y + 1, x + width - 1, y + height - 1, Theme.COLORS[toggleColor])
 			gui.drawLine(x + 1, y + height - 1, x + width - 1, y + 1, Theme.COLORS[toggleColor])
 		end

diff --git a/ironmon_tracker/Languages/English.lua b/ironmon_tracker/Languages/English.lua
@@ -200,9 +200,9 @@ ScreenResources{
 		TabControls = "Controls",
 		PokemonIconSetLabel = "Pokémon icon set",
 		PokemonIconSetAuthor = "Added by",
+		OptionShowRandomBallPicker = "Show random ball picker",
 		OptionShowTeamView = "Show Team View",
 		OptionRightJustifiedNumbers = "Right justified numbers",
-		OptionShowNicknames = "Show nicknames",
 		OptionTrackPCHeals = "Track PC Heals",
 		OptionPCHealsCountDown = "PC heals count downward",
 		OptionAllowSpritesToWalk = "Walk",
@@ -245,9 +245,6 @@ ScreenResources{
 		LabelTimer = "Timer options",
 		ButtonEditTime = "Edit",
 		ButtonRelocateTime = "Relocate",
-		OptionShowRandomBallPicker = "Show random ball picker",
-		OptionShowHealsAsValue = "Show heals as whole number",
-		OptionShowBallCatchRate = "Show Poké Ball catch rate",
 		OptionDisplayRepelUsage = "Display repel usage",
 		OptionDisplayPedometer = "Display step pedometer",
 		OptionDisplayPlayTime = "Display play time",
@@ -263,17 +260,29 @@ ScreenResources{
 	},
 	GameOptionsScreen = {
 		Title = "Gameplay Options",
+		TabBattle = "Battle",
+		TabGameOver = "Game Over",
+		TabOther = "Other",
 		ButtonGameStats = "Game Stats",
+		LabelGameOverCondition = "Game is considered over when",
 		OptionAutoSwapEnemy = "Auto swap to enemy",
 		OptionHideStatsUntilSummary = "Hide info until summary shown",
+		OptionShowNicknames = "Show nicknames",
 		OptionShowExpBar = "Show experience points bar",
+		OptionShowHealsAsValue = "Show heals as whole number",
 		OptionShowPhysicalSpecial = "Show physical special icons",
 		OptionShowMoveEffectiveness = "Show move effectiveness",
 		OptionCalculateVariableDamage = "Calculate variable damage",
 		OptionDetermineFriendship = "Determine friendship readiness",
+		OptionShowBallCatchRate = "Show Poké Ball catch rate",
 		OptionCountEnemyPP = "Count enemy PP usage",
 		OptionShowLastDamage = "Show last damage calcs",
 		OptionRevealRandomizedInfo = "Show random move/type data",
+		OptionLeadPokemonFaints = "Lead Pokémon faints",
+		OptionHighestLevelFaints = "Highest level faints",
+		OptionEntirePartyFaints = "Entire party faints",
+		OptionOpenBookPlayMode = "Open Book play mode",
+		LabelExtraTimeWarning = "May add extra load time",
 	},
 	QuickloadScreen = {
 		Title = "New Runs Setup",
@@ -527,7 +536,6 @@ ScreenResources{
 		Title = "G a m e O v e r",
 		LabelAttempt = "Attempt",
 		LabelPlayTime = "Play Time",
-		LabelNotesGrade = "Notes Grade",
 		ButtonViewGrade = "View",
 		QuoteCongratulations = "CONGRATULATIONS!!",
 		ButtonContinuePlaying = "Continue playing",
@@ -536,6 +544,7 @@ ScreenResources{
 		ButtonSaveAttempt = "Save this attempt",
 		ButtonSaveSuccessful = "Saved in Tracker folder",
 		ButtonSaveFailed = "Unable to save",
+		ButtonGradeMyNotes = "Grade my notes",
 		ButtonInspectLogFile = "Inspect the log",
 		ButtonOpenLogFile = "Open a log file",
 	},
@@ -615,8 +624,6 @@ ScreenResources{
 		CheckboxShowUnlearnableGymTMs = "Show unlearnable Gym TMs",
 		CheckboxShowPreEvolutions = "Show Pre Evolutions",
 		CheckboxCustomTrainerNames = "Custom Trainer Names",
-		CheckboxOpenBookMode = "Open Book Play Mode",
-		LabelExtraTimeWarning = "May add extra load time",
 		PromptShareSeedTitle = "Share Randomizer Seed",
 		PromptShareSeedDesc = "Copy/paste everything below to share. Load it through Randomizer --> Premade Seed.",
 	},
@@ -660,6 +667,8 @@ ScreenResources{
 		CMD_Move_Help = "name > Displays game info for a move.",
 		CMD_Ability_Name = "Ability Info",
 		CMD_Ability_Help = "name > Displays game info for a Pokémon's ability.",
+		CMD_Trainer_Name = "Trainer Info",
+		CMD_Trainer_Help = "[name id] > Displays info about the most recent trainer fought, or for a specific trainer name or id.",
 		CMD_Route_Name = "Route Info",
 		CMD_Route_Help = "name > Displays trainer and wild encounter info for a route or area.",
 		CMD_Dungeon_Name = "Dungeon Info",
@@ -704,6 +713,8 @@ ScreenResources{
 		CR_ChangeFavoriteThree_Name = "Change Starter Favorite: #3",
 		CR_ChangeTheme_Name = "Change Tracker Theme",
 		CR_ChangeLanguage_Name = "Change Tracker Language",
+		GE_GameOver_Name = "When the game is over...",
+		GE_GameOver_TriggerEffect = "Update SB Global Variables",
 		O_SendMessage = "Send chat message if successful",
 		O_AutoComplete = "Auto-complete the redeem",
 		O_RequireChosenMon = "Your pick direction must match",

diff --git a/ironmon_tracker/Languages/French.lua b/ironmon_tracker/Languages/French.lua
@@ -200,9 +200,9 @@ ScreenResources{
 		TabControls = "Controls", -- NEEDS TRANSLATION
 		PokemonIconSetLabel = "Pokémon icon set", -- NEEDS TRANSLATION
 		PokemonIconSetAuthor = "Added by", -- NEEDS TRANSLATION
+		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
 		OptionShowTeamView = "Show Team View", -- NEEDS TRANSLATION
 		OptionRightJustifiedNumbers = "Right justified numbers", -- NEEDS TRANSLATION
-		OptionShowNicknames = "Show nicknames", -- NEEDS TRANSLATION
 		OptionTrackPCHeals = "Track PC Heals", -- NEEDS TRANSLATION
 		OptionPCHealsCountDown = "PC heals count downward", -- NEEDS TRANSLATION
 		OptionAllowSpritesToWalk = "Walk", -- NEEDS TRANSLATION
@@ -245,9 +245,6 @@ ScreenResources{
 		LabelTimer = "Timer options", -- NEEDS TRANSLATION
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
-		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
-		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
-		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -263,17 +260,29 @@ ScreenResources{
 	},
 	GameOptionsScreen = {
 		Title = "Gameplay Options", -- NEEDS TRANSLATION
+		TabBattle = "Battle", -- NEEDS TRANSLATION
+		TabGameOver = "Game Over", -- NEEDS TRANSLATION
+		TabOther = "Other", -- NEEDS TRANSLATION
 		ButtonGameStats = "Game Stats", -- NEEDS TRANSLATION
+		LabelGameOverCondition = "Game is considered over when", -- NEEDS TRANSLATION
 		OptionAutoSwapEnemy = "Auto swap to enemy", -- NEEDS TRANSLATION
 		OptionHideStatsUntilSummary = "Hide info until summary shown", -- NEEDS TRANSLATION
+		OptionShowNicknames = "Show nicknames", -- NEEDS TRANSLATION
 		OptionShowExpBar = "Show experience points bar", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
 		OptionShowPhysicalSpecial = "Show physical special icons", -- NEEDS TRANSLATION
 		OptionShowMoveEffectiveness = "Show move effectiveness", -- NEEDS TRANSLATION
 		OptionCalculateVariableDamage = "Calculate variable damage", -- NEEDS TRANSLATION
 		OptionDetermineFriendship = "Determine friendship readiness", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
-		OptionRevealRandomizedInfo = "Reveal info if randomized", -- NEEDS TRANSLATION
+		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionLeadPokemonFaints = "Lead Pokémon faints", -- NEEDS TRANSLATION
+		OptionHighestLevelFaints = "Highest level faints", -- NEEDS TRANSLATION
+		OptionEntirePartyFaints = "Entire party faints", -- NEEDS TRANSLATION
+		OptionOpenBookPlayMode = "Open Book play mode", -- NEEDS TRANSLATION
+		LabelExtraTimeWarning = "May add extra load time", -- NEEDS TRANSLATION
 	},
 	QuickloadScreen = {
 		Title = "New Runs Setup", -- NEEDS TRANSLATION
@@ -527,7 +536,6 @@ ScreenResources{
 		Title = "G a m e O v e r", -- NEEDS TRANSLATION
 		LabelAttempt = "Attempt", -- NEEDS TRANSLATION
 		LabelPlayTime = "Play Time", -- NEEDS TRANSLATION
-		LabelNotesGrade = "Notes Grade", -- NEEDS TRANSLATION
 		ButtonViewGrade = "View", -- NEEDS TRANSLATION
 		QuoteCongratulations = "CONGRATULATIONS!!", -- NEEDS TRANSLATION
 		ButtonContinuePlaying = "Continue playing", -- NEEDS TRANSLATION
@@ -536,6 +544,7 @@ ScreenResources{
 		ButtonSaveAttempt = "Save this attempt", -- NEEDS TRANSLATION
 		ButtonSaveSuccessful = "Saved in Tracker folder", -- NEEDS TRANSLATION
 		ButtonSaveFailed = "Unable to save", -- NEEDS TRANSLATION
+		ButtonGradeMyNotes = "Grade my notes", -- NEEDS TRANSLATION
 		ButtonInspectLogFile = "Inspect the log", -- NEEDS TRANSLATION
 		ButtonOpenLogFile = "Open a log file", -- NEEDS TRANSLATION
 	},
@@ -615,8 +624,6 @@ ScreenResources{
 		CheckboxShowUnlearnableGymTMs = "Show unlearnable Gym TMs", -- NEEDS TRANSLATION
 		CheckboxShowPreEvolutions = "Show Pre Evolutions", -- NEEDS TRANSLATION
 		CheckboxCustomTrainerNames = "Custom Trainer Names", -- NEEDS TRANSLATION
-		CheckboxOpenBookMode = "Open Book Play Mode", -- NEEDS TRANSLATION
-		LabelExtraTimeWarning = "May add extra load time", -- NEEDS TRANSLATION
 		PromptShareSeedTitle = "Share Randomizer Seed", -- NEEDS TRANSLATION
 		PromptShareSeedDesc = "Copy/paste everything below to share. Load it through Randomizer --> Premade Seed.", -- NEEDS TRANSLATION
 	},
@@ -661,6 +668,8 @@ ScreenResources{
 		CMD_Move_Help = "name > Displays game info for a move.",
 		CMD_Ability_Name = "Ability Info",
 		CMD_Ability_Help = "name > Displays game info for a Pokémon's ability.",
+		CMD_Trainer_Name = "Trainer Info",
+		CMD_Trainer_Help = "[name id] > Displays info about the most recent trainer fought, or for a specific trainer name or id.",
 		CMD_Route_Name = "Route Info",
 		CMD_Route_Help = "name > Displays trainer and wild encounter info for a route or area.",
 		CMD_Dungeon_Name = "Dungeon Info",
@@ -705,6 +714,8 @@ ScreenResources{
 		CR_ChangeFavoriteThree_Name = "Change Starter Favorite: #3",
 		CR_ChangeTheme_Name = "Change Tracker Theme",
 		CR_ChangeLanguage_Name = "Change Tracker Language",
+		GE_GameOver_Name = "When the game is over...",
+		GE_GameOver_TriggerEffect = "Update SB Global Variables",
 		O_SendMessage = "Send chat message if successful",
 		O_AutoComplete = "Auto-complete the redeem",
 		O_RequireChosenMon = "Your pick direction must match",

diff --git a/ironmon_tracker/Languages/German.lua b/ironmon_tracker/Languages/German.lua
@@ -200,9 +200,9 @@ ScreenResources{
 		TabControls = "Controls", -- NEEDS TRANSLATION
 		PokemonIconSetLabel = "Pokémon icon set", -- NEEDS TRANSLATION
 		PokemonIconSetAuthor = "Added by", -- NEEDS TRANSLATION
+		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
 		OptionShowTeamView = "Show Team View", -- NEEDS TRANSLATION
 		OptionRightJustifiedNumbers = "Right justified numbers", -- NEEDS TRANSLATION
-		OptionShowNicknames = "Show nicknames", -- NEEDS TRANSLATION
 		OptionTrackPCHeals = "Track PC Heals", -- NEEDS TRANSLATION
 		OptionPCHealsCountDown = "PC heals count downward", -- NEEDS TRANSLATION
 		OptionAllowSpritesToWalk = "Walk", -- NEEDS TRANSLATION
@@ -245,9 +245,6 @@ ScreenResources{
 		LabelTimer = "Timer options", -- NEEDS TRANSLATION
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
-		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
-		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
-		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -263,17 +260,29 @@ ScreenResources{
 	},
 	GameOptionsScreen = {
 		Title = "Gameplay Options", -- NEEDS TRANSLATION
+		TabBattle = "Battle", -- NEEDS TRANSLATION
+		TabGameOver = "Game Over", -- NEEDS TRANSLATION
+		TabOther = "Other", -- NEEDS TRANSLATION
 		ButtonGameStats = "Game Stats", -- NEEDS TRANSLATION
+		LabelGameOverCondition = "Game is considered over when", -- NEEDS TRANSLATION
 		OptionAutoSwapEnemy = "Auto swap to enemy", -- NEEDS TRANSLATION
 		OptionHideStatsUntilSummary = "Hide info until summary shown", -- NEEDS TRANSLATION
+		OptionShowNicknames = "Show nicknames", -- NEEDS TRANSLATION
 		OptionShowExpBar = "Show experience points bar", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
 		OptionShowPhysicalSpecial = "Show physical special icons", -- NEEDS TRANSLATION
 		OptionShowMoveEffectiveness = "Show move effectiveness", -- NEEDS TRANSLATION
 		OptionCalculateVariableDamage = "Calculate variable damage", -- NEEDS TRANSLATION
 		OptionDetermineFriendship = "Determine friendship readiness", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionLeadPokemonFaints = "Lead Pokémon faints", -- NEEDS TRANSLATION
+		OptionHighestLevelFaints = "Highest level faints", -- NEEDS TRANSLATION
+		OptionEntirePartyFaints = "Entire party faints", -- NEEDS TRANSLATION
+		OptionOpenBookPlayMode = "Open Book play mode", -- NEEDS TRANSLATION
+		LabelExtraTimeWarning = "May add extra load time", -- NEEDS TRANSLATION
 	},
 	QuickloadScreen = {
 		Title = "New Runs Setup", -- NEEDS TRANSLATION
@@ -527,7 +536,6 @@ ScreenResources{
 		Title = "G a m e O v e r", -- NEEDS TRANSLATION
 		LabelAttempt = "Attempt", -- NEEDS TRANSLATION
 		LabelPlayTime = "Play Time", -- NEEDS TRANSLATION
-		LabelNotesGrade = "Notes Grade", -- NEEDS TRANSLATION
 		ButtonViewGrade = "View", -- NEEDS TRANSLATION
 		QuoteCongratulations = "CONGRATULATIONS!!", -- NEEDS TRANSLATION
 		ButtonContinuePlaying = "Continue playing", -- NEEDS TRANSLATION
@@ -536,6 +544,7 @@ ScreenResources{
 		ButtonSaveAttempt = "Save this attempt", -- NEEDS TRANSLATION
 		ButtonSaveSuccessful = "Saved in Tracker folder", -- NEEDS TRANSLATION
 		ButtonSaveFailed = "Unable to save", -- NEEDS TRANSLATION
+		ButtonGradeMyNotes = "Grade my notes", -- NEEDS TRANSLATION
 		ButtonInspectLogFile = "Inspect the log", -- NEEDS TRANSLATION
 		ButtonOpenLogFile = "Open a log file", -- NEEDS TRANSLATION
 	},
@@ -615,8 +624,6 @@ ScreenResources{
 		CheckboxShowUnlearnableGymTMs = "Show unlearnable Gym TMs", -- NEEDS TRANSLATION
 		CheckboxShowPreEvolutions = "Show Pre Evolutions", -- NEEDS TRANSLATION
 		CheckboxCustomTrainerNames = "Custom Trainer Names", -- NEEDS TRANSLATION
-		CheckboxOpenBookMode = "Open Book Play Mode", -- NEEDS TRANSLATION
-		LabelExtraTimeWarning = "May add extra load time", -- NEEDS TRANSLATION
 		PromptShareSeedTitle = "Share Randomizer Seed", -- NEEDS TRANSLATION
 		PromptShareSeedDesc = "Copy/paste everything below to share. Load it through Randomizer --> Premade Seed.", -- NEEDS TRANSLATION
 	},
@@ -661,6 +668,8 @@ ScreenResources{
 		CMD_Move_Help = "name > Displays game info for a move.",
 		CMD_Ability_Name = "Ability Info",
 		CMD_Ability_Help = "name > Displays game info for a Pokémon's ability.",
+		CMD_Trainer_Name = "Trainer Info",
+		CMD_Trainer_Help = "[name id] > Displays info about the most recent trainer fought, or for a specific trainer name or id.",
 		CMD_Route_Name = "Route Info",
 		CMD_Route_Help = "name > Displays trainer and wild encounter info for a route or area.",
 		CMD_Dungeon_Name = "Dungeon Info",
@@ -705,6 +714,8 @@ ScreenResources{
 		CR_ChangeFavoriteThree_Name = "Change Starter Favorite: #3",
 		CR_ChangeTheme_Name = "Change Tracker Theme",
 		CR_ChangeLanguage_Name = "Change Tracker Language",
+		GE_GameOver_Name = "When the game is over...",
+		GE_GameOver_TriggerEffect = "Update SB Global Variables",
 		O_SendMessage = "Send chat message if successful",
 		O_AutoComplete = "Auto-complete the redeem",
 		O_RequireChosenMon = "Your pick direction must match",