From e54e17fc077ef7d35629b5194df7f4d17f437bee Mon Sep 17 00:00:00 2001
From: "NG (Graham)" <ngniusness@gmail.com>
Date: Sun, 3 Aug 2025 18:23:24 -0400
Subject: [PATCH] Fix some incorrect team base offsets #30

---
 rc_core/src/persist/maps.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/rc_core/src/persist/maps.rs b/rc_core/src/persist/maps.rs
index 3b08de4..952f403 100644
--- a/rc_core/src/persist/maps.rs
+++ b/rc_core/src/persist/maps.rs
@@ -49,6 +49,15 @@ pub struct CaptureBase {
     pub percent_per_second: f32,
 }
 
+impl CaptureBase {
+    const fn offset(mut self, x: f32, y: f32, z: f32) -> Self {
+        self.x += x;
+        self.y += y;
+        self.z += z;
+        self
+    }
+}
+
 const DEFAULT_PERCENT_PER_SECOND: f32 = 2.5;
 const DEFAULT_BASE_RADIUS: f32 = 20.0;
 
@@ -695,7 +704,7 @@ pub(super) fn default_map() -> std::collections::HashMap<super::combat::GameMap,
                 radius: DEFAULT_BASE_RADIUS,
                 percent_per_second: DEFAULT_PERCENT_PER_SECOND,
             },
-        ],
+        ].into_iter().map(|x| x.offset(-434.640, 0.0, -414.720)).collect(),
     });
     map.insert(super::combat::GameMap::Mars3, MapConfig {
         spawn_points: vec![
@@ -839,7 +848,7 @@ pub(super) fn default_map() -> std::collections::HashMap<super::combat::GameMap,
                 radius: DEFAULT_BASE_RADIUS,
                 percent_per_second: DEFAULT_PERCENT_PER_SECOND,
             },
-        ],
+        ].into_iter().map(|x| x.offset(49.608, 0.0, 52.493)).collect(),
     });
     map.insert(super::combat::GameMap::Neptune1, MapConfig {
         spawn_points: vec![
@@ -983,7 +992,7 @@ pub(super) fn default_map() -> std::collections::HashMap<super::combat::GameMap,
                 radius: DEFAULT_BASE_RADIUS,
                 percent_per_second: DEFAULT_PERCENT_PER_SECOND,
             },
-        ],
+        ].into_iter().map(|x| x.offset(405.542, 0.0, 10.668)).collect(),
     });
     map.insert(super::combat::GameMap::Neptune2, MapConfig {
         spawn_points: vec![