X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fw_hlac.qc;h=e3d3cb991883e1f209cb666712a89a3110f3693e;hb=3188aedc78fc6c0f613adbfe8f1297ef5cb6a730;hp=ecd30d76911d0b8f016eada99910014eb7cf9d31;hpb=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index ecd30d769..e3d3cb991 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -1,6 +1,7 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hlac", "hlac", "Heavy Laser Assault Cannon"); #else +#ifdef SVQC .float HLAC_bulletcounter; void W_HLAC_Touch (void) { @@ -8,7 +9,7 @@ void W_HLAC_Touch (void) self.event_damage = SUB_Null; - RadiusDamage (self, self.owner, cvar("g_balance_hlac_primary_damage"), cvar("g_balance_hlac_primary_edgedamage"), cvar("g_balance_hlac_primary_radius"), world, cvar("g_balance_hlac_primary_force"), self.projectiledeathtype, other); + RadiusDamage (self, self.owner, autocvar_g_balance_hlac_primary_damage, autocvar_g_balance_hlac_primary_edgedamage, autocvar_g_balance_hlac_primary_radius, world, autocvar_g_balance_hlac_primary_force, self.projectiledeathtype, other); remove (self); } @@ -19,7 +20,7 @@ void W_HLAC_Touch2 (void) self.event_damage = SUB_Null; - RadiusDamage (self, self.owner, cvar("g_balance_hlac_secondary_damage"), cvar("g_balance_hlac_secondary_edgedamage"), cvar("g_balance_hlac_secondary_radius"), world, cvar("g_balance_hlac_secondary_force"), self.projectiledeathtype, other); + RadiusDamage (self, self.owner, autocvar_g_balance_hlac_secondary_damage, autocvar_g_balance_hlac_secondary_edgedamage, autocvar_g_balance_hlac_secondary_radius, world, autocvar_g_balance_hlac_secondary_force, self.projectiledeathtype, other); remove (self); } @@ -31,15 +32,15 @@ void W_HLAC_Attack (void) if not(self.items & IT_UNLIMITED_WEAPON_AMMO) { - self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_primary_ammo"); + self.ammo_cells = self.ammo_cells - autocvar_g_balance_hlac_primary_ammo; } - spread = cvar("g_balance_hlac_primary_spread_min") + (cvar("g_balance_hlac_primary_spread_add") * self.HLAC_bulletcounter); - spread = min(spread,cvar("g_balance_hlac_primary_spread_max")); + spread = autocvar_g_balance_hlac_primary_spread_min + (autocvar_g_balance_hlac_primary_spread_add * self.HLAC_bulletcounter); + spread = min(spread,autocvar_g_balance_hlac_primary_spread_max); if(self.crouch) - spread = spread * cvar("g_balance_hlac_primary_spread_crouchmod"); + spread = spread * autocvar_g_balance_hlac_primary_spread_crouchmod; - W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", cvar("g_balance_hlac_primary_damage")); + W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CHAN_WEAPON, autocvar_g_balance_hlac_primary_damage); pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); if (!g_norecoil) { @@ -53,7 +54,7 @@ void W_HLAC_Attack (void) // missile.dmg = issecondary; missile.bot_dodge = TRUE; - missile.bot_dodgerating = cvar("g_balance_hlac_primary_damage"); + missile.bot_dodgerating = autocvar_g_balance_hlac_primary_damage; missile.movetype = MOVETYPE_FLY; PROJECTILE_MAKETRIGGER(missile); @@ -61,18 +62,20 @@ void W_HLAC_Attack (void) setorigin (missile, w_shotorg); setsize(missile, '0 0 0', '0 0 0'); - W_SetupProjectileVelocity(missile, cvar("g_balance_hlac_primary_speed"), spread); + W_SetupProjectileVelocity(missile, autocvar_g_balance_hlac_primary_speed, spread); missile.angles = vectoangles (missile.velocity); missile.touch = W_HLAC_Touch; missile.think = SUB_Remove; - missile.nextthink = time + cvar("g_balance_hlac_primary_lifetime"); + missile.nextthink = time + autocvar_g_balance_hlac_primary_lifetime; missile.flags = FL_PROJECTILE; missile.projectiledeathtype = WEP_HLAC; CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void W_HLAC_Attack2f (void) @@ -80,13 +83,13 @@ void W_HLAC_Attack2f (void) local entity missile; float spread; - spread = cvar("g_balance_hlac_secondary_spread"); + spread = autocvar_g_balance_hlac_secondary_spread; if(self.crouch) - spread = spread * cvar("g_balance_hlac_secondary_spread_crouchmod"); + spread = spread * autocvar_g_balance_hlac_secondary_spread_crouchmod; - W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", cvar("g_balance_hlac_secondary_damage")); + W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CHAN_WEAPON, autocvar_g_balance_hlac_secondary_damage); pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); missile = spawn (); @@ -95,7 +98,7 @@ void W_HLAC_Attack2f (void) // missile.dmg = issecondary; missile.bot_dodge = TRUE; - missile.bot_dodgerating = cvar("g_balance_hlac_secondary_damage"); + missile.bot_dodgerating = autocvar_g_balance_hlac_secondary_damage; missile.movetype = MOVETYPE_FLY; PROJECTILE_MAKETRIGGER(missile); @@ -103,18 +106,20 @@ void W_HLAC_Attack2f (void) setorigin (missile, w_shotorg); setsize(missile, '0 0 0', '0 0 0'); - W_SetupProjectileVelocity(missile, cvar("g_balance_hlac_secondary_speed"), spread); + W_SetupProjectileVelocity(missile, autocvar_g_balance_hlac_secondary_speed, spread); missile.angles = vectoangles (missile.velocity); missile.touch = W_HLAC_Touch2; missile.think = SUB_Remove; - missile.nextthink = time + cvar("g_balance_hlac_secondary_lifetime"); + missile.nextthink = time + autocvar_g_balance_hlac_secondary_lifetime; missile.flags = FL_PROJECTILE; missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY; CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void W_HLAC_Attack2 (void) @@ -123,10 +128,10 @@ void W_HLAC_Attack2 (void) if not(self.items & IT_UNLIMITED_WEAPON_AMMO) { - self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_secondary_ammo"); + self.ammo_cells = self.ammo_cells - autocvar_g_balance_hlac_secondary_ammo; } - for(i=cvar("g_balance_hlac_secondary_shots");i>0;--i) + for(i=autocvar_g_balance_hlac_secondary_shots;i>0;--i) W_HLAC_Attack2f(); if (!g_norecoil) @@ -154,14 +159,14 @@ void HLAC_fire1_02() return; } - ATTACK_FINISHED(self) = time + cvar("g_balance_hlac_primary_refire") * W_WeaponRateFactor(); + ATTACK_FINISHED(self) = time + autocvar_g_balance_hlac_primary_refire * W_WeaponRateFactor(); W_HLAC_Attack(); self.HLAC_bulletcounter = self.HLAC_bulletcounter + 1; - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_refire, HLAC_fire1_02); } else { - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_animtime, w_ready); } }; @@ -173,22 +178,22 @@ void spawnfunc_weapon_hlac (void) float w_hlac(float req) { if (req == WR_AIM) - self.BUTTON_ATCK = bot_aim(cvar("g_balance_hlac_primary_speed"), 0, cvar("g_balance_hlac_primary_lifetime"), FALSE); + self.BUTTON_ATCK = bot_aim(autocvar_g_balance_hlac_primary_speed, 0, autocvar_g_balance_hlac_primary_lifetime, FALSE); else if (req == WR_THINK) { if (self.BUTTON_ATCK) - if (weapon_prepareattack(0, cvar("g_balance_hlac_primary_refire"))) + if (weapon_prepareattack(0, autocvar_g_balance_hlac_primary_refire)) { self.HLAC_bulletcounter = 0; W_HLAC_Attack(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_refire, HLAC_fire1_02); } - if (self.BUTTON_ATCK2 && cvar("g_balance_hlac_secondary")) - if (weapon_prepareattack(1, cvar("g_balance_hlac_secondary_refire"))) + if (self.BUTTON_ATCK2 && autocvar_g_balance_hlac_secondary) + if (weapon_prepareattack(1, autocvar_g_balance_hlac_secondary_refire)) { W_HLAC_Attack2(); - weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hlac_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hlac_secondary_animtime, w_ready); } } @@ -203,13 +208,32 @@ float w_hlac(float req) else if (req == WR_SETUP) weapon_setup(WEP_HLAC); else if (req == WR_CHECKAMMO1) - return self.ammo_cells >= cvar("g_balance_hlac_primary_ammo"); + return self.ammo_cells >= autocvar_g_balance_hlac_primary_ammo; else if (req == WR_CHECKAMMO2) - return self.ammo_cells >= cvar("g_balance_hlac_secondary_ammo"); + return self.ammo_cells >= autocvar_g_balance_hlac_secondary_ammo; + return TRUE; +}; +#endif +#ifdef CSQC +float w_hlac(float req) +{ + if(req == WR_IMPACTEFFECT) + { + vector org2; + org2 = w_org + w_backoff * 6; + pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1); + if(!w_issilent) + sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); + } + else if(req == WR_PRECACHE) + { + precache_sound("weapons/laserimpact.wav"); + } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "should have used a smaller gun"; + w_deathtypestring = "%s should have used a smaller gun"; else if (req == WR_KILLMESSAGE) - w_deathtypestring = "was cut down by"; + w_deathtypestring = "%s was cut down by %s"; return TRUE; -}; +} +#endif #endif