alpha 7

Andrewgdewar · Feb 12, 2025 · cd34f3c · cd34f3c
1 parent 9888949
commit cd34f3c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/dist/DewardianDev-MOAR-3.0.1-alpha-6.zip → dist/DewardianDev-MOAR-3.0.1-alpha-7.zip b/dist/DewardianDev-MOAR-3.0.1-alpha-6.zip → dist/DewardianDev-MOAR-3.0.1-alpha-7.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOAR",
-  "version": "3.0.1-alpha-6",
+  "version": "3.0.1-alpha-7",
   "main": "src/mod.js",
   "license": "MIT",
   "author": "DewardianDev",

diff --git a/src/SpawnZoneChanges/setupSpawn.ts b/src/SpawnZoneChanges/setupSpawn.ts
@@ -151,7 +151,7 @@ export const setupSpawns = (container: DependencyContainer) => {
           ? {
             ...point,
             Categories: ["Player"],
-            BotZoneName: point?.BotZoneName ? point.BotZoneName : "",
+            BotZoneName: "",
             CorePointId: 0,
             Sides: ["Pmc"],
           }

diff --git a/src/Spawning/spawnZoneUtils.ts b/src/Spawning/spawnZoneUtils.ts
@@ -156,7 +156,7 @@ export function cleanClosest(
   // }
 }
 
-function uuidv4() {
+export function uuidv4() {
   return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, (c) =>
     (
       +c ^
@@ -315,6 +315,7 @@ export const AddCustomPlayerSpawnPoints = (
         Radius: 20,
       },
     },
+    isCustom: true,
     CorePointId: 0,
     DelayToCanSpawnSec: 4,
     Id: uuidv4(),

diff --git a/src/Spawning/updateSpawnLocations.ts b/src/Spawning/updateSpawnLocations.ts
@@ -8,6 +8,7 @@ import { globalValues } from "../GlobalValues";
 import getSortedSpawnPointList, {
   getClosestZone,
   getDistance,
+  uuidv4,
 } from "./spawnZoneUtils";
 
 export default function updateSpawnLocations(
@@ -41,6 +42,7 @@ export default function updateSpawnLocations(
       ) {
         possibleSpawnList.push({
           ...point,
+          Id: uuidv4(),
           Categories: ["Player"],
           BotZoneName: "",
           CorePointId: 0,
@@ -67,16 +69,16 @@ export default function updateSpawnLocations(
 
     const isGZ = map.includes("gz");
 
-    const newPMCSpawns = canBeConverted.map((point) => ({
+    const newPMCSpawns = canBeConverted.filter(({ isCustom }: any) => !isCustom).map((point) => ({
       ...point,
       BotZoneName: isGZ
         ? "ZoneSandbox"
         : getClosestZone(
-            mapSpawns,
-            point.Position.x,
-            point.Position.y,
-            point.Position.z
-          ),
+          mapSpawns,
+          point.Position.x,
+          point.Position.y,
+          point.Position.z
+        ),
       Categories: ["Coop", Math.random() ? "Group" : "Opposite"],
       Sides: ["Pmc"],
       CorePointId: 0,