Rename npc_spawn function to spawnNpc

This commit is contained in:
Major-
2018-08-20 20:41:27 +01:00
parent ae73453e1a
commit d4de32c82c
8 changed files with 555 additions and 549 deletions
+129 -129
View File
@@ -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)
}