From: terencehill <piuntn@gmail.com>
Date: Sun, 29 Apr 2018 08:56:20 +0000 (+0200)
Subject: Apply commit 1986f19a67 "Set consistent rating scales in havocbot_goalrating_enemypla... 
X-Git-Tag: xonotic-v0.8.5~1923^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c29a6a09a5fc01a3dcfeb832980a6e3ed8b54c40;p=xonotic%2Fxonotic-data.pk3dir.git

Apply commit 1986f19a67 "Set consistent rating scales in havocbot_goalrating_enemyplayers calls (no actual change)" to Key Hunt code too
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
index 04576486b..30d78a01e 100644
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
@@ -1075,9 +1075,9 @@ void havocbot_role_kh_carrier(entity this)
 		navigation_goalrating_start(this);
 
 		if(kh_Key_AllOwnedByWhichTeam() == this.team)
-			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // bring home
+			havocbot_goalrating_kh(this, 10, 0.1, 0.05); // bring home
 		else
-			havocbot_goalrating_kh(this, 4, 4, 1); // play defensively
+			havocbot_goalrating_kh(this, 4, 4, 0.5); // play defensively
 
 		navigation_goalrating_end(this);
 
@@ -1115,11 +1115,11 @@ void havocbot_role_kh_defense(entity this)
 
 		key_owner_team = kh_Key_AllOwnedByWhichTeam();
 		if(key_owner_team == this.team)
-			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend key carriers
+			havocbot_goalrating_kh(this, 10, 0.1, 0.05); // defend key carriers
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(this, 4, 1, 0.1); // play defensively
+			havocbot_goalrating_kh(this, 4, 1, 0.05); // play defensively
 		else
-			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY
+			havocbot_goalrating_kh(this, 0.1, 0.1, 5); // ATTACK ANYWAY
 
 		navigation_goalrating_end(this);
 
@@ -1158,11 +1158,11 @@ void havocbot_role_kh_offense(entity this)
 
 		key_owner_team = kh_Key_AllOwnedByWhichTeam();
 		if(key_owner_team == this.team)
-			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway
+			havocbot_goalrating_kh(this, 10, 0.1, 0.05); // defend anyway
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(this, 0.1, 1, 4); // play offensively
+			havocbot_goalrating_kh(this, 0.1, 1, 2); // play offensively
 		else
-			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK! EMERGENCY!
+			havocbot_goalrating_kh(this, 0.1, 0.1, 5); // ATTACK! EMERGENCY!
 
 		navigation_goalrating_end(this);
 
@@ -1207,11 +1207,11 @@ void havocbot_role_kh_freelancer(entity this)
 
 		int key_owner_team = kh_Key_AllOwnedByWhichTeam();
 		if(key_owner_team == this.team)
-			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway
+			havocbot_goalrating_kh(this, 10, 0.1, 0.05); // defend anyway
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(this, 1, 10, 4); // prefer dropped keys
+			havocbot_goalrating_kh(this, 1, 10, 2); // prefer dropped keys
 		else
-			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY
+			havocbot_goalrating_kh(this, 0.1, 0.1, 5); // ATTACK ANYWAY
 
 		navigation_goalrating_end(this);