stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Grouped ports from object_tweaks.

Browse source 
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
This commit is contained in:
toaster 2019-10-19 15:57:01 +01:00
parent bb9a0de4f5
commit 920736ac8b
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extras/conf/SRB2-22.cfg
View file

@ -4218,6 +4218,15 @@ thingtypes
flags4text = "[4] Ignore gravity"; flags4text = "[4] Ignore gravity";
flags8text = "[8] Rotate 22.5° CCW"; flags8text = "[8] Rotate 22.5° CCW";
} }
557
{
arrow = 1;
title = "Diagonal Blue Spring";
sprite = "BSPRD2";
width = 16;
flags4text = "[4] Ignore gravity";
flags8text = "[8] Rotate 22.5° CCW";
}
558 558
{ {
arrow = 1; arrow = 1;

8
src/p_mobj.c
View file

@ -11558,7 +11558,9 @@ You should think about modifying the deathmatch starts to take full advantage of
if (i == MT_ROSY) if (i == MT_ROSY)
{ {
if (mariomode) if (!(gametype == GT_COOP || (mthing->options & MTF_EXTRA)))
return; // she doesn't hang out here
else if (mariomode)
i = MT_TOAD; // don't remove on penalty of death i = MT_TOAD; // don't remove on penalty of death
else if (!(netgame || multiplayer) && players[consoleplayer].skin == 5) else if (!(netgame || multiplayer) && players[consoleplayer].skin == 5)
return; // no doubles return; // no doubles
@ -12682,7 +12684,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
{ {
if (mthing->options & MTF_AMBUSH) if (mthing->options & MTF_AMBUSH)
{ {
if (i == MT_YELLOWDIAG || i == MT_REDDIAG) if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
mobj->angle += ANGLE_22h; mobj->angle += ANGLE_22h;
if (i == MT_YELLOWHORIZ || i == MT_REDHORIZ || i == MT_BLUEHORIZ) if (i == MT_YELLOWHORIZ || i == MT_REDHORIZ || i == MT_BLUEHORIZ)
@ -12721,7 +12723,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
if (mthing->options & MTF_OBJECTSPECIAL) if (mthing->options & MTF_OBJECTSPECIAL)
{ {
if (i == MT_YELLOWDIAG || i == MT_REDDIAG) if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
mobj->flags |= MF_NOGRAVITY; mobj->flags |= MF_NOGRAVITY;
if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0) if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)