diff --git a/image/topping2/bg_milk_choice.png b/image/topping2/bg_milk_choice.png index 9bae1726..35322147 100644 Binary files a/image/topping2/bg_milk_choice.png and b/image/topping2/bg_milk_choice.png differ diff --git a/image/topping2/bg_milk_choice_j.png b/image/topping2/bg_milk_choice_j.png new file mode 100644 index 00000000..b76121ed Binary files /dev/null and b/image/topping2/bg_milk_choice_j.png differ diff --git a/image/topping2/cb_disable_check.png b/image/topping2/cb_disable_check.png new file mode 100644 index 00000000..2630e827 Binary files /dev/null and b/image/topping2/cb_disable_check.png differ diff --git a/image/topping2_en/bg_milk_choice.png b/image/topping2_en/bg_milk_choice.png new file mode 100644 index 00000000..6f92e205 Binary files /dev/null and b/image/topping2_en/bg_milk_choice.png differ diff --git a/image/topping2_en/bg_milk_choice_j.png b/image/topping2_en/bg_milk_choice_j.png new file mode 100644 index 00000000..542fb9b1 Binary files /dev/null and b/image/topping2_en/bg_milk_choice_j.png differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index d0ec5d9e..8af1e19f 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -41,6 +41,8 @@ Var TamatianEnable = 0 ; September 9 - 16 Var MayDayRunEnable = 0 +; Enable Milk Choice Vegan +Var MilkChoiceVeganEnable = 0 If SystemDateMonthInt = 9 Then If SystemDateDayInt > 5 Then @@ -80,6 +82,11 @@ If SystemDateMonthInt = 10 Then Var PepweenEnable = 1 EndIf + If SystemDateDayInt >= 13 Then + If SystemDateDayInt <= 24 Then + Var MilkChoiceVeganEnable = 1 + EndIf + EndIf EndIf DEBUGVAR PepweenEnable @@ -191,6 +198,7 @@ EndIf If InternationalEnable = 1 Then + Var MilkChoiceVeganEnable = 0 Var GameEnableFromTrickerEv = 0 Var TamatianEnable = 0 Var MayDayRunEnable = 0 diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index ddbf2856..a9d04640 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -85,7 +85,6 @@ ;Var ShotCoffeePremium = "Enable" ;Var showOreoAddEnable = "Enable" - Var CerealMilkToppingEnable = "Invisible" Var ExtraTopping = "Invisible" @@ -299,8 +298,15 @@ Var img_smth_dis = "/bt_smoothie_disable_no.png" Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + If MilkChoiceVeganEnable = 1 Then + Var CerealMilkToppingEnable = "Invisible" + Var CerealMilkToppingVegan = "Enable" + Else + Var CerealMilkToppingEnable = "Enable" + Var CerealMilkToppingVegan = "Invisible" + EndIf + Var CerealMilkEnable = "Invisible" - Var CerealMilkEnable = "Enable" Var topping_price_refresh = 1 @@ -1485,8 +1491,7 @@ If MenuCodeName1 = "Cereal-Milk" Then Var CerealMilkToppingEnable = "Enable" Var CerealMilkPrice = SubMenuPrice1 - Var ExtraTopping = "Enable" - + Var CerealMilkEnable = "Enable" EndIf @@ -1619,8 +1624,8 @@ 52 881 1080 - 900 - "auto-all" + 880 + 880 "Vertical" 1 @@ -2793,45 +2798,28 @@ ; ; ; -;-BEGIN shot layout - - ExtraTopping - 1080 - "auto" +; +; +; +; +;-BEGIN milk choice + + "Enable" + 986 + 157 20 - - - 986 - "auto" - "vertical" - ExtraTopping -; - - 986 - 64 - ExtraTopping - - Var( DirImage + "/bg_top.png" ) - - - -; -; -; - - 986 - "auto" - CerealMilkToppingEnable -; - 0 - 0 - Var( DirImage + "/bg_top_milk.png") + CerealMilkToppingEnable + Var( DirImage + "/bg_milk_choice.png" ) + + + CerealMilkToppingVegan + Var( DirImage + "/bg_milk_choice_j.png" ) - CerealMilkX - 2 + 237 + 69 KanitRegularTTF - CerealMilkEnable + "Enable" 36 0x84776F CerealMilkPrice + +; +; +; +; +; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + ExtraTopping + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + ExtraTopping +; + + 986 + 64 + ExtraTopping + + Var( DirImage + "/bg_top.png" ) + + ; ; ; @@ -4162,13 +4185,13 @@ Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop If CerealMilkAddAmount = 0 Then - Var CerealMilkPrice = "(+฿10)" + Var CerealMilkPrice = "(+฿5)" Else Var CerealMilkPrice = "(+฿" + CerealMilkAddAmount Var CerealMilkPrice = CerealMilkPrice + ")" - Var CerealMilkPrice = "(+฿10)" + Var CerealMilkPrice = "(+฿5)" EndIf DEBUGVAR SubMenuPrice1