diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 654f73626f..6b948877ee 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -1600,7 +1600,7 @@ STR_1594 :{SMALLFONT}{OPENQUOTES}This wonton soup from {STRINGID} is really g STR_1595 :{SMALLFONT}{OPENQUOTES}This meatball soup from {STRINGID} is really good value{ENDQUOTES} STR_1596 :{SMALLFONT}{OPENQUOTES}This fruit juice from {STRINGID} is really good value{ENDQUOTES} STR_1597 :{SMALLFONT}{OPENQUOTES}This soybean milk from {STRINGID} is really good value{ENDQUOTES} -STR_1598 :{SMALLFONT}{OPENQUOTES}This sujongkwa from {STRINGID} is really good value{ENDQUOTES} +STR_1598 :{SMALLFONT}{OPENQUOTES}This sujeonggwa from {STRINGID} is really good value{ENDQUOTES} STR_1599 :{SMALLFONT}{OPENQUOTES}This sub sandwich from {STRINGID} is really good value{ENDQUOTES} STR_1600 :{SMALLFONT}{OPENQUOTES}This cookie from {STRINGID} is really good value{ENDQUOTES} STR_1601 : @@ -1632,7 +1632,7 @@ STR_1626 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for wonton soup fro STR_1627 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for meatball soup from {STRINGID}{ENDQUOTES} STR_1628 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for fruit juice from {STRINGID}{ENDQUOTES} STR_1629 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for soybean milk from {STRINGID}{ENDQUOTES} -STR_1630 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for sujongkwa from {STRINGID}{ENDQUOTES} +STR_1630 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for sujeonggwa from {STRINGID}{ENDQUOTES} STR_1631 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for a sub sandwich from {STRINGID}{ENDQUOTES} STR_1632 :{SMALLFONT}{OPENQUOTES}I'm not paying that much for a cookie from {STRINGID}{ENDQUOTES} STR_1633 : @@ -2118,7 +2118,7 @@ STR_2110 :{WINDOW_COLOUR_2}Wonton Soup price: STR_2111 :{WINDOW_COLOUR_2}Meatball Soup price: STR_2112 :{WINDOW_COLOUR_2}Fruit Juice price: STR_2113 :{WINDOW_COLOUR_2}Soybean Milk price: -STR_2114 :{WINDOW_COLOUR_2}Sujongkwa price: +STR_2114 :{WINDOW_COLOUR_2}Sujeonggwa price: STR_2115 :{WINDOW_COLOUR_2}Sub Sandwich price: STR_2116 :{WINDOW_COLOUR_2}Cookie price: STR_2117 :{WINDOW_COLOUR_2} @@ -2140,7 +2140,7 @@ STR_2132 :Wonton Soup STR_2133 :Meatball Soup STR_2134 :Fruit Juice STR_2135 :Soybean Milk -STR_2136 :Sujongkwa +STR_2136 :Sujeonggwa STR_2137 :Sub Sandwich STR_2138 :Cookie STR_2139 :Empty Bowl @@ -2162,7 +2162,7 @@ STR_2154 :Wonton Soups STR_2155 :Meatball Soups STR_2156 :Fruit Juices STR_2157 :Soybean Milks -STR_2158 :Sujongkwa +STR_2158 :Sujeonggwa STR_2159 :Sub Sandwiches STR_2160 :Cookies STR_2161 :Empty Bowls @@ -2184,7 +2184,7 @@ STR_2176 :some Wonton Soup STR_2177 :some Meatball Soup STR_2178 :a Fruit Juice STR_2179 :some Soybean Milk -STR_2180 :some Sujongkwa +STR_2180 :some Sujeonggwa STR_2181 :a Sub Sandwich STR_2182 :a Cookie STR_2183 :an Empty Bowl @@ -2206,7 +2206,7 @@ STR_2198 :Wonton Soup STR_2199 :Meatball Soup STR_2200 :Fruit Juice STR_2201 :Soybean Milk -STR_2202 :Sujongkwa +STR_2202 :Sujeonggwa STR_2203 :Sub Sandwich STR_2204 :Cookie STR_2205 :Empty Bowl @@ -5137,6 +5137,11 @@ STR_NAME :Six-seater Twister Trains [SUBMAR] STR_NAME :Submarines +# Spelling +[CINDR] +STR_NAME :Sujeonggwa Stall +STR_DESC :A stall selling Korean style Sujeonggwa drinks + #WW [CONDORRD] STR_NAME :Condor Trains diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index adec33615c..74754f69a7 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -1054,7 +1054,8 @@ uint8 RideObject::ParseShopItem(const std::string &s) { "iced_tea", SHOP_ITEM_ICED_TEA }, { "fruit_juice", SHOP_ITEM_FRUIT_JUICE }, { "soybean_milk", SHOP_ITEM_SOYBEAN_MILK }, - { "su_jongkwa", SHOP_ITEM_SU_JONGKWA }, + { "su_jongkwa", SHOP_ITEM_SUJEONGGWA }, + { "sujeonggwa", SHOP_ITEM_SUJEONGGWA }, { "balloon", SHOP_ITEM_BALLOON }, { "toy", SHOP_ITEM_TOY }, { "map", SHOP_ITEM_MAP }, diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 6a207abfe9..69ffcf3c0b 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -850,7 +850,7 @@ static constexpr const uint8 byte_9822F4[] = { 110, // SHOP_ITEM_MEATBALL_SOUP 110, // SHOP_ITEM_FRUIT_JUICE 90, // SHOP_ITEM_SOYBEAN_MILK - 100, // SHOP_ITEM_SU_JONGKWA + 100, // SHOP_ITEM_SUJEONGGWA 130, // SHOP_ITEM_SUB_SANDWICH 75, // SHOP_ITEM_COOKIE 0, // SHOP_ITEM_EMPTY_BOWL_RED diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index c8314f89b3..4bae2ed945 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -7709,7 +7709,7 @@ bool shop_item_is_food_or_drink(sint32 shopItem) case SHOP_ITEM_MEATBALL_SOUP: case SHOP_ITEM_FRUIT_JUICE: case SHOP_ITEM_SOYBEAN_MILK: - case SHOP_ITEM_SU_JONGKWA: + case SHOP_ITEM_SUJEONGGWA: case SHOP_ITEM_SUB_SANDWICH: case SHOP_ITEM_COOKIE: case SHOP_ITEM_ROAST_SAUSAGE: @@ -7758,7 +7758,7 @@ bool shop_item_is_drink(sint32 shopItem) case SHOP_ITEM_ICED_TEA: case SHOP_ITEM_FRUIT_JUICE: case SHOP_ITEM_SOYBEAN_MILK: - case SHOP_ITEM_SU_JONGKWA: + case SHOP_ITEM_SUJEONGGWA: return true; default: return false; diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index a112fd6cf6..c8da9c85f0 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -857,7 +857,7 @@ enum { SHOP_ITEM_MEATBALL_SOUP, SHOP_ITEM_FRUIT_JUICE, SHOP_ITEM_SOYBEAN_MILK, - SHOP_ITEM_SU_JONGKWA, + SHOP_ITEM_SUJEONGGWA, SHOP_ITEM_SUB_SANDWICH, SHOP_ITEM_COOKIE, SHOP_ITEM_EMPTY_BOWL_RED, diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index ae67d56a62..5625ffb4da 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -1460,7 +1460,7 @@ const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT] = { MONEY(1,50), // SHOP_ITEM_MEATBALL_SOUP MONEY(1,20), // SHOP_ITEM_FRUIT_JUICE MONEY(1,20), // SHOP_ITEM_SOYBEAN_MILK - MONEY(1,20), // SHOP_ITEM_SU_JONGKWA + MONEY(1,20), // SHOP_ITEM_SUJEONGGWA MONEY(1,50), // SHOP_ITEM_SUB_SANDWICH MONEY(0,70), // SHOP_ITEM_COOKIE MONEY(0,00), // SHOP_ITEM_EMPTY_BOWL_RED @@ -1576,7 +1576,7 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = { SPR_SHOP_ITEM_MEATBALL_SOUP, SPR_SHOP_ITEM_FRUIT_JUICE, SPR_SHOP_ITEM_SOYBEAN_MILK, - SPR_SHOP_ITEM_SU_JONGKWA, + SPR_SHOP_ITEM_SUJEONGGWA, SPR_SHOP_ITEM_SUB_SANDWICH, SPR_SHOP_ITEM_COOKIE, SPR_SHOP_ITEM_EMPTY_BOWL_RED, @@ -2482,7 +2482,7 @@ const rct_shop_item_stats ShopItemStats[SHOP_ITEM_COUNT] = { { 5, 14, 14, 16 }, // SHOP_ITEM_MEATBALL_SOUP { 4, 11, 19, 11 }, // SHOP_ITEM_FRUIT_JUICE { 4, 10, 14, 10 }, // SHOP_ITEM_SOYBEAN_MILK - { 3, 11, 14, 11 }, // SHOP_ITEM_SU_JONGKWA + { 3, 11, 14, 11 }, // SHOP_ITEM_SUJEONGGWA { 5, 19, 19, 17 }, // SHOP_ITEM_SUB_SANDWICH { 4, 8, 8, 8 }, // SHOP_ITEM_COOKIE { 0, 0, 0, 0 }, // SHOP_ITEM_EMPTY_BOWL_RED diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index f681a87f4e..b843134406 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -101,7 +101,7 @@ enum { SPR_SHOP_ITEM_MEATBALL_SOUP = 5100, SPR_SHOP_ITEM_FRUIT_JUICE = 5101, SPR_SHOP_ITEM_SOYBEAN_MILK = 5102, - SPR_SHOP_ITEM_SU_JONGKWA = 5103, + SPR_SHOP_ITEM_SUJEONGGWA = 5103, SPR_SHOP_ITEM_SUB_SANDWICH = 5104, SPR_SHOP_ITEM_COOKIE = 5105, SPR_SHOP_ITEM_EMPTY_BOWL_RED = 5106,