diff --git a/Distribution/Data/Spawns/Overworld/Bastion_NPCs.json b/Distribution/Data/Spawns/Overworld/Bastion_NPCs.json index 5b0beebf1..e489b99a5 100644 --- a/Distribution/Data/Spawns/Overworld/Bastion_NPCs.json +++ b/Distribution/Data/Spawns/Overworld/Bastion_NPCs.json @@ -909,5 +909,19 @@ "entries": [ { "name": "bountyvendor", "probability": 100, "maxCount": 1 } ] + }, + { + "$type": "Spawner", + "guid": "79cc3fd0-1e54-48cc-b858-975101e285f0", + "location": [1886, 1947, 1], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": 10, + "entries": [ + { "name": "harbormaster", "probability": 100, "maxCount": 1 } + ] } ] diff --git a/Distribution/Data/Spawns/Overworld/End_Point_Dock_Critters.json b/Distribution/Data/Spawns/Overworld/End_Point_Dock_Critters.json new file mode 100644 index 000000000..3a909b6eb --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/End_Point_Dock_Critters.json @@ -0,0 +1,18 @@ +[ + { + "$type": "RegionSpawner", + "guid": "7828a42b-6b29-4cda-87b5-88db80d9f506", + "location": [1537, 954, 8], + "map": "Veridia", + "count": 8, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "region": "the End Point Dock", + "walkingRange": -1, + "entries": [ + { "name": "cat", "probability": 100, "maxCount": 2 }, + { "name": "rat", "probability": 100, "maxCount": 2 }, + { "name": "dog", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/Spawns/Overworld/End_Point_Dock_NPCs.json b/Distribution/Data/Spawns/Overworld/End_Point_Dock_NPCs.json new file mode 100644 index 000000000..dc80cc2b2 --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/End_Point_Dock_NPCs.json @@ -0,0 +1,44 @@ +[ + { + "$type": "Spawner", + "guid": "8eb24c8c-e159-4d2d-b70b-e0f212d6d426", + "location": [1535, 936, 8], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "fisherman", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "7dfa3ece-29c2-440c-8d9d-737fc34a81d1", + "location": [1536, 956, 8], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": 8, + "entries": [ + { "name": "harbormaster", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "fa4bebb5-85e4-4b3c-ac43-e49cc34872fc", + "location": [1536, 954, 8], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "merchant", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/Spawns/Overworld/Landow_Docks_NPCs.json b/Distribution/Data/Spawns/Overworld/Landow_Docks_NPCs.json new file mode 100644 index 000000000..097ee9f69 --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/Landow_Docks_NPCs.json @@ -0,0 +1,142 @@ +[ + { + "$type": "Spawner", + "guid": "b9d81f2b-0d77-481d-8864-deaa9018172c", + "location": [1729, 1468, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "warriorguard", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "84401af0-b5cb-479a-b935-3805615a5544", + "location": [1739, 1506, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "fisherman", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "7f7a6e08-7dc9-48d7-add1-c21ca2fdb7cf", + "location": [1716, 1513, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "fisherman", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "6067242e-b93a-4b48-881d-0edaafe1ad72", + "location": [1711, 1472, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "thief", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "1baaf60c-bba6-47f0-9b29-03257b994f63", + "location": [1711, 1464, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "shipwright", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "703ce7f4-2ff0-444d-ac62-92ef0263b416", + "location": [1729, 1475, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "mapmaker", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "5c4eeb97-2031-4e7c-a00c-547f3c5d64d0", + "location": [1743, 1475, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "butcher", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "9b080f07-cb61-422c-881f-9b9709cae16b", + "location": [1743, 1464, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "innkeeper", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "56e3dfae-d354-4389-a9dc-027f7589a9a6", + "location": [1727, 1461, 7], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 1, + "walkingRange": 4, + "entries": [ + { "name": "provisioner", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "01d53a5f-4ffd-4e02-8dfb-19f86b555779", + "location": [1727, 1498, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 6, + "walkingRange": 12, + "entries": [ + { "name": "harbormaster", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/Spawns/Overworld/Landow_Docks_TownCritters.json b/Distribution/Data/Spawns/Overworld/Landow_Docks_TownCritters.json new file mode 100644 index 000000000..b25bc9dca --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/Landow_Docks_TownCritters.json @@ -0,0 +1,36 @@ +[ + { + "$type": "Spawner", + "guid": "3436ea84-0ffe-4104-937f-b7a10d5a131c", + "location": [1726, 1468, 7], + "map": "Veridia", + "count": 8, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 15, + "walkingRange": -1, + "entries": [ + { "name": "dog", "probability": 100, "maxCount": 1 }, + { "name": "cat", "probability": 100, "maxCount": 1 }, + { "name": "rat", "probability": 100, "maxCount": 2 }, + { "name": "bird", "probability": 100, "maxCount": 4 } + ] + }, + { + "$type": "Spawner", + "guid": "b0a1d6e3-6bee-488b-b2d9-db57e3f8d912", + "location": [1726, 1497, 2], + "map": "Veridia", + "count": 10, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 15, + "walkingRange": -1, + "entries": [ + { "name": "bird", "probability": 100, "maxCount": 4 }, + { "name": "rat", "probability": 100, "maxCount": 4 }, + { "name": "cat", "probability": 100, "maxCount": 3 }, + { "name": "dog", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/Spawns/Overworld/Landow_NPCs.json b/Distribution/Data/Spawns/Overworld/Landow_NPCs.json new file mode 100644 index 000000000..72a22c0cc --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/Landow_NPCs.json @@ -0,0 +1,143 @@ +[ + { + "$type": "Spawner", + "guid": "b848a875-7409-4274-a801-b840b9fe37fc", + "location": [1797, 1357, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 2, + "walkingRange": 4, + "entries": [ + { "name": "blacksmith", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "77d74b9b-5f30-40fa-b9c8-40eee7aa5ef6", + "location": [1808, 1357, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "warriorguard", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "6243293b-ef93-4b75-8716-40d01c6c52b6", + "location": [1800, 1379, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "provisioner", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "1672eb76-fb63-4076-8322-84f7c52858b8", + "location": [1798, 1395, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 2, + "walkingRange": 4, + "entries": [ + { "name": "leatherworker", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "65a801f3-cf80-44f5-bfb8-7db37fbc40f9", + "location": [1800, 1396, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 2, + "walkingRange": 4, + "entries": [ + { "name": "cobbler", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "f73931a7-4fef-44b8-8184-912bc05f52c0", + "location": [1821, 1396, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "bowyer", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "c5e50252-31a2-4a93-b00c-9da7ba55a359", + "location": [1834, 1397, 42], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "spawnBounds": { "x1": 1834, "y1": 1397, "z1": 42, "x2": 1835, "y2": 1398, "z2": 128 }, + "walkingRange": 3, + "entries": [ + { "name": "warriorguard", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "93b7f911-da26-4f2d-8169-e390ddf14b0c", + "location": [1809, 1388, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "warriorguard", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "fc492a97-ccf0-42e9-a0e4-fa8f2552a044", + "location": [1786, 1367, 2], + "map": "Veridia", + "count": 2, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "healer", "probability": 100, "maxCount": 1 }, + { "name": "monk", "probability": 100, "maxCount": 1 } + ] + }, + { + "$type": "Spawner", + "guid": "e44b04bc-a9c3-4981-914a-e573ac0e18f0", + "location": [1781, 1412, 2], + "map": "Veridia", + "count": 1, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "homeRange": 4, + "walkingRange": -1, + "entries": [ + { "name": "warriorguard", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/Spawns/Overworld/Landow_TownCritters.json b/Distribution/Data/Spawns/Overworld/Landow_TownCritters.json new file mode 100644 index 000000000..43f5abb8e --- /dev/null +++ b/Distribution/Data/Spawns/Overworld/Landow_TownCritters.json @@ -0,0 +1,19 @@ +[ + { + "$type": "RegionSpawner", + "guid": "980b7cd4-40c6-40b9-8dd9-7cd99714c343", + "location": [1806, 1391, 2], + "map": "Veridia", + "count": 18, + "minDelay": "00:05:00", + "maxDelay": "00:10:00", + "region": "the town of Landow", + "walkingRange": -1, + "entries": [ + { "name": "bird", "probability": 100, "maxCount": 14 }, + { "name": "cat", "probability": 100, "maxCount": 1 }, + { "name": "rat", "probability": 100, "maxCount": 2 }, + { "name": "dog", "probability": 100, "maxCount": 1 } + ] + } +] diff --git a/Distribution/Data/regions.json b/Distribution/Data/regions.json index 773bdb6d6..c9764c8bf 100644 --- a/Distribution/Data/regions.json +++ b/Distribution/Data/regions.json @@ -2085,6 +2085,16 @@ { "x1": 1709, "y1": 1471, "x2": 1714, "y2": 1482 } ] }, + { + "$type": "GreetingBusinessRegion", + "Map": "Veridia", + "Parent": { "Name": "the Landow Docks", "Map": "Veridia" }, + "Name": "the Dock Provisioner", + "Priority": 60, + "Area": [ + { "x1": 1725, "y1": 1459, "x2": 1731, "y2": 1465 } + ] + }, { "$type": "GreetingBusinessRegion", "Map": "Veridia", @@ -2115,6 +2125,17 @@ { "x1": 1741, "y1": 1460, "x2": 1746, "y2": 1470 } ] }, + { + "$type": "GreetingBusinessRegion", + "Map": "Veridia", + "Name": "the End Point Dock", + "Priority": 60, + "Area": [ + { "x1": 1531, "y1": 933, "x2": 1542, "y2": 962 }, + { "x1": 1542, "y1": 953, "x2": 1554, "y2": 962 }, + { "x1": 1547, "y1": 962, "x2": 1554, "y2": 963 } + ] + }, { "$type": "NewbieDungeonRegion", "Map": "Underworld", diff --git a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs index 84e1f1d3a..f43036e67 100644 --- a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs +++ b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs @@ -15,7 +15,7 @@ public partial class HarborMaster : BaseCreature SetSpeed(0.2, 0.4); SpeechHue = Utility.RandomDyedHue(); Hue = Race.Human.RandomSkinHue(); - Blessed = true; + //Blessed = true; if (Female = Utility.RandomBool()) {