Add support for the new modding framework, while still supporting ModImporter. Dealt with some potential naming conflicts/incompatibilities with other mods due to functions being global and not under the mod's table.

Author: Dannyj1

HadesIIRandomizer/boon_randomizer.lua …j1-HadesIIRandomizer/boon_randomizer.luaHadesIIRandomizer/boon_randomizer.lua renamed to Dannyj1-HadesIIRandomizer/boon_randomizer.lua HadesIIRandomizer/boon_randomizer.lua renamed to Dannyj1-HadesIIRandomizer/boon_randomizer.lua

@@ -13,7 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ]]
-function randomizeBoons()
+
+if not Hades2Randomizer.Config.Enabled then
+    return
+end
+
+function Hades2Randomizer.randomizeBoons()
     LootData = DeepCopyTable(Hades2Randomizer.Data.LootData)
 
     local rng = Hades2Randomizer.Data.Rng

HadesIIRandomizer/config.lua Dannyj1-HadesIIRandomizer/config.luaHadesIIRandomizer/config.lua renamed to Dannyj1-HadesIIRandomizer/config.lua

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]
 
-local mod = ModUtil.Mod.Register("Hades2Randomizer")
-
-mod.Config = {
+Hades2Randomizer.Config = {
     Enabled = true,
     RandomizeEnemies = true,
     RandomizeBoons = true,
     RandomizeElementalTraits = true,
     ScaleStats = true
 }
+
+return Hades2Randomizer.Config

HadesIIRandomizer/data.lua Dannyj1-HadesIIRandomizer/data.luaHadesIIRandomizer/data.lua renamed to Dannyj1-HadesIIRandomizer/data.lua

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]
 
+if not Hades2Randomizer.Config.Enabled then
+    return
+end
+
 Hades2Randomizer.Data = {
     RoomCounter = 0,
     Rng = RandomInit(64),
@@ -47,24 +51,24 @@ ModUtil.LoadOnce(function()
 
     -- Load enemy data
     for biome, enemies in pairs(EnemySets) do
-        if tableContains(Hades2Randomizer.Data.IgnoredSets, biome) then
+        if Hades2Randomizer.tableContains(Hades2Randomizer.Data.IgnoredSets, biome) then
             goto continue
         end
 
         for _, enemy in ipairs(enemies) do
             if EnemyData[enemy] ~= nil then
-                if string.find(string.lower(enemy), "miniboss") or tableContains(Hades2Randomizer.Data.MiniBosses, enemy) then
-                    if not tableContains(Hades2Randomizer.Data.MiniBosses, enemy) then
+                if string.find(string.lower(enemy), "miniboss") or Hades2Randomizer.tableContains(Hades2Randomizer.Data.MiniBosses, enemy) then
+                    if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.MiniBosses, enemy) then
                         table.insert(Hades2Randomizer.Data.MiniBosses, enemy)
                     end
                 elseif string.find(string.lower(enemy), "elite") or (EnemyData[enemy].InheritFrom ~= nil
-                        and tableContains(EnemyData[enemy].InheritFrom, "Elite")) or EnemyData[enemy].HealthBuffer ~= nil then
+                        and Hades2Randomizer.tableContains(EnemyData[enemy].InheritFrom, "Elite")) or EnemyData[enemy].HealthBuffer ~= nil then
                     -- Elite enemies generally have armor
-                    if not tableContains(Hades2Randomizer.Data.EliteEnemies, enemy) then
+                    if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.EliteEnemies, enemy) then
                         table.insert(Hades2Randomizer.Data.EliteEnemies, enemy)
                     end
                 else
-                    if not tableContains(Hades2Randomizer.Data.Enemies, enemy) then
+                    if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.Enemies, enemy) then
                         table.insert(Hades2Randomizer.Data.Enemies, enemy)
                     end
                 end
@@ -78,54 +82,54 @@ ModUtil.LoadOnce(function()
     for _, data in pairs(LootData) do
         if data.PriorityUpgrades ~= nil then
             for _, upgrade in ipairs(data.PriorityUpgrades) do
-                if not tableContains(Hades2Randomizer.Data.PriorityUpgrades, upgrade) then
+                if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.PriorityUpgrades, upgrade) then
                     table.insert(Hades2Randomizer.Data.PriorityUpgrades, upgrade)
                 end
             end
         end
 
         if data.WeaponUpgrades ~= nil then
             for _, upgrade in ipairs(data.WeaponUpgrades) do
-                if not tableContains(Hades2Randomizer.Data.WeaponUpgrades, upgrade) then
+                if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.WeaponUpgrades, upgrade) then
                     table.insert(Hades2Randomizer.Data.WeaponUpgrades, upgrade)
                 end
             end
         end
 
         if data.Traits ~= nil then
             for _, trait in ipairs(data.Traits) do
-                if not tableContains(Hades2Randomizer.Data.Traits, trait) then
+                if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.Traits, trait) then
                     table.insert(Hades2Randomizer.Data.Traits, trait)
                 end
             end
         end
 
         if data.Consumables ~= nil then
             for _, consumable in ipairs(data.Consumables) do
-                if not tableContains(Hades2Randomizer.Data.Consumables, consumable) then
+                if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.Consumables, consumable) then
                     table.insert(Hades2Randomizer.Data.Consumables, consumable)
                 end
             end
         end
 
         if data.OffersElementalTrait ~= nil then
             for _, trait in ipairs(data.OffersElementalTrait) do
-                if not tableContains(Hades2Randomizer.Data.ElementalTraits, trait) then
+                if not Hades2Randomizer.tableContains(Hades2Randomizer.Data.ElementalTraits, trait) then
                     table.insert(Hades2Randomizer.Data.ElementalTraits, trait)
                 end
             end
         end
     end
 end)
 
-function isElite(enemy)
-    return tableContains(Hades2Randomizer.Data.EliteEnemies, enemy)
+function Hades2Randomizer.isElite(enemy)
+    return Hades2Randomizer.tableContains(Hades2Randomizer.Data.EliteEnemies, enemy)
 end
 
-function isMiniBoss(enemy)
-    return tableContains(Hades2Randomizer.Data.MiniBosses, enemy)
+function Hades2Randomizer.isMiniBoss(enemy)
+    return Hades2Randomizer.tableContains(Hades2Randomizer.Data.MiniBosses, enemy)
 end
 
-function isEnemy(enemy)
-    return tableContains(Hades2Randomizer.Data.Enemies, enemy)
+function Hades2Randomizer.isEnemy(enemy)
+    return Hades2Randomizer.tableContains(Hades2Randomizer.Data.Enemies, enemy)
 end

HadesIIRandomizer/enemy_randomizer.lua …1-HadesIIRandomizer/enemy_randomizer.luaHadesIIRandomizer/enemy_randomizer.lua renamed to Dannyj1-HadesIIRandomizer/enemy_randomizer.lua HadesIIRandomizer/enemy_randomizer.lua renamed to Dannyj1-HadesIIRandomizer/enemy_randomizer.lua

@@ -14,8 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]
 
+if not Hades2Randomizer.Config.Enabled then
+    return
+end
+
 -- TODO: Randomize Chronos spawns and maybe Scylla spawns if that doesn't become too difficult
-function randomizeEnemies()
+function Hades2Randomizer.randomizeEnemies()
     local rng = Hades2Randomizer.Data.Rng
     local availableEnemies = DeepCopyTable(Hades2Randomizer.Data.Enemies)
     local availableEliteEnemies = DeepCopyTable(Hades2Randomizer.Data.EliteEnemies)
@@ -143,7 +147,7 @@ function randomizeEnemies()
     end
 
     for key, enemies in pairs(EnemySets) do
-        if tableContains(Hades2Randomizer.Data.IgnoredSets, key) then
+        if Hades2Randomizer.tableContains(Hades2Randomizer.Data.IgnoredSets, key) then
             goto continue
         end
 

Dannyj1-HadesIIRandomizer/main.lua

@@ -0,0 +1,17 @@
+--[[
+Copyright 2024 Danny Jelsma
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+
+rom.mods['SGG_Modding-DemonDaemon'].auto()

Dannyj1-HadesIIRandomizer/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "Hades II Randomizer",
+  "version_number": "1.0.0",
+  "website_url": "https://github.com/Dannyj1/HadesIIRandomizer/",
+  "description": "Hades II Randomizer is a randomizer mod for the game Hades II. It randomizes certain parts of the game everytime you start a new run. ",
+  "dependencies": [
+    "Hell2Modding-Hell2Modding-1.0.22",
+    "SGG_Modding-DemonDaemon-1.0.1",
+    "SGG_Modding-ModUtil-3.1.0"
+  ]
+}

HadesIIRandomizer/modfile.txt Dannyj1-HadesIIRandomizer/modfile.txtHadesIIRandomizer/modfile.txt renamed to Dannyj1-HadesIIRandomizer/modfile.txt

@@ -1,9 +1,9 @@
+Top Import "register.lua"
 Top Import "config.lua"
+
 Import "utils.lua"
 Import "data.lua"
 Import "enemy_randomizer.lua"
 Import "boon_randomizer.lua"
 Import "stat_scaler.lua"
-Import "main.lua"
-
-
+Import "randomizer_core.lua"

HadesIIRandomizer/main.lua …j1-HadesIIRandomizer/randomizer_core.luaHadesIIRandomizer/main.lua renamed to Dannyj1-HadesIIRandomizer/randomizer_core.lua HadesIIRandomizer/main.lua renamed to Dannyj1-HadesIIRandomizer/randomizer_core.lua

@@ -26,15 +26,15 @@ function StartOver(args)
     EnemyData = DeepCopyTable(Hades2Randomizer.Data.EnemyData)
 
     if Hades2Randomizer.Config.RandomizeEnemies then
-        randomizeEnemies()
+        Hades2Randomizer.randomizeEnemies()
     end
 
     if Hades2Randomizer.Config.ScaleStats then
-        scaleStats()
+        Hades2Randomizer.scaleStats()
     end
 
     if Hades2Randomizer.Config.RandomizeBoons then
-        randomizeBoons()
+        Hades2Randomizer.randomizeBoons()
     end
 
     oStartOver(args)
@@ -45,7 +45,7 @@ function DoUnlockRoomExits(run, room)
     Hades2Randomizer.Data.RoomCounter = Hades2Randomizer.Data.RoomCounter + 1
 
     if Hades2Randomizer.Config.ScaleStats then
-        scaleStats()
+        Hades2Randomizer.scaleStats()
     end
 
     oDoUnlockRoomExits(run, room)

Dannyj1-HadesIIRandomizer/register.lua

@@ -0,0 +1,17 @@
+--[[
+Copyright 2024 Danny Jelsma
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+
+return ModUtil.Mod.Register("Hades2Randomizer")

HadesIIRandomizer/stat_scaler.lua Dannyj1-HadesIIRandomizer/stat_scaler.luaHadesIIRandomizer/stat_scaler.lua renamed to Dannyj1-HadesIIRandomizer/stat_scaler.lua

@@ -20,8 +20,40 @@ local originalMaxMinibossHealth = {}
 local originalMaxMinibossArmor = {}
 local originalDifficulty = {}
 
+if not Hades2Randomizer.Config.Enabled then
+    return
+end
+
+local function restoreOriginalStats()
+    for enemyName, health in pairs(originalMaxHealth) do
+        EnemyData[enemyName].MaxHealth = health
+    end
+
+    for enemyName, armor in pairs(originalMaxArmor) do
+        EnemyData[enemyName].HealthBuffer = armor
+    end
+
+    for enemyName, health in pairs(originalMaxMinibossHealth) do
+        EnemyData[enemyName].MaxHealth = health
+    end
+
+    for enemyName, armor in pairs(originalMaxMinibossArmor) do
+        EnemyData[enemyName].HealthBuffer = armor
+    end
+
+    for enemyName, difficulty in pairs(originalDifficulty) do
+        EnemyData[enemyName].GeneratorData.DifficultyRating = difficulty
+    end
+
+    originalMaxHealth = {}
+    originalMaxArmor = {}
+    originalMaxMinibossHealth = {}
+    originalMaxMinibossArmor = {}
+    originalDifficulty = {}
+end
+
 -- TODO: Add min health and min difficulty (to fix very long encounters)
-function scaleStats()
+function Hades2Randomizer.scaleStats()
     restoreOriginalStats()
 
     local maxHealth = 999999999
@@ -47,15 +79,15 @@ function scaleStats()
     end
 
     for enemyName, values in pairs(EnemyData) do
-        if not isEnemy(enemyName) and not isElite(enemyName) and not isMiniBoss(enemyName) then
+        if not Hades2Randomizer.isEnemy(enemyName) and not Hades2Randomizer.isElite(enemyName) and not Hades2Randomizer.isMiniBoss(enemyName) then
             goto continue
         end
 
         if string.lower(enemyName) == "crawlerminiboss" then
             goto continue
         end
 
-        if isMiniBoss(enemyName) then
+        if Hades2Randomizer.isMiniBoss(enemyName) then
             if values.MaxHealth ~= nil then
                 values.MaxHealth = math.min(values.MaxHealth, maxMinibossHealth)
                 originalMaxMinibossHealth[enemyName] = values.MaxHealth
@@ -90,31 +122,3 @@ function scaleStats()
         ::continue::
     end
 end
-
-function restoreOriginalStats()
-    for enemyName, health in pairs(originalMaxHealth) do
-        EnemyData[enemyName].MaxHealth = health
-    end
-
-    for enemyName, armor in pairs(originalMaxArmor) do
-        EnemyData[enemyName].HealthBuffer = armor
-    end
-
-    for enemyName, health in pairs(originalMaxMinibossHealth) do
-        EnemyData[enemyName].MaxHealth = health
-    end
-
-    for enemyName, armor in pairs(originalMaxMinibossArmor) do
-        EnemyData[enemyName].HealthBuffer = armor
-    end
-
-    for enemyName, difficulty in pairs(originalDifficulty) do
-        EnemyData[enemyName].GeneratorData.DifficultyRating = difficulty
-    end
-
-    originalMaxHealth = {}
-    originalMaxArmor = {}
-    originalMaxMinibossHealth = {}
-    originalMaxMinibossArmor = {}
-    originalDifficulty = {}
-end