Merge pull request #289 from Courseplay/diff-mp-fixes

Changed settings event calls

Author: Tensuko

Courseplay.lua

@@ -106,7 +106,7 @@ function Courseplay:loadMap(filename)
 	self:load()
 	self:setupGui()
 	self:loadUserSettings()
-	if g_currentMission.missionInfo.savegameDirectory ~= nil then
+	if g_server ~= nil and g_currentMission.missionInfo.savegameDirectory ~= nil then
 		local saveGamePath = g_currentMission.missionInfo.savegameDirectory .."/"
 		local filePath = saveGamePath .. "Courseplay.xml"
 		self.xmlFile = XMLFile.load("cpXml", filePath , self.xmlSchema)

scripts/ai/parameters/AIParameterBooleanSetting.lua

@@ -34,16 +34,15 @@ function AIParameterBooleanSetting:loadFromXMLFile(xmlFile, key)
 	local rawValue = xmlFile:getString(key .. "#currentValue")
 	if rawValue ~= nil then 
 		self.loadedValue = rawValue
-		self:setValue(rawValue == "true" or false)
+		self:setValue(rawValue == "true" or false, true)
 	else 
 		self:loadFromXMLFileLegacy(xmlFile, key)
 	end
 end
 
-function AIParameterBooleanSetting:resetToLoadedValue()
+function AIParameterBooleanSetting:resetToLoadedValue(noEventSend)
 	if self.loadedValue ~= nil then 
-		self:setValue(self.loadedValue)
-		self:raiseDirtyFlag()
+		self:setValue(self.loadedValue, noEventSend)
 	end
 end
 

scripts/ai/parameters/AIParameterSetting.lua

@@ -128,10 +128,12 @@ end
 --- Make sure the setting value gets synchronized by the class.
 function AIParameterSetting:raiseDirtyFlag()
 	if not self:getIsUserSetting() then
-		if self.class and self.class.raiseDirtyFlag then
+		if self.class ~= nil and self.class.raiseDirtyFlag ~= nil then
 			if self.vehicle ~= nil then 
+				self:debug("Raising dirty flag for vehicle", CpUtil.getName(self.vehicle))
 				self.class.raiseDirtyFlag(self.vehicle, self)
 			else
+				self:debug("Raising dirty flag")
 				self.class:raiseDirtyFlag(self)
 			end
 		end

scripts/ai/parameters/AIParameterSettingInterface.lua

@@ -103,12 +103,12 @@ function AIParameterSettingInterface:refresh()
 end
 
 --- Sets a float value relative to the incremental.
-function AIParameterSettingInterface:setFloatValue(value, epsilon)
+function AIParameterSettingInterface:setFloatValue(value, epsilon, noEventSend)
 
 end
 
 --- Sets a value.
-function AIParameterSettingInterface:setValue(value)
+function AIParameterSettingInterface:setValue(value, noEventSend)
 
 end
 

scripts/ai/parameters/AIParameterSettingList.lua

@@ -54,11 +54,11 @@ function AIParameterSettingList:init(data, vehicle, class)
 	end
 	--- Lastly apply the default values here.
 	if data.default ~=nil then
-		AIParameterSettingList.setFloatValue(self, data.default)
+		AIParameterSettingList.setFloatValue(self, data.default, nil, true)
 		self:debug("set to default %s", data.default)
 	end
 	if data.defaultBool ~= nil then
-		AIParameterSettingList.setValue(self, data.defaultBool)
+		AIParameterSettingList.setValue(self, data.defaultBool, true)
 		self:debug("set to default %s", tostring(data.defaultBool))
 	end
 
@@ -273,7 +273,7 @@ function AIParameterSettingList:loadFromXMLFile(xmlFile, key)
 		self:debug("loaded value: %.2f", value)
 		self.loadedValue = value
 		--- Applies a small epsilon, as otherwise floating point problems might happen.
-		self:setFloatValue(value, 0.001)
+		self:setFloatValue(value, 0.001, true)
 	else 
 		self:loadFromXMLFileLegacy(xmlFile, key)
 	end
@@ -388,11 +388,15 @@ end
 ---@param value number
 ---@param epsilon number|nil optional
 ---@return boolean value is not valid and could not be set.
-function AIParameterSettingList:setFloatValue(value, epsilon)
-	return setValueInternal(self, value, function(a, b)
+function AIParameterSettingList:setFloatValue(value, epsilon, noEventSend)
+	local failed = setValueInternal(self, value, function(a, b)
 		local epsilon = epsilon or self.data.incremental or 0.1
 		if a == nil or b == nil then return false end
 		return a > b - epsilon / 2 and a <= b + epsilon / 2 end)
+	if not failed and not noEventSend then
+		self:raiseDirtyFlag()
+	end
+	return failed
 end
 
 --- Gets the closest value ix and absolute difference, relative to the value searched for.
@@ -416,16 +420,21 @@ end
 
 --- Sets a value.
 ---@param value number
+---@param noEventSend boolean|nil
 ---@return boolean value is not valid and could not be set.
-function AIParameterSettingList:setValue(value)
-	return setValueInternal(self, value, function(a, b)  return a == b end)
+function AIParameterSettingList:setValue(value, noEventSend)
+	local failed = setValueInternal(self, value, function(a, b)  return a == b end)
+	if not failed and not noEventSend then 
+		self:raiseDirtyFlag()
+	end
+	return failed
 end
 
 function AIParameterSettingList:setDefault(noEventSend)
 	local current = self.current
 	--- If the setting has a function to set the default value, then call it.
 	if self:hasCallback(self.data.setDefaultFunc) then 
-		self:getCallback(self.data.setDefaultFunc)
+		self:getCallback(self.data.setDefaultFunc, noEventSend)
 		self:debug("set to default by extern function.")
 		return
 	end
@@ -437,9 +446,9 @@ function AIParameterSettingList:setDefault(noEventSend)
 				local value = g_vehicleConfigurations:get(object, configName)
 				if value then 
 					if tonumber(value) then 
-						self:setFloatValue(value)
+						self:setFloatValue(value, noEventSend)
 					else
-						self:setValue(value)
+						self:setValue(value, noEventSend)
 					end
 					self:debug("set to default: %s from vehicle configuration: (%s|%s)", value, CpUtil.getName(object), configName)
 					return
@@ -449,12 +458,12 @@ function AIParameterSettingList:setDefault(noEventSend)
 	end
 	--- If default values were setup use these.
 	if self.data.default ~=nil then
-		AIParameterSettingList.setFloatValue(self, self.data.default)
+		AIParameterSettingList.setFloatValue(self, self.data.default, noEventSend)
 		self:debug("set to default %s", self.data.default)
 		return
 	end
 	if self.data.defaultBool ~= nil then
-		AIParameterSettingList.setValue(self, self.data.defaultBool)
+		AIParameterSettingList.setValue(self, self.data.defaultBool, noEventSend)
 		self:debug("set to default %s", tostring(self.data.defaultBool))
 		return
 	end
@@ -524,9 +533,9 @@ end
 --- Copy the value to another setting.
 function AIParameterSettingList:copy(setting)
 	if self.data.incremental and self.data.incremental ~= 1 then 
-		self:setFloatValue(setting.values[setting.current])
+		self:setFloatValue(setting.values[setting.current], nil, true)
 	else 
-		self:setValue(setting.values[setting.current])
+		self:setValue(setting.values[setting.current], true)
 	end
 end
 

scripts/ai/tasks/CpAITaskFieldWork.lua

@@ -66,8 +66,7 @@ function CpAITaskFieldWork:start()
 	spec.isActive = true
 	self.vehicle:raiseAIEvent("onAIFieldWorkerStart", "onAIImplementStart")
 	if self.isServer then
-		spec.isActive = true
-		spec:updateAIFieldWorkerImplementData()
+		self.vehicle:updateAIFieldWorkerImplementData()
 		if self.vehicle:getAINeedsTrafficCollisionBox() and (AIFieldWorker.TRAFFIC_COLLISION ~= nil and 
 			(AIFieldWorker.TRAFFIC_COLLISION ~= 0 and spec.aiTrafficCollision == nil)) then
 

scripts/events/VehicleSettingsEvent.lua

@@ -45,16 +45,16 @@ function VehicleSettingsEvent:run(connection, setting)
 end
 
 function VehicleSettingsEvent.sendEvent(vehicle, setting)
+	VehicleSettingsEvent.debug(vehicle, "sendEvent, server: %s", tostring(g_server ~= nil))
 	if g_server ~= nil then
-		VehicleSettingsEvent.debug(vehicle, "sendEvent")
 		g_server:broadcastEvent(VehicleSettingsEvent.new(vehicle, setting), nil, nil, vehicle)
 	else
 		g_client:getServerConnection():sendEvent(VehicleSettingsEvent.new(vehicle, setting))
 	end
 end
 
 function VehicleSettingsEvent.debug(vehicle, str, ...)
-	CpUtil.debugVehicle(CpDebug.DBG_MULTIPLAYER, vehicle, "VehicleSettingsEvent: "..str, ...)
+	CpUtil.debugVehicle(CpDebug.DBG_MULTIPLAYER, vehicle, "VehicleSettingsEvent: " .. str, ...)
 end
 
 --- Sends the changed setting value to the server,

scripts/specializations/CpAIWorker.lua

@@ -147,7 +147,9 @@ function CpAIWorker:onRegisterActionEvents(isActiveForInput, isActiveForInputIgn
                 end)
 
             addActionEvent(self, InputAction.CP_GENERATE_COURSE, function (self)
-                    CourseGeneratorInterface.generateDefaultCourse()
+                    if self:getCanStartCpFieldWork() then
+                        CourseGeneratorInterface.generateDefaultCourse()
+                    end
                 end)
             addActionEvent(self, InputAction.CP_CHANGE_SELECTED_JOB, function (self)
                     local currentJobSetting = self:cpGetHudSelectedJobSetting()
@@ -238,6 +240,9 @@ function CpAIWorker:updateActionEvents()
 
         actionEvent = spec.actionEvents[InputAction.CP_CLEAR_COURSE]
         g_inputBinding:setActionEventActive(actionEvent.actionEventId, self:hasCpCourse())
+
+        actionEvent = spec.actionEvents[InputAction.CP_GENERATE_COURSE]
+        g_inputBinding:setActionEventActive(actionEvent.actionEventId, self:getCanStartCpFieldWork())
     end
 end
 

scripts/specializations/CpVehicleSettings.lua

@@ -104,6 +104,7 @@ end
 function CpVehicleSettings:onUpdate()
     local spec = self.spec_cpVehicleSettings
     if not spec.finishedFirstUpdate then
+        CpVehicleSettings.validateSettings(self)
         --- TODO: Maybe consider a more generic approach in the future.
         spec.toolOffsetX:resetToLoadedValue()
         spec.bunkerSiloWorkWidth:resetToLoadedValue()