diff --git a/extras/conf/D3R-Config.cfg b/extras/conf/D3R-Config.cfg index 862fb0cf3..dac4b0135 100644 --- a/extras/conf/D3R-Config.cfg +++ b/extras/conf/D3R-Config.cfg @@ -5166,16 +5166,17 @@ thingtypes duel { color = 4; // Red - arrow = 1; + arrow = 0; title = "Duel Objects"; sprite = "SPBMA2A8"; - width = 24; - height = 48; flags1text = "[1] Spawn in all modes"; 2050 { title = "Duel Bomb"; + width = 24; + height = 48; + arrow = 1; flags8text = "[8] Flip strafe"; } @@ -5226,6 +5227,14 @@ thingtypes width = 45; height = 32; } + + 2057 + { + title = "Pogo Spring"; + sprite = "POGSA0"; + width = 48; + height = 32; + } } } diff --git a/src/info.c b/src/info.c index b05a20abc..7bdffe11d 100644 --- a/src/info.c +++ b/src/info.c @@ -8308,7 +8308,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_POGOSPRING - -1, // doomednum + 2057, // doomednum S_POGOSPRING1, // spawnstate 1000, // spawnhealth S_POGOSPRING2B, // seestate diff --git a/src/p_mobj.c b/src/p_mobj.c index 5b9ea4c75..6e699cbf5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11575,6 +11575,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i) case MT_LANDMINE: case MT_HYUDORO_CENTER: case MT_DROPTARGET: + case MT_POGOSPRING: { // Duel objects. // Normally only spawn when placed by the map in Duels, @@ -12763,6 +12764,12 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean Obj_InitHyudoroCenter(mobj, NULL); break; } + case MT_POGOSPRING: + { + // Start as tumble version. + mobj->reactiontime++; + break; + } default: break; }