From 57a82e1a7984a06bb2ceed470d3eaf04544a11cb Mon Sep 17 00:00:00 2001 From: sphere Date: Wed, 16 Oct 2019 21:12:04 +0200 Subject: [PATCH 1/6] Make the maces and related objects normally placeable. --- src/info.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/info.c b/src/info.c index dd5338ef0..655664f9b 100644 --- a/src/info.c +++ b/src/info.c @@ -11104,7 +11104,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLMACE - -1, // doomednum + 1130, // doomednum S_SMALLMACE, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11131,7 +11131,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGMACE - -1, // doomednum + 1131, // doomednum S_BIGMACE, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLGRABCHAIN - -1, // doomednum + 1132, // doomednum S_SMALLGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11185,8 +11185,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGGRABCHAIN - -1, // doomednum - S_BIGGRABCHAIN, // spawnstate + 1133, // doomednum + S_BIGGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -11212,7 +11212,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_YELLOWSPRINGBALL - -1, // doomednum + 1134, // doomednum S_YELLOWSPRINGBALL, // spawnstate 1000, // spawnhealth S_YELLOWSPRINGBALL2, // seestate @@ -11239,7 +11239,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_REDSPRINGBALL - -1, // doomednum + 1135, // doomednum S_REDSPRINGBALL, // spawnstate 1000, // spawnhealth S_REDSPRINGBALL2, // seestate @@ -11266,7 +11266,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLFIREBAR - -1, // doomednum + 1136, // doomednum S_SMALLFIREBAR1, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11293,7 +11293,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGFIREBAR - -1, // doomednum + 1137, // doomednum S_BIGFIREBAR1, // spawnstate 1000, // spawnhealth S_NULL, // seestate From 5778803012264bb33f6712c4e74afdbc334f309b Mon Sep 17 00:00:00 2001 From: sphere Date: Wed, 16 Oct 2019 21:20:49 +0200 Subject: [PATCH 2/6] Add normally placeable maces to the ZB config. --- extras/conf/SRB2-22.cfg | 60 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg index d936721b6..606b8af68 100644 --- a/extras/conf/SRB2-22.cfg +++ b/extras/conf/SRB2-22.cfg @@ -2175,7 +2175,7 @@ linedeftypes title = "Award Rings"; prefix = "(460)"; } - + 461 { title = "Spawn Object"; @@ -5038,6 +5038,62 @@ thingtypes width = 8; height = 208; } + 1130 + { + title = "Small Mace"; + sprite = "SMCEA0"; + width = 17; + height = 34; + } + 1131 + { + title = "Big Mace"; + sprite = "BMCEA0"; + width = 34; + height = 68; + } + 1132 + { + title = "Small Grabbable Chain"; + sprite = "SMCHA0"; + width = 17; + height = 34; + } + 1133 + { + title = "Big Grabbable Chain"; + sprite = "BMCHA0"; + width = 17; + height = 34; + } + 1134 + { + title = "Yellow Spring Ball"; + sprite = "YSPBA0"; + width = 17; + height = 34; + } + 1135 + { + title = "Red Spring Ball"; + sprite = "RSPBA0"; + width = 34; + height = 68; + } + 1136 + { + title = "Small Fireball"; + sprite = "SFBRA0"; + width = 17; + height = 34; + } + 1136 + { + title = "Large Fireball"; + sprite = "BFBRA0"; + width = 17; + height = 34; + } } aridcanyon @@ -6416,4 +6472,4 @@ thingsfilters } } -} \ No newline at end of file +} From 71d7e2fedb4faf4c9352d99dd32d89fcba0a685e Mon Sep 17 00:00:00 2001 From: sphere Date: Wed, 16 Oct 2019 22:30:52 +0200 Subject: [PATCH 3/6] Correct some ZB config errors & remove grabbable chains. --- extras/conf/SRB2-22.cfg | 112 ++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 63 deletions(-) diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg index 606b8af68..41e8a30ea 100644 --- a/extras/conf/SRB2-22.cfg +++ b/extras/conf/SRB2-22.cfg @@ -4141,6 +4141,34 @@ thingtypes angletext = "Retraction interval"; parametertext = "Initial delay"; } + 1130 + { + title = "Small Mace"; + sprite = "SMCEA0"; + width = 17; + height = 34; + } + 1131 + { + title = "Big Mace"; + sprite = "BMCEA0"; + width = 34; + height = 68; + } + 1136 + { + title = "Small Fireball"; + sprite = "SFBRA0"; + width = 17; + height = 34; + } + 1137 + { + title = "Large Fireball"; + sprite = "BFBRA0"; + width = 34; + height = 68; + } } springs @@ -4248,6 +4276,20 @@ thingtypes width = 16; height = 32; } + 1134 + { + title = "Yellow Spring Ball"; + sprite = "YSPBA0"; + width = 17; + height = 34; + } + 1135 + { + title = "Red Spring Ball"; + sprite = "RSPBA0"; + width = 17; + height = 34; + } } patterns @@ -4828,7 +4870,7 @@ thingtypes } 1104 { - title = "Mace"; + title = "Mace Spawnpoint"; sprite = "SMCEA0"; width = 17; height = 34; @@ -4838,7 +4880,7 @@ thingtypes } 1105 { - title = "Chain & Maces"; + title = "Chain with Maces Spawnpoint"; sprite = "SMCEA0"; width = 17; height = 34; @@ -4848,7 +4890,7 @@ thingtypes } 1106 { - title = "Chained Spring"; + title = "Chained Spring Spawnpoint"; sprite = "YSPBA0"; width = 17; height = 34; @@ -4858,7 +4900,7 @@ thingtypes } 1107 { - title = "Chain"; + title = "Chain Spawnpoint"; sprite = "BMCHA0"; width = 17; height = 34; @@ -4868,7 +4910,7 @@ thingtypes 1108 { arrow = 1; - title = "Chain (Hidden)"; + title = "Hidden Chain Spawnpoint"; sprite = "internal:chain3"; width = 17; height = 34; @@ -4876,7 +4918,7 @@ thingtypes } 1109 { - title = "Firebar"; + title = "Firebar Spawnpoint"; sprite = "BFBRA0"; width = 17; height = 34; @@ -4886,7 +4928,7 @@ thingtypes } 1110 { - title = "Custom Mace"; + title = "Custom Mace Spawnpoint"; sprite = "SMCEA0"; width = 17; height = 34; @@ -5038,62 +5080,6 @@ thingtypes width = 8; height = 208; } - 1130 - { - title = "Small Mace"; - sprite = "SMCEA0"; - width = 17; - height = 34; - } - 1131 - { - title = "Big Mace"; - sprite = "BMCEA0"; - width = 34; - height = 68; - } - 1132 - { - title = "Small Grabbable Chain"; - sprite = "SMCHA0"; - width = 17; - height = 34; - } - 1133 - { - title = "Big Grabbable Chain"; - sprite = "BMCHA0"; - width = 17; - height = 34; - } - 1134 - { - title = "Yellow Spring Ball"; - sprite = "YSPBA0"; - width = 17; - height = 34; - } - 1135 - { - title = "Red Spring Ball"; - sprite = "RSPBA0"; - width = 34; - height = 68; - } - 1136 - { - title = "Small Fireball"; - sprite = "SFBRA0"; - width = 17; - height = 34; - } - 1136 - { - title = "Large Fireball"; - sprite = "BFBRA0"; - width = 17; - height = 34; - } } aridcanyon From 46567ab14714805b7c82501d005fe541c33e5547 Mon Sep 17 00:00:00 2001 From: sphere Date: Wed, 16 Oct 2019 22:31:57 +0200 Subject: [PATCH 4/6] Undo grabbable chains being placeable for now, since they're bugged. --- src/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/info.c b/src/info.c index 655664f9b..33340876e 100644 --- a/src/info.c +++ b/src/info.c @@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLGRABCHAIN - 1132, // doomednum + -1, // doomednum S_SMALLGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11185,7 +11185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGGRABCHAIN - 1133, // doomednum + -1, // doomednum S_BIGGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate From 232a558f2e8f96ae4d77b5bdd87b58ac3ba25ffa Mon Sep 17 00:00:00 2001 From: sphere Date: Thu, 17 Oct 2019 01:01:40 +0200 Subject: [PATCH 5/6] Fix standalone hangable chains being broken, thanks to toaster. --- src/info.c | 4 ++-- src/p_user.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/info.c b/src/info.c index 33340876e..655664f9b 100644 --- a/src/info.c +++ b/src/info.c @@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLGRABCHAIN - -1, // doomednum + 1132, // doomednum S_SMALLGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11185,7 +11185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGGRABCHAIN - -1, // doomednum + 1133, // doomednum S_BIGGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate diff --git a/src/p_user.c b/src/p_user.c index 33f84e2db..a67274d79 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4345,7 +4345,6 @@ void P_DoJump(player_t *player, boolean soundandstate) { player->mo->momz = 9*FRACUNIT; player->powers[pw_carry] = CR_NONE; - player->mo->tracer->flags |= MF_PUSHABLE; P_SetTarget(&player->mo->tracer->target, NULL); P_SetTarget(&player->mo->tracer, NULL); } @@ -12057,7 +12056,7 @@ void P_PlayerAfterThink(player_t *player) mo->momx = rock->momx; mo->momy = rock->momy; mo->momz = 0; - + if (player->panim == PA_IDLE && (mo->momx || mo->momy)) { P_SetPlayerMobjState(player->mo, S_PLAY_WALK); From 20af876282a06f708904fc7c5a6f8887321e397b Mon Sep 17 00:00:00 2001 From: sphere Date: Tue, 22 Oct 2019 02:29:34 +0200 Subject: [PATCH 6/6] Disable standalone hangable chains, since they're not a good mechanic. --- src/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/info.c b/src/info.c index 655664f9b..33340876e 100644 --- a/src/info.c +++ b/src/info.c @@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLGRABCHAIN - 1132, // doomednum + -1, // doomednum S_SMALLGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11185,7 +11185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGGRABCHAIN - 1133, // doomednum + -1, // doomednum S_BIGGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate