[nexuiz-commits] r7047 - in trunk/data: . qcsrc/server/tturrets/units

[DONOTREPLY at icculus.org]

Author: tzork
Date: 2009-06-16 17:55:03 -0400 (Tue, 16 Jun 2009)
New Revision: 7047

Modified:
   trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
   trunk/data/unit_flac.cfg
Log:
quick-fix for turret_flac 

Modified: trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_flac.qc	2009-06-16 20:31:44 UTC (rev 7046)
+++ trunk/data/qcsrc/server/tturrets/units/unit_flac.qc	2009-06-16 21:55:03 UTC (rev 7047)
@@ -28,6 +28,7 @@
     proj.angles             = vectoangles(proj.velocity);
     proj.touch              = turret_flac_projectile_explode;
     proj.think              = turret_flac_projectile_explode;
+    //proj.nextthink          = time + vlen(self.tur_shotorg - self.enemy.origin) / self.shot_speed;
     proj.nextthink          = time + max(self.tur_impacttime,(self.shot_radius * 3) / self.shot_speed);
     proj.enemy              = self.enemy;
     proj.cnt                = time + 5;
@@ -47,15 +48,17 @@
 
     //w_deathtypestring = "got caught in the flack.";
 
-    if(self.enemy != world)
-    if(self.cnt < time)
-    if(vlen(self.origin - self.enemy.origin) > self.owner.shot_radius * 0.25)
+
+
+    if( (self.enemy != world) &&
+        (vlen(self.origin - self.enemy.origin) < self.owner.shot_radius * 3) )
     {
-        self.nextthink = time; //vlen(self.origin - self.enemy.origin) / self.owner.shot_speed;
-        return;
+        // OMG HAXX!
+        setorigin(self,self.enemy.origin + randomvec() * self.owner.shot_radius);
     }
 
 
+
     te_explosion (self.origin);
 
     ftmp = crandom();

Modified: trunk/data/unit_flac.cfg
===================================================================
--- trunk/data/unit_flac.cfg	2009-06-16 20:31:44 UTC (rev 7046)
+++ trunk/data/unit_flac.cfg	2009-06-16 21:55:03 UTC (rev 7047)
@@ -1,12 +1,12 @@
 set g_turrets_unit_flac_std_health 700
 set g_turrets_unit_flac_std_respawntime 90
 
-set g_turrets_unit_flac_std_shot_dmg 25
-set g_turrets_unit_flac_std_shot_refire 0.2
-set g_turrets_unit_flac_std_shot_radius 150
-set g_turrets_unit_flac_std_shot_speed 2500
-set g_turrets_unit_flac_std_shot_spread 0.015
-set g_turrets_unit_flac_std_shot_force 15
+set g_turrets_unit_flac_std_shot_dmg 20
+set g_turrets_unit_flac_std_shot_refire 0.1
+set g_turrets_unit_flac_std_shot_radius 100
+set g_turrets_unit_flac_std_shot_speed 2000
+set g_turrets_unit_flac_std_shot_spread 0.02
+set g_turrets_unit_flac_std_shot_force 25
 set g_turrets_unit_flac_std_shot_volly 0
 set g_turrets_unit_flac_std_shot_volly_refire 0
 
@@ -15,7 +15,7 @@
 set g_turrets_unit_flac_std_target_range_optimal 1250
 
 set g_turrets_unit_flac_std_target_select_rangebias 0.25
-set g_turrets_unit_flac_std_target_select_samebias 0.25
+set g_turrets_unit_flac_std_target_select_samebias 1
 set g_turrets_unit_flac_std_target_select_anglebias 0.5
 set g_turrets_unit_flac_std_target_select_playerbias 0
 set g_turrets_unit_flac_std_target_select_missilebias 1