Fix Quick Restart Crashing; small code cleanup

.gitignore

@@ -0,0 +1,6 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/.vs
+ModUtil/**

.gitmodules

@@ -0,0 +1,16 @@
+[submodule "RunStartControl"]
+	path = RunStartControl
+	url = https://github.com/Museus/RunStartControl.git
+[submodule "sgg-mod-modutil"]
+	path = ModUtil
+	url = https://github.com/SGG-Modding/sgg-mod-modutil.git
+[submodule "HellModeToggle"]
+	path = HellModeToggle
+	url = https://github.com/cgullsHadesMods/HellModeToggle
+[submodule "DontGetVorimed"]
+	path = DontGetVorimed
+	url = https://github.com/cgullsHadesMods/DontGetVorimed
+[submodule "hades-CharonSackControl"]
+	path = hades-CharonSackControl
+	url = https://github.com/cgullsHadesMods/hades-CharonSackControl.git
+

CHANGELOG.md

@@ -0,0 +1,114 @@
+
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/), and will follow [Semantic Versioning](https://semver.org/).
+
+## [1.2.0] - 2022-05-30
+
+### Added
+
+ - Can now toggle guaranteed Charon Sack spawn for Loyalty Card
+ - QuickRestart now sets a flag for the Livesplit autosplitter to reset
+
+### Changed
+ - QuickRestart spawns you in the Courtyard instead of the blood pool
+ - QuickRestart re-equips your starting keepsake
+ - RtaTimer is now more efficient - should remove any lag issues that it was causing
+ - Default Hammer for Rama Aspect of the Bow is now Twin Shot
+ - Renamed sgg-mod-modutil to reduce duplicate ModUtil user installs
+
+### Bug fixes
+ - ShowChamberNumber now works with newer versions of modimporter
+
+## [1.1.1] - 2021-09-14
+
+### Added
+
+ - Can now toggle Hell Mode in mod settings
+
+### Removed
+
+ - Starting Boon Selector was not legal on any rulesets
+
+### Changed
+
+ - Clarified ruleset text
+ - Cleaned up menu and credits
+
+### Bug fixes
+
+ - Remove Approval Process blocking on the DontGetVorimed boon
+ - Slight delay before QuickRestart to remove interaction bugs
+
+## [1.1.0] - 2021-08-01
+
+### Added
+
+ - Single-run ruleset
+
+### Changed
+
+ - Quick Restart also resets RtaTimer
+ - Replaced FixedHammers with RunStartControl
+ - Asterius removed from Leaderboard ruleset
+
+### Bug fixes
+
+ - Can no longer reset during the pause before Thanatos Encounter spawns to prevent broken GameState
+
+
+
+## [1.0.0] - 2021-06-04
+
+No major bugs were found with v1.0.0-rc.2 so we are moving forward with leaderboard creation!
+
+## [1.0.0-rc.2] - 2021-05-30
+
+### Changed
+
+- Quick Restart (insta-kill) can only be activated if
+  - Zagreus is not in the house
+  - Zagreus is not frozen (cutscenes, boon pickups, room endings)
+  - Combat UI is visible
+
+ This is to prevent a variety of bugs, from duplicated boons to crashes. [#39](https://github.com/ellomenop/HadesSpeedrunningModPack/pull/39)
+
+- BoonSelector now has all filters enabled by default, and the rarity filter will be disabled automatically if "DontGetVorimed" is enabled. [#45](https://github.com/ellomenop/HadesSpeedrunningModPack/pull/45)
+
+- EmoteMod has been disabled due to an unknown issue with MacOS [#48](https://github.com/ellomenop/HadesSpeedrunningModPack/pull/48)
+
+### Fixed
+
+- MinibossControl now forces the correct amount of miniboss doors in Asphodel. [#38](https://github.com/ellomenop/HadesSpeedrunningModPack/pull/38)
+
+- MinibossControl now enforces changes on save reload. [#38](https://github.com/ellomenop/HadesSpeedrunningModPack/pull/38)
+
+## [1.0.0-rc.1] - 2021-05-27
+
+Initial "Beta" release of the modpack. This includes:
+
+- Colorblind
+- DontGetVorimed
+- DoorVisualIndicators
+- StartingBoonSelector
+- EmoteMod
+- ErumiUILib
+- FixedHammers
+- HadesSpeedrunningModpack
+- InteractableChaos
+- LootChoiceExt
+- MinibossControl
+- ModConfigMenu
+- ModUtil
+- ModdedWarning
+- PrintUtil
+- QuickRestart
+- RemoveCutscenes
+- RoomDeterminism
+- RTATimer
+- SatyrSackControl
+- ShowChamberNumber
+- ThanatosControl
+
+as well as a ruleset preset for "Multiweapon Leaderboard" runs.

ChaosControl/ChaosControl.lua

@@ -0,0 +1,118 @@
+--[[
+    ChaosControl
+    Authors:
+        SleepSoul (Discord: SleepSoul#6006)
+        Museus (Discord: Museus#7777)
+    Dependencies: ModUtil, RCLib
+    Change the eligible offerings from Chaos, allowing certain curses or blessings to be removed.
+]]
+ModUtil.Mod.Register("ChaosControl")
+
+local config = {
+  ChaosSetting = "Vanilla"
+}
+ChaosControl.config = config --TODO add config option in menu
+ChaosControl.EligibleBlessings = {}
+ChaosControl.EligibleCurses = {}
+ChaosControl.VanillaBlessings = {}
+ChaosControl.VanillaCurses = {}
+
+ChaosControl.Presets = { --Define rulesets
+    Vanilla = {},
+    Hypermodded = {
+        Blessings = {
+            Eclipse = false,
+        },
+        Curses = {
+            Roiling = false,
+        },
+    },
+    Debug = {
+        Blessings = {
+            Shot = true,
+        },
+        Curses = {
+            Abyssal = true,
+        },
+    }
+}
+
+ChaosControl.InheritVanilla = { -- Presets set to true will inherit the vanilla traits and only remove those set to false, Presets set to false will start from 0 and only add those set to true.
+    Hypermodded = {
+        Blessings = true,
+        Curses = true,
+    },
+}
+
+function ChaosControl.ReadPreset() -- Read current preset and create table of blessings and curses marked to eligible, including failsafe for presets with <3 traits
+    local Preset = {
+        Blessings = {},
+        Curses = {},
+    }
+    local InheritVanilla = {}
+    if ChaosControl.Presets[config.ChaosSetting] ~= nil then
+        Preset = ChaosControl.Presets[config.ChaosSetting]
+    end
+    if ChaosControl.InheritVanilla[config.ChaosSetting] ~= nil then
+        InheritVanilla = ChaosControl.InheritVanilla[config.ChaosSetting]
+    end
+    if Preset.Blessings ~= nil then
+        if InheritVanilla.Blessings then
+            RCLib.PopulateMinLength(
+                ChaosControl.EligibleBlessings,
+                RCLib.RemoveIneligibleStrings(Preset.Blessings,ChaosControl.VanillaBlessings,RCLib.NameToCode.ChaosBlessings),
+                3
+            )
+        else
+            RCLib.PopulateMinLength(
+                ChaosControl.EligibleBlessings,
+                RCLib.GetEligible(Preset.Blessings,RCLib.NameToCode.ChaosBlessings),
+                3
+            )
+        end
+    else
+        ChaosControl.EligibleBlessings = ChaosControl.VanillaBlessings
+    end
+    if Preset.Curses ~= nil then
+        if InheritVanilla.Curses then
+            RCLib.PopulateMinLength(
+                ChaosControl.EligibleCurses,
+                RCLib.RemoveIneligibleStrings(Preset.Curses,ChaosControl.VanillaCurses,RCLib.NameToCode.ChaosCurses),
+                3
+            )
+        else
+            RCLib.PopulateMinLength(
+                ChaosControl.EligibleCurses,
+                RCLib.GetEligible(Preset.Curses,RCLib.NameToCode.ChaosCurses),
+                3
+            )
+        end
+    else
+        ChaosControl.EligibleCurses = ChaosControl.VanillaCurses
+    end
+end
+
+function ChaosControl.UpdateOfferings() --Inject eligible blessings/curses into table of Chaos' offerings in LootData
+    DebugPrint({Text = "Chaos preset: "..ChaosControl.config.ChaosSetting})
+    ModUtil.Table.MergeKeyed(LootData, {
+        TrialUpgrade = {
+            PermanentTraits = ChaosControl.EligibleBlessings,
+            TemporaryTraits = ChaosControl.EligibleCurses,
+        }
+    })
+    DebugPrint({Text = "Updated Chaos offerings"})
+end
+
+ModUtil.LoadOnce( function()
+    ChaosControl.VanillaBlessings = ModUtil.Table.Copy(LootData.TrialUpgrade.PermanentTraits)
+    ChaosControl.VanillaCurses = ModUtil.Table.Copy(LootData.TrialUpgrade.TemporaryTraits)
+    ChaosControl.ReadPreset()
+    ChaosControl.UpdateOfferings()
+end)
+
+-- When a new run is started, make sure to apply the offering settings
+ModUtil.Path.Wrap("StartNewRun", function ( baseFunc, currentRun )
+    ChaosControl.ReadPreset()
+    ChaosControl.UpdateOfferings()
+    return baseFunc(currentRun)
+end, ChaosControl)

ChaosControl/modfile.txt

@@ -0,0 +1,2 @@
+:: Miniboss Control
+Import "ChaosControl.lua"

Colorblind/colorblind.lua

@@ -1,4 +1,4 @@
-ModUtil.RegisterMod("ColorblindMod")
+ModUtil.Mod.Register("ColorblindMod")
 
 local config =
 {
@@ -98,7 +98,7 @@ function IsOutlineLegal(enemy)
     return true
 end
 
-ModUtil.WrapBaseFunction("CreateLevelDisplay", function ( baseFunc, newEnemy, currentRun )
+ModUtil.Path.Wrap("CreateLevelDisplay", function ( baseFunc, newEnemy, currentRun )
   local biome = CurrentRun.CurrentRoom.RoomSetName
 
   if ColorblindMod.config[(biome or "nil") .. "Enabled"] and IsOutlineLegal(newEnemy) then
@@ -109,12 +109,15 @@ ModUtil.WrapBaseFunction("CreateLevelDisplay", function ( baseFunc, newEnemy, cu
   baseFunc(newEnemy, currentRun)
 end, ColorblindMod)
 
-ModUtil.BaseOverride("DoEnemyHealthBufferDeplete", function ( enemy )
+ModUtil.Path.Override("DoEnemyHealthBufferDeplete", function ( enemy )
 	if enemy.OnHealthBufferDepleteFunctionName ~= nil then
 		_G[enemy.OnHealthBufferDepleteFunctionName]( enemy )
 	end
   -- Mod start
-  -- RemoveOutline({ Id = enemy.ObjectId })
+  local biome = CurrentRun.CurrentRoom.RoomSetName
+  if not ColorblindMod.config[(biome or "nil") .. "Enabled"] then
+    RemoveOutline({ Id = enemy.ObjectId })
+  end
   -- Mod end
   if enemy.TetherIds ~= nil then
 		for k, tetherId in ipairs( enemy.TetherIds ) do
@@ -128,7 +131,7 @@ ModUtil.BaseOverride("DoEnemyHealthBufferDeplete", function ( enemy )
 end, ColorblindMod)
 
 OnAnyLoad{function ()
-    local biome = ModUtil.SafeGet(_G, ModUtil.PathArray("CurrentRun.CurrentRoom.RoomSetName"))
+    local biome = ModUtil.IndexArray.Get(_G, ModUtil.Path.IndexArray("CurrentRun.CurrentRoom.RoomSetName"))
     while ColorblindMod.config[(biome or "nil") .. "Enabled"] do
 	    local ammoIds = GetIdsByType({ Name = "AmmoPack" })
         if ammoIds ~= nil then
@@ -142,52 +145,52 @@ OnAnyLoad{function ()
     end
 end}
 
-ModUtil.WrapBaseFunction( "HarpyKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "HarpyKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "HydraKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "HydraKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "HydraKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "HydraKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "TheseusMinotaurKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "TheseusMinotaurKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "CrawlerMiniBossKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "CrawlerMiniBossKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "HadesKillPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "HadesKillPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = unit.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "KillPresentation", function(baseFunc, victim, args)
+ModUtil.Path.Wrap( "KillPresentation", function(baseFunc, victim, args)
     RemoveOutline({ Id = victim.ObjectId})
     return baseFunc(victim, args)
 end)
 
-ModUtil.WrapBaseFunction( "DeathPresentation", function(baseFunc, currentRun, killer, killingUnitWeapon )
+ModUtil.Path.Wrap( "DeathPresentation", function(baseFunc, currentRun, killer, killingUnitWeapon )
     RemoveOutline({ Id = currentRun.Hero.ObjectId})
     return baseFunc(currentRun, killer, killingUnitWeapon )
 end)
 
-ModUtil.WrapBaseFunction( "BoatToDeathAreaTransition", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "BoatToDeathAreaTransition", function(baseFunc, unit, args)
     RemoveOutline({ Id = CurrentRun.Hero.ObjectId})
     return baseFunc(unit, args)
 end)
 
-ModUtil.WrapBaseFunction( "SurfaceDeathPresentation", function(baseFunc, unit, args)
+ModUtil.Path.Wrap( "SurfaceDeathPresentation", function(baseFunc, unit, args)
     RemoveOutline({ Id = CurrentRun.Hero.ObjectId})
     return baseFunc(unit, args)
 end)