From 4d33098716f2dbcaa5d23fdca74b92c9654695eb Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 4 May 2022 17:22:43 -0700 Subject: [PATCH] prop_vehicle_driveable: change dmg and velocity calculation for when you collide with an object that feels pain. --- src/gs-entbase/shared/prop_vehicle_driveable.qc | 5 +++-- src/gs-entbase/shared/worldspawn.qc | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc index 604e3c6b..1c5d4a61 100644 --- a/src/gs-entbase/shared/prop_vehicle_driveable.qc +++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc @@ -400,15 +400,16 @@ prop_vehicle_driveable_wheel::Accel(float flMoveTime, float m_flTurn) tracebox(origin, mins * 4.0, maxs * 4.0, origin, MOVE_NORMAL, owner); if (trace_ent && trace_ent != vehParent.m_eDriver) { - int iImpactDamage = vlen(velocity) / 100; + int iImpactDamage = vlen(velocity) / 10; if (iImpactDamage > 10) { - trace_ent.velocity = velocity; + trace_ent.velocity = velocity * 2.0 + [0,0,500]; velocity *= 0.25f; #ifdef SERVER if (trace_ent.takedamage) { NSSurfacePropEntity foo = (NSSurfacePropEntity)trace_ent; Damage_Apply(foo, vehParent.m_eDriver, iImpactDamage, 0, DMG_VEHICLE); + print(sprintf("Delivering %i impact damage\n", iImpactDamage)); } #endif } diff --git a/src/gs-entbase/shared/worldspawn.qc b/src/gs-entbase/shared/worldspawn.qc index 57b98ee5..7d4b7eee 100644 --- a/src/gs-entbase/shared/worldspawn.qc +++ b/src/gs-entbase/shared/worldspawn.qc @@ -44,7 +44,7 @@ This entity was introduced in Quake (1996). #ifdef CLIENT /* High Dynamic Range - Iris Adaption */ -var float g_flHDRIrisMinValue = 0.0; +var float g_flHDRIrisMinValue = 1.0; var float g_flHDRIrisMaxValue = 2.0; var float g_flHDRIrisMultiplier = 1.0; var float g_flHDRIrisFadeUp = 0.1; @@ -74,8 +74,6 @@ worldspawn::Initialized(void) cvar_set("r_hdr_irisadaptation_multiplier", ftos(g_flHDRIrisMultiplier)); cvar_set("r_hdr_irisadaptation_fade_up", ftos(g_flHDRIrisFadeUp)); cvar_set("r_hdr_irisadaptation_fade_down", ftos(g_flHDRIrisFadeDown)); - - remove(this); } void