From 919e06f72fd65e712f6aaa8ee596ebaf87b323ab Mon Sep 17 00:00:00 2001
From: ScrawnyRonnie <scrawnyronniebbac@yahoo.com>
Date: Tue, 28 Oct 2025 18:55:45 -0400
Subject: [PATCH] swap iffs, disable nonfunctional items

---
 server/src/main/resources/overrides/game_objects0.adb.lst | 3 +++
 src/main/resources/zonemaps/map02.json                    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst
index b62b955a..dab132d9 100644
--- a/server/src/main/resources/overrides/game_objects0.adb.lst
+++ b/server/src/main/resources/overrides/game_objects0.adb.lst
@@ -55,6 +55,7 @@ add_property lasher holstertime 750
 add_property lasher_projectile_ap lasher_projectile_ap false
 add_property lasher_projectile_ap lasher_projectile true
 add_property lightgunship maxhealth 855
+add_property maelstrom allowed false
 add_property maelstrom equiptime 1000
 add_property maelstrom holstertime 1000
 add_property magcutter equiptime 250
@@ -67,6 +68,7 @@ add_property mini_chaingun equiptime 750
 add_property mini_chaingun holstertime 750
 add_property nano_dispenser equiptime 750
 add_property nano_dispenser holstertime 750
+add_property oicw allowed false
 add_property pellet_gun equiptime 600
 add_property pellet_gun holstertime 600
 add_property peregrine_flight requirement_award0 false
@@ -93,6 +95,7 @@ add_property super_staminakit nodrop false
 add_property super_staminakit requirement_award0 false
 add_property suppressor equiptime 600
 add_property suppressor holstertime 600
+add_property trek allowed false
 add_property trek equiptime 500
 add_property trek holstertime 500
 add_property vulture requirement_award0 false
diff --git a/src/main/resources/zonemaps/map02.json b/src/main/resources/zonemaps/map02.json
index f833733c..4b2838e9 100644
--- a/src/main/resources/zonemaps/map02.json
+++ b/src/main/resources/zonemaps/map02.json
@@ -10538,7 +10538,7 @@
     "AbsY": 3005.953,
     "AbsZ": 45.12653,
     "Yaw": 270.0,
-    "GUID": 841,
+    "GUID": 842,
     "MapID": null,
     "IsChildObject": true
   },
@@ -10551,7 +10551,7 @@
     "AbsY": 2993.183,
     "AbsZ": 52.54653,
     "Yaw": 0.0,
-    "GUID": 842,
+    "GUID": 841,
     "MapID": null,
     "IsChildObject": true
   },