Use pmove_vel & _org fro raptor bombing crosshair insted of buggy hakk, should be...

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index 5db06c35e51aa36ebbda10fef47a2ef668dbfd6d..b15f843a2c321061bedb30491280bd8d40bf258f 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -26,8 +26,6 @@
 #define raptor_c  "gfx/vehicles/raptor_cross.tga"
 
 entity dropmark;
-vector lastpos;
-
 
 void CSQC_WAKIZASHI_HUD();
 void CSQC_SPIDER_HUD();
@@ -229,44 +227,6 @@ void CSQC_SPIDER_HUD()
     }
     else
     {
-
-        /*
-        float movedt, vel;
-        movedt = time - self.move_time;
-        self.move_time = time;
-        vel = (view_origin - lastpos) * (1 / movedt);
-        lastpos  = view_origin;
-        dprint("vel: ", ftos(vel), "  angles: ", vtos(self.angles), "\n");
-        */
-
-        /*
-        dprint("aim1: ", vtos(aim1), "  aim2: ", vtos(aim2), "\n");
-        aim2_x *= -1;
-        makevectors(aim2);
-        te_lightning1(self, view_origin, view_origin + v_forward * MAX_SHOT_DISTANCE);
-        traceline(view_origin, view_origin + v_forward * MAX_SHOT_DISTANCE, MOVE_WORLDONLY, self);
-        aim2 = trace_endpos;
-
-
-        aim1 = aim1 + view_origin;
-
-        // Draw the crosshairs
-        aim1 = project_3d_to_2d(aim1);
-        aim2 = project_3d_to_2d(aim2);
-
-        picsize = 0.5 * drawgetimagesize(SPIDER_CROSS2);
-        aim2 = aim2 - 0.5 * picsize;
-        aim2_z = 0;
-        picsize_z = 0;
-        drawpic(aim2, SPIDER_CROSS2, picsize, '0 1 1', 1, DRAWFLAG_ADDITIVE);
-
-        picsize = 0.5 * drawgetimagesize(SPIDER_CROSS2);
-        aim1 = aim1 - 0.5 * picsize;
-        aim1_z = 0;
-        picsize_z = 0;
-        drawpic(aim1, SPIDER_CROSS2, picsize, '1 0 0', 1, DRAWFLAG_ADDITIVE);
-
-        */
         picsize = drawgetimagesize(SPIDER_CROSS);
         picsize_x *= autocvar_cl_vehicle_spiderbot_cross_size;
         picsize_y *= autocvar_cl_vehicle_spiderbot_cross_size;
@@ -293,14 +253,6 @@ void CSQC_RAPTOR_HUD()
         dropmark.owner = self;
     }
 
-       movedt = time - dropmark.move_time;
-       if(movedt)
-       {
-        dropmark.move_time = time;
-        vel = (view_origin - lastpos) * (1 / movedt);
-        lastpos  = view_origin;
-    }
-
     // Fetch health & ammo stats
     hp      = bound(0,getstatf(STAT_VEHICLESTAT_HEALTH), 1);
        shield  = bound(0,getstatf(STAT_VEHICLESTAT_SHIELD), 1);
@@ -351,12 +303,11 @@ void CSQC_RAPTOR_HUD()
     if(reload == 1)
     {
         where = dropmark.origin;
-        setorigin(dropmark, view_origin);
-        dropmark.velocity = vel;
+        setorigin(dropmark, pmove_org);
+        dropmark.velocity = pmove_vel;
         tracetoss(dropmark, self);
 
-        // Blend old with new predicted impact to smooth out jumpyness
-        where = project_3d_to_2d(trace_endpos * 0.5 + where * 0.5);
+        where = project_3d_to_2d(trace_endpos);
 
         setorigin(dropmark, trace_endpos);
         picsize = drawgetimagesize(raptor_d) * 0.2;

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index f16a0a6fd0dba9235fe7991951e73a571dccdad0..a546407c06b20a4da49e797e1bc1fd820478cb70 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -31,21 +31,21 @@ set g_vehicle_raptor_guns_pitchlimit_up   8
 set g_vehicle_raptor_guns_pitchlimit_down 48
 
 set g_vehicle_raptor_cannon_locktarget 1
-set g_vehicle_raptor_cannon_locking_time 0.2
-set g_vehicle_raptor_cannon_locking_releasetime 0.2
-set g_vehicle_raptor_cannon_locked_time 0.5
+set g_vehicle_raptor_cannon_locking_time 0.5
+set g_vehicle_raptor_cannon_locking_releasetime 0.5
+set g_vehicle_raptor_cannon_locked_time 1
 set g_vehicle_raptor_cannon_predicttarget 1
 
-set g_vehicle_raptor_cannon_cost     1
+set g_vehicle_raptor_cannon_cost     2
 set g_vehicle_raptor_cannon_damage   20
 set g_vehicle_raptor_cannon_radius   45
 set g_vehicle_raptor_cannon_refire   0.2
 set g_vehicle_raptor_cannon_speed    9000
 set g_vehicle_raptor_cannon_spread   0.0125
 
-set g_vehicle_raptor_energy             80
+set g_vehicle_raptor_energy             40
 set g_vehicle_raptor_energy_regen       40
-set g_vehicle_raptor_energy_regen_pause 0.25
+set g_vehicle_raptor_energy_regen_pause 1
 
 set g_vehicle_raptor_health             200
 set g_vehicle_raptor_health_regen       0