pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Topping8: Topping2 now can use, Switch espresso slot index, default normal espresso slot

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-22 13:35:36 +07:00
parent da4c4ec1a3
commit a998b2f04a
1 changed files with 52 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

68
xml/page_topping_select8.xml
View file

@ -2789,6 +2789,14 @@
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf
If TOPPING2 = "shot coffee" Then
If showShotNormal = "Enable" Then
If showShotEnable = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
EndIf
;Var SelectToppingType = 0
@ -3515,6 +3523,10 @@
DEBUGVAR toppingID2price2Conv
Var text_shot_normal_add = toppingID2price2Conv + ")"
Var text_shot_normal_add = "(+" + text_shot_normal_add
If showShotNormal = "Enable" Then
Var showShotNormal = "Press"
EndIf
Refresh
EndIf
@ -3688,7 +3700,14 @@
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
If toppingID2index3 = 0 Then
Var EnableLightRoast = "Invisible"
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
EndIf
DEBUGVAR TOPPING2
@ -3746,16 +3765,16 @@
Var CustomCoffeeQuantityAdditionalPrice[0] = ""
EndIf
If toppingID2price2 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[1] = ""
EndIf
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
Else
@ -3763,6 +3782,18 @@
EndIf
EndIf
If CustomCoffeeQuantityAdditionalPrice[1] = "" Then
Var CustomCoffeeQuantityTextX[1] = 809
Else
Var CustomCoffeeQuantityTextX[1] = 784
EndIf
If CustomCoffeeQuantityAdditionalPrice[2] = "" Then
Var CustomCoffeeQuantityTextX[2] = 922
Else
Var CustomCoffeeQuantityTextX[2] = 892
EndIf
;-END
@ -7915,8 +7946,8 @@
<EventClick>
Var showShotNormal = "Enable"
Var showShotEnable = "PressForever"
Var showShotNormal = "Press"
Var showShotEnable = "Enable"
SAVELOG "esp shot ignore"
Function 2
@ -7937,7 +7968,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var showShotEnable = "PressForever"
Var showShotEnable = "Press"
Var showShotNormal = "Enable"
SAVELOG "Espresso Shot add"
@ -9016,7 +9047,7 @@
</Button>
<Text>
<X> 694 </X>
<X> 699 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -9026,7 +9057,8 @@
</Text>
<Text>
<X> 784 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[1] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -9036,7 +9068,8 @@
</Text>
<Text>
<X> 892 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[2] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -11391,6 +11424,12 @@
EndIf
EndIf
If showShotEnable = "Disable" Then
If showShotNormal = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
If showCustomCoffee = "Enable" Then
If showCoffeeWater = "Enable" Then
@ -11442,10 +11481,10 @@
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
EndIf
If CustomCoffeeLevelState[0] = "PressForever" Then
@ -11588,9 +11627,6 @@
RefreshAll
;for test
;Var showShotEnable = "Invisible"
</Function2>