Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heroes' Guild update and bug fixes #497

Merged
merged 13 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/cfg/doors/double-doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,15 @@
"left": 1596,
"right": 1597
}
},
{
"opened": {
"left": 1517,
"right": 1520
},
"closed": {
"left": 1516,
"right": 1519
}
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -13,54 +13,56 @@ spawn_npc(npc = Npcs.CITIZEN, x = 2565, z = 3149, height = 0, walkRadius = 5, di
spawn_npc(npc = Npcs.HENGRAD, x = 2598, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Hengrad
spawn_npc(npc = Npcs.JOE, x = 2587, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Joe
spawn_npc(npc = Npcs.KELVIN, x = 2589, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Kelvin
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2564, z = 3146, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7520, x = 2564, z = 3153, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7519, x = 2566, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2567, z = 3149, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7518, x = 2569, z = 3144, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2570, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2564, z = 3146, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7520, x = 2564, z = 3153, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7519, x = 2566, z = 3142, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2567, z = 3149, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7518, x = 2569, z = 3144, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2570, z = 3142, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2577, z = 3162, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7514, x = 2578, z = 3159, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7515, x = 2578, z = 3164, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7514, x = 2578, z = 3159, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7515, x = 2578, z = 3160, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7514, x = 2578, z = 3163, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7515, x = 2578, z = 3164, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2579, z = 3171, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2580, z = 3166, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2583, z = 3149, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2584, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7504, x = 2588, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7511, x = 2589, z = 3148, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7506, x = 2589, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2589, z = 3193, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7510, x = 2590, z = 3148, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2591, z = 3139, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2592, z = 3182, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2592, z = 3185, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2583, z = 3149, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2584, z = 3142, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7504, x = 2588, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7511, x = 2589, z = 3148, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7506, x = 2589, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2589, z = 3193, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7510, x = 2590, z = 3148, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2591, z = 3139, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2592, z = 3182, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2592, z = 3185, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2593, z = 3179, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7512, x = 2594, z = 3148, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7508, x = 2594, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7512, x = 2594, z = 3148, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7508, x = 2594, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2594, z = 3176, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2595, z = 3139, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7513, x = 2595, z = 3148, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7505, x = 2595, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2596, z = 3184, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2598, z = 3182, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7507, x = 2599, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2599, z = 3193, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2595, z = 3139, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7513, x = 2595, z = 3148, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7505, x = 2595, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2596, z = 3184, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2598, z = 3182, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7507, x = 2599, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2599, z = 3193, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7509, x = 2600, z = 3174, height = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7506, x = 2601, z = 3174, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7506, x = 2601, z = 3174, height = 0, walkRadius = 0, direction = Direction.SOUTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2606, z = 3171, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2607, z = 3183, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2607, z = 3185, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2608, z = 3186, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2609, z = 3149, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2610, z = 3149, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2614, z = 3150, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2614, z = 3186, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2616, z = 3172, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2618, z = 3159, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2618, z = 3166, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2592, z = 3163, height = 3, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2594, z = 3162, height = 3, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_LAUNDERER, x = 2564, z = 3172, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Khazard launderer
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2607, z = 3183, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2607, z = 3185, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2608, z = 3186, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2609, z = 3149, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_256, x = 2610, z = 3149, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2614, z = 3150, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_255, x = 2614, z = 3186, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2616, z = 3172, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2618, z = 3159, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_7528, x = 2618, z = 3166, height = 0, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD_254, x = 2592, z = 3163, height = 3, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_GUARD, x = 2594, z = 3162, height = 3, walkRadius = 0, direction = Direction.NORTH, static = true) //Khazard Guard
spawn_npc(npc = Npcs.KHAZARD_LAUNDERER, x = 2564, z = 3172, height = 0, walkRadius = 5, direction = Direction.NORTH, static = true) //Khazard launderer
spawn_npc(npc = Npcs.LOCAL, x = 2583, z = 3171, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Local
spawn_npc(npc = Npcs.SLAVE_FIGHTER, x = 2595, z = 3142, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Slave fighter
spawn_npc(npc = Npcs.SLAVE_FIGHTER, x = 2616, z = 3160, height = 0, walkRadius = 5, direction = Direction.NORTH, static = false) //Slave fighter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ spawn_npc(npc = Npcs.MONKEY, x = 2791, z = 3181, walkRadius = 5, direction = Dir
spawn_npc(npc = Npcs.MONKEY, x = 2758, z = 3170, walkRadius = 5, direction = Direction.EAST)
spawn_npc(npc = Npcs.MONKEY, x = 2754, z = 3167, walkRadius = 5, direction = Direction.WEST)
spawn_npc(npc = Npcs.MONKEY, x = 2754, z = 3175, walkRadius = 5, direction = Direction.NORTH)
spawn_npc(npc = Npcs.FLY_TRAP, x = 2756, z = 3156, walkRadius = 5, direction = Direction.EAST)
spawn_npc(npc = Npcs.FLY_TRAP, x = 2760, z = 3152, walkRadius = 5, direction = Direction.SOUTH)
spawn_npc(npc = Npcs.FLY_TRAP, x = 2756, z = 3156, walkRadius = 0, direction = Direction.EAST, static = true)
spawn_npc(npc = Npcs.FLY_TRAP, x = 2760, z = 3152, walkRadius = 0, direction = Direction.SOUTH, static = true)
spawn_npc(npc = Npcs.CAPN_IZZY_NOBEARD, x = 2807, z = 3191, walkRadius = 5, direction = Direction.NORTH_WEST)
spawn_npc(npc = Npcs.DAVON, x = 2803, z = 3152, walkRadius = 5, direction = Direction.WEST)
spawn_npc(npc = Npcs.IMP, x = 2806, z = 3181, walkRadius = 5, direction = Direction.WEST)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package gg.rsmod.plugins.content.areas.taverley

import gg.rsmod.game.model.shop.PurchasePolicy
import gg.rsmod.game.model.shop.ShopItem
import gg.rsmod.plugins.api.cfg.Items
import gg.rsmod.plugins.api.cfg.Npcs
import gg.rsmod.plugins.api.ext.openShop
import gg.rsmod.plugins.api.ext.player
import gg.rsmod.plugins.content.mechanics.shops.CoinCurrency

/**
* @author Harley <https://github.com/HarleyGilpin>
*/

create_shop("Happy Heroes' H'emporium", CoinCurrency(), containsSamples = false, purchasePolicy = PurchasePolicy.BUY_STOCK) {
items[0] = ShopItem(Items.DRAGON_BATTLEAXE, 10)
items[1] = ShopItem(Items.DRAGON_MACE, 10)
}

on_npc_option(npc = Npcs.HELEMOS, option = "trade") {
player.openShop("Happy Heroes' H'emporium")
}

on_npc_option(npc = Npcs.HELEMOS, option = "talk-to") {
player.queue {
mainChat (this, player)
}
}

suspend fun mainChat(it: QueueTask, player: Player) {
it.chatNpc(
"Welcome to the Heroes' Guild!")
when (it.options(
"So do you sell anything here?",
"So what can I do here?"
)) {
FIRST_OPTION -> {
it.chatPlayer("So do you sell anything good here?")
it.chatNpc("Why yes! We DO run an exclusive shop for our members!", wrap = true)
player.openShop("Happy Heroes' H'emporium")
}
SECOND_OPTION -> {
it.chatPlayer("So what can I do here?")
it.chatNpc("Look around... there are all sorts of things to keep our guild members entertained!", wrap = true)
}
}
}
Loading