THAI: Add Taiwanese tea powder, Fixed milk enable 2 state, Fixed blend condition disable shot, coffee shot for healthy type

inc/button_topping_select_confirm_order.inc

@@ -272,6 +272,7 @@ EndIf
     Var Seeker.topping9 = topping9
     Var Seeker.topping10 = topping10
     Var Seeker.topping11 = topping11
+    var Seeker.topping11_2 = topping11_2
     Var Seeker.topping12 = topping12
     Var Seeker.topping13 = topping13
 
@@ -287,6 +288,12 @@ EndIf
     Var Seeker.strMulti6_5 = strMulti6_5
     Var Seeker.strMulti6_6 = strMulti6_6
 
+    Var Seeker.strMulti11_1 = strMulti11_1
+    Var Seeker.strMulti11_2 = strMulti11_2
+    Var Seeker.strMulti11_3 = strMulti11_3
+    Var Seeker.strMulti11_4 = strMulti11_4
+    Var Seeker.strMulti11_5 = strMulti11_5
+    
     
 
     DEBUGVAR Seeker.topping1
@@ -298,6 +305,7 @@ EndIf
     DEBUGVAR Seeker.topping9
     DEBUGVAR Seeker.topping10
     DEBUGVAR Seeker.topping11
+    DEBUGVAR Seeker.topping11_2
     DEBUGVAR Seeker.topping12
     DEBUGVAR Seeker.topping13
     DEBUGVAR Seeker.get_a_straw
@@ -309,6 +317,12 @@ EndIf
     DEBUGVAR Seeker.strMulti6_4
     DEBUGVAR Seeker.strMulti6_5
 
+    DEBUGVAR Seeker.strMulti11_1
+    DEBUGVAR Seeker.strMulti11_2
+    DEBUGVAR Seeker.strMulti11_3
+    DEBUGVAR Seeker.strMulti11_4
+    DEBUGVAR Seeker.strMulti11_5
+
     DEBUGVAR LidState
     DEBUGVAR StrawState
     DEBUGVAR UserSelectProductCode

inc/select_drink_current_multi_topping.inc

@@ -34,6 +34,16 @@
         Topping "Multiply6-ID" Seeker.strMulti6_1
         Topping "Multiply6-ID" Seeker.strMulti6_2
         Topping "Multiply6-ID" Seeker.strMulti6_3
+
+        If Seeker.topping11_2 = "" Then
+    
+        Else
+            Topping "Multiply11-ID" Seeker.strMulti11_1
+            Topping "Multiply11-ID" Seeker.strMulti11_2
+            Topping "Multiply11-ID" Seeker.strMulti11_3
+            Topping "Multiply11-ID" Seeker.strMulti11_4
+            Topping "Multiply11-ID" Seeker.strMulti11_5
+        EndIf
     EndIf
 
     Topping "Pack" ExtendDataCurr

xml/page_topping_select8.xml

@@ -70,6 +70,7 @@
 	Var blendedStateShow = "Invisible"
 	Var ShotCoffeeBG = "Invisible"
 	Var showShotEnable = "Invisible"
+	Var showShotEnableHealthy = "Invisible"
 	Var ShowLidStraw = "Invisible"
 	Var ShowStrawOnly = "Invisible"
 	Var ShowLidOnly = "Invisible"
@@ -111,6 +112,7 @@
 	Var showShotSodaEnable = "Invisible"
 	Var showCoffeeEnable = "Invisible"
 	Var showMilkEnable = "Invisible"
+	Var showTaiwaneseTeaEnable = "Invisible"
 	
 
 ; Customer Coffee
@@ -175,6 +177,9 @@
 	Var CustomMilkState[1] = "Invisible"
 	Var CustomMilkState[2] = "Invisible"
 
+	Var CustomTaiwaneseTeaState[0] = "Invisible"
+	Var CustomTaiwaneseTeaState[1] = "Invisible"
+
 	Var showShotEnableSoda = "Disable"
 	Var CustomEnergyState[0] = "Disable"
 	Var CustomEnergyState[1] = "Disable"
@@ -357,6 +362,12 @@
 		Var CustomSweetestPercentTextX = 935
 		Var CustomEspressoTextX = 793
 
+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 695
+		Var CustomEspressoShotTextNewX = 840
+
 		Var CustomEspressoShotTextX = 892
 		Var SugarZeroCalTextX = 890
 		Var SugarTextX = 800
@@ -475,6 +486,12 @@
 
 		Var CustomEspressoTextX = 804
 
+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 705
+		Var CustomEspressoShotTextNewX = 840
+
 		Var CustomEspressoShotTextX = 892
 		Var SugarZeroCalTextX = 890
 		Var SugarTextX = 800
@@ -528,6 +545,12 @@
 		Var CustomMilkIntensityII_X = 804
 		Var CustomMilkIntensityIII_X = 893
 
+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 705
+		Var CustomEspressoShotTextNewX = 840
+
 		; healthy sugar
 		Var CustomHealthySugar_Text_X = 360
 		Var CustomHealthySugar_TextBelow_X = 295
@@ -556,6 +579,12 @@
 		Var CustomSweetExtraTextX = 760
 		Var CustomSweetestTextX = 865
 
+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 690
+		Var CustomEspressoShotTextNewX = 830
+
 		Var SugarTextX = 810
 		Var custom_coffee_level_right_text_x = 686
 
@@ -1655,6 +1684,8 @@
 	DEBUGVAR TOPPING9
 	DEBUGVAR TOPPING10
 	DEBUGVAR TOPPING11
+	DEBUGVAR TOPPING11_EXT_1
+	DEBUGVAR TOPPING11_EXT_2
 	DEBUGVAR TOPPING12
 	DEBUGVAR TOPPING13
 
@@ -1710,6 +1741,9 @@
 	DEBUGVAR toppingID11index1
 	DEBUGVAR toppingID11index2
 	DEBUGVAR toppingID11index3
+	DEBUGVAR toppingID11index4
+	DEBUGVAR toppingID11index5
+	DEBUGVAR toppingID11index6
 
 	DEBUGVAR toppingID12index1
 	DEBUGVAR toppingID12index2
@@ -1841,27 +1875,52 @@
 		EndIf
 
 		If TOPPING11 = "milk-level" Then
-			Var showMilkEnable = "Enable"
 			;for some menu that not have sugar-level channel from json
 			If TOPPING1 = "" Then
 				Var BGMilkNew = "Enable"
+				Var showMilkEnable = "Invisible"
 				Var BGSugarNew = "Invisible"
 				Var SugarZeroCalOption = "Invisible"
+			Else
+				Var showMilkEnable = "Enable"
+				Var BGMilkNew = "Invisible"
+			EndIf
+
+			;taiwanese-tea-powder-level
+			If toppingID11index5 = 547 Then
+				Var showTaiwaneseTeaEnable = "Enable"
+			Else
+				Var showTaiwaneseTeaEnable = "Invisible"
 			EndIf 
 			
 			If blend_button_state = "PressForever" Then
 				Var CustomMilkState[0] = "Enable"
 				Var CustomMilkState[1] = "Enable"
 				Var CustomMilkState[2] = "Enable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
 			Else
 				If TOPPING11 = "milk-level" Then
 					Var CustomMilkState[0] = "Enable"
 					Var CustomMilkState[1] = "Enable"
 					Var CustomMilkState[2] = "Enable"
+
+					If showTaiwaneseTeaEnable = "Enable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
 				Else
 					Var CustomMilkState[0] = "Disable"
 					Var CustomMilkState[1] = "Disable"
 					Var CustomMilkState[2] = "Disable"
+
+					If showTaiwaneseTeaEnable = "Enable" Then
+						Var CustomTaiwaneseTeaState[0] = "Disable"
+						Var CustomTaiwaneseTeaState[1] = "Disable"
+					EndIf
 				EndIf
 			EndIf
 
@@ -1869,6 +1928,36 @@
 			Var CustomMilkState[0] = "Disable"
 			Var CustomMilkState[1] = "Disable"
 			Var CustomMilkState[2] = "Disable"
+
+			If showTaiwaneseTeaEnable = "Enable" Then
+				Var CustomTaiwaneseTeaState[0] = "Disable"
+				Var CustomTaiwaneseTeaState[1] = "Disable"
+			EndIf
+		EndIf
+
+		;taiwanese-tea-powder-level
+		If TOPPING11 = "taiwanese-tea-level" Then
+			Var showTaiwaneseTeaEnable = "Enable"
+			
+			If blend_button_state = "PressForever" Then
+				Var CustomTaiwaneseTeaState[0] = "Enable"
+				Var CustomTaiwaneseTeaState[1] = "Enable"
+			Else
+				If TOPPING11 = "taiwanese-tea-level" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+		Else
+			If TOPPING11 = "milk-level" Then
+				;do-not-thing
+			Else
+				Var CustomTaiwaneseTeaState[0] = "Disable"
+				Var CustomTaiwaneseTeaState[1] = "Disable"
+			EndIf
 		EndIf
 
 		If TOPPING6 = "all-volcano" Then
@@ -2664,10 +2753,59 @@
 						EndIf
 					EndIf
 				EndIf
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+				
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf
 
 			If TOPPING13 = "shot coffee" Then
@@ -2763,10 +2901,58 @@
 						EndIf
 					EndIf
 				EndIf
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf
 
 			If TOPPING13 = "shot coffee" Then
@@ -2789,6 +2975,7 @@
 		; first time.
 		If blend_button_state = "PressForever" Then
 			If showShotEnableSoda = "Enable" Then
+				Var showShotNormalSoda = "Disable"
 				Var showShotEnableSoda = "Disable"
 			EndIf
 
@@ -2817,10 +3004,58 @@
 					EndIf
 				EndIf
 
+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf
 
 			If TOPPING2 = "shot coffee" Then
@@ -6961,6 +7196,110 @@
 	</Text>
 
 
+</Row1>
+
+;taiwanese-tea-powder-level
+<Row1>
+	<Width> 986 </Width>
+	<Height> "auto" </Height>
+	<State> showTaiwaneseTeaEnable </State>
+	<Image>
+		<X> 0 </X>
+		<Y> 0 </Y>
+		<Filename> Var( DirImageInter + "/bg_custom_taiwanese_tea_powder.png" ) </Filename>
+	</Image>
+
+	<Text>
+		<X> 130 </X>
+		<Y> 15 </Y>
+		<Width> 500 </Width>
+		<Height> 46 </Height>
+		<Language>
+			<ID> 002028 </ID>
+		</Language>
+	</Text>
+
+	<Button>
+		<X> 800 </X>
+		<Y> 10 </Y>
+		<State> CustomTaiwaneseTeaState[0] </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var CustomTaiwaneseTeaState[0] = "PressForever"
+			Var CustomTaiwaneseTeaState[1] = "Enable"
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				Var topping11 = toppingID11index1
+			Else
+				Var topping11_2 = toppingID11index4
+			EndIf
+
+			Function 2
+			Refresh
+
+
+		</EventClick>
+	</Button>
+
+	<Button>
+		<X> 911 </X>
+		<Y> 10 </Y>
+		<State> CustomTaiwaneseTeaState[1] </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var CustomTaiwaneseTeaState[0] = "Enable"
+			Var CustomTaiwaneseTeaState[1] = "PressForever"
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				Var topping11 = toppingID11index2
+			Else
+				Var topping11_2 = toppingID11index5
+			EndIf
+
+			Function 2
+			Refresh
+
+		</EventClick>
+	</Button>
+
+	<Text>
+		<X> CustomMilkIntensityII_X </X>
+		<Y> CustomEspressoTextY </Y>
+		<Width> 500 </Width>
+		<Height> 18 </Height>
+		<State> CustomTaiwaneseTeaState[0] </State>
+		<Language>
+			<ID> 000127 </ID>
+		</Language>
+	</Text>
+
+	<Text>
+		<X> CustomMilkIntensityIII_X </X>
+		<Y> CustomEspressoTextY </Y>
+		<Width> 500 </Width>
+		<Height> 23 </Height>
+		<State> CustomTaiwaneseTeaState[1] </State>
+		<Language>
+			<ID> 000128 </ID>
+			<SubValue> TaiwaneseTeaIncreasePriceText </SubValue>
+			<SubSize> 15 </SubSize>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
+	</Text>
+
+
 </Row1>
 
 ; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable
@@ -7292,7 +7631,7 @@
 
 </Row1>
 
-; Sugar zero cal, Hot healthy, Then SugarZeroCalOption not enable
+; Sugar zero cal, Cold healthy, Then SugarZeroCalOption not enable
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@@ -7601,7 +7940,7 @@
 
 </Row1>
 
-; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable
+; Sugar zero cal, Cold healthy, Then SugarZeroCalOption enable
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@@ -7968,10 +8307,26 @@
 
 </Row1>
 
+;If-not-healthy-type
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
-	<State> showShotEnable </State>
+	<State> eval(
+		If showShotEnable = "Enable" Then
+			If TOPPING1 = "Suger 4 step cold" Then
+				Var return = "Invisible"
+			Else
+				If TOPPING1 = "Suger 4 step hot" Then
+					Var return = "Invisible"
+				Else
+					Var return = "Enable"
+				EndIf
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+	</State>
 	<Image>
 		<X> 0 </X>
 		<Y> 0 </Y>
@@ -8058,6 +8413,112 @@
 	
 </Row1>
 
+;If-is-healthy-type
+<Row1>
+	<Width> 986 </Width>
+	<Height> "auto" </Height>
+	<State> eval(
+			If showShotEnable = "Enable" Then
+				If TOPPING1 = "Suger 4 step cold" Then
+					Var return = "Enable"
+				Else
+					If TOPPING1 = "Suger 4 step hot" Then
+						Var return = "Enable"
+					Else
+						Var return = "Invisible"
+					EndIf
+				EndIf
+			Else
+				Var return = "Invisible"
+			EndIf
+	)
+	</State>
+	<Image>
+		<X> 0 </X>
+		<Y> 0 </Y>
+		<Filename> Var( DirImageInter + "/bg_custom_espesso_healthy_level.png" ) </Filename>
+	</Image>
+
+	<Text>
+		<X> 130 </X>
+		<Y> 15 </Y>
+		<Width> 500 </Width>
+		<Height> 46 </Height>
+		<Language>
+			<ID> 002031 </ID>
+		</Language>
+	</Text>
+
+
+	<Button>
+		<X> BtnChoiceX1 </X>
+		<Y> 10 </Y>
+		<State> showShotNormal </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+		
+			Var showShotNormal = "Press"
+			Var showShotEnable = "Enable"
+			SAVELOG "esp shot ignore"
+
+			Function 2
+
+
+		</EventClick>
+	</Button>
+
+	<Button>
+		<X> BtnChoiceX2 </X>
+		<Y> 10 </Y>
+		<State> showShotEnable </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var showShotEnable = "Press"
+			Var showShotNormal = "Enable"
+			SAVELOG "Espresso Shot add"
+
+			
+			Function 2
+		</EventClick>
+	</Button>
+
+
+
+	<Text>
+		<X> CustomEspressoTextNewX </X>
+		<Y> CustomEspressoTextY </Y>
+		<State> showEspressoLevel </State>
+		<Language>
+			<ID> 002059 </ID>
+		</Language>
+	</Text>
+
+	<Text>
+		<X> CustomEspressoShotTextNewX </X>
+		<Y> CustomEspressoTextY </Y>
+		<Font> KanitRegularTTF </Font>
+		<Language>
+			<ID> 002060 </ID>
+			<SubValue> CoffeeTextLevel1 </SubValue>
+			<SubSize> 15 </SubSize>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
+	</Text>
+	
+</Row1>
+
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@@ -8701,7 +9162,7 @@
 		<X> CustomMilkIntensityI_X </X>
 		<Y> CustomEspressoTextY </Y>
 		<Width> 500 </Width>
-		<Height> 25 </Height>
+		<Height> 20 </Height>
 		<State> CustomMilkState[0] </State>
 		<Language>
 			<ID> 000126 </ID>
@@ -8712,7 +9173,7 @@
 		<X> CustomMilkIntensityII_X </X>
 		<Y> CustomEspressoTextY </Y>
 		<Width> 500 </Width>
-		<Height> 25 </Height>
+		<Height> 18 </Height>
 		<State> CustomMilkState[1] </State>
 		<Language>
 			<ID> 000127 </ID>
@@ -11174,6 +11635,7 @@
     Var StrawberryPrice = 5
     Var YuzuPrice = 5   
     Var MilkIncreasePrice = 5
+	Var TaiwaneseTeaIncreasePrice = 5
 
 	Var EnergyPriceLevel1 = 5
     Var EnergyPriceLevel2 = 10
@@ -11187,6 +11649,7 @@
     Var StrawberryPriceText = "(+5)"
     Var YuzuPriceText = "(+5)"  
     Var MilkIncreasePriceText = "(+5)"
+	Var TaiwaneseTeaIncreasePriceText = "(+5)"
 	Var CollagenPriceText = "(Free)"
 
 	Var EnergyTextLevel1 = "(+5)"
@@ -11307,6 +11770,17 @@
 	; Coaco
 	Var strMulti6_3 = "TPID:322+multiply:0"
 
+	; light-milk
+	Var strMulti11_1 = "TPID:541+multiply:0"
+	; normal-milk
+	Var strMulti11_2 = "TPID:542+multiply:0"
+	; rich-milk
+	Var strMulti11_3 = "TPID:543+multiply:0"
+	; normal-taiwanese-tea
+	Var strMulti11_4 = "TPID:546+multiply:0"
+	; rich-taiwanese-tea
+	Var strMulti11_5 = "TPID:547+multiply:0"
+
 
 	If showOreoAddEnable = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
@@ -11358,11 +11832,65 @@
 		
 	EndIf
 
+	If CustomMilkState[0] = "PressForever" Then
+		Var strMulti11_1 = "TPID=541,multiply=1"
+		Var DisableUsingCode = "true"
+		DEBUGVAR DisableUsingCode
+	Else
+		Var strMulti11_1 = "TPID=542,multiply=0"
+		Var DisableUsingCode = "false"
+		DEBUGVAR DisableUsingCode
+	EndIf
+
+	If CustomMilkState[1] = "PressForever" Then
+		Var strMulti11_2 = "TPID=542,multiply=1"
+		Var DisableUsingCode = "true"
+		DEBUGVAR DisableUsingCode
+	Else
+		Var strMulti11_2 = "TPID=542,multiply=0"
+		Var DisableUsingCode = "false"
+		DEBUGVAR DisableUsingCode
+	EndIf
+
+	If CustomMilkState[2] = "PressForever" Then
+		Var strMulti11_3 = "TPID=543,multiply=1"
+		Var DisableUsingCode = "true"
+		DEBUGVAR DisableUsingCode
+	Else
+		Var strMulti11_3 = "TPID=542,multiply=0"
+		Var DisableUsingCode = "false"
+		DEBUGVAR DisableUsingCode
+	EndIf
+
+	If CustomTaiwaneseTeaState[0] = "PressForever" Then
+		Var strMulti11_4 = "TPID=546,multiply=1"
+		Var DisableUsingCode = "true"
+		DEBUGVAR DisableUsingCode
+	Else
+		Var strMulti11_4 = "TPID=546,multiply=0"
+		Var DisableUsingCode = "false"
+		DEBUGVAR DisableUsingCode
+	EndIf
+
+	If CustomTaiwaneseTeaState[1] = "PressForever" Then
+		Var strMulti11_5 = "TPID=547,multiply=1"
+		Var DisableUsingCode = "true"
+		DEBUGVAR DisableUsingCode
+	Else
+		Var strMulti11_5 = "TPID=547,multiply=0"
+		Var DisableUsingCode = "false"
+		DEBUGVAR DisableUsingCode
+	EndIf
+
+
+	If CustomTaiwaneseTeaState[1] = "PressForever" Then
+		Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
+	EndIf
+
 	If CustomMilkState[2] = "PressForever" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + MilkIncreasePrice
 	EndIf
 
-
 	If CustomEnergyState[0] = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1
 		Var topping12 = toppingID12index2