Finish new shop command

Author: Iapetus-11

common/data.json

@@ -1708,161 +1708,161 @@
     }
   },
   "emoji_items": {
-    "Netherite Scrap": "netherite",
-    "Slime Ball": "slimeball",
-    "Heart Of The Sea": "heart_of_the_sea",
-    "Cod": "fish.cod",
-    "Salmon": "fish.salmon",
-    "Tropical Fish": "fish.tropical_fish",
-    "Pufferfish": "fish.pufferfish",
-    "Rainbow Trout": "fish.rainbow_trout",
-    "Gold Fish": "fish.gold_fish",
-    "Emerald Fish": "fish.emerald_fish",
-    "Mooderald": "autistic_emerald",
-    "Fortune I Book": "enchanted_book",
-    "Fortune II Book": "enchanted_book",
-    "Fortune III Book": "enchanted_book",
-    "Efficiency I Book": "enchanted_book",
-    "Looting I Book": "enchanted_book",
-    "Looting II Book": "enchanted_book",
-    "Sharpness I Book": "enchanted_book",
-    "Sharpness II Book": "enchanted_book",
-    "Lure I Book": "enchanted_book",
-    "Present": "present",
-    "Haste I Potion": "haste_i_potion",
-    "Haste II Potion": "haste_ii_potion",
-    "Vault Potion": "glass_bottle",
-    "Luck Potion": "luck_potion",
-    "Wood Sword": "wood_sword",
-    "Stone Sword": "stone_sword",
-    "Iron Sword": "iron_sword",
-    "Gold Sword": "gold_sword",
-    "Diamond Sword": "diamond_sword",
-    "Netherite Sword": "netherite_sword",
-    "Wood Pickaxe": "wood_pick",
-    "Stone Pickaxe": "stone_pick",
-    "Iron Pickaxe": "iron_pick",
-    "Gold Pickaxe": "gold_pick",
-    "Diamond Pickaxe": "diamond_pick",
-    "Netherite Pickaxe": "netherite_pick",
-    "Wood Hoe": "wood_hoe",
-    "Stone Hoe": "stone_hoe",
-    "Iron Hoe": "iron_hoe",
-    "Gold Hoe": "gold_hoe",
-    "Diamond Hoe": "diamond_hoe",
-    "Netherite Hoe": "netherite_hoe",
-    "Fishing Rod": "fishing_rod",
-    "Jar Of Bees": "jar_of_bees",
-    "Honey Jar": "honey_jar",
-    "Emerald Fruit": "farming.normal.emerald_fruit",
-    "Chorus Fruit": "farming.normal.chorus_fruit",
-    "Chorus Seed": "farming.seeds.chorus_fruit",
-    "Melon": "farming.normal.melon",
-    "Melon Seed": "farming.seeds.melon",
-    "Potato": "farming.normal.potato",
-    "Carrot": "farming.normal.carrot",
-    "Wheat": "farming.normal.wheat",
-    "Wheat Seed": "farming.seeds.wheat",
-    "Rusty Fishing Hook": "rusty_fishing_hook",
-    "Minecraft Movie Ticket": "ticket",
-    "Barrel": "barrel",
-    "Moon Rock": "rock",
-    "BFG 3000": "gun",
-    "Alien Mask": "alien",
-    "Pride Flag": "pride_flag",
-    "A Literal Rainbow": "rainbow",
-    "Bone Meal": "bone_meal",
-    "Rainbow Lego Stud": "rainbow_stud",
-    "Morbius": "morbius",
-    "Recycler": "recycle",
-    "Guacamole Sombrero": "guacamole_sombrero",
-    "Dirt Block": "dirt_block",
-    "Forever Alone Trophy": "trophy",
-    "Rich Person Trophy": "rich_person_trophy",
-    "Fishing Trophy": "fishing_trophy",
-    "Slime Trophy": "slime_trophy",
-    "Ender Pearl": "ender_pearl",
-    "Chocolate Chip Cookie": "chocolate_chip_cookie",
-    "Will O Wisp": "will_o_wisp",
-    "Time Pearl": "time_pearl",
-    "Shield Pearl": "shield_pearl",
-    "Turkey Leg": "turkey_leg",
-    "Pilgrim Hat": "pilgrim_hat",
-    "Turkey Feather": "feather",
-    "Seaweed": "seaweed",
-    "Mask": "mask",
-    "Cornucopia": "cornucopia",
-    "Rudolfs Red Nose": "rudolfs_red_nose",
-    "Christmas Tree": "christmas_tree",
-    "Inflatable Santa": "inflatable_santa",
-    "Snow Globe": "snow_globe",
-    "Santa Sack": "santa_sack",
-    "Moon Dust": "moon_dust",
-    "Item Box": "item_box",
-    "Fake Item Box": "fake_box",
-    "Banana": "banana",
-    "Green Shell": "green_shell",
-    "Red Shell": "red_shell",
-    "Mushroom": "mushroom",
-    "Mega Mushroom": "mega_mushroom",
-    "Golden Mushroom": "golden_mushroom",
-    "Blue Shell": "blue_shell",
-    "Golden Bunny Ears": "golden_bunny_ears",
-    "Rainbow Easter Egg": "rainbow_easter_egg",
-    "Bunny Ears": "bunny_ears",
-    "Green Striped Easter Egg": "green_striped_easter_egg",
-    "Purple Striped Easter Egg": "purple_striped_easter_egg",
-    "Blue Striped Easter Egg": "blue_striped_easter_egg",
-    "Blue Dotted Easter Egg": "blue_dotted_easter_egg",
-    "Green Dotted Easter Egg": "green_dotted_easter_egg",
-    "Purple Dotted Easter Egg": "purple_dotted_easter_egg",
-    "Purple Easter Egg": "purple_easter_egg",
-    "Green Easter Egg": "green_easter_egg",
-    "Blue Easter Egg": "blue_easter_egg",
-    "Red Striped Easter Egg": "red_striped_easter_egg",
-    "Yellow Striped Easter Egg": "yellow_striped_easter_egg",
-    "Orange Striped Easter Egg": "orange_striped_easter_egg",
-    "Red Dotted Easter Egg": "red_dotted_easter_egg",
-    "Yellow Dotted Easter Egg": "yellow_dotted_easter_egg",
-    "Orange Dotted Easter Egg": "orange_dotted_easter_egg",
-    "Orange Easter Egg": "orange_easter_egg",
-    "Yellow Easter Egg": "yellow_easter_egg",
-    "Red Easter Egg": "red_easter_egg",
+    "netherite scrap": "netherite",
+    "slime ball": "slimeball",
+    "heart of the sea": "heart_of_the_sea",
+    "cod": "fish.cod",
+    "salmon": "fish.salmon",
+    "tropical fish": "fish.tropical_fish",
+    "pufferfish": "fish.pufferfish",
+    "rainbow trout": "fish.rainbow_trout",
+    "gold fish": "fish.gold_fish",
+    "emerald fish": "fish.emerald_fish",
+    "mooderald": "autistic_emerald",
+    "fortune i book": "enchanted_book",
+    "fortune ii book": "enchanted_book",
+    "fortune iii book": "enchanted_book",
+    "efficiency i book": "enchanted_book",
+    "looting i book": "enchanted_book",
+    "looting ii book": "enchanted_book",
+    "sharpness i book": "enchanted_book",
+    "sharpness ii book": "enchanted_book",
+    "lure i book": "enchanted_book",
+    "present": "present",
+    "haste i potion": "haste_i_potion",
+    "haste ii potion": "haste_ii_potion",
+    "vault potion": "glass_bottle",
+    "luck potion": "luck_potion",
+    "wood sword": "wood_sword",
+    "stone sword": "stone_sword",
+    "iron sword": "iron_sword",
+    "gold sword": "gold_sword",
+    "diamond sword": "diamond_sword",
+    "netherite sword": "netherite_sword",
+    "wood pickaxe": "wood_pick",
+    "stone pickaxe": "stone_pick",
+    "iron pickaxe": "iron_pick",
+    "gold pickaxe": "gold_pick",
+    "diamond pickaxe": "diamond_pick",
+    "netherite pickaxe": "netherite_pick",
+    "wood hoe": "wood_hoe",
+    "stone hoe": "stone_hoe",
+    "iron hoe": "iron_hoe",
+    "gold hoe": "gold_hoe",
+    "diamond hoe": "diamond_hoe",
+    "netherite hoe": "netherite_hoe",
+    "fishing rod": "fishing_rod",
+    "jar of bees": "jar_of_bees",
+    "honey jar": "honey_jar",
+    "emerald fruit": "farming.normal.emerald_fruit",
+    "chorus fruit": "farming.normal.chorus_fruit",
+    "chorus seed": "farming.seeds.chorus_fruit",
+    "melon": "farming.normal.melon",
+    "melon seed": "farming.seeds.melon",
+    "potato": "farming.normal.potato",
+    "carrot": "farming.normal.carrot",
+    "wheat": "farming.normal.wheat",
+    "wheat seed": "farming.seeds.wheat",
+    "rusty fishing hook": "rusty_fishing_hook",
+    "minecraft movie ticket": "ticket",
+    "barrel": "barrel",
+    "moon rock": "rock",
+    "bfg 3000": "gun",
+    "alien mask": "alien",
+    "pride flag": "pride_flag",
+    "a literal rainbow": "rainbow",
+    "bone meal": "bone_meal",
+    "rainbow lego stud": "rainbow_stud",
+    "morbius": "morbius",
+    "recycler": "recycle",
+    "guacamole sombrero": "guacamole_sombrero",
+    "dirt block": "dirt_block",
+    "forever alone trophy": "trophy",
+    "rich person trophy": "rich_person_trophy",
+    "fishing trophy": "fishing_trophy",
+    "slime trophy": "slime_trophy",
+    "ender pearl": "ender_pearl",
+    "chocolate chip cookie": "chocolate_chip_cookie",
+    "will o wisp": "will_o_wisp",
+    "time pearl": "time_pearl",
+    "shield pearl": "shield_pearl",
+    "turkey leg": "turkey_leg",
+    "pilgrim hat": "pilgrim_hat",
+    "turkey feather": "feather",
+    "seaweed": "seaweed",
+    "mask": "mask",
+    "cornucopia": "cornucopia",
+    "rudolfs red nose": "rudolfs_red_nose",
+    "christmas tree": "christmas_tree",
+    "inflatable santa": "inflatable_santa",
+    "snow globe": "snow_globe",
+    "santa sack": "santa_sack",
+    "moon dust": "moon_dust",
+    "item box": "item_box",
+    "fake item box": "fake_box",
+    "banana": "banana",
+    "green shell": "green_shell",
+    "red shell": "red_shell",
+    "mushroom": "mushroom",
+    "mega mushroom": "mega_mushroom",
+    "golden mushroom": "golden_mushroom",
+    "blue shell": "blue_shell",
+    "golden bunny ears": "golden_bunny_ears",
+    "rainbow easter egg": "rainbow_easter_egg",
+    "bunny ears": "bunny_ears",
+    "green striped easter egg": "green_striped_easter_egg",
+    "purple striped easter egg": "purple_striped_easter_egg",
+    "blue striped easter egg": "blue_striped_easter_egg",
+    "blue dotted easter egg": "blue_dotted_easter_egg",
+    "green dotted easter egg": "green_dotted_easter_egg",
+    "purple dotted easter egg": "purple_dotted_easter_egg",
+    "purple easter egg": "purple_easter_egg",
+    "green easter egg": "green_easter_egg",
+    "blue easter egg": "blue_easter_egg",
+    "red striped easter egg": "red_striped_easter_egg",
+    "yellow striped easter egg": "yellow_striped_easter_egg",
+    "orange striped easter egg": "orange_striped_easter_egg",
+    "red dotted easter egg": "red_dotted_easter_egg",
+    "yellow dotted easter egg": "yellow_dotted_easter_egg",
+    "orange dotted easter egg": "orange_dotted_easter_egg",
+    "orange easter egg": "orange_easter_egg",
+    "yellow easter egg": "yellow_easter_egg",
+    "red easter egg": "red_easter_egg",
     "emerald": "emerald",
-    "Fishing Bait": "worm",
-    "Red Firework Rocket": "red_firework_rocket",
-    "Blue Firework Rocket": "blue_firework_rocket",
-    "Green Firework Rocket": "green_firework_rocket",
-    "Orange Firework Rocket": "orange_firework_rocket",
-    "Purple Firework Rocket": "purple_firework_rocket",
-    "Yellow Firework Rocket": "yellow_firework_rocket",
-    "American Flag": "american_flag",
-    "Uncle Sams Hat": "uncle_sams_hat",
-    "Hot Dog": "hot_dog",
-    "Komodo 30000 SuperNova Aerial Firework": "bomb",
-    "Firecracker": "firecracker",
-    "Declaration Of Independence": "scroll",
-    "Infernum's Scroll": "infernums_scroll",
-    "Regeneration Totem": "regeneration_totem",
-    "Flaming Quiver": "flaming_quiver",
-    "Love Medallion": "love_medallion",
-    "Wind Horn": "wind_horn",
-    "Battle Robes": "battle_robes",
-    "Weakening Gong": "weakening_gong",
-    "Soul Protection Totem": "soul_protection_totem",
-    "Deathcap Mushroom": "deathcap_mushroom",
-    "Shadow Shifter": "shadow_shifter",
-    "Gastly Totem": "gastly_totem",
-    "Splendid Robes": "splendid_robes",
-    "Satchel Of Elements": "satchel_of_elements",
-    "Dark Rooted Robes": "dark_rooted_robes",
-    "Pumpkin": "pumpkin",
-    "Laser Assault Rifle": "laser_assault_rifle",
-    "Leftover Party Confetti": "leftover_party_confetti",
-    "Rona Vaccine": "rona_vaccine",
-    "Rainbow Sparkles Easter Egg": "rainbow_sparkles_easter_egg",
-    "Party Popper": "party_popper",
-    "Bane Of Pillagers Amulet": "bopa"
+    "fishing bait": "worm",
+    "red firework rocket": "red_firework_rocket",
+    "blue firework rocket": "blue_firework_rocket",
+    "green firework rocket": "green_firework_rocket",
+    "orange firework rocket": "orange_firework_rocket",
+    "purple firework rocket": "purple_firework_rocket",
+    "yellow firework rocket": "yellow_firework_rocket",
+    "american flag": "american_flag",
+    "uncle sams hat": "uncle_sams_hat",
+    "hot dog": "hot_dog",
+    "komodo 30000 supernova aerial firework": "bomb",
+    "firecracker": "firecracker",
+    "declaration of independence": "scroll",
+    "infernum's scroll": "infernums_scroll",
+    "regeneration totem": "regeneration_totem",
+    "flaming quiver": "flaming_quiver",
+    "love medallion": "love_medallion",
+    "wind horn": "wind_horn",
+    "battle robes": "battle_robes",
+    "weakening gong": "weakening_gong",
+    "soul protection totem": "soul_protection_totem",
+    "deathcap mushroom": "deathcap_mushroom",
+    "shadow shifter": "shadow_shifter",
+    "gastly totem": "gastly_totem",
+    "splendid robes": "splendid_robes",
+    "satchel of elements": "satchel_of_elements",
+    "dark rooted robes": "dark_rooted_robes",
+    "pumpkin": "pumpkin",
+    "laser assault rifle": "laser_assault_rifle",
+    "leftover party confetti": "leftover_party_confetti",
+    "rona vaccine": "rona_vaccine",
+    "rainbow sparkles easter egg": "rainbow_sparkles_easter_egg",
+    "party popper": "party_popper",
+    "bane of pillagers amulet": "bopa"
   },
   "farming": {
     "emojis": {

discord/bot/cogs/commands/econ.py

@@ -13,7 +13,6 @@
 
 import aiohttp
 import arrow
-from bot.services.karen.resources.commands.shop import ShopItemEntry
 import discord
 import numpy.random
 from discord.ext import commands
@@ -27,8 +26,9 @@
 from bot.logic.formatting import format_required_items
 from bot.logic.leaderboards import craft_lbs
 from bot.logic.progress_bar import make_health_bar
-from bot.models.data import Findable, Fishing, ShopItem
+from bot.models.data import Findable, Fishing
 from bot.services.karen.errors import NotEnoughEmeraldsError
+from bot.services.karen.resources.commands.shop import ShopItemEntry
 from bot.services.karen.resources.commands.vault import (
     NonPositiveDepositAmountError,
     NonPositiveWithdrawAmountError,
@@ -497,11 +497,7 @@ async def vault_deposit(self, ctx: Ctx, emerald_blocks: str):
         except NotEnoughVaultCapacityError:
             await ctx.reply_embed(ctx.l.econ.dep.stupid_2)
         except NotEnoughEmeraldsError:
-            await ctx.reply_embed(
-                ctx.l.econ.dep.poor_loser
-                if ctx.k.user.emeralds < 9
-                else ctx.l.econ.dep.stupid_3
-            )
+            await ctx.reply_embed(ctx.l.econ.dep.poor_loser if ctx.k.user.emeralds < 9 else ctx.l.econ.dep.stupid_3)
         else:
             await ctx.reply_embed(
                 ctx.l.econ.dep.deposited.format(
@@ -583,9 +579,8 @@ async def shop_logic(self, ctx: Ctx, category: str, header: str) -> None:
 
         items: list[ShopItemEntry] = list((await self.karen.commands.shop.get_items_for_category(category)).values())
 
-        items = sorted(items, key=(lambda item: item.buy_price))  # sort items by their buy price
-        item_pages = [items[i : i + 4] for i in range(0, len(items), 4)]  # put items in groups of 4
-        item_pages = list(iter(itertools.batched(items, 4)))
+        items = sorted(items, key=(lambda item: item.buy_price))
+        item_pages = list(map(list, itertools.batched(items, 4)))
         del items
 
         def get_page(page: int) -> discord.Embed:
@@ -594,11 +589,8 @@ def get_page(page: int) -> discord.Embed:
 
             for item in item_pages[page]:
                 embed.add_field(
-                    name=(
-                        f"{emojify_item(self.d, item.db_entry.item)} {item.db_entry.item} "
-                        f"({format_required_items(self.d, item)})"
-                    ),
-                    value=f"`{ctx.prefix}buy {item.db_entry.item.lower()}`",
+                    name=(f"{emojify_item(self.d, item.name)} {item.name} ({format_required_items(self.d, item)})"),
+                    value=f"`{ctx.prefix}buy {item.name.lower()}`",
                     inline=False,
                 )
 

discord/bot/logic/emojification.py

@@ -5,7 +5,7 @@
 
 def emojify_item(d, item: str, default: Any = DEFAULT_SENTINEL) -> str | Any:
     try:
-        emoji_key = d.emoji_items[item]
+        emoji_key = d.emoji_items[item.lower()]
 
         if emoji_key.startswith("fish."):
             return d.emojis.fish[emoji_key[5:]]