X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_onslaught.qc;h=76a7a65d57b7f97954a20e92280d96254b90f87c;hb=eeec5ec4584c71acbb89db6eea843b48d6ca4c26;hp=448664a9020eb96d58a460a47a2a889e738b033a;hpb=3cc2f37092129be173109ef4c47d765945e94b7a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc index 448664a90..76a7a65d5 100644 --- a/qcsrc/server/mutators/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/gamemode_onslaught.qc @@ -4,22 +4,12 @@ #include "../controlpoint.qh" #include "../generator.qh" -vector randompos(vector m1, vector m2) -{ - vector v; - m2 = m2 - m1; - v_x = m2_x * random() + m1_x; - v_y = m2_y * random() + m1_y; - v_z = m2_z * random() + m1_z; - return v; -} - // ======================= // CaptureShield Functions // ======================= bool ons_CaptureShield_Customize() -{ +{SELFPARAM(); entity e = WaypointSprite_getviewentity(other); if(!self.enemy.isshielded && (ons_ControlPoint_Attackable(self.enemy, e.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return false; } @@ -29,7 +19,7 @@ bool ons_CaptureShield_Customize() } void ons_CaptureShield_Touch() -{ +{SELFPARAM(); if(!self.enemy.isshielded && (ons_ControlPoint_Attackable(self.enemy, other.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return; } if(!IS_PLAYER(other)) { return; } if(SAME_TEAM(other, self)) { return; } @@ -51,7 +41,7 @@ void ons_CaptureShield_Touch() } void ons_CaptureShield_Reset() -{ +{SELFPARAM(); self.colormap = self.enemy.colormap; self.team = self.enemy.team; } @@ -89,8 +79,8 @@ void ons_debug(string input) { switch(autocvar_g_onslaught_debug) { - case 1: dprint(input); break; - case 2: print(input); break; + case 1: LOG_TRACE(input); break; + case 2: LOG_INFO(input); break; } } @@ -239,7 +229,7 @@ void onslaught_updatelinks() // =================== bool ons_Link_Send(entity to, int sendflags) -{ +{SELFPARAM(); WriteByte(MSG_ENTITY, ENT_CLIENT_RADARLINK); WriteByte(MSG_ENTITY, sendflags); if(sendflags & 1) @@ -262,7 +252,7 @@ bool ons_Link_Send(entity to, int sendflags) } void ons_Link_CheckUpdate() -{ +{SELFPARAM(); // TODO check if the two sides have moved (currently they won't move anyway) float cc = 0, cc1 = 0, cc2 = 0; @@ -281,7 +271,7 @@ void ons_Link_CheckUpdate() } void ons_DelayedLinkSetup() -{ +{SELFPARAM(); self.goalentity = find(world, targetname, self.target); self.enemy = find(world, targetname, self.target2); if(!self.goalentity) { objerror("can not find target\n"); } @@ -354,9 +344,7 @@ int ons_ControlPoint_Attackable(entity cp, int teamnumber) } void ons_ControlPoint_Icon_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{ - entity oself; - +{SELFPARAM(); if(damage <= 0) { return; } if (self.owner.isshielded) @@ -387,7 +375,7 @@ void ons_ControlPoint_Icon_Damage(entity inflictor, entity attacker, float damag WaypointSprite_UpdateBuildFinished(self.owner.sprite, time + (self.max_health - self.health) / (self.count / ONS_CP_THINKRATE)); self.pain_finished = time + 1; // particles on every hit - pointparticles(particleeffectnum("sparks"), hitloc, force*-1, 1); + pointparticles(particleeffectnum(EFFECT_SPARKS), hitloc, force*-1, 1); //sound on every hit if (random() < 0.5) sound(self, CH_TRIGGER, "onslaught/ons_hit1.wav", VOL_BASE+0.3, ATTEN_NORM); @@ -396,8 +384,8 @@ void ons_ControlPoint_Icon_Damage(entity inflictor, entity attacker, float damag if (self.health < 0) { - sound(self, CH_TRIGGER, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM); - pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1); + sound(self, CH_TRIGGER, W_Sound("grenade_impact"), VOL_BASE, ATTEN_NORM); + pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1); Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(self.team, INFO_ONSLAUGHT_CPDESTROYED_), self.owner.message, attacker.netname); PlayerScore_Add(attacker, SP_ONS_TAKES, 1); @@ -414,11 +402,10 @@ void ons_ControlPoint_Icon_Damage(entity inflictor, entity attacker, float damag onslaught_updatelinks(); // Use targets now (somebody make sure this is in the right place..) - oself = self; - self = self.owner; + setself(self.owner); activator = self; SUB_UseTargets (); - self = oself; + setself(this); self.owner.waslinked = self.owner.islinked; if(self.owner.model != "models/onslaught/controlpoint_pad.md3") @@ -432,8 +419,7 @@ void ons_ControlPoint_Icon_Damage(entity inflictor, entity attacker, float damag } void ons_ControlPoint_Icon_Think() -{ - entity oself; +{SELFPARAM(); self.nextthink = time + ONS_CP_THINKRATE; if(autocvar_g_onslaught_cp_proxydecap) @@ -488,11 +474,10 @@ void ons_ControlPoint_Icon_Think() if(!self.owner.islinked) self.owner.team = 0; - oself = self; - self = self.owner; + setself(self.owner); activator = self; SUB_UseTargets (); - self = oself; + setself(this); self.owner.team = t; @@ -502,7 +487,7 @@ void ons_ControlPoint_Icon_Think() // damaged fx if(random() < 0.6 - self.health / self.max_health) { - Send_Effect("electricity_sparks", self.origin + randompos('-10 -10 -20', '10 10 20'), '0 0 0', 1); + Send_Effect(EFFECT_ELECTRIC_SPARKS, self.origin + randompos('-10 -10 -20', '10 10 20'), '0 0 0', 1); if(random() > 0.8) sound(self, CH_PAIN, "onslaught/ons_spark1.wav", VOL_BASE, ATTEN_NORM); @@ -512,8 +497,7 @@ void ons_ControlPoint_Icon_Think() } void ons_ControlPoint_Icon_BuildThink() -{ - entity oself; +{SELFPARAM(); int a; self.nextthink = time + ONS_CP_THINKRATE; @@ -536,7 +520,7 @@ void ons_ControlPoint_Icon_BuildThink() self.owner.iscaptured = true; self.solid = SOLID_BBOX; - Send_Effect(sprintf("%s_cap", Static_Team_ColorName_Lower(self.owner.team)), self.owner.origin, '0 0 0', 1); + Send_Effect_(sprintf("%s_cap", Static_Team_ColorName_Lower(self.owner.team)), self.owner.origin, '0 0 0', 1); WaypointSprite_UpdateMaxHealth(self.owner.sprite, self.max_health); WaypointSprite_UpdateHealth(self.owner.sprite, self.health); @@ -555,11 +539,10 @@ void ons_ControlPoint_Icon_BuildThink() onslaught_updatelinks(); // Use targets now (somebody make sure this is in the right place..) - oself = self; - self = self.owner; + setself(self.owner); activator = self; SUB_UseTargets (); - self = oself; + setself(this); self.SendFlags |= CPSF_SETUP; } @@ -567,7 +550,7 @@ void ons_ControlPoint_Icon_BuildThink() setmodel_fixsize(self.owner, "models/onslaught/controlpoint_pad2.md3"); if(random() < 0.9 - self.health / self.max_health) - Send_Effect("rage", self.origin + 10 * randomvec(), '0 0 -1', 1); + Send_Effect(EFFECT_RAGE, self.origin + 10 * randomvec(), '0 0 -1', 1); } void ons_ControlPoint_Icon_Spawn(entity cp, entity player) @@ -595,7 +578,7 @@ void ons_ControlPoint_Icon_Spawn(entity cp, entity player) cp.team = e.team; cp.colormap = e.colormap; - Send_Effect(sprintf("%sflag_touch", Static_Team_ColorName_Lower(player.team)), e.origin, '0 0 0', 1); + Send_Effect_(sprintf("%sflag_touch", Static_Team_ColorName_Lower(player.team)), e.origin, '0 0 0', 1); WaypointSprite_UpdateBuildFinished(cp.sprite, time + (e.max_health - e.health) / (e.count / ONS_CP_THINKRATE)); WaypointSprite_UpdateRule(cp.sprite,cp.team,SPRITERULE_TEAMPLAY); @@ -665,7 +648,7 @@ void ons_ControlPoint_UpdateSprite(entity e) } void ons_ControlPoint_Touch() -{ +{SELFPARAM(); entity toucher = other; int attackable; @@ -702,13 +685,13 @@ void ons_ControlPoint_Touch() } void ons_ControlPoint_Think() -{ +{SELFPARAM(); self.nextthink = time + ONS_CP_THINKRATE; - CSQCMODEL_AUTOUPDATE(); + CSQCMODEL_AUTOUPDATE(self); } void ons_ControlPoint_Reset() -{ +{SELFPARAM(); if(self.goalentity) remove(self.goalentity); @@ -731,23 +714,23 @@ void ons_ControlPoint_Reset() activator = self; SUB_UseTargets(); // to reset the structures, playerspawns etc. - CSQCMODEL_AUTOUPDATE(); + CSQCMODEL_AUTOUPDATE(self); } void ons_DelayedControlPoint_Setup(void) -{ +{SELFPARAM(); onslaught_updatelinks(); // captureshield setup ons_CaptureShield_Spawn(self, false); - CSQCMODEL_AUTOINIT(); + CSQCMODEL_AUTOINIT(self); } void ons_ControlPoint_Setup(entity cp) -{ +{SELFPARAM(); // declarations - self = cp; // for later usage with droptofloor() + setself(cp); // for later usage with droptofloor() // main setup cp.ons_worldcpnext = ons_worldcplist; // link control point into ons_worldcplist @@ -781,7 +764,7 @@ void ons_ControlPoint_Setup(entity cp) precache_model("models/onslaught/controlpoint_icon_gib4.md3"); precache_sound("onslaught/controlpoint_build.wav"); precache_sound("onslaught/controlpoint_built.wav"); - precache_sound("weapons/grenade_impact.wav"); + precache_sound(W_Sound("grenade_impact")); precache_sound("onslaught/damageblockedbyshield.wav"); precache_sound("onslaught/controlpoint_underattack.wav"); precache_sound("onslaught/ons_spark1.wav"); @@ -800,7 +783,7 @@ void ons_ControlPoint_Setup(entity cp) { setorigin(cp, cp.origin + '0 0 20'); cp.noalign = false; - self = cp; + setself(cp); droptofloor(); cp.movetype = MOVETYPE_TOSS; } @@ -852,7 +835,7 @@ void ons_Generator_UpdateSprite(entity e) } void ons_GeneratorDamage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{ +{SELFPARAM(); if(damage <= 0) { return; } if(warmup_stage || gameover) { return; } if(!round_handler_IsRoundStarted()) { return; } @@ -917,12 +900,12 @@ void ons_GeneratorDamage(entity inflictor, entity attacker, float damage, int de // Throw some flaming gibs on damage, more damage = more chance for gib if(random() < damage/220) { - sound(self, CH_TRIGGER, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM); + sound(self, CH_TRIGGER, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM); } else { // particles on every hit - Send_Effect("sparks", hitloc, force * -1, 1); + Send_Effect(EFFECT_SPARKS, hitloc, force * -1, 1); //sound on every hit if (random() < 0.5) @@ -935,7 +918,7 @@ void ons_GeneratorDamage(entity inflictor, entity attacker, float damage, int de } void ons_GeneratorThink() -{ +{SELFPARAM(); entity e; self.nextthink = time + GEN_THINKRATE; if (!gameover) @@ -958,7 +941,7 @@ void ons_GeneratorThink() } void ons_GeneratorReset() -{ +{SELFPARAM(); self.team = self.team_saved; self.lasthealth = self.max_health = self.health = autocvar_g_onslaught_gen_health; self.takedamage = DAMAGE_AIM; @@ -983,7 +966,7 @@ void ons_GeneratorReset() } void ons_DelayedGeneratorSetup() -{ +{SELFPARAM(); // bot waypoints waypoint_spawnforitem_force(self, self.origin); self.nearestwaypointtimeout = 0; // activate waypointing again @@ -999,7 +982,7 @@ void ons_DelayedGeneratorSetup() void onslaught_generator_touch() -{ +{SELFPARAM(); if ( IS_PLAYER(other) ) if ( SAME_TEAM(self,other) ) if ( self.iscaptured ) @@ -1009,10 +992,10 @@ void onslaught_generator_touch() } void ons_GeneratorSetup(entity gen) // called when spawning a generator entity on the map as a spawnfunc -{ +{SELFPARAM(); // declarations int teamnumber = gen.team; - self = gen; // for later usage with droptofloor() + setself(gen); // for later usage with droptofloor() // main setup gen.ons_worldgeneratornext = ons_worldgeneratorlist; // link generator into ons_worldgeneratorlist @@ -1041,8 +1024,8 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o precache_model("models/onslaught/gen_gib2.md3"); precache_model("models/onslaught/gen_gib3.md3"); precache_sound("onslaught/generator_decay.wav"); - precache_sound("weapons/grenade_impact.wav"); - precache_sound("weapons/rocket_impact.wav"); + precache_sound(W_Sound("grenade_impact")); + precache_sound(W_Sound("rocket_impact")); precache_sound("onslaught/generator_underattack.wav"); precache_sound("onslaught/shockwave.wav"); precache_sound("onslaught/ons_hit1.wav"); @@ -1056,7 +1039,7 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o gen.colormap = 1024 + (teamnumber - 1) * 17; // generator placement - self = gen; + setself(gen); droptofloor(); // waypointsprites @@ -1220,7 +1203,7 @@ void Onslaught_RoundStart() // NOTE: LEGACY CODE, needs to be re-written! void havocbot_goalrating_ons_offenseitems(float ratingscale, vector org, float sradius) -{ +{SELFPARAM(); entity head; float t, c; int i; @@ -1294,7 +1277,7 @@ void havocbot_role_ons_setrole(entity bot, int role) } int havocbot_ons_teamcount(entity bot, int role) -{ +{SELFPARAM(); int c = 0; entity head; @@ -1307,7 +1290,7 @@ int havocbot_ons_teamcount(entity bot, int role) } void havocbot_goalrating_ons_controlpoints_attack(float ratingscale) -{ +{SELFPARAM(); entity cp, cp1, cp2, best, pl, wp; float radius, bestvalue; int c; @@ -1425,7 +1408,7 @@ void havocbot_goalrating_ons_controlpoints_attack(float ratingscale) } bool havocbot_goalrating_ons_generator_attack(float ratingscale) -{ +{SELFPARAM(); entity g, wp, bestwp; bool found; int best; @@ -1481,7 +1464,7 @@ bool havocbot_goalrating_ons_generator_attack(float ratingscale) } void havocbot_role_ons_offense() -{ +{SELFPARAM(); if(self.deadflag != DEAD_NO) { self.havocbot_attack_time = 0; @@ -1516,17 +1499,17 @@ void havocbot_role_ons_offense() } void havocbot_role_ons_assistant() -{ +{SELFPARAM(); havocbot_ons_reset_role(self); } void havocbot_role_ons_defense() -{ +{SELFPARAM(); havocbot_ons_reset_role(self); } void havocbot_ons_reset_role(entity bot) -{ +{SELFPARAM(); entity head; int c = 0; @@ -1558,7 +1541,7 @@ void havocbot_ons_reset_role(entity bot) * if max_dist is positive, only control points within this range will be considered */ entity ons_Nearest_ControlPoint(vector pos, float max_dist) -{ +{SELFPARAM(); entity tmp_entity, closest_target = world; tmp_entity = findchain(classname, "onslaught_controlpoint"); while(tmp_entity) @@ -1589,7 +1572,7 @@ entity ons_Nearest_ControlPoint(vector pos, float max_dist) * This function only check distances on the XY plane, disregarding Z */ entity ons_Nearest_ControlPoint_2D(vector pos, float max_dist) -{ +{SELFPARAM(); entity tmp_entity, closest_target = world; vector delta; float smallest_distance = 0, distance; @@ -1636,7 +1619,7 @@ entity ons_Nearest_ControlPoint_2D(vector pos, float max_dist) * find the number of control points and generators in the same team as self */ int ons_Count_SelfControlPoints() -{ +{SELFPARAM(); entity tmp_entity; tmp_entity = findchain(classname, "onslaught_controlpoint"); int n = 0; @@ -1688,7 +1671,7 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe { if ( tele_effects ) { - Send_Effect("teleport", player.origin, '0 0 0', 1); + Send_Effect(EFFECT_TELEPORT, player.origin, '0 0 0', 1); sound (player, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTEN_NORM); } setorigin(player, loc); @@ -1698,7 +1681,7 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe player.teleport_antispam = time + autocvar_g_onslaught_teleport_wait; if ( tele_effects ) - Send_Effect("teleport", player.origin + v_forward * 32, '0 0 0', 1); + Send_Effect(EFFECT_TELEPORT, player.origin + v_forward * 32, '0 0 0', 1); return true; } } @@ -1712,24 +1695,25 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe // ============== MUTATOR_HOOKFUNCTION(ons_ResetMap) -{ - FOR_EACH_PLAYER(self) +{SELFPARAM(); + entity e; + FOR_EACH_PLAYER(e) { - self.ons_roundlost = false; - self.ons_deathloc = '0 0 0'; - PutClientInServer(); + e.ons_roundlost = false; + e.ons_deathloc = '0 0 0'; + WITH(entity, self, e, PutClientInServer()); } return false; } MUTATOR_HOOKFUNCTION(ons_RemovePlayer) -{ +{SELFPARAM(); self.ons_deathloc = '0 0 0'; return false; } MUTATOR_HOOKFUNCTION(ons_PlayerSpawn) -{ +{SELFPARAM(); if(!round_handler_IsRoundStarted()) { self.player_blocked = true; @@ -1855,7 +1839,7 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn) } MUTATOR_HOOKFUNCTION(ons_PlayerDies) -{ +{SELFPARAM(); frag_target.ons_deathloc = frag_target.origin; entity l; for(l = ons_worldgeneratorlist; l; l = l.ons_worldgeneratornext) @@ -1875,7 +1859,7 @@ MUTATOR_HOOKFUNCTION(ons_PlayerDies) } MUTATOR_HOOKFUNCTION(ons_MonsterThink) -{ +{SELFPARAM(); entity e = find(world, targetname, self.target); if (e != world) self.team = e.team; @@ -1884,7 +1868,7 @@ MUTATOR_HOOKFUNCTION(ons_MonsterThink) } void ons_MonsterSpawn_Delayed() -{ +{SELFPARAM(); entity e, own = self.owner; if(!own) { remove(self); return; } @@ -1905,7 +1889,7 @@ void ons_MonsterSpawn_Delayed() } MUTATOR_HOOKFUNCTION(ons_MonsterSpawn) -{ +{SELFPARAM(); entity e = spawn(); e.owner = self; InitializeEntity(e, ons_MonsterSpawn_Delayed, INITPRIO_FINDTARGET); @@ -1914,7 +1898,7 @@ MUTATOR_HOOKFUNCTION(ons_MonsterSpawn) } void ons_TurretSpawn_Delayed() -{ +{SELFPARAM(); entity e, own = self.owner; if(!own) { remove(self); return; } @@ -1936,7 +1920,7 @@ void ons_TurretSpawn_Delayed() } MUTATOR_HOOKFUNCTION(ons_TurretSpawn) -{ +{SELFPARAM(); entity e = spawn(); e.owner = self; InitializeEntity(e, ons_TurretSpawn_Delayed, INITPRIO_FINDTARGET); @@ -1945,7 +1929,7 @@ MUTATOR_HOOKFUNCTION(ons_TurretSpawn) } MUTATOR_HOOKFUNCTION(ons_BotRoles) -{ +{SELFPARAM(); havocbot_ons_reset_role(self); return true; } @@ -1969,13 +1953,13 @@ MUTATOR_HOOKFUNCTION(ons_GetTeamCount) } MUTATOR_HOOKFUNCTION(ons_SpectateCopy) -{ +{SELFPARAM(); self.ons_roundlost = other.ons_roundlost; // make spectators see it too return false; } MUTATOR_HOOKFUNCTION(ons_SV_ParseClientCommand) -{ +{SELFPARAM(); if(MUTATOR_RETURNVALUE) // command was already handled? return false; @@ -2039,7 +2023,7 @@ MUTATOR_HOOKFUNCTION(ons_SV_ParseClientCommand) } MUTATOR_HOOKFUNCTION(ons_PlayerUseKey) -{ +{SELFPARAM(); if(MUTATOR_RETURNVALUE || gameover) { return false; } if((time > self.teleport_antispam) && (self.deadflag == DEAD_NO) && !self.vehicle) @@ -2075,7 +2059,7 @@ keys: "target2" - second control point. */ void spawnfunc_onslaught_link() -{ +{SELFPARAM(); if(!g_onslaught) { remove(self); return; } if (self.target == "" || self.target2 == "") @@ -2100,7 +2084,7 @@ keys: */ void spawnfunc_onslaught_controlpoint() -{ +{SELFPARAM(); if(!g_onslaught) { remove(self); return; } ons_ControlPoint_Setup(self); @@ -2116,7 +2100,7 @@ keys: "targetname" - name that spawnfunc_onslaught_link entities will use to target this. */ void spawnfunc_onslaught_generator() -{ +{SELFPARAM(); if(!g_onslaught) { remove(self); return; } if(!self.team) { objerror("team must be set"); } @@ -2189,7 +2173,7 @@ MUTATOR_DEFINITION(gamemode_onslaught) MUTATOR_ONREMOVE { - print("This is a game type and it cannot be removed at runtime."); + LOG_INFO("This is a game type and it cannot be removed at runtime."); return -1; }