From 0de83db3238f3b58f206ce9998fba314e8a2f7aa Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 27 Jun 2023 16:33:31 +0700
Subject: [PATCH] DO

---
 xml/event/promotion_mystery_cup_35.xml | 29 +++++++-------------------
 xml/event/promotion_template3.inc      |  8 +++----
 xml/page_board.xml                     |  1 +
 xml_main/startup.xml                   |  4 ++--
 xml_main/startup_ignore_netcore.xml    |  1 +
 5 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml
index a7ec65c4..e8722643 100644
--- a/xml/event/promotion_mystery_cup_35.xml
+++ b/xml/event/promotion_mystery_cup_35.xml
@@ -8961,9 +8961,9 @@ LIMENADE SODA" </Value>
     )
     </FilenameDisable>
     <EventClick>
-	Var OreoGuarantee = OreoGuarantee + 1
-	DEBUGVAR OreoGuarantee
-		If OreoGuarantee = 4 Then
+    Var OreoGuarantee = OreoGuarantee + 1
+    DEBUGVAR OreoGuarantee
+		If OreoGuarantee > 4 Then
 			Random2 0 IndexOfRateupOreoMilk ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoMilk[ResultRandomIndex]
 			DEBUGVAR ListOfOreoMilk[ResultRandomIndex]
@@ -9001,8 +9001,8 @@ LIMENADE SODA" </Value>
     </FilenameDisable>
 <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
-DEBUGVAR OreoGuarantee
-		If OreoGuarantee = 4 Then
+		DEBUGVAR OreoGuarantee
+        If OreoGuarantee > 4 Then
 			Random2 0 IndexOfRateupOreoTea ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoTea[ResultRandomIndex]
 			DEBUGVAR ListOfOreoTea[ResultRandomIndex]
@@ -9042,7 +9042,7 @@ DEBUGVAR OreoGuarantee
 <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
 DEBUGVAR OreoGuarantee
-If OreoGuarantee = 4 Then
+If OreoGuarantee > 4 Then
 
 Random2 0 IndexOfRateupOreoCoffee ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoCoffee[ResultRandomIndex]
@@ -9085,7 +9085,7 @@ EndIf
     <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
 DEBUGVAR OreoGuarantee
-If OreoGuarantee = 4 Then
+If OreoGuarantee > 4 Then
 		Random2 0 IndexOfRateupOreoAll ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoAll[ResultRandomIndex]
 			DEBUGVAR ListOfOreoAll[ResultRandomIndex]
@@ -9144,7 +9144,7 @@ EndIf
         )
      </FilenameDisable>
 <EventOnClick> 
-        Var BigButtonEnable = "Invisible"
+                Var BigButtonEnable = "Invisible"
 		
         DEBUGVAR BigButtonEnable
 		DEBUGVAR OreoGuarantee
@@ -9297,19 +9297,6 @@ Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1
 			Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1
         EndIf
 
-        ; HOJICHA Oreo smoothie
-        If $12-99-03-0029.Button = "Enable" Then
-            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0029"
-            Var ListOfTea[IndexOfTea] = "12-99-03-0029"
-            Var IndexOfAllRandom = IndexOfAllRandom + 1
-            Var IndexOfTea = IndexOfTea + 1
-
-			Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0029"
-			Var ListOfOreoTea[IndexOfRateupOreoTea] = "12-99-03-0029"
-Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1
-			Var IndexOfRateupOreoTea = IndexOfRateupOreoTea + 1
-        EndIf
-
         ; Thai milk tea smoothie
         If $12-99-03-0030.Button = "Enable" Then
             Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0030"
diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc
index 81a06940..ee69c283 100644
--- a/xml/event/promotion_template3.inc
+++ b/xml/event/promotion_template3.inc
@@ -30,7 +30,7 @@
     <EventClick>
     Var OreoGuarantee = OreoGuarantee + 1
     DEBUGVAR OreoGuarantee
-		If OreoGuarantee = 4 Then
+		If OreoGuarantee > 4 Then
 			Random2 0 IndexOfRateupOreoMilk ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoMilk[ResultRandomIndex]
 			DEBUGVAR ListOfOreoMilk[ResultRandomIndex]
@@ -69,7 +69,7 @@
 <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
 		DEBUGVAR OreoGuarantee
-        If OreoGuarantee = 4 Then
+        If OreoGuarantee > 4 Then
 			Random2 0 IndexOfRateupOreoTea ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoTea[ResultRandomIndex]
 			DEBUGVAR ListOfOreoTea[ResultRandomIndex]
@@ -109,7 +109,7 @@ Var OreoGuarantee = OreoGuarantee + 1
 <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
 DEBUGVAR OreoGuarantee
-If OreoGuarantee = 4 Then
+If OreoGuarantee > 4 Then
 
 Random2 0 IndexOfRateupOreoCoffee ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoCoffee[ResultRandomIndex]
@@ -152,7 +152,7 @@ EndIf
     <EventClick>
 Var OreoGuarantee = OreoGuarantee + 1
 DEBUGVAR OreoGuarantee
-If OreoGuarantee = 4 Then
+If OreoGuarantee > 4 Then
 		Random2 0 IndexOfRateupOreoAll ResultRandomIndex
 			Var ProductCodeRandom = ListOfOreoAll[ResultRandomIndex]
 			DEBUGVAR ListOfOreoAll[ResultRandomIndex]
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 23e11981..493f058a 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -367,6 +367,7 @@
 	If StartUpExt = "false" Then
 
 	Else
+		Var OreoGuarantee = 0
 		Machine Initial
 		Var StartUpExt = "false"
 		Var CameraSettingStatus = ""
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 2f214772..6599dd7f 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.35"
-	Var XMLPageVersionInt = 735
+	Var XMLPageVersion = "7.36"
+	Var XMLPageVersionInt = 736
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>
diff --git a/xml_main/startup_ignore_netcore.xml b/xml_main/startup_ignore_netcore.xml
index ae048251..7809cbf0 100644
--- a/xml_main/startup_ignore_netcore.xml
+++ b/xml_main/startup_ignore_netcore.xml
@@ -99,6 +99,7 @@
 	Var XMLPageVersionInt = 999
 	Var IgnoreNetCore = "true"
 
+	Var OreoGuarantee = 0
 
 </EventOpen>