X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fspiderbot.qc;h=913e3316f012ecd2280611c1a2a05c6c6c4b0186;hb=a2029211d07cca1158f99bd8aa0d3b3eaa81e987;hp=090b53149fbf1fe72a493dd5d3b869d67f981120;hpb=7426a3cf2e1eedb3c059437ffdf3689d717650dc;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 090b53149..913e3316f 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -1,11 +1,9 @@ const vector SPIDERBOT_MIN = '-75 -75 10'; -const vector SPIDERBOT_MAX = '75 75 110'; +const vector SPIDERBOT_MAX = '75 75 125'; +#ifdef SVQC 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_speed_stop; float autocvar_g_vehicle_spiderbot_speed_strafe; float autocvar_g_vehicle_spiderbot_speed_walk; @@ -37,86 +35,43 @@ float autocvar_g_vehicle_spiderbot_shield_regen_pause; float autocvar_g_vehicle_spiderbot_minigun_damage; float autocvar_g_vehicle_spiderbot_minigun_refire; float autocvar_g_vehicle_spiderbot_minigun_spread; -float autocvar_g_vehicle_spiderbot_minigun_cooldown; -float autocvar_g_vehicle_spiderbot_minigun_heat; +float autocvar_g_vehicle_spiderbot_minigun_ammo_cost; +float autocvar_g_vehicle_spiderbot_minigun_ammo_max; +float autocvar_g_vehicle_spiderbot_minigun_ammo_regen; +float autocvar_g_vehicle_spiderbot_minigun_ammo_regen_pause; float autocvar_g_vehicle_spiderbot_rocket_damage; -float autocvar_g_vehicle_spiderbot_rocket_edgedamage; float autocvar_g_vehicle_spiderbot_rocket_force; -float autocvar_g_vehicle_spiderbot_rocket_health; -float autocvar_g_vehicle_spiderbot_rocket_lifetime; -float autocvar_g_vehicle_spiderbot_rocket_noise; float autocvar_g_vehicle_spiderbot_rocket_radius; +float autocvar_g_vehicle_spiderbot_rocket_speed; float autocvar_g_vehicle_spiderbot_rocket_refire; float autocvar_g_vehicle_spiderbot_rocket_reload; -float autocvar_g_vehicle_spiderbot_rocket_speed; +float autocvar_g_vehicle_spiderbot_rocket_health; +float autocvar_g_vehicle_spiderbot_rocket_noise; float autocvar_g_vehicle_spiderbot_rocket_turnrate; +float autocvar_g_vehicle_spiderbot_rocket_lifetime; + +vector autocvar_g_vehicle_spiderbot_bouncepain; void spiderbot_exit(float eject); void spiderbot_enter(); void spiderbot_spawn(); -void spiderbot_rocket_explode() -{ - vector org2; - - if(self.event_damage != SUB_Null) - { - self.event_damage = SUB_Null; - self.think = spiderbot_rocket_explode; - self.nextthink = time; - return; - } - - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - org2 = findbetterlocation (self.origin, 16); - pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1); - w_deathtypestring = "dident escape the rocket barrage"; - - if(!self.owner) - self.owner = self.realowner; - - RadiusDamage (self, self.owner, - autocvar_g_vehicle_spiderbot_rocket_damage, - autocvar_g_vehicle_spiderbot_rocket_edgedamage, - autocvar_g_vehicle_spiderbot_rocket_radius, world, - autocvar_g_vehicle_spiderbot_rocket_force, DEATH_SBROCKET, world); - - remove (self); -} - -void spiderbot_rocket_touch() -{ - if(self.owner) - { - if(other == self.owner.vehicle) - return; - - if(other == self.owner.vehicle.tur_head) - return; - } - - PROJECTILE_TOUCH; - spiderbot_rocket_explode(); -} - void spiderbot_rocket_unguided() { vector newdir, olddir; self.nextthink = time; - olddir = normalize(self.velocity); newdir = normalize(self.pos1 - self.origin) + randomvec() * autocvar_g_vehicle_spiderbot_rocket_noise; self.velocity = normalize(olddir + newdir * autocvar_g_vehicle_spiderbot_rocket_turnrate) * autocvar_g_vehicle_spiderbot_rocket_speed; UpdateCSQCProjectile(self); - if (self.owner.deadflag != DEAD_NO || self.cnt < time) - spiderbot_rocket_explode(); - + if (self.owner.deadflag != DEAD_NO || self.cnt < time || vlen(self.pos1 - self.origin) < 16) + self.use(); } void spiderbot_rocket_guided() @@ -125,10 +80,10 @@ void spiderbot_rocket_guided() self.nextthink = time; - if not (self.owner.vehicle) + if not (self.realowner.vehicle) self.think = spiderbot_rocket_unguided; - crosshair_trace(self.owner); + crosshair_trace(self.realowner); olddir = normalize(self.velocity); newdir = normalize(trace_endpos - self.origin) + randomvec() * autocvar_g_vehicle_spiderbot_rocket_noise; self.velocity = normalize(olddir + newdir * autocvar_g_vehicle_spiderbot_rocket_turnrate) * autocvar_g_vehicle_spiderbot_rocket_speed; @@ -136,21 +91,13 @@ void spiderbot_rocket_guided() UpdateCSQCProjectile(self); if (self.owner.deadflag != DEAD_NO || self.cnt < time) - spiderbot_rocket_explode(); -} - -void spiderbot_rocket_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) -{ - self.health -= damage; - self.velocity += force; - if(self.health < 1) - spiderbot_rocket_explode(); + self.use(); } void spiderbot_guide_release() { entity rkt; - rkt = findchainentity(owner,self.owner); + rkt = findchainentity(realowner, self.owner); if not (rkt) return; @@ -168,6 +115,8 @@ void spiderbot_guide_release() void spiderbot_rocket_do() { + + vector v; entity rocket; if (self.owner.BUTTON_ATCK2) @@ -199,33 +148,20 @@ void spiderbot_rocket_do() if not (self.owner.BUTTON_ATCK2) return; - sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", VOL_BASE, ATTN_NORM); - rocket = spawn (); - setsize (rocket, '-1 -1 -1', '1 1 1'); // give it some size so it can be shot - setorigin(rocket,gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"))); - te_explosion (rocket.origin); - crosshair_trace(self.owner); - rocket.classname = "spiderbot_rocket"; - rocket.bot_dodge = TRUE; - rocket.bot_dodgerating = autocvar_g_vehicle_spiderbot_rocket_damage; - rocket.cnt = time + autocvar_g_vehicle_spiderbot_rocket_lifetime; - rocket.health = autocvar_g_vehicle_spiderbot_rocket_health; - rocket.takedamage = DAMAGE_AIM; - rocket.event_damage = spiderbot_rocket_damage; - rocket.owner = self.owner; - rocket.nextthink = time; - rocket.movetype = MOVETYPE_FLYMISSILE; - rocket.velocity = normalize(v_forward + (v_up * 0.5) + randomvec() * 0.25) * autocvar_g_vehicle_spiderbot_rocket_speed; - rocket.angles = vectoangles(rocket.velocity); - rocket.think = spiderbot_rocket_guided; - rocket.touch = spiderbot_rocket_touch; - rocket.flags = FL_PROJECTILE; - rocket.solid = SOLID_TRIGGER; - rocket.pos1 = trace_endpos; - - CSQCProjectile(rocket, FALSE, PROJECTILE_ROCKET, FALSE); // no culling, has fly sound + v = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire")); + rocket = vehicles_projectile("spiderbot_rocket_launch", "weapons/rocket_fire.wav", + v, normalize(v_forward) * autocvar_g_vehicle_spiderbot_rocket_speed, + autocvar_g_vehicle_spiderbot_rocket_damage, autocvar_g_vehicle_spiderbot_rocket_radius, autocvar_g_vehicle_spiderbot_rocket_force, 1, + DEATH_SBROCKET, PROJECTILE_SPIDERROCKET, autocvar_g_vehicle_spiderbot_rocket_health, FALSE, FALSE); + + rocket.cnt = time + 15; + rocket.classname = "spiderbot_rocket"; + rocket.pos1 = trace_endpos; + rocket.think = spiderbot_rocket_guided; + rocket.nextthink = time; + rocket.cnt = time + autocvar_g_vehicle_spiderbot_rocket_lifetime; self.tur_head.frame += 1; if (self.tur_head.frame == 9) @@ -236,182 +172,85 @@ void spiderbot_rocket_do() self.gun2.cnt = time + self.attack_finished_single; } -void spiderbot_minigun_fire(entity gun, float trail) -{ - vector v; - - v = gettaginfo(gun, gettagindex(gun,"barrels")); - v_forward = normalize(v_forward); - v += v_forward * 50; - - fireBullet (v, v_forward, autocvar_g_vehicle_spiderbot_minigun_spread, autocvar_g_vehicle_spiderbot_minigun_damage, - autocvar_g_vehicle_spiderbot_minigun_spread, DEATH_SBMINIGUN, 0); - - if(trail) - { - sound (gun, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM); - trailparticles(self, particleeffectnum("spiderbot_minigun_trail"), v, trace_endpos); - pointparticles(particleeffectnum("spiderbot_minigun_muzzleflash"), v, v_forward * 2500, 1); - pointparticles(particleeffectnum("spiderbot_minigun_impact"), trace_endpos, trace_plane_normal * 2500,1); - } -} - -void spiderbot_miniguns_do() -{ - float ftmp; - - if((self.vehicle_reload1 == 1) || (!self.owner.BUTTON_ATCK)) - { - ftmp = 1 / autocvar_g_vehicle_spiderbot_minigun_cooldown * sys_frametime; - self.owner.vehicle_reload1 = max(self.owner.vehicle_reload1 - ftmp, 0); - if(self.owner.vehicle_reload1 <= 0) - self.vehicle_reload1 = 0; - - return; - } - - if (self.owner.BUTTON_ATCK) - { - - // Animate miniguns - self.gun1.angles_z += (1440 * sys_frametime); - self.gun2.angles_z -= (1440 * sys_frametime); - if(self.gun1.angles_z >= 360) - { - self.gun1.angles_z = 0; - self.gun2.angles_z = 360; - } - - if (self.tur_head.attack_finished_single < time) - { - // Fire bullets, alternating trails left<->right - self = self.owner; - if(self.misc_bulletcounter == 1) - { - spiderbot_minigun_fire(self.vehicle.gun1, 0); - spiderbot_minigun_fire(self.vehicle.gun2, 1); - self.misc_bulletcounter = 0; - } - else - { - spiderbot_minigun_fire(self.vehicle.gun1, 1); - spiderbot_minigun_fire(self.vehicle.gun2, 0); - self.misc_bulletcounter += 1; - } - self = self.vehicle; - - ftmp = autocvar_g_vehicle_spiderbot_minigun_refire / autocvar_g_vehicle_spiderbot_minigun_heat; - self.owner.vehicle_reload1 += ftmp; - - if(self.owner.vehicle_reload1 >= 1) - { - self.vehicle_reload1 = 1; - self.owner.vehicle_reload1 = 1; - self.tur_head.attack_finished_single = autocvar_g_vehicle_spiderbot_minigun_cooldown + time; - } - else - self.tur_head.attack_finished_single = autocvar_g_vehicle_spiderbot_minigun_refire + time; - } - return; - } -} - float spiderbot_frame() { - vector ad; + vector ad, vf; entity player, spider; float ftmp; + if(intermission_running) + return 1; + player = self; spider = self.vehicle; + self = spider; + vehicles_painframe(); + player.BUTTON_ZOOM = 0; player.BUTTON_CROUCH = 0; player.switchweapon = 0; - if(player.BUTTON_USE) - { - self = spider; - vehicles_exit(VHEF_NORMAL); - self = player; - return 0; - } - - self = spider; +#if 1 // 0 to enable per-gun impact aux crosshairs + // Avarage gun impact point's -> aux cross + ad = gettaginfo(spider.tur_head, gettagindex(spider.tur_head, "tag_hardpoint01")); + vf = v_forward; + ad += gettaginfo(spider.tur_head, gettagindex(spider.tur_head, "tag_hardpoint02")); + 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); + vf = ad; + ad = gettaginfo(spider.gun2, gettagindex(spider.gun2, "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)), 1); + ad = 0.5 * (ad + vf); +#endif crosshair_trace(player); + ad = vectoangles(normalize(trace_endpos - ad)); + ad = AnglesTransform_ToAngles(AnglesTransform_LeftDivide(AnglesTransform_FromAngles(spider.angles), AnglesTransform_FromAngles(ad))) - spider.tur_head.angles; + ad = AnglesTransform_Normalize(ad, TRUE); //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; - 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); // Pitch head - ftmp = autocvar_g_vehicle_spiderbot_head_pitchspeed * sys_frametime; - //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); - - - // 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; - ofs = self.origin + v_up * 128; - te_lightning1(world, ofs, ofs + v_up * 32); - te_lightning1(world, ofs, ofs + v_right * 128); - te_lightning1(world, ofs, ofs + v_forward * 256); - */ - + //fixedmakevectors(spider.angles); + makevectors(spider.angles + '-2 0 0' * spider.angles_x); + movelib_groundalign4point(autocvar_g_vehicle_spiderbot_springlength, autocvar_g_vehicle_spiderbot_springup, autocvar_g_vehicle_spiderbot_springblend); if(spider.flags & FL_ONGROUND) { - if(player.BUTTON_JUMP && self.tur_head.wait < time) + if(spider.frame == 4 && self.tur_head.wait != 0) { + sound (self, CH_TRIGGER_SINGLE, "vehicles/spiderbot_land.wav", VOL_VEHICLEENGINE, ATTN_NORM); + spider.frame = 5; + } + + if(player.BUTTON_JUMP && self.tur_head.wait < time) + { + sound (self, CH_TRIGGER_SINGLE, "vehicles/spiderbot_jump.wav", VOL_VEHICLEENGINE, ATTN_NORM); + //dprint("spiderbot_jump:", ftos(soundlength("vehicles/spiderbot_jump.wav")), "\n"); + self.delay = 0; + self.tur_head.wait = time + 2; player.BUTTON_JUMP = 0; spider.velocity = v_forward * 700 + v_up * 600; @@ -421,6 +260,13 @@ float spiderbot_frame() { if(vlen(player.movement) == 0) { + if(self.sound_nexttime < time || self.delay != 3) + { + self.delay = 3; + self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_idle.wav"); + //dprint("spiderbot_idle:", ftos(soundlength("vehicles/spiderbot_idle.wav")), "\n"); + sound (self, CH_TRIGGER_SINGLE, "vehicles/spiderbot_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop); spider.frame = 5; } @@ -443,6 +289,14 @@ float spiderbot_frame() } player.movement_y = 0; movelib_move_simple(normalize(v_forward * player.movement_x),autocvar_g_vehicle_spiderbot_speed_walk,autocvar_g_vehicle_spiderbot_movement_inertia); + + if(self.sound_nexttime < time || self.delay != 1) + { + self.delay = 1; + self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_walk.wav"); + sound (self, CH_TRIGGER_SINGLE, "vehicles/spiderbot_walk.wav", VOL_VEHICLEENGINE, ATTN_NORM); + //dprint("spiderbot_walk:", ftos(soundlength("vehicles/spiderbot_walk.wav")), "\n"); + } } else if(player.movement_y != 0) { @@ -457,6 +311,13 @@ float spiderbot_frame() spider.frame = 3; } movelib_move_simple(normalize(v_right * player.movement_y),autocvar_g_vehicle_spiderbot_speed_strafe,autocvar_g_vehicle_spiderbot_movement_inertia); + if(self.sound_nexttime < time || self.delay != 2) + { + self.delay = 2; + self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_strafe.wav"); + sound (self, CH_TRIGGER_SINGLE, "vehicles/spiderbot_strafe.wav", VOL_VEHICLEENGINE, ATTN_NORM); + //dprint("spiderbot_strafe:", ftos(soundlength("vehicles/spiderbot_strafe.wav")), "\n"); + } } } } @@ -465,7 +326,49 @@ float spiderbot_frame() self.angles_x = bound(-45, self.angles_x, 45); self.angles_z = bound(-45, self.angles_z, 45); - spiderbot_miniguns_do(); + if(player.BUTTON_ATCK) + { + spider.cnt = time; + if(spider.vehicle_ammo1 >= autocvar_g_vehicle_spiderbot_minigun_ammo_cost && spider.tur_head.attack_finished_single <= time) + { + entity gun; + vector v; + spider.misc_bulletcounter += 1; + + self = player; + + mod(spider.misc_bulletcounter, 2) ? gun = spider.gun1 : gun = spider.gun2; + v = gettaginfo(gun, gettagindex(gun, "barrels")); + v_forward = normalize(v_forward); + v += v_forward * 50; + + fireBullet (v, v_forward, autocvar_g_vehicle_spiderbot_minigun_spread, autocvar_g_vehicle_spiderbot_minigun_damage, + autocvar_g_vehicle_spiderbot_minigun_spread, DEATH_SBMINIGUN, 0); + + sound (gun, CH_WEAPON_A, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM); + trailparticles(self, particleeffectnum("spiderbot_minigun_trail"), v, trace_endpos); + pointparticles(particleeffectnum("spiderbot_minigun_muzzleflash"), v, v_forward * 2500, 1); + + self = spider; + + spider.vehicle_ammo1 -= autocvar_g_vehicle_spiderbot_minigun_ammo_cost; + spider.tur_head.attack_finished_single = time + autocvar_g_vehicle_spiderbot_minigun_refire; + player.vehicle_ammo1 = (spider.vehicle_ammo1 / autocvar_g_vehicle_spiderbot_minigun_ammo_max) * 100; + spider.gun1.angles_z += 45; + spider.gun2.angles_z -= 45; + if(spider.gun1.angles_z >= 360) + { + spider.gun1.angles_z = 0; + spider.gun2.angles_z = 0; + } + } + } + else + vehicles_regen(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); + + spiderbot_rocket_do(); if(self.vehicle_flags & VHF_SHIELDREGEN) @@ -478,9 +381,9 @@ float spiderbot_frame() player.vehicle_ammo2 = spider.tur_head.frame; if(spider.gun2.cnt <= time) - player.vehicle_reload2 = 1; + player.vehicle_reload2 = 100; else - player.vehicle_reload2 = 1 - ((spider.gun2.cnt - time) / spider.attack_finished_single); + player.vehicle_reload2 = 100 - ((spider.gun2.cnt - time) / spider.attack_finished_single) * 100; setorigin(player, spider.origin + '0 0 1' * SPIDERBOT_MAX_z); player.velocity = spider.velocity; @@ -490,32 +393,9 @@ 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); - UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload1) + ('0 1 0' * (1 - player.vehicle_reload1)), 1); -#endif - self = player; - return 1; + return 1; } - void spiderbot_think() { if(self.flags & FL_ONGROUND) @@ -527,14 +407,22 @@ 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); + + self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health) * 100; + self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_spiderbot_shield) * 100; + + if(self.owner.flagcarried) + { + setattachment(self.owner.flagcarried, self.tur_head, ""); + setorigin(self.owner.flagcarried, '-20 0 120'); + } } void spiderbot_exit(float eject) { entity e; - + vector spot; + e = findchain(classname,"spiderbot_rocket"); while(e) { @@ -551,67 +439,35 @@ void spiderbot_exit(float eject) self.nextthink = time; self.frame = 5; self.movetype = MOVETYPE_WALK; - + if not (self.owner) return; makevectors(self.angles); if(eject) { - setorigin(self.owner ,self.origin + v_forward * 100 + '0 0 64'); + spot = self.origin + v_forward * 100 + '0 0 64'; + spot = vehicles_findgoodexit(spot); + setorigin(self.owner , spot); self.owner.velocity = (v_up + v_forward * 0.25) * 750; + self.owner.oldvelocity = self.owner.velocity; } else - setorigin(self.owner, self.origin - v_forward * 200 + '0 0 64'); - + { + self.owner.velocity = normalize(self.velocity) * autocvar_sv_maxairspeed; + self.owner.oldvelocity = self.owner.velocity; + spot = self.origin - v_forward * 200 + '0 0 64'; + spot = vehicles_findgoodexit(spot); + setorigin(self.owner , spot); + } + antilag_clear(self.owner); self.owner = world; } - -// Better way of determening whats crushable needed! (fl_crushable?) -float spiderbot_crushable(entity e) +void spider_impact() { - if(e.classname == "corpse") - return 1; - - if(e.classname == "player") - return 1; - - if(e.classname == "monster_zombie") - return 1; - - return 0; + if(autocvar_g_vehicle_spiderbot_bouncepain_x) + vehilces_impact(autocvar_g_vehicle_spiderbot_bouncepain_x, autocvar_g_vehicle_spiderbot_bouncepain_y, autocvar_g_vehicle_spiderbot_bouncepain_z); } - -/*void spiderbot_touch( -{ - //vehicles_touch(); - if(self.owner) - { - if(vlen(self.velocity) == 0) - return; - - if not (spiderbot_crushable(other)) - return; - - //todo: add check for velocity/angle here (so we dont cush players runing into us from behind) - - Damage(other, self, self.owner,autocvar_g_vehicle_spiderbot_crush_dmg,DEATH_SBCRUSH, '0 0 0', normalize(other.origin - self.origin) * autocvar_g_vehicle_spiderbot_crush_force); - return; - } - - if(other.classname != "player") - return; - - if(other.deadflag != DEAD_NO) - return; - - if(other.vehicle != world) - return; - - vehicles_enter(); -}*/ - - void spiderbot_spawn() { self.frame = 5; @@ -627,6 +483,7 @@ void spiderbot_spawn() setorigin(self, self.pos1 + '0 0 128'); self.angles = self.pos2; + self.vehicle_impact = spider_impact; } void spiderbot_headfade() @@ -639,8 +496,8 @@ void spiderbot_headfade() { if(self.alpha > 0.1) { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("rocket_explode"), self.origin + '0 0 100', '0 0 0', 1); + sound (self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); + pointparticles(particleeffectnum("explosion_big"), self.origin + '0 0 100', '0 0 0', 1); } remove(self); } @@ -648,12 +505,17 @@ void spiderbot_headfade() void spiderbot_blowup() { - float i; - 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); - + if(self.cnt > time) + { + 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; + return; + } + entity h, g1, g2, b; b = spawn(); h = spawn(); @@ -666,6 +528,10 @@ void spiderbot_blowup() setmodel(g2, "models/vehicles/spiderbot_barrels.dpm"); setorigin(b, self.origin); + b.frame = 11; + b.angles = self.angles; + setsize(b, self.mins, self.maxs); + setorigin(h, gettaginfo(self, gettagindex(self, "tag_head"))); h.movetype = MOVETYPE_BOUNCE; h.solid = SOLID_BBOX; @@ -692,11 +558,10 @@ void spiderbot_blowup() g2.solid = SOLID_CORPSE; g2.velocity = v_forward * 700 + (randomvec() * 32); g2.avelocity = randomvec() * 180; - b.frame = 5; h.colormod = b.colormod = g1.colormod = g2.colormod = '-2 -2 -2'; - SUB_SetFade(b, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10)); + SUB_SetFade(b, time + 5, min(autocvar_g_vehicle_spiderbot_respawntime, 1)); //SUB_SetFade(h, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10)); SUB_SetFade(g1, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10)); SUB_SetFade(g2, time, min(autocvar_g_vehicle_spiderbot_respawntime, 10)); @@ -709,29 +574,23 @@ void spiderbot_blowup() 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); } void spiderbot_die() { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("rocket_explode"), self.origin + '0 0 100', '0 0 0', 1); - - self.health = 0; - self.event_damage = SUB_Null; - self.takedamage = DAMAGE_NO; - self.touch = SUB_Null; - self.nextthink = 1 + time + random() * 2; - self.think = spiderbot_blowup; - self.deadflag = DEAD_DYING; - self.frame = 5; - self.tur_head.effects |= EF_FLAME; - self.colormod = self.tur_head.colormod = '-1 -1 -1'; - + self.health = 0; + self.event_damage = SUB_Null; + self.takedamage = DAMAGE_NO; + self.touch = SUB_Null; + self.cnt = 3.4 + time + random() * 2; + self.think = spiderbot_blowup; + self.nextthink = time; + self.deadflag = DEAD_DYING; + self.frame = 5; + self.tur_head.effects |= EF_FLAME; + self.colormod = self.tur_head.colormod = '-1 -1 -1'; + self.frame = 10; + self.movetype = MOVETYPE_TOSS; } void vewhicle_spiderbot_dinit() @@ -748,12 +607,14 @@ void vewhicle_spiderbot_dinit() spiderbot_spawn, autocvar_g_vehicle_spiderbot_respawntime, spiderbot_frame, spiderbot_enter, spiderbot_exit, - spiderbot_die, spiderbot_think)) + spiderbot_die, spiderbot_think, + FALSE)) { remove(self); return; } + self.gun1 = spawn(); self.gun2 = spawn(); @@ -769,6 +630,10 @@ void vewhicle_spiderbot_dinit() void spawnfunc_vehicle_spiderbot() { + self.vehicle_flags |= VHF_DMGSHAKE; + //self.vehicle_flags |= VHF_DMGROLL; + //self.vehicle_flags |= VHF_DMGHEADROLL; + precache_model ( "models/vhshield.md3"); precache_model ( "models/vehicles/spiderbot.dpm"); precache_model ( "models/vehicles/spiderbot_top.dpm"); @@ -776,9 +641,15 @@ void spawnfunc_vehicle_spiderbot() precache_model ( "models/vehicles/spiderbot_cockpit.dpm"); precache_model ( "models/uziflash.md3"); - precache_sound ( "weapons/rocket_impact.wav" ); precache_sound ( "weapons/uzi_fire.wav" ); - precache_sound ( "weapons/rocket_impact.wav" ); + precache_sound ( "weapons/rocket_impact.wav"); + + precache_sound ( "vehicles/spiderbot_die.wav"); + precache_sound ( "vehicles/spiderbot_idle.wav"); + precache_sound ( "vehicles/spiderbot_jump.wav"); + precache_sound ( "vehicles/spiderbot_strafe.wav"); + precache_sound ( "vehicles/spiderbot_walk.wav"); + precache_sound ( "vehicles/spiderbot_land.wav"); vehicles_configcheck("vehicle_spiderbot.cfg", autocvar_g_vehicle_spiderbot_health); if(autocvar_g_vehicle_spiderbot_shield) @@ -789,7 +660,12 @@ void spawnfunc_vehicle_spiderbot() if(autocvar_g_vehicle_spiderbot_health_regen) self.vehicle_flags |= VHF_HEALTHREGEN; - + self.think = vewhicle_spiderbot_dinit; - self.nextthink = time + 0.5; + + if(g_assault) + self.nextthink = time + 0.5; + else + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } +#endif // SVQC