From: Jakob MG <jakob_mg@hotmail.com>
Date: Mon, 11 Jun 2012 11:22:30 +0000 (+0200)
Subject: Damage factors for nex, rifle, uzi & minstanex versus vehicles
X-Git-Tag: xonotic-v0.7.0~312^2~24
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0879cf53c73d4419f2e5b62f377dcc21b8b08025

Damage factors for nex, rifle, uzi & minstanex versus vehicles
---

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index bfd13a0e7..b6ca4f943 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -4,6 +4,12 @@ float autocvar_g_vehicles_delayspawn;
 float autocvar_g_vehicles_delayspawn_jitter;
 float autocvar_g_vehicles_allow_flagcarry;
 
+float autocvar_g_vehicles_nex_damagerate = 0.5;
+float autocvar_g_vehicles_uzi_damagerate = 0.5;
+float autocvar_g_vehicles_rifle_damagerate = 0.75;
+float autocvar_g_vehicles_minstanex_damagerate = 0.001;
+
+
 void vehicles_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
 void vehicles_return();
 void vehicles_enter();
@@ -131,6 +137,8 @@ vector targetdrone_getnewspot()
 	}
 	return self.origin;
 }
+
+#if 0
 void targetdrone_think();
 void targetdrone_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
 void targetdrone_renwe()
@@ -226,6 +234,7 @@ void targetdrone_spawn(vector _where, float _autorenew)
 	drone.nextthink = time + 0.1;
 	drone.cnt = _autorenew;
 }
+#endif
 
 void vehicles_locktarget(float incr, float decr, float _lock_time)
 {
@@ -362,7 +371,6 @@ void vehicles_projectile_damage(entity inflictor, entity attacker, float damage,
         self.think = self.use;
         self.nextthink = time;
     }
-
 }
 
 void vehicles_projectile_explode()
@@ -829,6 +837,18 @@ void vehicles_painframe()
 void vehicles_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
     self.dmg_time = time;
+    
+    if(DEATH_ISWEAPON(deathtype, WEP_NEX))
+        damage *= autocvar_g_vehicles_nex_damagerate;
+        
+    if(DEATH_ISWEAPON(deathtype, WEP_UZI))
+        damage *= autocvar_g_vehicles_uzi_damagerate;
+        
+    if(DEATH_ISWEAPON(deathtype, WEP_RIFLE))
+        damage *= autocvar_g_vehicles_rifle_damagerate;
+        
+    if(DEATH_ISWEAPON(deathtype, WEP_MINSTANEX))
+        damage *= autocvar_g_vehicles_minstanex_damagerate;
 
     if((self.vehicle_flags & VHF_HASSHIELD) && (self.vehicle_shield > 0))
     {
diff --git a/vehicles.cfg b/vehicles.cfg
index e00232122..67f3c5c5f 100644
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -17,3 +17,8 @@ set cl_vehicles_hudscale 0.5way
 set g_vehicles_delayspawn 1
 set g_vehicles_delayspawn_jitter 10
 set g_vehicles_allow_flagcarry 1
+
+set g_vehicles_nex_damagerate 0.5
+set g_vehicles_uzi_damagerate 0.5
+set g_vehicles_rifle_damagerate 0.5
+set g_vehicles_minstanex_damagerate 0.001
\ No newline at end of file