From 4016d15f7b10d0814ecf852e02485eb0ce700a8d Mon Sep 17 00:00:00 2001 From: JTE Date: Sat, 4 Apr 2015 18:38:20 -0400 Subject: [PATCH 1/2] Adjusted platform-creating velocity of goo water. Now it will only bounce ONCE when you jump on it, and Knuckles just barely gets enough velocity out of his jump for even that. This will leave players vulnerable and annoyed for a lot less time while they wait to finish bouncing. --- src/p_map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 2321cd969..b4f17db7a 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -121,7 +121,7 @@ void P_DoSpring(mobj_t *spring, mobj_t *object) /*Someone want to make these work like bumpers?*/ return; } - + object->eflags |= MFE_SPRUNG; // apply this flag asap! spring->flags &= ~(MF_SOLID|MF_SPECIAL); // De-solidify @@ -1223,7 +1223,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) { // If you're inside goowater and slowing down fixed_t sinklevel = FixedMul(thing->info->height/6, thing->scale); - fixed_t minspeed = FixedMul(thing->info->height/12, thing->scale); + fixed_t minspeed = FixedMul(thing->info->height/9, thing->scale); if (thing->z < *rover->topheight && *rover->bottomheight < thingtop && abs(thing->momz) < minspeed) { From 4f06650a1e47366a59f5b61ae0e78cf40f183bf8 Mon Sep 17 00:00:00 2001 From: JTE Date: Sat, 4 Apr 2015 18:39:32 -0400 Subject: [PATCH 2/2] Removed the small velocity boost you get for surfacing from goo. This will prevent the goo from maintaining momentum for too long, and shorten the amount of time before you stabilize on the surface. --- src/p_mobj.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 081124b95..7a7d6e702 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2526,10 +2526,8 @@ void P_MobjCheckWater(mobj_t *mobj) return; if ((mobj->eflags & MFE_GOOWATER || wasingoo)) { // Decide what happens to your momentum when you enter/leave goopy water. - if (wasinwater && P_MobjFlip(mobj)*mobj->momz > 0) - mobj->momz = FixedMul(mobj->momz, FixedDiv(9*FRACUNIT, 8*FRACUNIT)); // Give the mobj a little out-of-goo boost. - else if (P_MobjFlip(mobj)*mobj->momz < 0) - mobj->momz = FixedMul(mobj->momz, FixedDiv(2*FRACUNIT, 5*FRACUNIT)); // KILL its momentum. + if (P_MobjFlip(mobj)*mobj->momz < 0) // You are entering the goo? + mobj->momz = FixedMul(mobj->momz, FixedDiv(2*FRACUNIT, 5*FRACUNIT)); // kill momentum significantly, to make the goo feel thick. } else if (wasinwater && P_MobjFlip(mobj)*mobj->momz > 0) mobj->momz = FixedMul(mobj->momz, FixedDiv(780*FRACUNIT, 457*FRACUNIT)); // Give the mobj a little out-of-water boost.