X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_grenadelauncher.qc;h=d5f6c5d6827f13f213330b5012a74bdbf2fd9344;hp=a6e4d0dc0fc1cad0013db7639dcca143359aaf2b;hb=dc6baa32c44fb1b81f88339d95674948d0d97c26;hpb=9fa4c0d887cfe9f1165c2407639f4cca2f62a2e1 diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index a6e4d0dc0..d5f6c5d68 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -1,7 +1,10 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(GRENADE_LAUNCHER, w_glauncher, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "gl", "grenadelauncher", "Mortar"); +REGISTER_WEAPON(GRENADE_LAUNCHER, w_glauncher, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "gl", "grenadelauncher", _("Mortar")) #else #ifdef SVQC +.float gl_detonate_later; +.float gl_bouncecnt; + void W_Grenade_Explode (void) { if(other.takedamage == DAMAGE_AIM) @@ -13,7 +16,11 @@ void W_Grenade_Explode (void) self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other); + + if(self.movetype == MOVETYPE_NONE) + self.velocity = self.oldvelocity; + + RadiusDamage (self, self.owner, autocvar_g_balance_grenadelauncher_primary_damage, autocvar_g_balance_grenadelauncher_primary_edgedamage, autocvar_g_balance_grenadelauncher_primary_radius, world, autocvar_g_balance_grenadelauncher_primary_force, self.projectiledeathtype, other); remove (self); } @@ -28,7 +35,11 @@ void W_Grenade_Explode2 (void) self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_force"), self.projectiledeathtype, other); + + if(self.movetype == MOVETYPE_NONE) + self.velocity = self.oldvelocity; + + RadiusDamage (self, self.owner, autocvar_g_balance_grenadelauncher_secondary_damage, autocvar_g_balance_grenadelauncher_secondary_edgedamage, autocvar_g_balance_grenadelauncher_secondary_radius, world, autocvar_g_balance_grenadelauncher_secondary_force, self.projectiledeathtype, other); remove (self); } @@ -44,55 +55,72 @@ void W_Grenade_Damage (entity inflictor, entity attacker, float damage, float de } } +void W_Grenade_Think1 (void) +{ + self.nextthink = time; + if (time > self.cnt) + { + other = world; + self.projectiledeathtype |= HITTYPE_BOUNCE; + W_Grenade_Explode (); + return; + } + if(self.gl_detonate_later && self.gl_bouncecnt >= autocvar_g_balance_grenadelauncher_primary_remote_minbouncecnt) + W_Grenade_Explode(); +} + void W_Grenade_Touch1 (void) { PROJECTILE_TOUCH; - if(cvar("g_balance_grenadelauncher_primary_sticky") && other.takedamage != DAMAGE_AIM) + if (other.takedamage == DAMAGE_AIM || autocvar_g_balance_grenadelauncher_primary_type == 0) // always explode when hitting a player, or if normal mortar projectile { - entity oldowner; - oldowner = self.owner; - - vector temporigin; - temporigin = self.origin; - - remove(self); - local entity gren; - - gren = spawn (); - gren.owner = oldowner; - gren.classname = "grenade"; - gren.bot_dodge = TRUE; - gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage"); - gren.movetype = MOVETYPE_NONE; - PROJECTILE_MAKETRIGGER(gren); - gren.projectiledeathtype = WEP_GRENADE_LAUNCHER; - setorigin(gren, temporigin); - setsize(gren, '0 0 -3', '0 0 -3'); - - gren.nextthink = time + cvar("g_balance_grenadelauncher_primary_lifetime2"); - gren.think = adaptor_think2use_hittype_splash; - gren.use = W_Grenade_Explode; + self.use (); + } + else if (autocvar_g_balance_grenadelauncher_primary_type == 1) // bounce + { + float r; + r = random() * 6; + if(r < 1) + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM); + else if(r < 2) + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM); + else if(r < 3) + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM); + else if(r < 4) + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM); + else if(r < 5) + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM); + else + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM); + self.projectiledeathtype |= HITTYPE_BOUNCE; + self.gl_bouncecnt += 1; + } + else if(autocvar_g_balance_grenadelauncher_primary_type == 2 && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) // stick + { + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM); - gren.flags = FL_PROJECTILE; + // let it stick whereever it is + self.oldvelocity = self.velocity; + self.velocity = '0 0 0'; + self.movetype = MOVETYPE_NONE; // also disables gravity + self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO + UpdateCSQCProjectile(self); - gren.takedamage = DAMAGE_YES; - gren.health = cvar("g_balance_grenadelauncher_primary_health"); - gren.event_damage = W_Grenade_Damage; + // do not respond to any more touches + self.solid = SOLID_NOT; - CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); + self.nextthink = min(self.nextthink, time + autocvar_g_balance_grenadelauncher_primary_lifetime2); } - else - W_Grenade_Explode (); } void W_Grenade_Touch2 (void) { PROJECTILE_TOUCH; - if (other.takedamage == DAMAGE_AIM) + if (other.takedamage == DAMAGE_AIM || autocvar_g_balance_grenadelauncher_secondary_type == 0) // always explode when hitting a player, or if normal mortar projectile { self.use (); } - else + else if (autocvar_g_balance_grenadelauncher_secondary_type == 1) // bounce { float r; r = random() * 6; @@ -109,6 +137,23 @@ void W_Grenade_Touch2 (void) else spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM); self.projectiledeathtype |= HITTYPE_BOUNCE; + self.gl_bouncecnt += 1; + } + else if(autocvar_g_balance_grenadelauncher_secondary_type == 2 && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) // stick + { + spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM); + + // let it stick whereever it is + self.oldvelocity = self.velocity; + self.velocity = '0 0 0'; + self.movetype = MOVETYPE_NONE; // also disables gravity + self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO + UpdateCSQCProjectile(self); + + // do not respond to any more touches + self.solid = SOLID_NOT; + + self.nextthink = min(self.nextthink, time + autocvar_g_balance_grenadelauncher_secondary_lifetime2); } } @@ -117,8 +162,8 @@ void W_Grenade_Attack (void) local entity gren; if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo"); - W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 4, "weapons/grenade_fire.wav", cvar("g_balance_grenadelauncher_primary_damage")); + self.ammo_rockets = self.ammo_rockets - autocvar_g_balance_grenadelauncher_primary_ammo; + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", CHAN_WEAPON, autocvar_g_balance_grenadelauncher_primary_damage); w_shotdir = v_forward; // no TrueAim for grenades please pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -127,23 +172,36 @@ void W_Grenade_Attack (void) gren.owner = self; gren.classname = "grenade"; gren.bot_dodge = TRUE; - gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage"); + gren.bot_dodgerating = autocvar_g_balance_grenadelauncher_primary_damage; gren.movetype = MOVETYPE_BOUNCE; + gren.bouncefactor = autocvar_g_balance_grenadelauncher_bouncefactor; + gren.bouncestop = autocvar_g_balance_grenadelauncher_bouncestop; PROJECTILE_MAKETRIGGER(gren); gren.projectiledeathtype = WEP_GRENADE_LAUNCHER; setorigin(gren, w_shotorg); - setsize(gren, '0 0 -3', '0 0 -3'); + setsize(gren, '-3 -3 -3', '3 3 3'); - gren.nextthink = time + cvar("g_balance_grenadelauncher_primary_lifetime"); - gren.think = adaptor_think2use_hittype_splash; + gren.cnt = time + autocvar_g_balance_grenadelauncher_primary_lifetime; + gren.nextthink = time; + gren.think = W_Grenade_Think1; gren.use = W_Grenade_Explode; gren.touch = W_Grenade_Touch1; + + gren.takedamage = DAMAGE_YES; + gren.health = autocvar_g_balance_grenadelauncher_primary_health; + gren.damageforcescale = autocvar_g_balance_grenadelauncher_primary_damageforcescale; + gren.event_damage = W_Grenade_Damage; W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_primary); gren.angles = vectoangles (gren.velocity); gren.flags = FL_PROJECTILE; - CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); + if(autocvar_g_balance_grenadelauncher_primary_type == 0 || autocvar_g_balance_grenadelauncher_primary_type == 2) + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); + else + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE); + + other = gren; MUTATOR_CALLHOOK(EditProjectile); } void W_Grenade_Attack2 (void) @@ -151,8 +209,8 @@ void W_Grenade_Attack2 (void) local entity gren; if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_secondary_ammo"); - W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 4, "weapons/grenade_fire.wav", cvar("g_balance_grenadelauncher_secondary_damage")); + self.ammo_rockets = self.ammo_rockets - autocvar_g_balance_grenadelauncher_secondary_ammo; + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", CHAN_WEAPON, autocvar_g_balance_grenadelauncher_secondary_damage); w_shotdir = v_forward; // no TrueAim for grenades please pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -161,29 +219,35 @@ void W_Grenade_Attack2 (void) gren.owner = self; gren.classname = "grenade"; gren.bot_dodge = TRUE; - gren.bot_dodgerating = cvar("g_balance_grenadelauncher_secondary_damage"); + gren.bot_dodgerating = autocvar_g_balance_grenadelauncher_secondary_damage; gren.movetype = MOVETYPE_BOUNCE; - gren.bouncefactor = cvar("g_balance_grenadelauncher_secondary_bouncefactor"); - gren.bouncestop = cvar("g_balance_grenadelauncher_secondary_bouncestop"); + gren.bouncefactor = autocvar_g_balance_grenadelauncher_bouncefactor; + gren.bouncestop = autocvar_g_balance_grenadelauncher_bouncestop; PROJECTILE_MAKETRIGGER(gren); gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY; - setsize(gren, '0 0 -3', '0 0 -3'); setorigin(gren, w_shotorg); + setsize(gren, '-3 -3 -3', '3 3 3'); - gren.nextthink = time + cvar("g_balance_grenadelauncher_secondary_lifetime"); + gren.nextthink = time + autocvar_g_balance_grenadelauncher_secondary_lifetime; gren.think = adaptor_think2use_hittype_splash; gren.use = W_Grenade_Explode2; gren.touch = W_Grenade_Touch2; + gren.takedamage = DAMAGE_YES; - gren.health = cvar("g_balance_grenadelauncher_secondary_health"); - gren.damageforcescale = cvar("g_balance_grenadelauncher_secondary_damageforcescale"); + gren.health = autocvar_g_balance_grenadelauncher_secondary_health; + gren.damageforcescale = autocvar_g_balance_grenadelauncher_secondary_damageforcescale; gren.event_damage = W_Grenade_Damage; W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_secondary); gren.angles = vectoangles (gren.velocity); gren.flags = FL_PROJECTILE; - CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE); + if(autocvar_g_balance_grenadelauncher_secondary_type == 0 || autocvar_g_balance_grenadelauncher_secondary_type == 2) + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); + else + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE); + + other = gren; MUTATOR_CALLHOOK(EditProjectile); } void spawnfunc_weapon_grenadelauncher (void) @@ -194,13 +258,16 @@ void spawnfunc_weapon_grenadelauncher (void) .float bot_secondary_grenademooth; float w_glauncher(float req) { + entity nade; + float nadefound; + if (req == WR_AIM) { self.BUTTON_ATCK = FALSE; self.BUTTON_ATCK2 = FALSE; if (self.bot_secondary_grenademooth == 0) { - if(bot_aim(cvar("g_balance_grenadelauncher_primary_speed"), cvar("g_balance_grenadelauncher_primary_speed_up"), cvar("g_balance_grenadelauncher_primary_lifetime"), TRUE)) + if(bot_aim(autocvar_g_balance_grenadelauncher_primary_speed, autocvar_g_balance_grenadelauncher_primary_speed_up, autocvar_g_balance_grenadelauncher_primary_lifetime, TRUE)) { self.BUTTON_ATCK = TRUE; if(random() < 0.01) self.bot_secondary_grenademooth = 1; @@ -208,7 +275,7 @@ float w_glauncher(float req) } else { - if(bot_aim(cvar("g_balance_grenadelauncher_secondary_speed"), cvar("g_balance_grenadelauncher_secondary_speed_up"), cvar("g_balance_grenadelauncher_secondary_lifetime"), TRUE)) + if(bot_aim(autocvar_g_balance_grenadelauncher_secondary_speed, autocvar_g_balance_grenadelauncher_secondary_speed_up, autocvar_g_balance_grenadelauncher_secondary_lifetime, TRUE)) { self.BUTTON_ATCK2 = TRUE; if(random() < 0.02) self.bot_secondary_grenademooth = 0; @@ -218,19 +285,32 @@ float w_glauncher(float req) else if (req == WR_THINK) { if (self.BUTTON_ATCK) - if (weapon_prepareattack(0, cvar("g_balance_grenadelauncher_primary_refire"))) + if (weapon_prepareattack(0, autocvar_g_balance_grenadelauncher_primary_refire)) { - if(cvar("g_balance_grenadelauncher_primary2secondary")) - W_Grenade_Attack2(); - else - W_Grenade_Attack(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grenadelauncher_primary_animtime"), w_ready); + W_Grenade_Attack(); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_grenadelauncher_primary_animtime, w_ready); } - if (self.BUTTON_ATCK2 && !cvar("g_balance_grenadelauncher_primary2secondary")) - if (weapon_prepareattack(1, cvar("g_balance_grenadelauncher_secondary_refire"))) + if (self.BUTTON_ATCK2) { - W_Grenade_Attack2(); - weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grenadelauncher_secondary_animtime"), w_ready); + if (cvar("g_balance_grenadelauncher_secondary_remote_detonateprimary")) + { + nadefound = 0; + for(nade = world; (nade = find(nade, classname, "grenade")); ) if(nade.owner == self) + { + if(!nade.gl_detonate_later) + { + nade.gl_detonate_later = TRUE; + nadefound = 1; + } + } + if(nadefound) + sound (self, CHAN_WEAPON2, "weapons/rocket_det.wav", VOL_BASE, ATTN_NORM); + } + else if (weapon_prepareattack(1, autocvar_g_balance_grenadelauncher_secondary_refire)) + { + W_Grenade_Attack2(); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_grenadelauncher_secondary_animtime, w_ready); + } } } else if (req == WR_PRECACHE) @@ -244,14 +324,15 @@ float w_glauncher(float req) precache_sound ("weapons/grenade_bounce4.wav"); precache_sound ("weapons/grenade_bounce5.wav"); precache_sound ("weapons/grenade_bounce6.wav"); + precache_sound ("weapons/grenade_stick.wav"); precache_sound ("weapons/grenade_fire.wav"); } else if (req == WR_SETUP) weapon_setup(WEP_GRENADE_LAUNCHER); else if (req == WR_CHECKAMMO1) - return self.ammo_rockets >= cvar("g_balance_grenadelauncher_primary_ammo"); + return self.ammo_rockets >= autocvar_g_balance_grenadelauncher_primary_ammo; else if (req == WR_CHECKAMMO2) - return self.ammo_rockets >= cvar("g_balance_grenadelauncher_secondary_ammo"); + return self.ammo_rockets >= autocvar_g_balance_grenadelauncher_secondary_ammo; return TRUE; }; #endif @@ -273,19 +354,19 @@ float w_glauncher(float req) else if (req == WR_SUICIDEMESSAGE) { if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "tried out his own grenade"; + w_deathtypestring = _("%s tried out his own grenade"); else - w_deathtypestring = "detonated"; + w_deathtypestring = _("%s detonated"); } else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_SPLASH) if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then) - w_deathtypestring = "didn't see #'s grenade"; + w_deathtypestring = _("%s didn't see %s's grenade"); else // unchecked: SECONDARY - w_deathtypestring = "almost dodged #'s grenade"; + w_deathtypestring = _("%s almost dodged %s's grenade"); else // unchecked: SECONDARY, BOUNCE - w_deathtypestring = "ate #'s grenade"; + w_deathtypestring = _("%s ate %s's grenade"); } return TRUE; }