X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=b4987b69f9bcf62a9729c428d35009f1024a1953;hb=44effb3a66f8b44d05106ff361ef5fc126fef03b;hp=39a04e490a5da99ed69c06e4a93f2bdc2327a4c1;hpb=54ed0e31a41f2569b2ea8f2a5169201fde7d6f9d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 39a04e490..b4987b69f 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -1,68 +1,16 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(ROCKET_LAUNCHER, w_rlauncher, IT_ROCKETS, 9, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "rl", "rocketlauncher", _("Rocket Launcher")) +REGISTER_WEAPON(ROCKET_LAUNCHER, w_rlauncher, IT_ROCKETS, 9, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "rl", "rocketlauncher", _("Rocket Launcher")) #else #ifdef SVQC .float rl_release; .float rl_detonate_later; -void W_RocketLauncher_SetAmmoCounter() -{ - // set clip_load to the weapon we have switched to, if the gun uses reloading - if(!autocvar_g_balance_rocketlauncher_reload_ammo) - self.clip_load = 0; // also keeps crosshair ammo from displaying - else - { - self.clip_load = self.rocketlauncher_load; - self.clip_size = autocvar_g_balance_rocketlauncher_reload_ammo; // for the crosshair ammo display - } -} - -void W_RocketLauncher_ReloadedAndReady() -{ - float t; - - // now do the ammo transfer - self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading - while(self.clip_load < autocvar_g_balance_rocketlauncher_reload_ammo && self.ammo_rockets) // make sure we don't add more ammo than we have - { - self.clip_load += 1; - self.ammo_rockets -= 1; - } - self.rocketlauncher_load = self.clip_load; - - t = ATTACK_FINISHED(self) - autocvar_g_balance_rocketlauncher_reload_time - 1; - ATTACK_FINISHED(self) = t; - w_ready(); -} - -void W_RocketLauncher_Reload() -{ - // return if reloading is disabled for this weapon - if(!autocvar_g_balance_rocketlauncher_reload_ammo) - return; - - if(!W_ReloadCheck(self.ammo_rockets, autocvar_g_balance_rocketlauncher_ammo)) - return; - - float t; - - sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM); - - t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_rocketlauncher_reload_time + 1; - ATTACK_FINISHED(self) = t; - - weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_rocketlauncher_reload_time, W_RocketLauncher_ReloadedAndReady); - - self.old_clip_load = self.clip_load; - self.clip_load = -1; -} - void W_Rocket_Unregister() { - if(self.owner && self.owner.lastrocket == self) + if(self.realowner && self.realowner.lastrocket == self) { - self.owner.lastrocket = world; - // self.owner.rl_release = 1; + self.realowner.lastrocket = world; + // self.realowner.rl_release = 1; } } @@ -72,22 +20,23 @@ void W_Rocket_Explode () if(other.takedamage == DAMAGE_AIM) if(other.classname == "player") - if(IsDifferentTeam(self.owner, other)) - if(IsFlying(other)) - AnnounceTo(self.owner, "airshot"); + if(IsDifferentTeam(self.realowner, other)) + if(other.deadflag == DEAD_NO) + if(IsFlying(other)) + AnnounceTo(self.realowner, "airshot"); self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, autocvar_g_balance_rocketlauncher_damage, autocvar_g_balance_rocketlauncher_edgedamage, autocvar_g_balance_rocketlauncher_radius, world, autocvar_g_balance_rocketlauncher_force, self.projectiledeathtype, other); + RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_damage, autocvar_g_balance_rocketlauncher_edgedamage, autocvar_g_balance_rocketlauncher_radius, world, autocvar_g_balance_rocketlauncher_force, self.projectiledeathtype, other); - if (self.owner.weapon == WEP_ROCKET_LAUNCHER) + if (self.realowner.weapon == WEP_ROCKET_LAUNCHER) { - if(self.owner.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) + if(self.realowner.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) { - self.owner.cnt = WEP_ROCKET_LAUNCHER; - ATTACK_FINISHED(self.owner) = time; - self.owner.switchweapon = w_getbestweapon(self.owner); + self.realowner.cnt = WEP_ROCKET_LAUNCHER; + ATTACK_FINISHED(self.realowner) = time; + self.realowner.switchweapon = w_getbestweapon(self.realowner); } } remove (self); @@ -100,15 +49,15 @@ void W_Rocket_DoRemoteExplode () self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, autocvar_g_balance_rocketlauncher_remote_damage, autocvar_g_balance_rocketlauncher_remote_edgedamage, autocvar_g_balance_rocketlauncher_remote_radius, world, autocvar_g_balance_rocketlauncher_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world); + RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_remote_damage, autocvar_g_balance_rocketlauncher_remote_edgedamage, autocvar_g_balance_rocketlauncher_remote_radius, world, autocvar_g_balance_rocketlauncher_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world); - if (self.owner.weapon == WEP_ROCKET_LAUNCHER) + if (self.realowner.weapon == WEP_ROCKET_LAUNCHER) { - if(self.owner.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) + if(self.realowner.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) { - self.owner.cnt = WEP_ROCKET_LAUNCHER; - ATTACK_FINISHED(self.owner) = time; - self.owner.switchweapon = w_getbestweapon(self.owner); + self.realowner.cnt = WEP_ROCKET_LAUNCHER; + ATTACK_FINISHED(self.realowner) = time; + self.realowner.switchweapon = w_getbestweapon(self.realowner); } } remove (self); @@ -161,19 +110,19 @@ entity FindLaserTarget(entity e, float dist_variance, float dot_variance) head = find(head, classname, "laser_target"); } - //bprint(selected.owner.netname); + //bprint(selected.realowner.netname); //bprint("\n"); return selected; } void W_Rocket_RemoteExplode() { - if(self.owner.deadflag == DEAD_NO) - if(self.owner.lastrocket) + if(self.realowner.deadflag == DEAD_NO) + if(self.realowner.lastrocket) { if((self.spawnshieldtime >= 0) ? (time >= self.spawnshieldtime) // timer - : (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > autocvar_g_balance_rocketlauncher_remote_radius) // safety device + : (vlen(NearestPointOnBox(self.realowner, self.origin) - self.origin) > autocvar_g_balance_rocketlauncher_remote_radius) // safety device ) { W_Rocket_DoRemoteExplode(); @@ -226,14 +175,14 @@ void W_Rocket_Think (void) self.velocity = self.velocity + v_forward * min(autocvar_g_balance_rocketlauncher_speedaccel * g_weaponspeedfactor * frametime, velspeed); // laser guided, or remote detonation - if (self.owner.weapon == WEP_ROCKET_LAUNCHER) + if (self.realowner.weapon == WEP_ROCKET_LAUNCHER) { - if(self == self.owner.lastrocket) - if not(self.owner.rl_release) + if(self == self.realowner.lastrocket) + if not(self.realowner.rl_release) if not(self.BUTTON_ATCK2) if(autocvar_g_balance_rocketlauncher_guiderate) if(time > self.pushltime) - if(self.owner.deadflag == DEAD_NO) + if(self.realowner.deadflag == DEAD_NO) { f = autocvar_g_balance_rocketlauncher_guideratedelay; if(f) @@ -243,9 +192,9 @@ void W_Rocket_Think (void) velspeed = vlen(self.velocity); - makevectors(self.owner.v_angle); - desireddir = WarpZone_RefSys_TransformVelocity(self.owner, self, v_forward); - desiredorigin = WarpZone_RefSys_TransformOrigin(self.owner, self, self.owner.origin + self.owner.view_ofs); + makevectors(self.realowner.v_angle); + desireddir = WarpZone_RefSys_TransformVelocity(self.realowner, self, v_forward); + desiredorigin = WarpZone_RefSys_TransformOrigin(self.realowner, self, self.realowner.origin + self.realowner.view_ofs); olddir = normalize(self.velocity); // now it gets tricky... we want to move like some curve to approximate the target direction @@ -260,7 +209,7 @@ void W_Rocket_Think (void) { pointparticles(particleeffectnum("rocket_guide"), self.origin, self.velocity, 1); // TODO add a better sound here - sound (self.owner, CHAN_WEAPON2, "weapons/rocket_mode.wav", VOL_BASE, ATTN_NORM); + sound (self.realowner, CH_WEAPON_B, "weapons/rocket_mode.wav", VOL_BASE, ATTN_NORM); self.count = 1; } } @@ -300,23 +249,13 @@ void W_Rocket_Attack (void) local entity missile; local entity flash; - // if this weapon is reloadable, decrease its load. Else decrease the player's ammo - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - { - if(autocvar_g_balance_rocketlauncher_reload_ammo) - { - self.clip_load -= autocvar_g_balance_rocketlauncher_ammo; - self.rocketlauncher_load = self.clip_load; - } - else - self.ammo_rockets -= autocvar_g_balance_rocketlauncher_ammo; - } + W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo); - W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", CHAN_WEAPON, autocvar_g_balance_rocketlauncher_damage); + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, autocvar_g_balance_rocketlauncher_damage); pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); missile = WarpZone_RefSys_SpawnSameRefSys(self); - missile.owner = self; + missile.owner = missile.realowner = self; self.lastrocket = missile; if(autocvar_g_balance_rocketlauncher_detonatedelay >= 0) missile.spawnshieldtime = time + autocvar_g_balance_rocketlauncher_detonatedelay; @@ -389,7 +328,7 @@ float w_rlauncher(float req) missile = find(world, classname, "rocket"); while (missile) { - if (missile.owner != self) + if (missile.realowner != self) { missile = find(missile, classname, "rocket"); continue; @@ -402,7 +341,7 @@ float w_rlauncher(float req) // count potential damage according to type of target if (targ == self) selfdamage = selfdamage + d; - else if (targ.team == self.team && teams_matter) + else if (targ.team == self.team && teamplay) teamdamage = teamdamage + d; else if (bot_shouldattack(targ)) enemydamage = enemydamage + d; @@ -414,13 +353,13 @@ float w_rlauncher(float req) desirabledamage = enemydamage; if (time > self.invincible_finished && time > self.spawnshieldtime) desirabledamage = desirabledamage - selfdamage * autocvar_g_balance_selfdamagepercent; - if (teams_matter && self.team) + if (teamplay && self.team) desirabledamage = desirabledamage - teamdamage; missile = find(world, classname, "rocket"); while (missile) { - if (missile.owner != self) + if (missile.realowner != self) { missile = find(missile, classname, "rocket"); continue; @@ -466,7 +405,7 @@ float w_rlauncher(float req) else if (req == WR_THINK) { if(autocvar_g_balance_rocketlauncher_reload_ammo && self.clip_load < autocvar_g_balance_rocketlauncher_ammo) // forced reload - W_RocketLauncher_Reload(); + weapon_action(self.weapon, WR_RELOAD); else { if (self.BUTTON_ATCK) @@ -485,7 +424,7 @@ float w_rlauncher(float req) if (self.BUTTON_ATCK2) { rockfound = 0; - for(rock = world; (rock = find(rock, classname, "rocket")); ) if(rock.owner == self) + for(rock = world; (rock = find(rock, classname, "rocket")); ) if(rock.realowner == self) { if(!rock.rl_detonate_later) { @@ -494,20 +433,9 @@ float w_rlauncher(float req) } } if(rockfound) - sound (self, CHAN_WEAPON2, "weapons/rocket_det.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_WEAPON_B, "weapons/rocket_det.wav", VOL_BASE, ATTN_NORM); } } - if(self.wish_reload) - { - if(self.switchweapon == self.weapon) - { - if(self.weaponentity.state == WS_READY) - { - self.wish_reload = 0; - W_RocketLauncher_Reload(); - } - } - } } else if (req == WR_PRECACHE) { @@ -518,12 +446,12 @@ float w_rlauncher(float req) precache_sound ("weapons/rocket_det.wav"); precache_sound ("weapons/rocket_fire.wav"); precache_sound ("weapons/rocket_mode.wav"); - precache_sound ("weapons/reload.wav"); + //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else } else if (req == WR_SETUP) { weapon_setup(WEP_ROCKET_LAUNCHER); - W_RocketLauncher_SetAmmoCounter(); + self.current_ammo = ammo_rockets; self.rl_release = 1; } else if (req == WR_CHECKAMMO1) @@ -531,12 +459,15 @@ float w_rlauncher(float req) // don't switch while guiding a missile if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_ROCKET_LAUNCHER) { - if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) - ammo_amount = FALSE; - if(autocvar_g_balance_electro_reload_ammo && self.minelayer_load < autocvar_g_balance_rocketlauncher_ammo) - ammo_amount = FALSE; + if(autocvar_g_balance_rocketlauncher_reload_ammo) + { + if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo && self.weapon_load[WEP_ROCKET_LAUNCHER] < autocvar_g_balance_rocketlauncher_ammo) + ammo_amount = TRUE; + } + else if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) + ammo_amount = TRUE; + return !ammo_amount; } - return ammo_amount; } else if (req == WR_CHECKAMMO2) return FALSE; @@ -546,7 +477,7 @@ float w_rlauncher(float req) } else if (req == WR_RELOAD) { - W_RocketLauncher_Reload(); + W_Reload(autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo, autocvar_g_balance_rocketlauncher_reload_time, "weapons/reload.wav"); } return TRUE; }; @@ -560,22 +491,22 @@ float w_rlauncher(float req) org2 = w_org + w_backoff * 12; pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1); if(!w_issilent) - sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); } else if(req == WR_PRECACHE) { precache_sound("weapons/rocket_impact.wav"); } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "%s exploded"; + w_deathtypestring = _("%s exploded"); else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = "%s got too close to %s's rocket"; + w_deathtypestring = _("%s got too close to %s's rocket"); else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "%s almost dodged %s's rocket"; + w_deathtypestring = _("%s almost dodged %s's rocket"); else - w_deathtypestring = "%s ate %s's rocket"; + w_deathtypestring = _("%s ate %s's rocket"); } return TRUE; }