Tinker with default mods

This commit is contained in:
Agent X 2023-12-05 14:37:48 -05:00
parent 87d4902f46
commit 99c9cd27cc
213 changed files with 366 additions and 29 deletions

View file

@ -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

Binary file not shown.

View file

@ -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

View file

@ -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

View file

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more