vehicle damage scaling

TomArrow · Jan 15, 2024 · 0d6861c · 0d6861c
1 parent 09b8aae
commit 0d6861c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/codemp/game/bg_slidemove.c b/codemp/game/bg_slidemove.c
@@ -503,7 +503,7 @@ void PM_VehicleImpact(bgEntity_t *pEnt, trace_t *trace)
 					if (pSelfVeh->m_pVehicleInfo->type == VH_FIGHTER)
 					{ //player die good.. if me fighter
 						if (g_tweakWeapons.integer & WT_TRIBES)
-							pmult = 7.0f;
+							pmult = 7.0f * g_weaponDamageScale.value;
 						else
 							pmult = 2000.0f;
 					}

diff --git a/codemp/game/g_main.c b/codemp/game/g_main.c
@@ -3919,7 +3919,7 @@ void G_RunFrame( int levelTime ) {
 					if (ent->client->jetPackDebReduce < level.time) //ent->client->jetPackDebReduce can be negative or 0 or ?
 					{
 						if (ent->client->pers.tribesClass == 3) //Heavy
-							ent->client->ps.fd.forcePower -= 7;
+							ent->client->ps.fd.forcePower -= 6;
 						if (ent->client->pers.tribesClass == 2) //Med
 							ent->client->ps.fd.forcePower -= 5;
 						else 

diff --git a/codemp/game/g_weapon.c b/codemp/game/g_weapon.c
@@ -498,8 +498,8 @@ void WP_FireTurboLaserMissile( gentity_t *ent, vec3_t start, vec3_t dir )
 	missile->classname = "turbo_proj";
 	missile->s.weapon = WP_TURRET;
 
-	missile->damage = ent->damage;		//FIXME: externalize
-	missile->splashDamage = ent->splashDamage;	//FIXME: externalize
+	missile->damage = ent->damage * g_weaponDamageScale.value;		//FIXME: externalize
+	missile->splashDamage = ent->splashDamage * g_splashDamageScale.value;	//FIXME: externalize
 	missile->splashRadius = ent->splashRadius;	//FIXME: externalize
 	missile->dflags = DAMAGE_DEATH_KNOCKBACK;
 	missile->methodOfDeath = MOD_TURBLAST; //count as a heavy weap
@@ -5434,8 +5434,8 @@ gentity_t *WP_FireVehicleWeapon( gentity_t *ent, vec3_t start, vec3_t dir, vehWe
 		missile->classname = "vehicle_proj";
 
 		missile->s.genericenemyindex = ent->s.number+MAX_GENTITIES;
-		missile->damage = vehWeapon->iDamage;
-		missile->splashDamage = vehWeapon->iSplashDamage;
+		missile->damage = vehWeapon->iDamage * g_weaponDamageScale.value;
+		missile->splashDamage = vehWeapon->iSplashDamage * g_splashDamageScale.value;
 		missile->splashRadius = vehWeapon->fSplashRadius;
 
 		//FIXME: externalize some of these properties?