From c9c48cedbcd8b0b1c9b34d09a64d455ce3ccce24 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 3 Oct 2010 14:31:56 +0300 Subject: [PATCH] grenadelauncher remote detonation test --- balance25.cfg | 11 ++- balanceLeeStricklin.cfg | 11 ++- balanceNexSVN.cfg | 10 ++- balanceSamual.cfg | 11 ++- balanceXonotic.cfg | 11 ++- qcsrc/server/w_grenadelauncher.qc | 136 ++++++++++++++++++++++-------- qcsrc/server/w_nex.qc | 2 +- 7 files changed, 139 insertions(+), 53 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 09abd6bc6..6287460ca 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -268,8 +268,7 @@ set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu // }}} // {{{ mortar -set g_balance_grenadelauncher_primary2secondary 0 -set g_balance_grenadelauncher_primary_sticky 0 +set g_balance_grenadelauncher_primary_type 0 set g_balance_grenadelauncher_primary_damage 70 set g_balance_grenadelauncher_primary_edgedamage 38 set g_balance_grenadelauncher_primary_force 400 @@ -284,7 +283,12 @@ set g_balance_grenadelauncher_primary_refire 0.8 set g_balance_grenadelauncher_primary_animtime 0.3 set g_balance_grenadelauncher_primary_ammo 2 set g_balance_grenadelauncher_primary_health 25 -set g_balance_grenadelauncher_secondary_sticky 0 +set g_balance_grenadelauncher_primary_damageforcescale 4 +set g_balance_grenadelauncher_primary_bouncefactor 0.5 +set g_balance_grenadelauncher_primary_bouncestop 0.075 +set g_balance_grenadelauncher_primary_remote_minbouncecnt 0 + +set g_balance_grenadelauncher_secondary_type 1 set g_balance_grenadelauncher_secondary_damage 70 set g_balance_grenadelauncher_secondary_edgedamage 38 set g_balance_grenadelauncher_secondary_force 400 @@ -302,6 +306,7 @@ set g_balance_grenadelauncher_secondary_health 10 set g_balance_grenadelauncher_secondary_damageforcescale 4 set g_balance_grenadelauncher_secondary_bouncefactor 0.5 set g_balance_grenadelauncher_secondary_bouncestop 0.075 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 // }}} // {{{ electro set g_balance_electro_lightning 0 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 7799e510c..c1ff93612 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -279,8 +279,7 @@ set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 300 // 13.1qu // }}} // {{{ mortar -set g_balance_grenadelauncher_primary2secondary 0 -set g_balance_grenadelauncher_primary_sticky 0 +set g_balance_grenadelauncher_primary_type 0 set g_balance_grenadelauncher_primary_damage 65 set g_balance_grenadelauncher_primary_edgedamage 35 set g_balance_grenadelauncher_primary_force 400 @@ -295,7 +294,12 @@ set g_balance_grenadelauncher_primary_refire 0.7 set g_balance_grenadelauncher_primary_animtime 0.3 set g_balance_grenadelauncher_primary_ammo 2 set g_balance_grenadelauncher_primary_health 72 -set g_balance_grenadelauncher_secondary_sticky 0 +set g_balance_grenadelauncher_primary_damageforcescale 0 +set g_balance_grenadelauncher_primary_bouncefactor 0.7 +set g_balance_grenadelauncher_primary_bouncestop 0.12 +set g_balance_grenadelauncher_primary_remote_minbouncecnt 0 + +set g_balance_grenadelauncher_secondary_type 1 set g_balance_grenadelauncher_secondary_damage 65 set g_balance_grenadelauncher_secondary_edgedamage 35 set g_balance_grenadelauncher_secondary_force 400 @@ -313,6 +317,7 @@ set g_balance_grenadelauncher_secondary_health 40 set g_balance_grenadelauncher_secondary_damageforcescale 0 set g_balance_grenadelauncher_secondary_bouncefactor 0.7 set g_balance_grenadelauncher_secondary_bouncestop 0.12 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 // }}} // {{{ electro set g_balance_electro_lightning 0 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index 792485c14..36615d790 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -268,8 +268,7 @@ set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu // }}} // {{{ mortar -set g_balance_grenadelauncher_primary2secondary 0 -set g_balance_grenadelauncher_primary_sticky 0 +set g_balance_grenadelauncher_primary_type 0 set g_balance_grenadelauncher_primary_damage 70 set g_balance_grenadelauncher_primary_edgedamage 38 set g_balance_grenadelauncher_primary_force 400 @@ -284,7 +283,11 @@ set g_balance_grenadelauncher_primary_refire 0.8 set g_balance_grenadelauncher_primary_animtime 0.3 set g_balance_grenadelauncher_primary_ammo 2 set g_balance_grenadelauncher_primary_health 25 -set g_balance_grenadelauncher_secondary_sticky 0 +set g_balance_grenadelauncher_primary_damageforcescale 4 +set g_balance_grenadelauncher_primary_bouncefactor 0.5 +set g_balance_grenadelauncher_primary_bouncestop 0.075 +set g_balance_grenadelauncher_primary_remote_minbouncecnt 0 +set g_balance_grenadelauncher_secondary_type 1 set g_balance_grenadelauncher_secondary_damage 70 set g_balance_grenadelauncher_secondary_edgedamage 38 set g_balance_grenadelauncher_secondary_force 400 @@ -302,6 +305,7 @@ set g_balance_grenadelauncher_secondary_health 10 set g_balance_grenadelauncher_secondary_damageforcescale 4 set g_balance_grenadelauncher_secondary_bouncefactor 0.5 set g_balance_grenadelauncher_secondary_bouncestop 0.075 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 // }}} // {{{ electro set g_balance_electro_lightning 0 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 486896142..aeed47e89 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -268,8 +268,7 @@ set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu // }}} // {{{ mortar -set g_balance_grenadelauncher_primary2secondary 0 -set g_balance_grenadelauncher_primary_sticky 0 +set g_balance_grenadelauncher_primary_type 0 set g_balance_grenadelauncher_primary_damage 50 set g_balance_grenadelauncher_primary_edgedamage 38 set g_balance_grenadelauncher_primary_force 400 @@ -284,7 +283,12 @@ set g_balance_grenadelauncher_primary_refire 0.8 set g_balance_grenadelauncher_primary_animtime 0.3 set g_balance_grenadelauncher_primary_ammo 2 set g_balance_grenadelauncher_primary_health 25 -set g_balance_grenadelauncher_secondary_sticky 0 +set g_balance_grenadelauncher_primary_damageforcescale 4 +set g_balance_grenadelauncher_primary_bouncefactor 0.5 +set g_balance_grenadelauncher_primary_bouncestop 0.075 +set g_balance_grenadelauncher_primary_remote_minbouncecnt 0 + +set g_balance_grenadelauncher_secondary_type 1 set g_balance_grenadelauncher_secondary_damage 60 set g_balance_grenadelauncher_secondary_edgedamage 38 set g_balance_grenadelauncher_secondary_force 400 @@ -302,6 +306,7 @@ set g_balance_grenadelauncher_secondary_health 70 set g_balance_grenadelauncher_secondary_damageforcescale 4 set g_balance_grenadelauncher_secondary_bouncefactor 0.5 set g_balance_grenadelauncher_secondary_bouncestop 0.075 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 1 // }}} // {{{ electro set g_balance_electro_lightning 0 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index bc931daa2..9168f9d2d 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -268,8 +268,7 @@ set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu // }}} // {{{ mortar // TODO -set g_balance_grenadelauncher_primary2secondary 0 -set g_balance_grenadelauncher_primary_sticky 0 +set g_balance_grenadelauncher_primary_type 1 set g_balance_grenadelauncher_primary_damage 60 set g_balance_grenadelauncher_primary_edgedamage 25 set g_balance_grenadelauncher_primary_force 300 @@ -284,7 +283,12 @@ set g_balance_grenadelauncher_primary_refire 0.8 set g_balance_grenadelauncher_primary_animtime 0.4 set g_balance_grenadelauncher_primary_ammo 2 set g_balance_grenadelauncher_primary_health 72 -set g_balance_grenadelauncher_secondary_sticky 1 +set g_balance_grenadelauncher_primary_damageforcescale 0 +set g_balance_grenadelauncher_primary_bouncefactor 0.7 +set g_balance_grenadelauncher_primary_bouncestop 0.12 +set g_balance_grenadelauncher_primary_remote_minbouncecnt 1 + +set g_balance_grenadelauncher_secondary_type 0 set g_balance_grenadelauncher_secondary_damage 90 set g_balance_grenadelauncher_secondary_edgedamage 32 set g_balance_grenadelauncher_secondary_force 300 @@ -302,6 +306,7 @@ set g_balance_grenadelauncher_secondary_health 40 set g_balance_grenadelauncher_secondary_damageforcescale 0 set g_balance_grenadelauncher_secondary_bouncefactor 0.7 set g_balance_grenadelauncher_secondary_bouncestop 0.12 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 1 // }}} // {{{ electro // TODO set g_balance_electro_lightning 1 diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 84b98b525..a5e6efa0a 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -2,6 +2,9 @@ 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) @@ -52,10 +55,47 @@ 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 >= cvar("g_balance_grenadelauncher_primary_remote_minbouncecnt")) + W_Grenade_Explode(); +} + void W_Grenade_Touch1 (void) { PROJECTILE_TOUCH; - if(cvar("g_balance_grenadelauncher_primary_sticky") && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) + if (other.takedamage == DAMAGE_AIM || cvar("g_balance_grenadelauncher_primary_type") == 0) // always explode when hitting a player, or if normal mortar projectile + { + self.use (); + } + else if (cvar("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(cvar("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); @@ -71,14 +111,35 @@ void W_Grenade_Touch1 (void) self.nextthink = min(self.nextthink, time + cvar("g_balance_grenadelauncher_primary_lifetime2")); } - else - W_Grenade_Explode (); } void W_Grenade_Touch2 (void) { PROJECTILE_TOUCH; - if(cvar("g_balance_grenadelauncher_secondary_sticky") && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) + if (other.takedamage == DAMAGE_AIM || cvar("g_balance_grenadelauncher_secondary_type") == 0) // always explode when hitting a player, or if normal mortar projectile + { + self.use (); + } + else if (cvar("g_balance_grenadelauncher_secondary_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(cvar("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); @@ -94,31 +155,6 @@ void W_Grenade_Touch2 (void) self.nextthink = min(self.nextthink, time + cvar("g_balance_grenadelauncher_secondary_lifetime2")); } - else - { - if (cvar("g_balance_grenadelauncher_secondary_sticky") || other.takedamage == DAMAGE_AIM) - { - self.use (); - } - else - { - 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; - } - } } void W_Grenade_Attack (void) @@ -138,25 +174,32 @@ void W_Grenade_Attack (void) gren.bot_dodge = TRUE; gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage"); gren.movetype = MOVETYPE_BOUNCE; + gren.bouncefactor = cvar("g_balance_grenadelauncher_primary_bouncefactor"); + gren.bouncestop = cvar("g_balance_grenadelauncher_primary_bouncestop"); PROJECTILE_MAKETRIGGER(gren); gren.projectiledeathtype = WEP_GRENADE_LAUNCHER; setorigin(gren, w_shotorg); 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 + cvar("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 = cvar("g_balance_grenadelauncher_primary_health"); + gren.damageforcescale = cvar("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(cvar("g_balance_grenadelauncher_secondary_type") == 0 || cvar("g_balance_grenadelauncher_secondary_type") == 2) + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); + else + CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE); } void W_Grenade_Attack2 (void) @@ -197,7 +240,7 @@ void W_Grenade_Attack2 (void) gren.angles = vectoangles (gren.velocity); gren.flags = FL_PROJECTILE; - if(cvar("g_balance_grenadelauncher_secondary_sticky")) + if(cvar("g_balance_grenadelauncher_secondary_type") == 0 || cvar("g_balance_grenadelauncher_secondary_type") == 2) CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE); else CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE); @@ -211,6 +254,9 @@ 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; @@ -243,11 +289,27 @@ float w_glauncher(float req) W_Grenade_Attack(); weapon_thinkf(WFRAME_FIRE1, cvar("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, cvar("g_balance_grenadelauncher_secondary_refire"))) + { + W_Grenade_Attack2(); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grenadelauncher_secondary_animtime"), w_ready); + } } } else if (req == WR_PRECACHE) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 8bce2ebc4..d1ba02273 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -43,7 +43,7 @@ void W_Nex_Attack (float issecondary) float flying; flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last - f = ExponentiaFalloff(cvar("g_balance_nex_velocitydependent_minspeed"), cvar("g_balance_nex_velocitydependent_maxspeed"), cvar("g_balance_nex_velocitydependent_halflife"), vlen(self.velocity)); + f = ExponentialFalloff(cvar("g_balance_nex_velocitydependent_minspeed"), cvar("g_balance_nex_velocitydependent_maxspeed"), cvar("g_balance_nex_velocitydependent_halflife"), vlen(self.velocity)); // TODO: make it more obvious (through effects, indicator on weapon) that damage increases when speed increases mydmg *= f; -- 2.39.2