From ed741222130e2f92ac3b67e7fbdda8aa8e1a5f8c Mon Sep 17 00:00:00 2001 From: luigi-budd <90123055+luigi-budd@users.noreply.github.com> Date: Sat, 7 Sep 2024 17:26:21 -0500 Subject: [PATCH 1/4] Things have zb definitions --- src/Lua/Exit Signs/exitsign_init.lua | 14 ++++++++----- src/Lua/Exit Signs/exitsign_thinkers.lua | 26 ++++++++++++++++-------- src/Lua/Gimmicks/doors.lua | 4 ++++ src/Lua/Gimmicks/keys.lua | 4 ++++ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/Lua/Exit Signs/exitsign_init.lua b/src/Lua/Exit Signs/exitsign_init.lua index 3bd03dc..c40f216 100644 --- a/src/Lua/Exit Signs/exitsign_init.lua +++ b/src/Lua/Exit Signs/exitsign_init.lua @@ -1,4 +1,5 @@ -//LUIG BUD!!! +--LUIG BUD!!! +--this code is old and sucks booty /* --TODO @@ -16,9 +17,12 @@ states[S_EXITSPAWN_PLACEHOLDER] = { tics = -1, } mobjinfo[MT_PIZZATOWER_EXITSIGN_SPAWN] = { - doomednum = 1263, //1-26-[202]3 + --$Name Exit Sign + --$Sprite GSSEA0 + --$Category Spice Runners + doomednum = 1263, --1-26-[202]3 spawnstate = S_EXITSPAWN_PLACEHOLDER, - spawnhealth = 1000, //gus cannot die lol + spawnhealth = 1000, --gus cannot die lol radius = 14*FU, height = 26*FU, flags = MF_NOCLIPTHING @@ -88,7 +92,7 @@ states[S_GUSTAVO_RAT_RALLY] = { mobjinfo[MT_GUSTAVO_EXITSIGN] = { doomednum = -1, spawnstate = S_GUSTAVO_EXIT_WAIT, - spawnhealth = 1000, //gus cannot die lol + spawnhealth = 1000, --gus cannot die lol radius = 14*FU, height = 26*FU, flags = MF_NOCLIPTHING @@ -124,7 +128,7 @@ states[S_STICK_EXIT_RALLY] = { mobjinfo[MT_STICK_EXITSIGN] = { doomednum = -1, spawnstate = S_STICK_EXIT_WAIT, - spawnhealth = 1000, //gus cannot die lol + spawnhealth = 1000, --gus cannot die lol radius = 10*FU, height = 32*FU, flags = MF_NOCLIPTHING diff --git a/src/Lua/Exit Signs/exitsign_thinkers.lua b/src/Lua/Exit Signs/exitsign_thinkers.lua index d3c6be4..0e81c16 100644 --- a/src/Lua/Exit Signs/exitsign_thinkers.lua +++ b/src/Lua/Exit Signs/exitsign_thinkers.lua @@ -1,7 +1,8 @@ -//LUIG BUD!!! -local isIcy = false +--LUIG BUD!!! +--local isIcy = false local dist = 1500 +/* addHook("NetVars",function(n) isIcy = n($) end) @@ -11,7 +12,7 @@ local function isIcyF(map) return false; end - // https://wiki.srb2.org/wiki/Flats_and_textures/Skies + -- https://wiki.srb2.org/wiki/Flats_and_textures/Skies if (mapheaderinfo[map].skynum == 17 or mapheaderinfo[map].skynum == 29 or mapheaderinfo[map].skynum == 30 @@ -23,11 +24,11 @@ local function isIcyF(map) if (mapheaderinfo[map].musname == "MP_ICE" or mapheaderinfo[map].musname == "FHZ" or mapheaderinfo[map].musname == "CCZ") - // ice music + -- ice music return true; end - //time to bust out the thesaurus! + --time to bust out the thesaurus! local icywords = { "frozen", "christmas", @@ -67,14 +68,17 @@ end addHook("MapLoad",function(mapid) isIcy = isIcyF(mapid) end) +*/ + addHook("MapThingSpawn",function(mo,mt) - //we dont wanna see EXIT pop up from no where - //looks like an ERROR in a source game! + --we dont wanna see EXIT pop up from no where + --looks like an ERROR in a source game! mo.flags2 = $|MF2_DONTDRAW if PTSR.IsPTSR() local mul = 14 - if isIcy + /* + if false local gus = P_SpawnMobjFromMobj(mo,0,0,(mo.height*mul),MT_GUSTAVO_EXITSIGN) gus.state = S_GUSTAVO_EXIT_WAIT gus.icygus = true @@ -89,6 +93,8 @@ addHook("MapThingSpawn",function(mo,mt) gus.tracer = mo return true else + */ + do if (P_RandomChance(FU/2)) local gus = P_SpawnMobjFromMobj(mo,0,0,(mo.height*mul),MT_GUSTAVO_EXITSIGN) gus.state = S_GUSTAVO_EXIT_WAIT @@ -165,7 +171,8 @@ addHook("MobjThinker",function(mo) mo.state = S_GUSTAVO_RAT_FALL elseif not (mo.icygus) mo.state = S_GUSTAVO_EXIT_FALL - end + end + mo.momz = $ + P_GetMobjGravity(mo) end end end,MT_GUSTAVO_EXITSIGN) @@ -213,6 +220,7 @@ addHook("MobjThinker",function(mo) end else mo.state = S_STICK_EXIT_FALL + mo.momz = $ + P_GetMobjGravity(mo) end end end,MT_STICK_EXITSIGN) \ No newline at end of file diff --git a/src/Lua/Gimmicks/doors.lua b/src/Lua/Gimmicks/doors.lua index 8339e3d..36cfa41 100644 --- a/src/Lua/Gimmicks/doors.lua +++ b/src/Lua/Gimmicks/doors.lua @@ -22,6 +22,10 @@ states[freeslot "S_PTSR_DOOR_UNLOCKED"] = { } mobjinfo[freeslot "MT_PTSR_DOOR"] = { + --$Name Door + --$Sprite PDORA0 + --$Category Spice Runners + --$AngleText ID doomednum = 2111, radius = 20*FU, diff --git a/src/Lua/Gimmicks/keys.lua b/src/Lua/Gimmicks/keys.lua index 7c6717c..4d9361a 100644 --- a/src/Lua/Gimmicks/keys.lua +++ b/src/Lua/Gimmicks/keys.lua @@ -20,6 +20,10 @@ local keyNotCaughtFlags = MF_SPECIAL local keyCaughtFlags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY mobjinfo[freeslot "MT_PTSR_KEY"] = { + --$Name Key + --$Sprite PKEYA0 + --$Category Spice Runners + --$AngleText Door ID doomednum = 2112, spawnstate = S_PTSR_KEY, From a025f27c793e7c2a1566ce72716c8f153bf75602 Mon Sep 17 00:00:00 2001 From: luigi-budd <90123055+luigi-budd@users.noreply.github.com> Date: Sat, 7 Sep 2024 17:29:53 -0500 Subject: [PATCH 2/4] disable pf viewpoint for now --- src/Lua/Hooks/PlayerThinks.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Lua/Hooks/PlayerThinks.lua b/src/Lua/Hooks/PlayerThinks.lua index a032b50..8c3716c 100644 --- a/src/Lua/Hooks/PlayerThinks.lua +++ b/src/Lua/Hooks/PlayerThinks.lua @@ -354,6 +354,7 @@ end) --PF Viewpoint (spectate pizzafaces) addHook("PlayerThink",function(p) if not (p.spectator) then return end + if leveltime then return end local me = p.realmo From 7cc73235d6a59e3d13ed91f3d31e5df0bd563ae2 Mon Sep 17 00:00:00 2001 From: luigi-budd <90123055+luigi-budd@users.noreply.github.com> Date: Sat, 7 Sep 2024 17:33:38 -0500 Subject: [PATCH 3/4] disable pf viewpoint for now --- src/Lua/Hooks/PlayerThinks.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Lua/Hooks/PlayerThinks.lua b/src/Lua/Hooks/PlayerThinks.lua index 8c3716c..c9ff0a4 100644 --- a/src/Lua/Hooks/PlayerThinks.lua +++ b/src/Lua/Hooks/PlayerThinks.lua @@ -352,6 +352,7 @@ addHook("PostThinkFrame", function() end) --PF Viewpoint (spectate pizzafaces) +/* addHook("PlayerThink",function(p) if not (p.spectator) then return end if leveltime then return end @@ -423,4 +424,5 @@ addHook("PlayerThink",function(p) end end -end) \ No newline at end of file +end) +*/ \ No newline at end of file From aeeb029acc960329315be62bb06f66c95f4eba4a Mon Sep 17 00:00:00 2001 From: luigi-budd <90123055+luigi-budd@users.noreply.github.com> Date: Sat, 7 Sep 2024 17:34:26 -0500 Subject: [PATCH 4/4] Revert "Things have zb definitions" This reverts commit ed741222130e2f92ac3b67e7fbdda8aa8e1a5f8c. --- src/Lua/Exit Signs/exitsign_init.lua | 14 +++++-------- src/Lua/Exit Signs/exitsign_thinkers.lua | 26 ++++++++---------------- src/Lua/Gimmicks/doors.lua | 4 ---- src/Lua/Gimmicks/keys.lua | 4 ---- 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/Lua/Exit Signs/exitsign_init.lua b/src/Lua/Exit Signs/exitsign_init.lua index c40f216..3bd03dc 100644 --- a/src/Lua/Exit Signs/exitsign_init.lua +++ b/src/Lua/Exit Signs/exitsign_init.lua @@ -1,5 +1,4 @@ ---LUIG BUD!!! ---this code is old and sucks booty +//LUIG BUD!!! /* --TODO @@ -17,12 +16,9 @@ states[S_EXITSPAWN_PLACEHOLDER] = { tics = -1, } mobjinfo[MT_PIZZATOWER_EXITSIGN_SPAWN] = { - --$Name Exit Sign - --$Sprite GSSEA0 - --$Category Spice Runners - doomednum = 1263, --1-26-[202]3 + doomednum = 1263, //1-26-[202]3 spawnstate = S_EXITSPAWN_PLACEHOLDER, - spawnhealth = 1000, --gus cannot die lol + spawnhealth = 1000, //gus cannot die lol radius = 14*FU, height = 26*FU, flags = MF_NOCLIPTHING @@ -92,7 +88,7 @@ states[S_GUSTAVO_RAT_RALLY] = { mobjinfo[MT_GUSTAVO_EXITSIGN] = { doomednum = -1, spawnstate = S_GUSTAVO_EXIT_WAIT, - spawnhealth = 1000, --gus cannot die lol + spawnhealth = 1000, //gus cannot die lol radius = 14*FU, height = 26*FU, flags = MF_NOCLIPTHING @@ -128,7 +124,7 @@ states[S_STICK_EXIT_RALLY] = { mobjinfo[MT_STICK_EXITSIGN] = { doomednum = -1, spawnstate = S_STICK_EXIT_WAIT, - spawnhealth = 1000, --gus cannot die lol + spawnhealth = 1000, //gus cannot die lol radius = 10*FU, height = 32*FU, flags = MF_NOCLIPTHING diff --git a/src/Lua/Exit Signs/exitsign_thinkers.lua b/src/Lua/Exit Signs/exitsign_thinkers.lua index 0e81c16..d3c6be4 100644 --- a/src/Lua/Exit Signs/exitsign_thinkers.lua +++ b/src/Lua/Exit Signs/exitsign_thinkers.lua @@ -1,8 +1,7 @@ ---LUIG BUD!!! ---local isIcy = false +//LUIG BUD!!! +local isIcy = false local dist = 1500 -/* addHook("NetVars",function(n) isIcy = n($) end) @@ -12,7 +11,7 @@ local function isIcyF(map) return false; end - -- https://wiki.srb2.org/wiki/Flats_and_textures/Skies + // https://wiki.srb2.org/wiki/Flats_and_textures/Skies if (mapheaderinfo[map].skynum == 17 or mapheaderinfo[map].skynum == 29 or mapheaderinfo[map].skynum == 30 @@ -24,11 +23,11 @@ local function isIcyF(map) if (mapheaderinfo[map].musname == "MP_ICE" or mapheaderinfo[map].musname == "FHZ" or mapheaderinfo[map].musname == "CCZ") - -- ice music + // ice music return true; end - --time to bust out the thesaurus! + //time to bust out the thesaurus! local icywords = { "frozen", "christmas", @@ -68,17 +67,14 @@ end addHook("MapLoad",function(mapid) isIcy = isIcyF(mapid) end) -*/ - addHook("MapThingSpawn",function(mo,mt) - --we dont wanna see EXIT pop up from no where - --looks like an ERROR in a source game! + //we dont wanna see EXIT pop up from no where + //looks like an ERROR in a source game! mo.flags2 = $|MF2_DONTDRAW if PTSR.IsPTSR() local mul = 14 - /* - if false + if isIcy local gus = P_SpawnMobjFromMobj(mo,0,0,(mo.height*mul),MT_GUSTAVO_EXITSIGN) gus.state = S_GUSTAVO_EXIT_WAIT gus.icygus = true @@ -93,8 +89,6 @@ addHook("MapThingSpawn",function(mo,mt) gus.tracer = mo return true else - */ - do if (P_RandomChance(FU/2)) local gus = P_SpawnMobjFromMobj(mo,0,0,(mo.height*mul),MT_GUSTAVO_EXITSIGN) gus.state = S_GUSTAVO_EXIT_WAIT @@ -171,8 +165,7 @@ addHook("MobjThinker",function(mo) mo.state = S_GUSTAVO_RAT_FALL elseif not (mo.icygus) mo.state = S_GUSTAVO_EXIT_FALL - end - mo.momz = $ + P_GetMobjGravity(mo) + end end end end,MT_GUSTAVO_EXITSIGN) @@ -220,7 +213,6 @@ addHook("MobjThinker",function(mo) end else mo.state = S_STICK_EXIT_FALL - mo.momz = $ + P_GetMobjGravity(mo) end end end,MT_STICK_EXITSIGN) \ No newline at end of file diff --git a/src/Lua/Gimmicks/doors.lua b/src/Lua/Gimmicks/doors.lua index 36cfa41..8339e3d 100644 --- a/src/Lua/Gimmicks/doors.lua +++ b/src/Lua/Gimmicks/doors.lua @@ -22,10 +22,6 @@ states[freeslot "S_PTSR_DOOR_UNLOCKED"] = { } mobjinfo[freeslot "MT_PTSR_DOOR"] = { - --$Name Door - --$Sprite PDORA0 - --$Category Spice Runners - --$AngleText ID doomednum = 2111, radius = 20*FU, diff --git a/src/Lua/Gimmicks/keys.lua b/src/Lua/Gimmicks/keys.lua index 4d9361a..7c6717c 100644 --- a/src/Lua/Gimmicks/keys.lua +++ b/src/Lua/Gimmicks/keys.lua @@ -20,10 +20,6 @@ local keyNotCaughtFlags = MF_SPECIAL local keyCaughtFlags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY mobjinfo[freeslot "MT_PTSR_KEY"] = { - --$Name Key - --$Sprite PKEYA0 - --$Category Spice Runners - --$AngleText Door ID doomednum = 2112, spawnstate = S_PTSR_KEY,