From f3e4caecb0867a88759f55f4441091c0e39b6716 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:17:19 -0500 Subject: [PATCH] New Character Select --- mods/character-select-coop/main.lua | 15 ++++++++------- .../textures/char-select-text.tex | Bin 479 -> 480 bytes .../textures/unknown-icon.tex | Bin 401 -> 402 bytes mods/character-select-coop/z-dev-32.lua | Bin 1362 -> 1456 bytes mods/character-select-coop/z-dev-64.lua | Bin 1362 -> 1456 bytes 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mods/character-select-coop/main.lua b/mods/character-select-coop/main.lua index 3ddff382..a8a0c1de 100644 --- a/mods/character-select-coop/main.lua +++ b/mods/character-select-coop/main.lua @@ -244,20 +244,21 @@ local function mario_update(m) end if m.playerIndex == 0 and stallFrame > 1 then - characterTable[1].forceChar = gNetworkPlayers[m.playerIndex].modelIndex + local modelIndex = gNetworkPlayers[m.playerIndex].modelIndex + characterTable[1].forceChar = modelIndex if currChar == 1 then - characterTable[1].color = defaultPlayerColors[gNetworkPlayers[m.playerIndex].modelIndex] - characterTable[1].lifeIcon = defaultIcons[gNetworkPlayers[m.playerIndex].modelIndex] + characterTable[1].color = defaultPlayerColors[modelIndex] + characterTable[1].lifeIcon = defaultIcons[modelIndex] end if optionTable[optionTableRef.localModels].toggle > 0 then - gPlayerSyncTable[0].modelId = characterTable[currChar].model - gPlayerSyncTable[0].capModels = characterTable[currChar].capModels + gPlayerSyncTable[m.playerIndex].modelId = characterTable[currChar].model + gPlayerSyncTable[m.playerIndex].capModels = characterTable[currChar].capModels if characterTable[currChar].forceChar ~= nil then gNetworkPlayers[m.playerIndex].overrideModelIndex = characterTable[currChar].forceChar end else - gPlayerSyncTable[0].modelId = nil - gPlayerSyncTable[0].capModels = nil + gPlayerSyncTable[m.playerIndex].modelId = nil + gPlayerSyncTable[m.playerIndex].capModels = nil gNetworkPlayers[m.playerIndex].overrideModelIndex = characterTable[1].forceChar end diff --git a/mods/character-select-coop/textures/char-select-text.tex b/mods/character-select-coop/textures/char-select-text.tex index 7e409931054a8cbf4b780015ccc22bd0e6989c91..f679a2db48066e4515175ca71d9d0f0024b2c826 100644 GIT binary patch delta 12 Tcmcc5{D66a6eI6OsiTYl9hL+S delta 10 RcmaFBe4lxO)JEx}i~tyP1Ofm6 diff --git a/mods/character-select-coop/textures/unknown-icon.tex b/mods/character-select-coop/textures/unknown-icon.tex index 4a2c1483a16fcc7c8a0dc68483b51bcdbd16da6c..92ccf76c8e0d2a7d7b4f393a00b9749d3e5f5560 100644 GIT binary patch delta 12 TcmbQpJc)UN7$fgSv1&#D7A6BB delta 10 RcmbQlJdt^V*hcYcMgS5-0~7!N diff --git a/mods/character-select-coop/z-dev-32.lua b/mods/character-select-coop/z-dev-32.lua index 49a7dffcb85f5a500f39d4760bdabbaa28c25305..d4c101b825b9dc2725e083b0f5c11d7c14ec9d5c 100644 GIT binary patch delta 555 zcmb`DF-yZh6vyA)B~6;3ty2e~T?AJr7nfW}TAS7uEfqS2LQ4g~g5XdPn{;R^4pt8F z3%I%X5t0lAR}sP858^vXMRyM#{NMlG{qBGFYCM~ZOS0nE=3%Q5eqWJ294WP3vJ3{3O58uOc)TG!4pRvGB6VWV-n2_+nE~^>)N6L zOcMvTc)&{FLJ^eToH6BGMNoi;RUnB9oMsS)JVw?{&}oL4T;2 zql;1Zv@f;zAPaFz@5K&#GYJ5Gom`&SR7zr3$!AsUzDtains`_0;~YA&^8Z{L$WyRb z)sYu^67Tv4O~jW6LGNfS$pft@XW`)8j^pT+4-P>k<~l~HZ3QPrF^VGwJNIPXTJ; zapiMf?H=jS?FLi#O?&PocqntJ*T3rYFWbFt-yMfv6)p{~2j>^v{DL4~BLl>4pKC7V m@&U{CuW@Z|xgnR`6Q8(O-rm^~Dc8fKq4FnIt7;#ep8W#3h-HBQ diff --git a/mods/character-select-coop/z-dev-64.lua b/mods/character-select-coop/z-dev-64.lua index 6de4aacde12bda1cbee455789180173537696b7c..d8b4b1d3f8ab71fc43d7bc96eadd4685df727ea8 100644 GIT binary patch delta 555 zcmb`DF-yZh6vyA)B~6;3ty2e~T?AJr7nfW}TAS7uEfqS2LQ4g~g5XdPn{;R^4pt8F z3%I%X5t0lAR}sP858^vXMRyM#{NMlG{qBGFYCM~ZOS0nE=3%Q5eqWJ294WP3vJ3{3O58uOc)TG!4pRvGB6VWV-n2_+nE~^>)N6L zOcMvTc)&{FLJ^eToH6BGMNoi;RUnB9oMsS)JVw?{&}oL4T;2 zql;1Zv@f;zAPaFz@5K&#GYJ5Gom`&SR7zr3$!AsUzDtains`_0;~YA&^8Z{L$WyRb z)sYu^67Tv4O~jW6LGNfS$pft@XW`)8j^pT+4-P>k<~l~HZ3QPrF^VGwJNIPXTJ; zapiMf?H=jS?FLi#O?&PocqntJ*T3rYFWbFt-yMfv6)p{~2j>^v{DL4~BLl>4pKC7V m@&U{CuW@Z|xgnR`6Q8(O-rm^~Dc8fKq4FnIt7;#ep8W#3h-HBQ