diff --git a/Projects/UOContent/Engines/FarmSpawner.cs b/Projects/UOContent/Engines/FarmSpawner.cs index 3b6600f0f..d1594eb25 100644 --- a/Projects/UOContent/Engines/FarmSpawner.cs +++ b/Projects/UOContent/Engines/FarmSpawner.cs @@ -11,30 +11,54 @@ namespace Server.Engines.Farming private static readonly Rectangle2D[] m_FlaxPlot1 = { new(432, 1853, 10, 9), }; private static readonly Type[] m_FlaxCrop1 = { typeof(FarmableFlax)}; + private static readonly Rectangle2D[] m_FlaxPlot2 = { new(2170, 2072, 9, 7), }; + private static readonly Type[] m_FlaxCrop2 = { typeof(FarmableFlax)}; + + private static readonly Rectangle2D[] m_CottonPlot2 = { new(2170, 2081, 9, 7), }; + private static readonly Type[] m_CottonCrop2 = { typeof(FarmableCotton)}; + private static readonly Rectangle2D[] m_CottonPlot1 = { new(408, 1862, 9, 9), }; private static readonly Type[] m_CottonCrop1 = { typeof(FarmableCotton)}; private static readonly Rectangle2D[] m_WheatPlot1 = { new(474, 1839, 6, 9), }; private static readonly Type[] m_WheatCrop1 = { typeof(FarmableWheat)}; + private static readonly Rectangle2D[] m_WheatPlot2 = { new(2206, 2063, 8, 8), }; + private static readonly Type[] m_WheatCrop2 = { typeof(FarmableWheat)}; + private static readonly Rectangle2D[] m_TurnipPlot1 = { new(1534, 2904, 5, 5), }; private static readonly Type[] m_TurnipCrop1 = { typeof(FarmableTurnip)}; + private static readonly Rectangle2D[] m_TurnipPlot2 = { new(2256, 2044, 6, 6), }; + private static readonly Type[] m_TurnipCrop2 = { typeof(FarmableTurnip)}; + private static readonly Rectangle2D[] m_CabbagePlot1 = { new(1606, 2894, 8, 12), }; private static readonly Type[] m_CabbageCrop1 = { typeof(FarmableCabbage)}; + private static readonly Rectangle2D[] m_CabbagePlot2 = { new(2263, 2044, 6, 6), }; + private static readonly Type[] m_CabbageCrop2 = { typeof(FarmableCabbage)}; + private static readonly Rectangle2D[] m_CarrotPlot1 = { new(2170, 2104, 4, 7), }; private static readonly Type[] m_CarrotCrop1 = { typeof(FarmableCarrot)}; + private static readonly Rectangle2D[] m_CarrotPlot2 = { new(2256, 2051, 6, 6), }; + private static readonly Type[] m_CarrotCrop2 = { typeof(FarmableCarrot)}; + private static readonly Rectangle2D[] m_OnionPlot1 = { new(2175, 2104, 4, 7), }; private static readonly Type[] m_OnionCrop1 = { typeof(FarmableOnion)}; + private static readonly Rectangle2D[] m_OnionPlot2 = { new(2262, 2051, 6, 6), }; + private static readonly Type[] m_OnionCrop2 = { typeof(FarmableOnion)}; + private static readonly Rectangle2D[] m_LettucePlot1 = { new(2170, 2112, 4, 7), }; private static readonly Type[] m_LettuceCrop1 = { typeof(FarmableLettuce)}; private static readonly Rectangle2D[] m_PumpkinPlot1 = { new(2175, 2112, 4, 7), }; private static readonly Type[] m_PumpkinCrop1 = { typeof(FarmablePumpkin)}; + private static readonly Rectangle2D[] m_PumpkinPlot2 = { new(2197, 2063, 8, 8), }; + private static readonly Type[] m_PumpkinCrop2 = { typeof(FarmablePumpkin)}; + public static void Initialize() { _timer = Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), OnTick); @@ -43,14 +67,22 @@ namespace Server.Engines.Farming private static void OnTick() { ProcessRegion(m_FlaxPlot1, m_FlaxCrop1); + ProcessRegion(m_FlaxPlot2, m_FlaxCrop2); ProcessRegion(m_CottonPlot1, m_CottonCrop1); + ProcessRegion(m_CottonPlot2, m_CottonCrop2); ProcessRegion(m_WheatPlot1, m_WheatCrop1); + ProcessRegion(m_WheatPlot2, m_WheatCrop2); ProcessRegion(m_TurnipPlot1, m_TurnipCrop1); + ProcessRegion(m_TurnipPlot2, m_TurnipCrop2); ProcessRegion(m_CabbagePlot1, m_CabbageCrop1); + ProcessRegion(m_CabbagePlot2, m_CabbageCrop2); ProcessRegion(m_CarrotPlot1, m_CarrotCrop1); + ProcessRegion(m_CarrotPlot2, m_CarrotCrop2); ProcessRegion(m_OnionPlot1, m_OnionCrop1); + ProcessRegion(m_OnionPlot2, m_OnionCrop2); ProcessRegion(m_LettucePlot1, m_LettuceCrop1); ProcessRegion(m_PumpkinPlot1, m_PumpkinCrop1); + ProcessRegion(m_PumpkinPlot2, m_PumpkinCrop2); } private static void ProcessRegion(Rectangle2D[] fields, Type[] cropTypes)