X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fspiderbot.qc;h=08b9459911cf0f50fbf2fb7c8181eae9772a7271;hb=5c0f2bd0a4c9bf64df16b933740a6be426bf3c99;hp=056249ed53a6bc5f276da85ecbfc38532ab6ace6;hpb=750e508d36f7d088f7d63035255b137a798bc566;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 056249ed5..08b945991 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -27,10 +27,10 @@ void spiderbot_rocket_explode() self.owner = self.realowner; RadiusDamage (self, self.owner, - cvar("g_vehicle_spiderbot_rocket_damage"), - cvar("g_vehicle_spiderbot_rocket_edgedamage"), - cvar("g_vehicle_spiderbot_rocket_radius"), world, - cvar("g_vehicle_spiderbot_rocket_force"), DEATH_SBROCKET, world); + 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); } @@ -58,8 +58,8 @@ void spiderbot_rocket_unguided() olddir = normalize(self.velocity); - newdir = normalize(self.pos1 - self.origin) + randomvec() * cvar("g_vehicle_spiderbot_rocket_noise"); - self.velocity = normalize(olddir + newdir * cvar("g_vehicle_spiderbot_rocket_turnrate")) * cvar("g_vehicle_spiderbot_rocket_speed"); + 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); @@ -79,8 +79,8 @@ void spiderbot_rocket_guided() crosshair_trace(self.owner); olddir = normalize(self.velocity); - newdir = normalize(trace_endpos - self.origin) + randomvec() * cvar("g_vehicle_spiderbot_rocket_noise"); - self.velocity = normalize(olddir + newdir * cvar("g_vehicle_spiderbot_rocket_turnrate")) * cvar("g_vehicle_spiderbot_rocket_speed"); + 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; UpdateCSQCProjectile(self); @@ -161,15 +161,15 @@ void spiderbot_rocket_do() rocket.classname = "spiderbot_rocket"; rocket.bot_dodge = TRUE; - rocket.bot_dodgerating = cvar("g_vehicle_spiderbot_rocket_damage"); - rocket.cnt = time + cvar("g_vehicle_spiderbot_rocket_lifetime"); - rocket.health = cvar("g_vehicle_spiderbot_rocket_health"); + 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) * cvar("g_vehicle_spiderbot_rocket_speed"); + 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; @@ -181,9 +181,9 @@ void spiderbot_rocket_do() self.tur_head.frame += 1; if (self.tur_head.frame == 9) - self.attack_finished_single = cvar("g_vehicle_spiderbot_rocket_reload"); + self.attack_finished_single = autocvar_g_vehicle_spiderbot_rocket_reload; else - self.attack_finished_single = cvar("g_vehicle_spiderbot_rocket_refire"); + self.attack_finished_single = autocvar_g_vehicle_spiderbot_rocket_refire; self.gun2.cnt = time + self.attack_finished_single; } @@ -213,8 +213,8 @@ void spiderbot_minigun_fire(entity gun, float trail) sound (gun, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM); - fireBullet (v, v_forward, cvar("g_vehicle_spiderbot_minigun_spread"), cvar("g_vehicle_spiderbot_minigun_damage"), - cvar("g_vehicle_spiderbot_minigun_spread"), DEATH_SBMINIGUN, 0); + 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); UziFlash(); @@ -231,7 +231,7 @@ void spiderbot_miniguns_do() if((self.vehicle_reload1 == 1) || (!self.owner.BUTTON_ATCK)) { - ftmp = 1 / cvar("g_vehicle_spiderbot_minigun_cooldown") * sys_frametime; + 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; @@ -255,32 +255,32 @@ void spiderbot_miniguns_do() { // Fire bullets, alternating trails left<->right self = self.owner; - if(self.uzi_bulletcounter == 1) + if(self.misc_bulletcounter == 1) { spiderbot_minigun_fire(self.vehicle.gun1, 0); spiderbot_minigun_fire(self.vehicle.gun2, 1); - self.uzi_bulletcounter = 0; + self.misc_bulletcounter = 0; } else { spiderbot_minigun_fire(self.vehicle.gun1, 1); spiderbot_minigun_fire(self.vehicle.gun2, 0); - self.uzi_bulletcounter += 1; + self.misc_bulletcounter += 1; } self = self.vehicle; - ftmp = cvar("g_vehicle_spiderbot_minigun_refire") / cvar("g_vehicle_spiderbot_minigun_heat"); + 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 = cvar("g_vehicle_spiderbot_minigun_cooldown") + time; + self.tur_head.attack_finished_single = autocvar_g_vehicle_spiderbot_minigun_cooldown + time; } else - self.tur_head.attack_finished_single = cvar("g_vehicle_spiderbot_minigun_refire") + time; + self.tur_head.attack_finished_single = autocvar_g_vehicle_spiderbot_minigun_refire + time; } self = self.owner; @@ -323,17 +323,17 @@ float spiderbot_pplug() if(ad_y < -180) ad_y += 360; // Rotate head - ftmp = cvar("g_vehicle_spiderbot_head_turnspeed") * sys_frametime; + ftmp = autocvar_g_vehicle_spiderbot_head_turnspeed * sys_frametime; ad_y = bound(-ftmp, ad_y, ftmp); - spider.tur_head.angles_y = bound(cvar("g_vehicle_spiderbot_head_turnlimit") * -1, spider.tur_head.angles_y + ad_y, cvar("g_vehicle_spiderbot_head_turnlimit")); + 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 = cvar("g_vehicle_spiderbot_head_pitchspeed") * sys_frametime; + ftmp = autocvar_g_vehicle_spiderbot_head_pitchspeed * sys_frametime; ad_x = bound(-ftmp, ad_x, ftmp); - spider.tur_head.angles_x = bound(cvar("g_vehicle_spiderbot_head_pitchlimit_down"), spider.tur_head.angles_x + ad_x, cvar("g_vehicle_spiderbot_head_pitchlimit_up")); + 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 = cvar("g_vehicle_spiderbot_turnspeed") * sys_frametime; + ftmp = autocvar_g_vehicle_spiderbot_turnspeed * sys_frametime; ftmp = bound(-ftmp, spider.tur_head.angles_y, ftmp); self = spider; @@ -350,7 +350,7 @@ float spiderbot_pplug() { if(vlen(player.movement) == 0) { - movelib_beak_simple(cvar("g_vehicle_spiderbot_speed_stop")); + movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop); spider.frame = 5; } else @@ -371,7 +371,7 @@ float spiderbot_pplug() spider.frame = 1; } player.movement_y = 0; - movelib_move_simple(normalize(v_forward * player.movement_x),cvar("g_vehicle_spiderbot_speed_walk"),cvar("g_vehicle_spiderbot_movement_inertia")); + movelib_move_simple(normalize(v_forward * player.movement_x),autocvar_g_vehicle_spiderbot_speed_walk,autocvar_g_vehicle_spiderbot_movement_inertia); } else if(player.movement_y != 0) { @@ -385,7 +385,7 @@ float spiderbot_pplug() player.movement_y = 1; spider.frame = 3; } - movelib_move_simple(normalize(v_right * player.movement_y),cvar("g_vehicle_spiderbot_speed_strafe"),cvar("g_vehicle_spiderbot_movement_inertia")); + movelib_move_simple(normalize(v_right * player.movement_y),autocvar_g_vehicle_spiderbot_speed_strafe,autocvar_g_vehicle_spiderbot_movement_inertia); } } @@ -417,7 +417,7 @@ float spiderbot_pplug() void spiderbot_think() { if(self.flags & FL_ONGROUND) - movelib_beak_simple(cvar("g_vehicle_spiderbot_speed_stop")); + movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop); self.nextthink = time; } @@ -452,8 +452,8 @@ void spiderbot_enter() self.owner.vehicle = self; self.owner.event_damage = SUB_Null; self.owner.hud = HUD_SPIDERBOT; - self.owner.vehicle_health = (self.vehicle_health / cvar("g_vehicle_spiderbot_health")); - self.owner.vehicle_shield = (self.vehicle_shield / cvar("g_vehicle_spiderbot_shield")); + 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.view_ofs = '0 0 0'; self.owner.vehicle_ammo1 = self.vehicle_ammo1; self.owner.vehicle_ammo2 = self.vehicle_ammo2; @@ -586,7 +586,7 @@ void spiderbot_touch() //todo: add check for velocity/angle here (so we dont cush players runing into us from behind) - Damage(other,self,self.owner,cvar("g_vehicle_spiderbot_crush_dmg"),DEATH_SBCRUSH,'0 0 0', normalize(other.origin - self.origin) * cvar("g_vehicle_spiderbot_crush_force") ); + 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; } @@ -662,7 +662,7 @@ 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 + cvar("g_vehicle_spiderbot_respawntime"); + self.nextthink = time + autocvar_g_vehicle_spiderbot_respawntime; self.think = spiderbot_spawn; self.movetype = MOVETYPE_NONE;