From cc19e58872b68f69ba86cc70bdf954dea809b906 Mon Sep 17 00:00:00 2001
From: Xi Xu <i@xi-xu.me>
Date: Sat, 2 Dec 2023 02:49:24 +0800
Subject: [PATCH] xi 1.0

---
 StrategySystem.cpp | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/StrategySystem.cpp b/StrategySystem.cpp
index 04a13b3..51a11f7 100644
--- a/StrategySystem.cpp
+++ b/StrategySystem.cpp
@@ -2411,30 +2411,24 @@ void CStrategySystem::Goalie() {
 
 	if (ball.position.x < hgoalie.position.x && Distance(ball.position, hgoalie.position) > 1) {
 		int xix = ball.position.x >= 873 && (ball.position.y <= 313 || ball.position.y >= 505) || ball.position.x >= 940 ? 965 : 950;
-		int xiy = 409;
 
-		if (ball.position.x >= 600) {
-			xiy = int(((ball.position.y - ball.oldPosition.y) * 1.0 / (ball.position.x - ball.oldPosition.x) * 1.0) * (xix - 9) + (ball.oldPosition.y - ((ball.position.y - ball.oldPosition.y) * 1.0 / (ball.position.x - ball.oldPosition.x) * 1.0) * ball.oldPosition.x) + 0.5);
+		int xid = 8;
+		if (abs(ball.position.y - ball.oldPosition.y) > 2)
+			xid = 10;
+		int xiy = int(((ball.position.y - ball.oldPosition.y) * 1.0 / (ball.position.x - ball.oldPosition.x) * 1.0) * (xix - xid) + (ball.oldPosition.y - ((ball.position.y - ball.oldPosition.y) * 1.0 / (ball.position.x - ball.oldPosition.x) * 1.0) * ball.oldPosition.x) + 0.5);
 
-			if (Distance(ball.position, ball.oldPosition) < 1 || ball.position.x <= ball.oldPosition.x || xiy < 313 || xiy > 505) {
-				if (ball.position.x >= 927 && ball.position.y >= 247 && ball.position.y <= 577) {
-					if (ball.position.y < 313)
-						xiy = 313;
-					else if (ball.position.y > 505)
-						xiy = 505;
-					else
-						xiy = ball.position.y;
-				}
+		if (Distance(ball.position, ball.oldPosition) < 1 || ball.position.x <= ball.oldPosition.x || xiy < 313 || xiy > 505) {
+			if (ball.position.x >= 927 && ball.position.y >= 247 && ball.position.y <= 577) {
+				if (ball.position.y < 313)
+					xiy = 313;
+				else if (ball.position.y > 505)
+					xiy = 505;
 				else
-					xiy = int((Distance(ball.position, CPoint(863, 313)) * 192 / (Distance(ball.position, CPoint(863, 313)) + Distance(ball.position, CPoint(863, 505)))) + 313.5);
-
-				if ((xit / 4) % 2)
-					xiy += 30;
-				else
-					xiy -= 30;
+					xiy = ball.position.y;
 			}
-		}
-		else {
+			else
+				xiy = int((Distance(ball.position, CPoint(863, 313)) * 192 / (Distance(ball.position, CPoint(863, 313)) + Distance(ball.position, CPoint(863, 505)))) + 313.5);
+
 			if ((xit / 4) % 2)
 				xiy += 30;
 			else