From ffcbaf13b589b42ea2cf4a0139b0f6bb78caefd9 Mon Sep 17 00:00:00 2001
From: ceikry <ironceikry@gmail.com>
Date: Sun, 18 Jul 2021 11:25:40 -0500
Subject: [PATCH] Move NPCs to better locations

---
 .../npc/{other => region/fremennikisles}/FremennikGuards.kt   | 2 +-
 .../npc/{other => region/fremennikisles}/HonourGuardGFI.kt    | 2 +-
 .../{other => region/fremennikisles}/IceTrollJatizsoCaves.kt  | 4 +---
 .../entity/npc/{other => region/fremennikisles}/YakNPC.kt     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename Server/src/main/kotlin/rs09/game/node/entity/npc/{other => region/fremennikisles}/FremennikGuards.kt (94%)
 rename Server/src/main/kotlin/rs09/game/node/entity/npc/{other => region/fremennikisles}/HonourGuardGFI.kt (96%)
 rename Server/src/main/kotlin/rs09/game/node/entity/npc/{other => region/fremennikisles}/IceTrollJatizsoCaves.kt (90%)
 rename Server/src/main/kotlin/rs09/game/node/entity/npc/{other => region/fremennikisles}/YakNPC.kt (93%)

diff --git a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/FremennikGuards.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/FremennikGuards.kt
similarity index 94%
rename from Server/src/main/kotlin/rs09/game/node/entity/npc/other/FremennikGuards.kt
rename to Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/FremennikGuards.kt
index f57617276..e6cb764ff 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/FremennikGuards.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/FremennikGuards.kt
@@ -1,4 +1,4 @@
-package rs09.game.node.entity.npc.other
+package rs09.game.node.entity.npc.region.fremennikisles
 
 import api.ContentAPI
 import core.game.node.entity.npc.AbstractNPC
diff --git a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/HonourGuardGFI.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/HonourGuardGFI.kt
similarity index 96%
rename from Server/src/main/kotlin/rs09/game/node/entity/npc/other/HonourGuardGFI.kt
rename to Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/HonourGuardGFI.kt
index deba6ad9e..f0980bd3b 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/HonourGuardGFI.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/HonourGuardGFI.kt
@@ -1,4 +1,4 @@
-package rs09.game.node.entity.npc.other
+package rs09.game.node.entity.npc.region.fremennikisles
 
 import api.ContentAPI
 import core.game.node.entity.npc.AbstractNPC
diff --git a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/IceTrollJatizsoCaves.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/IceTrollJatizsoCaves.kt
similarity index 90%
rename from Server/src/main/kotlin/rs09/game/node/entity/npc/other/IceTrollJatizsoCaves.kt
rename to Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/IceTrollJatizsoCaves.kt
index 3cbd154a5..b1b08a3c3 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/IceTrollJatizsoCaves.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/IceTrollJatizsoCaves.kt
@@ -1,12 +1,10 @@
-package rs09.game.node.entity.npc.other
+package rs09.game.node.entity.npc.region.fremennikisles
 
 import api.ContentAPI
 import core.game.node.entity.npc.AbstractNPC
 import core.game.world.map.Location
 import core.plugin.Initializable
-import core.tools.RandomFunction
 import org.rs09.consts.NPCs
-import rs09.game.system.SystemLogger
 
 @Initializable
 class IceTrollJatizsoCaves : AbstractNPC {
diff --git a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/YakNPC.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/YakNPC.kt
similarity index 93%
rename from Server/src/main/kotlin/rs09/game/node/entity/npc/other/YakNPC.kt
rename to Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/YakNPC.kt
index c26ba2803..35fe6569f 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/npc/other/YakNPC.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/region/fremennikisles/YakNPC.kt
@@ -1,4 +1,4 @@
-package rs09.game.node.entity.npc.other
+package rs09.game.node.entity.npc.region.fremennikisles
 
 import core.game.node.entity.npc.AbstractNPC
 import core.game.world.map.Location