X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=dd83df6b4fb49339e95f085b8e70f6a5d4d40d12;hb=2edeb8354bb93aae319d75077a44c0fd0b4f6ca2;hp=bf83fed40d9116d34ef24f1f8d385c286b6a4539;hpb=dc0822c46acae059e6469278e5f801b9fe5e5ffb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index bf83fed40..dd83df6b4 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -1,39 +1,34 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex")) +REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex")) #else #ifdef SVQC .float minstanex_lasthit; +.float jump_interval; void W_MinstaNex_Attack (void) { float flying; flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last - W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CHAN_WEAPON, 10000); + W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CH_WEAPON_A, 10000); yoda = 0; damage_goodhits = 0; headshot = 0; + damage_headshotbonus = -1; // no extra damage, just count FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_MINSTANEX); + damage_headshotbonus = 0; - if(g_minstagib) + if(yoda && flying) + AnnounceTo(self, "yoda"); + if(headshot) { - if(yoda) - AnnounceTo(self, "yoda"); + AnnounceTo(self, "headshot"); } - else + if(damage_goodhits && self.minstanex_lasthit) { - if(yoda && flying) - AnnounceTo(self, "yoda"); - if(headshot) - { - AnnounceTo(self, "headshot"); - } - if(damage_goodhits && self.minstanex_lasthit) - { - if(AnnounceTo(self, "impressive")) - damage_goodhits = 0; // only every second time - } + if(AnnounceTo(self, "impressive")) + damage_goodhits = 0; // only every second time } self.minstanex_lasthit = damage_goodhits; @@ -75,96 +70,8 @@ void W_MinstaNex_Attack (void) } else WarpZone_TrailParticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, v); - - // flash and burn the wall - if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)) - Damage_DamageInfo(trace_endpos, 10000, 0, 0, 800 * w_shotdir, WEP_MINSTANEX, self); - - if (g_minstagib) - W_DecreaseAmmo(ammo_cells, 1, autocvar_g_balance_minstanex_reload_ammo); - else - W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo); -} - - -.float minstagib_nextthink; -void minstagib_ammocheck (void) -{ - if (time < self.minstagib_nextthink || self.deadflag || gameover) - return; - - if (self.ammo_cells <= 0) - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - { - if (self.health == 5) - { - centerprint(self, "you're dead now...\n"); - Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "terminated"); - } - else if (self.health == 10) - { - centerprint(self, "^11^7 second left to find some ammo\n"); - Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "1"); - } - else if (self.health == 20) - { - centerprint(self, "^12^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "2"); - } - else if (self.health == 30) - { - centerprint(self, "^13^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "3"); - } - else if (self.health == 40) - { - centerprint(self, "^14^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "4"); - } - else if (self.health == 50) - { - centerprint(self, "^15^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "5"); - } - else if (self.health == 60) - { - centerprint(self, "^36^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "6"); - } - else if (self.health == 70) - { - centerprint(self, "^37^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "7"); - } - else if (self.health == 80) - { - centerprint(self, "^38^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "8"); - } - else if (self.health == 90) - { - centerprint(self, "^39^7 seconds left to find some ammo\n"); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - AnnounceTo(self, "9"); - } - else if (self.health == 100) - { - centerprint(self, "get some ammo or\nyou'll be dead in ^310^7 seconds..."); - Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); - if not(self.flags & FL_GODMODE) - AnnounceTo(self, "10"); - } - } - self.minstagib_nextthink = time + 1; + + W_DecreaseAmmo(ammo_cells, ((g_minstagib) ? 1 : autocvar_g_balance_minstanex_ammo), autocvar_g_balance_minstanex_reload_ammo); } void spawnfunc_weapon_minstanex (void); // defined in t_items.qc @@ -175,10 +82,7 @@ float w_minstanex(float req) float minstanex_ammo; // now multiple WR_s use this - if(g_minstagib) - minstanex_ammo = 1; - else - minstanex_ammo = autocvar_g_balance_minstanex_ammo; + minstanex_ammo = ((g_minstagib) ? 1 : autocvar_g_balance_minstanex_ammo); if (req == WR_AIM) { @@ -205,9 +109,11 @@ float w_minstanex(float req) else if (self.BUTTON_ATCK2) { if (self.jump_interval <= time) + if (weapon_prepareattack(1, -1)) { - self.jump_interval = time + autocvar_g_balance_laser_primary_refire * W_WeaponRateFactor(); - + // handle refire manually, so that primary and secondary can be fired without conflictions (important for minstagib) + self.jump_interval = time + autocvar_g_balance_minstanex_laser_refire * W_WeaponRateFactor(); + // decrease ammo for the laser? if(autocvar_g_balance_minstanex_laser_ammo) W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo); @@ -218,6 +124,9 @@ float w_minstanex(float req) self.weapon = WEP_LASER; W_Laser_Attack(2); self.weapon = w; + + // now do normal refire + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_minstanex_laser_animtime, w_ready); } } } @@ -243,7 +152,7 @@ float w_minstanex(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= minstanex_ammo; - ammo_amount += self.weapon_load[WEP_MINSTANEX] >= minstanex_ammo; + ammo_amount += self.(weapon_load[WEP_MINSTANEX]) >= minstanex_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) @@ -251,7 +160,7 @@ float w_minstanex(float req) if(!autocvar_g_balance_minstanex_laser_ammo) return TRUE; ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo; - ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_laser_ammo; + ammo_amount += self.(weapon_load[WEP_MINSTANEX]) >= autocvar_g_balance_minstanex_laser_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) @@ -269,7 +178,7 @@ float w_minstanex(float req) W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_minstanex(float req) @@ -280,7 +189,7 @@ float w_minstanex(float req) org2 = w_org + w_backoff * 6; pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1); if(!w_issilent) - sound(self, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM); } else if(req == WR_PRECACHE) { @@ -289,7 +198,7 @@ float w_minstanex(float req) else if (req == WR_SUICIDEMESSAGE) w_deathtypestring = _("%s is now thinking with portals"); else if (req == WR_KILLMESSAGE) - w_deathtypestring = _("%s has been vaporized by %s"); + w_deathtypestring = _("%s has been vaporized by %s's minstanex"); return TRUE; } #endif