Merge remote-tracking branch 'origin/masterpiece' into hkg_multi
This commit is contained in:
commit
3eaea7ff80
1 changed files with 112 additions and 44 deletions
|
|
@ -1226,6 +1226,13 @@
|
|||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState4 = "Disable"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; Suger 4 step hot
|
||||
|
|
@ -1267,6 +1274,13 @@
|
|||
; select no sugar
|
||||
Var SugarZeroCalCheck = "Disable"
|
||||
EndIf
|
||||
|
||||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState4 = "Disable"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR RecipeTag2
|
||||
|
|
@ -1324,9 +1338,11 @@
|
|||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
Else
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1392,9 +1408,11 @@
|
|||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
Else
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1451,9 +1469,11 @@
|
|||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
Else
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1506,9 +1526,11 @@
|
|||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
Else
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1564,9 +1586,11 @@
|
|||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
Else
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -2400,7 +2424,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2464,7 +2489,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2483,7 +2509,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2546,7 +2573,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2565,7 +2593,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2626,7 +2655,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2645,7 +2675,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2662,7 +2693,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2723,7 +2755,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2742,7 +2775,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2759,7 +2793,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2820,7 +2855,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2839,7 +2875,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2856,7 +2893,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -2971,7 +3009,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3035,7 +3074,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3095,7 +3135,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3156,7 +3197,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3271,7 +3313,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3336,7 +3379,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3396,7 +3440,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3456,7 +3501,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -3699,7 +3745,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3771,7 +3818,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3790,7 +3838,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3866,7 +3915,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3885,7 +3935,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3960,7 +4011,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3979,7 +4031,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -3996,7 +4049,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4072,7 +4126,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4091,7 +4146,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4108,7 +4164,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4173,7 +4230,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4192,7 +4250,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4209,7 +4268,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState6 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
|
@ -4436,7 +4496,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4501,7 +4562,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4565,7 +4627,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4628,7 +4691,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4856,7 +4920,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4924,7 +4989,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -4987,7 +5053,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -5049,7 +5116,8 @@
|
|||
; No 2 right steps
|
||||
If NoSugarStepRight2 = "true" Then
|
||||
|
||||
Var SugarState5 = "Disable"
|
||||
Var SugarState4 = "Disable"
|
||||
Var SugarState5 = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue