WIP

modDesc.xml

@@ -157,7 +157,6 @@ Funktionen:
 		<sourceFile filename="scripts/events/GlobalSettingsEvent.lua"/>
 		<sourceFile filename="scripts/events/VehicleSettingsEvent.lua"/>
 		<sourceFile filename="scripts/events/DebugChannelEvent.lua"/>
-		<sourceFile filename="scripts/events/SendCustomFieldsToServerEvent.lua"/>
 	</extraSourceFiles>
 
 	<specializations>

scripts/ai/AIDriveStrategyFindBales.lua

@@ -146,18 +146,17 @@ function AIDriveStrategyFindBales:setAllStaticParameters()
     self.pathfinderFailureCount = 0
 end
 
+function AIDriveStrategyFindBales:setFieldPolygon(fieldPolygon)
+    self.fieldPolygon = fieldPolygon
+end
+
 -----------------------------------------------------------------------------------------------------------------------
 --- Bale finding
 -----------------------------------------------------------------------------------------------------------------------
 ---@param bale BaleToCollect
 function AIDriveStrategyFindBales:isBaleOnField(bale)
-    if self.fieldId then
-        -- normal field mode
-        return bale:getFieldId() == self.fieldId
-    elseif self.customField then
-        local x, _, z = bale:getPosition()
-        return self.customField:isPointOnField(x, z)
-    end
+    local x, _, z = bale:getPosition()
+    return CpMathUtil.isPointInPolygon(self.fieldPolygon, x, z) 
 end
 
 --- Find bales on field

scripts/ai/jobs/CpAIJobBaleFinder.lua

@@ -60,6 +60,18 @@ function CpAIJobBaleFinder:validate(farmId)
 	if not isValid then
 		return isValid, errorMessage
 	end
-	isValid, errorMessage = self:validateFieldSetup(isValid, errorMessage)
+	isValid, errorMessage = self:validateFieldSetup(isValid, errorMessage)	
+	self.baleFinderTask:setFieldPolygon(self.fieldPolygon)
 	return isValid, errorMessage
 end
+
+function CpAIJobBaleFinder:readStream(streamId, connection)
+	self.fieldPolygon = CustomField.readStreamVertices(streamId, connection)
+	self.baleFinderTask:setFieldPolygon(self.fieldPolygon)
+	CpAIJobBaleFinder:superClass().readStream(self, streamId, connection)
+end
+
+function CpAIJobBaleFinder:writeStream(streamId, connection)
+	CustomField.writeStreamVertices(self.fieldPolygon, streamId, connection)
+	CpAIJobBaleFinder:superClass().writeStream(self, streamId, connection)
+end

scripts/ai/tasks/CpAITaskBaleFinder.lua

@@ -4,6 +4,7 @@ local AITaskBaleFinderCp_mt = Class(CpAITaskBaleFinder, AITask)
 function CpAITaskBaleFinder.new(isServer, job, customMt)
 	local self = AITask.new(isServer, job, customMt or AITaskBaleFinderCp_mt)
 	self.vehicle = nil
+	self.fieldPolygon = nil
 	return self
 end
 
@@ -20,9 +21,13 @@ function CpAITaskBaleFinder:setVehicle(vehicle)
 	self.vehicle = vehicle
 end
 
+function CpAITaskBaleFinder:setFieldPolygon(fieldPolygon)
+	self.fieldPolygon = fieldPolygon
+end
+
 function CpAITaskBaleFinder:start()
 	if self.isServer then
-		self.vehicle:startCpBaleFinder()
+		self.vehicle:startCpBaleFinder(self.fieldPolygon)
 	end
 
 	CpAITaskBaleFinder:superClass().start(self)

scripts/events/CpJoinEvent.lua

@@ -48,8 +48,7 @@ end
 
 --- Runs the event on the receiving end of the event.
 function CpJoinEvent:run(connection) 
-	--- Makes sure the custom fields are send to the server.
-	g_customFieldManager:sendToServer()
+
 end
 
 function CpJoinEvent.debug(str, ...)

scripts/field/CustomField.lua

@@ -174,3 +174,25 @@ function CustomField.createFromStream(streamId, connection)
     CpUtil.debugFormat(CpDebug.DBG_COURSES,'Custom field with %d points loaded from stream.', #customField.vertices)
     return customField
 end
+
+function CustomField.writeStreamVertices(vertices, streamId, connection)
+    streamWriteInt32(streamId, #vertices)
+    for _, point in pairs(vertices) do 
+        streamWriteFloat32(streamId, point.x)
+        streamWriteFloat32(streamId, point.z)
+    end
+end
+
+function CustomField.readStreamVertices(streamId, connection)
+    local numVertices =  streamReadInt32(streamId)
+    local vertices = {}
+    local p = {}
+    for i=1, numVertices do 
+        p = {
+            x = streamReadFloat32(streamId),
+            z = streamReadFloat32(streamId)
+        }
+        table.insert(vertices, p)
+    end
+    return vertices
+end

scripts/field/CustomFieldManager.lua

@@ -123,7 +123,7 @@ function CustomFieldManager:onClickSaveDialog(clickOk, field)
             field:getName())
             fieldValid = true
             table.insert(self.fields, field)
-            self:refresh()
+            self.fileSystem:refresh()
         end
     end
     if not fieldValid then 
@@ -141,7 +141,7 @@ function CustomFieldManager:onClickDeleteDialog(clickOk, fieldToDelete)
                     file:delete()
                     field:delete()
                     table.remove(self.fields, i)
-                    self:refresh()
+                    self.fileSystem:refresh()
                 else 
                     CpUtil.debugFormat(CpDebug.DBG_COURSES, 'Custom field %s was found, but the file not.', fieldToDelete:getName())
                 end
@@ -162,7 +162,7 @@ function CustomFieldManager:onClickRenameDialog(newName,clickOk,fieldToRename)
                     CpUtil.debugFormat(CpDebug.DBG_COURSES, 'Renamed custom field from %s to %s.', fieldToRename:getName(),newName)
                     if file:rename(newName) then 
                         fieldToRename:setName(newName)
-                        self:refresh()
+                        self.fileSystem:refresh()
                         return
                     end
                 end
@@ -226,26 +226,6 @@ function CustomFieldManager:refresh()
         CpUtil.debugFormat(CpDebug.DBG_COURSES,"Added new hotspot %s from filesystem.", entry:getName())
         table.insert(self.fields, CustomField.createFromXmlFile(entry))
     end
-    if g_server == nil then 
-        self:sendToServer()
-    end
-end
-
---- Sends the custom field data to the server.
-function CustomFieldManager:sendToServer()
-    SendCustomFieldsToServerEvent.sendEvent(self.fields)
-end
-
---- Removes the custom field data, when the user disconnects.
-function CustomFieldManager:onUserRemoved(user)
-    if user then
-        self.clientFields[user:getUniqueUserId()] = nil
-    end
-end
-
---- Custom fields received by a user.
-function CustomFieldManager:setFromClient(uniqueUserId, fields)
-    self.clientFields[uniqueUserId] = fields
 end
 
 -- for reload only:

scripts/specializations/CpAIBaleFinder.lua

@@ -89,8 +89,11 @@ function CpAIBaleFinder:startCpAtFirstWp(superFunc)
             local spec = self.spec_cpAIBaleFinder
             spec.cpJob:applyCurrentState(self, g_currentMission, g_currentMission.player.farmId, true)
             spec.cpJob:setValues()
-            g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJob, self:getOwnerFarmId()))
-            return true
+            local success = spec.cpJob:validate(false)
+            if success then
+                g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJob, self:getOwnerFarmId()))
+                return true
+            end
         end
     else 
         return true
@@ -104,27 +107,30 @@ function CpAIBaleFinder:startCpAtLastWp(superFunc)
             local spec = self.spec_cpAIBaleFinder
             spec.cpJob:applyCurrentState(self, g_currentMission, g_currentMission.player.farmId, true)
             spec.cpJob:setValues()
-            g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJob, self:getOwnerFarmId()))
-            return true
+            local success = spec.cpJob:validate(false)
+            if success then
+                g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJob, self:getOwnerFarmId()))
+                return true
+            end
         end
     else 
         return true
     end
 end
 
 --- Custom version of AIFieldWorker:startFieldWorker()
-function CpAIBaleFinder:startCpBaleFinder(jobParameters)
+function CpAIBaleFinder:startCpBaleFinder(fieldPolygon)
     --- Calls the giants startFieldWorker function.
     self:startFieldWorker()
     if self.isServer then 
         --- Replaces drive strategies.
-        CpAIBaleFinder.replaceDriveStrategies(self, jobParameters)
+        CpAIBaleFinder.replaceDriveStrategies(self, fieldPolygon)
     end
 end
 
 -- We replace the Giants AIDriveStrategyStraight with our AIDriveStrategyFieldWorkCourse  to take care of
 -- field work.
-function CpAIBaleFinder:replaceDriveStrategies(jobParameters)
+function CpAIBaleFinder:replaceDriveStrategies(fieldPolygon)
     CpUtil.infoVehicle(self, 'This is a CP field work job, start the CP AI driver, setting up drive strategies...')
     local spec = self.spec_aiFieldWorker
     if spec.driveStrategies ~= nil then
@@ -137,7 +143,8 @@ function CpAIBaleFinder:replaceDriveStrategies(jobParameters)
     end
 	CpUtil.infoVehicle(self, 'Bale collect/wrap job, install CP drive strategy for it')
     local cpDriveStrategy = AIDriveStrategyFindBales.new()
-    cpDriveStrategy:setAIVehicle(self, jobParameters)
+    cpDriveStrategy:setFieldPolygon(fieldPolygon)
+    cpDriveStrategy:setAIVehicle(self)
     self.spec_cpAIFieldWorker.driveStrategy = cpDriveStrategy
     --- TODO: Correctly implement this strategy.
 	local driveStrategyCollision = AIDriveStrategyCollision.new(cpDriveStrategy)

scripts/specializations/CpAIFieldWorker.lua

@@ -204,8 +204,11 @@ function CpAIFieldWorker:startCpAtFirstWp()
         --- Applies the lane offset set in the hud, so ad can start with the correct lane offset.
         spec.cpJobStartAtFirstWp:getCpJobParameters().laneOffset:setValue(spec.cpJob:getCpJobParameters().laneOffset:getValue())
         spec.cpJobStartAtFirstWp:setValues()
-        g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJobStartAtFirstWp, self:getOwnerFarmId()))
-        return true
+        local success = spec.cpJob:validate(false)
+        if success then
+            g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJobStartAtFirstWp, self:getOwnerFarmId()))
+            return true
+        end
     end
 end
 
@@ -216,8 +219,11 @@ function CpAIFieldWorker:startCpAtLastWp()
     if self:hasCpCourse() and self:getCanStartCpFieldWork() then
         spec.cpJobStartAtLastWp:applyCurrentState(self, g_currentMission, g_currentMission.player.farmId, true)
         spec.cpJobStartAtLastWp:setValues()
-        g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJobStartAtLastWp, self:getOwnerFarmId()))
-        return true
+        local success = spec.cpJob:validate(false)
+        if success then
+            g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(spec.cpJobStartAtLastWp, self:getOwnerFarmId()))
+            return true
+        end
     end
 end
 

scripts/specializations/CpAIWorker.lua

@@ -194,13 +194,15 @@ function CpAIWorker:startStopDriver()
 
             job:applyCurrentState(self, g_currentMission, g_currentMission.player.farmId, true)
             job:setValues()
-         --   local success = spec.cpJob:validate(false)
-         --   if success then
-            if true then
+            local success, message = job:validate(false)
+            if success then
                 g_client:getServerConnection():sendEvent(AIJobStartRequestEvent.new(job, self:getOwnerFarmId()))
                 CpUtil.infoVehicle(self, "Cp helper started.")
             else
-                CpUtil.infoVehicle(self, "Job parameters not valid.")
+                CpUtil.infoVehicle(self, "Could not start CP helper: %s", tostring(message))
+                if message then
+                    g_currentMission:showBlinkingWarning("CP: "..message, 5000)
+                end
             end
         else
             CpUtil.infoVehicle(self, "Could not start CP helper, it needs a course when not collecting bales.")