]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/vehicles/spiderbot.qc
Make a common vehicles_spawn to handle bulk stuff / reduce code duplication. Make...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / spiderbot.qc
index a160c5c046fde5ed3eb2e7a02fd93206b4842877..090b53149fbf1fe72a493dd5d3b869d67f981120 100644 (file)
@@ -1,10 +1,20 @@
-const vector spiderbot_MIN = '-75 -75 10';
-const vector spiderbot_MAX  = '75 75 110';
+const vector SPIDERBOT_MIN = '-75 -75 10';
+const vector SPIDERBOT_MAX  = '75 75 110';
 
 float autocvar_g_vehicle_spiderbot_respawntime;
 
-float autocvar_g_vehicle_spiderbot_crush_dmg;
-float autocvar_g_vehicle_spiderbot_crush_force;
+//float autocvar_g_vehicle_spiderbot_crush_dmg;
+//float autocvar_g_vehicle_spiderbot_crush_force;
+
+float autocvar_g_vehicle_spiderbot_speed_stop;
+float autocvar_g_vehicle_spiderbot_speed_strafe;
+float autocvar_g_vehicle_spiderbot_speed_walk;
+float autocvar_g_vehicle_spiderbot_turnspeed;
+float autocvar_g_vehicle_spiderbot_movement_inertia;
+
+float autocvar_g_vehicle_spiderbot_springlength;
+float autocvar_g_vehicle_spiderbot_springup;
+float autocvar_g_vehicle_spiderbot_springblend;
 
 float autocvar_g_vehicle_spiderbot_head_pitchlimit_down;
 float autocvar_g_vehicle_spiderbot_head_pitchlimit_up;
@@ -24,12 +34,11 @@ float autocvar_g_vehicle_spiderbot_shield;
 float autocvar_g_vehicle_spiderbot_shield_regen;
 float autocvar_g_vehicle_spiderbot_shield_regen_pause;
 
-float autocvar_g_vehicle_spiderbot_minigun_cooldown;
 float autocvar_g_vehicle_spiderbot_minigun_damage;
-float autocvar_g_vehicle_spiderbot_minigun_heat;
 float autocvar_g_vehicle_spiderbot_minigun_refire;
 float autocvar_g_vehicle_spiderbot_minigun_spread;
-float autocvar_g_vehicle_spiderbot_movement_inertia;
+float autocvar_g_vehicle_spiderbot_minigun_cooldown;
+float autocvar_g_vehicle_spiderbot_minigun_heat;
 
 float autocvar_g_vehicle_spiderbot_rocket_damage;
 float autocvar_g_vehicle_spiderbot_rocket_edgedamage;
@@ -43,16 +52,6 @@ float autocvar_g_vehicle_spiderbot_rocket_reload;
 float autocvar_g_vehicle_spiderbot_rocket_speed;
 float autocvar_g_vehicle_spiderbot_rocket_turnrate;
 
-float autocvar_g_vehicle_spiderbot_shield;
-float autocvar_g_vehicle_spiderbot_speed_stop;
-float autocvar_g_vehicle_spiderbot_speed_strafe;
-float autocvar_g_vehicle_spiderbot_speed_walk;
-float autocvar_g_vehicle_spiderbot_turnspeed;
-
-
-float autocvar_g_vehicle_spiderbot_springlength;
-float autocvar_g_vehicle_spiderbot_springup;
-float autocvar_g_vehicle_spiderbot_springblend;
 
 void spiderbot_exit(float eject);
 void spiderbot_enter();
@@ -104,7 +103,7 @@ void spiderbot_rocket_touch()
 
 void spiderbot_rocket_unguided()
 {
-    vector newdir,olddir;
+    vector newdir, olddir;
 
     self.nextthink  = time;
 
@@ -156,7 +155,6 @@ void spiderbot_guide_release()
         return;
 
     crosshair_trace(self.owner);
-
     while(rkt)
     {
         if(rkt.think == spiderbot_rocket_guided)
@@ -164,7 +162,6 @@ void spiderbot_guide_release()
             rkt.pos1 = trace_endpos;
             rkt.think = spiderbot_rocket_unguided;
         }
-
         rkt = rkt.chain;
     }
 }
@@ -242,7 +239,6 @@ void spiderbot_rocket_do()
 void spiderbot_minigun_fire(entity gun, float trail)
 {
     vector v;
-    entity oldself;
 
     v = gettaginfo(gun, gettagindex(gun,"barrels"));
     v_forward = normalize(v_forward);
@@ -315,7 +311,6 @@ void spiderbot_miniguns_do()
             }
             else
                 self.tur_head.attack_finished_single = autocvar_g_vehicle_spiderbot_minigun_refire + time;
-
         }
         return;
     }
@@ -345,6 +340,9 @@ float spiderbot_frame()
     self = spider;
 
     crosshair_trace(player);
+    //UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload2) + ('0 1 0' * (1 - player.vehicle_reload2)), 2);
+
+#if VEHICLES_VIEWROTATE_CROSSHAIR
     ad = vectoangles(normalize(trace_endpos - gettaginfo(spider.tur_head,gettagindex(spider.tur_head,"tag_hud")))) - (spider.tur_head.angles + spider.angles);
     if(ad_x > 180) ad_x -= 360;
     if(ad_x < -180) ad_x += 360;
@@ -358,20 +356,47 @@ float spiderbot_frame()
 
     // Pitch head
     ftmp = autocvar_g_vehicle_spiderbot_head_pitchspeed * sys_frametime;
-    ad_x = bound(-ftmp, ad_x, ftmp);
+    //ad_x = bound(-ftmp, ad_x, ftmp);
     spider.tur_head.angles_x = bound(autocvar_g_vehicle_spiderbot_head_pitchlimit_down, spider.tur_head.angles_x + ad_x, autocvar_g_vehicle_spiderbot_head_pitchlimit_up);
 
     // Turn Body
     ftmp = autocvar_g_vehicle_spiderbot_turnspeed * sys_frametime;
     ftmp = bound(-ftmp, spider.tur_head.angles_y, ftmp);
+#else
+
+    player.v_angle_x *= -1;
+    ad = player.v_angle - (spider.tur_head.angles + spider.angles);
+    player.v_angle_x *= -1;
+    if(ad_x > 180)  ad_x -= 360;
+    if(ad_x < -180) ad_x += 360;
+    if(ad_y > 180)  ad_y -= 360;
+    if(ad_y < -180) ad_y += 360;
+
+    // Rotate head
+    ftmp = autocvar_g_vehicle_spiderbot_head_turnspeed * sys_frametime;
+    ad_y = bound(-ftmp, ad_y, ftmp);
+    spider.tur_head.angles_y = bound(autocvar_g_vehicle_spiderbot_head_turnlimit * -1, spider.tur_head.angles_y + ad_y, autocvar_g_vehicle_spiderbot_head_turnlimit);
 
-    //fixedmakevectors(self.angles);
-    // Not sure why this works better, but it does.
-    spider.tur_head.angles_x *= -1;
-    spider.angles_x *= -1;
-    makevectors(spider.angles);
-    spider.tur_head.angles_x *= -1;
-    spider.angles_x *= -1;
+
+    // Pitch head
+    ad = vectoangles(normalize(trace_endpos - gettaginfo(spider.tur_head,gettagindex(spider.tur_head,"tag_hud")))) - (spider.tur_head.angles + spider.angles);
+    if(ad_x > 180) ad_x -= 360;
+    if(ad_x < -180) ad_x += 360;
+
+
+    ftmp = autocvar_g_vehicle_spiderbot_head_pitchspeed * sys_frametime;
+    ad_x = bound(ftmp * -1, ad_x, ftmp);
+    spider.tur_head.angles_x = bound(autocvar_g_vehicle_spiderbot_head_pitchlimit_down, spider.tur_head.angles_x + ad_x, autocvar_g_vehicle_spiderbot_head_pitchlimit_up);
+
+
+
+    // Turn Body
+    ftmp = autocvar_g_vehicle_spiderbot_turnspeed * sys_frametime;
+    ftmp = bound(-ftmp, spider.tur_head.angles_y, ftmp);
+
+
+#endif
+    makevectors(spider.angles + '-1 0 0' * spider.angles_x);
 
     /*
     vector ofs;
@@ -437,8 +462,8 @@ float spiderbot_frame()
         }
     }
 
-    self.angles_x = bound(-60, self.angles_x, 60);
-    self.angles_z = bound(-60, self.angles_z, 60);
+    self.angles_x = bound(-45, self.angles_x, 45);
+    self.angles_z = bound(-45, self.angles_z, 45);
 
     spiderbot_miniguns_do();
     spiderbot_rocket_do();
@@ -457,7 +482,7 @@ float spiderbot_frame()
     else
         player.vehicle_reload2 = 1 - ((spider.gun2.cnt - time) / spider.attack_finished_single);
 
-    setorigin(player, spider.origin + '0 0 64');
+    setorigin(player, spider.origin + '0 0 1' * SPIDERBOT_MAX_z);
     player.velocity = spider.velocity;
 
     VEHICLE_UPDATE_PLAYER(health, spiderbot);
@@ -465,17 +490,27 @@ float spiderbot_frame()
     if(self.vehicle_flags & VHF_HASSHIELD)
         VEHICLE_UPDATE_PLAYER(shield, spiderbot);
 
+#if 1 // 0 to enable per-gun impact aux crosshairs
+    // Avarage gun impact point's -> aux cross
     vector vf;
-
     ad = gettaginfo(spider.gun1, gettagindex(spider.gun1, "barrels"));
     vf = v_forward;
     ad += gettaginfo(spider.gun2, gettagindex(spider.gun2, "barrels"));
     vf += v_forward;
     ad = ad * 0.5;
     v_forward = vf * 0.5;
+    traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, spider);
+    UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload1) + ('0 1 0' * (1 - player.vehicle_reload1)), 0);
 
+#else
+    ad = gettaginfo(spider.gun1, gettagindex(spider.gun1, "barrels"));
+    traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, spider);
+    UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload1) + ('0 1 0' * (1 - player.vehicle_reload1)), 0);
+
+    ad = gettaginfo(spider.gun2, gettagindex(spider.gun2, "barrels"));
     traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, spider);
-    SpawnOrUpdateAuxiliaryXhair(player, trace_endpos);
+    UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload1) + ('0 1 0' * (1 - player.vehicle_reload1)), 1);
+#endif
 
     self = player;
     return 1;
@@ -491,6 +526,7 @@ void spiderbot_think()
 
 void spiderbot_enter()
 {
+    self.movetype   = MOVETYPE_WALK;
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health);
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_spiderbot_shield);
 }
@@ -499,8 +535,6 @@ void spiderbot_exit(float eject)
 {
     entity e;
 
-    vehicles_setreturn(autocvar_g_vehicle_spiderbot_respawntime, spiderbot_spawn);
-
     e = findchain(classname,"spiderbot_rocket");
     while(e)
     {
@@ -516,12 +550,11 @@ void spiderbot_exit(float eject)
     self.think      = spiderbot_think;
     self.nextthink  = time;
     self.frame      = 5;
+    self.movetype   = MOVETYPE_WALK;
 
     if not (self.owner)
         return;
 
-       Release_AuxiliaryXhair(self.owner);
-
        makevectors(self.angles);
        if(eject)
        {
@@ -549,8 +582,9 @@ float spiderbot_crushable(entity e)
     return 0;
 }
 
-void spiderbot_touch()
+/*void spiderbot_touch(
 {
+    //vehicles_touch();
     if(self.owner)
     {
         if(vlen(self.velocity) == 0)
@@ -575,50 +609,24 @@ void spiderbot_touch()
         return;
 
     vehicles_enter();
-}
+}*/
 
 
 void spiderbot_spawn()
 {
-
-    setsize(self, spiderbot_MIN, spiderbot_MAX);
-
     self.frame              = 5;
+    self.tur_head.frame     = 1;
     self.think              = spiderbot_think;
     self.nextthink          = time;
-    self.owner              = world;
-    self.velocity           = '0 0 0';
     self.vehicle_health     = autocvar_g_vehicle_spiderbot_health;
     self.vehicle_shield     = autocvar_g_vehicle_spiderbot_shield;
-    self.event_damage       = vehicles_damage;
-    self.iscreature         = TRUE;
     self.movetype           = MOVETYPE_WALK;
     self.solid              = SOLID_SLIDEBOX;
-    self.takedamage         = DAMAGE_AIM;
-    self.touch              = spiderbot_touch;
     self.alpha              = self.tur_head.alpha = self.gun1.alpha = self.gun2.alpha = 1;
     self.tur_head.angles    = '0 0 0';
-       self.colormap           = 1024;
-       self.tur_head.colormap  = 1024;
-       self.deadflag           = DEAD_NO;
-    self.bot_attack         = TRUE;
-    self.flags              |= FL_NOTARGET;
-    self.tur_head.frame     = 1;
-    self.vehicle_hudmodel.viewmodelforclient = self;
 
     setorigin(self, self.pos1 + '0 0 128');
     self.angles = self.pos2;
-
-    if (self.team == COLOR_TEAM1)
-        self.colormod = '1.4 0.8 0.8';
-    else if (self.team == COLOR_TEAM2)
-        self.colormod = '0.8 0.8 1.4';
-    else
-        self.colormod = '0 0 0';
-
-    self.tur_head.colormod = self.colormod;
-
-
 }
 
 void spiderbot_headfade()
@@ -644,9 +652,7 @@ void spiderbot_blowup()
     sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
 
     for(i = 0; i < 5; ++i)
-    {
         pointparticles(particleeffectnum("rocket_explode"), self.origin + (randomvec() * 100) + '0 0 100', '0 0 0', 1);
-    }
 
     entity h, g1, g2, b;
     b = spawn();
@@ -698,14 +704,15 @@ void spiderbot_blowup()
     RadiusDamage (self, self, 250, 15, 250, world, 250, DEATH_SBBLOWUP, world);
 
     self.alpha = self.tur_head.alpha = self.gun1.alpha = self.gun2.alpha = -1;
-    self.nextthink  = time + autocvar_g_vehicle_spiderbot_respawntime;
-    self.think      = spiderbot_spawn;
     self.movetype   = MOVETYPE_NONE;
     self.deadflag   = DEAD_DEAD;
     self.solid      = SOLID_NOT;
     self.tur_head.effects  &~=  EF_FLAME;
        self.vehicle_hudmodel.viewmodelforclient = self;
 
+    //self.nextthink  = time + autocvar_g_vehicle_spiderbot_respawntime;
+    //self.think      = spiderbot_spawn;
+
     //setorigin(self, self.tur_aimpos);
 }
 
@@ -736,9 +743,10 @@ void vewhicle_spiderbot_dinit()
              "models/vehicles/spiderbot_cockpit.dpm",
              "tag_head", "tag_hud", "",
              HUD_SPIDERBOT,
-             spiderbot_MIN, spiderbot_MAX,
+             SPIDERBOT_MIN, SPIDERBOT_MAX,
              FALSE,
-             spiderbot_spawn, spiderbot_frame,
+             spiderbot_spawn, autocvar_g_vehicle_spiderbot_respawntime,
+             spiderbot_frame,
              spiderbot_enter, spiderbot_exit,
              spiderbot_die,   spiderbot_think))
     {
@@ -756,6 +764,7 @@ void vewhicle_spiderbot_dinit()
     setattachment(self.gun2, self.tur_head, "tag_hardpoint02");
 
     self.gravity            = 2;
+    self.mass               = 5000;
 }
 
 void spawnfunc_vehicle_spiderbot()