From b1e1d226ce3cb87bc2b048de6ff5b7c3258df921 Mon Sep 17 00:00:00 2001 From: thanawat saiyota Date: Fri, 21 Mar 2025 19:41:08 +0700 Subject: [PATCH] THAI: soda volcano --- inc/button_topping_select_confirm_order.inc | 26 + xml/page_topping_select8.xml | 1036 ++++++++++++++----- 2 files changed, 817 insertions(+), 245 deletions(-) diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc index 7a598798..4654d5b3 100644 --- a/inc/button_topping_select_confirm_order.inc +++ b/inc/button_topping_select_confirm_order.inc @@ -87,6 +87,32 @@ EndIf EndIf + + + If showShotNormalSoda = "Press" Then + Var topping13 = toppingID13index1 + EndIf + + If showShotEnableSoda = "Press" Then + Var topping13 = toppingID13index2 + Var topping12 = toppingID12index1 + Else + Var topping13 = toppingID13index1 + Var topping12 = toppingID12index1 + EndIf + + + If CustomEnergyState[0] = "Press" Then + Var topping12 = toppingID12index2 + + EndIf + + If CustomEnergyState[1] = "Press" Then + Var topping12 = toppingID12index3 + + EndIf + + If CustomSweetState[3] = "PressForever" Then If ShiftSugarStep = 1 Then Var topping1 = toppingID1index4 diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index b6769040..e862087b 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -111,6 +111,10 @@ Var SpecialMix = "Invisible" Var CustomSyrup = "Invisible" + Var showEnergyEnable = "Invisible" + Var showShotSodaEnable = "Invisible" + Var showCoffeeEnable = "Invisible" + Var showMilkEnable = "Invisible" ; Customer Coffee @@ -153,9 +157,10 @@ Var CustomSweetState[4] = "Invisible" Var CustomSweetState[5] = "Invisible" + Var showShotNormal = "Enable" - Var CustomEspressoState[0] = "Enable" - Var CustomEspressoState[1] = "Enable" + Var showShotNormalSoda = "Enable" + Var showShotEnableSoda = "Enable" Var CustomEnaergyState[0] = "Enable" Var CustomEnaergyState[1] = "Enable" @@ -301,9 +306,11 @@ Var CustomSweetrText[5] = "Sweetest" - Var CustomEspressoText[0] = "1 Shot" - Var CustomEspressoText[1] = "2 Shot" - Var CustomEspressoText[2] = "3 Shot" + Var CustomEspressoText[0] = "Normal" + Var CustomEspressoText[1] = "1 Shot" + + Var CustomEnergyText[0] = "1 Shot" + Var CustomEnergyText[1] = "2 Shot" Var CustomCocoaText[0] = "Cocoa X2" Var CustomCocoaText[1] = "Cocoa X3" @@ -348,6 +355,7 @@ Var CustomSweetestTextX = 865 Var CustomSweetestPercentTextX = 935 + Var CustomEspressoTextX = 793 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -392,9 +400,11 @@ Var CustomSweetrText[5] = "สุขิต" - Var CustomEspressoText[0] = "1 ช็อต" - Var CustomEspressoText[1] = "2 ช็อต" - Var CustomEspressoText[2] = "3 ช็อต" + Var CustomEspressoText[0] = "ปกติ" + Var CustomEspressoText[1] = "1 ช็อต" + + Var CustomEnergyText[0] = "1 ช็อต" + Var CustomEnergyText[1] = "2 ช็อต" Var CustomCocoaText[0] = "โกโก้ X2" Var CustomCocoaText[1] = "โกโก้ X3" @@ -435,6 +445,8 @@ Var CustomSweetestTextX = 900 Var CustomSweetestPercentTextX = 935 + + Var CustomEspressoTextX = 804 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust @@ -1214,9 +1226,11 @@ Var CustomSweetrText[5] = "Sweetest" - Var CustomEspressoText[0] = "1 Shot" - Var CustomEspressoText[1] = "2 Shot" - Var CustomEspressoText[2] = "3 Shot" + Var CustomEspressoText[0] = "Normal" + Var CustomEspressoText[1] = "1 Shot" + + Var CustomEnergyText[0] = "1 Shot" + Var CustomEnergyText[1] = "2 Shot" Var CustomCocoaText[0] = "Cocoa X2" Var CustomCocoaText[1] = "Cocoa X3" @@ -1298,9 +1312,8 @@ Var CustomSweetrText[5] = "สุขิต" - Var CustomEspressoText[0] = "1 ช็อต" + Var CustomEspressoText[0] = "ปกติ" Var CustomEspressoText[1] = "2 ช็อต" - Var CustomEspressoText[2] = "3 ช็อต" Var CustomCocoaText[0] = "โกโก้ X2" Var CustomCocoaText[1] = "โกโก้ X3" @@ -1450,6 +1463,8 @@ DEBUGVAR TOPPING9 DEBUGVAR TOPPING10 DEBUGVAR TOPPING11 + DEBUGVAR TOPPING12 + DEBUGVAR TOPPING13 DEBUGVAR toppingID1index1 DEBUGVAR toppingID1index2 @@ -1503,6 +1518,22 @@ DEBUGVAR toppingID11index1 DEBUGVAR toppingID11index2 DEBUGVAR toppingID11index3 + + DEBUGVAR toppingID12index1 + DEBUGVAR toppingID12index2 + DEBUGVAR toppingID12index3 + + DEBUGVAR toppingID12index1Status + DEBUGVAR toppingID12index2Status + DEBUGVAR toppingID12index3Status + + DEBUGVAR toppingID13index1 + DEBUGVAR toppingID13index2 + DEBUGVAR toppingID13index3 + + DEBUGVAR toppingID13index1Status + DEBUGVAR toppingID13index2Status + DEBUGVAR toppingID13index3Status If toppingID1index5 > 0 Then SAVELOG "toppingID1index5 not set" @@ -1618,7 +1649,7 @@ 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" @@ -1820,6 +1851,168 @@ EndIf EndIf + + If TOPPING6 = "syrup-topping" Then + + If toppingID6price2 > 0 Then + DEBUGVAR toppingID6price2 + DEBUGVAR DisplayFormat + + Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID6price2Conv + + Var text_price_6 = "" + + Var text_price_6 = toppingID6price2Conv + ")" + Var text_price_6 = "(+" + text_price_6 + + + + DEBUGVAR text_price_6 + Else + + Var text_price_6 = "" + EndIf + + + Var CustomSyrup = "Enable" + + Var showStrawberryEnable = "Disable" + Var showYuzuEnable = "Disable" + + If cold_button_state = "PressForever" Then + Var showStrawberryEnable = "Enable" + Var showYuzuEnable = "Enable" + EndIf + + + If hot_button_state = "PressForever" Then + Var SpecialMix = "Enable" + Var CustomSyrup = "Enable" + + Var showStrawberryEnable = "Disable" + Var showYuzuEnable = "Disable" + EndIf + + + + If toppingID6index2Status = "" Then + Var showStrawberryEnable = "Invisible" + EndIf + + If toppingID6index3Status = "" Then + Var showYuzuEnable = "Invisible" + EndIf + + If toppingID6index2Status = "Disable" Then + Var showStrawberryEnable = "Disable" + EndIf + + If toppingID6index3Status = "Disable" Then + Var showYuzuEnable = "Disable" + EndIf + + + Var ExtraTopping = "Enable" + + + If blend_button_state = "Disable2" Then + If hot_button_state = "Disable2" Then + If cold_button_state = "PressForever" Then + Var showOreoAddEnable = "Enable" + Var showOvaltineEnable = "Enable" + Var showCocoaEnable = "Enable" + Var showText8 = "Invisible" + EndIf + EndIf + EndIf + EndIf + + + If TOPPING12 = "energy-drink" Then + + If toppingID12index2Status = "Enable" Then + Var showEnergyEnable = "Enable" + EndIf + + If toppingID12index2Status = "Disable" Then + Var showEnergyEnable = "Enable" + EndIf + + If toppingID12index2Status = "" Then + Var showEnergyEnable = "Invisible" + EndIf + + + If cold_button_state = "PressForever" Then + If toppingID12index2Status = "Enable" Then + Var CustomEnergyState[0] = "Enable" + EndIf + + If toppingID12index3Status = "Enable" Then + Var CustomEnergyState[1] = "Enable" + EndIf + Else + If toppingID12index2Status = "" Then + Var CustomEnergyState[0] = "Invisible" + Else + Var CustomEnergyState[0] = "Disable" + EndIf + + If toppingID12index3Status = "" Then + Var CustomEnergyState[1] = "Invisible" + Else + Var CustomEnergyState[1] = "Disable" + EndIf + EndIf + + If blend_button_state = "PressForever" Then + If toppingID12index2Status = "Enable" Then + Var CustomEnergyState[0] = "Enable" + EndIf + + If toppingID12index3Status = "Enable" Then + Var CustomEnergyState[1] = "Enable" + EndIf + EndIf + + EndIf + + If TOPPING13 = "shot coffee" Then + + If toppingID13index2Status = "Enable" Then + Var showShotSodaEnable = "Enable" + EndIf + + If toppingID13index2Status = "Disable" Then + Var showShotSodaEnable = "Enable" + EndIf + + If toppingID13index2Status = "" Then + Var showShotSodaEnable = "Invisible" + EndIf + + If cold_button_state = "PressForever" Then + If toppingID13index2Status = "Enable" Then + Var showShotEnableSoda = "Enable" + Var showShotNormalSoda = "Enable" + EndIf + Else + + If toppingID13index2Status = "" Then + Var showShotNormalSoda = "Invisible" + Var showShotEnableSoda = "Invisible" + Else + Var showShotNormalSoda = "Disable" + Var showShotEnableSoda = "Disable" + EndIf + EndIf + + EndIf + + + DEBUGVAR SubMenuGroupIDSlot6_1 DEBUGVAR TOPPING3 @@ -2164,17 +2357,33 @@ If showStrawberryEnable = "Enable" Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf EndIf If showStrawberryEnable = "Press" Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf EndIf If showYuzuEnable = "Enable" Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf If showYuzuEnable = "Press" Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf If TOPPING11 = "milk-level" Then @@ -2233,17 +2442,33 @@ EndIf If showStrawberryEnable = "Enable" Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf EndIf If showStrawberryEnable = "Press" Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf EndIf If showYuzuEnable = "Enable" Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf If showYuzuEnable = "Press" Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf If CustomMilkState[0] = "Enable" Then @@ -2276,11 +2501,32 @@ EndIf EndIf + If TOPPING13 = "shot coffee" Then + If showShotNormalSoda = "Enable" Then + If showShotEnableSoda = "Enable" Then + Var showShotNormalSoda = "Press" + EndIf + EndIf + Else + If showShotNormal = "Enable" Then + If showShotEnable = "Enable" Then + Var showShotNormal = "Press" + EndIf + EndIf + EndIf + Var SelectToppingType = 1 EndIf ; first time. If blend_button_state = "PressForever" Then + If showShotEnableSoda = "Enable" Then + Var showShotEnableSoda = "Disable" + EndIf + + If showShotNormalSoda = "Press" Then + Var showShotNormalSoda = "Disable" + Endif If TOPPING11 = "milk-level" Then @@ -6257,7 +6503,7 @@ 986 "auto" - BGSugarNew + showMilkEnable 0 0 @@ -7375,7 +7621,7 @@ - - - - - - - 784 + CustomEspressoTextX CustomEspressoTextY KanitRegularTTF showEspressoLevel @@ -7593,6 +7700,289 @@ 0x513C2F CustomEspressoText[1] + + + 940 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + CoffeeTextLevel1 + + + + + 986 + "auto" + showShotSodaEnable + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_custom_espesso_level.png" ) + + + + + + + + + + + CustomEspressoTextX + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[0] + + + + 892 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[1] + + + + 940 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + CoffeeTextLevel1 + + + + + + 986 + "auto" + showEnergyEnable + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_custom_energy_level.png" ) + + + + + + + + + + + 784 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEnergyText[0] + + + + 892 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEnergyText[1] + ; Additional Price @@ -9507,32 +9897,66 @@ If showStrawberryEnable = "Press" Then - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Enable" - Else - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Enable" - Else - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf Else - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Press" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Press" + EndIf + EndIf + + If toppingID6index6 = 325 Then + Var showYuzuEnable = "Disable" EndIf EndIf - If toppingID6index6 = 325 Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Press" + EndIf + EndIf + + If toppingID6index3 = 92 Then + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf @@ -9563,32 +9987,66 @@ If showStrawberryEnable = "Press" Then - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Enable" - Else - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Enable" - Else - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf Else - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Press" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Press" + EndIf + EndIf + + If toppingID6index6 = 325 Then + Var showYuzuEnable = "Disable" EndIf EndIf - If toppingID6index6 = 325 Then - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Press" + EndIf + EndIf + + If toppingID6index3 = 92 Then + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf @@ -9651,30 +10109,64 @@ SAVELOG "Press add Yuzu" If showYuzuEnable = "Press" Then - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Enable" - Else - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Enable" - Else - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf Else - If toppingID6index5 = 324 Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + Var showStrawberryEnable = "Disable" + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Press" + EndIf + EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Press" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + Var showStrawberryEnable = "Disable" + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Press" + EndIf EndIf EndIf EndIf @@ -9710,30 +10202,64 @@ SAVELOG "Press add Yuzu" If showYuzuEnable = "Press" Then - If toppingID6index5 = 324 Then - If toppingID6index5Status = "Enable" Then - Var showStrawberryEnable = "Enable" - Else - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + If toppingID6index5Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Enable" - Else - Var showYuzuEnable = "Disable" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + If toppingID6index2Status = "Enable" Then + Var showStrawberryEnable = "Enable" + Else + Var showStrawberryEnable = "Disable" + EndIf + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Enable" + Else + Var showYuzuEnable = "Disable" + EndIf EndIf EndIf Else - If toppingID6index5 = 324 Then - Var showStrawberryEnable = "Disable" + If TOPPING6 = "all-volcano" Then + If toppingID6index5 = 324 Then + Var showStrawberryEnable = "Disable" + EndIf + + If toppingID6index6 = 325 Then + If toppingID6index6Status = "Enable" Then + Var showYuzuEnable = "Press" + EndIf + EndIf EndIf - If toppingID6index6 = 325 Then - If toppingID6index6Status = "Enable" Then - Var showYuzuEnable = "Press" + If TOPPING6 = "syrup-topping" Then + If toppingID6index2 = 91 Then + Var showStrawberryEnable = "Disable" + EndIf + + If toppingID6index3 = 92 Then + If toppingID6index3Status = "Enable" Then + Var showYuzuEnable = "Press" + EndIf EndIf EndIf EndIf @@ -10299,22 +10825,18 @@ EndIf - If CustomEnaergyState[0] = "Press" Then + If CustomEnergyState[0] = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1 EndIf - If CustomEnaergyState[1] = "Press" Then + If CustomEnergyState[1] = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel2 EndIf - If CustomEspressoState[0] = "Press" Then + If showShotEnableSoda = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + CoffeePriceLevel1 EndIf - If CustomEspressoState[1] = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + CoffeePriceLevel2 - EndIf - If CollagenState = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice @@ -10340,12 +10862,26 @@ If showStrawberryEnable = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + StrawberryPrice - Var strMulti6_5 = "TPID=324,multiply=1" + If TOPPING6 = "all-volcano" Then + Var strMulti6_5 = "TPID=324,multiply=1" + EndIf + + If TOPPING6 = "syrup-topping" Then + Var strMulti6_5 = "TPID=91,multiply=1" + EndIf + Var DisableUsingCode = "true" Else - Var strMulti6_5 = "TPID=320,multiply=0" + If TOPPING6 = "all-volcano" Then + Var strMulti6_5 = "TPID=320,multiply=1" + EndIf + + If TOPPING6 = "syrup-topping" Then + Var strMulti6_5 = "TPID=90,multiply=1" + EndIf + Var DisableUsingCode = "false" DEBUGVAR DisableUsingCode @@ -10355,12 +10891,22 @@ If showYuzuEnable = "Press" Then Var TOPPING_PRICE = TOPPING_PRICE + YuzuPrice - Var strMulti6_6 = "TPID=325,multiply=1" + If TOPPING6 = "all-volcano" Then + Var strMulti6_6 = "TPID=325,multiply=1" + EndIf + If TOPPING6 = "syrup-topping" Then + Var strMulti6_6 = "TPID=92,multiply=1" + EndIf Var DisableUsingCode = "true" Else - Var strMulti6_6 = "TPID=320,multiply=0" + If TOPPING6 = "all-volcano" Then + Var strMulti6_6 = "TPID=320,multiply=1" + EndIf + If TOPPING6 = "syrup-topping" Then + Var strMulti6_6 = "TPID=90,multiply=1" + EndIf Var DisableUsingCode = "false" DEBUGVAR DisableUsingCode @@ -10575,7 +11121,7 @@ RefreshAll ;for test - Var showShotEnable = "Invisible" + ;Var showShotEnable = "Invisible"