X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=6d3c331739917267ff28ff3035581d5f1631aec2;hb=fb1dd3c24d6b306d07262e6e4b1171b3b30b1c5e;hp=3ec50da50d633cc59679dd5087595726d1ab6f1b;hpb=dbdc35464a18f62bf550a20eddac9ec16b0eacee;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 3ec50da50..6d3c33173 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -1,10 +1,11 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", _("Mine Layer")) +REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", _("Mine Layer")) #else #ifdef SVQC void W_Mine_Think (void); .float minelayer_detonate, mine_explodeanyway; .float mine_time; +.vector mine_orientation; void spawnfunc_weapon_minelayer (void) { @@ -31,7 +32,7 @@ void W_Mine_Stick (entity to) setmodel(newmine, "models/mine.md3"); newmine.angles = vectoangles(-trace_plane_normal); // face against the surface - newmine.oldvelocity = self.velocity; + newmine.mine_orientation = -trace_plane_normal; newmine.takedamage = self.takedamage; newmine.damageforcescale = self.damageforcescale; @@ -45,7 +46,7 @@ void W_Mine_Stick (entity to) newmine.mine_time = self.mine_time; - newmine.touch = SUB_Null; + newmine.touch = func_null; newmine.think = W_Mine_Think; newmine.nextthink = time; newmine.cnt = self.cnt; @@ -67,7 +68,7 @@ void W_Mine_Explode () if(IsFlying(other)) AnnounceTo(self.realowner, "airshot"); - self.event_damage = SUB_Null; + self.event_damage = func_null; self.takedamage = DAMAGE_NO; RadiusDamage (self, self.realowner, autocvar_g_balance_minelayer_damage, autocvar_g_balance_minelayer_edgedamage, autocvar_g_balance_minelayer_radius, world, autocvar_g_balance_minelayer_force, self.projectiledeathtype, other); @@ -91,11 +92,11 @@ void W_Mine_Explode () void W_Mine_DoRemoteExplode () { - self.event_damage = SUB_Null; + self.event_damage = func_null; self.takedamage = DAMAGE_NO; if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW) - self.velocity = self.oldvelocity; + self.velocity = self.mine_orientation; // particle fx and decals need .velocity RadiusDamage (self, self.realowner, 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); @@ -149,11 +150,11 @@ void W_Mine_ProximityExplode () float W_Mine_Count(entity e) { - float minecount; + float minecount = 0; entity mine; for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == e) minecount += 1; - + return minecount; } @@ -225,7 +226,12 @@ void W_Mine_Touch (void) if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW) return; // we're already a stuck mine, why do we get called? TODO does this even happen? - PROJECTILE_TOUCH; + if(WarpZone_Projectile_Touch()) + { + if(wasfreed(self)) + self.realowner.minelayer_mines -= 1; + return; + } if(other && other.classname == "player" && other.deadflag == DEAD_NO) { @@ -263,8 +269,7 @@ void W_Mine_Attack (void) // scan how many mines we placed, and return if we reached our limit if(autocvar_g_balance_minelayer_limit) { - - if(W_Mine_Count(self) >= autocvar_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("minelayer: You cannot place more than ^2", ftos(autocvar_g_balance_minelayer_limit), " ^7mines at a time\n") ); @@ -308,6 +313,7 @@ void W_Mine_Attack (void) mine.nextthink = time; mine.cnt = time + (autocvar_g_balance_minelayer_lifetime - autocvar_g_balance_minelayer_lifetime_countdown); mine.flags = FL_PROJECTILE; + mine.missile_flags = MIF_SPLASH | MIF_ARC | MIF_PROXY; CSQCProjectile(mine, TRUE, PROJECTILE_MINE, TRUE); @@ -325,12 +331,10 @@ void W_Mine_Attack (void) self.minelayer_mines = W_Mine_Count(self); } -void spawnfunc_weapon_minelayer (void); // defined in t_items.qc - float W_PlacedMines(float detonate) { entity mine; - float minfound; + float minfound = 0; for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == self) { @@ -356,7 +360,10 @@ float w_minelayer(float req) if (req == WR_AIM) { // aim and decide to fire if appropriate - self.BUTTON_ATCK = bot_aim(autocvar_g_balance_minelayer_speed, 0, autocvar_g_balance_minelayer_lifetime, FALSE); + if(self.minelayer_mines >= autocvar_g_balance_minelayer_limit) + self.BUTTON_ATCK = FALSE; + else + 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 @@ -506,10 +513,22 @@ float w_minelayer(float req) else return FALSE; } + else if (req == WR_RESETPLAYER) + { + self.minelayer_mines = 0; + } else if (req == WR_RELOAD) { W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + return WEAPON_MINELAYER_SUICIDE; + } + else if (req == WR_KILLMESSAGE) + { + return WEAPON_MINELAYER_MURDER; + } return TRUE; } #endif @@ -528,20 +547,6 @@ float w_minelayer(float req) { precache_sound("weapons/mine_exp.wav"); } - else if (req == WR_SUICIDEMESSAGE) - if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = _("%s blew themself up with their minelayer"); - else - w_deathtypestring = _("%s forgot about their mine"); - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = _("%s got too close to %s's mine"); - else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = _("%s almost dodged %s's mine"); - else - w_deathtypestring = _("%s stepped on %s's mine"); - } return TRUE; } #endif