diff --git a/Common_PF1250.TPA.mlpe b/Common_PF1250.TPA.mlpe index 3653e10..e6ede9e 100644 --- a/Common_PF1250.TPA.mlpe +++ b/Common_PF1250.TPA.mlpe @@ -2718,8 +2718,8 @@ function EmitParkRoller( dPosT, bSplitCut) local dPosY2 = dPosT + EMT.Y2DELTA local DiffY2 = MyParkY2 - dPosY2 local dMoveY2 = EgtIf( DiffY2 < -0.1, dMoveV2, 0) - local dTryMoveY2 = max( ParkV2 - dPosT - EMT.LT - EMT.HOVM, MinY2 - dPosY2 + 10) - if ( dPosT + EMT.LT + EMT.HOVM < ParkV1 + ExtraParkV and dPosT + EMT.LT + EMT.HOVM > ParkV2 and dPosY2 + dTryMoveY2 > MinY2) then dMoveY2 = min( dMoveY2, dTryMoveY2) end + local dTryMoveY2 = max( ParkV2 - dPosT - EMT.LB - EMT.HOVM, MinY2 - dPosY2 + 10) + if ( dPosT + EMT.LB + EMT.HOVM < ParkV1 + ExtraParkV and dPosT + EMT.LB + EMT.HOVM > ParkV2 and dPosY2 + dTryMoveY2 > MinY2) then dMoveY2 = min( dMoveY2, dTryMoveY2) end --MyOutput( string.format( 'PosT=%.3f LT=%.3f PosY2=%.3f V2POS=%.3f', dPosT, EMT.LT, dPosY2, EMT.V2POS)) MDChar.Y2 = dPosY2 + dMoveY2 MDChar.MovType = 2 diff --git a/Common_PF1250.mlpe b/Common_PF1250.mlpe index f96cdd4..eca39de 100644 --- a/Common_PF1250.mlpe +++ b/Common_PF1250.mlpe @@ -2067,8 +2067,8 @@ function ExecParkRoller( PosY1, PosY2, PosV1, PosV2, bSpliCut, bAgg) local MoveV2 = ParkV2 - PosV2 local DiffY2 = MyParkY2 - PosY2 local MoveY2 = EgtIf( DiffY2 < -0.1, MoveV2, 0) - local TryMoveY2 = max( ParkV2 - PosT - EMT.LT, MinY2 - PosY2 + 10) - if ( PosT + EMT.LT < ParkV1 + ExtraParkV and PosT + EMT.LT > ParkV2 and PosY2 + TryMoveY2 > MinY2) then MoveY2 = min( MoveY2, TryMoveY2) end + local TryMoveY2 = max( ParkV2 - PosT - EMT.LB, MinY2 - PosY2 + 10) + if ( PosT + EMT.LB < ParkV1 + ExtraParkV and PosT + EMT.LB > ParkV2 and PosY2 + TryMoveY2 > MinY2) then MoveY2 = min( MoveY2, TryMoveY2) end if not SimulMoveAxes( 'T', PosT + MoveY2, MCH_SIM_STEP.RAPID, 'V1', ParkV1, MCH_SIM_STEP.RAPID, 'V2', ParkV2, MCH_SIM_STEP.RAPID, diff --git a/UpdateLog.txt b/UpdateLog.txt index fbcced6..b6bc81b 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_PF1250 Update Log ==== +Versione 3.1-- (--/--/2026) +- (SIM-GEN) Corretto calcolo rimanenza durante ParkRoller. Ticket#2832 + Versione 3.1b1 (17/02/2026) - (GEN) Generazione non allineata a simulazione. Ticket#2819 diff --git a/Version.lua b/Version.lua index 29a89c9..bc36bde 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_PF1250', -- nome script PP standard - VERSION = '3.1b1', -- versione script + VERSION = '3.1--', -- versione script MIN_MACH_VER_PP_COMMON = '2.7k1' -- versione minima kernel }