Npc updates

Author: hydrozoa-yt

src/main/kotlin/game/game/location/lumbridge/lumbridge.kts

@@ -204,12 +204,12 @@ on(ServerLaunchEvent::class) {
         id = 520,
         x = 3212,
         y = 3245)
-        .startWandering(8, WanderingFrequency.RAPID)
+        .startWandering(8, WanderingFrequency.NORMAL)
     world.addNpc(
         id = 521,
         x = 3212,
         y = 3248)
-        .startWandering(8, WanderingFrequency.RAPID)
+        .startWandering(8, WanderingFrequency.NORMAL)
 
     // Hans
     world.addNpc(

src/main/kotlin/game/game/location/portSarim/briansBattleaxes.kts

@@ -0,0 +1,53 @@
+package game.location.portSarim
+
+import api.predef.*
+import api.predef.ext.*
+import api.shop.dsl.ShopHandler
+import io.luna.game.event.impl.ServerStateChangedEvent.ServerLaunchEvent
+import io.luna.game.model.item.shop.*
+import io.luna.game.model.mob.wandering.*
+
+val shopkeeperId = 559
+
+ShopHandler.create("Brian's Battleaxe Bazaar.") {
+    buy = BuyPolicy.EXISTING
+    restock = RestockPolicy.DEFAULT
+    currency = Currency.COINS
+
+    sell {
+        "Bronze battleaxe" x 4
+        "Iron battleaxe" x 3
+        "Steel battleaxe" x 2
+        "Black battleaxe" x 1
+        "Mithril battleaxe" x 1
+        "Adamant battleaxe" x 1
+    }
+
+    open {
+        npc2 += shopkeeperId
+    }
+}
+
+npc1(shopkeeperId, {
+    plr.newDialogue()
+        .options(
+            "So, are you selling something?", {
+                plr.newDialogue()
+                    .player("So, are you selling something?")
+                    .npc(targetNpc.id, "Yep, take a lok at these great axes!")
+                    .then({it.overlays.open(ShopInterface(world, "Brian's Battleaxe Bazaar."))})
+                    .open()
+            },
+            "'Ello.", {
+                plr.newDialogue()
+                    .player("'Ello.")
+                    .npc(targetNpc.id, "'Ello!")
+                    .open()
+            })
+        .open()
+})
+
+on(ServerLaunchEvent::class) {
+    world.addNpc(shopkeeperId, 3029, 3249)
+        .startWandering(3, WanderingFrequency.NORMAL)
+}

…me/game/location/portSarim/portSarim.kts …game/location/portSarim/gerrantsFish.ktssrc/main/kotlin/game/game/location/portSarim/portSarim.kts renamed to src/main/kotlin/game/game/location/portSarim/gerrantsFish.kts src/main/kotlin/game/game/location/portSarim/portSarim.kts renamed to src/main/kotlin/game/game/location/portSarim/gerrantsFish.kts

@@ -5,25 +5,9 @@ import api.predef.ext.*
 import api.shop.dsl.ShopHandler
 import io.luna.game.event.impl.ServerStateChangedEvent.ServerLaunchEvent
 import io.luna.game.model.item.shop.*
+import io.luna.game.model.mob.wandering.*
 
-ShopHandler.create("Brian's Battleaxe Bazaar.") {
-    buy = BuyPolicy.EXISTING
-    restock = RestockPolicy.DEFAULT
-    currency = Currency.COINS
-
-    sell {
-        "Bronze battleaxe" x 4
-        "Iron battleaxe" x 3
-        "Steel battleaxe" x 2
-        "Black battleaxe" x 1
-        "Mithril battleaxe" x 1
-        "Adamant battleaxe" x 1
-    }
-
-    open {
-        npc2 += 559
-    }
-}
+val shopkeeperId = 558
 
 ShopHandler.create("Gerrant's Fishy Business.") {
     buy = BuyPolicy.EXISTING
@@ -51,38 +35,13 @@ ShopHandler.create("Gerrant's Fishy Business.") {
     }
 
     open {
-        npc2 += 558
+        npc2 += shopkeeperId
     }
 }
 
-/**
- * Brian dialogue
- */
-npc1(559, {
-    plr.newDialogue()
-        .options(
-            "So, are you selling something?", {
-                plr.newDialogue()
-                    .player("So, are you selling something?")
-                    .npc(559, "Yep, take a lok at these great axes!")
-                    .then({it.overlays.open(ShopInterface(world, "Brian's Battleaxe Bazaar."))})
-                    .open()
-            },
-            "'Ello.", {
-                plr.newDialogue()
-                    .player("'Ello.")
-                    .npc(559, "'Ello!")
-                    .open()
-            })
-        .open()
-})
-
-/**
- * Gerrant dialogue
- */
-npc1(558, {
+npc1(shopkeeperId, {
     plr.newDialogue()
-        .npc(558, "Wecome! You can buy fishing equipment at my store.", "We'll also buy anything you catch off you.")
+        .npc(targetNpc.id, "Wecome! You can buy fishing equipment at my store.", "We'll also buy anything you catch off you.")
         .options(
             "Let's see what you've got then.", {
                 plr.newDialogue()
@@ -97,6 +56,6 @@ npc1(558, {
 })
 
 on(ServerLaunchEvent::class) {
-    world.addNpc(559, 3029, 3249)   // Brian
-    world.addNpc(558, 3015, 3225)   // Gerrant
+    world.addNpc(shopkeeperId, 3015, 3225)
+        .startWandering(3, WanderingFrequency.NORMAL)
 }

src/main/kotlin/game/game/location/varrock/varrock.kts

@@ -8,5 +8,16 @@ import java.util.*
 
 on(ServerLaunchEvent::class) {
     // Bankers of west bank
-    //world.addNpc(494, 2945, 3366).defaultDirection = Optional.of(Direction.NORTH)
+    world.addNpc(494, 3187, 3446).defaultDirection = Optional.of(Direction.WEST)
+    world.addNpc(494, 3187, 3444).defaultDirection = Optional.of(Direction.WEST)
+    world.addNpc(494, 3187, 3442).defaultDirection = Optional.of(Direction.WEST)
+    world.addNpc(494, 3187, 3438).defaultDirection = Optional.of(Direction.WEST)
+    world.addNpc(494, 3187, 3436).defaultDirection = Optional.of(Direction.WEST)
+
+    // Bankers of east bank
+    world.addNpc(494, 3252, 3418).defaultDirection = Optional.of(Direction.NORTH)
+    world.addNpc(494, 3253, 3418).defaultDirection = Optional.of(Direction.NORTH)
+    world.addNpc(494, 3254, 3418).defaultDirection = Optional.of(Direction.NORTH)
+    world.addNpc(494, 3256, 3418).defaultDirection = Optional.of(Direction.NORTH)
+
 }