]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Massive vehicles update. Bumblebee should now be usable
authorJakob MG <jakob_mg@hotmail.com>
Wed, 15 Aug 2012 02:42:21 +0000 (04:42 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 15 Aug 2012 02:42:21 +0000 (04:42 +0200)
14 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/progs.src
qcsrc/client/vehicles/vehicles.qc
qcsrc/common/constants.qh
qcsrc/server/antilag.qc
qcsrc/server/g_damage.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/vehicles/vehicles_def.qh
vehicle_bumblebee.cfg

index 3ac1e9cf7a67fee7eb2f82d9e8ffd184a7583b6e..484e879fb1cb0c7e8ca773739a647dd852aa82f9 100644 (file)
@@ -768,6 +768,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
                case ENT_CLIENT_TURRET: ent_turret(); break; 
                case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
                case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;  
+               case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;  
                default:
                        //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
                        error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
index 66d7dd31c4b1ae258043002bc381a81109d9ddfc..0dd898aad6039407543f36e1e20c11d00024a2dd 100644 (file)
@@ -1468,6 +1468,8 @@ void CSQC_UpdateView(float w, float h)
             CSQC_RAPTOR_HUD();
         else if(hud == HUD_BUMBLEBEE)
             CSQC_BUMBLE_HUD();
+        else if(hud == HUD_BUMBLEBEE_GUN)
+            CSQC_BUMBLE_GUN_HUD();
     }
        
        cl_notice_run();
index a0b4826a6fd425ff71bd5354484e633dc274d811..0922433eebdecd2d6c3c229636162e1475c6e56b 100644 (file)
@@ -80,6 +80,7 @@ tuba.qc
 target_music.qc
 
 vehicles/vehicles.qc
+../server/vehicles/bumblebee.qc
 shownames.qh
 shownames.qc
 
index 62ba5304d26e59c7d06a27ae81c268d992ccc434..0cf543e9c9649a07a8582f6f7327d10b36e54812 100644 (file)
@@ -10,6 +10,7 @@
 #define hud_ammo1_ico "gfx/vehicles/bullets.tga"
 #define hud_ammo2_bar "gfx/vehicles/bar_dwn_right.tga"
 #define hud_ammo2_ico "gfx/vehicles/rocket.tga"
+#define hud_energy "gfx/vehicles/energy.tga"
 
 #define SBRM_FIRST 1
 #define SBRM_VOLLY 1
@@ -36,6 +37,7 @@ void CSQC_WAKIZASHI_HUD();
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
 void CSQC_BUMBLE_HUD();
+void CSQC_BUMBLE_GUN_HUD();
 
 #define MAX_AXH 4
 entity AuxiliaryXhair[MAX_AXH];
@@ -46,6 +48,13 @@ const var void Draw_Not();
 .float  axh_drawflag;
 .float  axh_scale;
 
+#define bumb_ico  "gfx/vehicles/bumb.tga"
+#define bumb_lgun  "gfx/vehicles/bumb_lgun.tga"
+#define bumb_rgun  "gfx/vehicles/bumb_rgun.tga"
+
+#define bumb_gun_ico  "gfx/vehicles/bumb_side.tga"
+#define bumb_gun_gun  "gfx/vehicles/bumb_side_gun.tga"
+
 #define spider_ico  "gfx/vehicles/sbot.tga"
 #define spider_rkt  "gfx/vehicles/sbot_rpods.tga"
 #define spider_mgun "gfx/vehicles/sbot_mguns.tga"
@@ -65,7 +74,7 @@ void AuxiliaryXhair_Draw2D()
     vector loc, psize;
 
     psize = self.axh_scale * draw_getimagesize(self.axh_image);
-    loc = project_3d_to_2d(self.origin) - 0.5 * psize;
+    loc = project_3d_to_2d(self.move_origin) - 0.5 * psize;
     if not (loc_z < 0 || loc_x < 0 || loc_y < 0 || loc_x > vid_conwidth || loc_y > vid_conheight)
     {
         loc_z = 0;
@@ -97,12 +106,20 @@ void Net_AuXair2(float bIsNew)
         axh.alpha         = 1;
                AuxiliaryXhair[axh_id] = axh;
     }
+    
+    if(axh.oldorigin != ' 0 0 0')
+    {          
+               //axh.move_velocity = 
+               axh.move_origin = axh.origin;
+               axh.move_time = time;
+               
+    }
 
     axh.draw2d   = AuxiliaryXhair_Draw2D;
-
-       axh.origin_x = ReadCoord();
-       axh.origin_y = ReadCoord();
-       axh.origin_z = ReadCoord();
+       
+       axh.move_origin_x = ReadCoord();
+       axh.move_origin_y = ReadCoord();
+       axh.move_origin_z = ReadCoord();
 
        axh.colormod_x = ReadByte() / 255;
        axh.colormod_y = ReadByte() / 255;
@@ -134,7 +151,7 @@ void Net_VehicleSetup()
         return;
     }
     
-    hud_id  = bound(HUD_SPIDERBOT, hud_id, HUD_RAPTOR);
+    hud_id  = bound(HUD_VEHICLE_FIRST, hud_id, HUD_VEHICLE_LAST);
 
     // Init auxiliary crosshairs
     entity axh;
@@ -186,11 +203,24 @@ void Net_VehicleSetup()
             break;
 
         case HUD_BUMBLEBEE:
+            // Raygun
+            AuxiliaryXhair[0].axh_image   = "gfx/vehicles/axh-bracket.tga";
+            AuxiliaryXhair[0].axh_scale   = 0.25;
+            
+            // Gunner1
+            AuxiliaryXhair[1].axh_image   = "gfx/vehicles/axh-ring.tga";
+            AuxiliaryXhair[1].axh_scale   = 0.25;
+            
+            // Gunner2
+            AuxiliaryXhair[2].axh_image   = "gfx/vehicles/axh-ring.tga";
+            AuxiliaryXhair[2].axh_scale   = 0.25;
+            break;        
+        case HUD_BUMBLEBEE_GUN:
             // Plasma cannons
-            AuxiliaryXhair[0].axh_image   = "gfx/vehicles/axh-ring.tga";
+            AuxiliaryXhair[0].axh_image   = "gfx/vehicles/axh-bracket.tga";
             AuxiliaryXhair[0].axh_scale   = 0.25;
             // Raygun
-            AuxiliaryXhair[1].axh_image   = "gfx/vehicles/axh-special1.tga";
+            AuxiliaryXhair[1].axh_image   = "gfx/vehicles/axh-bracket.tga";
             AuxiliaryXhair[1].axh_scale   = 0.25;
             break;
     }
@@ -231,15 +261,16 @@ void CSQC_BUMBLE_HUD()
     energy  *= 0.01;
     reload1 *= 0.01;
 
-    pic2size = draw_getimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8);
+    pic2size = draw_getimagesize(bumb_ico) * (autocvar_cl_vehicles_hudscale * 0.8);
     picloc = picsize * 0.5 - pic2size * 0.5;
+    
     if(vh_health < 0.25)
-        drawpic(hudloc + picloc, waki_ico, pic2size,  '1 0 0' + '0 1 1' * sin(time * 8),  1, DRAWFLAG_NORMAL);
+        drawpic(hudloc + picloc, bumb_ico, pic2size,  '1 0 0' + '0 1 1' * sin(time * 8),  1, DRAWFLAG_NORMAL);
     else
-        drawpic(hudloc + picloc, waki_ico, pic2size,  '1 1 1' * vh_health  + '1 0 0' * (1 - vh_health),  1, DRAWFLAG_NORMAL);
-    drawpic(hudloc + picloc, waki_eng, pic2size, '1 1 1' * energy   + '1 0 0' * (1 - energy),   1, DRAWFLAG_NORMAL);
-    drawpic(hudloc + picloc, waki_gun, pic2size, '1 1 1' * energy   + '1 0 0' * (1 - energy),   1, DRAWFLAG_NORMAL);
-    drawpic(hudloc + picloc, waki_rkt, pic2size,  '1 1 1' * reload1 + '1 0 0' * (1 - reload1), 1, DRAWFLAG_NORMAL);
+        drawpic(hudloc + picloc, bumb_ico, pic2size,  '1 1 1' * vh_health  + '1 0 0' * (1 - vh_health),  1, DRAWFLAG_NORMAL);
+    
+    drawpic(hudloc + picloc, bumb_lgun, pic2size, '1 1 1' * energy   + '1 0 0' * (1 - energy),   1, DRAWFLAG_NORMAL);
+    drawpic(hudloc + picloc, bumb_lgun, pic2size, '1 1 1' * energy   + '1 0 0' * (1 - energy),   1, DRAWFLAG_NORMAL);
     drawpic(hudloc + picloc, hud_sh, pic2size,  '1 1 1', shield, DRAWFLAG_NORMAL);
 
 // Health bar
@@ -270,7 +301,155 @@ void CSQC_BUMBLE_HUD()
             alarm1time = 0;
         }        
     }
+
+// Shield bar
+    picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale;
+    picloc = '69 140 0' * autocvar_cl_vehicles_hudscale;
+    drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - shield)), 0, vid_conwidth, vid_conheight);
+    drawpic(hudloc + picloc, hud_sh_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+    drawresetcliparea();
+// ..  and icon
+    picloc = '40 136 0' * autocvar_cl_vehicles_hudscale;
+    picsize = draw_getimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale;
+    if(shield < 0.25)
+    {
+        if(alarm2time < time)
+        {
+            alarm2time = time + 1;
+            sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE);
+        }
+        drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+    }
+    else
+    {
+        drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+        if(alarm2time)
+        {            
+            sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE);
+            alarm2time = 0;
+        }
+    }
+    
+       ammo1 *= 0.01;
+       ammo2 *= 0.01;
+       
+// Gunner1 bar
+    picsize = draw_getimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale;
+    picloc = '450 69 0' * autocvar_cl_vehicles_hudscale;
+    drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * ammo1, vid_conheight);
+    drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+    drawresetcliparea();
+// ..  and icon
+    picsize = 1.5 * draw_getimagesize(hud_energy) * autocvar_cl_vehicles_hudscale;
+    picloc = '664 60 0' * autocvar_cl_vehicles_hudscale;
+    if(ammo1 < 0.2)
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+    else
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+
+// Gunner2 bar
+    picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale;
+    picloc = '450 140 0' * autocvar_cl_vehicles_hudscale;
+    drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * ammo2, vid_conheight);
+    drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+    drawresetcliparea();
+// ..  and icon
+    picsize = 1.5 * draw_getimagesize(hud_energy) * autocvar_cl_vehicles_hudscale;
+    picloc = '664 130 0' * autocvar_cl_vehicles_hudscale;
+    if(ammo2 < 0.2)
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+    else
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+/*
+/*
+// Bomb bar
+    picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale;
+    picloc = '450 140 0' * autocvar_cl_vehicles_hudscale;
+    drawsetcliparea(hudloc_x + picloc_x, hudloc_y + picloc_y, picsize_x * reload1, vid_conheight);
+    drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+    drawresetcliparea();
+// ..  and icon
+    pic2size = draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale;
+    picloc = '664 130 0' * autocvar_cl_vehicles_hudscale;
+    if(reload1 != 1)
+        drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+    else
+        drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 1 1', 1, DRAWFLAG_NORMAL);
+*/
+       if (scoreboard_showscores)
+               HUD_DrawScoreboard();
+    else
+    {
+        picsize = draw_getimagesize(waki_xhair);
+        picsize_x *= 0.5;
+        picsize_y *= 0.5;
+
+
+        drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), waki_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+    }
+}
+
+void CSQC_BUMBLE_GUN_HUD()
+{
+
+       if(autocvar_r_letterbox)
+        return;
+
+    vector picsize, hudloc, pic2size, picloc;
+
+    // Fetch health & ammo stats
+       HUD_GETSTATS
+
+    picsize = draw_getimagesize(hud_bg) * autocvar_cl_vehicles_hudscale;
+    hudloc_y = vid_conheight - picsize_y;
+    hudloc_x = vid_conwidth * 0.5 - picsize_x * 0.5;
+
+    drawpic(hudloc, hud_bg, picsize, '1 1 1', autocvar_cl_vehicles_hudalpha, DRAWFLAG_NORMAL);
+
+    shield  *= 0.01;
+    vh_health  *= 0.01;
+    energy  *= 0.01;
+    reload1 *= 0.01;
+
+    pic2size = draw_getimagesize(bumb_gun_ico) * (autocvar_cl_vehicles_hudscale * 0.8);
+    picloc = picsize * 0.5 - pic2size * 0.5;
+    
+    if(vh_health < 0.25)
+        drawpic(hudloc + picloc, bumb_gun_ico, pic2size,  '1 0 0' + '0 1 1' * sin(time * 8),  1, DRAWFLAG_NORMAL);
+    else
+        drawpic(hudloc + picloc, bumb_gun_ico, pic2size,  '1 1 1' * vh_health  + '1 0 0' * (1 - vh_health),  1, DRAWFLAG_NORMAL);
+    
+    drawpic(hudloc + picloc, bumb_gun_gun, pic2size, '1 1 1' * energy   + '1 0 0' * (1 - energy),   1, DRAWFLAG_NORMAL);
+    drawpic(hudloc + picloc, hud_sh, pic2size,  '1 1 1', shield, DRAWFLAG_NORMAL);
+
+// Health bar
+    picsize = draw_getimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale;
+    picloc = '69 69 0' * autocvar_cl_vehicles_hudscale;
+    drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - vh_health)), 0, vid_conwidth, vid_conheight);
+    drawpic(hudloc + picloc, hud_hp_bar, picsize, '1 1 1', 1 , DRAWFLAG_NORMAL);
+    drawresetcliparea();
+// ..  and icon
+    picsize = draw_getimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale;
+    picloc = '37 65 0' * autocvar_cl_vehicles_hudscale;
+    if(vh_health < 0.25)
+    {
+        if(alarm1time < time)
+        {
+            alarm1time = time + 2;
+            sound(self, CH_PAIN_SINGLE, "vehicles/alarm.wav", VOL_BASEVOICE, ATTN_NONE);
+        }
         
+        drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+    }        
+    else
+    {
+        drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+        if(alarm1time)
+        {
+            sound(self, CH_PAIN_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE);
+            alarm1time = 0;
+        }        
+    }
 
 // Shield bar
     picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale;
@@ -307,13 +486,13 @@ void CSQC_BUMBLE_HUD()
     drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
     drawresetcliparea();
 // ..  and icon
-    picsize = draw_getimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale;
+    picsize = 1.5 * draw_getimagesize(hud_energy) * autocvar_cl_vehicles_hudscale;
     picloc = '664 60 0' * autocvar_cl_vehicles_hudscale;
     if(energy < 0.2)
-        drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
     else
-        drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-
+        drawpic(hudloc + picloc, hud_energy, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+/*
 // Bomb bar
     picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale;
     picloc = '450 140 0' * autocvar_cl_vehicles_hudscale;
@@ -327,7 +506,7 @@ void CSQC_BUMBLE_HUD()
         drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL);
     else
         drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 1 1', 1, DRAWFLAG_NORMAL);
-
+*/
        if (scoreboard_showscores)
                HUD_DrawScoreboard();
     else
@@ -343,7 +522,6 @@ void CSQC_BUMBLE_HUD()
 
 
 
-
 void CSQC_SPIDER_HUD()
 {
        if(autocvar_r_letterbox)
index 076de115e265c8c78aaf386d903737ce96609109..9717905b6e0f61c5d8a863a0467b9ae4826446eb 100644 (file)
@@ -98,6 +98,7 @@ const float ENT_CLIENT_SHOWNAMES = 31;
 const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
 const float ENT_CLIENT_MODEL = 33;
 const float ENT_CLIENT_ITEM = 34;
+const float ENT_CLIENT_BUMBLE_RAYGUN = 35;
 
 const float ENT_CLIENT_TURRET = 40;
 const float ENT_CLIENT_AUXILIARYXHAIR = 50;
@@ -183,7 +184,8 @@ const float HUD_SPIDERBOT       = 10;
 const float HUD_WAKIZASHI       = 11;
 const float HUD_RAPTOR          = 12;
 const float HUD_BUMBLEBEE       = 13;
-const float HUD_VEHICLE_LAST    = 13;
+const float HUD_BUMBLEBEE_GUN   = 14;
+const float HUD_VEHICLE_LAST    = 14;
 
 const vector eX = '1 0 0';
 const vector eY = '0 1 0';
index 4fd165b308c871617a2ccc42551ea7e434f6a125..73025f1f61004ed50996fc1dfa692aafac943895 100644 (file)
@@ -15,6 +15,9 @@ void antilag_dummy()
 
 void antilag_record(entity e, float t)
 {
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+        
     if(e.vehicle)
         antilag_record(e.vehicle, t);
 
@@ -92,6 +95,10 @@ vector antilag_takebackavgvelocity(entity e, float t0, float t1)
 
 void antilag_takeback(entity e, float t)
 {
+
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+
        if(e.vehicle)
                antilag_takeback(e.vehicle, t);
 
@@ -104,6 +111,9 @@ void antilag_takeback(entity e, float t)
 
 void antilag_restore(entity e)
 {
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+
        if(e.vehicle)
                antilag_restore(e.vehicle);
 
index 741dc6b757fcf9a62621fcd3b814146544535938..d77d614759e00944a15474e8bd4097785f39bbf4 100644 (file)
@@ -648,7 +648,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
                                                        if(autocvar_g_mirrordamage_virtual)
                                                        {
-                                                               vector v = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, mirrordamage);
+                                                               vector v  = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, mirrordamage);
                                                                attacker.dmg_take += v_x;
                                                                attacker.dmg_save += v_y;
                                                                attacker.dmg_inflictor = inflictor;
index e97993ba9dd2ebca9d25e826ee71f9859b978fe9..dfa151ccd67cdce7a5aea97101f890bab02f0ae3 100644 (file)
@@ -1,3 +1,7 @@
+#define BRG_SETUP 2
+#define BRG_START 4
+#define BRG_END 8
+
 #ifdef SVQC
 // Auto cvars
 float autocvar_g_vehicle_bumblebee_speed_forward;
@@ -29,17 +33,36 @@ float autocvar_g_vehicle_bumblebee_cannon_speed;
 float autocvar_g_vehicle_bumblebee_cannon_spread;
 float autocvar_g_vehicle_bumblebee_cannon_force;
 
+float autocvar_g_vehicle_bumblebee_cannon_ammo;
+float autocvar_g_vehicle_bumblebee_cannon_ammo_regen;
+float autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause;
+
+var float autocvar_g_vehicle_bumblebee_cannon_lock = 0;
+
 float autocvar_g_vehicle_bumblebee_cannon_turnspeed;
 float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down;
 float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up;
 float autocvar_g_vehicle_bumblebee_cannon_turnlimit_in;
 float autocvar_g_vehicle_bumblebee_cannon_turnlimit_out;
 
+
 float autocvar_g_vehicle_bumblebee_raygun_turnspeed;
 float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_down;
 float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_up;
 float autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides;
 
+float autocvar_g_vehicle_bumblebee_raygun_range;
+float autocvar_g_vehicle_bumblebee_raygun_dps;
+float autocvar_g_vehicle_bumblebee_raygun_aps;
+float autocvar_g_vehicle_bumblebee_raygun_fps;
+
+float autocvar_g_vehicle_bumblebee_raygun;
+float autocvar_g_vehicle_bumblebee_healgun_hps;
+float autocvar_g_vehicle_bumblebee_healgun_hmax;
+float autocvar_g_vehicle_bumblebee_healgun_aps;
+float autocvar_g_vehicle_bumblebee_healgun_amax;
+float autocvar_g_vehicle_bumblebee_healgun_sps;
+
 float autocvar_g_vehicle_bumblebee_respawntime;
 
 float autocvar_g_vehicle_bumblebee_blowup_radius;
@@ -47,577 +70,844 @@ float autocvar_g_vehicle_bumblebee_blowup_coredamage;
 float autocvar_g_vehicle_bumblebee_blowup_edgedamage;
 float autocvar_g_vehicle_bumblebee_blowup_forceintensity;
 
-float autocvar_g_vehicle_bumblebee;
+float autocvar_g_vehicle_bumblebee = 0;
+
+
+float bumble_raygun_send ( entity to, float sf )
 
 #define BUMB_MIN '-120 -120 -120'
 #define BUMB_MAX '120 120 120'
 
-void bumb_fire_cannon(entity _gun, string _tagname, entity _owner)
+void bumb_fire_cannon ( entity _gun, string _tagname, entity _owner )
 {
-    vector v;
-    entity bolt;
-    
-    v = gettaginfo(_gun, gettagindex(_gun, _tagname));
-    bolt = vehicles_projectile("bigplasma_muzzleflash", "weapons/flacexp3.wav",
-                           v, normalize(v_forward + randomvec() * autocvar_g_vehicle_bumblebee_cannon_spread) * autocvar_g_vehicle_bumblebee_cannon_speed,
-                           autocvar_g_vehicle_bumblebee_cannon_damage, autocvar_g_vehicle_bumblebee_cannon_radius, autocvar_g_vehicle_bumblebee_cannon_force,  0,
-                           DEATH_BUMB_GUN, PROJECTILE_BUMBLE_GUN, 0, TRUE, TRUE, _owner);
+       float  b = autocvar_g_vehicle_bumblebee;
+       if ( b == 3 )
+               return;
+       vector v;
+       entity bolt;
 
+       v = gettaginfo ( _gun, gettagindex ( _gun, _tagname ) );
+       bolt = vehicles_projectile ( "bigplasma_muzzleflash", "weapons/flacexp3.wav",
+                                                                v, normalize ( v_forward + randomvec() * autocvar_g_vehicle_bumblebee_cannon_spread ) * autocvar_g_vehicle_bumblebee_cannon_speed,
+                                                                autocvar_g_vehicle_bumblebee_cannon_damage, autocvar_g_vehicle_bumblebee_cannon_radius, autocvar_g_vehicle_bumblebee_cannon_force,  0,
+                                                                DEATH_BUMB_GUN, PROJECTILE_BUMBLE_GUN, 0, TRUE, TRUE, _owner );
 
-    //bolt.velocity = v_forward * autocvar_g_vehicle_bumblebee_cannon_speed;
-}
 
-float bumb_gunner_frame()
-{
-    entity vehic, gun, gunner;
-
-    vehic   = self.vehicle.owner;
-    gun     = self.vehicle;
-    gunner  = self;
-    self    = vehic;
-
-    vehic.solid = SOLID_NOT;
-    setorigin(gunner, vehic.origin);
-    gunner.velocity = vehic.velocity;
-    crosshair_trace(gunner);
-    vector _ct = trace_endpos;
-    vector ad;
-    float _in, _out;
-    _in = ((gun == vehic.gun1) ? autocvar_g_vehicle_bumblebee_cannon_turnlimit_in : autocvar_g_vehicle_bumblebee_cannon_turnlimit_out);
-    _out = ((gun == vehic.gun1) ? autocvar_g_vehicle_bumblebee_cannon_turnlimit_out : autocvar_g_vehicle_bumblebee_cannon_turnlimit_in);
-    
-    if(gun.lock_time < time)
-        gun.enemy = world;
-    
-    if(trace_ent)
-    if(trace_ent.movetype)
-    if(trace_ent.takedamage)
-    if(!trace_ent.deadflag)
-    {
-        if(teamplay)
-        {
-            if(trace_ent.team != gunner.team)
-            {
-                gun.enemy = trace_ent;
-                gun.lock_time = time + 5;
-            }
-        }
-        else
-        {            
-            gun.enemy = trace_ent;
-            gun.lock_time = time + 5;
-        }
-    }
-        
-    if(gun.enemy)
-    {
-        float i, distance, impact_time;
-
-        vector vf = real_origin(gun.enemy);
-        vector _vel = gun.enemy.velocity;
-        if(gun.enemy.movetype == MOVETYPE_WALK)
-            _vel_z *= 0.1;
-        
-            
-        ad = vf;
-        for(i = 0; i < 4; ++i)
-        {
-            distance = vlen(ad - gunner.origin);
-            impact_time = distance / autocvar_g_vehicle_bumblebee_cannon_speed;
-            ad = vf + _vel * impact_time;
-        }
-        trace_endpos = ad;
-            
-
-        UpdateAuxiliaryXhair(gunner, ad, '1 0 1', 1);
-        vehicle_aimturret(vehic, trace_endpos, gun, "fire", 
-                          autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up, 
-                          _out * -1,  _in,  autocvar_g_vehicle_bumblebee_cannon_turnspeed);
-
-    }
-    else
-        vehicle_aimturret(vehic, _ct, gun, "fire", 
-                          autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up, 
-                          _out * -1,  _in,  autocvar_g_vehicle_bumblebee_cannon_turnspeed);
-
-    if(gunner.BUTTON_ATCK)
-    if(time > gun.attack_finished_single)
-    if(vehic.vehicle_energy >= autocvar_g_vehicle_bumblebee_cannon_cost)
-    {
-        vehic.vehicle_energy -= autocvar_g_vehicle_bumblebee_cannon_cost;
-        vehic.wait = time;                        
-        bumb_fire_cannon(gun, "fire", gunner);
-        gun.attack_finished_single = time + autocvar_g_vehicle_bumblebee_cannon_refire;
-    }
-    
-    VEHICLE_UPDATE_PLAYER(gunner, health, bumblebee);
-    VEHICLE_UPDATE_PLAYER(gunner, energy, bumblebee);
-
-    if(vehic.vehicle_flags & VHF_HASSHIELD)
-        VEHICLE_UPDATE_PLAYER(gunner, shield, bumblebee);
-        
-    ad = gettaginfo(gun, gettagindex(gun, "fire"));
-    traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, gun);
-    UpdateAuxiliaryXhair(gunner, trace_endpos, ('1 0 0' * gunner.vehicle_reload1) + ('0 1 0' * (1 - gunner.vehicle_reload1)), 0);
-
-    
-    vehic.solid = SOLID_BBOX;
-    gunner.BUTTON_ATCK = gunner.BUTTON_ATCK2 = gunner.BUTTON_CROUCH = 0;
-    self = gunner;
-    return 1;
+       //bolt.velocity = v_forward * autocvar_g_vehicle_bumblebee_cannon_speed;
 }
 
 .entity gunner1;
 .entity gunner2;
 
-void bumb_gunner_exit(float _exitflag)
+float bumb_gunner_frame()
 {
-    dprint("^2Gunner1 exits\n");
-    
-    if (clienttype(self) == CLIENTTYPE_REAL)
-    {
-        msg_entity = self;
-        WriteByte (MSG_ONE, SVC_SETVIEWPORT);
-        WriteEntity( MSG_ONE, self);
-
-        WriteByte (MSG_ONE, SVC_SETVIEWANGLES);
-        WriteAngle(MSG_ONE, 0);
-        WriteAngle(MSG_ONE, self.vehicle.angles_y);
-        WriteAngle(MSG_ONE, 0);
-    }
-    
-    setsize(self, PL_MIN,PL_MAX);
-
-    self.takedamage     = DAMAGE_AIM;
-    self.solid          = SOLID_SLIDEBOX;
-    self.movetype       = MOVETYPE_WALK;
-    self.effects        &~= EF_NODRAW;
-    self.alpha          = 1;
-    self.PlayerPhysplug = SUB_Null;
-    self.view_ofs       = PL_VIEW_OFS;
-    self.event_damage   = PlayerDamage;
-    self.hud            = HUD_NORMAL;
-    self.switchweapon   = self.vehicle.switchweapon;
-
-    if(self.flagcarried)
-    {
-        self.flagcarried.scale = 0.6;
-        setattachment(self.flagcarried, self, "");
-        setorigin(self.flagcarried, FLAG_CARRY_POS);
-    }
-
-    CSQCVehicleSetup(self, HUD_NORMAL);
-    self.vehicle.vehicle_hudmodel.viewmodelforclient = self.vehicle;       
-    
-    if(self == self.vehicle.owner.gunner1)
-        self.vehicle.owner.gunner1 = world;
-    else if(self == self.vehicle.owner.gunner2)
-        self.vehicle.owner.gunner2 = world;
-    else
-        dprint("^1self != gunner1 or gunner2, this is a BIG PROBLEM, tell tZork this happend.\n");
-    
-    self.vehicle.phase = time + 1; 
-    self.vehicle        = world;
-}
-
-float bumb_gunner_enter()
-{    
-    RemoveGrapplingHook(other);
-    entity _gun, _gunner;
-    if(!self.gunner1)
-    {
-        _gun = self.gun1;
-        _gunner = self.gunner1;
-        self.gunner1 = other;
-    }
-    else
-    {        
-        _gun = self.gun2;
-        _gunner = self.gunner2;
-        self.gunner2 = other;
-    }
-    
-    _gun.vehicle_pilot = other;
-    _gunner            = other;
-    //_gun.owner         = other;
-    _gunner.vehicle    = _gun;
-    _gun.switchweapon  = other.switchweapon;
-    _gun.vehicle_exit  = bumb_gunner_exit;
-    
-        
-    other.angles            = self.angles;
-    other.takedamage        = DAMAGE_NO;
-    other.solid             = SOLID_NOT;
-    other.movetype          = MOVETYPE_NOCLIP;
-    other.alpha             = -1;
-    other.event_damage      = SUB_Null;
-    other.view_ofs          = '0 0 0';
-    other.hud               = _gun.hud;
-    other.PlayerPhysplug    = _gun.PlayerPhysplug;
-    other.vehicle_ammo1     = self.vehicle_ammo1;
-    other.vehicle_ammo2     = self.vehicle_ammo2;
-    other.vehicle_reload1   = self.vehicle_reload1;
-    other.vehicle_reload2   = self.vehicle_reload2;
-    other.vehicle_energy    = self.vehicle_energy;
-    other.PlayerPhysplug    = bumb_gunner_frame;
-    other.flags             &~= FL_ONGROUND;
-        
-    msg_entity = other;
-    WriteByte (MSG_ONE, SVC_SETVIEWPORT);
-    WriteEntity(MSG_ONE, _gun.vehicle_viewport);
-    WriteByte (MSG_ONE, SVC_SETVIEWANGLES);
-    WriteAngle(MSG_ONE, _gun.angles_x + self.angles_x); // tilt
-    WriteAngle(MSG_ONE, _gun.angles_y + self.angles_y); // yaw
-    WriteAngle(MSG_ONE, 0);                                  // roll        
-    _gun.vehicle_hudmodel.viewmodelforclient = other;
-
-    if(!self.gunner1)
-    {
-        self.gun1 = other;
-        _gunner = self.gunner1;
-    }
-    else
-    {        
-        _gun = self.gun2;
-        _gunner = self.gunner2;
-    }
-    
-    return TRUE;
+       entity vehic    = self.vehicle.owner;
+       entity gun      = self.vehicle;
+       entity gunner   = self;
+
+
+       self = vehic;
+
+       //gun.vehicle_energy = ((gun == vehic.gun1) ? vehic.vehicle_ammo1 : vehic.vehicle_ammo2);
+
+       vehic.solid = SOLID_NOT;
+       setorigin ( gunner, vehic.origin );
+       gunner.velocity = vehic.velocity;
+       crosshair_trace ( gunner );
+       vector _ct = trace_endpos;
+       vector ad;
+
+       float _in = ( ( gun == vehic.gun1 ) ? autocvar_g_vehicle_bumblebee_cannon_turnlimit_in : autocvar_g_vehicle_bumblebee_cannon_turnlimit_out );
+       float _out = ( ( gun == vehic.gun1 ) ? autocvar_g_vehicle_bumblebee_cannon_turnlimit_out : autocvar_g_vehicle_bumblebee_cannon_turnlimit_in );
+
+       if ( autocvar_g_vehicle_bumblebee_cannon_lock )
+               {
+                       if ( gun.lock_time < time )
+                               gun.enemy = world;
+
+                       if ( trace_ent )
+                               if ( trace_ent.movetype )
+                                       if ( trace_ent.takedamage )
+                                               if ( !trace_ent.deadflag )
+                                                       {
+                                                               if ( teamplay )
+                                                                       {
+                                                                               if ( trace_ent.team != gunner.team )
+                                                                                       {
+                                                                                               gun.enemy = trace_ent;
+                                                                                               gun.lock_time = time + 5;
+                                                                                       }
+                                                                       }
+                                                               else
+                                                                       {
+                                                                               gun.enemy = trace_ent;
+                                                                               gun.lock_time = time + 5;
+                                                                       }
+                                                       }
+               }
+
+       if ( gun.enemy )
+               {
+                       float i, distance, impact_time;
+
+                       vector vf = real_origin ( gun.enemy );
+                       vector _vel = gun.enemy.velocity;
+                       if ( gun.enemy.movetype == MOVETYPE_WALK )
+                               _vel_z *= 0.1;
+
+
+                       ad = vf;
+                       for ( i = 0; i < 4; ++i )
+                               {
+                                       distance = vlen ( ad - gunner.origin );
+                                       impact_time = distance / autocvar_g_vehicle_bumblebee_cannon_speed;
+                                       ad = vf + _vel * impact_time;
+                               }
+                       trace_endpos = ad;
+
+
+                       UpdateAuxiliaryXhair ( gunner, ad, '1 0 1', 1 );
+                       vehicle_aimturret ( vehic, trace_endpos, gun, "fire",
+                                                               autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up,
+                                                               _out * -1,  _in,  autocvar_g_vehicle_bumblebee_cannon_turnspeed );
+
+               }
+       else
+               vehicle_aimturret ( vehic, _ct, gun, "fire",
+                                                       autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up,
+                                                       _out * -1,  _in,  autocvar_g_vehicle_bumblebee_cannon_turnspeed );
+
+       if ( gunner.BUTTON_ATCK )
+               if ( time > gun.attack_finished_single )
+                       if ( gun.vehicle_energy >= autocvar_g_vehicle_bumblebee_cannon_cost )
+                               {
+                                       gun.vehicle_energy -= autocvar_g_vehicle_bumblebee_cannon_cost;
+                                       bumb_fire_cannon ( gun, "fire", gunner );
+                                       gun.delay = time;
+                                       gun.attack_finished_single = time + autocvar_g_vehicle_bumblebee_cannon_refire;
+                               }
+
+       VEHICLE_UPDATE_PLAYER ( gunner, health, bumblebee );
+       //VEHICLE_UPDATE_PLAYER(gunner, energy, bumblebee);
+
+       if ( vehic.vehicle_flags & VHF_HASSHIELD )
+               VEHICLE_UPDATE_PLAYER ( gunner, shield, bumblebee );
+
+       ad = gettaginfo ( gun, gettagindex ( gun, "fire" ) );
+       traceline ( ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, gun );
+
+       UpdateAuxiliaryXhair ( gunner, trace_endpos, ( '1 0 0' * gunner.vehicle_reload1 ) + ( '0 1 0' * ( 1 - gunner.vehicle_reload1 ) ), 0 );
+
+       if ( vehic.owner )
+               UpdateAuxiliaryXhair ( vehic.owner, trace_endpos, ( '1 0 0' * gunner.vehicle_reload1 ) + ( '0 1 0' * ( 1 - gunner.vehicle_reload1 ) ), ( ( gunner == vehic.gunner1 ) ? 1 : 2 ) );
+
+       vehic.solid = SOLID_BBOX;
+       gunner.BUTTON_ATCK = gunner.BUTTON_ATCK2 = gunner.BUTTON_CROUCH = 0;
+
+       //vehic.vehicle_ammo1 = vehic.gun1.vehicle_energy;
+       //vehic.vehicle_ammo2 = vehic.gun2.vehicle_energy;
+
+       gunner.vehicle_energy = ( gun.vehicle_energy / autocvar_g_vehicle_bumblebee_cannon_ammo ) * 100;
+
+       self = gunner;
+       return 1;
 }
 
-float vehicles_valid_pilot()
+void bumb_gunner_exit ( float _exitflag )
 {
-    if(other.classname != "player")
-        return FALSE;
-
-    if(other.deadflag != DEAD_NO)
-        return FALSE;
-
-    if(other.vehicle != world)
-        return FALSE;
-
-    // Remove this when bots know how to use vehicles.
-    if (clienttype(other) != CLIENTTYPE_REAL)
-        return FALSE;
-    
-    if(teamplay && other.team != self.team)
-        return FALSE;
-    
-    return TRUE;
+       if ( clienttype ( self ) == CLIENTTYPE_REAL )
+               {
+                       msg_entity = self;
+                       WriteByte ( MSG_ONE, SVC_SETVIEWPORT );
+                       WriteEntity ( MSG_ONE, self );
+
+                       WriteByte ( MSG_ONE, SVC_SETVIEWANGLES );
+                       WriteAngle ( MSG_ONE, 0 );
+                       WriteAngle ( MSG_ONE, self.vehicle.angles_y );
+                       WriteAngle ( MSG_ONE, 0 );
+               }
+
+       setsize ( self, PL_MIN, PL_MAX );
+
+       self.takedamage     = DAMAGE_AIM;
+       self.solid          = SOLID_SLIDEBOX;
+       self.movetype       = MOVETYPE_WALK;
+       self.effects        &~ = EF_NODRAW;
+       self.alpha          = 1;
+       self.PlayerPhysplug = SUB_Null;
+       self.view_ofs       = PL_VIEW_OFS;
+       self.event_damage   = PlayerDamage;
+       self.hud            = HUD_NORMAL;
+       self.switchweapon   = self.vehicle.switchweapon;
+
+       if ( self.flagcarried )
+               {
+                       self.flagcarried.scale = 0.6;
+                       setattachment ( self.flagcarried, self, "" );
+                       setorigin ( self.flagcarried, FLAG_CARRY_POS );
+               }
+
+       CSQCVehicleSetup ( self, HUD_NORMAL );
+       self.vehicle.vehicle_hudmodel.viewmodelforclient = self.vehicle;
+
+       if ( self == self.vehicle.owner.gunner1 )
+               self.vehicle.owner.gunner1 = world;
+       else if ( self == self.vehicle.owner.gunner2 )
+               self.vehicle.owner.gunner2 = world;
+       else
+               dprint ( "^1self != gunner1 or gunner2, this is a BIG PROBLEM, tell tZork this happend.\n" );
+
+       self.vehicle.phase = time + 5;
+       self.vehicle        = world;
 }
 
-void bumb_touch()
+float bumb_gunner_enter()
 {
-    
-    if(self.gunner1 != world && self.gunner2 != world)
-    {
-        vehicles_touch();
-        return;
-    }
-    
-    if (vehicles_valid_pilot())
-    {
-        if(self.gun1.phase <= time)
-            if (bumb_gunner_enter())        
-                return;            
-        
-        if(self.gun2.phase <= time)
-            if (bumb_gunner_enter())        
-                return;    
-    
-    }
-    
-    vehicles_touch();
+       RemoveGrapplingHook ( other );
+       entity _gun, _gunner;
+       if ( !self.gunner1 )
+               {
+                       _gun = self.gun1;
+                       _gunner = self.gunner1;
+                       self.gunner1 = other;
+               }
+       else if ( !self.gunner2 )
+               {
+                       _gun = self.gun2;
+                       _gunner = self.gunner2;
+                       self.gunner2 = other;
+               }
+       else
+               {
+                       dprint ( "^1ERROR:^7Tried to enter a fully occupied vehicle!\n" );
+                       return FALSE;
+               }
+
+       _gunner            = other;
+       _gunner.vehicle    = _gun;
+       _gun.switchweapon  = other.switchweapon;
+       _gun.vehicle_exit  = bumb_gunner_exit;
+
+       other.angles            = self.angles;
+       other.takedamage        = DAMAGE_NO;
+       other.solid             = SOLID_NOT;
+       other.movetype          = MOVETYPE_NOCLIP;
+       other.alpha             = -1;
+       other.event_damage      = SUB_Null;
+       other.view_ofs          = '0 0 0';
+       other.hud               = _gun.hud;
+       other.PlayerPhysplug    = _gun.PlayerPhysplug;
+       other.vehicle_ammo1     = self.vehicle_ammo1;
+       other.vehicle_ammo2     = self.vehicle_ammo2;
+       other.vehicle_reload1   = self.vehicle_reload1;
+       other.vehicle_reload2   = self.vehicle_reload2;
+       other.vehicle_energy    = self.vehicle_energy;
+       other.PlayerPhysplug    = bumb_gunner_frame;
+       other.flags             &~ = FL_ONGROUND;
+
+       msg_entity = other;
+       WriteByte ( MSG_ONE, SVC_SETVIEWPORT );
+       WriteEntity ( MSG_ONE, _gun.vehicle_viewport );
+       WriteByte ( MSG_ONE, SVC_SETVIEWANGLES );
+       WriteAngle ( MSG_ONE, _gun.angles_x + self.angles_x ); // tilt
+       WriteAngle ( MSG_ONE, _gun.angles_y + self.angles_y ); // yaw
+       WriteAngle ( MSG_ONE, 0 );                          // roll
+       _gun.vehicle_hudmodel.viewmodelforclient = other;
+
+       CSQCVehicleSetup ( other, other.hud );
+
+       return TRUE;
 }
 
-float bumb_pilot_frame()
+float vehicles_valid_pilot()
 {
-    entity pilot, vehic;
-    vector newvel;
+       if ( other.classname != "player" )
+               return FALSE;
 
-    pilot = self;
-    vehic = self.vehicle;
-    self   = vehic;
+       if ( other.deadflag != DEAD_NO )
+               return FALSE;
 
-    if(vehic.deadflag != DEAD_NO)
-    {
-        self = pilot;
-        pilot.BUTTON_ATCK = pilot.BUTTON_ATCK2 = 0;
-        return 1;
-    }
+       if ( other.vehicle != world )
+               return FALSE;
 
-    crosshair_trace(pilot);
+       if ( clienttype ( other ) != CLIENTTYPE_REAL )
+               if ( !autocvar_g_vehicles_allow_bots )
+                       return FALSE;
 
-    vector vang;
-    float ftmp;
+       if ( teamplay && other.team != self.team )
+               return FALSE;
+
+       return TRUE;
+}
 
-    vang = vehic.angles;
-    newvel = vectoangles(normalize(trace_endpos - self.origin + '0 0 32'));
-    vang_x *= -1;
-    newvel_x *= -1;
-    if(newvel_x > 180)  newvel_x -= 360;
-    if(newvel_x < -180) newvel_x += 360;
-    if(newvel_y > 180)  newvel_y -= 360;
-    if(newvel_y < -180) newvel_y += 360;
+void bumb_touch()
+{
 
-    ftmp = shortangle_f(pilot.v_angle_y - vang_y, vang_y);
-    if(ftmp > 180)  ftmp -= 360; if(ftmp < -180) ftmp += 360;
-    vehic.avelocity_y = bound(-autocvar_g_vehicle_bumblebee_turnspeed, ftmp + vehic.avelocity_y * 0.9, autocvar_g_vehicle_bumblebee_turnspeed);
+       if ( self.gunner1 != world && self.gunner2 != world )
+               {
+                       vehicles_touch();
+                       return;
+               }
 
-    // Pitch
-    ftmp = 0;
-    if(pilot.movement_x > 0 && vang_x < autocvar_g_vehicle_bumblebee_pitchlimit) ftmp = 5;
-    else if(pilot.movement_x < 0 && vang_x > -autocvar_g_vehicle_bumblebee_pitchlimit) ftmp = -20;
+       if ( vehicles_valid_pilot() )
+               {
+                       if ( self.gun1.phase <= time )
+                               if ( bumb_gunner_enter() )
+                                       return;
 
-    newvel_x = bound(-autocvar_g_vehicle_bumblebee_pitchlimit, newvel_x , autocvar_g_vehicle_bumblebee_pitchlimit);
-    ftmp = vang_x - bound(-autocvar_g_vehicle_bumblebee_pitchlimit, newvel_x + ftmp, autocvar_g_vehicle_bumblebee_pitchlimit);
-    vehic.avelocity_x = bound(-autocvar_g_vehicle_bumblebee_pitchspeed, ftmp + vehic.avelocity_x * 0.9, autocvar_g_vehicle_bumblebee_pitchspeed);
+                       if ( self.gun2.phase <= time )
+                               if ( bumb_gunner_enter() )
+                                       return;
 
-    vehic.angles_x = anglemods(vehic.angles_x);
-    vehic.angles_y = anglemods(vehic.angles_y);
-    vehic.angles_z = anglemods(vehic.angles_z);
+               }
 
-    makevectors('0 1 0' * vehic.angles_y);
-    newvel = vehic.velocity * -autocvar_g_vehicle_bumblebee_friction;
+       vehicles_touch();
+}
 
-    if(pilot.movement_x != 0)
-    {
-        if(pilot.movement_x > 0)
-            newvel += v_forward  * autocvar_g_vehicle_bumblebee_speed_forward;
-        else if(pilot.movement_x < 0)
-            newvel -= v_forward  * autocvar_g_vehicle_bumblebee_speed_forward;
-    }
+void bumb_regen()
+{
+       if ( self.gun1.delay + autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause < time )
+               self.gun1.vehicle_energy = min ( autocvar_g_vehicle_bumblebee_cannon_ammo,
+                                                                                self.gun1.vehicle_energy + autocvar_g_vehicle_bumblebee_cannon_ammo_regen * frametime );
 
-    if(pilot.movement_y != 0)
-    {
-        if(pilot.movement_y < 0)
-            newvel -= v_right * autocvar_g_vehicle_bumblebee_speed_strafe;
-        else if(pilot.movement_y > 0)
-            newvel += v_right * autocvar_g_vehicle_bumblebee_speed_strafe;
-        ftmp = newvel * v_right;
-        ftmp *= frametime * 0.1;
-        vehic.angles_z = bound(-15, vehic.angles_z + ftmp, 15);
-    }
-    else
-    {
-        vehic.angles_z *= 0.95;
-        if(vehic.angles_z >= -1 && vehic.angles_z <= -1)
-            vehic.angles_z = 0;
-    }
+       if ( self.gun2.delay + autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause < time )
+               self.gun2.vehicle_energy = min ( autocvar_g_vehicle_bumblebee_cannon_ammo,
+                                                                                self.gun2.vehicle_energy + autocvar_g_vehicle_bumblebee_cannon_ammo_regen * frametime );
 
-    if(pilot.BUTTON_CROUCH)
-        newvel -=   v_up * autocvar_g_vehicle_bumblebee_speed_down;
-    else if (pilot.BUTTON_JUMP)
-        newvel +=  v_up * autocvar_g_vehicle_bumblebee_speed_up;
-
-    vehic.velocity  += newvel * frametime;
-    pilot.velocity = pilot.movement  = vehic.velocity;
-    setorigin(pilot,vehic.origin + '0 0 32');
-
-    vehicle_aimturret(vehic, trace_endpos, self.gun3, "fire", 
-                          autocvar_g_vehicle_bumblebee_raygun_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_raygun_pitchlimit_up, 
-                          autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides * -1,  autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides,  autocvar_g_vehicle_bumblebee_raygun_turnspeed);
-
-    /*
-    if(!vehic.gunner1)
-    vehicle_aimturret(vehic, trace_endpos, self.gun1, "fire", 
-                          autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up, 
-                          autocvar_g_vehicle_bumblebee_cannon_turnlimit_out * -1,  autocvar_g_vehicle_bumblebee_cannon_turnlimit_in,  autocvar_g_vehicle_bumblebee_cannon_turnspeed);
-    //if(!vehic.gunner2)
-    vehicle_aimturret(vehic, trace_endpos, self.gun2, "fire", 
-                          autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up, 
-                          autocvar_g_vehicle_bumblebee_cannon_turnlimit_in * -1,  autocvar_g_vehicle_bumblebee_cannon_turnlimit_out,  autocvar_g_vehicle_bumblebee_cannon_turnspeed);
-    
-
-
-    if(pilot.BUTTON_ATCK)
-    if(time > vehic.attack_finished_single)
-    if(vehic.vehicle_energy >= autocvar_g_vehicle_bumblebee_cannon_cost)
-    {
-        vehic.vehicle_energy -= autocvar_g_vehicle_bumblebee_cannon_cost;
-        vehic.wait = time;
-
-        if(vehic.cnt)
-        {
-            bumb_fire_cannon(vehic.gun1, "fire", pilot);
-            vehic.cnt = 0;
-        }
-        else
-        {
-            bumb_fire_cannon(vehic.gun2, "fire", pilot);
-            vehic.cnt = 1;
-        }
-        vehic.attack_finished_single = time + autocvar_g_vehicle_bumblebee_cannon_refire;
-    }
-    */
-    
-    if(vehic.vehicle_flags  & VHF_SHIELDREGEN)
-        vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_bumblebee_shield, autocvar_g_vehicle_bumblebee_shield_regen_pause, autocvar_g_vehicle_bumblebee_shield_regen, frametime, TRUE);
+       /*
 
-    if(vehic.vehicle_flags  & VHF_HEALTHREGEN)
-        vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_bumblebee_health, autocvar_g_vehicle_bumblebee_health_regen_pause, autocvar_g_vehicle_bumblebee_health_regen, frametime, FALSE);
+       vehicles_regen( self.gun1.delay, vehicle_ammo1, autocvar_g_vehicle_bumblebee_cannon_ammo,
+                       autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause,
+                       autocvar_g_vehicle_bumblebee_cannon_ammo_regen, frametime, FALSE);
 
-    if(vehic.vehicle_flags  & VHF_ENERGYREGEN)
-        vehicles_regen(wait, vehicle_energy, autocvar_g_vehicle_bumblebee_energy, autocvar_g_vehicle_bumblebee_energy_regen_pause, autocvar_g_vehicle_bumblebee_energy_regen, frametime, FALSE);
+       vehicles_regen( self.gun2.delay, vehicle_ammo2, autocvar_g_vehicle_bumblebee_cannon_ammo,
+                       autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause,
+                       autocvar_g_vehicle_bumblebee_cannon_ammo_regen, frametime, FALSE);
+       */
 
-    VEHICLE_UPDATE_PLAYER(pilot, health, bumblebee);
-    VEHICLE_UPDATE_PLAYER(pilot, energy, bumblebee);
+       if ( self.vehicle_flags  & VHF_SHIELDREGEN )
+               vehicles_regen ( self.dmg_time, vehicle_shield, autocvar_g_vehicle_bumblebee_shield, autocvar_g_vehicle_bumblebee_shield_regen_pause, autocvar_g_vehicle_bumblebee_shield_regen, frametime, TRUE );
 
-    if(vehic.vehicle_flags & VHF_HASSHIELD)
-        VEHICLE_UPDATE_PLAYER(pilot, shield, bumblebee);
+       if ( self.vehicle_flags  & VHF_HEALTHREGEN )
+               vehicles_regen ( self.dmg_time, vehicle_health, autocvar_g_vehicle_bumblebee_health, autocvar_g_vehicle_bumblebee_health_regen_pause, autocvar_g_vehicle_bumblebee_health_regen, frametime, FALSE );
 
+       if ( self.vehicle_flags  & VHF_ENERGYREGEN )
+               vehicles_regen ( self.wait, vehicle_energy, autocvar_g_vehicle_bumblebee_energy, autocvar_g_vehicle_bumblebee_energy_regen_pause, autocvar_g_vehicle_bumblebee_energy_regen, frametime, FALSE );
 
-    pilot.BUTTON_ATCK = pilot.BUTTON_ATCK2 = pilot.BUTTON_CROUCH = 0;
-    self = pilot;
+}
 
-    return 1;
+float bumb_pilot_frame()
+{
+       entity pilot, vehic;
+       vector newvel;
+
+       pilot = self;
+       vehic = self.vehicle;
+       self   = vehic;
+
+
+       if ( vehic.deadflag != DEAD_NO )
+               {
+                       self = pilot;
+                       pilot.BUTTON_ATCK = pilot.BUTTON_ATCK2 = 0;
+                       return 1;
+               }
+
+       bumb_regen();
+
+       crosshair_trace ( pilot );
+
+       vector vang;
+       float ftmp;
+
+       vang = vehic.angles;
+       newvel = vectoangles ( normalize ( trace_endpos - self.origin + '0 0 32' ) );
+       vang_x *= -1;
+       newvel_x *= -1;
+       if ( newvel_x > 180 )  newvel_x -= 360;
+       if ( newvel_x < -180 ) newvel_x += 360;
+       if ( newvel_y > 180 )  newvel_y -= 360;
+       if ( newvel_y < -180 ) newvel_y += 360;
+
+       ftmp = shortangle_f ( pilot.v_angle_y - vang_y, vang_y );
+       if ( ftmp > 180 )  ftmp -= 360;
+       if ( ftmp < -180 ) ftmp += 360;
+       vehic.avelocity_y = bound ( -autocvar_g_vehicle_bumblebee_turnspeed, ftmp + vehic.avelocity_y * 0.9, autocvar_g_vehicle_bumblebee_turnspeed );
+
+       // Pitch
+       ftmp = 0;
+       if ( pilot.movement_x > 0 && vang_x < autocvar_g_vehicle_bumblebee_pitchlimit ) ftmp = 5;
+       else if ( pilot.movement_x < 0 && vang_x > -autocvar_g_vehicle_bumblebee_pitchlimit ) ftmp = -20;
+
+       newvel_x = bound ( -autocvar_g_vehicle_bumblebee_pitchlimit, newvel_x , autocvar_g_vehicle_bumblebee_pitchlimit );
+       ftmp = vang_x - bound ( -autocvar_g_vehicle_bumblebee_pitchlimit, newvel_x + ftmp, autocvar_g_vehicle_bumblebee_pitchlimit );
+       vehic.avelocity_x = bound ( -autocvar_g_vehicle_bumblebee_pitchspeed, ftmp + vehic.avelocity_x * 0.9, autocvar_g_vehicle_bumblebee_pitchspeed );
+
+       vehic.angles_x = anglemods ( vehic.angles_x );
+       vehic.angles_y = anglemods ( vehic.angles_y );
+       vehic.angles_z = anglemods ( vehic.angles_z );
+
+       makevectors ( '0 1 0' * vehic.angles_y );
+       newvel = vehic.velocity * -autocvar_g_vehicle_bumblebee_friction;
+
+       if ( pilot.movement_x != 0 )
+               {
+                       if ( pilot.movement_x > 0 )
+                               newvel += v_forward  * autocvar_g_vehicle_bumblebee_speed_forward;
+                       else if ( pilot.movement_x < 0 )
+                               newvel -= v_forward  * autocvar_g_vehicle_bumblebee_speed_forward;
+               }
+
+       if ( pilot.movement_y != 0 )
+               {
+                       if ( pilot.movement_y < 0 )
+                               newvel -= v_right * autocvar_g_vehicle_bumblebee_speed_strafe;
+                       else if ( pilot.movement_y > 0 )
+                               newvel += v_right * autocvar_g_vehicle_bumblebee_speed_strafe;
+                       ftmp = newvel * v_right;
+                       ftmp *= frametime * 0.1;
+                       vehic.angles_z = bound ( -15, vehic.angles_z + ftmp, 15 );
+               }
+       else
+               {
+                       vehic.angles_z *= 0.95;
+                       if ( vehic.angles_z >= -1 && vehic.angles_z <= -1 )
+                               vehic.angles_z = 0;
+               }
+
+       if ( pilot.BUTTON_CROUCH )
+               newvel -=   v_up * autocvar_g_vehicle_bumblebee_speed_down;
+       else if ( pilot.BUTTON_JUMP )
+               newvel +=  v_up * autocvar_g_vehicle_bumblebee_speed_up;
+
+       vehic.velocity  += newvel * frametime;
+       pilot.velocity = pilot.movement  = vehic.velocity;
+       setorigin ( pilot, vehic.origin + '0 0 32' );
+
+       vehicle_aimturret ( vehic, trace_endpos, self.gun3, "fire",
+                                               autocvar_g_vehicle_bumblebee_raygun_pitchlimit_down * -1,  autocvar_g_vehicle_bumblebee_raygun_pitchlimit_up,
+                                               autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides * -1,  autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides,  autocvar_g_vehicle_bumblebee_raygun_turnspeed );
+
+
+       if ( ( pilot.BUTTON_ATCK || pilot.BUTTON_ATCK2 ) && vehic.vehicle_energy > autocvar_g_vehicle_bumblebee_raygun_dps * sys_frametime )
+               {
+
+                       if ( vehic.gun3.enemy == world )
+                               {
+                                       vehic.gun3.enemy = spawn();
+                                       Net_LinkEntity ( vehic.gun3.enemy, FALSE, 0, bumble_raygun_send );
+                                       vehic.gun3.enemy.SendFlags = BRG_SETUP;
+                                       vehic.gun3.enemy.think = SUB_Remove;
+                                       vehic.gun3.enemy.realowner = pilot;
+                                       vehic.gun3.enemy.cnt = autocvar_g_vehicle_bumblebee_raygun;
+                               }
+
+                       vehic.gun3.enemy.nextthink = time + 0.1;
+                       setorigin ( vehic.gun3.enemy, gettaginfo ( vehic.gun3, gettagindex ( vehic.gun3, "fire" ) ) );
+                       traceline ( vehic.gun3.enemy.origin, vehic.gun3.enemy.origin + v_forward * autocvar_g_vehicle_bumblebee_raygun_range, MOVE_NORMAL, vehic );
+                       if ( trace_ent )
+                               {
+                                       if ( autocvar_g_vehicle_bumblebee_raygun )
+                                               {
+                                                       Damage ( trace_ent, vehic, pilot, autocvar_g_vehicle_bumblebee_raygun_dps * sys_frametime, DEATH_GENERIC, trace_endpos, v_forward * autocvar_g_vehicle_bumblebee_raygun_fps * sys_frametime );
+                                                       vehic.vehicle_energy -= autocvar_g_vehicle_bumblebee_raygun_aps * sys_frametime;
+                                               }
+                                       else
+                                               {
+                                                       if ( trace_ent.deadflag == DEAD_NO )
+                                                               if ( ( teamplay && trace_ent.team == pilot.team ) || !teamplay )
+                                                                       {
+
+                                                                               if ( trace_ent.vehicle_flags & VHF_ISVEHICLE )
+                                                                                       {
+                                                                                               if ( autocvar_g_vehicle_bumblebee_healgun_sps && trace_ent.vehicle_health <= trace_ent.tur_health )
+                                                                                                       trace_ent.vehicle_shield = min ( trace_ent.vehicle_shield + autocvar_g_vehicle_bumblebee_healgun_sps * frametime, trace_ent.tur_head.tur_health );
+
+                                                                                               if ( autocvar_g_vehicle_bumblebee_healgun_hps )
+                                                                                                       trace_ent.vehicle_health = min ( trace_ent.vehicle_health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, trace_ent.tur_health );
+                                                                                       }
+                                                                               else if ( trace_ent.flags & FL_CLIENT )
+                                                                                       {
+                                                                                               if ( trace_ent.health <= autocvar_g_vehicle_bumblebee_healgun_hmax && autocvar_g_vehicle_bumblebee_healgun_hps )
+                                                                                                       trace_ent.health = min ( trace_ent.health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, autocvar_g_vehicle_bumblebee_healgun_hmax );
+
+                                                                                               if ( trace_ent.armorvalue <= autocvar_g_vehicle_bumblebee_healgun_amax && autocvar_g_vehicle_bumblebee_healgun_aps )
+                                                                                                       trace_ent.armorvalue = min ( trace_ent.armorvalue + autocvar_g_vehicle_bumblebee_healgun_aps * frametime, autocvar_g_vehicle_bumblebee_healgun_amax );
+
+                                                                                               trace_ent.health = min ( trace_ent.health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, autocvar_g_vehicle_bumblebee_healgun_hmax );
+                                                                                       }
+                                                                               else if ( trace_ent.turrcaps_flags & TFL_TURRCAPS_ISTURRET )
+                                                                                       {
+                                                                                               if ( trace_ent.health  <= trace_ent.tur_health && autocvar_g_vehicle_bumblebee_healgun_hps )
+                                                                                                       trace_ent.health = min ( trace_ent.health + autocvar_g_vehicle_bumblebee_healgun_hps * frametime, trace_ent.tur_health );
+                                                                                               //else ..hmmm what? ammo?
+
+                                                                                               trace_ent.SendFlags |= TNSF_STATUS;
+                                                                                       }
+                                                                       }
+                                               }
+                               }
+                       vehic.gun3.enemy.hook_end = trace_endpos;
+                       vehic.gun3.enemy.SendFlags |= BRG_START;
+                       vehic.gun3.enemy.SendFlags |= BRG_END;
+                       vehic.wait = time + 1;
+               }
+       else
+               {
+                       if ( vehic.gun3.enemy )
+                               remove ( vehic.gun3.enemy );
+
+                       vehic.gun3.enemy = world;
+               }
+
+       VEHICLE_UPDATE_PLAYER ( pilot, health, bumblebee );
+       VEHICLE_UPDATE_PLAYER ( pilot, energy, bumblebee );
+
+       pilot.vehicle_ammo1 = ( vehic.gun1.vehicle_energy / autocvar_g_vehicle_bumblebee_cannon_ammo ) * 100;
+       pilot.vehicle_ammo2 = ( vehic.gun2.vehicle_energy / autocvar_g_vehicle_bumblebee_cannon_ammo ) * 100;
+
+       if ( vehic.vehicle_flags & VHF_HASSHIELD )
+               VEHICLE_UPDATE_PLAYER ( pilot, shield, bumblebee );
+
+
+       pilot.BUTTON_ATCK = pilot.BUTTON_ATCK2 = pilot.BUTTON_CROUCH = 0;
+       self = pilot;
+
+       return 1;
 }
 
 void bumb_think()
 {
-    self.velocity = self.velocity * 0.99;
-    self.nextthink = time + 0.1;
+       self.velocity = self.velocity * 0.99;
+       self.nextthink = time + 0.1;
 }
 
 void bumb_enter()
 {
-    self.touch  = bumb_touch;
+       self.touch  = bumb_touch;
+}
+
+void bumb_exit ( float eject )
+{
+       self.owner = world;
+       self.touch = vehicles_touch;
 }
 
-void bumb_exit(float eject)
+void bumb_blowup()
 {
-    self.owner = world;
-    self.touch = vehicles_touch;
+       self.deadflag    = DEAD_DEAD;
+
+       RadiusDamage ( self, self.enemy, autocvar_g_vehicle_bumblebee_blowup_coredamage,
+                                  autocvar_g_vehicle_bumblebee_blowup_edgedamage,
+                                  autocvar_g_vehicle_bumblebee_blowup_radius, self,
+                                  autocvar_g_vehicle_bumblebee_blowup_forceintensity,
+                                  DEATH_WAKIBLOWUP, world );
+
+       self.movetype       = MOVETYPE_NONE;
+       self.effects        = EF_NODRAW;
+       self.colormod       = '0 0 0';
+       self.avelocity      = '0 0 0';
+       self.velocity       = '0 0 0';
+
+       //entity vehicle_tossgib(entity _template, vector _vel, string _tag, float _burn, float _explode, float _maxtime)
+       fixedmakevectors ( self.angles );
+       vehicle_tossgib ( self.gun1, self.velocity + v_right * 300 + v_up * 100 + randomvec() * 200, "cannon_right", rint ( random() ), rint ( random() ), 6, randomvec() * 300 );
+       vehicle_tossgib ( self.gun2, self.velocity + v_right * -300 + v_up * 100 + randomvec() * 200, "cannon_left", rint ( random() ), rint ( random() ), 6, randomvec() * 300 );
+       vehicle_tossgib ( self.gun3, self.velocity + v_forward * 300 + v_up * -100 + randomvec() * 200, "raygun", rint ( random() ), rint ( random() ), 6, randomvec() * 300 );
+
+       sound ( self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM );
+       pointparticles ( particleeffectnum ( "explosion_large" ), randomvec() * 80 + ( self.origin + '0 0 100' ), '0 0 0', 1 );
+
+       setorigin ( self, self.pos1 );
+       self.touch = SUB_Null;
+       self.nextthink = 0;
+}
+
+void bumb_diethink()
+{
+       if ( time >= self.wait )
+               self.think = bumb_blowup;
+
+       if ( random() < 0.1 )
+               {
+                       sound ( self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM );
+                       pointparticles ( particleeffectnum ( "explosion_small" ), randomvec() * 80 + ( self.origin + '0 0 100' ), '0 0 0', 1 );
+               }
+
+       self.nextthink = time + 0.1;
 }
 
 void bumb_die()
 {
-    self.deadflag    = DEAD_DEAD;
-    self.vehicle_exit(VHEF_NORMAL);
-    
-    self.health       = 0;
-    self.event_damage = SUB_Null;
-    self.solid        = SOLID_CORPSE;
-    self.takedamage   = DAMAGE_NO;
-    self.deadflag     = DEAD_DYING;
-    self.movetype     = MOVETYPE_BOUNCE;
-    
-    RadiusDamage (self, self.enemy, autocvar_g_vehicle_bumblebee_blowup_coredamage,
-                                       autocvar_g_vehicle_bumblebee_blowup_edgedamage,
-                                       autocvar_g_vehicle_bumblebee_blowup_radius, world,
-                                       autocvar_g_vehicle_bumblebee_blowup_forceintensity,
-                                       DEATH_WAKIBLOWUP, world);
-
-    pointparticles(particleeffectnum("rocket_explode"), findbetterlocation (self.origin, 16), '0 0 0', 1);
+       entity oldself = self;
+       if ( self.gunner1 )
+               {
+                       self = self.gunner1;
+                       oldself.gun1.vehicle_exit ( VHEF_EJECT );
+                       self = oldself;
+               }
+
+       if ( self.gunner2 )
+               {
+                       self = self.gunner2;
+                       oldself.gun2.vehicle_exit ( VHEF_EJECT );
+                       self = oldself;
+               }
+
+       self.vehicle_exit ( VHEF_EJECT );
+
+       self.health       = 0;
+       self.event_damage = SUB_Null;
+       self.solid        = SOLID_CORPSE;
+       self.takedamage   = DAMAGE_NO;
+       self.deadflag     = DEAD_DYING;
+       self.movetype     = MOVETYPE_BOUNCE;
+       self.think        = bumb_diethink;
+       self.nextthink    = time;
+       self.wait         = time + 2 + ( random() * 8 );
+
+       self.avelocity = '0 0.5 1' * ( random() * 400 );
+       self.avelocity -= '0 0.5 1' * ( random() * 400 );
+
+       self.colormod = '-0.5 -0.5 -0.5';
+       self.touch     = bumb_blowup;
+
+       pointparticles ( particleeffectnum ( "explosion_medium" ), findbetterlocation ( self.origin, 16 ), '0 0 0', 1 );
 }
 
 
-void bumb_spawn(float _f)
+void bumb_spawn ( float _f )
 {
-    /*
-    float i;
-    for(i=1; gettaginfo(self.gun1, i), gettaginfo_name; ++i)
-    {
-        
-        dprint(" ------- ^1gettaginfo_name^2(",ftos(i),") ^3=", gettaginfo_name, "\n");
-    }
-    */  
-    
-    if(!self.gun1)
-    {
-        // for some reason, autosizing of the shiled entity refuses to work for this one so set it up in advance. 
-        self.vehicle_shieldent = spawn();
-        self.vehicle_shieldent.effects = EF_LOWPRECISION;
-        setmodel(self.vehicle_shieldent, "models/vhshield.md3");
-        setattachment(self.vehicle_shieldent, self, "");
-        setorigin(self.vehicle_shieldent, real_origin(self) - self.origin);
-        self.vehicle_shieldent.scale       = 512 / vlen(self.maxs - self.mins);
-        self.vehicle_shieldent.think       = shieldhit_think;
-        self.vehicle_shieldent.alpha = -1;
-        self.vehicle_shieldent.effects = EF_LOWPRECISION | EF_NODRAW;
-           
-        self.gun1 = spawn();
-        self.gun2 = spawn();
-        self.gun3 = spawn();
-
-        self.vehicle_flags |= VHF_MULTISLOT;
-
-        self.gun1.owner = self;
-        self.gun2.owner = self;
-        self.gun3.owner = self;
-        
-        setmodel(self.gun1, "models/vehicles/bumblebee_plasma_right.dpm");
-        setmodel(self.gun2, "models/vehicles/bumblebee_plasma_left.dpm");
-        setmodel(self.gun3, "models/vehicles/bumblebee_ray.dpm");
-
-        setattachment(self.gun1, self, "cannon_right");
-        setattachment(self.gun2, self, "cannon_left");
-        setattachment(self.gun3, self, "raygun");
-
-        vehicle_addplayerslot(self, self.gun1, HUD_RAPTOR, "models/vehicles/wakizashi_cockpit.dpm", bumb_gunner_frame, bumb_gunner_exit);
-        vehicle_addplayerslot(self, self.gun2, HUD_RAPTOR, "models/vehicles/wakizashi_cockpit.dpm", bumb_gunner_frame, bumb_gunner_exit);
-        
-        //fixme-model
-        setorigin(self.gun1.vehicle_hudmodel, '90 -27 -23');
-        setorigin(self.gun1.vehicle_viewport, '-85 0 50');
-        
-        setorigin(self.gun2.vehicle_hudmodel, '90 27 -23');
-        setorigin(self.gun2.vehicle_viewport, '-85 0 50');
-        self.scale = 1.5;        
-    }
-    
-    self.vehicle_health = autocvar_g_vehicle_bumblebee_health;
-    self.vehicle_shield = autocvar_g_vehicle_bumblebee_shield;
-    self.movetype       = MOVETYPE_TOSS;
-    self.solid          = SOLID_BBOX;
-    self.movetype = MOVETYPE_FLY;
-    setorigin(self, self.origin + '0 0 25');
+       /*
+       float i;
+       for(i=1; gettaginfo(self.gun1, i), gettaginfo_name; ++i)
+       {
+
+           dprint(" ------- ^1gettaginfo_name^2(",ftos(i),") ^3=", gettaginfo_name, "\n");
+       }
+       */
+
+       if ( !self.gun1 )
+               {
+                       // for some reason, autosizing of the shiled entity refuses to work for this one so set it up in advance.
+                       self.vehicle_shieldent = spawn();
+                       self.vehicle_shieldent.effects = EF_LOWPRECISION;
+                       setmodel ( self.vehicle_shieldent, "models/vhshield.md3" );
+                       setattachment ( self.vehicle_shieldent, self, "" );
+                       setorigin ( self.vehicle_shieldent, real_origin ( self ) - self.origin );
+                       self.vehicle_shieldent.scale       = 512 / vlen ( self.maxs - self.mins );
+                       self.vehicle_shieldent.think       = shieldhit_think;
+                       self.vehicle_shieldent.alpha = -1;
+                       self.vehicle_shieldent.effects = EF_LOWPRECISION | EF_NODRAW;
+
+                       self.gun1 = spawn();
+                       self.gun2 = spawn();
+                       self.gun3 = spawn();
+
+                       self.vehicle_flags |= VHF_MULTISLOT;
+
+                       self.gun1.owner = self;
+                       self.gun2.owner = self;
+                       self.gun3.owner = self;
+
+                       setmodel ( self.gun1, "models/vehicles/bumblebee_plasma_right.dpm" );
+                       setmodel ( self.gun2, "models/vehicles/bumblebee_plasma_left.dpm" );
+                       setmodel ( self.gun3, "models/vehicles/bumblebee_ray.dpm" );
+
+                       setattachment ( self.gun1, self, "cannon_right" );
+                       setattachment ( self.gun2, self, "cannon_left" );
+
+                       // Angled bones are no fun, messes up gun-aim; so work arround it.
+                       self.gun3.pos1 = self.angles;
+                       self.angles = '0 0 0';
+                       vector ofs = gettaginfo ( self, gettagindex ( self, "raygun" ) );
+                       ofs -= self.origin;
+                       setattachment ( self.gun3, self, "" );
+                       setorigin ( self.gun3, ofs );
+                       self.angles = self.gun3.pos1;
+
+                       vehicle_addplayerslot ( self, self.gun1, HUD_BUMBLEBEE_GUN, "models/vehicles/wakizashi_cockpit.dpm", bumb_gunner_frame, bumb_gunner_exit );
+                       vehicle_addplayerslot ( self, self.gun2, HUD_BUMBLEBEE_GUN, "models/vehicles/wakizashi_cockpit.dpm", bumb_gunner_frame, bumb_gunner_exit );
+
+                       setorigin ( self.vehicle_hudmodel, '45 0 45' ); // Move cockpit up-forward.
+                       setorigin ( self.vehicle_viewport, '8 0 5' ); // Move camera up-forward too.
+
+                       //fixme-model-bones
+                       setorigin ( self.gun1.vehicle_hudmodel, '90 -27 -23' );
+                       setorigin ( self.gun1.vehicle_viewport, '-85 0 50' );
+                       //fixme-model-bones
+                       setorigin ( self.gun2.vehicle_hudmodel, '90 27 -23' );
+                       setorigin ( self.gun2.vehicle_viewport, '-85 0 50' );
+
+                       self.scale = 1.5;
+               }
+
+       self.vehicle_health = autocvar_g_vehicle_bumblebee_health;
+       self.vehicle_shield = autocvar_g_vehicle_bumblebee_shield;
+       self.movetype       = MOVETYPE_TOSS;
+       self.solid          = SOLID_BBOX;
+       self.movetype = MOVETYPE_FLY;
+       setorigin ( self, self.origin + '0 0 25' );
 }
 
 void spawnfunc_vehicle_bumblebee()
 {
-    if(!autocvar_g_vehicle_bumblebee)
-    {
-        remove(self);
-        return;
-    }        
-    
-    precache_model ("models/vehicles/bumblebee_body.dpm");
-    precache_model ("models/vehicles/bumblebee_plasma_left.dpm");
-    precache_model ("models/vehicles/bumblebee_plasma_right.dpm");
-    precache_model ("models/vehicles/bumblebee_ray.dpm");
-    precache_model ("models/vehicles/wakizashi_cockpit.dpm");
-    precache_model ("models/vehicles/spiderbot_cockpit.dpm");
-    precache_model ("models/vehicles/raptor_cockpit.dpm");
-
-    if(autocvar_g_vehicle_bumblebee_energy)
-        if(autocvar_g_vehicle_bumblebee_energy_regen)
-            self.vehicle_flags |= VHF_ENERGYREGEN;
-
-    if(autocvar_g_vehicle_bumblebee_shield)
-        self.vehicle_flags |= VHF_HASSHIELD;
-
-    if(autocvar_g_vehicle_bumblebee_shield_regen)
-        self.vehicle_flags |= VHF_SHIELDREGEN;
-
-    if(autocvar_g_vehicle_bumblebee_health_regen)
-        self.vehicle_flags |= VHF_HEALTHREGEN;
-
-    if not (vehicle_initialize(
-             "Bumblebee", "models/vehicles/bumblebee_body.dpm",
-             "", "models/vehicles/spiderbot_cockpit.dpm", "", "", "tag_viewport",
-             HUD_BUMBLEBEE, BUMB_MIN, BUMB_MAX, FALSE,
-             bumb_spawn, autocvar_g_vehicle_bumblebee_respawntime,
-             bumb_pilot_frame, bumb_enter, bumb_exit,
-             bumb_die, bumb_think, FALSE, autocvar_g_vehicle_bumblebee_health))
-    {
-        remove(self);
-        return;
-    }
+       if ( !autocvar_g_vehicle_bumblebee )
+               {
+                       remove ( self );
+                       return;
+               }
+
+       precache_model ( "models/vehicles/bumblebee_body.dpm" );
+       precache_model ( "models/vehicles/bumblebee_plasma_left.dpm" );
+       precache_model ( "models/vehicles/bumblebee_plasma_right.dpm" );
+       precache_model ( "models/vehicles/bumblebee_ray.dpm" );
+       precache_model ( "models/vehicles/wakizashi_cockpit.dpm" );
+       precache_model ( "models/vehicles/spiderbot_cockpit.dpm" );
+       precache_model ( "models/vehicles/raptor_cockpit.dpm" );
+
+       if ( autocvar_g_vehicle_bumblebee_energy )
+               if ( autocvar_g_vehicle_bumblebee_energy_regen )
+                       self.vehicle_flags |= VHF_ENERGYREGEN;
+
+       if ( autocvar_g_vehicle_bumblebee_shield )
+               self.vehicle_flags |= VHF_HASSHIELD;
+
+       if ( autocvar_g_vehicle_bumblebee_shield_regen )
+               self.vehicle_flags |= VHF_SHIELDREGEN;
+
+       if ( autocvar_g_vehicle_bumblebee_health_regen )
+               self.vehicle_flags |= VHF_HEALTHREGEN;
+
+       if not ( vehicle_initialize (
+                                "Bumblebee", "models/vehicles/bumblebee_body.dpm",
+                                "", "models/vehicles/spiderbot_cockpit.dpm", "", "", "tag_viewport",
+                                HUD_BUMBLEBEE, BUMB_MIN, BUMB_MAX, FALSE,
+                                bumb_spawn, autocvar_g_vehicle_bumblebee_respawntime,
+                                bumb_pilot_frame, bumb_enter, bumb_exit,
+                                bumb_die, bumb_think, FALSE, autocvar_g_vehicle_bumblebee_health, autocvar_g_vehicle_bumblebee_shield ) )
+               {
+                       remove ( self );
+                       return;
+               }
+}
+
+float bumble_raygun_send ( entity to, float sf )
+{
+       WriteByte ( MSG_ENTITY, ENT_CLIENT_BUMBLE_RAYGUN );
+
+       WriteByte ( MSG_ENTITY, sf );
+       if ( sf & BRG_SETUP )
+               {
+                       WriteByte ( MSG_ENTITY, num_for_edict ( self.realowner ) );
+                       WriteByte ( MSG_ENTITY, self.realowner.team );
+                       WriteByte ( MSG_ENTITY, self.cnt );
+
+                       //WriteCoord(MSG_ENTITY, autocvar_g_balance_electro_primary_range);
+               }
+
+       if ( sf & BRG_START )
+               {
+                       WriteCoord ( MSG_ENTITY, self.origin_x );
+                       WriteCoord ( MSG_ENTITY, self.origin_y );
+                       WriteCoord ( MSG_ENTITY, self.origin_z );
+               }
+
+       if ( sf & BRG_END )
+               {
+                       WriteCoord ( MSG_ENTITY, self.hook_end_x );
+                       WriteCoord ( MSG_ENTITY, self.hook_end_y );
+                       WriteCoord ( MSG_ENTITY, self.hook_end_z );
+               }
+
+       return TRUE;
 }
 #endif // SVQC
 
 #ifdef CSQC
+/*
+.vector raygun_l1
+.vector raygun_l2;
+.vector raygun_l3;
+*/
+
+void bumble_raygun_draw()
+{
+       float _len;
+       vector _dir;
+       vector _vtmp1, _vtmp2;
+
+       _len = vlen ( self.origin - self.move_origin );
+       _dir = normalize ( self.move_origin - self.origin );
+
+       /*
+       self.raygun_l1 = 0.5 * self.raygun_l1;
+       self.raygun_l2 = 0.5 * self.raygun_l2;
+       self.raygun_l3 = 0.5 * self.raygun_l3;
+
+       self.raygun_l1 += randomvec() * (_len * 0.2) * (frametime * 10);
+       self.raygun_l2 += randomvec() * (_len * 0.2) * (frametime * 5);
+       self.raygun_l3 += randomvec() * (_len * 0.2) * (frametime * 2) ;
+       */
+       float i, df, sz, al;
+
+       for ( i = -0.1; i < 0.2; i += 0.1 )
+               {
+                       df = DRAWFLAG_NORMAL; //((random() < 0.5) ? DRAWFLAG_ADDITIVE : DRAWFLAG_SCREEN);
+                       sz = 2 + random() * 6;
+                       al = 0.25 + random() * 0.5;
+                       _vtmp1 = self.origin + _dir * _len * ( 0.25 + i );
+                       _vtmp1 += ( randomvec() * ( _len * 0.2 ) * ( frametime * 2 ) ); //self.raygun_l1;
+                       Draw_CylindricLine ( self.origin, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin );
+
+                       _vtmp2 = self.origin + _dir * _len * ( 0.5 + i );
+                       _vtmp2 += ( randomvec() * ( _len * 0.2 ) * ( frametime * 5 ) ); //self.raygun_l2;
+                       Draw_CylindricLine ( _vtmp1, _vtmp2, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin );
+
+                       _vtmp1 = self.origin + _dir * _len * ( 0.75 + i );
+                       _vtmp1 += randomvec() * ( _len * 0.2 ) * ( frametime * 10 ); //self.raygun_l3;
+                       Draw_CylindricLine ( _vtmp2, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin );
+
+                       Draw_CylindricLine ( _vtmp1, self.move_origin +  randomvec() * 32, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin );
+               }
+
+}
+
+void bumble_raygun_read ( float bIsNew )
+{
+       float sf = ReadByte();
+
+       if ( sf & BRG_SETUP )
+               {
+                       self.cnt  = ReadByte(); //WriteByte(MSG_ENTITY, num_for_edict(self.realowner));
+                       self.team = ReadByte(); //WriteByte(MSG_ENTITY, num_for_edict(self.realowner.team));
+                       self.cnt  = ReadByte(); //WriteByte(MSG_ENTITY, num_for_edict(self.cnt));
+                       if ( self.cnt )
+                               self.colormod = '1 0 0';
+                       else
+                               self.colormod = '0 1 0';
+
+                       self.draw = bumble_raygun_draw;
+
+                       //WriteCoord(MSG_ENTITY, autocvar_g_balance_electro_primary_range);
+               }
+
+       if ( sf & BRG_START )
+               {
+                       self.origin_x = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_start_x);
+                       self.origin_y = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_start_y);
+                       self.origin_z = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_start_z);
+                       setorigin ( self, self.origin );
+               }
+
+       if ( sf & BRG_END )
+               {
+                       self.move_origin_x = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_end_x);
+                       self.move_origin_y = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_end_y);
+                       self.move_origin_z = ReadCoord(); //WriteCoord(MSG_ENTITY, self.hook_end_z);
+               }
+}
+
 void bumblebee_draw()
 {
 
@@ -641,15 +931,15 @@ void vehicle_bumblebee_assemble()
 
 /*
 vector predict_target(entity _targ, vector _from, float _shot_speed)
-{    
+{
     float i;                // loop
     float _distance;        // How far to target
     float _impact_time;     // How long untill projectile impacts
     vector _predict_pos;    // Predicted enemy location
     vector _original_origin;// Where target is before predicted
-    
+
      _original_origin = real_origin(_targ); // Typicaly center of target BBOX
-        
+
     _predict_pos = _original_origin;
     for(i = 0; i < 4; ++i)  // Loop a few times to increase prediction accuracy (increase loop count if accuracy is to low)
     {
@@ -657,7 +947,7 @@ vector predict_target(entity _targ, vector _from, float _shot_speed)
         _impact_time = _distance / _shot_speed; // Calculate impact time
         _predict_pos = _original_origin + _targ.velocity * _impact_time; // Calculate new predicted location
     }
-    
+
     return _predict_pos;
 }
-*/
\ No newline at end of file
+*/
index 90ebba3968761baeeda8d1911ff98cd340e8acf5..ff129a4e48c85d68a55dd615b18098cb61f09fb0 100644 (file)
@@ -336,7 +336,7 @@ float racer_frame()
     if (player.BUTTON_JUMP && racer.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * frametime))
     {
         if(time - racer.wait > 0.2)
-            pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin, '0 0 0', 1);
+            pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin - v_forward * 32, v_forward  * vlen(self.velocity), 1);
 
         racer.wait = time;
         racer.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * frametime;
@@ -426,13 +426,13 @@ float racer_frame()
     player.vehicle_reload1 = bound(0, 100 * ((time - racer.lip) / (racer.delay - racer.lip)), 100);
 
     if(racer.vehicle_flags  & VHF_SHIELDREGEN)
-        vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, TRUE);
+        vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, TRUE);
 
     if(racer.vehicle_flags  & VHF_HEALTHREGEN)
-        vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, FALSE);
+        vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, FALSE);
 
     if(racer.vehicle_flags  & VHF_ENERGYREGEN)
-        vehicles_regen(wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, FALSE);
+        vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, FALSE);
 
 
     VEHICLE_UPDATE_PLAYER(player, health, racer);
@@ -677,7 +677,8 @@ void spawnfunc_vehicle_racer()
              racer_enter, racer_exit,
              racer_die,   racer_think,
              TRUE, 
-             autocvar_g_vehicle_racer_health))
+             autocvar_g_vehicle_racer_health,
+             autocvar_g_vehicle_racer_shield))
     {
         remove(self);
         return;
index fe239b5d2424715e8fbef4fc21970d0d38f3540a..c47c0ca3ad16f59a11f38d693a794bb26c461bf1 100644 (file)
@@ -313,13 +313,13 @@ float raptor_takeoff()
         player.PlayerPhysplug = raptor_frame;
 
     if(self.vehicle_flags  & VHF_SHIELDREGEN)
-        vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
+        vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
 
     if(self.vehicle_flags  & VHF_HEALTHREGEN)
-        vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
+        vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
 
     if(self.vehicle_flags  & VHF_ENERGYREGEN)
-        vehicles_regen(cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
+        vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
 
 
     raptor.bomb1.alpha = raptor.bomb2.alpha = (time - raptor.lip) / (raptor.delay - raptor.lip);
@@ -600,13 +600,13 @@ float raptor_frame()
     }
 
     if(self.vehicle_flags  & VHF_SHIELDREGEN)
-        vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
+        vehicles_regen(raptor.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime, TRUE);
 
     if(self.vehicle_flags  & VHF_HEALTHREGEN)
-        vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
+        vehicles_regen(raptor.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime, FALSE);
 
     if(self.vehicle_flags  & VHF_ENERGYREGEN)
-        vehicles_regen(cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
+        vehicles_regen(raptor.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime, FALSE);
 
     if(raptor.vehicle_weapon2mode == RSM_BOMB)
     {
@@ -706,6 +706,9 @@ void raptor_blowup()
 
 void raptor_diethink()
 {
+       if(time >= self.wait)
+               self.think = raptor_blowup;
+    
     if(random() < 0.1)
     {
         sound (self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
@@ -724,6 +727,7 @@ void raptor_die()
     self.movetype     = MOVETYPE_BOUNCE;
     self.think        = raptor_diethink;
     self.nextthink    = time;
+    self.wait            = time + 5 + (random() * 5);
     
     pointparticles(particleeffectnum("explosion_medium"), findbetterlocation (self.origin, 16), '0 0 0', 1);
 
@@ -923,7 +927,8 @@ void spawnfunc_vehicle_raptor()
              raptor_enter, raptor_exit,
              raptor_die,   raptor_think,
              FALSE, 
-             autocvar_g_vehicle_raptor_health))
+             autocvar_g_vehicle_raptor_health,
+             autocvar_g_vehicle_raptor_shield))
     {
         remove(self);
         return;
index 5c4fdcf003c9eaf84eabe887040cbd7d5c4e206f..9906f527129ca9aad9b10e785352a2c26c6cfc88 100644 (file)
@@ -286,11 +286,19 @@ void spiderbot_rocket_do()
                                    DEATH_SBROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, FALSE, TRUE, self.owner);
             
             crosshair_trace(self.owner);
+            vector _ct_end = trace_endpos + trace_plane_normal;
+            
             rocket.pos1       = trace_endpos + randomvec() * (0.75 * autocvar_g_vehicle_spiderbot_rocket_radius);
             rocket.pos1_z       = trace_endpos_z;
-            traceline(v, v + '0 0 1' * MAX_SHOT_DISTANCE, MOVE_WORLDONLY, self);     
             
-            rocket.velocity  = spiberbot_calcartillery(v, rocket.pos1, (0.75 * vlen(v - trace_endpos)));
+            traceline(v, v + '0 0 1' * MAX_SHOT_DISTANCE, MOVE_WORLDONLY, self);             
+            float h1 = 0.75 * vlen(v - trace_endpos);
+            
+            //v = trace_endpos;
+            traceline(v , rocket.pos1 + '0 0 1' * MAX_SHOT_DISTANCE, MOVE_WORLDONLY, self); 
+            float h2 = 0.75 * vlen(rocket.pos1 - v);
+            
+            rocket.velocity  = spiberbot_calcartillery(v, rocket.pos1, ((h1 < h2) ? h1 : h2));
             rocket.movetype  = MOVETYPE_TOSS;            
             rocket.gravity   = 1;
             //rocket.think     = spiderbot_rocket_artillery;   
@@ -516,7 +524,7 @@ float spiderbot_frame()
         }
     }
     else
-        vehicles_regen(cnt, vehicle_ammo1, autocvar_g_vehicle_spiderbot_minigun_ammo_max,
+        vehicles_regen(spider.cnt, vehicle_ammo1, autocvar_g_vehicle_spiderbot_minigun_ammo_max,
                                            autocvar_g_vehicle_spiderbot_minigun_ammo_regen_pause,
                                            autocvar_g_vehicle_spiderbot_minigun_ammo_regen, frametime, FALSE);
         
@@ -524,10 +532,10 @@ float spiderbot_frame()
     spiderbot_rocket_do();
 
     if(self.vehicle_flags  & VHF_SHIELDREGEN)
-        vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_spiderbot_shield, autocvar_g_vehicle_spiderbot_shield_regen_pause, autocvar_g_vehicle_spiderbot_shield_regen, frametime, TRUE);
+        vehicles_regen(spider.dmg_time, vehicle_shield, autocvar_g_vehicle_spiderbot_shield, autocvar_g_vehicle_spiderbot_shield_regen_pause, autocvar_g_vehicle_spiderbot_shield_regen, frametime, TRUE);
 
     if(self.vehicle_flags  & VHF_HEALTHREGEN)
-        vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, frametime, FALSE);
+        vehicles_regen(spider.dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, frametime, FALSE);
 
     player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0;
     player.vehicle_ammo2 = spider.tur_head.frame;
@@ -860,7 +868,8 @@ void spawnfunc_vehicle_spiderbot()
              spiderbot_enter, spiderbot_exit,
              spiderbot_die,   spiderbot_think,
              FALSE, 
-             autocvar_g_vehicle_spiderbot_health))
+             autocvar_g_vehicle_spiderbot_health,
+             autocvar_g_vehicle_spiderbot_shield))
     {
         remove(self);
         return;
index c2d8b7709269ccc08e5ad418ec439ffe643c7e6b..a168483da49d8fa7ce0a335c56652f121ffe7c45 100644 (file)
@@ -4,12 +4,13 @@ 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;
-float autocvar_g_vehicles_tag_damagerate = 5;
+var float autocvar_g_vehicles_nex_damagerate = 0.5;
+var float autocvar_g_vehicles_uzi_damagerate = 0.5;
+var float autocvar_g_vehicles_rifle_damagerate = 0.75;
+var float autocvar_g_vehicles_minstanex_damagerate = 0.001;
+var float autocvar_g_vehicles_tag_damagerate = 5;
 
+float autocvar_g_vehicles;
 
 void vehicles_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
 void vehicles_return();
@@ -744,6 +745,7 @@ void vehicles_exit(float eject)
         return;
     }
     
+    vehicles_exit_running = TRUE;
     if(self.flags & FL_CLIENT)
     {
         _vehicle = self.vehicle;
@@ -752,6 +754,7 @@ void vehicles_exit(float eject)
         {
             _vehicle.vehicle_exit(eject);
             self = _oldself;
+            vehicles_exit_running = FALSE;
             return;            
         }
     }
@@ -764,8 +767,6 @@ void vehicles_exit(float eject)
 
     if (_player)
     {
-        dprint("^3Player exits\n");
-        
         if (clienttype(_player) == CLIENTTYPE_REAL)
         {
             msg_entity = _player;
@@ -801,9 +802,6 @@ void vehicles_exit(float eject)
 
         CSQCVehicleSetup(_player, HUD_NORMAL);
     }
-    
-
-    dprint("^1Pilot exits\n");
     _vehicle.flags |= FL_NOTARGET;
     
     if(_vehicle.deadflag == DEAD_NO)
@@ -815,7 +813,6 @@ void vehicles_exit(float eject)
         _vehicle.team = 0;
     else
         _vehicle.team = _vehicle.tur_head.team;
-    
         
     sound (_vehicle, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM);
     _vehicle.vehicle_hudmodel.viewmodelforclient = _vehicle;   
@@ -827,13 +824,15 @@ void vehicles_exit(float eject)
     vehicles_reset_colors();        
     _vehicle.owner = world;
     self = _oldself;
+    
+    vehicles_exit_running = FALSE;
 }
 
 
-void vehicles_regen(.float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale)
+void vehicles_regen(float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale)
 {
     if(self.regen_field < field_max)
-    if(self.timer + rpause < time)
+    if(timer + rpause < time)
     {
         if(_healthscale)
             regen = regen * (self.vehicle_health / self.tur_health);
@@ -958,6 +957,27 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat
             else
                 vehicles_exit(VHEF_RELESE);
 
+        /*
+        if (self.vehicle_flags & VHF_MULTISLOT)
+        {
+            entity oldself = self;
+            entity e = findchainentity(owner, self);
+            while(e)
+            {
+                if(e.vehicle_flags & VHF_PLAYERSLOT)
+                {
+                    self = findentity(world, vehicle, e);
+                    if(self && self.flags & FL_CLIENT)
+                        e.vehicle_exit(VHEF_EJECT);
+
+                    self = oldself;
+                }
+                e = e.chain;
+            }
+        }
+        */
+        
+        antilag_clear(self);
         self.vehicle_die();
         vehicles_setreturn();
     }
@@ -1192,8 +1212,12 @@ float vehicle_initialize(string  net_name,
                          void() dieproc,
                          void() thinkproc,
                          float  use_csqc,
-                         float _max_health)
+                         float _max_health,
+                         float _max_shield)
 {
+       if(!autocvar_g_vehicles)
+               return FALSE;
+       
     if(self.targetname)
     {
         self.vehicle_controller = find(world, target, self.targetname);
@@ -1216,6 +1240,10 @@ float vehicle_initialize(string  net_name,
         }
     }
     
+    precache_sound("onslaught/ons_hit2.wav");
+    precache_sound("onslaught/electricity_explode.wav");
+
+
     addstat(STAT_HUD, AS_INT,  hud);
        addstat(STAT_VEHICLESTAT_HEALTH,  AS_INT, vehicle_health);
        addstat(STAT_VEHICLESTAT_SHIELD,  AS_INT, vehicle_shield);
@@ -1255,6 +1283,7 @@ float vehicle_initialize(string  net_name,
     self.damagedbycontents     = TRUE;
     self.hud                = vhud;
     self.tur_health          = _max_health;
+    self.tur_head.tur_health = _max_shield;
     self.vehicle_die         = dieproc;
     self.vehicle_exit        = exitfunc;
     self.vehicle_enter       = enterproc;
@@ -1327,3 +1356,50 @@ void vehicle_aimturret(entity _vehic, vector _target, entity _turrret, string _t
     _turrret.angles_y = bound(_rotlimit_min, _turrret.angles_y + vtmp_y, _rotlimit_max);    
     _turrret.angles_x = bound(_pichlimit_min, _turrret.angles_x + vtmp_x, _pichlimit_max);    
 }
+
+void vehicles_gib_explode()
+{
+       sound (self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+       pointparticles(particleeffectnum("explosion_small"), randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1);
+       remove(self);
+}
+
+void vehicles_gib_think()
+{
+       self.alpha -= 0.1;
+       if(self.cnt >= time)
+               remove(self);
+       else
+               self.nextthink = time + 0.1;
+}
+
+entity vehicle_tossgib(entity _template, vector _vel, string _tag, float _burn, float _explode, float _maxtime, vector _rot)
+{
+       entity _gib = spawn();
+       setmodel(_gib, _template.model);
+       setorigin(_gib, gettaginfo(self, gettagindex(self, _tag)));
+       _gib.velocity = _vel;
+       _gib.movetype = MOVETYPE_TOSS;
+       _gib.solid = SOLID_CORPSE;
+       _gib.colormod = '-0.5 -0.5 -0.5';
+       _gib.effects = EF_LOWPRECISION; 
+       _gib.avelocity = _rot;
+       
+       if(_burn)
+               _gib.effects |= EF_FLAME;
+       
+       if(_explode)
+       {
+               _gib.think = vehicles_gib_explode; 
+               _gib.nextthink = time + random() * _explode;
+               _gib.touch = vehicles_gib_explode;
+       }
+       else
+       {
+               _gib.cnt = time + _maxtime;
+               _gib.think = vehicles_gib_think; 
+               _gib.nextthink = time + _maxtime - 1;           
+               _gib.alpha = 1;
+       }
+       return _gib;
+}
\ No newline at end of file
index ed7bd15dda55b64e509121b5611065c16109d7e7..772640b124d3cd9d12d9a1b930c0f5ed67fa59be 100644 (file)
@@ -26,7 +26,6 @@ float VHF_PLAYERSLOT    = 16384;    /// This ent is a player slot on a multi-per
 .entity vehicle_viewport;
 .entity vehicle_hudmodel;
 .entity vehicle_controller;
-.entity vehicle_pilot;
 
 .float vehicle_health;      /// If self is player this is 0..100 indicating precentage of health left on vehicle. If self is vehile, this is the real health value.
 .float vehicle_energy;      /// If self is player this is 0..100 indicating precentage of energy left on vehicle. If self is vehile, this is the real energy value.
index 339da5f526327e7125ef153d8b8a1c9eff8ce955..844515187285b06767eb7441fce6eec77984c498 100644 (file)
@@ -1,43 +1,61 @@
-set g_vehicle_bumblebee_speed_forward            300
-set g_vehicle_bumblebee_speed_strafe             300
-set g_vehicle_bumblebee_speed_up                 300
-set g_vehicle_bumblebee_speed_down               300
-set g_vehicle_bumblebee_turnspeed                64
-set g_vehicle_bumblebee_pitchspeed               64
+set g_vehicle_bumblebee_respawntime              60
+
+set g_vehicle_bumblebee_speed_forward            200
+set g_vehicle_bumblebee_speed_strafe             200
+set g_vehicle_bumblebee_speed_up                 200
+set g_vehicle_bumblebee_speed_down               200
+set g_vehicle_bumblebee_turnspeed                60
+set g_vehicle_bumblebee_pitchspeed               60
 set g_vehicle_bumblebee_pitchlimit               60
-set g_vehicle_bumblebee_friction                 0.4
+set g_vehicle_bumblebee_friction                 0.2
 
 set g_vehicle_bumblebee_energy                   500
 set g_vehicle_bumblebee_energy_regen             50
-set g_vehicle_bumblebee_energy_regen_pause       1o
+set g_vehicle_bumblebee_energy_regen_pause       1
 
-set g_vehicle_bumblebee_health                   750
-set g_vehicle_bumblebee_health_regen             25
-set g_vehicle_bumblebee_health_regen_pause       5
+set g_vehicle_bumblebee_health                   1000
+set g_vehicle_bumblebee_health_regen             50
+set g_vehicle_bumblebee_health_regen_pause       10
 
-set g_vehicle_bumblebee_shield                   250
+set g_vehicle_bumblebee_shield                   300
 set g_vehicle_bumblebee_shield_regen             100
-set g_vehicle_bumblebee_shield_regen_pause       2
-
-set g_vehicle_bumblebee_cannon_cost              10
-set g_vehicle_bumblebee_cannon_damage            65
-set g_vehicle_bumblebee_cannon_radius            300
-set g_vehicle_bumblebee_cannon_refire            0.25
-set g_vehicle_bumblebee_cannon_speed             9000
-set g_vehicle_bumblebee_cannon_spread            0.0125
-set g_vehicle_bumblebee_cannon_force             200
-set g_vehicle_bumblebee_cannon_turnspeed         180
-set g_vehicle_bumblebee_cannon_pitchlimit_down   60
-set g_vehicle_bumblebee_cannon_pitchlimit_up     60
-set g_vehicle_bumblebee_cannon_turnlimit_in      15
-set g_vehicle_bumblebee_cannon_turnlimit_out     45
-
-set g_vehicle_bumblebee_raygun_turnspeed 50
+set g_vehicle_bumblebee_shield_regen_pause       1
+
+set g_vehicle_bumblebee_cannon_lock                            0
+set g_vehicle_bumblebee_cannon_cost                            2
+set g_vehicle_bumblebee_cannon_damage                  20
+set g_vehicle_bumblebee_cannon_radius                  250
+set g_vehicle_bumblebee_cannon_refire                  0.15
+set g_vehicle_bumblebee_cannon_speed                   15000
+set g_vehicle_bumblebee_cannon_spread                  0.04
+set g_vehicle_bumblebee_cannon_force                   -20
+set g_vehicle_bumblebee_cannon_turnspeed               180
+set g_vehicle_bumblebee_cannon_pitchlimit_down 60
+set g_vehicle_bumblebee_cannon_pitchlimit_up   60
+set g_vehicle_bumblebee_cannon_turnlimit_in            20
+set g_vehicle_bumblebee_cannon_turnlimit_out   80
+set g_vehicle_bumblebee_cannon_ammo                            100
+set g_vehicle_bumblebee_cannon_ammo_regen              100
+set g_vehicle_bumblebee_cannon_ammo_regen_pause        1
+
+
+set g_vehicle_bumblebee_raygun_turnspeed 120
 set g_vehicle_bumblebee_raygun_pitchlimit_down 20
-set g_vehicle_bumblebee_raygun_pitchlimit_up 30
-set g_vehicle_bumblebee_raygun_turnlimit_sides 30
+set g_vehicle_bumblebee_raygun_pitchlimit_up 5
+set g_vehicle_bumblebee_raygun_turnlimit_sides 35
 
-set g_vehicle_bumblebee_respawntime              60
+set g_vehicle_bumblebee_raygun 0
+set g_vehicle_bumblebee_raygun_range 2048
+set g_vehicle_bumblebee_raygun_dps 250
+set g_vehicle_bumblebee_raygun_aps 100
+set g_vehicle_bumblebee_raygun_fps 100
+
+set g_vehicle_bumblebee_healgun_hps 100
+set g_vehicle_bumblebee_healgun_hmax 100
+set g_vehicle_bumblebee_healgun_aps 100
+set g_vehicle_bumblebee_healgun_amax 100
+set g_vehicle_bumblebee_healgun_sps 100
+set g_vehicle_bumblebee_healgun_smax 100
 
 set g_vehicle_bumblebee_blowup_radius            500
 set g_vehicle_bumblebee_blowup_coredamage        500