mageed

xml/event/tricker.ev

@@ -57,9 +57,6 @@ Var ThickTeaByBrewerBanner = 0
 Var StrawberrySeriesPro = 0
 Var StrawberrySeriesMenu = 0
 
-; Ovaltine school, 1 - 28 Feb
-Var OvaltineSchoolPro = 0
-
 ; Red string of fate, 10 - 23 Feb
 Var RedStringOfFatePro = 0
 
@@ -81,9 +78,12 @@ Var SongkranSoundCampaign = 0
 ; Boost Energy drink, 1 - 11 May
 Var BoostEnergyPro = 0
 
-; Matcha every day, 1 - 31 May
+; Matcha every day, 1 - 18 May
 Var MatchaEveryDayPro = 0
 
+; School Ovaltine, 19 - 31 May
+Var SchoolOvaltinePro = 0
+
 ; Oreo volcano, 1 - 31 May
 Var OreoVolcanoPro = 0
 
@@ -138,7 +138,12 @@ EndIf
 If SystemDateMonthInt = 5 Then
 
 	Var OreoVolcanoPro = 1
-	Var MatchaEveryDayPro = 1
+
+	If SystemDateDayInt <= 18 Then
+	    Var MatchaEveryDayPro = 1
+	Else
+	    Var SchoolOvaltinePro = 1
+	EndIf
 
     If SystemDateDayInt <= 11 Then
         Var BoostEnergyPro = 1
@@ -174,11 +179,7 @@ EndIf
 
 
 If BoxID = 201714 Then
-	Var RedStringOfFatePro = 0
-	Var OvaltineSchoolPro = 0
-	Var KingdomThaiTeaPro = 1
-	Var SongkranSoundCampaign = 1
-	Var NewMatchaPremiumX3 = 1
+
 EndIf
 
 If BoxID = 201729 Then
@@ -198,8 +199,6 @@ EndIf
 
 If BoxID = 123456 Then
 	Var ToppingNewUINewSystem = 0
-	Var PepsiXTaobinPro = 1
-	Var MatchaEveryDayPro = 0
 	Var BoostEnergyPro = 1
 EndIf
 
@@ -276,7 +275,7 @@ DEBUGVAR HaveIngredientOvaltine
 If HaveIngredientOvaltine = "true" Then
 
 Else
-	Var OvaltineSchoolPro = 0
+	Var SchoolOvaltinePro = 0
 	Var RedStringOfFatePro = 0
 EndIf
 
@@ -286,8 +285,11 @@ Else
 	Var PepsiXTaobinPro = 0
 EndIf
 
-DEBUGVAR OvaltineSchoolPro
-DEBUGVAR RedStringOfFatePro
+If OreoEnable = "true" Then
+
+Else
+    Var OreoVolcanoPro = 0
+EndIf
 
 Var CurrentMainVideoTemp = 0
 
@@ -318,10 +320,3 @@ If BoxID = 176757 Then
 EndIf
 
 DEBUGVAR SystemDateDayOfWeek
-
-READ_FILE "/mnt/sdcard/coffeevending/kbank_cashless_machine" KBankCashlessMachineContent
-DEBUGVAR KBankCashlessMachineContent
-If KBankCashlessMachineContent = 1 Then
-	Var KBankCashlessMachine = 1
-EndIf
-DEBUGVAR KBankCashlessMachine