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.

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

fixed medicine den text adjusting error #3353

Merged
merged 2 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions scripts/conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ def medical_cats_condition_fulfilled(all_cats,
can_care_for = int(adjust_med_number * (amount_per_med + 1))

relevant_cats = list(
filter(lambda c: not c.dead and not c.outside, all_cats))
filter(lambda c: not c.dead and not c.outside, all_cats)
)

if give_clanmembers_covered is True:
if give_clanmembers_covered:
return can_care_for
if can_care_for >= len(relevant_cats):
fulfilled = True
Expand Down
12 changes: 7 additions & 5 deletions scripts/screens/MedDenScreen.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ def screen_switches(self):
clansize=number,
count=len(self.meds)
)

if game.clan.game_mode == "classic":
meds_cover = ""

Expand All @@ -375,11 +376,12 @@ def screen_switches(self):
clan=game.clan
)

med_messages.append(event_text_adjust(
Cat,
meds_cover,
main_cat=self.meds[0]
))
if meds_cover:
med_messages.append(event_text_adjust(
Cat,
meds_cover,
main_cat=self.meds[0]
))

if self.meds:
med_messages.append(game.clan.herb_supply.get_status_message(choice(self.meds)))
Expand Down
Loading