X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=42c8ec3ececc565e599fec2ba0541ba45823942f;hb=d7a834f0cfbf327e001d53f09c7ddfe2e2783955;hp=fba1ed3747ce8cfd66b172dcaa78448f77c6a678;hpb=627beb89e780d2a94ccd2d4169369cfce930a72f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index fba1ed374..42c8ec3ec 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -2,16 +2,19 @@ REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", "Mine Layer"); #else #ifdef SVQC -.float minelayer_detonate; -.float mine_number, mine_time; +void W_Mine_Think (void); +.float minelayer_detonate, minelayer_mines; +.float mine_time; void spawnfunc_weapon_minelayer (void) { weapon_defaultspawnfunc(WEP_MINE_LAYER); } -void W_Mine_RespawnEntity () +void W_Mine_Stick () { + spamsound (self, CHAN_PROJECTILE, "weapons/mine_stick.wav", VOL_BASE, ATTN_NORM); + // in order for mines to face properly when sticking to the ground, they must be a server side entity rather than a csqc projectile entity newmine; @@ -25,21 +28,21 @@ void W_Mine_RespawnEntity () setsize(newmine, '-4 -4 -4', '4 4 4'); setorigin(newmine, self.origin); setmodel(newmine, "models/mine.md3"); - newmine.angles = vectoangles(-trace_plane_normal); + newmine.angles = vectoangles(-trace_plane_normal); // face against the surface newmine.takedamage = self.takedamage; newmine.damageforcescale = self.damageforcescale; newmine.health = self.health; newmine.event_damage = self.event_damage; + newmine.spawnshieldtime = self.spawnshieldtime; - newmine.movetype = MOVETYPE_NONE; + newmine.movetype = MOVETYPE_NONE; // lock the mine in place newmine.projectiledeathtype = self.projectiledeathtype; - newmine.mine_number = self.mine_number; newmine.mine_time = self.mine_time; newmine.touch = SUB_Null; - newmine.think = self.think; + newmine.think = W_Mine_Think; newmine.nextthink = time; newmine.cnt = self.cnt; newmine.flags = self.flags; @@ -59,11 +62,11 @@ void W_Mine_Explode () self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, cvar("g_balance_minelayer_damage"), cvar("g_balance_minelayer_edgedamage"), cvar("g_balance_minelayer_radius"), world, cvar("g_balance_minelayer_force"), self.projectiledeathtype, other); + RadiusDamage (self, self.owner, autocvar_g_balance_minelayer_damage, autocvar_g_balance_minelayer_edgedamage, autocvar_g_balance_minelayer_radius, world, autocvar_g_balance_minelayer_force, self.projectiledeathtype, other); if (self.owner.weapon == WEP_MINE_LAYER) { - if(self.owner.ammo_rockets < cvar("g_balance_minelayer_ammo")) + if(self.owner.ammo_rockets < autocvar_g_balance_minelayer_ammo) { self.owner.cnt = WEP_MINE_LAYER; ATTACK_FINISHED(self.owner) = time; @@ -78,11 +81,11 @@ void W_Mine_DoRemoteExplode () self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.owner, cvar("g_balance_minelayer_remote_damage"), cvar("g_balance_minelayer_remote_edgedamage"), cvar("g_balance_minelayer_remote_radius"), world, cvar("g_balance_minelayer_remote_force"), self.projectiledeathtype | HITTYPE_BOUNCE, world); + RadiusDamage (self, self.owner, autocvar_g_balance_minelayer_remote_damage, autocvar_g_balance_minelayer_remote_edgedamage, autocvar_g_balance_minelayer_remote_radius, world, autocvar_g_balance_minelayer_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world); if (self.owner.weapon == WEP_MINE_LAYER) { - if(self.owner.ammo_rockets < cvar("g_balance_minelayer_ammo")) + if(self.owner.ammo_rockets < autocvar_g_balance_minelayer_ammo) { self.owner.cnt = WEP_MINE_LAYER; ATTACK_FINISHED(self.owner) = time; @@ -92,25 +95,25 @@ void W_Mine_DoRemoteExplode () remove (self); } -void W_Mine_RemoteExplode() +void W_Mine_RemoteExplode () { if(self.owner.deadflag == DEAD_NO) if((self.spawnshieldtime >= 0) ? (time >= self.spawnshieldtime) // timer - : (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > cvar("g_balance_minelayer_radius")) // safety device + : (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > autocvar_g_balance_minelayer_remote_radius) // safety device ) { W_Mine_DoRemoteExplode(); } } -void W_Mine_ProximityExplode() +void W_Mine_ProximityExplode () { // make sure no friend is in the mine's radius. If there is any, explosion is delayed until he's at a safe distance - if(cvar("g_balance_minelayer_protection")) + if(autocvar_g_balance_minelayer_protection) { entity head; - head = findradius(self.origin, cvar("g_balance_minelayer_radius")); + head = findradius(self.origin, autocvar_g_balance_minelayer_radius); while(head) { if(head == self.owner || !IsDifferentTeam(head, self.owner)) @@ -132,12 +135,22 @@ void W_Mine_Think (void) { other = world; self.projectiledeathtype |= HITTYPE_BOUNCE; - W_Mine_Explode (); + W_Mine_Explode(); + return; + } + + // a player's mines shall explode if he disconnects or dies + // TODO: Do this on team change too + if(self.owner.classname != "player" || self.owner.deadflag != DEAD_NO) + { + other = world; + self.projectiledeathtype |= HITTYPE_BOUNCE; + W_Mine_Explode(); return; } - // set the mine for detonation when a foe gets too close - head = findradius(self.origin, cvar("g_balance_minelayer_detectionradius")); + // set the mine for detonation when a foe gets close enough + head = findradius(self.origin, autocvar_g_balance_minelayer_proximityradius); while(head) { if(head.classname == "player" && head.deadflag == DEAD_NO) @@ -145,7 +158,7 @@ void W_Mine_Think (void) if(!self.mine_time) { spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM); - self.mine_time = time + cvar("g_balance_minelayer_time"); + self.mine_time = time + autocvar_g_balance_minelayer_time; } head = head.chain; } @@ -159,21 +172,13 @@ void W_Mine_Think (void) if (self.owner.deadflag == DEAD_NO) if (self.minelayer_detonate) W_Mine_RemoteExplode(); - - if(self.csqcprojectile_clientanimate == 0) - UpdateCSQCProjectile(self); } void W_Mine_Touch (void) { PROJECTILE_TOUCH; if(!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)) - { - spamsound (self, CHAN_PROJECTILE, "weapons/mine_stick.wav", VOL_BASE, ATTN_NORM); - self.movetype = MOVETYPE_NONE; // lock the mine in place - - W_Mine_RespawnEntity(); - } + W_Mine_Stick(); else if(self.movetype != MOVETYPE_NONE) // don't unstick a locked mine when someone touches it self.velocity = '0 0 0'; } @@ -190,44 +195,44 @@ 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")) + if(autocvar_g_balance_minelayer_limit) { - self.mine_number = 0; + self.minelayer_mines = 0; for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self) - self.mine_number += 1; + self.minelayer_mines += 1; - if(self.mine_number >= cvar("g_balance_minelayer_limit")) + if(self.minelayer_mines >= autocvar_g_balance_minelayer_limit) { // the refire delay keeps this message from being spammed - sprint(self, strcat("You cannot place more than ^2", cvar_string("g_balance_minelayer_limit"), " ^7mines at a time\n") ); + sprint(self, strcat("You cannot place more than ^2", ftos(autocvar_g_balance_minelayer_limit), " ^7mines at a time\n") ); play2(self, "weapons/unavailable.wav"); return; } } if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - self.ammo_rockets = self.ammo_rockets - cvar("g_balance_minelayer_ammo"); + self.ammo_rockets = self.ammo_rockets - autocvar_g_balance_minelayer_ammo; - W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", cvar("g_balance_minelayer_damage")); + W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", CHAN_WEAPON, autocvar_g_balance_minelayer_damage); pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); mine = WarpZone_RefSys_SpawnSameRefSys(self); mine.owner = self; - if(cvar("g_balance_minelayer_detonatedelay") >= 0) - mine.spawnshieldtime = time + cvar("g_balance_minelayer_detonatedelay"); + if(autocvar_g_balance_minelayer_detonatedelay >= 0) + mine.spawnshieldtime = time + autocvar_g_balance_minelayer_detonatedelay; else mine.spawnshieldtime = -1; mine.classname = "mine"; mine.bot_dodge = TRUE; - mine.bot_dodgerating = cvar("g_balance_minelayer_damage") * 2; // * 2 because it can detonate inflight which makes it even more dangerous + mine.bot_dodgerating = autocvar_g_balance_minelayer_damage * 2; // * 2 because it can detonate inflight which makes it even more dangerous mine.takedamage = DAMAGE_YES; - mine.damageforcescale = cvar("g_balance_minelayer_damageforcescale"); - mine.health = cvar("g_balance_minelayer_health"); + mine.damageforcescale = autocvar_g_balance_minelayer_damageforcescale; + mine.health = autocvar_g_balance_minelayer_health; mine.event_damage = W_Mine_Damage; mine.movetype = MOVETYPE_TOSS; @@ -236,16 +241,16 @@ void W_Mine_Attack (void) setsize (mine, '-4 -4 -4', '4 4 4'); // give it some size so it can be shot setorigin (mine, w_shotorg - v_forward * 4); // move it back so it hits the wall at the right point - W_SetupProjectileVelocity(mine, cvar("g_balance_minelayer_speed"), 0); + W_SetupProjectileVelocity(mine, autocvar_g_balance_minelayer_speed, 0); mine.angles = vectoangles (mine.velocity); mine.touch = W_Mine_Touch; mine.think = W_Mine_Think; mine.nextthink = time; - mine.cnt = time + cvar("g_balance_minelayer_lifetime"); + mine.cnt = time + autocvar_g_balance_minelayer_lifetime; mine.flags = FL_PROJECTILE; - CSQCProjectile(mine, FALSE, PROJECTILE_MINE, TRUE); + CSQCProjectile(mine, TRUE, PROJECTILE_MINE, TRUE); // muzzle flash for 1st person view flash = spawn (); @@ -255,6 +260,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 @@ -266,16 +273,16 @@ float w_minelayer(float req) if (req == WR_AIM) { // aim and decide to fire if appropriate - self.BUTTON_ATCK = bot_aim(cvar("g_balance_minelayer_speed"), 0, cvar("g_balance_minelayer_lifetime"), FALSE); + self.BUTTON_ATCK = bot_aim(autocvar_g_balance_minelayer_speed, 0, autocvar_g_balance_minelayer_lifetime, FALSE); 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; - edgedamage = cvar("g_balance_minelayer_edgedamage"); - coredamage = cvar("g_balance_minelayer_damage"); - edgeradius = cvar("g_balance_minelayer_radius"); + entity targetlist, targ; + float edgedamage, coredamage, edgeradius, recipricoledgeradius, d; + float selfdamage, teamdamage, enemydamage; + edgedamage = autocvar_g_balance_minelayer_edgedamage; + coredamage = autocvar_g_balance_minelayer_damage; + edgeradius = autocvar_g_balance_minelayer_radius; recipricoledgeradius = 1 / edgeradius; selfdamage = 0; teamdamage = 0; @@ -305,11 +312,11 @@ 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"); - if (self.team && teamplay != 1) + if (time > self.invincible_finished && time > self.spawnshieldtime) + desirabledamage = desirabledamage - selfdamage * autocvar_g_balance_selfdamagepercent; + if (teams_matter && self.team) desirabledamage = desirabledamage - teamdamage; mine = find(world, classname, "mine"); @@ -334,7 +341,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) @@ -362,10 +369,10 @@ float w_minelayer(float req) { if (self.BUTTON_ATCK) { - if(weapon_prepareattack(0, cvar("g_balance_minelayer_refire"))) + if(weapon_prepareattack(0, autocvar_g_balance_minelayer_refire)) { W_Mine_Attack(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minelayer_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_minelayer_animtime, w_ready); } } @@ -404,7 +411,7 @@ float w_minelayer(float req) { // don't switch while placing a mine if ((ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER) - && self.ammo_rockets < cvar("g_balance_minelayer_ammo")) + && self.ammo_rockets < autocvar_g_balance_minelayer_ammo) return FALSE; } else if (req == WR_CHECKAMMO2)