From bc9d9af33f4ed740183cf36e32d1c26f43f812f6 Mon Sep 17 00:00:00 2001 From: Ittipat Lusuk Date: Mon, 9 Jun 2025 09:59:38 +0700 Subject: [PATCH] THAI: Add Taiwanese tea powder, Fixed milk enable 2 state, Fixed blend condition disable shot, coffee shot for healthy type --- .../bg_custom_espesso_healthy_level.png | Bin 0 -> 2798 bytes .../bg_custom_taiwanese_tea_powder.png | Bin 0 -> 2564 bytes inc/button_topping_select_confirm_order.inc | 14 + inc/select_drink_current_multi_topping.inc | 10 + xml/page_topping_select8.xml | 542 +++++++++++++++++- 5 files changed, 559 insertions(+), 7 deletions(-) create mode 100644 image/topping_revamp_inter/bg_custom_espesso_healthy_level.png create mode 100644 image/topping_revamp_inter/bg_custom_taiwanese_tea_powder.png diff --git a/image/topping_revamp_inter/bg_custom_espesso_healthy_level.png b/image/topping_revamp_inter/bg_custom_espesso_healthy_level.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc613f1bf3880b20aa60f50d2a26d9c076348ef GIT binary patch literal 2798 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 V9y#ttLW4Evf|03Vf&Puh{{<$UWF-Iq literal 0 HcmV?d00001 diff --git a/image/topping_revamp_inter/bg_custom_taiwanese_tea_powder.png b/image/topping_revamp_inter/bg_custom_taiwanese_tea_powder.png new file mode 100644 index 0000000000000000000000000000000000000000..07bf83b4d14a677b190e703b6b2343e80354886e GIT binary patch literal 2564 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 literal 0 HcmV?d00001 diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc index 54eabcd3..67f63def 100644 --- a/inc/button_topping_select_confirm_order.inc +++ b/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 @@ -286,6 +287,12 @@ EndIf Var Seeker.strMulti6_4 = strMulti6_4 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 @@ -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 diff --git a/inc/select_drink_current_multi_topping.inc b/inc/select_drink_current_multi_topping.inc index dc9751c9..553a8b94 100644 --- a/inc/select_drink_current_multi_topping.inc +++ b/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 diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 62570a5f..acdecc0b 100644 --- a/xml/page_topping_select8.xml +++ b/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 @@ + + +;taiwanese-tea-powder-level + + 986 + "auto" + showTaiwaneseTeaEnable + + 0 + 0 + Var( DirImageInter + "/bg_custom_taiwanese_tea_powder.png" ) + + + + 130 + 15 + 500 + 46 + + 002028 + + + + + + + + + CustomMilkIntensityII_X + CustomEspressoTextY + 500 + 18 + CustomTaiwaneseTeaState[0] + + 000127 + + + + + CustomMilkIntensityIII_X + CustomEspressoTextY + 500 + 23 + CustomTaiwaneseTeaState[1] + + 000128 + TaiwaneseTeaIncreasePriceText + 15 + 0x84776F + + + + ; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable @@ -7292,7 +7631,7 @@ -; Sugar zero cal, Hot healthy, Then SugarZeroCalOption not enable +; Sugar zero cal, Cold healthy, Then SugarZeroCalOption not enable 986 "auto" @@ -7601,7 +7940,7 @@ -; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable +; Sugar zero cal, Cold healthy, Then SugarZeroCalOption enable 986 "auto" @@ -7968,10 +8307,26 @@ +;If-not-healthy-type 986 "auto" - showShotEnable + 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 + ) + 0 0 @@ -8058,6 +8413,112 @@ +;If-is-healthy-type + + 986 + "auto" + 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 + ) + + + 0 + 0 + Var( DirImageInter + "/bg_custom_espesso_healthy_level.png" ) + + + + 130 + 15 + 500 + 46 + + 002031 + + + + + + + + + + + + CustomEspressoTextNewX + CustomEspressoTextY + showEspressoLevel + + 002059 + + + + + CustomEspressoShotTextNewX + CustomEspressoTextY + KanitRegularTTF + + 002060 + CoffeeTextLevel1 + 15 + 0x84776F + + + + + 986 "auto" @@ -8701,7 +9162,7 @@ CustomMilkIntensityI_X CustomEspressoTextY 500 - 25 + 20 CustomMilkState[0] 000126 @@ -8712,7 +9173,7 @@ CustomMilkIntensityII_X CustomEspressoTextY 500 - 25 + 18 CustomMilkState[1] 000127 @@ -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