Skip to content

Commit

Permalink
06.01.00051:fix for 1.3.0 BETA
Browse files Browse the repository at this point in the history 
Courseplay#3165
  • Loading branch information
@ThomasGaertner
ThomasGaertner committed Feb 9, 2019
1 parent 8133794 commit 0011df0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 114 deletions.
2 changes: 1 addition & 1 deletion modDesc.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="40">
<version>6.01.00050</version>
<version>6.01.00051</version>
<author><![CDATA[Courseplay.devTeam]]></author>
<title>
<br>CoursePlay SIX</br>
Expand Down
125 changes: 12 additions & 113 deletions triggers.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,21 +313,7 @@ function courseplay:updateAllTriggers()
-- UPDATE
-- nonUpdateable objects
if g_currentMission.nonUpdateables ~= nil then
courseplay:debug('\tcheck nonUpdateables', 1);
local counter = 0;
for k,v in pairs(g_currentMission.nonUpdateables) do
counter = counter +1;
end;
courseplay:debug(('\t%i in list'):format(counter), 1);
end;
]]
--itemsToSave (BigPacks)
--print("g_currentMission.itemsToSave:"..tostring(g_currentMission.itemsToSave))
]]
if g_currentMission.itemsToSave ~= nil then
courseplay:debug('\tcheck itemsToSave', 1);

Expand All @@ -345,44 +331,17 @@ function courseplay:updateAllTriggers()
acceptedFillTypes = item.sellingStation.acceptedFillTypes;

}

courseplay:debug(string.format('\t\tadd %s(%s) to tipTriggers',item.sellingStation.stationName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to tipTriggers',item.sellingStation.stationName,triggerId), 1);
end
end
end
end
courseplay:debug(('\t%i in list'):format(counter), 1);
end
--[[
-- updateable objects
if g_currentMission.updateables ~= nil then
courseplay:debug('\tcheck updateables', 1);
end;

-- onCreate objects
local WaterMod;
if g_currentMission.missionInfo.customEnvironment then
WaterMod = getfenv(0)[g_currentMission.missionInfo.customEnvironment].WaterMod;
end;
if g_currentMission.onCreateLoadedObjects ~= nil then
courseplay:debug('\tcheck onCreateLoadedObjects', 1);
local counter = 0;
for k, object in pairs(g_currentMission.onCreateLoadedObjects) do
counter = counter +1;

end;
courseplay:debug(('\t%i in list'):format(counter), 1);
end;
--HeapTipTrigger
if g_currentMission.heapTipTriggers ~= nil then
courseplay:debug('\tcheck HeapTipTriggers', 1);
for index,trigger in pairs(g_currentMission.heapTipTriggers)do
if trigger.triggerId ~= nil then
courseplay:cpAddTrigger(trigger.triggerId, trigger, 'tipTrigger');
courseplay:debug('\t\tadd HeapTipTrigger', 1);
end;
end;
end;]]
-- placeables objects
if g_currentMission.placeables ~= nil then
courseplay:debug('\tcheck placeables', 1);
Expand All @@ -400,23 +359,24 @@ function courseplay:updateAllTriggers()
unloadingStation = placeable.unloadingStation;

}

courseplay:debug(string.format('\t\tadd %s(%s) to tipTriggers',placeable.unloadingStation.stationName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to tipTriggers',placeable.unloadingStation.stationName,triggerId), 1);
end
end


if placeable.sellingStation ~= nil then
local trigger = {}
for _,unloadTrigger in pairs(placeable.sellingStation.unloadTriggers) do
local triggerId = unloadTrigger.exactFillRootNode;
local triggerId = unloadTrigger.exactFillRootNode or unloadTrigger.baleTriggerNode;
trigger = {
triggerId = triggerId;
acceptedFillTypes = placeable.sellingStation.acceptedFillTypes;

}
courseplay:debug(string.format('\t\tadd %s(%s) to tipTriggers',placeable.sellingStation.stationName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to tipTriggers',placeable.sellingStation.stationName,triggerId), 1);
end
end

Expand All @@ -435,8 +395,8 @@ function courseplay:updateAllTriggers()
--capacity = myModule.fillCapacity;
--fillLevels = myModule.fillLevels;
}
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to tipTriggers',myModule.moduleName,triggerId), 1);
courseplay:debug(string.format('\t\tadd %s(%s) to tipTriggers',myModule.moduleName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
end

if myModule.feedingTrough ~= nil then
Expand All @@ -447,8 +407,8 @@ function courseplay:updateAllTriggers()
--capacity = myModule.fillCapacity;
--fillLevels = myModule.fillLevels;
}
courseplay:debug(string.format('\t\tadd %s(%s) to tipTriggers',myModule.moduleName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to tipTriggers',myModule.moduleName,triggerId), 1);
end
end
end
Expand All @@ -458,8 +418,8 @@ function courseplay:updateAllTriggers()
if placeable.buyingStation ~= nil then
for _,loadTrigger in pairs (placeable.buyingStation.loadTriggers) do
local triggerId = loadTrigger.triggerNode;
courseplay:debug(string.format('\t\tadd %s(%s) to fillTriggers', placeable.buyingStation.stationName,tostring(triggerId)), 1);
courseplay:cpAddTrigger(triggerId, loadTrigger, 'fillTrigger');
courseplay:debug(string.format('\t\tadd %s(%i) to fillTriggers', placeable.buyingStation.stationName,triggerId), 1);
end
end

Expand All @@ -485,50 +445,7 @@ function courseplay:updateAllTriggers()
end
courseplay:debug(('\t%i found'):format(counter), 1);
end;





-- UPK triggers
--[[if g_upkTrigger then
courseplay:debug('\tcheck g_upkTrigger', 1);
for i,trigger in ipairs(g_upkTrigger) do
local triggerId = trigger.triggerId;
if triggerId and trigger.isEnabled then
-- if trigger.type == 'dumptrigger' then -- TODO: kinda like tipTrigger?
-- elseif trigger.type == 'filltrigger' then
if trigger.type == 'gasstationtrigger' then
trigger.isGasStationTrigger = true;
trigger.isUpkGasStationTrigger = true;
courseplay:cpAddTrigger(triggerId, trigger, 'gasStation', 'nonUpdateable');
courseplay:debug(('\t\tadd gasStationTrigger (id %d)'):format(triggerId), 1);
elseif trigger.type == 'liquidmanurefilltrigger' then
trigger.isLiquidManureFillTrigger = true;
trigger.isUpkLiquidManureFillTrigger = true;
courseplay:cpAddTrigger(triggerId, trigger, 'liquidManure', 'nonUpdateable');
courseplay:debug(('\t\tadd liquidManureFillTrigger (id %d)'):format(triggerId), 1);
elseif trigger.type == 'sprayerfilltrigger' then
trigger.isSprayerFillTrigger = true;
trigger.isUpkSprayerFillTrigger = true;
courseplay:cpAddTrigger(triggerId, trigger, 'sprayer', 'nonUpdateable');
courseplay:debug(('\t\tadd sprayerFillTrigger (id %d)'):format(triggerId), 1);
elseif trigger.type == 'tiptrigger' then
trigger.isUpkTipTrigger = true;
if trigger.i18nNameSpace == 'PlaceableHeaps' then
trigger.isPlaceableHeapTrigger = true;
end;
courseplay:debug(('\t\tadd tipTrigger (id %d), isPlaceableHeapTrigger=%s'):format(triggerId, tostring(trigger.isPlaceableHeapTrigger)), 1);
courseplay:cpAddTrigger(triggerId, trigger, 'tipTrigger');
elseif trigger.type == 'waterfilltrigger' then
trigger.isWaterTrailerFillTrigger = true;
courseplay:cpAddTrigger(triggerId, trigger, 'water', 'nonUpdateable');
courseplay:debug(('\t\tadd waterTrailerFillTrigger (id %d)'):format(triggerId), 1);
end;
end;
end;
end;
]]
if g_currentMission.bunkerSilos ~= nil then
courseplay:debug('\tcheck bunkerSilos', 1);
for _, trigger in pairs(g_currentMission.bunkerSilos) do
Expand All @@ -547,25 +464,7 @@ function courseplay:updateAllTriggers()
end
end
end
--[[
-- tipTriggers objects
if g_currentMission.tipTriggers ~= nil then
courseplay:debug('\tcheck tipTriggers', 1);
end;
if courseplay.liquidManureOverloaders ~= nil then
for rootNode, vehicle in pairs(courseplay.liquidManureOverloaders) do
local trigger = vehicle.unloadTrigger
if trigger then
local triggerId = trigger.triggerId
trigger.isLiquidManureFillTrigger = true;
trigger.isLiquidManureOverloaderFillTrigger = true;
trigger.parentVehicle = vehicle
courseplay:cpAddTrigger(triggerId, trigger, 'liquidManure', 'nonUpdateable');
courseplay:debug(('\t\tadd overloader\'s liquidManureFillTrigger (id %d)'):format(triggerId), 1);
end;
end
end]]

end;

function courseplay:cpAddTrigger(triggerId, trigger, groupType)
Expand Down

0 comments on commit 0011df0

Please sign in to comment.