add oildunes, finish for today

BattleBit-Gamenight · Oct 20, 2024 · 42111c5 · 42111c5
1 parent 7d56e13
commit 42111c5
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 14 deletions.
diff --git a/Data/RegionList.cs b/Data/RegionList.cs
@@ -24,11 +24,16 @@ public class RegionList
                 TensatownRegions.TeamASafeZone,
                 TensatownRegions.TeamBSafeZone
             },
-            "DustyDew" => new List<RegionHelper.Region?>
+            "Dustydew" => new List<RegionHelper.Region?>
             {
                 DustydewRegions.TeamASafeZone,
                 DustydewRegions.TeamBSafeZone
             },
+            "OilDunes" => new List<RegionHelper.Region?>
+            {
+                OildunesRegions.TeamASafeZone,
+                OildunesRegions.TeamBSafeZone
+            },
             _ => new List<RegionHelper.Region?>()
         };
     }

diff --git a/Data/Regions/OildunesRegions.cs b/Data/Regions/OildunesRegions.cs
@@ -0,0 +1,51 @@
+using System.Numerics;
+using BattleBitMinigames.Handlers;
+
+namespace BattleBitMinigames.Data.Regions;
+
+public class OildunesRegions
+{
+    // US safe zone
+    public static readonly RegionHelper.Region TeamASafeZone = new(
+        "US Safe Zone",
+        "You've entered the US Safe Zone. Please leave immediately.",
+        new List<Vector2>
+        {
+            new(-225, -215),
+            new(-213, -97),
+            new(-224, -56),
+            new(-208, -20),
+            new(-190, 110),
+            new(-189, 149),
+            new(-51, 209),
+            new(-40, 278),
+            new(-268, 279),
+            new(-370, 75),
+            new(-373, -69),
+            new(-267, -229)
+        }
+    );
+
+    // RU safe zone region
+    public static readonly RegionHelper.Region? TeamBSafeZone = new(
+        "RU Safe Zone",
+        "You've entered the RU Safe Zone. Please leave immediately.",
+        new List<Vector2>
+        {
+            new(192, 233),
+            new(207, 230),
+            new(230, 266),
+            new(326, 178),
+            new(368, 55),
+            new(367, -55),
+            new(234, -293),
+            new(-30, -299),
+            new(9, -220),
+            new(73, -200),
+            new(141, -152),
+            new(177, -62),
+            new(168, 62),
+            new(175, 181)
+        }
+    );
+}
diff --git a/Events/HideAndSeekGamemode.cs b/Events/HideAndSeekGamemode.cs
@@ -33,11 +33,11 @@ public class HideAndSeekGamemode : Event
     private float SeekerReceiveDamageMultiplier { get; set; } = 0.0f;
 
     // RADAR DISTANCE
-    private const int SpicyRadarDistance = 25;
-    private const int HotRadarDistance = 50;
+    private const int SpicyRadarDistance = 35;
+    //private const int HotRadarDistance = 50;
     private const int WarmRadarDistance = 75;
-    private const int ColdRadarDistance = 150;
-    private const int FreezingRadarDistance = 300;
+    //private const int ColdRadarDistance = 150;
+    //private const int FreezingRadarDistance = 300;
 
     // DO NOT CHANGE THESE VALUES
     private MinigameStates State { get; set; } = MinigameStates.WaitingForPlayers;
@@ -132,17 +132,19 @@ private async void StartPlayerSeekerMeter()
                     var seekingMeterString = closestDistance switch
                     {
                         <= SpicyRadarDistance =>
-                            $"{RichTextHelper.FromColorName("IndianRed")}SPICY{RichTextHelper.FromColorName("Snow")} (0-25m)",
-                        <= HotRadarDistance =>
-                            $"{RichTextHelper.FromColorName("Red")}HOT{RichTextHelper.FromColorName("Snow")} (25-50m)",
+                            $"{RichTextHelper.FromColorName("IndianRed")}SPICY{RichTextHelper.FromColorName("Snow")} (0-35m)",
+                        //<= HotRadarDistance =>
+                        //    $"{RichTextHelper.FromColorName("Red")}HOT{RichTextHelper.FromColorName("Snow")} (25-50m)",
                         <= WarmRadarDistance =>
-                            $"{RichTextHelper.FromColorName("Orange")}WARM{RichTextHelper.FromColorName("Snow")} (50-75m)",
-                        <= ColdRadarDistance =>
-                            $"{RichTextHelper.FromColorName("Blue")}COLD{RichTextHelper.FromColorName("Snow")} (75-150m)",
-                        <= FreezingRadarDistance =>
-                            $"{RichTextHelper.FromColorName("Blue")}FREEZING{RichTextHelper.FromColorName("Snow")} (150-300m)",
+                            $"{RichTextHelper.FromColorName("Orange")}WARM{RichTextHelper.FromColorName("Snow")} (35-75m)",
                         _ =>
-                            $"{RichTextHelper.FromColorName("Violet")}NO LIFE DETECTED{RichTextHelper.FromColorName("Snow")} (300m+)"
+                            $"{RichTextHelper.FromColorName("Violet")}COLD{RichTextHelper.FromColorName("Snow")} (75m+)"
+                        //<= ColdRadarDistance =>
+                        //    $"{RichTextHelper.FromColorName("Blue")}COLD{RichTextHelper.FromColorName("Snow")} (75-150m)",
+                        //<= FreezingRadarDistance =>
+                        //    $"{RichTextHelper.FromColorName("Blue")}FREEZING{RichTextHelper.FromColorName("Snow")} (150-300m)",
+                        //_ =>
+                        //    $"{RichTextHelper.FromColorName("Violet")}NO LIFE DETECTED{RichTextHelper.FromColorName("Snow")} (300m+)"
                     };
 
                     if (closestHiderName != "")