diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 2c2b1d1a..ce96f9b8 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -370,23 +370,23 @@ Name=Momday,file=page_catalog_momday.skt
Name=CockTail,file=page_catalog_group_cocktail.skt
- ILYSB ILYSB Pineapple juice, Limeade, \nSoda, Ice, Malibu Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - - #N/A - #N/A #N/A
- Minty Madness Minty Madness Mint syrup, Limeade, Ice, Rum Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - - #N/A - #N/A #N/A
- Behind Bars Behind Bars Strawberry syrup, Limeade, \nSoda, Malibu Strawberry syrup, Limeade, \nSoda, Malibu - 11-99-05-0003 - bn_Alcohol_Third_Behind_Bars.png - - - - #N/A - #N/A #N/A
- Pinky Promise Pinky Promise Lychee, Limeade, Soda, Rum Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0004 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
- Love Potion Love Potion Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum - 11-99-05-0005 - bn_Alcohol_Love_Potion.png - - - - #N/A - #N/A #N/A
- Bedroom Story Bedroom Story Coffee, Milk Ice, Rum Coffee, Milk Ice, Rum - 11-99-05-0006 - bn_Alcohol_Bedroom_Story.png - - - - #N/A - #N/A #N/A
- Oriental Kink Oriental Kink Melon, Rum Melon, Rum - 11-99-05-0007 - bn_Alcohol_Oriental_Kink.png - - - - #N/A - #N/A #N/A
- Long Night Long Night Strawberry syrup, Pineaple \njuice Ice, Malibu Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A
- Good Night Kiss Good Night Kiss Black sugar syrup, Milk, Ice, \nMount Gay Rum Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A
- Forever Love Forever Love Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A
- Blue lable, soda Blue lable, soda Blue lable, soda Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A
- Blue lable, water Blue lable, water Blue lable, water Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A
- Gold lable, soda Gold lable, soda Gold lable, soda Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - -
- Gold lable, water Gold lable, water Gold lable, water Gold lable, water - 11-99-05-0018 - bn_iced_gold.png - - -
- Black lable, soda Black lable, soda Black lable, soda Black lable, soda - 11-99-05-0016 - bn_iced_soda_black.png - - - - #N/A - #N/A #N/A
- Black lable, water Black lable, water Black lable, water Black lable, water - 11-99-05-0014 - bn_iced_black.png - - - - #N/A - #N/A #N/A
- Pinky Promise Pinky Promise Lychee, Limeade, Soda, Rum Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0015 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
+ STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - - #N/A - #N/A #N/A
+ Noxious Nitrous Mint syrup, Limeade, Ice, Rum Noxious Nitrous Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - - #N/A - #N/A #N/A
+ Sea Level RISE Strawberry syrup, Limeade, \nSoda, Malibu Sea Level RISE Strawberry syrup, Limeade, \nSoda, Malibu - 11-99-05-0003 - bn_Alcohol_Third_Behind_Bars.png - - - - #N/A - #N/A #N/A
+ Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0004 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
+ Carbon Bonds Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum My Carbon Footprint Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum - 11-99-05-0005 - bn_Alcohol_Love_Potion.png - - - - #N/A - #N/A #N/A
+ Fossil Fuel Coffee, Milk Ice, Rum Fossil Fuel Coffee, Milk Ice, Rum - 11-99-05-0006 - bn_Alcohol_Bedroom_Story.png - - - - #N/A - #N/A #N/A
+ Stinky Sulphur Melon, Rum Stinky Sulphur Melon, Rum - 11-99-05-0007 - bn_Alcohol_Oriental_Kink.png - - - - #N/A - #N/A #N/A
+ Net Zero Strawberry syrup, Pineaple \njuice Ice, Malibu Biofuel Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A
+ Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A
+ Big Kid Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Bangkok Underwater Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A
+ Blue lable, soda Blue lable, soda Druzhba Pipe Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A
+ Blue lable, water Blue lable, water 2050 Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A
+ Gold lable, soda Gold lable, soda Petrol Fumes Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - -
+ Gold lable, water Gold lable, water Big Kid Gold lable, water - 11-99-05-0018 - bn_iced_gold.png - - -
+ Black lable, soda Black lable, soda Tailpipe Emissions Black lable, soda - 11-99-05-0016 - bn_iced_soda_black.png - - - - #N/A - #N/A #N/A
+ Black lable, water Black lable, water Greenwash Black lable, water - 11-99-05-0014 - bn_iced_black.png - - - - #N/A - #N/A #N/A
+ Pinky Promise Pinky Promise Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0015 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
Name=Obsolete,file=page_obsolete.skt
diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index f319238d..363e3268 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -141,13 +141,7 @@ If BoxID = 200580 Then
EndIf
-If SystemDateMonthInt = 9 Then
- If SystemDateDayInt > 15 Then
-
- Var MayDayRunEnable = 0
- EndIf
-EndIf
-
+Var MayDayRunEnable = 0
If BoxID = 33170 Then
Var PepsiProEnable = 0
diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml
index 9ac1ef54..14753681 100644
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@@ -556,9 +556,9 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "ILYSB"
- Var NameDrinkTH = "ILYSB"
- Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Malibu"
+ Var NameDrink = "Pineapple juice, Limeade, Soda, Ice, Malibu"
+ Var NameDrinkTH = "STX On The Beach"
+ Var DrinkDescriptionTH = "STX On The Beach"
Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_ILYSB.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -628,7 +628,7 @@
KanitMediumTTF
0x322B26
showthaiText
- "ILYSB"
+ "STX On The Beach"
16
@@ -638,8 +638,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "Pineapple juice, Limeade,
-Soda, Ice, Malibu"
+ "STX On The Beach"
16
@@ -650,7 +649,8 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "ILYSB"
+ "Pineapple juice, Limeade,
+Soda, Ice, Malibu"
16
@@ -806,9 +806,9 @@ Soda, Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Minty Madness"
- Var NameDrinkTH = "Minty Madness"
- Var DrinkDescriptionTH = "Mint syrup, Limeade, Ice, Rum"
+ Var NameDrink = "Mint syrup, Limeade, Ice, Rum"
+ Var NameDrinkTH = "Noxious Nitrous"
+ Var DrinkDescriptionTH = "Noxious Nitrous"
Var DrinkDescription = "Mint syrup, Limeade, Ice, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Gale_Jail.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -878,7 +878,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showthaiText
- "Minty Madness"
+ "Noxious Nitrous"
16
@@ -888,7 +888,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Mint syrup, Limeade, Ice, Rum"
+ "Noxious Nitrous"
16
@@ -899,7 +899,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Minty Madness"
+ "Mint syrup, Limeade, Ice, Rum"
16
@@ -1054,9 +1054,9 @@ Soda, Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Behind Bars"
- Var NameDrinkTH = "Behind Bars"
- Var DrinkDescriptionTH = "Strawberry syrup, Limeade, Soda, Malibu"
+ Var NameDrink = "Strawberry syrup, Limeade, Soda, Malibu"
+ Var NameDrinkTH = "Sea Level RISE"
+ Var DrinkDescriptionTH = "Sea Level RISE"
Var DrinkDescription = "Strawberry syrup, Limeade, Soda, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Third_Behind_Bars.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1126,7 +1126,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showthaiText
- "Behind Bars"
+ "Sea Level RISE"
16
@@ -1136,8 +1136,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Strawberry syrup, Limeade,
-Soda, Malibu"
+ "Sea Level RISE"
16
@@ -1148,7 +1147,8 @@ Soda, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Behind Bars"
+ "Strawberry syrup, Limeade,
+Soda, Malibu"
16
@@ -1304,9 +1304,9 @@ Soda, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Pinky Promise"
- Var NameDrinkTH = "Pinky Promise"
- Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Rum"
+ Var NameDrink = "Lychee, Limeade, Soda, Mount Gay Rum"
+ Var NameDrinkTH = "Methane Bubbles"
+ Var DrinkDescriptionTH = "Methane Bubbles"
Var DrinkDescription = "Lychee, Limeade, Soda, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Pinky_Promise.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1376,7 +1376,7 @@ Soda, Malibu"
KanitMediumTTF
0x322B26
showthaiText
- "Pinky Promise"
+ "Methane Bubbles"
16
@@ -1386,7 +1386,7 @@ Soda, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Lychee, Limeade, Soda, Rum"
+ "Methane Bubbles"
16
@@ -1397,7 +1397,8 @@ Soda, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Pinky Promise"
+ "Lychee, Limeade, Soda,
+Mount Gay Rum"
16
@@ -1553,9 +1554,9 @@ Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Love Potion"
- Var NameDrinkTH = "Love Potion"
- Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
+ Var NameDrink = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
+ Var NameDrinkTH = "Carbon Bonds"
+ Var DrinkDescriptionTH = "My Carbon Footprint"
Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Love_Potion.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1625,7 +1626,7 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Love Potion"
+ "Carbon Bonds"
16
@@ -1635,8 +1636,7 @@ Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Pineapple juice, Limeade,
-Soda, Ice, Mount Gay Rum"
+ "My Carbon Footprint"
16
@@ -1647,7 +1647,8 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Love Potion"
+ "Pineapple juice, Limeade,
+Soda, Ice, Mount Gay Rum"
16
@@ -1803,9 +1804,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Bedroom Story"
- Var NameDrinkTH = "Bedroom Story"
- Var DrinkDescriptionTH = "Coffee, Milk Ice, Rum"
+ Var NameDrink = "Coffee, Milk Ice, Rum"
+ Var NameDrinkTH = "Fossil Fuel"
+ Var DrinkDescriptionTH = "Fossil Fuel"
Var DrinkDescription = "Coffee, Milk Ice, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Bedroom_Story.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1875,7 +1876,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Bedroom Story"
+ "Fossil Fuel"
16
@@ -1885,7 +1886,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Coffee, Milk Ice, Rum"
+ "Fossil Fuel"
16
@@ -1896,7 +1897,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Bedroom Story"
+ "Coffee, Milk Ice, Rum"
16
@@ -2051,9 +2052,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Oriental Kink"
- Var NameDrinkTH = "Oriental Kink"
- Var DrinkDescriptionTH = "Melon, Rum"
+ Var NameDrink = "Melon, Rum"
+ Var NameDrinkTH = "Stinky Sulphur"
+ Var DrinkDescriptionTH = "Stinky Sulphur"
Var DrinkDescription = "Melon, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Oriental_Kink.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2123,7 +2124,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Oriental Kink"
+ "Stinky Sulphur"
16
@@ -2133,7 +2134,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Melon, Rum"
+ "Stinky Sulphur"
16
@@ -2144,7 +2145,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Oriental Kink"
+ "Melon, Rum"
16
@@ -2299,9 +2300,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Long Night"
- Var NameDrinkTH = "Long Night"
- Var DrinkDescriptionTH = "Strawberry syrup, Pineaple juice Ice, Malibu"
+ Var NameDrink = "Strawberry syrup, Pineaple juice Ice, Malibu"
+ Var NameDrinkTH = "Net Zero"
+ Var DrinkDescriptionTH = "Biofuel"
Var DrinkDescription = "Strawberry syrup, Pineaple juice Ice, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Long_Night.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2371,7 +2372,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Long Night"
+ "Net Zero"
16
@@ -2381,8 +2382,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Strawberry syrup, Pineaple
-juice Ice, Malibu"
+ "Biofuel"
16
@@ -2393,7 +2393,8 @@ juice Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Long Night"
+ "Strawberry syrup, Pineaple
+juice Ice, Malibu"
16
@@ -2549,9 +2550,9 @@ juice Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Good Night Kiss"
- Var NameDrinkTH = "Good Night Kiss"
- Var DrinkDescriptionTH = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
+ Var NameDrink = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
+ Var NameDrinkTH = "Coal Story Bro"
+ Var DrinkDescriptionTH = "Coal Story Bro"
Var DrinkDescription = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Good_Night_Kiss.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2621,7 +2622,7 @@ juice Ice, Malibu"
KanitMediumTTF
0x322B26
showthaiText
- "Good Night Kiss"
+ "Coal Story Bro"
16
@@ -2631,8 +2632,7 @@ juice Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Black sugar syrup, Milk, Ice,
-Mount Gay Rum"
+ "Coal Story Bro"
16
@@ -2643,7 +2643,8 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Good Night Kiss"
+ "Black sugar syrup, Milk, Ice,
+Mount Gay Rum"
16
@@ -2799,9 +2800,9 @@ Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Forever Love"
- Var NameDrinkTH = "Forever Love"
- Var DrinkDescriptionTH = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
+ Var NameDrink = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
+ Var NameDrinkTH = "Big Kid"
+ Var DrinkDescriptionTH = "Bangkok Underwater"
Var DrinkDescription = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Forever_Love.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2871,7 +2872,7 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Forever Love"
+ "Big Kid"
16
@@ -2881,8 +2882,7 @@ Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Lychee juice, Pineaple juice,
-Ice, Mount Gay Rum"
+ "Bangkok Underwater"
16
@@ -2893,7 +2893,8 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Forever Love"
+ "Lychee juice, Pineaple juice,
+Ice, Mount Gay Rum"
16
@@ -3051,7 +3052,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Blue lable, soda"
Var NameDrinkTH = "Blue lable, soda"
- Var DrinkDescriptionTH = "Blue lable, soda"
+ Var DrinkDescriptionTH = "Druzhba Pipe"
Var DrinkDescription = "Blue lable, soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda_blue.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3131,7 +3132,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Blue lable, soda"
+ "Druzhba Pipe"
16
@@ -3299,7 +3300,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Blue lable, water"
Var NameDrinkTH = "Blue lable, water"
- Var DrinkDescriptionTH = "Blue lable, water"
+ Var DrinkDescriptionTH = "2050"
Var DrinkDescription = "Blue lable, water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_blue.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3379,7 +3380,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Blue lable, water"
+ "2050"
16
@@ -3547,7 +3548,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Gold lable, soda"
Var NameDrinkTH = "Gold lable, soda"
- Var DrinkDescriptionTH = "Gold lable, soda"
+ Var DrinkDescriptionTH = "Petrol Fumes"
Var DrinkDescription = "Gold lable, soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda_gold.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3627,7 +3628,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Gold lable, soda"
+ "Petrol Fumes"
16
@@ -3795,7 +3796,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Gold lable, water"
Var NameDrinkTH = "Gold lable, water"
- Var DrinkDescriptionTH = "Gold lable, water"
+ Var DrinkDescriptionTH = "Big Kid"
Var DrinkDescription = "Gold lable, water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_gold.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3875,7 +3876,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Gold lable, water"
+ "Big Kid"
16
@@ -4043,7 +4044,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Black lable, soda"
Var NameDrinkTH = "Black lable, soda"
- Var DrinkDescriptionTH = "Black lable, soda"
+ Var DrinkDescriptionTH = "Tailpipe Emissions"
Var DrinkDescription = "Black lable, soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda_black.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -4123,7 +4124,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Black lable, soda"
+ "Tailpipe Emissions"
16
@@ -4291,7 +4292,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Black lable, water"
Var NameDrinkTH = "Black lable, water"
- Var DrinkDescriptionTH = "Black lable, water"
+ Var DrinkDescriptionTH = "Greenwash"
Var DrinkDescription = "Black lable, water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_black.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -4371,7 +4372,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Black lable, water"
+ "Greenwash"
16
@@ -4539,7 +4540,7 @@ Ice, Mount Gay Rum"
Var NameDrink = "Pinky Promise"
Var NameDrinkTH = "Pinky Promise"
- Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Rum"
+ Var DrinkDescriptionTH = "Methane Bubbles"
Var DrinkDescription = "Lychee, Limeade, Soda, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Pinky_Promise.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -4619,7 +4620,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Lychee, Limeade, Soda, Rum"
+ "Methane Bubbles"
16
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 19632ecc..716c3b63 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.65"
- Var XMLPageVersionInt = 765
+ Var XMLPageVersion = "7.66"
+ Var XMLPageVersionInt = 766
;Oreo
Var OreoGuarantee = 0