diff --git a/mods/flood/a-utils.lua b/mods/flood/a-utils.lua index 2ee7f668..0f1c333f 100644 --- a/mods/flood/a-utils.lua +++ b/mods/flood/a-utils.lua @@ -80,21 +80,6 @@ function if_then_else(cond, ifTrue, ifFalse) return ifFalse end -function approach_number(current, target, inc, dec) - if current < target then - current = current + inc - if current > target then - current = target - end - else - current = current - dec - if current < target then - current = target - end - end - return current -end - function string_without_hex(name) local s = '' local inSlash = false diff --git a/mods/flood/flood.zip b/mods/flood/flood.zip index c8db135e..a7a80657 100644 Binary files a/mods/flood/flood.zip and b/mods/flood/flood.zip differ diff --git a/mods/flood/main.lua b/mods/flood/main.lua index ad1bc9d7..428513c2 100644 --- a/mods/flood/main.lua +++ b/mods/flood/main.lua @@ -1,6 +1,6 @@ -- name: Flood -- incompatible: gamemode --- description: Flood v2.4.2\nBy \\#ec7731\\Agent X\\#dcdcdc\\\n\nThis mod adds a flood escape gamemode\nto sm64ex-coop, you must escape the flood and reach the top of the level before everything is flooded. +-- description: Flood v2.4.5\nBy \\#ec7731\\Agent X\\#dcdcdc\\\n\nThis mod adds a flood escape gamemode\nto sm64ex-coop, you must escape the flood and reach the top of the level before everything is flooded. if unsupported then return end @@ -93,7 +93,7 @@ local function server_update() local active = 0 for i = 0, (MAX_PLAYERS - 1) do local m = gMarioStates[i] - if active_player(m) ~= 0 and m.health > 0xff and not gPlayerSyncTable[i].finished then + if active_player(m) ~= 0 and m.health > 0xFF and not gPlayerSyncTable[i].finished then active = active + 1 end end @@ -101,7 +101,7 @@ local function server_update() if active == 0 then local dead = 0 for i = 0, (MAX_PLAYERS) - 1 do - if active_player(gMarioStates[i]) ~= 0 and gMarioStates[i].health <= 0xff then + if active_player(gMarioStates[i]) ~= 0 and gMarioStates[i].health <= 0xFF then dead = dead + 1 end end @@ -215,7 +215,7 @@ end local function mario_update(m) if not gNetworkPlayers[m.playerIndex].connected then return end - if m.health > 0xff then + if m.health > 0xFF then network_player_set_description(gNetworkPlayers[m.playerIndex], "Alive", 75, 255, 75, 255) else network_player_set_description(gNetworkPlayers[m.playerIndex], "Dead", 255, 75, 75, 255) @@ -298,10 +298,10 @@ local function mario_update(m) end if m.action == ACT_QUICKSAND_DEATH then - m.health = 0xff + m.health = 0xFF end - if m.health <= 0xff then + if m.health <= 0xFF then if network_player_connected_count() > 1 then m.area.camera.cutscene = 0 set_mario_spectator(m) @@ -376,7 +376,7 @@ local function on_hud_render() djui_hud_set_font(FONT_HUD) djui_hud_render_texture(gTextures.coin, 5, 5, 1, 1) - djui_hud_print_text("x", 21, 5, 1) + djui_hud_print_text(">", 21, 5, 1) djui_hud_print_text(tostring(hud_get_value(HUD_DISPLAY_COINS)), 37, 5, 1) if gGlobalSyncTable.speedMultiplier ~= 1 then diff --git a/mods/flood/misc.lua b/mods/flood/misc.lua index f190d3cf..4368e538 100644 --- a/mods/flood/misc.lua +++ b/mods/flood/misc.lua @@ -168,7 +168,7 @@ end local function on_death() local m = gMarioStates[0] if m.floor.type == SURFACE_DEATH_PLANE or m.floor.type == SURFACE_VERTICAL_WIND then - m.health = 0xff + m.health = 0xFF end return false end @@ -183,7 +183,7 @@ end --- @param m MarioState local function allow_hazard_surface(m) - if m.health <= 0xff then return false end + if m.health <= 0xFF then return false end return true end diff --git a/mods/flood/spectator.lua b/mods/flood/spectator.lua index 18595900..0912e23f 100644 --- a/mods/flood/spectator.lua +++ b/mods/flood/spectator.lua @@ -66,7 +66,7 @@ end --- @param m MarioState function set_mario_spectator(m) if m.action ~= ACT_SPECTATOR then - sPlayerFirstPerson.pos = { x = m.pos.x, y = if_then_else(m.health > 0xff, m.pos.y, gGlobalSyncTable.waterLevel), z = m.pos.z } + sPlayerFirstPerson.pos = { x = m.pos.x, y = if_then_else(m.health > 0xFF, m.pos.y, gGlobalSyncTable.waterLevel), z = m.pos.z } end m.action = ACT_SPECTATOR end @@ -91,7 +91,7 @@ local function act_spectator(m) vec3f_copy(m.marioObj.header.gfx.pos, m.pos) vec3f_copy(m.marioObj.header.gfx.angle, m.faceAngle) m.marioObj.header.gfx.angle.y = 0 - m.health = 0xff + m.health = 0xFF m.healCounter = 0 m.hurtCounter = 0 end diff --git a/mods/omm-coop/a-bunch-of-constants-32.lua b/mods/omm-coop/a-bunch-of-constants-32.lua deleted file mode 100644 index 6247792d..00000000 Binary files a/mods/omm-coop/a-bunch-of-constants-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-bunch-of-constants-64.lua b/mods/omm-coop/a-bunch-of-constants-64.lua deleted file mode 100644 index d50be1cb..00000000 Binary files a/mods/omm-coop/a-bunch-of-constants-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-bunch-of-functions-32.lua b/mods/omm-coop/a-bunch-of-functions-32.lua deleted file mode 100644 index 7f55780f..00000000 Binary files a/mods/omm-coop/a-bunch-of-functions-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-bunch-of-functions-64.lua b/mods/omm-coop/a-bunch-of-functions-64.lua deleted file mode 100644 index 14614113..00000000 Binary files a/mods/omm-coop/a-bunch-of-functions-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-bunch-of-globals-32.lua b/mods/omm-coop/a-bunch-of-globals-32.lua deleted file mode 100644 index 9b8492b7..00000000 Binary files a/mods/omm-coop/a-bunch-of-globals-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-bunch-of-globals-64.lua b/mods/omm-coop/a-bunch-of-globals-64.lua deleted file mode 100644 index 6b32545f..00000000 Binary files a/mods/omm-coop/a-bunch-of-globals-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-check-compatibility-32.lua b/mods/omm-coop/a-check-compatibility-32.lua deleted file mode 100644 index 9773aebe..00000000 Binary files a/mods/omm-coop/a-check-compatibility-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-check-compatibility-64.lua b/mods/omm-coop/a-check-compatibility-64.lua deleted file mode 100644 index bdc07890..00000000 Binary files a/mods/omm-coop/a-check-compatibility-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-game-32.lua b/mods/omm-coop/a-omm-game-32.lua deleted file mode 100644 index da54882b..00000000 Binary files a/mods/omm-coop/a-omm-game-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-game-64.lua b/mods/omm-coop/a-omm-game-64.lua deleted file mode 100644 index c0297cdc..00000000 Binary files a/mods/omm-coop/a-omm-game-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-models-32.lua b/mods/omm-coop/a-omm-models-32.lua deleted file mode 100644 index e5282a3e..00000000 Binary files a/mods/omm-coop/a-omm-models-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-models-64.lua b/mods/omm-coop/a-omm-models-64.lua deleted file mode 100644 index b095bfce..00000000 Binary files a/mods/omm-coop/a-omm-models-64.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-stars-32.lua b/mods/omm-coop/a-omm-stars-32.lua deleted file mode 100644 index 108f921f..00000000 Binary files a/mods/omm-coop/a-omm-stars-32.lua and /dev/null differ diff --git a/mods/omm-coop/a-omm-stars-64.lua b/mods/omm-coop/a-omm-stars-64.lua deleted file mode 100644 index ca3d7b0a..00000000 Binary files a/mods/omm-coop/a-omm-stars-64.lua and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_sparkly_star_blue_sparkle.bin b/mods/omm-coop/actors/omm_geo_sparkly_star_blue_sparkle.bin deleted file mode 100644 index d289dcd5..00000000 Binary files a/mods/omm-coop/actors/omm_geo_sparkly_star_blue_sparkle.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_sparkly_star_green_sparkle.bin b/mods/omm-coop/actors/omm_geo_sparkly_star_green_sparkle.bin deleted file mode 100644 index 7cce3ecd..00000000 Binary files a/mods/omm-coop/actors/omm_geo_sparkly_star_green_sparkle.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_sparkly_star_pink_gold_sparkle.bin b/mods/omm-coop/actors/omm_geo_sparkly_star_pink_gold_sparkle.bin deleted file mode 100644 index 655d9338..00000000 Binary files a/mods/omm-coop/actors/omm_geo_sparkly_star_pink_gold_sparkle.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_sparkly_star_purple_sparkle.bin b/mods/omm-coop/actors/omm_geo_sparkly_star_purple_sparkle.bin deleted file mode 100644 index 6cf7c262..00000000 Binary files a/mods/omm-coop/actors/omm_geo_sparkly_star_purple_sparkle.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_sparkly_star_red_sparkle.bin b/mods/omm-coop/actors/omm_geo_sparkly_star_red_sparkle.bin deleted file mode 100644 index 19351fde..00000000 Binary files a/mods/omm-coop/actors/omm_geo_sparkly_star_red_sparkle.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_star_opaque.bin b/mods/omm-coop/actors/omm_geo_star_opaque.bin deleted file mode 100644 index 8a8d6b37..00000000 Binary files a/mods/omm-coop/actors/omm_geo_star_opaque.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_geo_star_transparent.bin b/mods/omm-coop/actors/omm_geo_star_transparent.bin deleted file mode 100644 index 84373098..00000000 Binary files a/mods/omm-coop/actors/omm_geo_star_transparent.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_peachy_geo.bin b/mods/omm-coop/actors/omm_peachy_geo.bin deleted file mode 100644 index 4dcc055f..00000000 Binary files a/mods/omm-coop/actors/omm_peachy_geo.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_tiara_geo.bin b/mods/omm-coop/actors/omm_tiara_geo.bin deleted file mode 100644 index bc2e482b..00000000 Binary files a/mods/omm-coop/actors/omm_tiara_geo.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_tiara_metal_geo.bin b/mods/omm-coop/actors/omm_tiara_metal_geo.bin deleted file mode 100644 index 169df5c6..00000000 Binary files a/mods/omm-coop/actors/omm_tiara_metal_geo.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_tiara_wing_geo.bin b/mods/omm-coop/actors/omm_tiara_wing_geo.bin deleted file mode 100644 index 4328bcdd..00000000 Binary files a/mods/omm-coop/actors/omm_tiara_wing_geo.bin and /dev/null differ diff --git a/mods/omm-coop/actors/omm_tiara_winged_metal_geo.bin b/mods/omm-coop/actors/omm_tiara_winged_metal_geo.bin deleted file mode 100644 index ff11e30e..00000000 Binary files a/mods/omm-coop/actors/omm_tiara_winged_metal_geo.bin and /dev/null differ diff --git a/mods/omm-coop/cappy-bhv-32.lua b/mods/omm-coop/cappy-bhv-32.lua deleted file mode 100644 index 34f43200..00000000 Binary files a/mods/omm-coop/cappy-bhv-32.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-bhv-64.lua b/mods/omm-coop/cappy-bhv-64.lua deleted file mode 100644 index 5c1062d9..00000000 Binary files a/mods/omm-coop/cappy-bhv-64.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-events-32.lua b/mods/omm-coop/cappy-events-32.lua deleted file mode 100644 index 419d0eec..00000000 Binary files a/mods/omm-coop/cappy-events-32.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-events-64.lua b/mods/omm-coop/cappy-events-64.lua deleted file mode 100644 index 4abe1b9c..00000000 Binary files a/mods/omm-coop/cappy-events-64.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-interactions-32.lua b/mods/omm-coop/cappy-interactions-32.lua deleted file mode 100644 index da87b78c..00000000 Binary files a/mods/omm-coop/cappy-interactions-32.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-interactions-64.lua b/mods/omm-coop/cappy-interactions-64.lua deleted file mode 100644 index 9aebaac3..00000000 Binary files a/mods/omm-coop/cappy-interactions-64.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-step-32.lua b/mods/omm-coop/cappy-step-32.lua deleted file mode 100644 index a08d84bb..00000000 Binary files a/mods/omm-coop/cappy-step-32.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-step-64.lua b/mods/omm-coop/cappy-step-64.lua deleted file mode 100644 index ff2e6916..00000000 Binary files a/mods/omm-coop/cappy-step-64.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-update-32.lua b/mods/omm-coop/cappy-update-32.lua deleted file mode 100644 index edb20881..00000000 Binary files a/mods/omm-coop/cappy-update-32.lua and /dev/null differ diff --git a/mods/omm-coop/cappy-update-64.lua b/mods/omm-coop/cappy-update-64.lua deleted file mode 100644 index b1936a34..00000000 Binary files a/mods/omm-coop/cappy-update-64.lua and /dev/null differ diff --git a/mods/omm-coop/data/bhvOmmCappy.bhv b/mods/omm-coop/data/bhvOmmCappy.bhv deleted file mode 100644 index b849c464..00000000 Binary files a/mods/omm-coop/data/bhvOmmCappy.bhv and /dev/null differ diff --git a/mods/omm-coop/main.lua b/mods/omm-coop/main.lua deleted file mode 100644 index 2113137d..00000000 --- a/mods/omm-coop/main.lua +++ /dev/null @@ -1,3 +0,0 @@ --- name: OMM Rebirth --- incompatible: moveset --- description: Super Mario Odyssey Moves and Cappy.\nVersion: 1.1\nAuthor: PeachyPeach\nContributors: Isaac,\nPrince Frizzy,\nJokerFactor (Playtester),\nMr.Needlemouse (Playtester)\n\nIncludes:\n- Most moves from Odyssey\n- Custom star dance and death sequences\n- Improved power-ups\n- Odyssey HUD\n- Settings menu and star display menu\n- Improved non-stop mode\n- Fully custom camera mode\n- Inbuilt support for other mods diff --git a/mods/omm-coop/mario-action--32.lua b/mods/omm-coop/mario-action--32.lua deleted file mode 100644 index 85ebbb21..00000000 Binary files a/mods/omm-coop/mario-action--32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action--64.lua b/mods/omm-coop/mario-action--64.lua deleted file mode 100644 index 28f36f70..00000000 Binary files a/mods/omm-coop/mario-action--64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-airborne-32.lua b/mods/omm-coop/mario-action-airborne-32.lua deleted file mode 100644 index 1e900093..00000000 Binary files a/mods/omm-coop/mario-action-airborne-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-airborne-64.lua b/mods/omm-coop/mario-action-airborne-64.lua deleted file mode 100644 index 0faa0534..00000000 Binary files a/mods/omm-coop/mario-action-airborne-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-automatic-32.lua b/mods/omm-coop/mario-action-automatic-32.lua deleted file mode 100644 index d80eb458..00000000 Binary files a/mods/omm-coop/mario-action-automatic-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-automatic-64.lua b/mods/omm-coop/mario-action-automatic-64.lua deleted file mode 100644 index 832f86dc..00000000 Binary files a/mods/omm-coop/mario-action-automatic-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-cutscene-32.lua b/mods/omm-coop/mario-action-cutscene-32.lua deleted file mode 100644 index b1b27b5f..00000000 Binary files a/mods/omm-coop/mario-action-cutscene-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-cutscene-64.lua b/mods/omm-coop/mario-action-cutscene-64.lua deleted file mode 100644 index 1bcbacd8..00000000 Binary files a/mods/omm-coop/mario-action-cutscene-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-death-32.lua b/mods/omm-coop/mario-action-death-32.lua deleted file mode 100644 index 51b50f5d..00000000 Binary files a/mods/omm-coop/mario-action-death-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-death-64.lua b/mods/omm-coop/mario-action-death-64.lua deleted file mode 100644 index 7b997a73..00000000 Binary files a/mods/omm-coop/mario-action-death-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-metal-32.lua b/mods/omm-coop/mario-action-metal-32.lua deleted file mode 100644 index 7e1a5a74..00000000 Binary files a/mods/omm-coop/mario-action-metal-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-metal-64.lua b/mods/omm-coop/mario-action-metal-64.lua deleted file mode 100644 index ea6242ee..00000000 Binary files a/mods/omm-coop/mario-action-metal-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-moving-32.lua b/mods/omm-coop/mario-action-moving-32.lua deleted file mode 100644 index 60b3c7be..00000000 Binary files a/mods/omm-coop/mario-action-moving-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-moving-64.lua b/mods/omm-coop/mario-action-moving-64.lua deleted file mode 100644 index 70b95738..00000000 Binary files a/mods/omm-coop/mario-action-moving-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-object-32.lua b/mods/omm-coop/mario-action-object-32.lua deleted file mode 100644 index 2c77b0a1..00000000 Binary files a/mods/omm-coop/mario-action-object-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-object-64.lua b/mods/omm-coop/mario-action-object-64.lua deleted file mode 100644 index 5bb721ee..00000000 Binary files a/mods/omm-coop/mario-action-object-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-stardance-32.lua b/mods/omm-coop/mario-action-stardance-32.lua deleted file mode 100644 index 6eb86da5..00000000 Binary files a/mods/omm-coop/mario-action-stardance-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-stardance-64.lua b/mods/omm-coop/mario-action-stardance-64.lua deleted file mode 100644 index 755e0ba9..00000000 Binary files a/mods/omm-coop/mario-action-stardance-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-stationary-32.lua b/mods/omm-coop/mario-action-stationary-32.lua deleted file mode 100644 index 8d99eb41..00000000 Binary files a/mods/omm-coop/mario-action-stationary-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-stationary-64.lua b/mods/omm-coop/mario-action-stationary-64.lua deleted file mode 100644 index ad888886..00000000 Binary files a/mods/omm-coop/mario-action-stationary-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-submerged-32.lua b/mods/omm-coop/mario-action-submerged-32.lua deleted file mode 100644 index ea613610..00000000 Binary files a/mods/omm-coop/mario-action-submerged-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-action-submerged-64.lua b/mods/omm-coop/mario-action-submerged-64.lua deleted file mode 100644 index 88584fbc..00000000 Binary files a/mods/omm-coop/mario-action-submerged-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-caps-32.lua b/mods/omm-coop/mario-caps-32.lua deleted file mode 100644 index ca707f2b..00000000 Binary files a/mods/omm-coop/mario-caps-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-caps-64.lua b/mods/omm-coop/mario-caps-64.lua deleted file mode 100644 index 5d8932a5..00000000 Binary files a/mods/omm-coop/mario-caps-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-cancel-32.lua b/mods/omm-coop/mario-hooks-cancel-32.lua deleted file mode 100644 index 15a5ff0b..00000000 Binary files a/mods/omm-coop/mario-hooks-cancel-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-cancel-64.lua b/mods/omm-coop/mario-hooks-cancel-64.lua deleted file mode 100644 index 6ee14613..00000000 Binary files a/mods/omm-coop/mario-hooks-cancel-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-init-32.lua b/mods/omm-coop/mario-hooks-init-32.lua deleted file mode 100644 index 09dd7427..00000000 Binary files a/mods/omm-coop/mario-hooks-init-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-init-64.lua b/mods/omm-coop/mario-hooks-init-64.lua deleted file mode 100644 index 715fcfe6..00000000 Binary files a/mods/omm-coop/mario-hooks-init-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-update-32.lua b/mods/omm-coop/mario-hooks-update-32.lua deleted file mode 100644 index 1bde6294..00000000 Binary files a/mods/omm-coop/mario-hooks-update-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-hooks-update-64.lua b/mods/omm-coop/mario-hooks-update-64.lua deleted file mode 100644 index 177c6b46..00000000 Binary files a/mods/omm-coop/mario-hooks-update-64.lua and /dev/null differ diff --git a/mods/omm-coop/mario-update-32.lua b/mods/omm-coop/mario-update-32.lua deleted file mode 100644 index 2fea9e7d..00000000 Binary files a/mods/omm-coop/mario-update-32.lua and /dev/null differ diff --git a/mods/omm-coop/mario-update-64.lua b/mods/omm-coop/mario-update-64.lua deleted file mode 100644 index 18b251b2..00000000 Binary files a/mods/omm-coop/mario-update-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-animations-32.lua b/mods/omm-coop/omm-animations-32.lua deleted file mode 100644 index 902a34e7..00000000 Binary files a/mods/omm-coop/omm-animations-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-animations-64.lua b/mods/omm-coop/omm-animations-64.lua deleted file mode 100644 index cdbca8f5..00000000 Binary files a/mods/omm-coop/omm-animations-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-arena-32.lua b/mods/omm-coop/omm-arena-32.lua deleted file mode 100644 index 12894e82..00000000 Binary files a/mods/omm-coop/omm-arena-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-arena-64.lua b/mods/omm-coop/omm-arena-64.lua deleted file mode 100644 index d15912b1..00000000 Binary files a/mods/omm-coop/omm-arena-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-audio-32.lua b/mods/omm-coop/omm-audio-32.lua deleted file mode 100644 index 0c8b4c10..00000000 Binary files a/mods/omm-coop/omm-audio-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-audio-64.lua b/mods/omm-coop/omm-audio-64.lua deleted file mode 100644 index 7895145e..00000000 Binary files a/mods/omm-coop/omm-audio-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-camera-32.lua b/mods/omm-coop/omm-camera-32.lua deleted file mode 100644 index 12f257a3..00000000 Binary files a/mods/omm-coop/omm-camera-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-camera-64.lua b/mods/omm-coop/omm-camera-64.lua deleted file mode 100644 index b7e23724..00000000 Binary files a/mods/omm-coop/omm-camera-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-gamemode-32.lua b/mods/omm-coop/omm-gamemode-32.lua deleted file mode 100644 index 4450f6a1..00000000 Binary files a/mods/omm-coop/omm-gamemode-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-gamemode-64.lua b/mods/omm-coop/omm-gamemode-64.lua deleted file mode 100644 index 37d985fd..00000000 Binary files a/mods/omm-coop/omm-gamemode-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-hud-32.lua b/mods/omm-coop/omm-hud-32.lua deleted file mode 100644 index f6b08c91..00000000 Binary files a/mods/omm-coop/omm-hud-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-hud-64.lua b/mods/omm-coop/omm-hud-64.lua deleted file mode 100644 index 299407ee..00000000 Binary files a/mods/omm-coop/omm-hud-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-menu-32.lua b/mods/omm-coop/omm-menu-32.lua deleted file mode 100644 index 936a119d..00000000 Binary files a/mods/omm-coop/omm-menu-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-menu-64.lua b/mods/omm-coop/omm-menu-64.lua deleted file mode 100644 index 13071725..00000000 Binary files a/mods/omm-coop/omm-menu-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-object-32.lua b/mods/omm-coop/omm-object-32.lua deleted file mode 100644 index 49c28931..00000000 Binary files a/mods/omm-coop/omm-object-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-object-64.lua b/mods/omm-coop/omm-object-64.lua deleted file mode 100644 index aaf81849..00000000 Binary files a/mods/omm-coop/omm-object-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-settings-32.lua b/mods/omm-coop/omm-settings-32.lua deleted file mode 100644 index c7690a56..00000000 Binary files a/mods/omm-coop/omm-settings-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-settings-64.lua b/mods/omm-coop/omm-settings-64.lua deleted file mode 100644 index 0846a8d2..00000000 Binary files a/mods/omm-coop/omm-settings-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-stars-32.lua b/mods/omm-coop/omm-stars-32.lua deleted file mode 100644 index d7792d69..00000000 Binary files a/mods/omm-coop/omm-stars-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-stars-64.lua b/mods/omm-coop/omm-stars-64.lua deleted file mode 100644 index df101a53..00000000 Binary files a/mods/omm-coop/omm-stars-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-world-32.lua b/mods/omm-coop/omm-world-32.lua deleted file mode 100644 index 8716f117..00000000 Binary files a/mods/omm-coop/omm-world-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-world-64.lua b/mods/omm-coop/omm-world-64.lua deleted file mode 100644 index 7ec395fb..00000000 Binary files a/mods/omm-coop/omm-world-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-api-32.lua b/mods/omm-coop/omm-z-api-32.lua deleted file mode 100644 index 4a1b3538..00000000 Binary files a/mods/omm-coop/omm-z-api-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-api-64.lua b/mods/omm-coop/omm-z-api-64.lua deleted file mode 100644 index 850bae3d..00000000 Binary files a/mods/omm-coop/omm-z-api-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-0-32.lua b/mods/omm-coop/omm-z-game-0-32.lua deleted file mode 100644 index a0d5cbe5..00000000 Binary files a/mods/omm-coop/omm-z-game-0-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-0-64.lua b/mods/omm-coop/omm-z-game-0-64.lua deleted file mode 100644 index ce35d64b..00000000 Binary files a/mods/omm-coop/omm-z-game-0-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-1-32.lua b/mods/omm-coop/omm-z-game-1-32.lua deleted file mode 100644 index 3e9c904d..00000000 Binary files a/mods/omm-coop/omm-z-game-1-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-1-64.lua b/mods/omm-coop/omm-z-game-1-64.lua deleted file mode 100644 index eb76355a..00000000 Binary files a/mods/omm-coop/omm-z-game-1-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-gs-32.lua b/mods/omm-coop/omm-z-game-gs-32.lua deleted file mode 100644 index 9bbda3aa..00000000 Binary files a/mods/omm-coop/omm-z-game-gs-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-gs-64.lua b/mods/omm-coop/omm-z-game-gs-64.lua deleted file mode 100644 index aee9642f..00000000 Binary files a/mods/omm-coop/omm-z-game-gs-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-kbr2-32.lua b/mods/omm-coop/omm-z-game-kbr2-32.lua deleted file mode 100644 index a24f78a1..00000000 Binary files a/mods/omm-coop/omm-z-game-kbr2-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-kbr2-64.lua b/mods/omm-coop/omm-z-game-kbr2-64.lua deleted file mode 100644 index ef57c08d..00000000 Binary files a/mods/omm-coop/omm-z-game-kbr2-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-ldd-32.lua b/mods/omm-coop/omm-z-game-ldd-32.lua deleted file mode 100644 index 332fb22a..00000000 Binary files a/mods/omm-coop/omm-z-game-ldd-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-ldd-64.lua b/mods/omm-coop/omm-z-game-ldd-64.lua deleted file mode 100644 index cf051274..00000000 Binary files a/mods/omm-coop/omm-z-game-ldd-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-ms-32.lua b/mods/omm-coop/omm-z-game-ms-32.lua deleted file mode 100644 index 13c08367..00000000 Binary files a/mods/omm-coop/omm-z-game-ms-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-ms-64.lua b/mods/omm-coop/omm-z-game-ms-64.lua deleted file mode 100644 index 5e7b5590..00000000 Binary files a/mods/omm-coop/omm-z-game-ms-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-sm74-32.lua b/mods/omm-coop/omm-z-game-sm74-32.lua deleted file mode 100644 index 4917634c..00000000 Binary files a/mods/omm-coop/omm-z-game-sm74-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-sm74-64.lua b/mods/omm-coop/omm-z-game-sm74-64.lua deleted file mode 100644 index cd10235b..00000000 Binary files a/mods/omm-coop/omm-z-game-sm74-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-smsr-32.lua b/mods/omm-coop/omm-z-game-smsr-32.lua deleted file mode 100644 index dd2056cd..00000000 Binary files a/mods/omm-coop/omm-z-game-smsr-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-smsr-64.lua b/mods/omm-coop/omm-z-game-smsr-64.lua deleted file mode 100644 index 9d84ddf3..00000000 Binary files a/mods/omm-coop/omm-z-game-smsr-64.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-smtu-32.lua b/mods/omm-coop/omm-z-game-smtu-32.lua deleted file mode 100644 index e2048e3b..00000000 Binary files a/mods/omm-coop/omm-z-game-smtu-32.lua and /dev/null differ diff --git a/mods/omm-coop/omm-z-game-smtu-64.lua b/mods/omm-coop/omm-z-game-smtu-64.lua deleted file mode 100644 index c4c10752..00000000 Binary files a/mods/omm-coop/omm-z-game-smtu-64.lua and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_effect_damage.ogg b/mods/omm-coop/sound/omm_sound_effect_damage.ogg deleted file mode 100644 index 217f4109..00000000 Binary files a/mods/omm-coop/sound/omm_sound_effect_damage.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_effect_freeze_1.ogg b/mods/omm-coop/sound/omm_sound_effect_freeze_1.ogg deleted file mode 100644 index 0b787dcb..00000000 Binary files a/mods/omm-coop/sound/omm_sound_effect_freeze_1.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_effect_freeze_2.ogg b/mods/omm-coop/sound/omm_sound_effect_freeze_2.ogg deleted file mode 100644 index 501bea84..00000000 Binary files a/mods/omm-coop/sound/omm_sound_effect_freeze_2.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_effect_heal.ogg b/mods/omm-coop/sound/omm_sound_effect_heal.ogg deleted file mode 100644 index 51931e02..00000000 Binary files a/mods/omm-coop/sound/omm_sound_effect_heal.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_effect_midair_spin.ogg b/mods/omm-coop/sound/omm_sound_effect_midair_spin.ogg deleted file mode 100644 index 85b75405..00000000 Binary files a/mods/omm-coop/sound/omm_sound_effect_midair_spin.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_luigi_1.ogg b/mods/omm-coop/sound/omm_sound_event_death_luigi_1.ogg deleted file mode 100644 index 47778b4b..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_luigi_1.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_luigi_2.ogg b/mods/omm-coop/sound/omm_sound_event_death_luigi_2.ogg deleted file mode 100644 index e32dc89c..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_luigi_2.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_luigi_3.ogg b/mods/omm-coop/sound/omm_sound_event_death_luigi_3.ogg deleted file mode 100644 index aea7e3fb..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_luigi_3.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_mario_1.ogg b/mods/omm-coop/sound/omm_sound_event_death_mario_1.ogg deleted file mode 100644 index 81886450..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_mario_1.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_mario_2.ogg b/mods/omm-coop/sound/omm_sound_event_death_mario_2.ogg deleted file mode 100644 index 8cb061cc..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_mario_2.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_mario_3.ogg b/mods/omm-coop/sound/omm_sound_event_death_mario_3.ogg deleted file mode 100644 index abe27b63..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_mario_3.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_wario_1.ogg b/mods/omm-coop/sound/omm_sound_event_death_wario_1.ogg deleted file mode 100644 index e0e9df31..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_wario_1.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_wario_2.ogg b/mods/omm-coop/sound/omm_sound_event_death_wario_2.ogg deleted file mode 100644 index 1d7ae644..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_wario_2.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_death_wario_3.ogg b/mods/omm-coop/sound/omm_sound_event_death_wario_3.ogg deleted file mode 100644 index 30a57357..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_death_wario_3.ogg and /dev/null differ diff --git a/mods/omm-coop/sound/omm_sound_event_life_up.ogg b/mods/omm-coop/sound/omm_sound_event_life_up.ogg deleted file mode 100644 index 3cb7894d..00000000 Binary files a/mods/omm-coop/sound/omm_sound_event_life_up.ogg and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_cap_m.tex b/mods/omm-coop/textures/omm_tex_cap_m.tex deleted file mode 100644 index 26c2f804..00000000 Binary files a/mods/omm-coop/textures/omm_tex_cap_m.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_cap_v.tex b/mods/omm-coop/textures/omm_tex_cap_v.tex deleted file mode 100644 index 0a43ef49..00000000 Binary files a/mods/omm-coop/textures/omm_tex_cap_v.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_cap_w.tex b/mods/omm-coop/textures/omm_tex_cap_w.tex deleted file mode 100644 index 8bd9a158..00000000 Binary files a/mods/omm-coop/textures/omm_tex_cap_w.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_0.tex b/mods/omm-coop/textures/omm_tex_hud_0.tex deleted file mode 100644 index c212bfd2..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_0.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_1.tex b/mods/omm-coop/textures/omm_tex_hud_1.tex deleted file mode 100644 index 090d10b8..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_1.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_2.tex b/mods/omm-coop/textures/omm_tex_hud_2.tex deleted file mode 100644 index 07c16bc0..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_2.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_3.tex b/mods/omm-coop/textures/omm_tex_hud_3.tex deleted file mode 100644 index 070ec61c..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_3.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_4.tex b/mods/omm-coop/textures/omm_tex_hud_4.tex deleted file mode 100644 index 543abee4..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_4.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_5.tex b/mods/omm-coop/textures/omm_tex_hud_5.tex deleted file mode 100644 index abbb35aa..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_5.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_6.tex b/mods/omm-coop/textures/omm_tex_hud_6.tex deleted file mode 100644 index db12179b..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_6.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_7.tex b/mods/omm-coop/textures/omm_tex_hud_7.tex deleted file mode 100644 index 847229b1..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_7.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_8.tex b/mods/omm-coop/textures/omm_tex_hud_8.tex deleted file mode 100644 index a09145cc..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_8.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_9.tex b/mods/omm-coop/textures/omm_tex_hud_9.tex deleted file mode 100644 index 3cdbe2f9..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_9.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_arrow_red.tex b/mods/omm-coop/textures/omm_tex_hud_arrow_red.tex deleted file mode 100644 index c1f91a43..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_arrow_red.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_arrow_secret.tex b/mods/omm-coop/textures/omm_tex_hud_arrow_secret.tex deleted file mode 100644 index c3d3c22a..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_arrow_secret.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_arrow_star.tex b/mods/omm-coop/textures/omm_tex_hud_arrow_star.tex deleted file mode 100644 index b38a42a5..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_arrow_star.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_camera.tex b/mods/omm-coop/textures/omm_tex_hud_camera.tex deleted file mode 100644 index 72a5bfc9..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_camera.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_camera_16.tex b/mods/omm-coop/textures/omm_tex_hud_camera_16.tex deleted file mode 100644 index 65b2440a..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_camera_16.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_camera_8.tex b/mods/omm-coop/textures/omm_tex_hud_camera_8.tex deleted file mode 100644 index b1677e36..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_camera_8.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_camera_far.tex b/mods/omm-coop/textures/omm_tex_hud_camera_far.tex deleted file mode 100644 index cb961d20..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_camera_far.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_camera_near.tex b/mods/omm-coop/textures/omm_tex_hud_camera_near.tex deleted file mode 100644 index ff73941f..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_camera_near.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_000.tex b/mods/omm-coop/textures/omm_tex_hud_cap_000.tex deleted file mode 100644 index dea4921c..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_000.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_001.tex b/mods/omm-coop/textures/omm_tex_hud_cap_001.tex deleted file mode 100644 index a1022b40..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_001.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_010.tex b/mods/omm-coop/textures/omm_tex_hud_cap_010.tex deleted file mode 100644 index b5a58f67..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_010.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_011.tex b/mods/omm-coop/textures/omm_tex_hud_cap_011.tex deleted file mode 100644 index 133e6f35..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_011.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_100.tex b/mods/omm-coop/textures/omm_tex_hud_cap_100.tex deleted file mode 100644 index e45c055d..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_100.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_101.tex b/mods/omm-coop/textures/omm_tex_hud_cap_101.tex deleted file mode 100644 index 292bd5ec..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_101.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_110.tex b/mods/omm-coop/textures/omm_tex_hud_cap_110.tex deleted file mode 100644 index 315eb593..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_110.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_111.tex b/mods/omm-coop/textures/omm_tex_hud_cap_111.tex deleted file mode 100644 index 3f8b8fa8..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_111.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_200.tex b/mods/omm-coop/textures/omm_tex_hud_cap_200.tex deleted file mode 100644 index e431af6d..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_200.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_201.tex b/mods/omm-coop/textures/omm_tex_hud_cap_201.tex deleted file mode 100644 index 32ac9277..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_201.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_210.tex b/mods/omm-coop/textures/omm_tex_hud_cap_210.tex deleted file mode 100644 index d93b90ce..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_210.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_211.tex b/mods/omm-coop/textures/omm_tex_hud_cap_211.tex deleted file mode 100644 index 006078be..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_211.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_300.tex b/mods/omm-coop/textures/omm_tex_hud_cap_300.tex deleted file mode 100644 index 450e7539..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_300.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_301.tex b/mods/omm-coop/textures/omm_tex_hud_cap_301.tex deleted file mode 100644 index f7f02cf4..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_301.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_310.tex b/mods/omm-coop/textures/omm_tex_hud_cap_310.tex deleted file mode 100644 index a09f8d6b..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_310.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_311.tex b/mods/omm-coop/textures/omm_tex_hud_cap_311.tex deleted file mode 100644 index 7ee8455e..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_311.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_400.tex b/mods/omm-coop/textures/omm_tex_hud_cap_400.tex deleted file mode 100644 index cc30edce..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_400.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_401.tex b/mods/omm-coop/textures/omm_tex_hud_cap_401.tex deleted file mode 100644 index fa2324cf..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_401.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_410.tex b/mods/omm-coop/textures/omm_tex_hud_cap_410.tex deleted file mode 100644 index ae344cea..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_410.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_411.tex b/mods/omm-coop/textures/omm_tex_hud_cap_411.tex deleted file mode 100644 index e49e8051..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_411.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_wing0.tex b/mods/omm-coop/textures/omm_tex_hud_cap_wing0.tex deleted file mode 100644 index fe0c27f6..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_wing0.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_cap_wing1.tex b/mods/omm-coop/textures/omm_tex_hud_cap_wing1.tex deleted file mode 100644 index 55a23c11..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_cap_wing1.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_clock.tex b/mods/omm-coop/textures/omm_tex_hud_clock.tex deleted file mode 100644 index 603e410e..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_clock.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_clock_hand.tex b/mods/omm-coop/textures/omm_tex_hud_clock_hand.tex deleted file mode 100644 index fcb4d885..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_clock_hand.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_coin.tex b/mods/omm-coop/textures/omm_tex_hud_coin.tex deleted file mode 100644 index d1aeec49..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_coin.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_dots.tex b/mods/omm-coop/textures/omm_tex_hud_dots.tex deleted file mode 100644 index 1795c862..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_dots.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_m.tex b/mods/omm-coop/textures/omm_tex_hud_m.tex deleted file mode 100644 index ea28c866..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_m.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_0.tex b/mods/omm-coop/textures/omm_tex_hud_power_0.tex deleted file mode 100644 index 09f2fd34..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_0.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_1.tex b/mods/omm-coop/textures/omm_tex_hud_power_1.tex deleted file mode 100644 index 0c13ad90..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_1.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_2.tex b/mods/omm-coop/textures/omm_tex_hud_power_2.tex deleted file mode 100644 index 62a79b67..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_2.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_3.tex b/mods/omm-coop/textures/omm_tex_hud_power_3.tex deleted file mode 100644 index 5ea96eb2..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_3.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_4.tex b/mods/omm-coop/textures/omm_tex_hud_power_4.tex deleted file mode 100644 index 332c67fd..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_4.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_5.tex b/mods/omm-coop/textures/omm_tex_hud_power_5.tex deleted file mode 100644 index b111ea83..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_5.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_6.tex b/mods/omm-coop/textures/omm_tex_hud_power_6.tex deleted file mode 100644 index 0a44e677..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_6.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_7.tex b/mods/omm-coop/textures/omm_tex_hud_power_7.tex deleted file mode 100644 index 8c5d362a..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_7.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_8.tex b/mods/omm-coop/textures/omm_tex_hud_power_8.tex deleted file mode 100644 index fdb7d794..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_8.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_power_heart.tex b/mods/omm-coop/textures/omm_tex_hud_power_heart.tex deleted file mode 100644 index 58127341..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_power_heart.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_s.tex b/mods/omm-coop/textures/omm_tex_hud_s.tex deleted file mode 100644 index b16d3baf..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_s.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_secret.tex b/mods/omm-coop/textures/omm_tex_hud_secret.tex deleted file mode 100644 index 3b8a65b4..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_secret.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_slash.tex b/mods/omm-coop/textures/omm_tex_hud_slash.tex deleted file mode 100644 index 0f60cb46..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_slash.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star.tex b/mods/omm-coop/textures/omm_tex_hud_star.tex deleted file mode 100644 index d4544098..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_0.tex b/mods/omm-coop/textures/omm_tex_hud_star_0.tex deleted file mode 100644 index c0db2669..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_0.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_1.tex b/mods/omm-coop/textures/omm_tex_hud_star_1.tex deleted file mode 100644 index dd638451..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_1.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_10.tex b/mods/omm-coop/textures/omm_tex_hud_star_10.tex deleted file mode 100644 index fe9d5ce3..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_10.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_11.tex b/mods/omm-coop/textures/omm_tex_hud_star_11.tex deleted file mode 100644 index 23c7b4c5..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_11.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_12.tex b/mods/omm-coop/textures/omm_tex_hud_star_12.tex deleted file mode 100644 index f5c35080..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_12.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_13.tex b/mods/omm-coop/textures/omm_tex_hud_star_13.tex deleted file mode 100644 index 2276aeda..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_13.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_14.tex b/mods/omm-coop/textures/omm_tex_hud_star_14.tex deleted file mode 100644 index a25e1ea7..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_14.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_15.tex b/mods/omm-coop/textures/omm_tex_hud_star_15.tex deleted file mode 100644 index 0220c0a6..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_15.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_2.tex b/mods/omm-coop/textures/omm_tex_hud_star_2.tex deleted file mode 100644 index 0a71ec27..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_2.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_3.tex b/mods/omm-coop/textures/omm_tex_hud_star_3.tex deleted file mode 100644 index 54553fce..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_3.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_4.tex b/mods/omm-coop/textures/omm_tex_hud_star_4.tex deleted file mode 100644 index 4f7f3bcb..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_4.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_5.tex b/mods/omm-coop/textures/omm_tex_hud_star_5.tex deleted file mode 100644 index 2b9d53bd..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_5.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_6.tex b/mods/omm-coop/textures/omm_tex_hud_star_6.tex deleted file mode 100644 index 333bc0db..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_6.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_7.tex b/mods/omm-coop/textures/omm_tex_hud_star_7.tex deleted file mode 100644 index 75384eb8..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_7.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_8.tex b/mods/omm-coop/textures/omm_tex_hud_star_8.tex deleted file mode 100644 index 74fab21b..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_8.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_9.tex b/mods/omm-coop/textures/omm_tex_hud_star_9.tex deleted file mode 100644 index 0b777926..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_9.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_hud_star_empty.tex b/mods/omm-coop/textures/omm_tex_hud_star_empty.tex deleted file mode 100644 index 1654a753..00000000 Binary files a/mods/omm-coop/textures/omm_tex_hud_star_empty.tex and /dev/null differ diff --git a/mods/omm-coop/textures/omm_tex_key.tex b/mods/omm-coop/textures/omm_tex_key.tex deleted file mode 100644 index f19793cb..00000000 Binary files a/mods/omm-coop/textures/omm_tex_key.tex and /dev/null differ diff --git a/mods/personal-starcount-ex.lua b/mods/personal-starcount-ex.lua new file mode 100644 index 00000000..21c16b35 --- /dev/null +++ b/mods/personal-starcount-ex.lua @@ -0,0 +1,355 @@ +-- name: Personal Star Counter +-- description: See how many stars you've collected!\n\nCredits:\n\\#097419\\Mr.Needlemouse\\#FFFFFF\\ - Concept\nSunk\\#dcdcdc\\ - Creator\n\\#269A91\\Demnyx\\#dcdcdc\\ - Assistance\n\\#f296af\\PeachyPeach\\#dcdcdc\\ - Global functions +-- incompatible: gamemode arena + +------------------------------ +----- Localize functions ----- +------------------------------ +-- This looks strange but it makes the mod more performant +local tonumber, mod_storage_load, mod_storage_save, tostring, djui_hud_is_pause_menu_created, djui_hud_set_color, hud_get_value, djui_hud_print_text, djui_hud_render_texture, obj_get_first_with_behavior_id, djui_hud_set_resolution, djui_hud_set_font, djui_hud_get_screen_width, hud_set_value, network_player_set_description = + tonumber, mod_storage_load, mod_storage_save, tostring, djui_hud_is_pause_menu_created, djui_hud_set_color, hud_get_value, djui_hud_print_text, djui_hud_render_texture, obj_get_first_with_behavior_id, djui_hud_set_resolution, djui_hud_set_font, djui_hud_get_screen_width, hud_set_value, network_player_set_description +------------------------------ + +-- Initialize a value for the psc for everyone +for i = 0, MAX_PLAYERS - 1 do + gPlayerSyncTable[i].psc = 0 +end + +local psc_toggle = true +local psc_hud_toggle = true + +-- If there is no value in storage, default to 0 +local TotalStarCounter = tonumber(mod_storage_load("StarCounter")) or 0 +local ThisGameStarCounter = 0 +local prevNumStars = 0 +local introTimer = 0 + +-- When in these cutscenes, do special things like hiding or moving the star counters +local is_in_cutscenes = { + [ACT_END_PEACH_CUTSCENE] = true, + [ACT_CREDITS_CUTSCENE] = true, + [ACT_END_WAVING_CUTSCENE] = true, +} + +--- Whenever a star is collected, increment the other star counters +---@param m MarioState The Mario that does the interaction +---@param obj Object The object the Mario interacted with (Unused here) +---@param intType integer The interaction type +---@param interacted boolean If the interaction was successful (Unused here) +---@return nil +local function star_counter_on_interact(m, obj, intType, interacted) + if not psc_toggle then return end + + if m.playerIndex == 0 and intType == INTERACT_STAR_OR_KEY then + -- Interactions happen before hud rendering, which is why this check can work + -- despite prevNumStars being updated every frame + if m.numStars ~= prevNumStars then + ThisGameStarCounter = ThisGameStarCounter + 1 -- Red star counter + TotalStarCounter = TotalStarCounter + 1 -- Green star counter + mod_storage_save("StarCounter", tostring(TotalStarCounter)) -- Save to mod storage + end + end +end + +--- Hud alpha stuff from Agent X +--- Causes the hud to darken when the game is paused +---@param r number Red +---@param g number Green +---@param b number Blue +---@param a number Alpha (Transparency) +---@return nil +local function djui_hud_set_adjusted_color(r, g, b, a) + local multiplier = 1 + if djui_hud_is_pause_menu_created() then multiplier = 0.57 end -- Star Display compatibility + djui_hud_set_color(r * multiplier, g * multiplier, b * multiplier, a) +end + +--- Sets the star counters onto the hud +---@param m MarioState Mario +---@param width number Screen width +---@return nil +local function set_hud_star_positions(m, width) + if introTimer >= 1195 or m.action ~= ACT_INTRO_CUTSCENE then + local star_texture = gTextures.star + local is_in_cutscene = is_in_cutscenes[m.action] ~= nil + + -- Check if the timer is currently active + local timer_current_value = hud_get_value(HUD_DISPLAY_TIMER) + + -- Offset based on if the timer is active + local timer_offset_X = 0 + local timer_offset_Y = 0 + + -- Offset based on if each counter has less than 100 stars + local low_stars_offset_X = 0 + + -- Based off of star texture pos + local star_counter_offset_X = 0 + + -- Y position, based off of the top of the screen + local top_screen_offset_Y = 0 + + ------------------------------- + ----- Yellow star counter ----- + ------------------------------- + + -- Don't display while in a cutscene + if not is_in_cutscene then + star_counter_offset_X = 76 + top_screen_offset_Y = 15 + low_stars_offset_X = 14 + offsetX = 14 + if m.numStars < 100 then + djui_hud_set_adjusted_color(246, 246, 246, 255) + djui_hud_print_text("@", width - (star_counter_offset_X - 16), top_screen_offset_Y, 1) + offsetX = 0 + end + djui_hud_set_adjusted_color(255, 255, 255, 255) + djui_hud_print_text(tostring(m.numStars), width - (star_counter_offset_X - 30) - offsetX, top_screen_offset_Y, 1) + djui_hud_render_texture(star_texture, width - star_counter_offset_X, top_screen_offset_Y, 1, 1) + end + + ---------------------------- + ----- Red star counter ----- + ---------------------------- + + -- Move HUD graphics away from the TIMER HUD + if timer_current_value ~= 0 then + timer_offset_X = 60 + timer_offset_Y = -17 + end + + star_counter_offset_X = is_in_cutscene and 22 or 76 + top_screen_offset_Y = is_in_cutscene and 15 or 32 + low_stars_offset_X = 14 + + -- Render X if this counter has less than 100 stars + if ThisGameStarCounter < 100 then + djui_hud_set_adjusted_color(246, 246, 246, 255) + djui_hud_print_text( + "@", -- Text + (is_in_cutscene and + (star_counter_offset_X + 16) or -- X pos in cutscenes + (width - (star_counter_offset_X - 16) - timer_offset_X) -- X pos outside cutscenes + ), + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1 -- Scale + ) + low_stars_offset_X = 0 + end + + -- Render counter + djui_hud_set_adjusted_color(255, 255, 255, 255) + djui_hud_print_text( + tostring(ThisGameStarCounter), -- Text + (is_in_cutscene and + (star_counter_offset_X + 30 - low_stars_offset_X) or -- X pos in cutscenes + (width - (star_counter_offset_X - 30) - timer_offset_X - low_stars_offset_X) -- X pos outside cutscenes + ), + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1 -- Scale + ) + djui_hud_set_adjusted_color(232, 17, 35, 255) + djui_hud_render_texture( + star_texture, -- Texture + (is_in_cutscene and + (star_counter_offset_X) or -- X pos in cutscenes + (width - star_counter_offset_X - timer_offset_X) -- X pos outside cutscenes + ), + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1, 1 -- Scale + ) + + ------------------------------ + ----- Green star counter ----- + ------------------------------ + + -- Increment a seperate counter if the total star count is over 10000 + local perceived_total_counter = TotalStarCounter % 10000 + local milestone_counter = math.floor(TotalStarCounter / 10000) + + -- Move HUD graphics away from the TIMER HUD + if timer_current_value ~= 0 then + timer_offset_X = 0 + timer_offset_Y = 12 + end + + star_counter_offset_X = 76 + top_screen_offset_Y = is_in_cutscene and 15 or 49 + low_stars_offset_X = 14 + + -- Render X if this counter has less than 100 stars + if perceived_total_counter < 100 then + djui_hud_set_adjusted_color(246, 246, 246, 255) + djui_hud_print_text( + "@", -- Text + width - (star_counter_offset_X - 16) - timer_offset_X, -- X pos + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1 -- Scale + ) + low_stars_offset_X = 0 + end + + -- Render counter + djui_hud_set_adjusted_color(255, 255, 255, 255) + djui_hud_print_text( + tostring(perceived_total_counter), -- Text + width - (star_counter_offset_X - 30) - timer_offset_X - low_stars_offset_X, -- X pos + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1 -- Scale + ) + djui_hud_set_adjusted_color(50, 176, 40, 255) + djui_hud_render_texture( + star_texture, -- Texture + width - star_counter_offset_X - timer_offset_X, -- X pos + top_screen_offset_Y + timer_offset_Y, -- Y pos + 1, 1 -- Scale + ) + + -- Render milestone counter + if milestone_counter ~= 0 then + djui_hud_set_adjusted_color(255, 255, 255, 255) + djui_hud_print_text( + "@" .. milestone_counter, -- Text + width - star_counter_offset_X - timer_offset_X, -- X pos + (top_screen_offset_Y + 16) + timer_offset_Y, -- Y pos + 0.5 -- Scale + ) + end + end +end + +--- Renders star counters onto the screen +---@param m MarioState Mario +---@return nil +local function render_psc(m) + + -- Update prevNumStars + prevNumStars = m.numStars + + -- Make HUD appear when the real one does during the intro + if m.action == ACT_INTRO_CUTSCENE then + if introTimer < 1195 then + introTimer = introTimer + 1 + end + end + + -- Don't render the counters if one of the toggle is disabled + if not psc_toggle or not psc_hud_toggle then return end + + -- Don't render the counters if the act selector is active + if obj_get_first_with_behavior_id(id_bhvActSelector) then return end + + -- Set resolution and font + djui_hud_set_resolution(RESOLUTION_N64) + djui_hud_set_font(FONT_HUD) + + -- Force the normal star counter to be hidden + hud_set_value(HUD_DISPLAY_FLAGS, hud_get_value(HUD_DISPLAY_FLAGS) & ~HUD_DISPLAY_FLAG_STAR_COUNT) + + set_hud_star_positions(m, djui_hud_get_screen_width()) +end + +--- Renders star counters onto the screen, after the HUD is being rendered +---@return nil +local function hud_render_psc() + local m = gMarioStates[0] + if is_in_cutscenes[m.action] then + render_psc(m) + end +end + +--- Renders star counters onto the screen, before the HUD is being rendered +---@return nil +local function behind_hud_render_psc() + local m = gMarioStates[0] + if not is_in_cutscenes[m.action] then + render_psc(m) + end +end + +--- Display each person's star counter in the player menu +---@return nil +local function psc_update() + gPlayerSyncTable[0].psc = ThisGameStarCounter + for i = 0, MAX_PLAYERS - 1 do + network_player_set_description(gNetworkPlayers[i], "\\#FF0000\\Stars: " .. tostring(gPlayerSyncTable[i].psc), 255, 255, 255, 255) + end +end + +--- Toggle whether or not to display the star counter on the hud +---@param msg string +---@return boolean +local function toggle_psc(msg) + if msg:lower() == "on" then + psc_toggle = true + psc_hud_toggle = true + elseif msg:lower() == "off" then + psc_toggle = false + psc_hud_toggle = false + hud_set_value(HUD_DISPLAY_FLAGS, hud_get_value(HUD_DISPLAY_FLAGS) | HUD_DISPLAY_FLAG_STAR_COUNT) + end + return true +end + +----------------- +----- Hooks ----- +----------------- + +hook_event(HOOK_ON_INTERACT, star_counter_on_interact) +hook_event(HOOK_ON_HUD_RENDER, hud_render_psc) +hook_event(HOOK_ON_HUD_RENDER_BEHIND, behind_hud_render_psc) +hook_event(HOOK_UPDATE, psc_update) +hook_chat_command('psc', "On|Off - Displays stars you've collected. Default is On.", toggle_psc) + +-- Globalize functions for other mods to use +-- Created by PeachyPeach +_G.PersonalStarCounter = { + + --- Get the amount of red stars collected + ---@return integer + get_star_counter = function () + return ThisGameStarCounter + end, + + --- Get the amount of green stars collected + ---@return integer + get_total_star_counter = function () + return TotalStarCounter + end, + + --- Enable or disable the star counters + ---@param disable boolean + disable_star_counters = function (disable) + psc_toggle = not disable + end, + + --- Force show or hide the star counters + ---@param hide boolean + hide_star_counters = function (hide) + psc_hud_toggle = not hide + if hide then + hud_set_value(HUD_DISPLAY_FLAGS, hud_get_value(HUD_DISPLAY_FLAGS) | HUD_DISPLAY_FLAG_STAR_COUNT) + end + end, + + --- Modify the value of the star counters + ---@param red_change number How much to change the red (single game) star counter by + ---@param green_change number How much to change the green (total) star counter by + ---@param override_set boolean If true, force set the value of the star counters instead of change + ---@param save boolean If true, save the green star counter to mod storage + ---@return nil + change_star_counter_value = function (red_change, green_change, override_set, save) + ThisGameStarCounter = ThisGameStarCounter + red_change + if override_set then + ThisGameStarCounter = red_change + end + TotalStarCounter = TotalStarCounter + green_change + if override_set then + TotalStarCounter = green_change + end + if save then + mod_storage_save("StarCounter", tostring(TotalStarCounter)) + end + end +} \ No newline at end of file