X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=3c9aac6cc22090bbad023cb39c930d0f1940b4f4;hb=223ada6accb3798fe61a8a7168213582f02a3415;hp=0a06064632deae27be38ad60391fd434326c480a;hpb=e78d58310d82e6cbd9543b1d06c1fd6ee8f195cd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 0a0606463..3c9aac6cc 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -1,5 +1,5 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", "Mine Layer"); +REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", _("Mine Layer")) #else #ifdef SVQC void W_Mine_Think (void); @@ -62,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; @@ -81,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; @@ -100,7 +100,7 @@ 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_remote_radius")) // safety device + : (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > autocvar_g_balance_minelayer_remote_radius) // safety device ) { W_Mine_DoRemoteExplode(); @@ -110,10 +110,10 @@ void W_Mine_RemoteExplode () 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 && self.minelayer_mines == 0) { 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)) @@ -131,16 +131,19 @@ void W_Mine_Think (void) entity head; self.nextthink = time; - if (time > self.cnt) + + // our lifetime has expired, it's time to die - mine_time just allows us to play a sound for this + // TODO: replace this mine_trigger.wav sound with a real countdown + if ((time > self.cnt) && (!self.mine_time)) { - other = world; - self.projectiledeathtype |= HITTYPE_BOUNCE; - W_Mine_Explode(); - return; + if(autocvar_g_balance_minelayer_lifetime_countdown > 0) + spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM); + self.mine_time = time + autocvar_g_balance_minelayer_lifetime_countdown; + self.minelayer_mines = 1; // make the mine super aggressive } // a player's mines shall explode if he disconnects or dies - // TODO: Do this on team change too + // TODO: Do this on team change too -- Samual: But isn't a player killed when they switch teams? if(self.owner.classname != "player" || self.owner.deadflag != DEAD_NO) { other = world; @@ -150,7 +153,7 @@ void W_Mine_Think (void) } // set the mine for detonation when a foe gets close enough - head = findradius(self.origin, cvar("g_balance_minelayer_proximityradius")); + head = findradius(self.origin, autocvar_g_balance_minelayer_proximityradius); while(head) { if(head.classname == "player" && head.deadflag == DEAD_NO) @@ -158,14 +161,17 @@ 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; } // explode if it's time to if(self.mine_time && time >= self.mine_time) + { W_Mine_ProximityExplode(); + return; + } // remote detonation if (self.owner.weapon == WEP_MINE_LAYER) @@ -199,40 +205,39 @@ void W_Mine_Attack (void) 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.minelayer_mines = 0; for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self) self.minelayer_mines += 1; - if(self.minelayer_mines >= 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"); + W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo); - W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", CHAN_WEAPON, 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; @@ -241,13 +246,13 @@ 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 - autocvar_g_balance_minelayer_lifetime_countdown); mine.flags = FL_PROJECTILE; CSQCProjectile(mine, TRUE, PROJECTILE_MINE, TRUE); @@ -270,19 +275,21 @@ float w_minelayer(float req) { entity mine; float minfound; + float ammo_amount; + 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 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"); + 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; @@ -314,9 +321,9 @@ float w_minelayer(float req) } 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"); @@ -367,16 +374,18 @@ float w_minelayer(float req) } else if (req == WR_THINK) { - if (self.BUTTON_ATCK) + if(autocvar_g_balance_minelayer_reload_ammo && self.clip_load < autocvar_g_balance_minelayer_ammo) // forced reload + weapon_action(self.weapon, WR_RELOAD); + else 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); } } - if (self.BUTTON_ATCK2) + else if (self.BUTTON_ATCK2) { minfound = 0; for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self) @@ -402,6 +411,7 @@ float w_minelayer(float req) precache_sound ("weapons/mine_fire.wav"); precache_sound ("weapons/mine_stick.wav"); precache_sound ("weapons/mine_trigger.wav"); + precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) { @@ -410,12 +420,26 @@ float w_minelayer(float req) else if (req == WR_CHECKAMMO1) { // 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")) - return FALSE; + if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER) + { + if(autocvar_g_balance_minelayer_reload_ammo) + { + if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo && self.weapon_load[WEP_MINE_LAYER] < autocvar_g_balance_minelayer_ammo) + ammo_amount = TRUE; + } + else if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo) + ammo_amount = TRUE; + return !ammo_amount; + } } else if (req == WR_CHECKAMMO2) + { return FALSE; + } + else if (req == WR_RELOAD) + { + W_Reload(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav"); + } return TRUE; }; #endif @@ -435,15 +459,15 @@ float w_minelayer(float req) precache_sound("weapons/mine_exp.wav"); } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "%s exploded"; + w_deathtypestring = _("%s exploded"); else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = "%s got too close to %s's mine"; + w_deathtypestring = _("%s got too close to %s's mine"); else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "%s almost dodged %s's mine"; + w_deathtypestring = _("%s almost dodged %s's mine"); else - w_deathtypestring = "%s stepped on %s's mine"; + w_deathtypestring = _("%s stepped on %s's mine"); } return TRUE; }