From d4de32c82c7613e8528866116081887aab72337d Mon Sep 17 00:00:00 2001 From: Major- Date: Mon, 20 Aug 2018 20:41:27 +0100 Subject: [PATCH] Rename npc_spawn function to spawnNpc --- game/plugin/entity/spawn/src/spawn.kt | 20 +- .../locations/al-kharid/src/npcs.plugin.kts | 128 +++---- .../locations/edgeville/src/npcs.plugin.kts | 74 ++-- .../locations/falador/src/npcs.plugin.kts | 236 ++++++------- .../locations/lumbridge/src/npcs.plugin.kts | 22 +- .../tutorial-island/src/npcs.plugin.kts | 44 +-- .../locations/varrock/src/npcs.plugin.kts | 322 +++++++++--------- .../skills/fishing/src/spots.plugin.kts | 258 +++++++------- 8 files changed, 555 insertions(+), 549 deletions(-) diff --git a/game/plugin/entity/spawn/src/spawn.kt b/game/plugin/entity/spawn/src/spawn.kt index f21f7d20..f70c9a28 100644 --- a/game/plugin/entity/spawn/src/spawn.kt +++ b/game/plugin/entity/spawn/src/spawn.kt @@ -5,13 +5,19 @@ import org.apollo.game.model.Direction import org.apollo.game.model.Graphic import org.apollo.game.model.Position -data class Spawn(val id: Int?, val name: String, val position: Position, val facing: Direction, - val spawnAnimation: Animation? = null, val spawnGraphic: Graphic? = null) +fun spawnNpc(name: String, x: Int, y: Int, z: Int = 0, id: Int? = null, facing: Direction = Direction.NORTH) { + Spawns.list += Spawn(id, name, Position(x, y, z), facing) +} -object Spawns { +internal data class Spawn( + val id: Int?, + val name: String, + val position: Position, + val facing: Direction, + val spawnAnimation: Animation? = null, + val spawnGraphic: Graphic? = null +) + +internal object Spawns { val list = mutableListOf() } - -fun npc_spawn(name: String, x: Int, y: Int, z: Int = 0, id: Int? = null, facing: Direction = Direction.NORTH) { - Spawns.list.add(Spawn(id, name, Position(x, y, z), facing)) -} diff --git a/game/plugin/locations/al-kharid/src/npcs.plugin.kts b/game/plugin/locations/al-kharid/src/npcs.plugin.kts index 71fa6ce0..79b74471 100644 --- a/game/plugin/locations/al-kharid/src/npcs.plugin.kts +++ b/game/plugin/locations/al-kharid/src/npcs.plugin.kts @@ -1,114 +1,114 @@ package org.apollo.plugin.locations.alKharid import org.apollo.game.model.Direction -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc // Generic npcs -npc_spawn("man", x = 3276, y = 3186) -npc_spawn("man", x = 3282, y = 3197) +spawnNpc("man", x = 3276, y = 3186) +spawnNpc("man", x = 3282, y = 3197) -npc_spawn("man", id = 3, x = 3301, y = 3200) -npc_spawn("man", id = 3, x = 3300, y = 3208) +spawnNpc("man", id = 3, x = 3301, y = 3200) +spawnNpc("man", id = 3, x = 3300, y = 3208) -npc_spawn("man", id = 2, x = 3297, y = 3196) +spawnNpc("man", id = 2, x = 3297, y = 3196) -npc_spawn("man", id = 16, x = 3294, y = 3204) +spawnNpc("man", id = 16, x = 3294, y = 3204) -npc_spawn("spider", x = 3319, y = 3145) -npc_spawn("spider", x = 3319, y = 3140) -npc_spawn("spider", x = 3323, y = 3138) +spawnNpc("spider", x = 3319, y = 3145) +spawnNpc("spider", x = 3319, y = 3140) +spawnNpc("spider", x = 3323, y = 3138) -npc_spawn("scorpion", x = 3282, y = 3149) +spawnNpc("scorpion", x = 3282, y = 3149) // Camels -npc_spawn("cam_the_camel", x = 3295, y = 3232) -npc_spawn("elly_the_camel", x = 3312, y = 3210) -npc_spawn("camel", x = 3285, y = 3198) -npc_spawn("ollie_the_camel", x = 3291, y = 3209) -npc_spawn("al_the_camel", x = 3275, y = 3162) +spawnNpc("cam_the_camel", x = 3295, y = 3232) +spawnNpc("elly_the_camel", x = 3312, y = 3210) +spawnNpc("camel", x = 3285, y = 3198) +spawnNpc("ollie_the_camel", x = 3291, y = 3209) +spawnNpc("al_the_camel", x = 3275, y = 3162) // Quest npc -npc_spawn("osman", x = 3286, y = 3180, facing = Direction.EAST) +spawnNpc("osman", x = 3286, y = 3180, facing = Direction.EAST) -npc_spawn("hassan", x = 3302, y = 3163) +spawnNpc("hassan", x = 3302, y = 3163) -npc_spawn("father_reen", x = 3272, y = 3158) +spawnNpc("father_reen", x = 3272, y = 3158) -npc_spawn("man", id = 663, x = 3297, y = 3287) +spawnNpc("man", id = 663, x = 3297, y = 3287) // Boarder guards -npc_spawn("border_guard", x = 3268, y = 3226) -npc_spawn("border_guard", x = 3267, y = 3226) -npc_spawn("border_guard", x = 3268, y = 3229, facing = Direction.SOUTH) -npc_spawn("border_guard", x = 3267, y = 3229, facing = Direction.SOUTH) +spawnNpc("border_guard", x = 3268, y = 3226) +spawnNpc("border_guard", x = 3267, y = 3226) +spawnNpc("border_guard", x = 3268, y = 3229, facing = Direction.SOUTH) +spawnNpc("border_guard", x = 3267, y = 3229, facing = Direction.SOUTH) // Palace guards -npc_spawn("Al-Kharid warrior", x = 3285, y = 3174) -npc_spawn("Al-Kharid warrior", x = 3283, y = 3168) -npc_spawn("Al-Kharid warrior", x = 3285, y = 3169) -npc_spawn("Al-Kharid warrior", x = 3290, y = 3162) -npc_spawn("Al-Kharid warrior", x = 3295, y = 3170) -npc_spawn("Al-Kharid warrior", x = 3300, y = 3175) -npc_spawn("Al-Kharid warrior", x = 3300, y = 3171) -npc_spawn("Al-Kharid warrior", x = 3301, y = 3168) +spawnNpc("Al-Kharid warrior", x = 3285, y = 3174) +spawnNpc("Al-Kharid warrior", x = 3283, y = 3168) +spawnNpc("Al-Kharid warrior", x = 3285, y = 3169) +spawnNpc("Al-Kharid warrior", x = 3290, y = 3162) +spawnNpc("Al-Kharid warrior", x = 3295, y = 3170) +spawnNpc("Al-Kharid warrior", x = 3300, y = 3175) +spawnNpc("Al-Kharid warrior", x = 3300, y = 3171) +spawnNpc("Al-Kharid warrior", x = 3301, y = 3168) // Shanty pass -npc_spawn("shantay_guard", x = 3301, y = 3120) -npc_spawn("shantay_guard", x = 3302, y = 3126) -npc_spawn("shantay_guard", x = 3306, y = 3126) -npc_spawn("shantay_guard", id = 838, x = 3303, y = 3118) +spawnNpc("shantay_guard", x = 3301, y = 3120) +spawnNpc("shantay_guard", x = 3302, y = 3126) +spawnNpc("shantay_guard", x = 3306, y = 3126) +spawnNpc("shantay_guard", id = 838, x = 3303, y = 3118) // Mine -npc_spawn("scorpion", x = 3296, y = 3294) -npc_spawn("scorpion", x = 3298, y = 3280) -npc_spawn("scorpion", x = 3299, y = 3299) -npc_spawn("scorpion", x = 3299, y = 3309) -npc_spawn("scorpion", x = 3300, y = 3287) -npc_spawn("scorpion", x = 3300, y = 3315) -npc_spawn("scorpion", x = 3301, y = 3305) -npc_spawn("scorpion", x = 3301, y = 3312) +spawnNpc("scorpion", x = 3296, y = 3294) +spawnNpc("scorpion", x = 3298, y = 3280) +spawnNpc("scorpion", x = 3299, y = 3299) +spawnNpc("scorpion", x = 3299, y = 3309) +spawnNpc("scorpion", x = 3300, y = 3287) +spawnNpc("scorpion", x = 3300, y = 3315) +spawnNpc("scorpion", x = 3301, y = 3305) +spawnNpc("scorpion", x = 3301, y = 3312) // Functional npcs -npc_spawn("gnome_pilot", x = 3279, y = 3213) +spawnNpc("gnome_pilot", x = 3279, y = 3213) -npc_spawn("banker", id = 496, x = 3267, y = 3164, facing = Direction.EAST) -npc_spawn("banker", id = 496, x = 3267, y = 3167, facing = Direction.EAST) -npc_spawn("banker", id = 496, x = 3267, y = 3169, facing = Direction.EAST) +spawnNpc("banker", id = 496, x = 3267, y = 3164, facing = Direction.EAST) +spawnNpc("banker", id = 496, x = 3267, y = 3167, facing = Direction.EAST) +spawnNpc("banker", id = 496, x = 3267, y = 3169, facing = Direction.EAST) -npc_spawn("banker", id = 497, x = 3267, y = 3166, facing = Direction.EAST) -npc_spawn("banker", id = 497, x = 3267, y = 3168, facing = Direction.EAST) +spawnNpc("banker", id = 497, x = 3267, y = 3166, facing = Direction.EAST) +spawnNpc("banker", id = 497, x = 3267, y = 3168, facing = Direction.EAST) -npc_spawn("gem_trader", x = 3287, y = 3210) +spawnNpc("gem_trader", x = 3287, y = 3210) -npc_spawn("zeke", x = 3289, y = 3189) +spawnNpc("zeke", x = 3289, y = 3189) -npc_spawn("shantay", x = 3304, y = 3124) +spawnNpc("shantay", x = 3304, y = 3124) -npc_spawn("rug_merchant", id = 2296, x = 3311, y = 3109, facing = Direction.WEST) +spawnNpc("rug_merchant", id = 2296, x = 3311, y = 3109, facing = Direction.WEST) -npc_spawn("ranael", x = 3315, y = 3163) +spawnNpc("ranael", x = 3315, y = 3163) -npc_spawn("shop_keeper", id = 524, x = 3315, y = 3178) -npc_spawn("shop_assistant", id = 525, x = 3315, y = 3180, facing = Direction.WEST) +spawnNpc("shop_keeper", id = 524, x = 3315, y = 3178) +spawnNpc("shop_assistant", id = 525, x = 3315, y = 3180, facing = Direction.WEST) -npc_spawn("louie_legs", x = 3316, y = 3175, facing = Direction.WEST) +spawnNpc("louie_legs", x = 3316, y = 3175, facing = Direction.WEST) -npc_spawn("ellis", x = 3274, y = 3192) +spawnNpc("ellis", x = 3274, y = 3192) -npc_spawn("dommik", x = 3321, y = 3193) +spawnNpc("dommik", x = 3321, y = 3193) -npc_spawn("tool_leprechaun", x = 3319, y = 3204) +spawnNpc("tool_leprechaun", x = 3319, y = 3204) -npc_spawn("ali_morrisane", x = 3304, y = 3211, facing = Direction.EAST) +spawnNpc("ali_morrisane", x = 3304, y = 3211, facing = Direction.EAST) -npc_spawn("silk_trader", x = 3300, y = 3203) +spawnNpc("silk_trader", x = 3300, y = 3203) -npc_spawn("karim", x = 3273, y = 3180) \ No newline at end of file +spawnNpc("karim", x = 3273, y = 3180) \ No newline at end of file diff --git a/game/plugin/locations/edgeville/src/npcs.plugin.kts b/game/plugin/locations/edgeville/src/npcs.plugin.kts index 2fa94f88..7419b2b2 100644 --- a/game/plugin/locations/edgeville/src/npcs.plugin.kts +++ b/game/plugin/locations/edgeville/src/npcs.plugin.kts @@ -1,54 +1,54 @@ package org.apollo.plugin.locations.edgeville import org.apollo.game.model.Direction -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc // Generic npcs -npc_spawn("man", x = 3095, y = 3508) -npc_spawn("man", x = 3095, y = 3511) -npc_spawn("man", x = 3098, y = 3509) -npc_spawn("man", id = 2, x = 3093, y = 3511) -npc_spawn("man", id = 3, x = 3097, y = 3508) -npc_spawn("man", id = 3, x = 3092, y = 3508) -npc_spawn("man", id = 3, x = 3097, y = 3512) +spawnNpc("man", x = 3095, y = 3508) +spawnNpc("man", x = 3095, y = 3511) +spawnNpc("man", x = 3098, y = 3509) +spawnNpc("man", id = 2, x = 3093, y = 3511) +spawnNpc("man", id = 3, x = 3097, y = 3508) +spawnNpc("man", id = 3, x = 3092, y = 3508) +spawnNpc("man", id = 3, x = 3097, y = 3512) -npc_spawn("guard", x = 3086, y = 3516) -npc_spawn("guard", x = 3094, y = 3518) -npc_spawn("guard", x = 3108, y = 3514) -npc_spawn("guard", x = 3110, y = 3514) -npc_spawn("guard", x = 3113, y = 3514) -npc_spawn("guard", x = 3113, y = 3516) +spawnNpc("guard", x = 3086, y = 3516) +spawnNpc("guard", x = 3094, y = 3518) +spawnNpc("guard", x = 3108, y = 3514) +spawnNpc("guard", x = 3110, y = 3514) +spawnNpc("guard", x = 3113, y = 3514) +spawnNpc("guard", x = 3113, y = 3516) -npc_spawn("sheep", id = 43, x = 3050, y = 3516) -npc_spawn("sheep", id = 43, x = 3051, y = 3514) -npc_spawn("sheep", id = 43, x = 3056, y = 3517) -npc_spawn("ram", id = 3673, x = 3048, y = 3515) +spawnNpc("sheep", id = 43, x = 3050, y = 3516) +spawnNpc("sheep", id = 43, x = 3051, y = 3514) +spawnNpc("sheep", id = 43, x = 3056, y = 3517) +spawnNpc("ram", id = 3673, x = 3048, y = 3515) -npc_spawn("monk", x = 3044, y = 3491) -npc_spawn("monk", x = 3045, y = 3483) -npc_spawn("monk", x = 3045, y = 3497) -npc_spawn("monk", x = 3050, y = 3490) -npc_spawn("monk", x = 3054, y = 3490) -npc_spawn("monk", x = 3058, y = 3497) +spawnNpc("monk", x = 3044, y = 3491) +spawnNpc("monk", x = 3045, y = 3483) +spawnNpc("monk", x = 3045, y = 3497) +spawnNpc("monk", x = 3050, y = 3490) +spawnNpc("monk", x = 3054, y = 3490) +spawnNpc("monk", x = 3058, y = 3497) // Functional npcs -npc_spawn("richard", x = 3098, y = 3516) -npc_spawn("doris", x = 3079, y = 3491) -npc_spawn("brother_jered", x = 3045, y = 3488) -npc_spawn("brother_althric", x = 3054, y = 3504) +spawnNpc("richard", x = 3098, y = 3516) +spawnNpc("doris", x = 3079, y = 3491) +spawnNpc("brother_jered", x = 3045, y = 3488) +spawnNpc("brother_althric", x = 3054, y = 3504) -npc_spawn("abbot_langley", x = 3059, y = 3484) -npc_spawn("oziach", x = 3067, y = 3518, facing = Direction.EAST) +spawnNpc("abbot_langley", x = 3059, y = 3484) +spawnNpc("oziach", x = 3067, y = 3518, facing = Direction.EAST) -npc_spawn("shop_keeper", id = 528, x = 3079, y = 3509) -npc_spawn("shop_assistant", id = 529, x = 3082, y = 3513) +spawnNpc("shop_keeper", id = 528, x = 3079, y = 3509) +spawnNpc("shop_assistant", id = 529, x = 3082, y = 3513) -npc_spawn("banker", x = 3096, y = 3489, facing = Direction.WEST) -npc_spawn("banker", x = 3096, y = 3491, facing = Direction.WEST) -npc_spawn("banker", x = 3096, y = 3492) -npc_spawn("banker", x = 3098, y = 3492) +spawnNpc("banker", x = 3096, y = 3489, facing = Direction.WEST) +spawnNpc("banker", x = 3096, y = 3491, facing = Direction.WEST) +spawnNpc("banker", x = 3096, y = 3492) +spawnNpc("banker", x = 3098, y = 3492) -npc_spawn("mage_of_zamorak", x = 3106, y = 3560) \ No newline at end of file +spawnNpc("mage_of_zamorak", x = 3106, y = 3560) \ No newline at end of file diff --git a/game/plugin/locations/falador/src/npcs.plugin.kts b/game/plugin/locations/falador/src/npcs.plugin.kts index 68b676f2..9136f9c0 100644 --- a/game/plugin/locations/falador/src/npcs.plugin.kts +++ b/game/plugin/locations/falador/src/npcs.plugin.kts @@ -1,171 +1,171 @@ package org.apollo.plugin.locations.falador -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc // Generic npcs -npc_spawn("chicken", x = 2965, y = 3345) +spawnNpc("chicken", x = 2965, y = 3345) -npc_spawn("duck", x = 2988, y = 3383) -npc_spawn("duck", x = 2992, y = 3383) -npc_spawn("duck", x = 2993, y = 3385) +spawnNpc("duck", x = 2988, y = 3383) +spawnNpc("duck", x = 2992, y = 3383) +spawnNpc("duck", x = 2993, y = 3385) -npc_spawn("drunken_man", x = 2957, y = 3368, z = 1) +spawnNpc("drunken_man", x = 2957, y = 3368, z = 1) -npc_spawn("dwarf", id = 118, x = 3023, y = 3334) -npc_spawn("dwarf", id = 118, x = 3027, y = 3341) -npc_spawn("dwarf", id = 118, x = 3012, y = 3341) -npc_spawn("dwarf", id = 118, x = 3017, y = 3346, z = 1) -npc_spawn("dwarf", id = 118, x = 3011, y = 3341, z = 1) +spawnNpc("dwarf", id = 118, x = 3023, y = 3334) +spawnNpc("dwarf", id = 118, x = 3027, y = 3341) +spawnNpc("dwarf", id = 118, x = 3012, y = 3341) +spawnNpc("dwarf", id = 118, x = 3017, y = 3346, z = 1) +spawnNpc("dwarf", id = 118, x = 3011, y = 3341, z = 1) -npc_spawn("dwarf", id = 121, x = 3027, y = 3341) +spawnNpc("dwarf", id = 121, x = 3027, y = 3341) -npc_spawn("dwarf", id = 382, x = 3017, y = 3340) +spawnNpc("dwarf", id = 382, x = 3017, y = 3340) -npc_spawn("dwarf", id = 3294, x = 3022, y = 3338) -npc_spawn("dwarf", id = 3295, x = 3021, y = 3341) +spawnNpc("dwarf", id = 3294, x = 3022, y = 3338) +spawnNpc("dwarf", id = 3295, x = 3021, y = 3341) -npc_spawn("gardener", x = 2998, y = 3385) -npc_spawn("gardener", x = 3019, y = 3369) -npc_spawn("gardener", id = 3234, x = 3016, y = 3386) +spawnNpc("gardener", x = 2998, y = 3385) +spawnNpc("gardener", x = 3019, y = 3369) +spawnNpc("gardener", id = 3234, x = 3016, y = 3386) -npc_spawn("guard", x = 2965, y = 3394) -npc_spawn("guard", x = 2964, y = 3396) -npc_spawn("guard", x = 2966, y = 3397) -npc_spawn("guard", x = 2964, y = 3384) -npc_spawn("guard", x = 2963, y = 3380) -npc_spawn("guard", x = 3006, y = 3325) -npc_spawn("guard", x = 3008, y = 3320) -npc_spawn("guard", x = 3006, y = 3322) -npc_spawn("guard", x = 3038, y = 3356) +spawnNpc("guard", x = 2965, y = 3394) +spawnNpc("guard", x = 2964, y = 3396) +spawnNpc("guard", x = 2966, y = 3397) +spawnNpc("guard", x = 2964, y = 3384) +spawnNpc("guard", x = 2963, y = 3380) +spawnNpc("guard", x = 3006, y = 3325) +spawnNpc("guard", x = 3008, y = 3320) +spawnNpc("guard", x = 3006, y = 3322) +spawnNpc("guard", x = 3038, y = 3356) -npc_spawn("guard", id = 10, x = 2942, y = 3375) -npc_spawn("guard", id = 10, x = 3040, y = 3352) +spawnNpc("guard", id = 10, x = 2942, y = 3375) +spawnNpc("guard", id = 10, x = 3040, y = 3352) -npc_spawn("guard", id = 3230, x = 2967, y = 3395) -npc_spawn("guard", id = 3230, x = 2966, y = 3392) -npc_spawn("guard", id = 3230, x = 2963, y = 3376) -npc_spawn("guard", id = 3230, x = 2954, y = 3382) -npc_spawn("guard", id = 3230, x = 2950, y = 3377) -npc_spawn("guard", id = 3230, x = 2968, y = 3381) +spawnNpc("guard", id = 3230, x = 2967, y = 3395) +spawnNpc("guard", id = 3230, x = 2966, y = 3392) +spawnNpc("guard", id = 3230, x = 2963, y = 3376) +spawnNpc("guard", id = 3230, x = 2954, y = 3382) +spawnNpc("guard", id = 3230, x = 2950, y = 3377) +spawnNpc("guard", id = 3230, x = 2968, y = 3381) -npc_spawn("guard", id = 3231, x = 3033, y = 3389, z = 1) -npc_spawn("guard", id = 3231, x = 3041, y = 3388, z = 1) -npc_spawn("guard", id = 3231, x = 3048, y = 3389, z = 1) -npc_spawn("guard", id = 3231, x = 3056, y = 3389, z = 1) -npc_spawn("guard", id = 3231, x = 3062, y = 3386, z = 1) -npc_spawn("guard", id = 3231, x = 3058, y = 3329, z = 1) -npc_spawn("guard", id = 3231, x = 3050, y = 3329, z = 1) -npc_spawn("guard", id = 3231, x = 3038, y = 3329, z = 1) -npc_spawn("guard", id = 3231, x = 3029, y = 3329, z = 1) +spawnNpc("guard", id = 3231, x = 3033, y = 3389, z = 1) +spawnNpc("guard", id = 3231, x = 3041, y = 3388, z = 1) +spawnNpc("guard", id = 3231, x = 3048, y = 3389, z = 1) +spawnNpc("guard", id = 3231, x = 3056, y = 3389, z = 1) +spawnNpc("guard", id = 3231, x = 3062, y = 3386, z = 1) +spawnNpc("guard", id = 3231, x = 3058, y = 3329, z = 1) +spawnNpc("guard", id = 3231, x = 3050, y = 3329, z = 1) +spawnNpc("guard", id = 3231, x = 3038, y = 3329, z = 1) +spawnNpc("guard", id = 3231, x = 3029, y = 3329, z = 1) -npc_spawn("swan", x = 2960, y = 3359) -npc_spawn("swan", x = 2963, y = 3360) -npc_spawn("swan", x = 2968, y = 3359) -npc_spawn("swan", x = 2971, y = 3360) -npc_spawn("swan", x = 2976, y = 3358) -npc_spawn("swan", x = 2989, y = 3384) +spawnNpc("swan", x = 2960, y = 3359) +spawnNpc("swan", x = 2963, y = 3360) +spawnNpc("swan", x = 2968, y = 3359) +spawnNpc("swan", x = 2971, y = 3360) +spawnNpc("swan", x = 2976, y = 3358) +spawnNpc("swan", x = 2989, y = 3384) -npc_spawn("man", id = 3223, x = 2991, y = 3365) -npc_spawn("man", id = 3225, x = 3037, y = 3345, z = 1) +spawnNpc("man", id = 3223, x = 2991, y = 3365) +spawnNpc("man", id = 3225, x = 3037, y = 3345, z = 1) -npc_spawn("white_knight", x = 2983, y = 3343) -npc_spawn("white_knight", x = 2981, y = 3334) -npc_spawn("white_knight", x = 2988, y = 3335) -npc_spawn("white_knight", x = 2996, y = 3342) -npc_spawn("white_knight", x = 2960, y = 3340) -npc_spawn("white_knight", x = 2962, y = 3336) -npc_spawn("white_knight", x = 2974, y = 3342) -npc_spawn("white_knight", x = 2972, y = 3345) -npc_spawn("white_knight", x = 2977, y = 3348) +spawnNpc("white_knight", x = 2983, y = 3343) +spawnNpc("white_knight", x = 2981, y = 3334) +spawnNpc("white_knight", x = 2988, y = 3335) +spawnNpc("white_knight", x = 2996, y = 3342) +spawnNpc("white_knight", x = 2960, y = 3340) +spawnNpc("white_knight", x = 2962, y = 3336) +spawnNpc("white_knight", x = 2974, y = 3342) +spawnNpc("white_knight", x = 2972, y = 3345) +spawnNpc("white_knight", x = 2977, y = 3348) -npc_spawn("white_knight", id = 3348, x = 2971, y = 3340) -npc_spawn("white_knight", id = 3348, x = 2978, y = 3350) +spawnNpc("white_knight", id = 3348, x = 2971, y = 3340) +spawnNpc("white_knight", id = 3348, x = 2978, y = 3350) -npc_spawn("white_knight", x = 2964, y = 3330, z = 1) -npc_spawn("white_knight", x = 2968, y = 3334, z = 1) -npc_spawn("white_knight", x = 2969, y = 3339, z = 1) -npc_spawn("white_knight", x = 2978, y = 3332, z = 1) -npc_spawn("white_knight", x = 2958, y = 3340, z = 1) -npc_spawn("white_knight", x = 2960, y = 3343, z = 1) +spawnNpc("white_knight", x = 2964, y = 3330, z = 1) +spawnNpc("white_knight", x = 2968, y = 3334, z = 1) +spawnNpc("white_knight", x = 2969, y = 3339, z = 1) +spawnNpc("white_knight", x = 2978, y = 3332, z = 1) +spawnNpc("white_knight", x = 2958, y = 3340, z = 1) +spawnNpc("white_knight", x = 2960, y = 3343, z = 1) -npc_spawn("white_knight", id = 3348, x = 2987, y = 3334, z = 1) -npc_spawn("white_knight", id = 3348, x = 2983, y = 3336, z = 1) -npc_spawn("white_knight", id = 3348, x = 2987, y = 3334, z = 1) -npc_spawn("white_knight", id = 3348, x = 2979, y = 3348, z = 1) -npc_spawn("white_knight", id = 3348, x = 2964, y = 3337, z = 1) +spawnNpc("white_knight", id = 3348, x = 2987, y = 3334, z = 1) +spawnNpc("white_knight", id = 3348, x = 2983, y = 3336, z = 1) +spawnNpc("white_knight", id = 3348, x = 2987, y = 3334, z = 1) +spawnNpc("white_knight", id = 3348, x = 2979, y = 3348, z = 1) +spawnNpc("white_knight", id = 3348, x = 2964, y = 3337, z = 1) -npc_spawn("white_knight", id = 3349, x = 2989, y = 3344, z = 1) +spawnNpc("white_knight", id = 3349, x = 2989, y = 3344, z = 1) -npc_spawn("white_knight", x = 2985, y = 3342, z = 2) +spawnNpc("white_knight", x = 2985, y = 3342, z = 2) -npc_spawn("white_knight", id = 3348, x = 2979, y = 3348, z = 2) -npc_spawn("white_knight", id = 3348, x = 2974, y = 3329, z = 2) -npc_spawn("white_knight", id = 3348, x = 2982, y = 3341, z = 2) +spawnNpc("white_knight", id = 3348, x = 2979, y = 3348, z = 2) +spawnNpc("white_knight", id = 3348, x = 2974, y = 3329, z = 2) +spawnNpc("white_knight", id = 3348, x = 2982, y = 3341, z = 2) -npc_spawn("white_knight", id = 3349, x = 2990, y = 3341, z = 2) -npc_spawn("white_knight", id = 3349, x = 2971, y = 3330, z = 2) -npc_spawn("white_knight", id = 3349, x = 2965, y = 3350, z = 2) -npc_spawn("white_knight", id = 3349, x = 2965, y = 3329, z = 2) +spawnNpc("white_knight", id = 3349, x = 2990, y = 3341, z = 2) +spawnNpc("white_knight", id = 3349, x = 2971, y = 3330, z = 2) +spawnNpc("white_knight", id = 3349, x = 2965, y = 3350, z = 2) +spawnNpc("white_knight", id = 3349, x = 2965, y = 3329, z = 2) -npc_spawn("white_knight", id = 3350, x = 2961, y = 3347, z = 2) +spawnNpc("white_knight", id = 3350, x = 2961, y = 3347, z = 2) -npc_spawn("white_knight", id = 3349, x = 2962, y = 3339, z = 3) +spawnNpc("white_knight", id = 3349, x = 2962, y = 3339, z = 3) -npc_spawn("white_knight", id = 3350, x = 2960, y = 3336, z = 3) -npc_spawn("white_knight", id = 3350, x = 2984, y = 3349, z = 3) +spawnNpc("white_knight", id = 3350, x = 2960, y = 3336, z = 3) +spawnNpc("white_knight", id = 3350, x = 2984, y = 3349, z = 3) -npc_spawn("woman", id = 3226, x = 2991, y = 3384) +spawnNpc("woman", id = 3226, x = 2991, y = 3384) // Functional npcs -npc_spawn("apprentice_workman", id = 3235, x = 2971, y = 3369, z = 1) +spawnNpc("apprentice_workman", id = 3235, x = 2971, y = 3369, z = 1) -npc_spawn("banker", id = 495, x = 2945, y = 3366) -npc_spawn("banker", id = 495, x = 2946, y = 3366) -npc_spawn("banker", id = 495, x = 2947, y = 3366) -npc_spawn("banker", id = 495, x = 2948, y = 3366) +spawnNpc("banker", id = 495, x = 2945, y = 3366) +spawnNpc("banker", id = 495, x = 2946, y = 3366) +spawnNpc("banker", id = 495, x = 2947, y = 3366) +spawnNpc("banker", id = 495, x = 2948, y = 3366) -npc_spawn("banker", x = 2949, y = 3366) +spawnNpc("banker", x = 2949, y = 3366) -npc_spawn("banker", x = 3015, y = 3353) -npc_spawn("banker", x = 3014, y = 3353) -npc_spawn("banker", x = 3013, y = 3353) -npc_spawn("banker", x = 3012, y = 3353) -npc_spawn("banker", x = 3011, y = 3353) -npc_spawn("banker", x = 3010, y = 3353) +spawnNpc("banker", x = 3015, y = 3353) +spawnNpc("banker", x = 3014, y = 3353) +spawnNpc("banker", x = 3013, y = 3353) +spawnNpc("banker", x = 3012, y = 3353) +spawnNpc("banker", x = 3011, y = 3353) +spawnNpc("banker", x = 3010, y = 3353) -npc_spawn("cassie", x = 2976, y = 3383) +spawnNpc("cassie", x = 2976, y = 3383) -npc_spawn("emily", x = 2954, y = 3372) +spawnNpc("emily", x = 2954, y = 3372) -npc_spawn("flynn", x = 2950, y = 3387) +spawnNpc("flynn", x = 2950, y = 3387) -npc_spawn("hairdresser", x = 2944, y = 3380) +spawnNpc("hairdresser", x = 2944, y = 3380) -npc_spawn("herquin", x = 2945, y = 3335) +spawnNpc("herquin", x = 2945, y = 3335) -npc_spawn("heskel", x = 3007, y = 3374) +spawnNpc("heskel", x = 3007, y = 3374) -npc_spawn("kaylee", x = 2957, y = 3372) +spawnNpc("kaylee", x = 2957, y = 3372) -npc_spawn("tina", x = 2955, y = 3371, z = 1) +spawnNpc("tina", x = 2955, y = 3371, z = 1) -npc_spawn("tool_leprechaun", x = 3005, y = 3370) +spawnNpc("tool_leprechaun", x = 3005, y = 3370) -npc_spawn("squire", x = 2977, y = 3343) +spawnNpc("squire", x = 2977, y = 3343) -npc_spawn("sir_tiffy_cashien", x = 2997, y = 3373) +spawnNpc("sir_tiffy_cashien", x = 2997, y = 3373) -npc_spawn("sir_amik_varze", x = 2960, y = 3336, z = 2) +spawnNpc("sir_amik_varze", x = 2960, y = 3336, z = 2) -npc_spawn("sir_vyvin", x = 2983, y = 3335, z = 2) +spawnNpc("sir_vyvin", x = 2983, y = 3335, z = 2) -npc_spawn("shop_keeper", id = 524, x = 2955, y = 3389) -npc_spawn("shop_assistant", id = 525, x = 2957, y = 3387) +spawnNpc("shop_keeper", id = 524, x = 2955, y = 3389) +spawnNpc("shop_assistant", id = 525, x = 2957, y = 3387) -npc_spawn("wayne", x = 2972, y = 3312) +spawnNpc("wayne", x = 2972, y = 3312) -npc_spawn("workman", id = 3236, x = 2975, y = 3369, z = 1) +spawnNpc("workman", id = 3236, x = 2975, y = 3369, z = 1) -npc_spawn("wyson_the_gardener", x = 3028, y = 3381) \ No newline at end of file +spawnNpc("wyson_the_gardener", x = 3028, y = 3381) \ No newline at end of file diff --git a/game/plugin/locations/lumbridge/src/npcs.plugin.kts b/game/plugin/locations/lumbridge/src/npcs.plugin.kts index 28b05505..03094618 100644 --- a/game/plugin/locations/lumbridge/src/npcs.plugin.kts +++ b/game/plugin/locations/lumbridge/src/npcs.plugin.kts @@ -1,15 +1,15 @@ package org.apollo.plugin.locations.lumbridge -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc -npc_spawn("woman", id = 4, x = 3232, y = 3207) -npc_spawn("man", id = 1, x = 3231, y = 3237) -npc_spawn("man", id = 2, x = 3224, y = 3240) -npc_spawn("woman", id = 5, x = 3229, y = 2329) +spawnNpc("woman", id = 4, x = 3232, y = 3207) +spawnNpc("man", id = 1, x = 3231, y = 3237) +spawnNpc("man", id = 2, x = 3224, y = 3240) +spawnNpc("woman", id = 5, x = 3229, y = 2329) -npc_spawn("hans", x = 3221, y = 3221) -npc_spawn("father aereck", x = 3243, y = 3210) -npc_spawn("bob", x = 3231, y = 3203) -npc_spawn("shop keeper", x = 3212, y = 3247) -npc_spawn("shop assistant", x = 3211, y = 3245) -npc_spawn("lumbridge guide", x = 323, y = 3229) +spawnNpc("hans", x = 3221, y = 3221) +spawnNpc("father aereck", x = 3243, y = 3210) +spawnNpc("bob", x = 3231, y = 3203) +spawnNpc("shop keeper", x = 3212, y = 3247) +spawnNpc("shop assistant", x = 3211, y = 3245) +spawnNpc("lumbridge guide", x = 323, y = 3229) diff --git a/game/plugin/locations/tutorial-island/src/npcs.plugin.kts b/game/plugin/locations/tutorial-island/src/npcs.plugin.kts index f3165e69..5ec51c09 100644 --- a/game/plugin/locations/tutorial-island/src/npcs.plugin.kts +++ b/game/plugin/locations/tutorial-island/src/npcs.plugin.kts @@ -1,44 +1,44 @@ package org.apollo.plugin.locations.tutorialIsland import org.apollo.game.model.Direction -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc // Functional npcs // 'Above-ground' npcs -npc_spawn("master_chef", x = 3076, y = 3085) -npc_spawn("quest_guide", x = 3086, y = 3122) -npc_spawn("financial_advisor", x = 3127, y = 3124, facing = Direction.WEST) -npc_spawn("brother_brace", x = 3124, y = 3107, facing = Direction.EAST) -npc_spawn("magic_instructor", x = 3140, y = 3085) +spawnNpc("master_chef", x = 3076, y = 3085) +spawnNpc("quest_guide", x = 3086, y = 3122) +spawnNpc("financial_advisor", x = 3127, y = 3124, facing = Direction.WEST) +spawnNpc("brother_brace", x = 3124, y = 3107, facing = Direction.EAST) +spawnNpc("magic_instructor", x = 3140, y = 3085) // 'Below-ground' npcs // Note: They aren't actually on a different plane, they're just in a different location that // pretends to be underground. -npc_spawn("mining_instructor", x = 3081, y = 9504) -npc_spawn("combat_instructor", x = 3104, y = 9506) +spawnNpc("mining_instructor", x = 3081, y = 9504) +spawnNpc("combat_instructor", x = 3104, y = 9506) // Non-humanoid npcs -npc_spawn("fishing_spot", id = 316, x = 3102, y = 3093) +spawnNpc("fishing_spot", id = 316, x = 3102, y = 3093) -npc_spawn("chicken", x = 3140, y = 3095) -npc_spawn("chicken", x = 3140, y = 3093) -npc_spawn("chicken", x = 3138, y = 3092) -npc_spawn("chicken", x = 3137, y = 3094) -npc_spawn("chicken", x = 3138, y = 3095) +spawnNpc("chicken", x = 3140, y = 3095) +spawnNpc("chicken", x = 3140, y = 3093) +spawnNpc("chicken", x = 3138, y = 3092) +spawnNpc("chicken", x = 3137, y = 3094) +spawnNpc("chicken", x = 3138, y = 3095) // 'Below-ground' npcs // Note: They aren't actually on a different plane, they're just in a different location that // pretends to be underground. -npc_spawn("giant_rat", id = 87, x = 3105, y = 9514) -npc_spawn("giant_rat", id = 87, x = 3105, y = 9517) -npc_spawn("giant_rat", id = 87, x = 3106, y = 9514) -npc_spawn("giant_rat", id = 87, x = 3104, y = 9514) -npc_spawn("giant_rat", id = 87, x = 3105, y = 9519) -npc_spawn("giant_rat", id = 87, x = 3109, y = 9516) -npc_spawn("giant_rat", id = 87, x = 3108, y = 9520) -npc_spawn("giant_rat", id = 87, x = 3102, y = 9517) \ No newline at end of file +spawnNpc("giant_rat", id = 87, x = 3105, y = 9514) +spawnNpc("giant_rat", id = 87, x = 3105, y = 9517) +spawnNpc("giant_rat", id = 87, x = 3106, y = 9514) +spawnNpc("giant_rat", id = 87, x = 3104, y = 9514) +spawnNpc("giant_rat", id = 87, x = 3105, y = 9519) +spawnNpc("giant_rat", id = 87, x = 3109, y = 9516) +spawnNpc("giant_rat", id = 87, x = 3108, y = 9520) +spawnNpc("giant_rat", id = 87, x = 3102, y = 9517) \ No newline at end of file diff --git a/game/plugin/locations/varrock/src/npcs.plugin.kts b/game/plugin/locations/varrock/src/npcs.plugin.kts index 4ffecf07..1e5c9f0c 100644 --- a/game/plugin/locations/varrock/src/npcs.plugin.kts +++ b/game/plugin/locations/varrock/src/npcs.plugin.kts @@ -1,270 +1,270 @@ package org.apollo.plugin.locations.varrock import org.apollo.game.model.Direction -import org.apollo.game.plugin.entity.spawn.npc_spawn +import org.apollo.game.plugin.entity.spawn.spawnNpc -npc_spawn("barbarian_woman", x = 3222, y = 3399) +spawnNpc("barbarian_woman", x = 3222, y = 3399) -npc_spawn("bear", id = 106, x = 3289, y = 3351) +spawnNpc("bear", id = 106, x = 3289, y = 3351) -npc_spawn("black_knight", x = 3238, y = 3514) -npc_spawn("black_knight", x = 3227, y = 3518) -npc_spawn("black_knight", x = 3279, y = 3502) +spawnNpc("black_knight", x = 3238, y = 3514) +spawnNpc("black_knight", x = 3227, y = 3518) +spawnNpc("black_knight", x = 3279, y = 3502) -npc_spawn("dark_wizard", id = 174, x = 3230, y = 3366) +spawnNpc("dark_wizard", id = 174, x = 3230, y = 3366) -npc_spawn("dark_wizard", id = 174, x = 3228, y = 3368) -npc_spawn("dark_wizard", id = 174, x = 3225, y = 3367) -npc_spawn("dark_wizard", id = 174, x = 3226, y = 3365) -npc_spawn("dark_wizard", id = 174, x = 3226, y = 3372) -npc_spawn("dark_wizard", id = 174, x = 3231, y = 3371) +spawnNpc("dark_wizard", id = 174, x = 3228, y = 3368) +spawnNpc("dark_wizard", id = 174, x = 3225, y = 3367) +spawnNpc("dark_wizard", id = 174, x = 3226, y = 3365) +spawnNpc("dark_wizard", id = 174, x = 3226, y = 3372) +spawnNpc("dark_wizard", id = 174, x = 3231, y = 3371) -npc_spawn("dark_wizard", id = 172, x = 3229, y = 3372) -npc_spawn("dark_wizard", id = 172, x = 3224, y = 3370) -npc_spawn("dark_wizard", id = 172, x = 3228, y = 3366) -npc_spawn("dark_wizard", id = 172, x = 3232, y = 3368) -npc_spawn("dark_wizard", id = 172, x = 3226, y = 3369) +spawnNpc("dark_wizard", id = 172, x = 3229, y = 3372) +spawnNpc("dark_wizard", id = 172, x = 3224, y = 3370) +spawnNpc("dark_wizard", id = 172, x = 3228, y = 3366) +spawnNpc("dark_wizard", id = 172, x = 3232, y = 3368) +spawnNpc("dark_wizard", id = 172, x = 3226, y = 3369) -npc_spawn("giant_rat", id = 87, x = 3292, y = 3375) -npc_spawn("giant_rat", id = 87, x = 3265, y = 3384) -npc_spawn("giant_rat", id = 87, x = 3267, y = 3381) +spawnNpc("giant_rat", id = 87, x = 3292, y = 3375) +spawnNpc("giant_rat", id = 87, x = 3265, y = 3384) +spawnNpc("giant_rat", id = 87, x = 3267, y = 3381) -npc_spawn("guard", id = 368, x = 3263, y = 3407, facing = Direction.SOUTH) +spawnNpc("guard", id = 368, x = 3263, y = 3407, facing = Direction.SOUTH) -npc_spawn("jeremy_clerksin", x = 3253, y = 3477) -npc_spawn("martina_scorsby", x = 3256, y = 3481) +spawnNpc("jeremy_clerksin", x = 3253, y = 3477) +spawnNpc("martina_scorsby", x = 3256, y = 3481) -npc_spawn("man", x = 3281, y = 3500) -npc_spawn("man", x = 3193, y = 3394) -npc_spawn("man", x = 3159, y = 3429) -npc_spawn("man", x = 3245, y = 3394) -npc_spawn("man", x = 3283, y = 3492, z = 1) +spawnNpc("man", x = 3281, y = 3500) +spawnNpc("man", x = 3193, y = 3394) +spawnNpc("man", x = 3159, y = 3429) +spawnNpc("man", x = 3245, y = 3394) +spawnNpc("man", x = 3283, y = 3492, z = 1) -npc_spawn("man", id = 2, x = 3283, y = 3492, z = 1) -npc_spawn("man", id = 2, x = 3263, y = 3400) +spawnNpc("man", id = 2, x = 3283, y = 3492, z = 1) +spawnNpc("man", id = 2, x = 3263, y = 3400) -npc_spawn("man", id = 3, x = 3227, y = 3395, z = 1) -npc_spawn("man", id = 3, x = 3231, y = 3399, z = 1) +spawnNpc("man", id = 3, x = 3227, y = 3395, z = 1) +spawnNpc("man", id = 3, x = 3231, y = 3399, z = 1) -npc_spawn("mugger", x = 3251, y = 3390) -npc_spawn("mugger", x = 3177, y = 3363) +spawnNpc("mugger", x = 3251, y = 3390) +spawnNpc("mugger", x = 3177, y = 3363) -npc_spawn("tramp", id = 2792, x = 3177, y = 3363) +spawnNpc("tramp", id = 2792, x = 3177, y = 3363) -npc_spawn("woman", x = 3221, y = 3396) +spawnNpc("woman", x = 3221, y = 3396) -npc_spawn("woman", id = 5, x = 3279, y = 3497) -npc_spawn("woman", id = 25, x = 3278, y = 3492) +spawnNpc("woman", id = 5, x = 3279, y = 3497) +spawnNpc("woman", id = 25, x = 3278, y = 3492) -npc_spawn("thief", x = 3285, y = 3500) -npc_spawn("thief", x = 3234, y = 3389) -npc_spawn("thief", x = 3188, y = 3383) -npc_spawn("thief", x = 3184, y = 3390) -npc_spawn("thief", x = 3188, y = 3394) +spawnNpc("thief", x = 3285, y = 3500) +spawnNpc("thief", x = 3234, y = 3389) +spawnNpc("thief", x = 3188, y = 3383) +spawnNpc("thief", x = 3184, y = 3390) +spawnNpc("thief", x = 3188, y = 3394) -npc_spawn("unicorn", x = 3286, y = 3342) -npc_spawn("unicorn", x = 3279, y = 3345) +spawnNpc("unicorn", x = 3286, y = 3342) +spawnNpc("unicorn", x = 3279, y = 3345) // North Guards -npc_spawn("guard", x = 3244, y = 3500) -npc_spawn("guard", x = 3247, y = 3503) +spawnNpc("guard", x = 3244, y = 3500) +spawnNpc("guard", x = 3247, y = 3503) // East Guards -npc_spawn("guard", x = 3271, y = 3431) -npc_spawn("guard", x = 3270, y = 3425) -npc_spawn("guard", x = 3274, y = 3421) -npc_spawn("guard", x = 3274, y = 3427) +spawnNpc("guard", x = 3271, y = 3431) +spawnNpc("guard", x = 3270, y = 3425) +spawnNpc("guard", x = 3274, y = 3421) +spawnNpc("guard", x = 3274, y = 3427) // South Guards -npc_spawn("guard", x = 3210, y = 3382) -npc_spawn("guard", x = 3212, y = 3380) -npc_spawn("guard", x = 3207, y = 3376) +spawnNpc("guard", x = 3210, y = 3382) +spawnNpc("guard", x = 3212, y = 3380) +spawnNpc("guard", x = 3207, y = 3376) // West Guards -npc_spawn("guard", x = 3174, y = 3427) -npc_spawn("guard", x = 3176, y = 3430) -npc_spawn("guard", x = 3176, y = 3427) -npc_spawn("guard", x = 3180, y = 3399) -npc_spawn("guard", x = 3175, y = 3415, z = 1) -npc_spawn("guard", x = 3174, y = 3403, z = 1) +spawnNpc("guard", x = 3174, y = 3427) +spawnNpc("guard", x = 3176, y = 3430) +spawnNpc("guard", x = 3176, y = 3427) +spawnNpc("guard", x = 3180, y = 3399) +spawnNpc("guard", x = 3175, y = 3415, z = 1) +spawnNpc("guard", x = 3174, y = 3403, z = 1) // Varrock Palace -npc_spawn("guard", x = 3210, y = 3461) -npc_spawn("guard", x = 3211, y = 3465) -npc_spawn("guard", x = 3214, y = 3462) -npc_spawn("guard", x = 3216, y = 3464) -npc_spawn("guard", x = 3220, y = 3461) -npc_spawn("guard", x = 3206, y = 3461) -npc_spawn("guard", x = 3204, y = 3495) +spawnNpc("guard", x = 3210, y = 3461) +spawnNpc("guard", x = 3211, y = 3465) +spawnNpc("guard", x = 3214, y = 3462) +spawnNpc("guard", x = 3216, y = 3464) +spawnNpc("guard", x = 3220, y = 3461) +spawnNpc("guard", x = 3206, y = 3461) +spawnNpc("guard", x = 3204, y = 3495) -npc_spawn("guard", x = 3204, y = 3495, z = 1) -npc_spawn("guard", x = 3205, y = 3492, z = 1) -npc_spawn("guard", x = 3203, y = 3492, z = 1) -npc_spawn("guard", x = 3205, y = 3497, z = 1) +spawnNpc("guard", x = 3204, y = 3495, z = 1) +spawnNpc("guard", x = 3205, y = 3492, z = 1) +spawnNpc("guard", x = 3203, y = 3492, z = 1) +spawnNpc("guard", x = 3205, y = 3497, z = 1) -npc_spawn("guard", x = 3221, y = 3471, z = 2) -npc_spawn("guard", x = 3214, y = 3474, z = 2) -npc_spawn("guard", x = 3215, y = 3471, z = 2) -npc_spawn("guard", x = 3211, y = 3471, z = 2) -npc_spawn("guard", x = 3209, y = 3473, z = 2) -npc_spawn("guard", x = 3212, y = 3475, z = 2) -npc_spawn("guard", x = 3207, y = 3477, z = 2) -npc_spawn("guard", x = 3203, y = 3476, z = 2) -npc_spawn("guard", x = 3205, y = 3479, z = 2) -npc_spawn("guard", x = 3203, y = 3483, z = 2) -npc_spawn("guard", x = 3221, y = 3485, z = 2) +spawnNpc("guard", x = 3221, y = 3471, z = 2) +spawnNpc("guard", x = 3214, y = 3474, z = 2) +spawnNpc("guard", x = 3215, y = 3471, z = 2) +spawnNpc("guard", x = 3211, y = 3471, z = 2) +spawnNpc("guard", x = 3209, y = 3473, z = 2) +spawnNpc("guard", x = 3212, y = 3475, z = 2) +spawnNpc("guard", x = 3207, y = 3477, z = 2) +spawnNpc("guard", x = 3203, y = 3476, z = 2) +spawnNpc("guard", x = 3205, y = 3479, z = 2) +spawnNpc("guard", x = 3203, y = 3483, z = 2) +spawnNpc("guard", x = 3221, y = 3485, z = 2) -npc_spawn("monk_of_zamorak", id = 189, x = 3213, y = 3476) +spawnNpc("monk_of_zamorak", id = 189, x = 3213, y = 3476) -npc_spawn("warrior_woman", x = 3203, y = 3490) -npc_spawn("warrior_woman", x = 3205, y = 3493) +spawnNpc("warrior_woman", x = 3203, y = 3490) +spawnNpc("warrior_woman", x = 3205, y = 3493) // Varrock/Lumbridge Pen -npc_spawn("swan", x = 3261, y = 3354) -npc_spawn("swan", x = 3260, y = 3356) +spawnNpc("swan", x = 3261, y = 3354) +spawnNpc("swan", x = 3260, y = 3356) -npc_spawn("ram", id = 3673, x = 3238, y = 3346) -npc_spawn("ram", id = 3673, x = 3248, y = 3352) -npc_spawn("ram", id = 3673, x = 3260, y = 3348) +spawnNpc("ram", id = 3673, x = 3238, y = 3346) +spawnNpc("ram", id = 3673, x = 3248, y = 3352) +spawnNpc("ram", id = 3673, x = 3260, y = 3348) -npc_spawn("sheep", id = 42, x = 3263, y = 3347) -npc_spawn("sheep", id = 42, x = 3268, y = 3350) -npc_spawn("sheep", id = 42, x = 3252, y = 3352) -npc_spawn("sheep", id = 42, x = 3243, y = 3344) -npc_spawn("sheep", id = 42, x = 3235, y = 3347) +spawnNpc("sheep", id = 42, x = 3263, y = 3347) +spawnNpc("sheep", id = 42, x = 3268, y = 3350) +spawnNpc("sheep", id = 42, x = 3252, y = 3352) +spawnNpc("sheep", id = 42, x = 3243, y = 3344) +spawnNpc("sheep", id = 42, x = 3235, y = 3347) -npc_spawn("sheep", id = 3579, x = 3234, y = 3344) -npc_spawn("sheep", id = 3579, x = 3241, y = 3347) -npc_spawn("sheep", id = 3579, x = 3257, y = 3350) +spawnNpc("sheep", id = 3579, x = 3234, y = 3344) +spawnNpc("sheep", id = 3579, x = 3241, y = 3347) +spawnNpc("sheep", id = 3579, x = 3257, y = 3350) // Champions Guild -npc_spawn("chicken", x = 3195, y = 3359) -npc_spawn("chicken", x = 3198, y = 3356) -npc_spawn("chicken", x = 3195, y = 3355) +spawnNpc("chicken", x = 3195, y = 3359) +spawnNpc("chicken", x = 3198, y = 3356) +spawnNpc("chicken", x = 3195, y = 3355) -npc_spawn("chicken", id = 1017, x = 3196, y = 3353) -npc_spawn("chicken", id = 1017, x = 3197, y = 3356) +spawnNpc("chicken", id = 1017, x = 3196, y = 3353) +spawnNpc("chicken", id = 1017, x = 3197, y = 3356) -npc_spawn("evil_chicken", x = 3198, y = 3359) +spawnNpc("evil_chicken", x = 3198, y = 3359) // Function Npc -npc_spawn("apothecary", x = 3196, y = 3403) +spawnNpc("apothecary", x = 3196, y = 3403) -npc_spawn("captain_rovin", x = 3204, y = 3496, z = 2) +spawnNpc("captain_rovin", x = 3204, y = 3496, z = 2) -npc_spawn("curator", x = 3256, y = 3447) +spawnNpc("curator", x = 3256, y = 3447) -npc_spawn("dimintheis", x = 3280, y = 3403) +spawnNpc("dimintheis", x = 3280, y = 3403) -npc_spawn("dr_harlow", x = 3224, y = 3398) +spawnNpc("dr_harlow", x = 3224, y = 3398) -npc_spawn("ellamaria", x = 3228, y = 3475) +spawnNpc("ellamaria", x = 3228, y = 3475) -npc_spawn("father_lawrence", x = 3253, y = 3484) +spawnNpc("father_lawrence", x = 3253, y = 3484) -npc_spawn("guidors_wife", id = 342, x = 3280, y = 3382) +spawnNpc("guidors_wife", id = 342, x = 3280, y = 3382) -npc_spawn("guidor", x = 3284, y = 3381, facing = Direction.SOUTH) +spawnNpc("guidor", x = 3284, y = 3381, facing = Direction.SOUTH) -npc_spawn("guild_master", x = 3189, y = 3360) +spawnNpc("guild_master", x = 3189, y = 3360) -npc_spawn("gypsy", x = 3203, y = 3423) +spawnNpc("gypsy", x = 3203, y = 3423) -npc_spawn("hooknosed_jack", x = 3268, y = 3400) +spawnNpc("hooknosed_jack", x = 3268, y = 3400) -npc_spawn("jonny_the_beard", x = 3223, y = 3395) +spawnNpc("jonny_the_beard", x = 3223, y = 3395) -npc_spawn("johnathon", x = 3278, y = 3503, z = 1) +spawnNpc("johnathon", x = 3278, y = 3503, z = 1) -npc_spawn("katrine", x = 3185, y = 3386) +spawnNpc("katrine", x = 3185, y = 3386) -npc_spawn("king_roald", x = 3223, y = 3473) +spawnNpc("king_roald", x = 3223, y = 3473) -npc_spawn("master_farmer", x = 3243, y = 3349) +spawnNpc("master_farmer", x = 3243, y = 3349) -npc_spawn("pox", x = 3267, y = 3399) +spawnNpc("pox", x = 3267, y = 3399) -npc_spawn("reldo", x = 3210, y = 3492) +spawnNpc("reldo", x = 3210, y = 3492) -npc_spawn("romeo", x = 3211, y = 3423) +spawnNpc("romeo", x = 3211, y = 3423) -npc_spawn("shilop", x = 3211, y = 3435) +spawnNpc("shilop", x = 3211, y = 3435) -npc_spawn("sir_prysin", x = 3204, y = 3472) +spawnNpc("sir_prysin", x = 3204, y = 3472) -npc_spawn("tarquin", x = 3203, y = 3344, facing = Direction.SOUTH) +spawnNpc("tarquin", x = 3203, y = 3344, facing = Direction.SOUTH) -npc_spawn("tool_leprechaun", x = 3182, y = 3355) +spawnNpc("tool_leprechaun", x = 3182, y = 3355) -npc_spawn("tool_leprechaun", x = 3229, y = 3455) +spawnNpc("tool_leprechaun", x = 3229, y = 3455) -npc_spawn("tramp", id = 641, x = 3207, y = 3392) +spawnNpc("tramp", id = 641, x = 3207, y = 3392) -npc_spawn("wilough", x = 3222, y = 3437) +spawnNpc("wilough", x = 3222, y = 3437) // Shop Npc -npc_spawn("aubury", x = 3253, y = 3401) +spawnNpc("aubury", x = 3253, y = 3401) -npc_spawn("baraek", x = 3217, y = 3434) +spawnNpc("baraek", x = 3217, y = 3434) -npc_spawn("bartender", x = 3226, y = 3400) +spawnNpc("bartender", x = 3226, y = 3400) -npc_spawn("bartender", id = 1921, x = 3277, y = 3487) +spawnNpc("bartender", id = 1921, x = 3277, y = 3487) -npc_spawn("fancy_dress_shop_owner", x = 3281, y = 3398) +spawnNpc("fancy_dress_shop_owner", x = 3281, y = 3398) -npc_spawn("horvik", x = 3229, y = 3438) +spawnNpc("horvik", x = 3229, y = 3438) -npc_spawn("lowe", x = 3233, y = 3421) +spawnNpc("lowe", x = 3233, y = 3421) -npc_spawn("scavvo", x = 3192, y = 3353, z = 1) +spawnNpc("scavvo", x = 3192, y = 3353, z = 1) -npc_spawn("shop_keeper", id = 551, x = 3206, y = 3399) -npc_spawn("shop_assistant", id = 552, x = 3207, y = 3396) +spawnNpc("shop_keeper", id = 551, x = 3206, y = 3399) +spawnNpc("shop_assistant", id = 552, x = 3207, y = 3396) -npc_spawn("shop_keeper", id = 522, x = 3216, y = 3414) -npc_spawn("shop_assistant", id = 523, x = 3216, y = 3417) +spawnNpc("shop_keeper", id = 522, x = 3216, y = 3414) +spawnNpc("shop_assistant", id = 523, x = 3216, y = 3417) -npc_spawn("tea_seller", x = 3271, y = 3411) +spawnNpc("tea_seller", x = 3271, y = 3411) -npc_spawn("thessalia", x = 3206, y = 3417) +spawnNpc("thessalia", x = 3206, y = 3417) -npc_spawn("zaff", x = 3203, y = 3434) +spawnNpc("zaff", x = 3203, y = 3434) // Juliet House -npc_spawn("draul_leptoc", x = 3228, y = 3475) -npc_spawn("juliet", x = 3159, y = 3425, z = 1) -npc_spawn("phillipa", x = 3160, y = 3429, z = 1) +spawnNpc("draul_leptoc", x = 3228, y = 3475) +spawnNpc("juliet", x = 3159, y = 3425, z = 1) +spawnNpc("phillipa", x = 3160, y = 3429, z = 1) // Gertrude House -npc_spawn("gertrude", x = 3153, y = 3413) -npc_spawn("kanel", x = 3155, y = 3405, facing = Direction.EAST) -npc_spawn("philop", x = 3150, y = 3405, facing = Direction.SOUTH) +spawnNpc("gertrude", x = 3153, y = 3413) +spawnNpc("kanel", x = 3155, y = 3405, facing = Direction.EAST) +spawnNpc("philop", x = 3150, y = 3405, facing = Direction.SOUTH) // Small Bank -npc_spawn("banker", id = 495, x = 3252, y = 3418) -npc_spawn("banker", id = 494, x = 3252, y = 3418) -npc_spawn("banker", id = 494, x = 3252, y = 3418) -npc_spawn("banker", id = 494, x = 3252, y = 3418) +spawnNpc("banker", id = 495, x = 3252, y = 3418) +spawnNpc("banker", id = 494, x = 3252, y = 3418) +spawnNpc("banker", id = 494, x = 3252, y = 3418) +spawnNpc("banker", id = 494, x = 3252, y = 3418) // Big Bank -npc_spawn("banker", id = 494, x = 3187, y = 3436, facing = Direction.WEST) -npc_spawn("banker", id = 494, x = 3187, y = 3440, facing = Direction.WEST) -npc_spawn("banker", id = 494, x = 3187, y = 3444, facing = Direction.WEST) -npc_spawn("banker", id = 495, x = 3187, y = 3438, facing = Direction.WEST) -npc_spawn("banker", id = 495, x = 3187, y = 3442, facing = Direction.WEST) \ No newline at end of file +spawnNpc("banker", id = 494, x = 3187, y = 3436, facing = Direction.WEST) +spawnNpc("banker", id = 494, x = 3187, y = 3440, facing = Direction.WEST) +spawnNpc("banker", id = 494, x = 3187, y = 3444, facing = Direction.WEST) +spawnNpc("banker", id = 495, x = 3187, y = 3438, facing = Direction.WEST) +spawnNpc("banker", id = 495, x = 3187, y = 3442, facing = Direction.WEST) \ No newline at end of file diff --git a/game/plugin/skills/fishing/src/spots.plugin.kts b/game/plugin/skills/fishing/src/spots.plugin.kts index 8aa824b6..e874ad85 100644 --- a/game/plugin/skills/fishing/src/spots.plugin.kts +++ b/game/plugin/skills/fishing/src/spots.plugin.kts @@ -1,181 +1,181 @@ - import org.apollo.game.model.Direction import org.apollo.game.model.Position -import org.apollo.game.plugin.entity.spawn.Spawn -import org.apollo.game.plugin.entity.spawn.Spawns +import org.apollo.game.plugin.entity.spawn.spawnNpc import org.apollo.game.plugin.skills.fishing.FishingSpot -import org.apollo.game.plugin.skills.fishing.FishingSpot.* +import org.apollo.game.plugin.skills.fishing.FishingSpot.CAGE_HARPOON +import org.apollo.game.plugin.skills.fishing.FishingSpot.NET_HARPOON +import org.apollo.game.plugin.skills.fishing.FishingSpot.NET_ROD +import org.apollo.game.plugin.skills.fishing.FishingSpot.ROD // Al-Kharid -register(NET_ROD, x = 3267, y = 3148) -register(NET_ROD, x = 3268, y = 3147) -register(NET_ROD, x = 3277, y = 3139) -register(CAGE_HARPOON, x = 3350, y = 3817) -register(CAGE_HARPOON, x = 3347, y = 3814) -register(CAGE_HARPOON, x = 3363, y = 3816) -register(CAGE_HARPOON, x = 3368, y = 3811) +NET_ROD at Position(3267, 3148) +NET_ROD at Position(3268, 3147) +NET_ROD at Position(3277, 3139) +CAGE_HARPOON at Position(3350, 3817) +CAGE_HARPOON at Position(3347, 3814) +CAGE_HARPOON at Position(3363, 3816) +CAGE_HARPOON at Position(3368, 3811) // Ardougne -register(ROD, x = 2561, y = 3374) -register(ROD, x = 2562, y = 3374) -register(ROD, x = 2568, y = 3365) +ROD at Position(2561, 3374) +ROD at Position(2562, 3374) +ROD at Position(2568, 3365) // Bandit camp -register(NET_ROD, x = 3047, y = 3703) -register(NET_ROD, x = 3045, y = 3702) +NET_ROD at Position(3047, 3703) +NET_ROD at Position(3045, 3702) // Baxtorian falls -register(ROD, x = 2527, y = 3412) -register(ROD, x = 2530, y = 3412) -register(ROD, x = 2533, y = 3410) +ROD at Position(2527, 3412) +ROD at Position(2530, 3412) +ROD at Position(2533, 3410) // Burgh de Rott -register(NET_HARPOON, x = 3497, y = 3175) -register(NET_HARPOON, x = 3496, y = 3178) -register(NET_HARPOON, x = 3499, y = 3178) -register(NET_HARPOON, x = 3489, y = 3184) -register(NET_HARPOON, x = 3496, y = 3176) -register(NET_HARPOON, x = 3486, y = 3184) -register(NET_HARPOON, x = 3479, y = 3189) -register(NET_HARPOON, x = 3476, y = 3191) -register(NET_HARPOON, x = 3472, y = 3196) -register(NET_HARPOON, x = 3496, y = 3180) -register(NET_HARPOON, x = 3512, y = 3178) -register(NET_HARPOON, x = 3515, y = 3180) -register(NET_HARPOON, x = 3518, y = 3177) -register(NET_HARPOON, x = 3528, y = 3172) -register(NET_HARPOON, x = 3531, y = 3169) -register(NET_HARPOON, x = 3531, y = 3172) -register(NET_HARPOON, x = 3531, y = 3167) +NET_HARPOON at Position(3497, 3175) +NET_HARPOON at Position(3496, 3178) +NET_HARPOON at Position(3499, 3178) +NET_HARPOON at Position(3489, 3184) +NET_HARPOON at Position(3496, 3176) +NET_HARPOON at Position(3486, 3184) +NET_HARPOON at Position(3479, 3189) +NET_HARPOON at Position(3476, 3191) +NET_HARPOON at Position(3472, 3196) +NET_HARPOON at Position(3496, 3180) +NET_HARPOON at Position(3512, 3178) +NET_HARPOON at Position(3515, 3180) +NET_HARPOON at Position(3518, 3177) +NET_HARPOON at Position(3528, 3172) +NET_HARPOON at Position(3531, 3169) +NET_HARPOON at Position(3531, 3172) +NET_HARPOON at Position(3531, 3167) // Camelot -register(ROD, x = 2726, y = 3524) -register(ROD, x = 2727, y = 3524) +ROD at Position(2726, 3524) +ROD at Position(2727, 3524) // Castle wars -register(ROD, x = 2461, y = 3151) -register(ROD, x = 2461, y = 3150) -register(ROD, x = 2462, y = 3145) -register(ROD, x = 2472, y = 3156) +ROD at Position(2461, 3151) +ROD at Position(2461, 3150) +ROD at Position(2462, 3145) +ROD at Position(2472, 3156) // Catherby 1 -register(NET_ROD, x = 2838, y = 3431) -register(CAGE_HARPOON, x = 2837, y = 3431) -register(CAGE_HARPOON, x = 2836, y = 3431) -register(NET_ROD, x = 2846, y = 3429) -register(NET_ROD, x = 2844, y = 3429) -register(CAGE_HARPOON, x = 2845, y = 3429) -register(NET_HARPOON, x = 2853, y = 3423) -register(NET_HARPOON, x = 2855, y = 3423) -register(NET_HARPOON, x = 2859, y = 3426) +NET_ROD at Position(2838, 3431) +CAGE_HARPOON at Position(2837, 3431) +CAGE_HARPOON at Position(2836, 3431) +NET_ROD at Position(2846, 3429) +NET_ROD at Position(2844, 3429) +CAGE_HARPOON at Position(2845, 3429) +NET_HARPOON at Position(2853, 3423) +NET_HARPOON at Position(2855, 3423) +NET_HARPOON at Position(2859, 3426) // Draynor village -register(NET_ROD, x = 3085, y = 3230) -register(NET_ROD, x = 3085, y = 3231) -register(NET_ROD, x = 3086, y = 3227) +NET_ROD at Position(3085, 3230) +NET_ROD at Position(3085, 3231) +NET_ROD at Position(3086, 3227) // Elf camp -register(ROD, x = 2210, y = 3243) -register(ROD, x = 2216, y = 3236) -register(ROD, x = 2222, y = 3241) +ROD at Position(2210, 3243) +ROD at Position(2216, 3236) +ROD at Position(2222, 3241) // Entrana -register(NET_ROD, x = 2843, y = 3359) -register(NET_ROD, x = 2842, y = 3359) -register(NET_ROD, x = 2847, y = 3361) -register(NET_ROD, x = 2848, y = 3361) -register(NET_ROD, x = 2840, y = 3356) -register(NET_ROD, x = 2845, y = 3356) -register(NET_ROD, x = 2875, y = 3342) -register(NET_ROD, x = 2876, y = 3342) -register(NET_ROD, x = 2877, y = 3342) +NET_ROD at Position(2843, 3359) +NET_ROD at Position(2842, 3359) +NET_ROD at Position(2847, 3361) +NET_ROD at Position(2848, 3361) +NET_ROD at Position(2840, 3356) +NET_ROD at Position(2845, 3356) +NET_ROD at Position(2875, 3342) +NET_ROD at Position(2876, 3342) +NET_ROD at Position(2877, 3342) // Fishing guild -register(CAGE_HARPOON, x = 2612, y = 3411) -register(CAGE_HARPOON, x = 2607, y = 3410) -register(NET_HARPOON, x = 2612, y = 3414) -register(NET_HARPOON, x = 2612, y = 3415) -register(NET_HARPOON, x = 2609, y = 3416) -register(CAGE_HARPOON, x = 2604, y = 3417) -register(NET_HARPOON, x = 2605, y = 3416) -register(NET_HARPOON, x = 2602, y = 3411) -register(NET_HARPOON, x = 2602, y = 3412) -register(CAGE_HARPOON, x = 2602, y = 3414) -register(NET_HARPOON, x = 2603, y = 3417) -register(NET_HARPOON, x = 2599, y = 3419) -register(NET_HARPOON, x = 2601, y = 3422) -register(NET_HARPOON, x = 2605, y = 3421) -register(CAGE_HARPOON, x = 2602, y = 3426) -register(NET_HARPOON, x = 2604, y = 3426) -register(CAGE_HARPOON, x = 2605, y = 3425) +CAGE_HARPOON at Position(2612, 3411) +CAGE_HARPOON at Position(2607, 3410) +NET_HARPOON at Position(2612, 3414) +NET_HARPOON at Position(2612, 3415) +NET_HARPOON at Position(2609, 3416) +CAGE_HARPOON at Position(2604, 3417) +NET_HARPOON at Position(2605, 3416) +NET_HARPOON at Position(2602, 3411) +NET_HARPOON at Position(2602, 3412) +CAGE_HARPOON at Position(2602, 3414) +NET_HARPOON at Position(2603, 3417) +NET_HARPOON at Position(2599, 3419) +NET_HARPOON at Position(2601, 3422) +NET_HARPOON at Position(2605, 3421) +CAGE_HARPOON at Position(2602, 3426) +NET_HARPOON at Position(2604, 3426) +CAGE_HARPOON at Position(2605, 3425) // Fishing platform -register(NET_ROD, x = 2791, y = 3279) -register(NET_ROD, x = 2795, y = 3279) -register(NET_ROD, x = 2790, y = 3273) +NET_ROD at Position(2791, 3279) +NET_ROD at Position(2795, 3279) +NET_ROD at Position(2790, 3273) // Grand Tree -register(ROD, x = 2393, y = 3419) -register(ROD, x = 2391, y = 3421) -register(ROD, x = 2389, y = 3423) -register(ROD, x = 2388, y = 3423) -register(ROD, x = 2385, y = 3422) -register(ROD, x = 2384, y = 3419) -register(ROD, x = 2383, y = 3417) +ROD at Position(2393, 3419) +ROD at Position(2391, 3421) +ROD at Position(2389, 3423) +ROD at Position(2388, 3423) +ROD at Position(2385, 3422) +ROD at Position(2384, 3419) +ROD at Position(2383, 3417) // Karamja -register(NET_ROD, x = 2921, y = 3178) -register(CAGE_HARPOON, x = 2923, y = 3179) -register(CAGE_HARPOON, x = 2923, y = 3180) -register(NET_ROD, x = 2924, y = 3181) -register(NET_ROD, x = 2926, y = 3180) -register(CAGE_HARPOON, x = 2926, y = 3179) +NET_ROD at Position(2921, 3178) +CAGE_HARPOON at Position(2923, 3179) +CAGE_HARPOON at Position(2923, 3180) +NET_ROD at Position(2924, 3181) +NET_ROD at Position(2926, 3180) +CAGE_HARPOON at Position(2926, 3179) // Lumbridge -register(ROD, x = 3239, y = 3244) -register(NET_ROD, x = 3238, y = 3252) +ROD at Position(3239, 3244) +NET_ROD at Position(3238, 3252) // Miscellenia -register(CAGE_HARPOON, x = 2580, y = 3851) -register(CAGE_HARPOON, x = 2581, y = 3851) -register(CAGE_HARPOON, x = 2582, y = 3851) -register(CAGE_HARPOON, x = 2583, y = 3852) -register(CAGE_HARPOON, x = 2583, y = 3853) +CAGE_HARPOON at Position(2580, 3851) +CAGE_HARPOON at Position(2581, 3851) +CAGE_HARPOON at Position(2582, 3851) +CAGE_HARPOON at Position(2583, 3852) +CAGE_HARPOON at Position(2583, 3853) // Rellekka -register(NET_ROD, x = 2633, y = 3691) -register(NET_ROD, x = 2633, y = 3689) -register(CAGE_HARPOON, x = 2639, y = 3698) -register(CAGE_HARPOON, x = 2639, y = 3697) -register(CAGE_HARPOON, x = 2639, y = 3695) -register(NET_HARPOON, x = 2642, y = 3694) -register(NET_HARPOON, x = 2642, y = 3697) -register(NET_HARPOON, x = 2644, y = 3709) +NET_ROD at Position(2633, 3691) +NET_ROD at Position(2633, 3689) +CAGE_HARPOON at Position(2639, 3698) +CAGE_HARPOON at Position(2639, 3697) +CAGE_HARPOON at Position(2639, 3695) +NET_HARPOON at Position(2642, 3694) +NET_HARPOON at Position(2642, 3697) +NET_HARPOON at Position(2644, 3709) // Rimmington -register(NET_ROD, x = 2990, y = 3169) -register(NET_ROD, x = 2986, y = 3176) +NET_ROD at Position(2990, 3169) +NET_ROD at Position(2986, 3176) // Shilo Village -register(ROD, x = 2855, y = 2974) -register(ROD, x = 2865, y = 2972) -register(ROD, x = 2860, y = 2972) -register(ROD, x = 2835, y = 2974) -register(ROD, x = 2859, y = 2976) +ROD at Position(2855, 2974) +ROD at Position(2865, 2972) +ROD at Position(2860, 2972) +ROD at Position(2835, 2974) +ROD at Position(2859, 2976) // Tirannwn -register(ROD, x = 2266, y = 3253) -register(ROD, x = 2265, y = 3258) -register(ROD, x = 2264, y = 3258) +ROD at Position(2266, 3253) +ROD at Position(2265, 3258) +ROD at Position(2264, 3258) // Tutorial island -register(NET_ROD, x = 3101, y = 3092) -register(NET_ROD, x = 3103, y = 3092) +NET_ROD at Position(3101, 3092) +NET_ROD at Position(3103, 3092) /** * Registers the [FishingSpot] at the specified position. */ -fun register(spot: FishingSpot, x: Int, y: Int, z: Int = 0) { - val position = Position(x, y, z) - Spawns.list.add(Spawn(spot.npc, "", position, Direction.NORTH)) +infix fun FishingSpot.at(position: Position) { + spawnNpc("", position.x, position.y, position.height, id = npc, facing = Direction.NORTH) } \ No newline at end of file