From 6eebdd1f117d9d42cc4b28e7129ad10fa7d96eef Mon Sep 17 00:00:00 2001 From: Major- Date: Sun, 14 Feb 2016 16:11:31 +0000 Subject: [PATCH] Improve Falador/Varrock npcs.rb formatting --- data/plugins/location/falador/npcs.rb | 43 +++++++++------------------ data/plugins/location/varrock/npcs.rb | 16 ++++------ 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/data/plugins/location/falador/npcs.rb b/data/plugins/location/falador/npcs.rb index b916b2ce..9d55c2e1 100644 --- a/data/plugins/location/falador/npcs.rb +++ b/data/plugins/location/falador/npcs.rb @@ -11,21 +11,16 @@ spawn_npc name: :drunken_man, x: 2957, y: 3368, z: 1 spawn_npc name: :dwarf_118, x: 3023, y: 3334 spawn_npc name: :dwarf_118, x: 3027, y: 3341 spawn_npc name: :dwarf_118, x: 3012, y: 3341 - spawn_npc name: :dwarf_118, x: 3017, y: 3346, z: 1 spawn_npc name: :dwarf_118, x: 3011, y: 3341, z: 1 -spawn_npc name: :dwarf_121, x: 3027, y: 3341 - -spawn_npc name: :dwarf_382, x: 3017, y: 3340 - +spawn_npc name: :dwarf_121, x: 3027, y: 3341 +spawn_npc name: :dwarf_382, x: 3017, y: 3340 spawn_npc name: :dwarf_3294, x: 3022, y: 3338 - spawn_npc name: :dwarf_3295, x: 3021, y: 3341 -spawn_npc name: :gardener, x: 2998, y: 3385 -spawn_npc name: :gardener, x: 3019, y: 3369 - +spawn_npc name: :gardener, x: 2998, y: 3385 +spawn_npc name: :gardener, x: 3019, y: 3369 spawn_npc name: :gardener_3234, x: 3016, y: 3386 spawn_npc name: :guard, x: 2965, y: 3394 @@ -45,7 +40,6 @@ spawn_npc name: :guard_3230, x: 2967, y: 3395 spawn_npc name: :guard_3230, x: 2966, y: 3392 spawn_npc name: :guard_3230, x: 2963, y: 3376 spawn_npc name: :guard_3230, x: 2954, y: 3382 - spawn_npc name: :guard_3231, x: 2950, y: 3377 spawn_npc name: :guard_3231, x: 2968, y: 3381 @@ -67,7 +61,6 @@ spawn_npc name: :swan, x: 2976, y: 3358 spawn_npc name: :swan, x: 2989, y: 3384 spawn_npc name: :man_3223, x: 2991, y: 3365 - spawn_npc name: :man_3225, x: 3037, y: 3345, z: 1 spawn_npc name: :white_knight, x: 2983, y: 3343 @@ -98,8 +91,7 @@ spawn_npc name: :white_knight_3348, x: 2964, y: 3337, z: 1 spawn_npc name: :white_knight_3349, x: 2989, y: 3344, z: 1 -spawn_npc name: :white_knight, x: 2985, y: 3342, z: 2 - +spawn_npc name: :white_knight, x: 2985, y: 3342, z: 2 spawn_npc name: :white_knight_3348, x: 2979, y: 3348, z: 2 spawn_npc name: :white_knight_3348, x: 2974, y: 3329, z: 2 spawn_npc name: :white_knight_3348, x: 2982, y: 3341, z: 2 @@ -136,37 +128,30 @@ spawn_npc name: :banker, x: 3011, y: 3353, face: :north spawn_npc name: :banker, x: 3010, y: 3353, face: :north spawn_npc name: :cassie, x: 2976, y: 3383 - -spawn_npc name: :emily, x: 2954, y: 3372 - -spawn_npc name: :flynn, x: 2950, y: 3387 +spawn_npc name: :emily, x: 2954, y: 3372 +spawn_npc name: :flynn, x: 2950, y: 3387 spawn_npc name: :hairdresser, x: 2944, y: 3380 spawn_npc name: :herquin, x: 2945, y: 3335 spawn_npc name: :heskel, x: 3007, y: 3374 - spawn_npc name: :kaylee, x: 2957, y: 3372 -spawn_npc name: :tina, x: 2955, y: 3371, z: 1 - +spawn_npc name: :tina, x: 2955, y: 3371, z: 1 spawn_npc name: :tool_leprechaun, x: 3005, y: 3370 -spawn_npc name: :sir_amik_varze, x: 2960, y: 3336, z: 2 - +spawn_npc name: :squire, x: 2977, y: 3343 spawn_npc name: :sir_tiffy_cashien, x: 2997, y: 3373, face: :north - -spawn_npc name: :sir_vyvin, x: 2983, y: 3335, z: 2 +spawn_npc name: :sir_amik_varze, x: 2960, y: 3336, z: 2 +spawn_npc name: :sir_vyvin, x: 2983, y: 3335, z: 2 spawn_npc name: :shop_asssistant_525, x: 2955, y: 3389 - -spawn_npc name: :shop_keeper_524, x: 2957, y: 3387 - -spawn_npc name: :squire, x: 2977, y: 3343 +spawn_npc name: :shop_keeper_524, x: 2957, y: 3387 spawn_npc name: :wayne, x: 2972, y: 3312 spawn_npc name: :workman_3236, x: 2975, y: 3369, z: 1 -spawn_npc name: :wyson_the_gardener, x: 3028, y: 3381 \ No newline at end of file +spawn_npc name: :wyson_the_gardener, x: 3028, y: 3381 + diff --git a/data/plugins/location/varrock/npcs.rb b/data/plugins/location/varrock/npcs.rb index 4a3ebf77..0bd4c84e 100644 --- a/data/plugins/location/varrock/npcs.rb +++ b/data/plugins/location/varrock/npcs.rb @@ -28,7 +28,6 @@ spawn_npc name: :giant_rat_87, x: 3267, y: 3381 spawn_npc name: :guard_368, x: 3263, y: 3407, face: :south spawn_npc name: :jeremy_clerksin, x: 3253, y: 3477 - spawn_npc name: :martina_scorsby, x: 3256, y: 3481 spawn_npc name: :man, x: 3281, y: 3500 @@ -38,7 +37,6 @@ spawn_npc name: :man, x: 3245, y: 3394 spawn_npc name: :man, x: 3283, y: 3492, z: 1 spawn_npc name: :man_2, x: 3263, y: 3400 - spawn_npc name: :man_3, x: 3227, y: 3395, z: 1 spawn_npc name: :man_3, x: 3231, y: 3399, z: 1 @@ -235,18 +233,14 @@ spawn_npc name: :zaff, x: 3203, y: 3434 # Juliet House spawn_npc name: :draul_leptoc, x: 3228, y: 3475 - -spawn_npc name: :juliet, x: 3159, y: 3425, z: 1 - -spawn_npc name: :phillipa, x: 3160, y: 3429, z: 1 +spawn_npc name: :juliet, x: 3159, y: 3425, z: 1 +spawn_npc name: :phillipa, x: 3160, y: 3429, z: 1 # Gertrude House spawn_npc name: :gertrude, x: 3153, y: 3413 - -spawn_npc name: :kanel, x: 3155, y: 3405, face: :east - -spawn_npc name: :philop, x: 3150, y: 3405, face: :south +spawn_npc name: :kanel, x: 3155, y: 3405, face: :east +spawn_npc name: :philop, x: 3150, y: 3405, face: :south # Small Bank @@ -261,4 +255,4 @@ spawn_npc name: :banker_494, x: 3187, y: 3436, face: :west spawn_npc name: :banker_495, x: 3187, y: 3438, face: :west spawn_npc name: :banker_494, x: 3187, y: 3440, face: :west spawn_npc name: :banker_495, x: 3187, y: 3442, face: :west -spawn_npc name: :banker_494, x: 3187, y: 3444, face: :west \ No newline at end of file +spawn_npc name: :banker_494, x: 3187, y: 3444, face: :west