* Added knockback scaling

* Balance tweaks
* A load of other stuff I can't remember

1 files changed, 34 insertions, 1 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 167ce0d5..ec8f2df6 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1423,6 +1423,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    1.0f,                                           //float   knockbackScale;
     { PCL_NONE, PCL_NONE, PCL_NONE },               //int     children[ 3 ];
     0,                                              //int     cost;
     0                                               //int     value;
@@ -1460,6 +1461,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     130.0f,                                         //float   jumpMagnitude;
+    1.0f,                                           //float   knockbackScale;
     { PCL_A_B_LEV1, PCL_A_O_BASE, PCL_NONE },       //int     children[ 3 ];
     ABUILDER_COST,                                  //int     cost;
     ABUILDER_VALUE                                  //int     value;
@@ -1497,6 +1499,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    1.0f,                                           //float   knockbackScale;
     { PCL_A_O_BASE, PCL_NONE, PCL_NONE },           //int     children[ 3 ];
     ABUILDER_UPG_COST,                              //int     cost;
     ABUILDER_UPG_VALUE                              //int     value;
@@ -1535,6 +1538,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     400.0f,                                         //float   stopSpeed;
     250.0f,                                         //float   jumpMagnitude;
+    2.0f,                                           //float   knockbackScale;
     { PCL_A_O_LEV1, PCL_NONE, PCL_NONE },           //int     children[ 3 ];
     SOLDIER_COST,                                   //int     cost;
     SOLDIER_VALUE                                   //int     value;
@@ -1573,6 +1577,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     300.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    1.2f,                                           //float   knockbackScale;
     { PCL_A_O_LEV2, PCL_A_O_LEV1_UPG, PCL_NONE },   //int     children[ 3 ];
     HYDRA_COST,                                     //int     cost;
     HYDRA_VALUE                                     //int     value;
@@ -1611,6 +1616,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     300.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    1.1f,                                           //float   knockbackScale;
     { PCL_A_O_LEV2, PCL_NONE, PCL_NONE },           //int     children[ 3 ];
     HYDRA_UPG_COST,                                 //int     cost;
     HYDRA_UPG_VALUE                                 //int     value;
@@ -1649,6 +1655,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     400.0f,                                         //float   jumpMagnitude;
+    0.8f,                                           //float   knockbackScale;
     { PCL_A_O_LEV3, PCL_A_O_LEV2_UPG, PCL_NONE },   //int     children[ 3 ];
     CHIMERA_COST,                                   //int     cost;
     CHIMERA_VALUE                                   //int     value;
@@ -1687,6 +1694,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     400.0f,                                         //float   jumpMagnitude;
+    0.7f,                                           //float   knockbackScale;
     { PCL_A_O_LEV3, PCL_NONE, PCL_NONE },           //int     children[ 3 ];
     CHIMERA_UPG_COST,                               //int     cost;
     CHIMERA_UPG_VALUE                               //int     value;
@@ -1725,6 +1733,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     200.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    0.5f,                                           //float   knockbackScale;
     { PCL_A_O_LEV4, PCL_A_O_LEV3_UPG, PCL_NONE },   //int     children[ 3 ];
     DRAGOON_COST,                                   //int     cost;
     DRAGOON_VALUE                                   //int     value;
@@ -1763,6 +1772,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     200.0f,                                         //float   stopSpeed;
     270.0f,                                         //float   jumpMagnitude;
+    0.4f,                                           //float   knockbackScale;
     { PCL_A_O_LEV4, PCL_NONE, PCL_NONE },           //int     children[ 3 ];
     DRAGOON_UPG_COST,                               //int     cost;
     DRAGOON_UPG_VALUE                               //int     value;
@@ -1801,6 +1811,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     170.0f,                                         //float   jumpMagnitude;
+    0.1f,                                           //float   knockbackScale;
     { PCL_NONE, PCL_NONE, PCL_NONE },               //int     children[ 3 ];
     BMOFO_COST,                                     //int     cost;
     BMOFO_VALUE                                     //int     value;
@@ -1839,6 +1850,7 @@ classAttributes_t bg_classList[ ] =
     6.0f,                                           //float   friction;
     100.0f,                                         //float   stopSpeed;
     220.0f,                                         //float   jumpMagnitude;
+    1.0f,                                           //float   knockbackScale;
     { PCL_NONE, PCL_NONE, PCL_NONE },               //int     children[ 3 ];
     0,                                              //int     cost;
     0                                               //int     value;
@@ -1855,7 +1867,7 @@ classAttributes_t bg_classList[ ] =
     
     "bsuit", ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), { 0, 0, 0 }, { 0, 0, 0, },                             
     { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 0.0f, 0, 0, 0, 0.0f, 0, 0, WP_NONE, 0.0f, 0,   
-    0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0, 0
+    0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, 1.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0, 0
   }
 };
 
@@ -2445,6 +2457,27 @@ float BG_FindJumpMagnitudeForClass( int pclass )
 
 /*
 ==============
+BG_FindKnockbackScaleForClass
+==============
+*/
+float BG_FindKnockbackScaleForClass( int pclass )
+{
+  int i;
+
+  for( i = 0; i < bg_numPclasses; i++ )
+  {
+    if( bg_classList[ i ].classNum == pclass )
+    {
+      return bg_classList[ i ].knockbackScale;
+    }
+  }
+  
+  Com_Printf( S_COLOR_YELLOW "WARNING: fallthrough in BG_FindKnockbackScaleForClass\n" );
+  return 1.0f;
+}
+
+/*
+==============
 BG_FindSteptimeForClass
 ==============
 */