From: terencehill <piuntn@gmail.com>
Date: Thu, 15 Oct 2015 13:34:53 +0000 (+0200)
Subject: Onslaught, control point selection through the radar: increase chances that a spawnpo... 
X-Git-Tag: xonotic-v0.8.2~1800^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd3fd4c504896c7b7b4abf58383abd9bcf7361ab;p=xonotic%2Fxonotic-data.pk3dir.git

Onslaught, control point selection through the radar: increase chances that a spawnpoint can be found even if there's little room around the control point (now a spawnpoint near the control point in the middle of runningmanctf can always be found, unlike before)
---

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 8b2e223c0..19a7a5e37 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1623,15 +1623,19 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe
 	int i;
 	vector loc;
 	float theta;
+	// narrow the range for each iteration to increase chances that a spawnpoint
+	// can be found even if there's little room around the control point
+	float iteration_scale = 1;
 	for(i = 0; i < 16; ++i)
 	{
+		iteration_scale -= i / 16;
 		theta = random() * 2 * M_PI;
 		loc_y = sin(theta);
 		loc_x = cos(theta);
 		loc_z = 0;
-		loc *= random() * range;
+		loc *= random() * range * iteration_scale;
 
-		loc += tele_target.origin + '0 0 128';
+		loc += tele_target.origin + '0 0 128' * iteration_scale;
 
 		tracebox(loc, PL_MIN, PL_MAX, loc, MOVE_NORMAL, player);
 		if(trace_fraction == 1.0 && !trace_startsolid)
@@ -1737,10 +1741,12 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
 		{
 			float i;
 			vector loc;
+			float iteration_scale = 1;
 			for(i = 0; i < 10; ++i)
 			{
-				loc = closest_target.origin + '0 0 96';
-				loc += ('0 1 0' * random()) * 128;
+				iteration_scale -= i / 10;
+				loc = closest_target.origin + '0 0 96' * iteration_scale;
+				loc += ('0 1 0' * random()) * 128 * iteration_scale;
 				tracebox(loc, PL_MIN, PL_MAX, loc, MOVE_NORMAL, self);
 				if(trace_fraction == 1.0 && !trace_startsolid)
 				{
@@ -1786,10 +1792,12 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
 		{
 			float i;
 			vector loc;
+			float iteration_scale = 1;
 			for(i = 0; i < 10; ++i)
 			{
-				loc = closest_target.origin + '0 0 128';
-				loc += ('0 1 0' * random()) * 256;
+				iteration_scale -= i / 10;
+				loc = closest_target.origin + '0 0 128' * iteration_scale;
+				loc += ('0 1 0' * random()) * 256 * iteration_scale;
 				tracebox(loc, PL_MIN, PL_MAX, loc, MOVE_NORMAL, self);
 				if(trace_fraction == 1.0 && !trace_startsolid)
 				{