X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_nades.qc;h=40f4f7247db6fb284d272732724c71e0aff6e0d5;hb=17f8cdecf39482eca4a49623d67bfdb5f4477d29;hp=41dc285d233d95200f06f1cde96abd0f58281158;hpb=99facb38338832f539cec7022c414f7a6de458c3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc index 41dc285d2..40f4f7247 100644 --- a/qcsrc/server/mutators/mutator_nades.qc +++ b/qcsrc/server/mutators/mutator_nades.qc @@ -1,3 +1,16 @@ +#include "mutator_nades.qh" +#include "../_all.qh" + +#include "mutator.qh" + +#include "gamemode_keyhunt.qh" +#include "gamemode_freezetag.qh" +#include "../../common/nades.qh" +#include "../../common/monsters/spawn.qh" +#include "../../common/monsters/sv_monsters.qh" + +.float lifetime; + .entity nade_spawnloc; void nade_timer_think() @@ -10,7 +23,7 @@ void nade_timer_think() void nade_burn_spawn(entity _nade) { - CSQCProjectile(_nade, true, Nade_ProjectileFromID(_nade.nade_type, true), true); + CSQCProjectile(_nade, true, NADES[_nade.nade_type].m_projectile[true], true); } void nade_spawn(entity _nade) @@ -29,7 +42,7 @@ void nade_spawn(entity _nade) _nade.effects |= EF_LOWPRECISION; - CSQCProjectile(_nade, true, Nade_ProjectileFromID(_nade.nade_type, false), true); + CSQCProjectile(_nade, true, NADES[_nade.nade_type].m_projectile[false], true); } void napalm_damage(float dist, float damage, float edgedamage, float burntime) @@ -219,7 +232,7 @@ void nade_ice_freeze(entity freezefield, entity frost_target, float freeze_time) else { DropBall(frost_target.ballcarried, frost_target.origin, frost_target.velocity);} if(frost_target.flagcarried) { ctf_Handle_Throw(frost_target, world, DROP_THROW); } if(frost_target.nade) { toss_nade(frost_target, '0 0 0', time + 0.05); } - + kh_Key_DropAll(frost_target, false); } @@ -347,13 +360,9 @@ void nade_translocate_boom() makevectors(self.realowner.angles); - entity oldself = self; - self = self.realowner; - MUTATOR_CALLHOOK(PortalTeleport); - self.realowner = self; - self = oldself; + MUTATOR_CALLHOOK(PortalTeleport, self.realowner); - TeleportPlayer(self, self.realowner, locout, self.realowner.mangle, v_forward * vlen(self.realowner.velocity), '0 0 0', '0 0 0', TELEPORT_FLAGS_TELEPORTER); + TeleportPlayer(self, self.realowner, locout, self.realowner.angles, v_forward * vlen(self.realowner.velocity), '0 0 0', '0 0 0', TELEPORT_FLAGS_TELEPORTER); } void nade_spawn_boom() @@ -383,9 +392,9 @@ void nade_heal_think() remove(self); return; } - + self.nextthink = time; - + if(time >= self.nade_special_time) { self.nade_special_time = time+0.25; @@ -420,15 +429,15 @@ void nade_heal_touch() pointparticles(particleeffectnum("healing_fx"), other.origin, '0 0 0', 1); other.health = min(other.health+health_factor, maxhealth); } - other.pauserothealth_finished = max(other.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); + other.pauserothealth_finished = max(other.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); } else if ( health_factor < 0 ) { Damage(other,self,self.realowner,-health_factor,DEATH_NADE_HEAL,other.origin,'0 0 0'); } - + } - + if ( IS_REAL_CLIENT(other) || (other.vehicle_flags & VHF_ISVEHICLE) ) { entity show_red = (other.vehicle_flags & VHF_ISVEHICLE) ? other.owner : other; @@ -455,9 +464,9 @@ void nade_heal_boom() healer.healer_radius = autocvar_g_nades_nade_radius; vector size = '1 1 1' * healer.healer_radius / 2; setsize(healer,-size,size); - + Net_LinkEntity(healer, true, 0, healer_send); - + healer.think = nade_heal_think; healer.nextthink = time; healer.SendFlags |= 1; @@ -466,7 +475,7 @@ void nade_heal_boom() void nade_monster_boom() { entity e = spawnmonster(self.pokenade_type, 0, self.realowner, self.realowner, self.origin, false, false, 1); - + if(autocvar_g_nades_pokenade_monster_lifetime > 0) e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime; e.monster_skill = MONSTER_SKILL_INSANE; @@ -475,25 +484,25 @@ void nade_monster_boom() void nade_boom() { string expef; - float nade_blast = 1; + bool nade_blast = true; - switch ( self.nade_type ) + switch ( NADES[self.nade_type] ) { case NADE_TYPE_NAPALM: nade_blast = autocvar_g_nades_napalm_blast; expef = "explosion_medium"; break; case NADE_TYPE_ICE: - nade_blast = 0; + nade_blast = false; expef = "electro_combo"; // hookbomb_explode electro_combo bigplasma_impact break; case NADE_TYPE_TRANSLOCATE: - nade_blast = 0; + nade_blast = false; expef = ""; break; case NADE_TYPE_MONSTER: case NADE_TYPE_SPAWN: - nade_blast = 0; + nade_blast = false; switch(self.realowner.team) { case NUM_TEAM_1: expef = "spawn_event_red"; break; @@ -504,7 +513,7 @@ void nade_boom() } break; case NADE_TYPE_HEAL: - nade_blast = 0; + nade_blast = false; expef = "spawn_event_red"; break; @@ -536,7 +545,7 @@ void nade_boom() } if(self.takedamage) - switch ( self.nade_type ) + switch ( NADES[self.nade_type] ) { case NADE_TYPE_NAPALM: nade_napalm_boom(); break; case NADE_TYPE_ICE: nade_ice_boom(); break; @@ -551,17 +560,17 @@ void nade_boom() void nade_touch() { - float is_weapclip = 0; + /*float is_weapclip = 0; if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NODRAW) if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NONSOLID)) if (!(trace_dphitcontents & DPCONTENTS_OPAQUE)) - is_weapclip = 1; - if(ITEM_TOUCH_NEEDKILL() || is_weapclip) + is_weapclip = 1;*/ + if(ITEM_TOUCH_NEEDKILL()) // || is_weapclip) { remove(self); return; } - + PROJECTILE_TOUCH; //setsize(self, '-2 -2 -2', '2 2 2'); @@ -583,7 +592,7 @@ void nade_beep() self.nextthink = max(self.wait, time); } -void nade_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) +void nade_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) { if(ITEM_DAMAGE_NEEDKILL(deathtype)) { @@ -592,7 +601,7 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp return; } - if(self.nade_type == NADE_TYPE_TRANSLOCATE || self.nade_type == NADE_TYPE_SPAWN) + if(self.nade_type == NADE_TYPE_TRANSLOCATE.m_id || self.nade_type == NADE_TYPE_SPAWN.m_id) return; if(DEATH_ISWEAPON(deathtype, WEP_BLASTER)) @@ -639,8 +648,8 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp } self.health -= damage; - - if ( self.nade_type != NADE_TYPE_HEAL || IS_PLAYER(attacker) ) + + if ( self.nade_type != NADE_TYPE_HEAL.m_id || IS_PLAYER(attacker) ) self.realowner = attacker; if(self.health <= 0) @@ -666,7 +675,13 @@ void toss_nade(entity e, vector _velocity, float _time) Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER_CPID, CPID_NADES); - setorigin(_nade, w_shotorg + (v_right * 25) * -1); + vector offset = (v_forward * autocvar_g_nades_throw_offset.x) + + (v_right * autocvar_g_nades_throw_offset.y) + + (v_up * autocvar_g_nades_throw_offset.z); + if(autocvar_g_nades_throw_offset == '0 0 0') + offset = '0 0 0'; + + setorigin(_nade, w_shotorg + offset + (v_right * 25) * -1); //setmodel(_nade, "models/weapons/v_ok_grenade.md3"); //setattachment(_nade, world, ""); PROJECTILE_MAKETRIGGER(_nade); @@ -677,7 +692,7 @@ void toss_nade(entity e, vector _velocity, float _time) if (trace_startsolid) setorigin(_nade, e.origin); - if(self.v_angle.x >= 70 && self.v_angle.x <= 110) + if(self.v_angle.x >= 70 && self.v_angle.x <= 110 && self.BUTTON_CROUCH) _nade.velocity = '0 0 100'; else if(autocvar_g_nades_nade_newton_style == 1) _nade.velocity = e.velocity + _velocity; @@ -705,7 +720,7 @@ void toss_nade(entity e, vector _velocity, float _time) _nade.toss_time = time; _nade.solid = SOLID_CORPSE; //((_nade.nade_type == NADE_TYPE_TRANSLOCATE) ? SOLID_CORPSE : SOLID_BBOX); - if(_nade.nade_type == NADE_TYPE_TRANSLOCATE || _nade.nade_type == NADE_TYPE_SPAWN) + if(_nade.nade_type == NADE_TYPE_TRANSLOCATE.m_id || _nade.nade_type == NADE_TYPE_SPAWN.m_id) _nade.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP; else _nade.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY; @@ -764,10 +779,10 @@ float nade_customize() { //self.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION; if(!self.traileffectnum) - self.traileffectnum = particleeffectnum(Nade_TrailEffect(Nade_ProjectileFromID(self.nade_type, false), self.team)); + self.traileffectnum = particleeffectnum(Nade_TrailEffect(NADES[self.nade_type].m_projectile[false], self.team)); self.alpha = 1; } - + return true; } @@ -797,15 +812,15 @@ void nade_prime() n.nade_type = ((autocvar_g_nades_client_select) ? self.cvar_cl_nade_type : autocvar_g_nades_nade_type); n.pokenade_type = ((autocvar_g_nades_client_select) ? self.cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); } - - n.nade_type = bound(1, n.nade_type, NADE_TYPE_LAST); + + n.nade_type = bound(1, n.nade_type, NADES_COUNT); setmodel(n, "models/weapons/v_ok_grenade.md3"); //setattachment(n, self, "bip01 l hand"); n.exteriormodeltoclient = self; n.customizeentityforclient = nade_customize; - n.traileffectnum = particleeffectnum(Nade_TrailEffect(Nade_ProjectileFromID(n.nade_type, false), self.team)); - n.colormod = Nade_Color(n.nade_type); + n.traileffectnum = particleeffectnum(Nade_TrailEffect(NADES[n.nade_type].m_projectile[false], self.team)); + n.colormod = NADES[n.nade_type].m_color; n.realowner = self; n.colormap = self.colormap; n.glowmod = self.glowmod; @@ -818,7 +833,7 @@ void nade_prime() setmodel(fn, "models/weapons/h_ok_grenade.iqm"); setattachment(fn, self.weaponentity, ""); fn.realowner = fn.owner = self; - fn.colormod = Nade_Color(n.nade_type); + fn.colormod = NADES[n.nade_type].m_color; fn.colormap = self.colormap; fn.glowmod = self.glowmod; fn.think = SUB_Remove; @@ -912,7 +927,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink) if(g_grappling_hook || client_hasweapon(self, WEP_HOOK, false, false) || (weaponsInMap & WEPSET_HOOK)) key_pressed = self.button16; // if hook is enabled, use an alternate key - + if(self.nade) { self.nade_timer = bound(0, (time - self.nade.lifetime) / autocvar_g_nades_nade_lifetime, 1); @@ -961,7 +976,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink) time_score = autocvar_g_nades_bonus_score_time_flagcarrier; else time_score = autocvar_g_nades_bonus_score_time; - + if(key_count) time_score = autocvar_g_nades_bonus_score_time_flagcarrier * key_count; // multiply by the number of keys the player is holding @@ -975,8 +990,8 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink) self.nade_type = autocvar_g_nades_bonus_type; self.pokenade_type = autocvar_g_nades_pokenade_monster_type; } - - self.nade_type = bound(1, self.nade_type, NADE_TYPE_LAST); + + self.nade_type = bound(1, self.nade_type, NADES_COUNT); if(self.bonus_nade_score >= 0 && autocvar_g_nades_bonus_score_max) nades_GiveBonus(self, time_score / autocvar_g_nades_bonus_score_max); @@ -1050,7 +1065,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerSpawn) { setorigin(self, self.nade_spawnloc.origin); self.nade_spawnloc.cnt -= 1; - + if(self.nade_spawnloc.cnt <= 0) { remove(self.nade_spawnloc); @@ -1111,7 +1126,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerDamage) Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_NADE, frag_target.netname); Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF); } - + return false; } @@ -1172,7 +1187,7 @@ void nades_Initialize() addstat(STAT_NADE_BONUS_SCORE, AS_FLOAT, bonus_nade_score); addstat(STAT_HEALING_ORB, AS_FLOAT, stat_healing_orb); addstat(STAT_HEALING_ORB_ALPHA, AS_FLOAT, stat_healing_orb_alpha); - + precache_model("models/ok_nade_counter/ok_nade_counter.md3"); precache_model("models/weapons/h_ok_grenade.iqm"); precache_model("models/weapons/v_ok_grenade.md3");