Skip to content

Commit

Permalink
Updated emoji ids to match with bot application emojis
Browse files Browse the repository at this point in the history
  • Loading branch information
PieTw3lve committed Jul 24, 2024
1 parent fe8b5bb commit 99f57da
Show file tree
Hide file tree
Showing 42 changed files with 25 additions and 25 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion src/extensions/admin/rushsite.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self, options: list) -> None:

class SideSelection(miru.TextSelect):
def __init__(self) -> None:
super().__init__(options=[miru.SelectOption(label='Counter-Terrorist', emoji='<:CounterTerrorist:1139266351073079406>', value='ct'), miru.SelectOption(label='Terrorist', emoji='<:Terrorist:1139272220884091001>', value='t')], custom_id='side_select', placeholder='Pick a Side')
super().__init__(options=[miru.SelectOption(label='Counter-Terrorist', emoji='<:CounterTerrorist:1265770646739353684>', value='ct'), miru.SelectOption(label='Terrorist', emoji='<:Terrorist:1139272220884091001>', value='t')], custom_id='side_select', placeholder='Pick a Side')

class StrikeViewPools(miru.View):
def __init__(self, embed: hikari.Embed, maps: list, user1: hikari.User, user2: hikari.User) -> None:
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/economy/coinflip.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ async def coinflip(ctx: lightbulb.SlashContext, number: int) -> None:
for i in range(number):
number = random.randint(1,2)
if number == 1:
result.append('<:heads:1142649356827242536>')
result.append('<:heads:1265769437814853733>')
heads += 1
else:
result.append('<:tails:1142651928824774737>')
result.append('<:tails:1265769509235593380>')
tails += 1

result = (' '.join(result))
Expand Down
14 changes: 7 additions & 7 deletions src/extensions/economy/daily.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ async def daily(ctx: lightbulb.Context) -> None:
match scenario:
case 1: # The Choice of Chests
embed = hikari.Embed(title=f'The Choice of Chests: Unveiling Your Fate', description="In a dimly lit chamber, three chests await your selection, each with a predetermined sum of coins inside. Your decision will unveil not just wealth, but a reflection of your desires and your readiness for life's uncertainties. Choose wisely, for destiny awaits.", color=get_setting('general', 'embed_color'), timestamp=datetime.now().astimezone())
embed.set_thumbnail('assets/img/general/dailies/treasure_chest.png')
embed.add_field(name='<:small_chest:1143255749322100837> - Old Chest', value='This weathered and timeworn chest may hold a hidden treasure of unknown worth, offering an element of mystery and nostalgia.')
embed.add_field(name='<:medium_chest:1143258292253118525> - Standard Chest', value='The middle-of-the-road option, this chest offers a reliable chance at a decent haul of coins, without any frills or extravagance.')
embed.add_field(name='<:large_chest:1143260812002218164> - Luxurious Chest', value='The epitome of opulence, this chest tends to promise high-value rewards, making it the grandest and most alluring choice among the three.')
embed.set_thumbnail('assets/img/general/daily/treasure_chest.png')
embed.add_field(name='<:small_chest:1265769485441175562> - Old Chest', value='This weathered and timeworn chest may hold a hidden treasure of unknown worth, offering an element of mystery and nostalgia.')
embed.add_field(name='<:medium_chest:1265769466109890693> - Standard Chest', value='The middle-of-the-road option, this chest offers a reliable chance at a decent haul of coins, without any frills or extravagance.')
embed.add_field(name='<:large_chest:1265769448095092777> - Luxurious Chest', value='The epitome of opulence, this chest tends to promise high-value rewards, making it the grandest and most alluring choice among the three.')
embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)
view = DailyChestsView(dailyManager, ctx.author)
case 2: # The Mystery Box
embed = hikari.Embed(title=f'The Mystery Box: A Decision to Share or Snare', description="Before you lies an enigmatic mystery box, an object shrouded in intrigue and uncertainty. Its exterior, adorned with intricate patterns, beckons you to uncover its secrets. However, this box comes with a twist: it holds the power to either reward your generosity or ensnare your curiosity.", color=get_setting('general', 'embed_color'), timestamp=datetime.now().astimezone())
embed.set_thumbnail('assets/img/general/dailies/question_mark.png')
embed.set_thumbnail('assets/img/general/daily/question_mark.png')
embed.add_field(name='The Gift of Connection', value='If you choose to share this mysterious box with another soul, a remarkable surprise awaits. Inside, you will find not just a reward for your generosity, but a token of camaraderie and connection. Perhaps a heartwarming message or a gesture of goodwill that can forge a bond between you and your chosen companion.')
embed.add_field(name='The Solitary Treasure', value="If you opt to open the box for yourself, a grand reward might also await. It could be a treasure beyond your wildest dreams or a revelation that changes your life's course. The enigma rewards those who trust in their instincts and tread their path alone.")
embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)
view = DailyMysteryBoxView(dailyManager, ctx.author)
case 3: # Enchanted Encounter
embed = hikari.Embed(title=f'Enchanted Encounter: A Choice in the Wilderness', description="As you wander along a serene forest trail, the dappled sunlight filtering through the thick canopy overhead, you suddenly stumble upon an unexpected sight. There, nestled among the ferns and moss-covered rocks, is a small, curious creature. It's a red fox, its fiery fur contrasting beautifully with the lush greenery of the forest.", color=get_setting('general', 'embed_color'), timestamp=datetime.now().astimezone())
embed.set_thumbnail('assets/img/general/dailies/fox.png')
embed.set_thumbnail('assets/img/emotes/general/sleeping_fox.png')
embed.add_field(name=':palm_down_hand: - PET THE GOD DAMN FOX', value="You're overwhelmed by an irresistible urge. You simply must pet the fox, no questions asked. It's as if the universe itself conspires for you to pet that fox at this very moment.")
embed.add_field(name='<:sleeping_fox:1143665534030848080> - Leave the Fox Alone', value="Let the fox rest peacefully and continue with your day.")
embed.add_field(name='<:sleeping_fox:1265769415014879232> - Leave the Fox Alone', value="Let the fox rest peacefully and continue with your day.")
embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)
view = DailyFoxView(dailyManager, ctx.author)

Expand Down
2 changes: 1 addition & 1 deletion src/extensions/general/rushsite.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

plugin = lightbulb.Plugin('Rushsite')
dataDirectory = 'database/rushsite'
trophiesIndex = {'s1': '<:TrophyS1:1143265272510304308>', 's2': '<:TrophyS2:1143265277925142578>', 's3': '<:TrophyS3:1143265282614366258>', 's4': '<:TrophyS4:1143265285848178778>', 's5': '<:TrophyS5:1143272567965237360>',}
trophiesIndex = {'s1': '<:TrophyS1:1265770665378709598>', 's2': '<:TrophyS2:1265770682659111136>', 's3': '<:TrophyS3:1265770692666986648>', 's4': '<:TrophyS4:1265770707233800333>', 's5': '<:TrophyS5:1265770715978661919>',}
rushsiteStats = {}
allNames = []

Expand Down
8 changes: 4 additions & 4 deletions src/extensions/pokemon/pokeinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ async def callback(self, ctx: miru.ViewContext) -> None:
self.db.commit()

if favorite:
favorite_symbol = '<:favorite_icon:1074056642368377023>'
favorite_symbol = '<:favorite_icon:1265770511858794496>'
else:
favorite_symbol = '<:unfavorite_icon:1074057036393881672>'
favorite_symbol = '<:unfavorite_icon:1265770609732751451>'

self.embed.title = f'{name} Card {self.indents}{favorite_symbol}' if not shiny else f'Shiny {name} Card {self.indents}{favorite_symbol}'
self.emoji = favorite_symbol
Expand Down Expand Up @@ -167,9 +167,9 @@ async def open(ctx: lightbulb.Context, uuid: str) -> None:
indents = '\t\t\t\t\t\t\t\t\t\t\t'

if favorite:
favorite_symbol = '<:favorite_icon:1074056642368377023>'
favorite_symbol = '<:favorite_icon:1265770511858794496>'
else:
favorite_symbol = '<:unfavorite_icon:1074057036393881672>'
favorite_symbol = '<:unfavorite_icon:1265770609732751451>'

embed = hikari.Embed(title=f'{name} Card {indents}{favorite_symbol}' if not shiny else f'Shiny {name} Card {indents}{favorite_symbol}', color=get_setting('general', 'embed_color'))
embed.set_image(f'https://img.pokemondb.net/sprites/home/normal/{name.lower()}.png' if not shiny else f'https://img.pokemondb.net/sprites/home/shiny/{name.lower()}.png')
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/pokemon/pokeshop.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class PackShop(miru.View):
def __init__(self) -> None:
super().__init__(timeout=None)

@miru.button(label='Standard Pack', emoji='<:standard_booster_pack:1073771426324156428>', style=hikari.ButtonStyle.PRIMARY, custom_id='standard_pack_button')
@miru.button(label='Standard Pack', emoji='<:standard_booster_pack:1265770591319883919>', style=hikari.ButtonStyle.PRIMARY, custom_id='standard_pack_button')
async def standard(self, ctx: miru.ViewContext, button: miru.Button) -> None:
if verify_user(ctx.user) == None: # if user has never been register
register_user(ctx.user)
Expand All @@ -26,7 +26,7 @@ async def standard(self, ctx: miru.ViewContext, button: miru.Button) -> None:
pack = StandardPokemonCardPack(ctx.user, ctx)
await pack.buy()

@miru.button(label='Premium Pack', emoji='<:premium_booster_pack:1073771425095237662>', style=hikari.ButtonStyle.PRIMARY, custom_id='premium_pack_button')
@miru.button(label='Premium Pack', emoji='<:premium_booster_pack:1265770581832503316>', style=hikari.ButtonStyle.PRIMARY, custom_id='premium_pack_button')
async def premium(self, ctx: miru.ViewContext, button: miru.Button) -> None:
if verify_user(ctx.user) == None: # if user has never been register
register_user(ctx.user)
Expand Down
6 changes: 3 additions & 3 deletions src/utils/daily/events/chest.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def __init__(self, dailyManager: DailyManager, user: hikari.User) -> None:
custom_id='info_select',
placeholder='Select a Treasure Chest',
options=[
miru.SelectOption(label='Old Chest', emoji='<:small_chest:1143255749322100837>', description='Worn and enigmatic, with tales of bygone days.', value='0'),
miru.SelectOption(label='Standard Chest', emoji='<:medium_chest:1143258292253118525>', description='Unremarkable yet dependable.', value='1'),
miru.SelectOption(label='Luxurious Chest', emoji='<:large_chest:1143260812002218164>', description='Lavish and extravagant, may promise grand rewards.', value='2'),
miru.SelectOption(label='Old Chest', emoji='<:small_chest:1265769485441175562>', description='Worn and enigmatic, with tales of bygone days.', value='0'),
miru.SelectOption(label='Standard Chest', emoji='<:medium_chest:1265769466109890693>', description='Unremarkable yet dependable.', value='1'),
miru.SelectOption(label='Luxurious Chest', emoji='<:large_chest:1265769448095092777>', description='Lavish and extravagant, may promise grand rewards.', value='2'),
]
)
async def chests(self, ctx: miru.ViewContext, select: miru.TextSelect) -> None:
Expand Down
4 changes: 2 additions & 2 deletions src/utils/daily/events/fox.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def __init__(self, dailyManager: DailyManager, user: hikari.User) -> None:
placeholder='Select an Option',
options=[
miru.SelectOption(label='PET THE GOD DAMN FOX', emoji='🫳', description='You simply must pet the fox, no questions asked.', value='0'),
miru.SelectOption(label='Leave the Fox Alone', emoji='<:sleeping_fox:1143665534030848080>', description='Let the fox rest peacefully and continue with your day.', value='1'),
miru.SelectOption(label='Leave the Fox Alone', emoji='<:sleeping_fox:1265769415014879232>', description='Let the fox rest peacefully and continue with your day.', value='1'),
]
)
async def fox(self, ctx: miru.ViewContext, select: miru.TextSelect) -> None:
Expand All @@ -41,7 +41,7 @@ async def fox(self, ctx: miru.ViewContext, select: miru.TextSelect) -> None:
embed.description = f'As you stand there amidst the tranquil forest, you recognize the importance of allowing nature to unfold at its own pace. The fox, in its natural habitat, is a symbol of the untamed, unscripted beauty of the wilderness.\n\n> You earned 🪙 {amount}!\n> Your daily streak is now **{self.dailyManager.streak}**!\n\nCommand cooldown will reset at 12 AM EDT.'

embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)
embed.set_thumbnail('assets/img/general/dailies/fox.png')
embed.set_thumbnail('assets/img/emotes/general/sleeping_fox.png')

await ctx.edit_response(embed, components=[])
self.stop()
Expand Down
4 changes: 2 additions & 2 deletions src/utils/daily/events/mystery_box.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async def get_users(self, ctx: miru.ViewContext, select: miru.UserSelect) -> Non
economy.add_money(self.user.id, amount, True)

embed = hikari.Embed(title=f'A Solitary Journey into the Unknown', description=f'With a resolute spirit, you decide to open the enigmatic mystery box solely for yourself. As you carefully lift the lid, a sense of adventure courses through you. What awaits within is exclusively yours, a treasure that reflects your individual journey.\n\n> You earned 🪙 {amount}!\n> Your daily streak is now **{self.dailyManager.streak}**!\n\nCommand cooldown will reset at 12 AM EDT.', color=get_setting('general', 'embed_color'), timestamp=datetime.now().astimezone())
embed.set_thumbnail('assets/img/general/dailies/question_mark.png')
embed.set_thumbnail('assets/img/general/daily/question_mark.png')
embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)

await ctx.edit_response(embed, components=[])
Expand All @@ -44,7 +44,7 @@ async def get_users(self, ctx: miru.ViewContext, select: miru.UserSelect) -> Non
economy.add_money(user.id, amount, True)

embed = hikari.Embed(title=f'A Bond Forged Through Sharing', description=f'As you choose to share the enigmatic mystery box with {user.global_name}, a sense of anticipation fills the air. Gently, you pass the box to {user.global_name}, and together, you both open it.\n\n> You and <@{user.id}> earned 🪙 {amount}!\n> Your daily streak is now **{self.dailyManager.streak}**!\n\nCommand cooldown will reset at 12 AM EDT.', color=get_setting('general', 'embed_color'), timestamp=datetime.now().astimezone())
embed.set_thumbnail('assets/img/general/dailies/question_mark.png')
embed.set_thumbnail('assets/img/general/daily/question_mark.png')
embed.set_footer(text=f'Requested by {ctx.author.global_name}', icon=ctx.author.display_avatar_url)

await ctx.edit_response(embed, components=[])
Expand Down
2 changes: 1 addition & 1 deletion src/utils/pokemon/inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def show_inventory(self, items_per_page):
id, userID, date, name, pokemonId, rarity, shiny, favorite = card
emoji_star = '⭐' if not shiny else '🌟'
name_symbol = '' if not shiny else '**'
favorite_symbol = '' if not favorite else '<:favorite_icon:1074056642368377023>'
favorite_symbol = '' if not favorite else '<:favorite_icon:1265770511858794496>'
rarity_emoji = emoji_star * int(rarity)
if len(embed.fields) == 0:
embed.add_field(name='Pokémon Name', value=f'• {name_symbol}{name}{name_symbol} {favorite_symbol}', inline=True)
Expand Down

0 comments on commit 99f57da

Please sign in to comment.