Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug Fix #9

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Bug Fix #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Classes/CE_Roll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
'Tier 2' : 10,
'Tier 3' : hm.months_to_days(1),
'Tier 4' : hm.months_to_days(2),
'Tier 5' : None
'Tier 5' : None,
'Tier 5+' : None,
'Tier 6' : None
}
}

Expand Down
4 changes: 4 additions & 0 deletions Modules/hm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@ def get_rollable_game(
continue
"""

if tier_number == 6 and not game.is_t5plus() :
"Incorrect tier."
continue

if tier_number != None and game.get_tier() != f"Tier {tier_number}" :
"Incorrect tier."
continue
Expand Down
16 changes: 12 additions & 4 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ def __init__(self, user : CEUser, partner : CEUser) :
options : list[discord.SelectOption] = []
for i in range(5) :
options.append(discord.SelectOption(
label=f"Tier {i+1}", value=f"{i}", description=f"Roll a Tier {i+1}", emoji=hm.get_emoji(f'Tier {i+1}')
label=f"Tier {i+1}", value=f"{i+1}", description=f"Roll a Tier {i+1}", emoji=hm.get_emoji(f'Tier {i+1}')
))
options.append(discord.SelectOption(
label="Tier 5+", value="5", description="Roll a Tier 5 (or above)"
Expand All @@ -852,6 +852,12 @@ async def callback(self, interaction : discord.Interaction) :
)

# send message
if self.values[0] == "6" :
return await interaction.response.edit_message(
content=(f"{self.__partner.mention()}, would you like to enter a Tier 5+ Soul Mates " +
f"with {self.__user.mention()}?"),
view=SoulMatesAgreeView(self.__user, self.__partner, self.values[0])
)
return await interaction.response.edit_message(
content=(f"{self.__partner.mention()}, would you like to enter a Tier {self.values[0]} Soul Mates " +
f"with {self.__user.mention()}?"),
Expand Down Expand Up @@ -881,7 +887,7 @@ async def yes_button(self, interaction : discord.Interaction, button : discord.u
# defer
await interaction.response.defer()

hour_limit = [15, 40, 80, 160, None, None]
hour_limit = [None, 15, 40, 80, 160, None, None]

tier_num = int(self.__tier)

Expand All @@ -906,15 +912,17 @@ async def yes_button(self, interaction : discord.Interaction, button : discord.u
user_ce_id=self.__user.ce_id,
games=[rolled_game],
partner_ce_id=self.__partner.ce_id,
is_current=True
is_current=True,
tier_num=tier_num
)

partner_roll = CERoll(
roll_name="Soul Mates",
user_ce_id=self.__partner.ce_id,
games=[rolled_game],
partner_ce_id=self.__user.ce_id,
is_current=True
is_current=True,
tier_num=tier_num
)

self.__user.add_current_roll(user_roll)
Expand Down