Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

This commit is contained in:
Ittipat Lusuk 2025-02-21 10:55:53 +07:00
commit 3eaea7ff80

View file

@ -1226,6 +1226,13 @@
; select no sugar ; select no sugar
Var SugarZeroCalCheck = "Disable" Var SugarZeroCalCheck = "Disable"
EndIf EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
EndIf
EndIf EndIf
; Suger 4 step hot ; Suger 4 step hot
@ -1267,6 +1274,13 @@
; select no sugar ; select no sugar
Var SugarZeroCalCheck = "Disable" Var SugarZeroCalCheck = "Disable"
EndIf EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
EndIf
EndIf EndIf
DEBUGVAR RecipeTag2 DEBUGVAR RecipeTag2
@ -1324,9 +1338,11 @@
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then If RecipeTag2 = "Topping6Step" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
Else Else
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -1392,9 +1408,11 @@
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then If RecipeTag2 = "Topping6Step" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
Else Else
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -1451,9 +1469,11 @@
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then If RecipeTag2 = "Topping6Step" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
Else Else
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -1506,9 +1526,11 @@
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then If RecipeTag2 = "Topping6Step" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
Else Else
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -1564,9 +1586,11 @@
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then If RecipeTag2 = "Topping6Step" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
Else Else
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -2400,6 +2424,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2464,6 +2489,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2483,6 +2509,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2546,6 +2573,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2565,6 +2593,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2626,6 +2655,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2645,6 +2675,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2662,6 +2693,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2723,6 +2755,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2742,6 +2775,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2759,6 +2793,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2820,6 +2855,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2839,6 +2875,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2856,6 +2893,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -2971,6 +3009,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3035,6 +3074,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3095,6 +3135,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3156,6 +3197,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3271,6 +3313,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3336,6 +3379,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3396,6 +3440,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3456,6 +3501,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -3699,6 +3745,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3771,6 +3818,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3790,6 +3838,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3866,6 +3915,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3885,6 +3935,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3960,6 +4011,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3979,6 +4031,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -3996,6 +4049,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4072,6 +4126,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4091,6 +4146,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4108,6 +4164,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4173,6 +4230,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4192,6 +4250,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4209,6 +4268,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
Var SugarState6 = "Disable" Var SugarState6 = "Disable"
@ -4436,6 +4496,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4501,6 +4562,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4565,6 +4627,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4628,6 +4691,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4856,6 +4920,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4924,6 +4989,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -4987,6 +5053,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf
@ -5049,6 +5116,7 @@
; No 2 right steps ; No 2 right steps
If NoSugarStepRight2 = "true" Then If NoSugarStepRight2 = "true" Then
Var SugarState4 = "Disable"
Var SugarState5 = "Disable" Var SugarState5 = "Disable"
EndIf EndIf