X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_race.qc;h=690d23ca8bc3e2595df612f403185eba0975ee9c;hb=13e8382b4bd9c0de8bcfd2a96f56e638ba5d431d;hp=7628968ed6503a3cab71e0c5373f194a831aa60f;hpb=2e6170f68128fcb440c35065ceef95d62a9735c2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index 7628968ed..690d23ca8 100644
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -14,48 +14,53 @@ void havocbot_role_race(entity this)
 	if(IS_DEAD(this))
 		return;
 
-	if (this.bot_strategytime < time)
+	if (navigation_goalrating_timeout(this))
 	{
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
 		navigation_goalrating_start(this);
 
+		bool raw_touch_check = true;
+		int cp = this.race_checkpoint;
+
+		LABEL(search_racecheckpoints)
 		IL_EACH(g_racecheckpoints, true,
 		{
-			if(it.cnt == this.race_checkpoint)
-			{
-				navigation_routerating(this, it, 1000000, 5000);
-			}
-			else if(this.race_checkpoint == -1)
+			if(it.cnt == cp || cp == -1)
 			{
+				// redirect bot to next goal if it touched the waypoint of an untouchable checkpoint
+				// e.g. checkpoint in front of Stormkeep's warpzone
+				// the same workaround is applied in CTS game mode
+				if (raw_touch_check && vdist(this.origin - it.nearestwaypoint.origin, <, 30))
+				{
+					cp = race_NextCheckpoint(cp);
+					raw_touch_check = false;
+					goto search_racecheckpoints;
+				}
 				navigation_routerating(this, it, 1000000, 5000);
-			}
 		});
 
 		navigation_goalrating_end(this);
+
+		navigation_goalrating_timeout_set(this);
 	}
 }
 
 void race_ScoreRules()
 {
-	ScoreRules_basics(race_teams, 0, 0, false);
-	if(race_teams)
-	{
-		ScoreInfo_SetLabel_TeamScore(  ST_RACE_LAPS,    "laps",       SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_TIME,    "time",      SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	else if(g_race_qualifying)
-	{
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	else
-	{
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_TIME,    "time",      SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	ScoreRules_basics_end();
+    GameRules_score_enabled(false);
+	GameRules_scoring(race_teams, 0, 0, {
+        if (race_teams) {
+            field_team(ST_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_TIME, "time", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+            field(SP_RACE_FASTEST, "fastest", SFL_LOWER_IS_BETTER | SFL_TIME);
+        } else if (g_race_qualifying) {
+            field(SP_RACE_FASTEST, "fastest", SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+        } else {
+            field(SP_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_TIME, "time", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+            field(SP_RACE_FASTEST, "fastest", SFL_LOWER_IS_BETTER | SFL_TIME);
+        }
+	});
 }
 
 void race_EventLog(string mode, entity actor) // use an alias for easy changing and quick editing later
@@ -201,7 +206,7 @@ MUTATOR_HOOKFUNCTION(rc, reset_map_global)
 	FOREACH_CLIENT(true, {
 		if(it.race_place)
 		{
-			s = PlayerScore_Add(it, SP_RACE_FASTEST, 0);
+			s = GameRules_scoring_add(it, RACE_FASTEST, 0);
 			if(!s)
 				it.race_place = 0;
 		}
@@ -251,7 +256,7 @@ MUTATOR_HOOKFUNCTION(rc, MakePlayerObserver)
 	entity player = M_ARGV(0, entity);
 
 	if(g_race_qualifying)
-	if(PlayerScore_Add(player, SP_RACE_FASTEST, 0))
+	if(GameRules_scoring_add(player, RACE_FASTEST, 0))
 		player.frags = FRAGS_LMS_LOSER;
 	else
 		player.frags = FRAGS_SPECTATOR;
@@ -443,17 +448,8 @@ void rc_SetLimits()
 
 	if(autocvar_g_race_teams)
 	{
-		ActivateTeamplay();
-		race_teams = bound(2, autocvar_g_race_teams, 4);
-		int teams = 0;
-		if(race_teams >= 1) teams |= BIT(0);
-		if(race_teams >= 2) teams |= BIT(1);
-		if(race_teams >= 3) teams |= BIT(2);
-		if(race_teams >= 4) teams |= BIT(3);
-
-		race_teams = teams; // now set it?
-
-		have_team_spawns = -1; // request team spawns
+		GameRules_teams(true);
+		race_teams = BITS(bound(2, autocvar_g_race_teams, 4));
 	}
 	else
 		race_teams = 0;
@@ -484,5 +480,8 @@ void rc_SetLimits()
 	}
 	else
 		g_race_qualifying = 0;
-	SetLimits(fraglimit_override, leadlimit_override, timelimit_override, qualifying_override);
+    GameRules_limit_score(fraglimit_override);
+    GameRules_limit_lead(leadlimit_override);
+    GameRules_limit_time(timelimit_override);
+    GameRules_limit_time_qualifying(qualifying_override);
 }