diff --git a/Common-PF1250.mlpe b/Common-PF1250.mlpe index f107967..8708377 100644 --- a/Common-PF1250.mlpe +++ b/Common-PF1250.mlpe @@ -515,19 +515,19 @@ function OnSimulToolSelect( dPosA) AddToolToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd, true) AddToolHolderToCollisionObj( EMT.TOOL, EMT.HEAD, EMT.EXIT, nInd + 1) - if nSetHead ~= 1 then + if nSetHead ~= 1 and ( EMT.PREVTOOL_H1 and EMT.PREVHEAD_H1) then local nPrevExit_H1 = 1 local nInd_H1 = 1001 AddToolToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1, false) AddToolHolderToCollisionObj( EMT.PREVTOOL_H1, EMT.PREVHEAD_H1, nPrevExit_H1, nInd_H1 + 1) end - if nSetHead ~= 2 then + if nSetHead ~= 2 and ( EMT.PREVTOOL_H2 and EMT.PREVHEAD_H2) then local nPrevExit_H2 = 1 local nInd_H2 = 1011 AddToolToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2, false) AddToolHolderToCollisionObj( EMT.PREVTOOL_H2, EMT.PREVHEAD_H2, nPrevExit_H2, nInd_H2 + 1) end - if nSetHead ~= 3 then + if nSetHead ~= 3 and EgtGetHeadId( 'H31') then local nPrevExit_H3 = 1 local nInd_H3 = 1001 AddToolToCollisionObj( nil, 'H31', nPrevExit_H3, 1001) diff --git a/Common-PF1250.mlse b/Common-PF1250.mlse index 4df5d26..8af2d27 100644 --- a/Common-PF1250.mlse +++ b/Common-PF1250.mlse @@ -989,7 +989,7 @@ end function SpecCalcLoad( dPosT, dDistFront, dDistBack) --[L] local dNewY1min = max( EMC.LB - dDistBack, MinOther + AggLoad + EMC.HCING + EMC.HOVM) - local dNewY1max = min( ( MaxY1 - MinY1) - 5, EMC.LB - MinJoin) + local dNewY1max = min( ( MaxY1 - MinY1) - 5, EMC.LB - MinJoin + AggLoad) if dNewY1min > dNewY1max then return nil end local dNewY1Delta = EgtClamp( BD.CHAR_LOAD_DIST or 3000, 0.75 * dNewY1min + 0.25 * dNewY1max, 0.25 * dNewY1min + 0.75 * dNewY1max) local dNewY2Delta = nil diff --git a/UpdateLog.txt b/UpdateLog.txt index e373f33..c8dbb20 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,7 +1,8 @@ ==== Common_PF1250 Update Log ==== -Versione 2.6-- (--/--/2024) +Versione 2.6g3 (22/07/2024) - (SIM) Si aggiunge al controllo collisioni anche Tool e ToolHolder della testa non utilizzata. Ticket#1937 +- (SIM-GEN) In calcolo pinzaggio al carico, si aggiunge anche alla quota massima l'offset aggiuntivo. Ticket#1942 Versione 2.6g2 (12/07/2024) - (SIM-GEN) Corretto movimento testa sotto che andava in collisione tra una lavorazione e la successiva se tra le due c'era un riposizionamento pinze. Ticket#1925 diff --git a/Version.lua b/Version.lua index 63ac361..8eb6635 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_PF1250', -- nome script PP standard - VERSION = '2.6--', -- versione script + VERSION = '2.6g3', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }