v2.2.6 - Fix to prevent SoilMod adding spray-types to bought equipment that does not have the 'Sprayer' specialization.

- Some minor code refacturing
- Updated the change-log

Author: DeckerMMIV

README.md

@@ -92,6 +92,13 @@ During a growth-cycle, crops with cause the following effects:
 
 ## Change-log
 
+2.2.6
+- Russan translation updated by Gonimy-Vetrom
+- Italian translation updated by DD Modpassion
+- Polish translation updated by Dzi4d3k
+- Fix for 'grid-pattern'-growth problem on x4 maps (and possibly also x16 maps)
+- Fix for only adding SoilMod spray-types to equipment with 'Sprayer' specialization
+
 2.2.3
 - Hired workers tries to "remember" what they are spraying, even when empty.
   - NOTE: This only works with-in the current play-session, and NOT between save/load sessions.

SoilManagement/_ReadMe_EN.txt

@@ -10,6 +10,13 @@ Note: This is a BBCode formatted text-file.
 [i]Remember to check the FS-UK support topic for any additional information regarding this mod[/i]
 
 [b][u]Changelog[/u][/b]
+2.2.6
+- Russan translation updated by Gonimy-Vetrom
+- Italian translation updated by DD Modpassion
+- Polish translation updated by Dzi4d3k
+- Fix for 'grid-pattern'-growth problem on x4 maps (and possibly also x16 maps)
+- Fix for only adding SoilMod spray-types to equipment with 'Sprayer' specialization.
+
 2.2.3
 - Hired workers tries to "remember" what they are spraying, even when empty.
   - NOTE: This only works with-in the current play-session, and NOT between save/load sessions.

SoilManagement/modDesc.xml

@@ -4,7 +4,7 @@
     <contributors>sootysax, mngrazy, Gonimy_Vetrom, Iscarriah, Ziuta, DD ModPassion, Alfredo Prieto, Beowulf212, DreadX, Vanquish081, Michaelbjerg21978</contributors>
     <FS2013_contributors>JakobT, Gonimy_Vetrom, VAHA, KingFrame, Albi, webalizer, Marxtai, Calamarain</FS2013_contributors>
 
-    <version>2.2.5</version>
+    <version>2.2.6</version>
 
     <title>
         <en>Soil Management and Growth Control</en>

SoilManagement/soilMod/fmcGrowthControl.lua

@@ -283,7 +283,7 @@ function fmcGrowthControl:update(dt)
                 --    cellToUpdate = cellToUpdate - 1
                 --end
 
-                fmcGrowthControl.updateFoliageCell(self, cellToUpdate, fmcGrowthControl.lastDay, pctCompleted)
+                fmcGrowthControl.updateFoliageCell(self, cellToUpdate, 0, fmcGrowthControl.lastDay, pctCompleted)
                 --
                 fmcGrowthControl.lastGrowth = fmcGrowthControl.lastGrowth - 1
                 if fmcGrowthControl.lastGrowth <= 0 then
@@ -304,7 +304,7 @@ function fmcGrowthControl:update(dt)
                 local pctCompleted = ((totalCells - fmcGrowthControl.lastWeather) / totalCells) + 0.01 -- Add 1% to get clients to render "%"
                 local cellToUpdate = (fmcGrowthControl.lastWeather * 271) % (fmcGrowthControl.gridCells * fmcGrowthControl.gridCells)
 
-                fmcGrowthControl.updateFoliageWeatherCell(self, cellToUpdate, fmcGrowthControl.weatherInfo, fmcGrowthControl.lastDay, pctCompleted)
+                fmcGrowthControl.updateFoliageCell(self, cellToUpdate, fmcGrowthControl.weatherInfo, fmcGrowthControl.lastDay, pctCompleted)
                 --
                 fmcGrowthControl.lastWeather = fmcGrowthControl.lastWeather - 1
                 if fmcGrowthControl.lastWeather <= 0 then
@@ -544,15 +544,7 @@ function fmcGrowthControl:createWeedFoliage(centerX,centerZ,radius,weedType, noE
 end
 
 --
-function fmcGrowthControl:updateFoliageCell(cellToUpdate, day, pctCompleted, noEventSend)
-    local x = math.floor(fmcGrowthControl.gridCellWH * math.floor(cellToUpdate % fmcGrowthControl.gridCells))
-    local z = math.floor(fmcGrowthControl.gridCellWH * math.floor(cellToUpdate / fmcGrowthControl.gridCells))
-    local sx,sz = (x-(g_currentMission.terrainSize/2)),(z-(g_currentMission.terrainSize/2))
-
-    fmcGrowthControl:updateFoliageCellXZWH(sx,sz, fmcGrowthControl.gridCellWH - 0.1, 0, day, pctCompleted, noEventSend)
-end
-
-function fmcGrowthControl:updateFoliageWeatherCell(cellToUpdate, weatherInfo, day, pctCompleted, noEventSend)
+function fmcGrowthControl:updateFoliageCell(cellToUpdate, weatherInfo, day, pctCompleted, noEventSend)
     local x = math.floor(fmcGrowthControl.gridCellWH * math.floor(cellToUpdate % fmcGrowthControl.gridCells))
     local z = math.floor(fmcGrowthControl.gridCellWH * math.floor(cellToUpdate / fmcGrowthControl.gridCells))
     local sx,sz = (x-(g_currentMission.terrainSize/2)),(z-(g_currentMission.terrainSize/2))

SoilManagement/soilMod/fmcModifySprayers.lua

@@ -243,7 +243,9 @@ function fmcModifySprayers.overwriteSprayer1()
     logInfo("Prepending to Fillable.postLoad, for adding extra fill-types")
     Fillable.postLoad = Utils.prependedFunction(Fillable.postLoad, function(self, xmlFile)
         -- Only consider tools that can spread/spray 'fertilizer'.
-        if self.fillTypes[Fillable.FILLTYPE_FERTILIZER] then
+        if  self.fillTypes[Fillable.FILLTYPE_FERTILIZER] 
+        and SpecializationUtil.hasSpecialization(Sprayer, self.specializations)
+        then
             -- However if tool already accepts at least one for SoilMods spray-types (excluding 'kalk'), then do NOT add any extra
             for fillType,accepts in pairs(self.fillTypes) do
                 if  fillType ~= Fillable.FILLTYPE_FERTILIZER