THAI: finish pro bad valentine

xml/event/bad_valentine/page_bad_valentine_random.xml

@@ -50,9 +50,9 @@
 
 
         ; pattern
-        Var patternList[0] = "/randome_pattern_1.png"
+        Var patternList[0] = "/random_pattern_1.png"
-        Var patternList[1] = "/randome_pattern_2.png"
+        Var patternList[1] = "/random_pattern_2.png"
-        Var patternList[2] = "/randome_pattern_3.png"
+        Var patternList[2] = "/random_pattern_3.png"
 
 
 
@@ -67,17 +67,14 @@
             Var patternList[2].X = 489
             Var patternList[2].Y = 1213
 
+            Var patternList[0].Text1 = "Act like a lover,\nbut it's just casual chatter."
+            Var patternList[0].Text2 = "Get all the lover-fell functions. When I asked to be\nmy girlfriend, she said NO"
 
-            Var patternList[0].Text1 = "ทำทุกอย่างเหมือนแฟน
+            Var patternList[1].Text1 = "She went for a shower, BRB.\nThree months later, still no word."
-แต่เป็นได้แค่คนคุย"
+            Var patternList[1].Text2 = "She loves cleanliness, maybe too much for a reply."
-            Var patternList[0].Text2 = "รับทุกฟังก์ชั่นแบบฟีลแฟน พอขอเป็นแฟนเธอบอกแคนนอท"
 
-            Var patternList[1].Text1 = "เธอขอไปอาบน้ำ เดี๋ยวมา
+            Var patternList[2].Text1 = "Paid for it all, yet stuck in the friend zone."
-3 เดือนผ่านมายังไม่ตอบเลย"
+            Var patternList[2].Text2 = "Almost paid the price of life, but in the end, left alone.\nNo worries, keep your cash, invest in a new unknown."
-            Var patternList[1].Text2 = "เราว่าเธอคงจะรักสะอาดจนไม่มีเวลาตอบ อาบน้ำตั้ง 3 เดือน ตัวคงเปื่อยน่าดูเลย"
-
-            Var patternList[2].Text1 = "เปย์เป็นแสน แขนไม่ได้จับ"
-            Var patternList[2].Text2 = "เปย์แทบตาย แต่สุดท้ายก็โดนทิ้ง ไม่เป็นไรนะ เก็บตังค์ไว้เปย์คนใหม่"
 
         Else
 
@@ -91,41 +88,38 @@
             Var patternList[2].Y = 1238
 
 
-            Var patternList[0].Text1 = "Act like a lover,
+            Var patternList[0].Text1 = "ทำทุกอย่างเหมือนแฟน\nแต่เป็นได้แค่คนคุย"
-but it's just casual chatter."
+            Var patternList[0].Text2 = "รับทุกฟังก์ชั่นแบบฟีลแฟน พอขอเป็นแฟนเธอบอกแคนนอท"
-            Var patternList[0].Text2 = "Get all the lover-fell functions. When I asked to be
-my girlfriend, she said NO"
 
-            Var patternList[1].Text1 = "She went for a shower, BRB.
+            Var patternList[1].Text1 = "เธอขอไปอาบน้ำ เดี๋ยวมา\n3 เดือนผ่านมายังไม่ตอบเลย"
-Three months later, still no word."
+            Var patternList[1].Text2 = "เราว่าเธอคงจะรักสะอาดจนไม่มีเวลาตอบ อาบน้ำตั้ง 3 เดือน ตัวคงเปื่อยน่าดูเลย"
-            Var patternList[1].Text2 = "She loves cleanliness, maybe too much for a reply."
-
-            Var patternList[2].Text1 = "Paid for it all, yet stuck in the friend zone."
-            Var patternList[2].Text2 = "Almost paid the price of life, but in the end, left alone.
-No worries, keep your cash, invest in a new unknown."
 
+            Var patternList[2].Text1 = "เปย์เป็นแสน แขนไม่ได้จับ"
+            Var patternList[2].Text2 = "เปย์แทบตาย แต่สุดท้ายก็โดนทิ้ง ไม่เป็นไรนะ เก็บตังค์ไว้เปย์คนใหม่"
 
         EndIf
 
         ; Random pattern
         Var pattern = 0
         Random2 0 2 pattern
-        Var RewardDisplay = patternList[pattern]
+        Var PatternImg = patternList[pattern]
-        Var RewardDisplay.X = patternList[pattern].X
+        Var PatternImg.X = patternList[pattern].X
-        Var RewardDisplay.Y = patternList[pattern].Y
+        Var PatternImg.Y = patternList[pattern].Y
+        Var PatternImg.Text1 = patternList[pattern].Text1
+        Var PatternImg.Text2 = patternList[pattern].Text2
 
         DEBUGVAR UserCouponReward
-        DEBUGVAR RewardDisplay
+        DEBUGVAR PatternImg
-
+        DEBUGVAR PatternImg.X
-        DEBUGVAR RewardDisplay
+        DEBUGVAR PatternImg.Y
+        DEBUGVAR PatternImg.Text1
+        DEBUGVAR PatternImg.Text2
     </EventOpen>
 
     <Timeout> 1000 </Timeout>
     <EventTimeout>
         DEBUGVAR Timeout
 
-
-
         If Timeout > 5 Then
             Open "ROOT/taobin_project/xml/page_lid_straw.xml"
         EndIf
@@ -151,15 +145,57 @@ No worries, keep your cash, invest in a new unknown."
     </Image>
 
     <Image>
-        <X> 193 </X>
+        <X> 66 </X>
         <Y> 464 </Y>
         <Filename> CouponResultImage </Filename>
     </Image>
 
     <Image>
-        <X> RewardDisplay.X </X>
+        <X> PatternImg.X </X>
-        <Y> RewardDisplay.Y </Y>
+        <Y> PatternImg.Y </Y>
-        <Filename> RewardDisplay </Filename>
+        <Filename> Var( DirImage + PatternImg) </Filename>
     </Image>
 
+    <Text>
+        <X> 0 </X>
+        <Y> 1600 </Y>
+        <Width> 1080 </Width>
+        <Height> 200 </Height>
+        <Font> KanitSemiBoldTTF </Font>
+        <Size> 48 </Size>
+        <Color> 0x523D30 </Color>
+        <Align> center-vertical-horizontal </Align>
+        <Value> PatternImg.Text1 </Value>
+    </Text> 
+
+    <Text>
+        <X> 0 </X>
+        <Y> 1760 </Y>
+        <Width> 1080 </Width>
+        <Height> 150 </Height>
+        <Font> KanitSemiBoldTTF </Font>
+        <Size> 32 </Size>
+        <Color> 0xFFFFFF </Color>
+        <Align> center-vertical-horizontal </Align>
+        <Value> PatternImg.Text2 </Value>
+    </Text>
+
+<EventUnitTest1>
+    OpenInst 2 "ROOT/taobin_project/xml/page_lid_straw.xml"
+</EventUnitTest1>
+
+<EventUnitTest2>
+    Var show_eng = "false"
+    Open "ROOT/taobin_project/xml/event/bad_valentine/page_bad_valentine_random.xml"
+</EventUnitTest2>
+
+<EventUnitTest3>
+    Var show_eng = "true"
+    Open "ROOT/taobin_project/xml/event/bad_valentine/page_bad_valentine_random.xml"
+</EventUnitTest3>
+
+<EventUnitTest4>
+    Open "ROOT/taobin_project/xml/event/bad_valentine/page_bad_valentine_random.xml"
+</EventUnitTest4>
+
 </Popup>

xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml

@@ -49,32 +49,17 @@
 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0
 
-
-	Var taobinP1 = "Invisible"
-	Var taobinP2 = "Invisible"
-	Var taobinP3 = "Invisible"
-	Var taobinP4 = "Invisible"
-	Var taobinP5 = "Invisible"
-	Var taobinP6 = "Invisible"
-	Var taobinP7 = "Invisible"
-	Var taobinP8 = "Invisible"
-	Var taobinP9 = "Invisible"
-	Var taobinP10 = "Invisible"
-	Var taobinP11 = "Invisible"
-	Var taobinP12 = "Invisible"
-	Var taobinP13 = "Invisible"
-
 	Var taobinImgNewPoint = "/point_active_new.png"
 
-	Var taobinImgPoint[0] = "/point_active.png"
+	Var taobinImgPoint[0] = "/point_deactive.png"
-	Var taobinImgPoint[1]= "/point_active.png"
+	Var taobinImgPoint[1]= "/point_deactive.png"
-	Var taobinImgPoint[2]= "/point_active.png"
+	Var taobinImgPoint[2]= "/point_deactive.png"
-	Var taobinImgPoint[3]= "/point_active.png"
+	Var taobinImgPoint[3]= "/point_deactive.png"
-	Var taobinImgPoint[4]= "/point_active.png"
+	Var taobinImgPoint[4]= "/point_deactive.png"
-	Var taobinImgPoint[5]= "/point_active.png"
+	Var taobinImgPoint[5]= "/point_deactive.png"
-	Var taobinImgPoint[6]= "/point_active.png"
+	Var taobinImgPoint[6]= "/point_deactive.png"
-	Var taobinImgPoint[7]= "/point_active.png"
+	Var taobinImgPoint[7]= "/point_deactive.png"
-	Var taobinImgPoint[8]= "/point_active.png"
+	Var taobinImgPoint[8]= "/point_deactive.png"
 
 	;Var taobinTextPointTH[0] = "รวยข้ามคืน ตื่นมารวย"
 	;Var taobinTextPointTH[1] = "รวยตาค้าง กระพริบตาบ้างก็ได้"
@@ -122,30 +107,39 @@
 
 	If PointState[0] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[0] = "/point_active.png"
 	EndIf
 	If PointState[1] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[1] = "/point_active.png"
 	EndIf
 	If PointState[2] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[2] = "/point_active.png"
 	EndIf
 	If PointState[3] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[3] = "/point_active.png"
 	EndIf
 	If PointState[4] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[4] = "/point_active.png"
 	EndIf
 	If PointState[5] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[5] = "/point_active.png"
 	EndIf
 	If PointState[6] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[6] = "/point_active.png"
 	EndIf
 	If PointState[7] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[7] = "/point_active.png"
 	EndIf
 	If PointState[8] = 1 Then
 		Var PointCount = PointCount + 1
+		Var taobinImgPoint[8] = "/point_active.png"
 	EndIf
 
 	If newPointIndex = "" Then
@@ -670,7 +664,7 @@
 	Var PointState[7] = 1
 	Var PointState[8] = 1
 
-	Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_bad_valentine_3.xml"
+	Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml"
 </EventUnitTest3>
 
 <EventUnitTest4>
@@ -679,7 +673,7 @@
 	Else
 		Var show_eng = "true"
 	EndIf
-	Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_bad_valentine_3.xml"
+	Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml"
 </EventUnitTest4>
 
 

xml/event/tricker.ev

@@ -128,7 +128,8 @@ EndIf
 
 
 If BoxID = 173149 Then
-	Var ProPeachEnable = 1
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
 	Var NewFlowPaymentCode = 1
 EndIf
 
@@ -152,6 +153,34 @@ If BoxID = 172644 Then
 EndIf
 
 
+; Exclusive Box
+
+If BoxID = 174200 Then
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
+EndIf
+
+If BoxID = 175038 Then
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
+EndIf
+
+If BoxID = 174825 Then
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
+EndIf
+
+If BoxID = 200443 Then
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
+EndIf
+
+If BoxID = 173433 Then
+	Var ProPeachEnable = 0
+	Var ProBadValentineEnable = 1
+EndIf
+
+
 
 Var GameEnableFromTrickerEv = 1
 

xml/page_brewing3.xml

@@ -223,6 +223,12 @@
 		EndIf
 	EndIf
 
+	If ProBadValentineEnable = 1 Then
+		If FromBadValentinePro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
 		Var TelephoneNumberProblem = TelephoneNumberGOTFree

xml/page_brewing3Conti.xml

@@ -134,6 +134,12 @@
 		EndIf
 	EndIf
 
+	If ProBadValentineEnable = 1 Then
+		If FromBadValentinePro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
 	If LedLidBlink = "true" Then
 		Var LedLidBlink = "no"
 		LED LedDoorLid Blink 255 255 255 255