X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=dc4f48152e4ebb6d6dc07df6a0af8d49695cb77c;hb=168b974f2e9e994c4634b6be43e2d4a77f311980;hp=da847d2709c19de897d57b1610a293537960cc75;hpb=73aacea5ecd160c845d8fdc15cacf443eddc79ca;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index da847d270..dc4f48152 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -17,7 +17,7 @@ void W_Mine_Stick () // in order for mines to face properly when sticking to the ground, they must be a server side entity rather than a csqc projectile - local entity newmine; + entity newmine; newmine = spawn(); newmine.classname = self.classname; @@ -197,8 +197,8 @@ void W_Mine_Damage (entity inflictor, entity attacker, float damage, float death void W_Mine_Attack (void) { - local entity mine; - local entity flash; + entity mine; + entity flash; // scan how many mines we placed, and return if we reached our limit if(cvar("g_balance_minelayer_limit")) @@ -262,6 +262,8 @@ void W_Mine_Attack (void) W_AttachToShotorg(flash, '5 0 0'); // common properties + + other = mine; MUTATOR_CALLHOOK(EditProjectile); } void spawnfunc_weapon_minelayer (void); // defined in t_items.qc @@ -277,9 +279,9 @@ float w_minelayer(float req) if(skill >= 2) // skill 0 and 1 bots won't detonate mines! { // decide whether to detonate mines - local entity mine, targetlist, targ; - local float edgedamage, coredamage, edgeradius, recipricoledgeradius, d; - local float selfdamage, teamdamage, enemydamage; + entity targetlist, targ; + float edgedamage, coredamage, edgeradius, recipricoledgeradius, d; + float selfdamage, teamdamage, enemydamage; edgedamage = cvar("g_balance_minelayer_edgedamage"); coredamage = cvar("g_balance_minelayer_damage"); edgeradius = cvar("g_balance_minelayer_radius"); @@ -312,7 +314,7 @@ float w_minelayer(float req) } mine = find(mine, classname, "mine"); } - local float desirabledamage; + float desirabledamage; desirabledamage = enemydamage; if (teamplay != 1 && time > self.invincible_finished && time > self.spawnshieldtime) desirabledamage = desirabledamage - selfdamage * cvar("g_balance_selfdamagepercent"); @@ -341,7 +343,7 @@ float w_minelayer(float req) targ = targ.chain; } }else{ - local float distance; distance= bound(300,vlen(self.origin-self.enemy.origin),30000); + float distance; distance= bound(300,vlen(self.origin-self.enemy.origin),30000); //As the distance gets larger, a correct detonation gets near imposible //Bots are assumed to use the mine spawnfunc_light to see if the mine gets near a player if(v_forward * normalize(mine.origin - self.enemy.origin)< 0.1)