Add shantay pass and magic carpets (#820)

* Expose door opening and closing mechanics

* Add Shantay Pass

* Add better quest requirement skipping

* Add None expression type, clear camera on graphics options open, add separate close/open tabs method

* Start adding all rug merchants

* Add patrol loop toggle

* Start adding carpet routes

* Add no collision patrolling

* Add all routes and tests

* Route fixes

* Formatting

* Add better uzer route to avoid plants

Add better uzer route to avoid cactus

* Fix warning continuing

* Replace None expression with Blink

* Use static timestamp in tests to fix #817

Author: GregHib

data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npc-spawns.toml

@@ -1,12 +1,12 @@
 spawns = [
 # 13104
   { id = "musician_shantay_pass", x = 3309, y = 3126, direction = "WEST" },
-  { id = "monkey_bedabin_camp", x = 3311, y = 3108, members = true },
+  { id = "magic_carpet_monkey", x = 3311, y = 3108, members = true },
   { id = "irena_shantay_pass", x = 3303, y = 3113, members = true },
   { id = "irena_shantay_pass_2", x = 3304, y = 3113, members = true },
   { id = "scout_shantay_pass", x = 3301, y = 3100, members = true },
   { id = "ana_shantay_pass", x = 3305, y = 3112, members = true },
-  { id = "shantay_shantay_pass", x = 3304, y = 3118 },
+  { id = "shantay", x = 3304, y = 3118 },
   { id = "ugthanki", x = 3267, y = 3077 },
   { id = "ugthanki", x = 3269, y = 3110 },
   { id = "ugthanki", x = 3275, y = 3094 },
@@ -15,7 +15,9 @@ spawns = [
   { id = "ugthanki", x = 3305, y = 3089 },
   { id = "ugthanki", x = 3318, y = 3078 },
   { id = "ugthanki", x = 3321, y = 3104 },
+  { id = "shantay_guard", x = 3299, y = 32124 },
   { id = "shantay_guard", x = 3305, y = 3129 },
   { id = "shantay_guard", x = 3307, y = 3123 },
+  { id = "shantay_guard_still", x = 3303, y = 3118 },
   { id = "rug_merchant_shantay_pass", x = 3311, y = 3109 },
 ]

data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npcs.toml

@@ -10,8 +10,9 @@ id = 5577
 [ana_shantay_pass]
 id = 6077
 
-[shantay_shantay_pass]
+[shantay]
 id = 836
+shop = "shantay_pass_shop"
 examine = "He's in control of the Shantay Pass."
 
 [ugthanki]
@@ -46,8 +47,13 @@ respawn_delay = 50
 drop_table = "bones"
 examine = "He patrols the Shantay Pass."
 
+[shantay_guard_still]
+id = 838
+examine = "He patrols the Shantay Pass."
+
 [rug_merchant_shantay_pass]
 id = 2291
+wander_radius = 2
 examine = "A man who deals in rugs."
 
 [irena_shantay_pass_3]

data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.objs.toml

@@ -0,0 +1,11 @@
+[shantay_pass]
+id = 12774
+examine = "Looks like a stone doorway to me."
+
+[danger_sign]
+id = 35555
+examine = "A sign that suggests danger."
+
+[shantay_chest]
+id = 2693
+examine = "This is used by Shantay and his men to take items to the bank on your behalf."

data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.vars.toml

@@ -0,0 +1,4 @@
+[shantay_state]
+format = "list"
+persist = true
+values = [ "new_player", "returning", "jailed" ]

data/area/kharidian_desert/bedabin_camp/bedabin_camp.npc-spawns.toml

@@ -1,5 +1,5 @@
 spawns = [
-  { id = "monkey_bedabin_camp", x = 3181, y = 3043, members = true },
+  { id = "magic_carpet_monkey", x = 3181, y = 3043, members = true },
   { id = "camel_ardougne", x = 3173, y = 3039 },
   { id = "al_shabim_bedabin_camp", x = 3171, y = 3025 },
   { id = "ugthanki", x = 3190, y = 3054 },
@@ -13,7 +13,7 @@ spawns = [
   { id = "bedabin_nomad_guard", x = 3173, y = 3035, members = true },
   { id = "bedabin_nomad_guard", x = 3176, y = 3038, members = true },
   { id = "bedabin_nomad_guard", x = 3176, y = 3043, members = true },
-  { id = "rug_merchant_bedabin", x = 3182, y = 3043, members = true },
+  { id = "rug_merchant_bedabin_camp", x = 3182, y = 3043, members = true },
   { id = "asgarnia_smith", x = 3178, y = 3043, members = true },
   { id = "bedabin_nomad_fighter", x = 3160, y = 3031, members = true },
   { id = "bedabin_nomad_fighter", x = 3162, y = 3033, members = true },

data/area/kharidian_desert/bedabin_camp/bedabin_camp.npcs.toml

@@ -1,4 +1,4 @@
-[monkey_bedabin_camp]
+[magic_carpet_monkey]
 id = 2301
 examine = "Perhaps our oldest relatives."
 
@@ -27,8 +27,9 @@ respawn_delay = 50
 drop_table = "bones"
 examine = "A bedabin nomad fighter - a sandy swordsman."
 
-[rug_merchant_bedabin]
+[rug_merchant_bedabin_camp]
 id = 2292
+wander_radius = 2
 examine = "A man who deals in rugs."
 
 [asgarnia_smith]

data/area/kharidian_desert/kharidian_desert.npc-spawns.toml

@@ -78,10 +78,10 @@ spawns = [
   { id = "jackal", x = 3378, y = 2906, members = true },
   { id = "jackal", x = 3378, y = 2908, members = true },
   { id = "wanderer_kharidian_desert", x = 3315, y = 2849, members = true },
-  { id = "rug_merchant_kharidian_desert_2", x = 3309, y = 2822, members = true },
-  { id = "monkey_bedabin_camp", x = 3347, y = 2942, members = true },
+  { id = "rug_merchant_sophanem", x = 3287, y = 2813, members = true },
+  { id = "monkey_kharidian_desert", x = 3288, y = 2816, members = true },
+  { id = "magic_carpet_monkey", x = 3347, y = 2942, members = true },
   { id = "monkey_kharidian_desert", x = 3243, y = 2820, members = true },
-  { id = "monkey_kharidian_desert", x = 3309, y = 2823, members = true },
   { id = "vulture_agility_pyramid", x = 3215, y = 2841, members = true },
   { id = "vulture_agility_pyramid", x = 3217, y = 2845, members = true },
   { id = "vulture_agility_pyramid", x = 3220, y = 2841, members = true },

data/area/kharidian_desert/kharidian_desert.npcs.toml

@@ -33,6 +33,7 @@ id = 13235
 
 [rug_merchant_kharidian_desert]
 id = 13237
+wander_radius = 2
 
 [desert_snake]
 id = 1874
@@ -68,8 +69,9 @@ examine = "Never smile at a..."
 [wanderer_kharidian_desert]
 id = 2002
 
-[rug_merchant_kharidian_desert_2]
+[rug_merchant_sophanem]
 id = 2297
+wander_radius = 2
 
 [monkey_kharidian_desert]
 id = 2302
@@ -146,6 +148,7 @@ id = 2006
 
 [rug_merchant_kharidian_desert_2_2]
 id = 2298
+wander_radius = 2
 
 [ali_the_wise_kharidian_desert_2]
 id = 7447
@@ -200,3 +203,4 @@ id = 13236
 
 [rug_merchant_kharidian_desert_3]
 id = 13238
+wander_radius = 2

data/area/kharidian_desert/magic_carpet/magic_carpet.anims.toml

@@ -0,0 +1,8 @@
+[magic_carpet_stand]
+id = 330
+
+[magic_carpet_land]
+id = 331
+
+[magic_carpet_takeoff]
+id = 654

data/area/kharidian_desert/magic_carpet/magic_carpet.gfx.toml

@@ -0,0 +1,8 @@
+[magic_carpet_takeoff]
+id = 2931
+
+[magic_carpet_fly]
+id = 2932
+
+[magic_carpet_land]
+id = 2933