From: terencehill Date: Wed, 18 Apr 2018 13:36:13 +0000 (+0200) Subject: Set consistent rating scales in havocbot_goalrating_enemyplayers calls (no actual... X-Git-Tag: xonotic-v0.8.5~1923^2~64 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1986f19a67;p=xonotic%2Fxonotic-data.pk3dir.git Set consistent rating scales in havocbot_goalrating_enemyplayers calls (no actual change) --- diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 2637aeef2..b714a5ebc 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -1485,7 +1485,7 @@ void havocbot_role_ons_offense(entity this) if (navigation_goalrating_timeout(this)) { navigation_goalrating_start(this); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 650); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 650); if(!havocbot_goalrating_ons_generator_attack(this, 20000)) havocbot_goalrating_ons_controlpoints_attack(this, 20000); havocbot_goalrating_ons_offenseitems(this, 10000, this.origin, 10000); diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc index e46943601..3909f5900 100644 --- a/qcsrc/server/bot/default/havocbot/roles.qc +++ b/qcsrc/server/bot/default/havocbot/roles.qc @@ -112,7 +112,7 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float { float rating; vector o; - ratingscale = ratingscale * 0.0001; // items are rated around 10000 already + ratingscale = ratingscale * 0.0001; IL_EACH(g_items, it.bot_pickup, { @@ -190,7 +190,7 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org if(this.waterlevel>WATERLEVEL_WETFEET) return; - ratingscale = ratingscale * 0.00005; // enemies are rated around 20000 already + ratingscale = ratingscale * 0.0001; float t; FOREACH_CLIENT(IS_PLAYER(it) && bot_shouldattack(this, it), { @@ -234,7 +234,7 @@ void havocbot_role_generic(entity this) { navigation_goalrating_start(this); havocbot_goalrating_items(this, 10000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000); havocbot_goalrating_waypoints(this, 1, this.origin, 3000); navigation_goalrating_end(this); diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc index d43dc9999..5dd620f13 100644 --- a/qcsrc/server/mutators/mutator/gamemode_assault.qc +++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc @@ -474,7 +474,7 @@ void havocbot_role_ast_offense(entity this) if (navigation_goalrating_timeout(this)) { navigation_goalrating_start(this); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 650); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 650); havocbot_goalrating_ast_targets(this, 20000); havocbot_goalrating_items(this, 15000, this.origin, 10000); navigation_goalrating_end(this); @@ -508,7 +508,7 @@ void havocbot_role_ast_defense(entity this) if (navigation_goalrating_timeout(this)) { navigation_goalrating_start(this); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 3000); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 3000); havocbot_goalrating_ast_targets(this, 20000); havocbot_goalrating_items(this, 15000, this.origin, 10000); navigation_goalrating_end(this); diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index 53ea68958..362e8cee7 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc @@ -1959,7 +1959,7 @@ void havocbot_role_ctf_middle(entity this) havocbot_goalrating_ctf_ourstolenflag(this, 50000); havocbot_goalrating_ctf_droppedflags(this, 30000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 10000, org, havocbot_middlepoint_radius * 0.5); + havocbot_goalrating_enemyplayers(this, 5000, org, havocbot_middlepoint_radius * 0.5); havocbot_goalrating_items(this, 5000, org, havocbot_middlepoint_radius * 0.5); havocbot_goalrating_items(this, 2500, this.origin, 10000); havocbot_goalrating_ctf_enemybase(this, 2500); @@ -2032,7 +2032,7 @@ void havocbot_role_ctf_defense(entity this) havocbot_goalrating_ctf_ourstolenflag(this, 20000); havocbot_goalrating_ctf_droppedflags(this, 20000, org, havocbot_middlepoint_radius); - havocbot_goalrating_enemyplayers(this, 15000, org, havocbot_middlepoint_radius); + havocbot_goalrating_enemyplayers(this, 7500, org, havocbot_middlepoint_radius); havocbot_goalrating_items(this, 10000, org, havocbot_middlepoint_radius); havocbot_goalrating_items(this, 5000, this.origin, 10000); diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc index 38ef58b6c..b0e6eabe6 100644 --- a/qcsrc/server/mutators/mutator/gamemode_domination.qc +++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc @@ -407,7 +407,7 @@ void havocbot_role_dom(entity this) navigation_goalrating_start(this); havocbot_goalrating_controlpoints(this, 10000, this.origin, 15000); havocbot_goalrating_items(this, 8000, this.origin, 8000); - //havocbot_goalrating_enemyplayers(this, 3000, this.origin, 2000); + //havocbot_goalrating_enemyplayers(this, 1500, this.origin, 2000); havocbot_goalrating_waypoints(this, 1, this.origin, 3000); navigation_goalrating_end(this); diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc index 36546c43a..8a23be2d7 100644 --- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc @@ -261,7 +261,7 @@ void havocbot_role_ft_offense(entity this) { navigation_goalrating_start(this); havocbot_goalrating_items(this, 10000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000); havocbot_goalrating_freeplayers(this, 9000, this.origin, 10000); havocbot_goalrating_waypoints(this, 1, this.origin, 3000); navigation_goalrating_end(this); @@ -290,7 +290,7 @@ void havocbot_role_ft_freeing(entity this) { navigation_goalrating_start(this); havocbot_goalrating_items(this, 8000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000); + havocbot_goalrating_enemyplayers(this, 5000, this.origin, 10000); havocbot_goalrating_freeplayers(this, 20000, this.origin, 10000); havocbot_goalrating_waypoints(this, 1, this.origin, 3000); navigation_goalrating_end(this); diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc index 567f24b47..9c9718e45 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc @@ -236,7 +236,7 @@ void havocbot_role_ka_carrier(entity this) { navigation_goalrating_start(this); havocbot_goalrating_items(this, 10000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000); + havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000); havocbot_goalrating_waypoints(this, 1, this.origin, 3000); navigation_goalrating_end(this); @@ -259,7 +259,7 @@ void havocbot_role_ka_collector(entity this) { navigation_goalrating_start(this); havocbot_goalrating_items(this, 10000, this.origin, 10000); - havocbot_goalrating_enemyplayers(this, 1000, this.origin, 10000); + havocbot_goalrating_enemyplayers(this, 500, this.origin, 10000); havocbot_goalrating_ball(this, 20000, this.origin); navigation_goalrating_end(this);