From 0163548433a9d4d0baa6ebd0ac7ebd8dfd22d145 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Fri, 10 Mar 2017 21:26:16 +0000
Subject: [PATCH] Buff gravity, slopes now throw you as nature intended Springs
 have updated spring power

---
 src/d_netcmd.c |  2 +-
 src/info.c     | 26 +++++++++++++-------------
 src/p_slopes.c |  4 ++--
 src/p_spec.c   |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 2293530d..7f9b8224 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -321,7 +321,7 @@ consvar_t cv_mphspeed = {"mphspeed", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NU
 
 consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo,
 	Ringslinger_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gravity = {"gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gravity = {"gravity", "0.8", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_soundtest = {"soundtest", "0", CV_CALL, NULL, SoundTest_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
diff --git a/src/info.c b/src/info.c
index c277798d..7e4ff958 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3531,7 +3531,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		24*FRACUNIT,    // radius
 		40*FRACUNIT,    // height
 		0,              // display offset
-		15*FRACUNIT,    // mass
+		19*FRACUNIT,    // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags
@@ -3558,7 +3558,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		24*FRACUNIT,    // radius
 		40*FRACUNIT,    // height
 		0,              // display offset
-		20*FRACUNIT,    // mass
+		26*FRACUNIT,    // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags
@@ -5362,7 +5362,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		20*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		11*FRACUNIT,    // mass
+		14*FRACUNIT,    // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
@@ -5389,7 +5389,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		20*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		20*FRACUNIT,    // mass
+		26*FRACUNIT,    // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
@@ -5416,7 +5416,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		20*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		32*FRACUNIT,    // mass
+		40*FRACUNIT,    // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
@@ -5443,8 +5443,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		16*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		20*FRACUNIT,    // mass
-		20*FRACUNIT,    // damage
+		26*FRACUNIT,    // mass
+		26*FRACUNIT,    // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
 		S_YDIAG2        // raisestate
@@ -5470,8 +5470,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		16*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		32*FRACUNIT,    // mass
-		32*FRACUNIT,    // damage
+		40*FRACUNIT,    // mass
+		40*FRACUNIT,    // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
 		S_RDIAG2        // raisestate
@@ -13997,7 +13997,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		20*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		5*FRACUNIT,     // mass
+		6*FRACUNIT,     // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
@@ -14024,7 +14024,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		20*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		5*FRACUNIT,     // mass
+		6*FRACUNIT,     // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
@@ -14051,8 +14051,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		16*FRACUNIT,    // radius
 		16*FRACUNIT,    // height
 		0,              // display offset
-		11*FRACUNIT,    // mass
-		11*FRACUNIT,    // damage
+		14*FRACUNIT,    // mass
+		14*FRACUNIT,    // damage
 		sfx_None,       // activesound
 		MF_SOLID|MF_SPRING, // flags
 		S_BDIAG2        // raisestate
diff --git a/src/p_slopes.c b/src/p_slopes.c
index d939fee9..695f930a 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -792,12 +792,12 @@ void P_SlopeLaunch(mobj_t *mo)
 		vector3_t slopemom;
 		slopemom.x = mo->momx;
 		slopemom.y = mo->momy;
-		slopemom.z = mo->momz*2;
+		slopemom.z = mo->momz;
 		P_QuantizeMomentumToSlope(&slopemom, mo->standingslope);
 
 		mo->momx = slopemom.x;
 		mo->momy = slopemom.y;
-		mo->momz = slopemom.z/2;
+		mo->momz = slopemom.z;
 	}
 
 	//CONS_Printf("Launched off of slope.\n");
diff --git a/src/p_spec.c b/src/p_spec.c
index e6a0b36c..3aaaeb05 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5473,7 +5473,7 @@ void P_SpawnSpecials(INT32 fromnetsave)
 	(void)fromnetsave;
 
 	// Set the default gravity. Custom gravity overrides this setting.
-	gravity = FRACUNIT/2;
+	gravity = (FRACUNIT*8)/10;
 
 	// Defaults in case levels don't have them set.
 	sstimer = 90*TICRATE + 6;