diff --git a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png index 7ebcc26b..471844c0 100644 Binary files a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png and b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png differ diff --git a/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png b/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png index 45863688..e2d5f9bd 100644 Binary files a/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png and b/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png b/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png index f7f62f23..74a1c88d 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png and b/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png b/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png index 8217f357..da22634e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png and b/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png b/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png index d5e91cd9..a8e04112 100644 Binary files a/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png and b/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png b/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png index 5bfdb31f..78a63017 100644 Binary files a/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png and b/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png b/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png index 3465b942..74c56574 100644 Binary files a/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png and b/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png b/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png index 70aea03a..6904d760 100644 Binary files a/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png and b/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png index 921689f0..7c01540f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png and b/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png differ diff --git a/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png b/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png index 09c461ff..cd0066a3 100644 Binary files a/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png and b/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png differ diff --git a/image/page_drink_n/bn_Choco_straw_banana_smoothie.png b/image/page_drink_n/bn_Choco_straw_banana_smoothie.png index b4497d92..93c76d1b 100644 Binary files a/image/page_drink_n/bn_Choco_straw_banana_smoothie.png and b/image/page_drink_n/bn_Choco_straw_banana_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png b/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png index d397e9b5..4b4c17b6 100644 Binary files a/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png and b/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png differ diff --git a/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png b/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png index a9316751..3d4a147a 100644 Binary files a/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png and b/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png b/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png index f788e6d6..3c7e6c29 100644 Binary files a/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png and b/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png differ diff --git a/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png b/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png index 31901cd9..ceffd03e 100644 Binary files a/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png and b/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png differ diff --git a/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png b/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png index a1c9dbc9..7b79f26d 100644 Binary files a/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png and b/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png differ diff --git a/image/page_drink_n/bn_iced_matcha_TokyoBanana.png b/image/page_drink_n/bn_iced_matcha_TokyoBanana.png index 6ae5e3f6..0c45d071 100644 Binary files a/image/page_drink_n/bn_iced_matcha_TokyoBanana.png and b/image/page_drink_n/bn_iced_matcha_TokyoBanana.png differ diff --git a/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png b/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png index b826fcff..7e8b5357 100644 Binary files a/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png and b/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png differ diff --git a/image/page_drink_press_n/bn_BananaOreo_smoothie_bad_valentine.png b/image/page_drink_press_n/bn_BananaOreo_smoothie_bad_valentine.png index 4b752cac..4180e0fa 100644 Binary files a/image/page_drink_press_n/bn_BananaOreo_smoothie_bad_valentine.png and b/image/page_drink_press_n/bn_BananaOreo_smoothie_bad_valentine.png differ diff --git a/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png b/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png index f73693b6..8d21587e 100644 Binary files a/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png and b/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_Ginger_TokyoBanana.png b/image/page_drink_press_n/bn_iced_Ginger_TokyoBanana.png index 78448925..d1163358 100644 Binary files a/image/page_drink_press_n/bn_iced_Ginger_TokyoBanana.png and b/image/page_drink_press_n/bn_iced_Ginger_TokyoBanana.png differ diff --git a/image/page_drink_press_n/bn_iced_Mocha_Tokyobanana_smoothie.png b/image/page_drink_press_n/bn_iced_Mocha_Tokyobanana_smoothie.png index 56ccc5b8..99976454 100644 Binary files a/image/page_drink_press_n/bn_iced_Mocha_Tokyobanana_smoothie.png and b/image/page_drink_press_n/bn_iced_Mocha_Tokyobanana_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_ThaiTea_TokyoBanana.png b/image/page_drink_press_n/bn_iced_ThaiTea_TokyoBanana.png index eb5fbe06..9cf34a7e 100644 Binary files a/image/page_drink_press_n/bn_iced_ThaiTea_TokyoBanana.png and b/image/page_drink_press_n/bn_iced_ThaiTea_TokyoBanana.png differ diff --git a/image/page_drink_press_n/bn_iced_energy_drink_Banana_soda.png b/image/page_drink_press_n/bn_iced_energy_drink_Banana_soda.png index 5c97a60e..9d594976 100644 Binary files a/image/page_drink_press_n/bn_iced_energy_drink_Banana_soda.png and b/image/page_drink_press_n/bn_iced_energy_drink_Banana_soda.png differ diff --git a/image/page_drink_press_n/bn_iced_matcha_Latte_TokyoBanana.png b/image/page_drink_press_n/bn_iced_matcha_Latte_TokyoBanana.png index 054337bf..db6bc131 100644 Binary files a/image/page_drink_press_n/bn_iced_matcha_Latte_TokyoBanana.png and b/image/page_drink_press_n/bn_iced_matcha_Latte_TokyoBanana.png differ diff --git a/image/page_drink_press_n/bn_iced_matcha_TokyoBanana.png b/image/page_drink_press_n/bn_iced_matcha_TokyoBanana.png index e0d7136f..3d751a62 100644 Binary files a/image/page_drink_press_n/bn_iced_matcha_TokyoBanana.png and b/image/page_drink_press_n/bn_iced_matcha_TokyoBanana.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberry_Tokyobanana_smoothie.png b/image/page_drink_press_n/bn_iced_strawberry_Tokyobanana_smoothie.png index a09853b4..48b7830b 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberry_Tokyobanana_smoothie.png and b/image/page_drink_press_n/bn_iced_strawberry_Tokyobanana_smoothie.png differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index c8c92978..d53d2e0e 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -110,6 +110,7 @@ if current_file_name == "page_catalog_group_pro_bad_valentine.skt": from_bad_valentine = True + # menu_white_color_catalog = True else: from_bad_valentine = False diff --git a/xml/page_catalog_group_pro_bad_valentine.xml b/xml/page_catalog_group_pro_bad_valentine.xml index 198a2605..ede18d55 100644 --- a/xml/page_catalog_group_pro_bad_valentine.xml +++ b/xml/page_catalog_group_pro_bad_valentine.xml @@ -557,8 +557,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Bad kid got smacked, good ones get ditched." - Var NameDrinkTH = "เป็นเด็กดื้อโดนตี เป็นเด็กดีโดนทิ้งตลอด" + Var NameDrink = "Bad kids smacked good ones ditched" + Var NameDrinkTH = "เป็นเด็กดื้อโดนตีเป็น เด็กดีโดนทิ้งตลอด" Var DrinkDescriptionTH = "กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย" Var DrinkDescription = "Espresso, Banana Syrup, cocoa, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Mocha_Tokyobanana_smoothie.png" @@ -632,8 +632,8 @@ KanitMediumTTF 0x322B26 showthaiText - "เป็นเด็กดื้อโดนตี -เป็นเด็กดีโดนทิ้งตลอด" + "เป็นเด็กดื้อโดนตีเป็น +เด็กดีโดนทิ้งตลอด" 16 @@ -654,8 +654,8 @@ KanitMediumTTF 0x322B26 showengText - "Bad kid got smacked, -good ones get ditched." + "Bad kids smacked +good ones ditched" 16 @@ -810,8 +810,8 @@ cocoa, Milk" SoundVolume xmlpro( 12-21-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") - Var NameDrink = "Bad kid got smacked, good ones get ditched." - Var NameDrinkTH = "เป็นเด็กดื้อโดนตี เป็นเด็กดีโดนทิ้งตลอด" + Var NameDrink = "Bad kids smacked good ones ditched" + Var NameDrinkTH = "เป็นเด็กดื้อโดนตีเป็น เด็กดีโดนทิ้งตลอด" Var DrinkDescriptionTH = "กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย" Var DrinkDescription = "Espresso, Banana Syrup, cocoa, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Mocha_Tokyobanana_smoothie.png" @@ -885,8 +885,8 @@ cocoa, Milk" KanitMediumTTF 0x322B26 showthaiText - "เป็นเด็กดื้อโดนตี -เป็นเด็กดีโดนทิ้งตลอด" + "เป็นเด็กดื้อโดนตีเป็น +เด็กดีโดนทิ้งตลอด" 16 @@ -907,8 +907,8 @@ cocoa, Milk" KanitMediumTTF 0x322B26 showengText - "Bad kid got smacked, -good ones get ditched." + "Bad kids smacked +good ones ditched" 16 @@ -1064,8 +1064,8 @@ cocoa, Milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Ghosted, sending a night means the convo's dead." - Var NameDrinkTH = "ตัดบทบอกฝันดี = เขา ไม่อยากคุย" + Var NameDrink = "Ghosted after night convo's dead" + Var NameDrinkTH = "ตัดบทบอกฝันดี = เขาไม่อยากคุย" Var DrinkDescriptionTH = "กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย" Var DrinkDescription = "Espresso, Banana Syrup, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_matcha_Latte_TokyoBanana.png" @@ -1139,8 +1139,8 @@ cocoa, Milk" KanitMediumTTF 0x322B26 showthaiText - "ตัดบทบอกฝันดี = เขา -ไม่อยากคุย" + "ตัดบทบอกฝันดี += เขาไม่อยากคุย" 16 @@ -1161,8 +1161,8 @@ cocoa, Milk" KanitMediumTTF 0x322B26 showengText - "Ghosted, sending a -night means the convo's dead." + "Ghosted after night +convo's dead" 16 @@ -1317,8 +1317,8 @@ Matcha, Milk" SoundVolume xmlpro( 12-21-02-0062, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") - Var NameDrink = "Ghosted, sending a night means the convo's dead." - Var NameDrinkTH = "ตัดบทบอกฝันดี = เขา ไม่อยากคุย" + Var NameDrink = "Ghosted after night convo's dead" + Var NameDrinkTH = "ตัดบทบอกฝันดี = เขาไม่อยากคุย" Var DrinkDescriptionTH = "กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย" Var DrinkDescription = "Espresso, Banana Syrup, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_matcha_Latte_TokyoBanana.png" @@ -1392,8 +1392,8 @@ Matcha, Milk" KanitMediumTTF 0x322B26 showthaiText - "ตัดบทบอกฝันดี = เขา -ไม่อยากคุย" + "ตัดบทบอกฝันดี += เขาไม่อยากคุย" 16 @@ -1414,8 +1414,8 @@ Matcha, Milk" KanitMediumTTF 0x322B26 showengText - "Ghosted, sending a -night means the convo's dead." + "Ghosted after night +convo's dead" 16 @@ -1571,7 +1571,7 @@ Matcha, Milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "He's the kindness fix, zero romance drama." + Var NameDrink = "Kindness fix, zero romance drama." Var NameDrinkTH = "ที่ทำดีด้วยเขาไม่ได้มีใจ แต่เขามีเมตตา" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ นม และโกโก้" Var DrinkDescription = "banana syrup, Strawberry syrup, Milk, cocoa" @@ -1668,7 +1668,7 @@ Matcha, Milk" KanitMediumTTF 0x322B26 showengText - "He's the kindness fix, + "Kindness fix, zero romance drama." @@ -1826,7 +1826,7 @@ Milk, cocoa" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Love's on mute, stuck in suspense." + Var NameDrink = "Love on mute, stuck in suspense." Var NameDrinkTH = "ตกอยู่ในสถานะ สแตนด์บาย" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ และนม " Var DrinkDescription = "banana syrup, Strawberry syrup, Milk" @@ -1923,7 +1923,7 @@ Milk, cocoa" KanitMediumTTF 0x322B26 showengText - "Love's on mute, + "Love on mute, stuck in suspense." @@ -2081,7 +2081,7 @@ Milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Promised a chat, but poof, gone once you say "hey."" + Var NameDrink = "Promised a chat, but poof,gone after HEY." Var NameDrinkTH = "บอกว่าคุยได้ พอทักไปก็หาย" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo" @@ -2178,8 +2178,8 @@ Milk" KanitMediumTTF 0x322B26 showengText - "Promised a chat, but poof, -gone once you say "hey."" + "Promised a chat, but +poof,gone after HEY." 16 @@ -2590,7 +2590,7 @@ rest bail on you." "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Love deep, broke hard, that's the real deal." + Var NameDrink = "Love deep, broke hard–the real deal." Var NameDrinkTH = "รักหมดใจ เจ็บหมดตัวมีอยู่จริง" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย ชาไทย นม และน้ำแข็ง" Var DrinkDescription = "Banana Syrup, Thai tea, milk and Ice" @@ -2687,8 +2687,8 @@ rest bail on you." KanitMediumTTF 0x322B26 showengText - "Love deep, broke hard, -that's the real deal." + "Love deep, broke +hard–the real deal." 16 @@ -2844,7 +2844,7 @@ that's the real deal." "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Forget love before winning, fine, we'll take the L." + Var NameDrink = "Forget love, take the L" Var NameDrinkTH = "คนลืมก่อนชนะ โอเคเราแพ้" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย มัทฉะ และน้ำแข็ง" Var DrinkDescription = "Banana Syrup, Matcha and Ice" @@ -2941,8 +2941,8 @@ that's the real deal." KanitMediumTTF 0x322B26 showengText - "Forget love before winning, -fine, we'll take the L." + "Forget love, take +the L" 16 @@ -3098,8 +3098,8 @@ fine, we'll take the L." "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Chatting's our sport, gold in the "No Reply" event." - Var NameDrinkTH = "ถ้าแชทหนักขวาเป็นกีฬา เราคงได้เหรียญทองไปแล้ว" + Var NameDrink = "Chat's our sport, gold in NO REPLY" + Var NameDrinkTH = "แชมป์โอลิมปิก สาขาชวนคุย" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย เต่าทรงพลัง (มีคาเฟอีน) " Var DrinkDescription = "Banana Syrup, Medicine drink, Soda and Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_Banana_soda.png" @@ -3173,8 +3173,8 @@ fine, we'll take the L." KanitMediumTTF 0x322B26 showthaiText - "ถ้าแชทหนักขวาเป็นกีฬา -เราคงได้เหรียญทองไปแล้ว" + "แชมป์โอลิมปิก +สาขาชวนคุย" 16 @@ -3196,8 +3196,8 @@ fine, we'll take the L." KanitMediumTTF 0x322B26 showengText - "Chatting's our sport, gold in -the "No Reply" event." + "Chat's our sport, +gold in NO REPLY" 16