diff --git a/Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json b/Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json index e27841353..1f9487735 100644 --- a/Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json +++ b/Distribution/Data/Spawns/Overworld/Bastion_TownCritters.json @@ -206,22 +206,6 @@ { "name": "crane", "probability": 100, "maxCount": 1 } ] }, - { - "$type": "Spawner", - "guid": "940fe9de-3a26-40a4-88c5-c2df52a97f12", - "location": [0, 0, 1], - "map": "Veridia", - "count": 7, - "minDelay": "00:05:00", - "maxDelay": "00:10:00", - "homeRange": 20, - "walkingRange": 30, - "entries": [ - { "name": "bird", "probability": 100, "maxCount": 5 }, - { "name": "dog", "probability": 100, "maxCount": 1 }, - { "name": "cat", "probability": 100, "maxCount": 1 } - ] - }, { "$type": "Spawner", "guid": "b72043a4-012a-4b6a-962b-42edbb5a0314", diff --git a/Projects/UOContent/Misc/Weather.cs b/Projects/UOContent/Misc/Weather.cs index 3a8a919ea..62e3477b8 100644 --- a/Projects/UOContent/Misc/Weather.cs +++ b/Projects/UOContent/Misc/Weather.cs @@ -59,7 +59,7 @@ public partial class Weather public static void Initialize() { - m_Facets = [Map.Felucca, Map.Trammel]; + m_Facets = [Map.Trammel]; /* Static weather: * @@ -67,22 +67,25 @@ public partial class Weather * AddWeather( temperature, chanceOfPrecipitation, chanceOfExtremeTemperature, ); */ - // ice island + // Cold Regions AddWeather( -15, 100, 5, - new Rectangle2D(3850, 160, 390, 320), - new Rectangle2D(3900, 480, 380, 180), - new Rectangle2D(4160, 660, 150, 110) + // Port Grim && Wharf's End + new Rectangle2D(2904, 296, 397, 383), + new Rectangle2D(3209, 234, 92, 58), + new Rectangle2D(3301, 234, 66, 637), + new Rectangle2D(3367, 291, 330, 580), + //Coldbarrow + new Rectangle2D(3194, 2185, 785, 291), + new Rectangle2D(3426, 2476, 346, 87), + new Rectangle2D(2629, 2218, 243, 670), + new Rectangle2D(2935, 2248, 50, 560), + new Rectangle2D(2985, 2326, 81, 368), + new Rectangle2D(3066, 2364, 128, 139) ); - // covetous entrance, around vesper and minoc - AddWeather(+15, 50, 5, new Rectangle2D(2425, 725, 250, 250)); - - // despise entrance, north of britain - AddWeather(+15, 50, 5, new Rectangle2D(1245, 1045, 250, 250)); - /* Dynamic weather: * * Format: @@ -91,7 +94,7 @@ public partial class Weather for (var i = 0; i < 15; ++i) { - AddDynamicWeather(+15, 100, 5, 8, 400, 400, new Rectangle2D(0, 0, 5120, 4096)); + AddDynamicWeather(+15, 100, 5, 8, 400, 400, new Rectangle2D(0, 0, 4275, 4095)); } }