Some major updates, work on adding HUD to KA, some bug fixes.

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 645faca9946aab314c56b71a351ade8f31a10d55..5951e7ba1a3b644450861f31889f938d820f0b19 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1247,6 +1247,7 @@ set g_keyhunt_teams 0
 
 // keepaway
 set g_keepaway 0 "game mode which focuses around a ball, look at g_keepaway_win_mode for further details"
+set g_keepaway_bckillscore 1 "enable scoring points (y/n) for ball carrier kills"
 set g_keepaway_pointlimit      -1      "total amount of points you can get, -1 for unlimited"
 set g_keepaway_pointleadlimit  -1      "mercy rule, -1 for unlimited"
 set g_keepaway_powerup 0       "powerup while holding the ball"
@@ -1261,7 +1262,7 @@ set g_keepaway_noncarrier_selfdamage      1       "self damage if you don't have the ball"
 set g_keepaway_noncarrier_selfforce    1       "self force if you don't have the ball"
 seta g_keepaway_win_mode       0       "win mode for keepaway: 0 = time, 1 = kills as carrier (KAC)"
 set g_keepawayball_trail_color 254     "particle trail color from player/ball"
-set g_keepawayball_damageforcescale    1       "I don't really know what this is for. :)"
+set g_keepawayball_damageforcescale    2 "Scale of force which is applied to the ball by weapons/explosions/etc"
 set g_keepawayball_respawntime 15      "if no one picks up the ball, how long to wait until the ball respawns"
 seta g_keepaway_teams_override 0
 set g_keepaway_teams 0

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f77f1c1c1af2b1009147f2f7a27978126c2fc580..0917be59aae1eea73e6cb5ef1f6a32eac35cab62 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4315,6 +4315,19 @@ void HUD_Mod_KH(vector pos, vector mySize)
        }
 }
 
+// Keepaway HUD mod icon
+void HUD_Mod_Keepaway(vector pos, vector mySize)
+{
+       float stat_items;
+       stat_items = getstati(STAT_ITEMS);
+
+       mod_active = 1;
+
+       if(stat_items & IT_KEY1)
+               drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+}
+
+
 // Nexball HUD mod icon
 void HUD_Mod_NexBall(vector pos, vector mySize)
 {
@@ -4515,7 +4528,7 @@ void HUD_ModIcons(void)
        if(!autocvar_hud_panel_modicons && !autocvar__hud_configure)
                return;
 
-       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure)
+       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_KEEPAWAY && !autocvar__hud_configure)
                return;
 
        active_panel = HUD_PANEL_MODICONS;
@@ -4554,6 +4567,8 @@ void HUD_ModIcons(void)
                HUD_Mod_Race(pos, mySize);
        else if(gametype == GAME_CA)
                HUD_Mod_CA(pos, mySize);
+       else if(gametype == GAME_KEEPAWAY)
+               HUD_Mod_Keepaway(pos, mySize);
 }
 
 // Draw pressed keys (#11)

diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc
index 6394f3f07cf67d04468bf0932793d7c9ab9b7d04..8f200dcd6c2b6c15a8ce456c566170737068947b 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/gamemode_keepaway.qc
@@ -2,6 +2,7 @@ void ka_SpawnBall(void);
 void ka_TouchEvent(void);
 void ka_RespawnBall(void);
 void ka_DropEvent(entity);
+void ka_UpdateState(entity);
 
 void ka_Initialize()
 {
@@ -36,6 +37,7 @@ void ka_SpawnBall() // self = the ball
        ball_scale = self.scale;
        self.classname = "keepawayball";
        self.damageforcescale = cvar("g_keepawayball_damageforcescale");
+       self.takedamage = DAMAGE_YES;
        self.effects = self.effects | EF_FULLBRIGHT;
        self.movetype = MOVETYPE_BOUNCE;
        self.touch = ka_TouchEvent;
@@ -46,8 +48,8 @@ void ka_SpawnBall() // self = the ball
        self.owner = world;
        
        //WaypointSprite_AttachCarrier("ka-ball", self);
-       //WaypointSprite_Spawn("ka-ball", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attachedforcarrier, FALSE);
-       //WaypointSprite_UpdateTeamRadar(self.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '1 0 0');
+       WaypointSprite_Spawn("ka-ball", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attachedforcarrier, FALSE);
+       WaypointSprite_UpdateTeamRadar(self.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '0 1 1');
        // wtf radar doesn't work when not in a team environment?
 }
 
@@ -63,7 +65,6 @@ void ka_RespawnBall()
                //self.touch = ka_TouchEvent;
                self.think = ka_RespawnBall;
                self.nextthink = time + cvar("g_keepawayball_respawntime");
-               WaypointSprite_Spawn("ka-ball", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attachedforcarrier, FALSE);
        }
        else
        {
@@ -81,14 +82,9 @@ void ka_TouchEvent()
                self.nextthink = time;
                return;
        }
-       if(!self) 
-               return;
-       if(other.classname != "player" || other.health < 1)
-               return;
-       if(self.wait > time)
-               return;
-       //if(time > self.ctf_droptime + cvar("g_keepawayball_respawntime"))
-       //      return;
+       if(other.classname != "player" || other.health < 1) { return; }
+       if(!self) { return; }
+       if(self.wait > time) { return; }
 
        self.owner = other;
        other.kaballcarried = self;
@@ -99,25 +95,29 @@ void ka_TouchEvent()
        self.movetype = MOVETYPE_NONE;
        self.touch = SUB_Null;
        self.alpha = 0.01;
-       
        self.think = SUB_Null;
        self.nextthink = 0;
-
        self.glow_color = cvar("g_keepawayball_trail_color");
        self.glow_trail = TRUE;
+       self.takedamage = DAMAGE_NO;
+
        other.effects |= 8;
        other.alpha = 0.6;
 
+       ka_UpdateState(other);
+
        bprint(other.netname, "^7 has picked up the ball!\n");
+       if(other.items & IT_KEY1) { bprint(other.netname, "^7 has the ball in their inventory.\n"); }
        WriteByte(MSG_BROADCAST, SVC_CENTERPRINT);
        WriteString(MSG_BROADCAST, strcat("\n\n", other.netname, "^7 has picked up the ball!\n"));
-       sound(self.owner, CHAN_AUTO, "keepaway/pickedup.wav", VOL_BASE, ATTN_NORM);
+       sound(self.owner, CHAN_AUTO, "keepaway/pickedup.wav", VOL_BASE, ATTN_NONE);
        
        PlayerScore_Add(other, SP_KEEPAWAY_PICKUPS, 1);
 
        WaypointSprite_AttachCarrier("ka-ballcarrier", other);
        WaypointSprite_UpdateRule(other.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
        WaypointSprite_UpdateTeamRadar(other.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '1 0 0');
+       WaypointSprite_Ping(other.waypointsprite_attachedforcarrier);   
        WaypointSprite_Kill(self.waypointsprite_attachedforcarrier);
 }
 
@@ -131,36 +131,41 @@ void ka_DropEvent(entity plyr)
        setattachment(ball, world, "");
        ball.movetype = MOVETYPE_BOUNCE;
        ball.solid = SOLID_TRIGGER;
-       ball.wait = time + 1;
-       ball.ctf_droptime = time;
+       ball.wait = time + 1; 
        ball.think = ka_SpawnBall;
        ball.nextthink = time + cvar("g_keepawayball_respawntime");
        ball.touch = ka_TouchEvent;
+       ball.takedamage = DAMAGE_YES;
        plyr.effects = EF_LOWPRECISION;
        plyr.alpha = 1.0;
        ball.alpha = 1.0;
        setorigin(ball, plyr.origin + '0 0 10');
        ball.velocity = '0 0 200' + '0 100 0'*crandom() + '100 0 0'*crandom();
-
+       ball.owner.kaballcarried = world;
+       ball.owner = world;
+       
+       ka_UpdateState(plyr);
+       
        bprint(plyr.netname, "^7 has dropped the ball!\n");
+       if(plyr.items & IT_KEY1) { bprint(plyr.netname, "^7 has the ball in their inventory.\n"); }
        WriteByte(MSG_BROADCAST, SVC_CENTERPRINT);
        WriteString(MSG_BROADCAST, strcat("\n\n", plyr.netname, "^7 has dropped the ball!\n"));
-       sound(other, CHAN_AUTO, "keepaway/dropped.wav", VOL_BASE, ATTN_NORM);   
+       sound(other, CHAN_AUTO, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE);   
        
        PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1);
        
-       // todo
        WaypointSprite_Spawn("ka-ball", 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, FALSE);
        WaypointSprite_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
+       WaypointSprite_UpdateTeamRadar(ball.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '0 1 1');
+       WaypointSprite_Ping(ball.waypointsprite_attachedforcarrier);    
        WaypointSprite_Kill(plyr.waypointsprite_attachedforcarrier);
-       //WaypointSprite_Ping(ball.waypointsprite_attachedforcarrier);
-       //WaypointSprite_AttachCarrier("ka-ball", ball);
-       //WaypointSprite_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT);
-       //WaypointSprite_UpdateTeamRadar(ball.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, BALL_SPRITECOLOR);
-       //WaypointSprite_Ping(ball.waypointsprite_attachedforcarrier);  
+}
 
-       ball.owner.kaballcarried = world;
-       ball.owner = world;
+void ka_UpdateState(entity plyr)
+{
+       if(plyr.kaballcarried) {
+               plyr.items |= IT_KEY1; 
+       }
 }
 
 MUTATOR_HOOKFUNCTION(ka_RemovePlayer)
@@ -171,12 +176,14 @@ MUTATOR_HOOKFUNCTION(ka_RemovePlayer)
 
 MUTATOR_HOOKFUNCTION(ka_Scoring)
 {
-       if not(frag_attacker == frag_target)
+       if((frag_attacker != frag_target) && (frag_attacker.classname == "player"))
        {
                if(frag_target.kaballcarried) { // get amount of times killing carrier
                        PlayerScore_Add(frag_attacker, SP_KEEPAWAY_CARRIERKILLS, 1);
+                       if(cvar("g_keepaway_bckillscore"))
+                               PlayerScore_Add(frag_attacker, SP_KEEPAWAY_SCORE, 1);
                }
-               else if not(frag_attacker.kaballcarried)
+               else if(!frag_attacker.kaballcarried)
                        if(cvar("g_keepaway_noncarrier_warn"))
                                centerprint_atprio(frag_attacker, (CENTERPRIO_SPAM + 5), "Killing people while you don't have the ball gives no points!");
 
@@ -184,6 +191,8 @@ MUTATOR_HOOKFUNCTION(ka_Scoring)
                        PlayerScore_Add(frag_attacker, SP_KEEPAWAY_SCORE, 1);
        }
 
+       if(self.items & IT_KEY1) { bprint(self.netname, "^7 has the ball in their inventory.\n"); }
+
        if(self.kaballcarried) { ka_DropEvent(self); }
        return 1;
 }
@@ -194,12 +203,29 @@ MUTATOR_HOOKFUNCTION(ka_GiveFragsForKill)
        return 1;
 }
 
+MUTATOR_HOOKFUNCTION(ka_PlayerPreThink)
+{
+       if(self.kaballcarried) {
+               self.items |= IT_KEY1; 
+       }
+       //if(self.items & IT_KEY1) { bprint(self.netname, "^7 has the ball in their inventory.\n"); }
+       return 1;
+}
+
+//MUTATOR_HOOKFUNCTION(ka_SpectateCopy)
+//{
+//     self.items = other.items;
+//     return 1;
+//}
+
 MUTATOR_DEFINITION(gamemode_keepaway)
 {
        MUTATOR_HOOK(MakePlayerObserver, ka_RemovePlayer, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientDisconnect, ka_RemovePlayer, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, ka_Scoring, CBC_ORDER_ANY);
        MUTATOR_HOOK(GiveFragsForKill, ka_GiveFragsForKill, CBC_ORDER_FIRST);
+       MUTATOR_HOOK(PlayerPreThink, ka_PlayerPreThink, CBC_ORDER_FIRST);
+       //MUTATOR_HOOK(SpectateCopy, ka_SpectateCopy, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
@@ -216,5 +242,4 @@ MUTATOR_DEFINITION(gamemode_keepaway)
        }
 
        return 0;
-}
-
+}
\ No newline at end of file