Skip to content

Add day/night count in sunrise/sunset messages #542

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

Merged
skizzerz merged 1 commit into from
Jul 7, 2025
Merged

Add day/night count in sunrise/sunset messages #542

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: 2 additions & 2 deletions messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@
"sunset_vote": "The sun sets.",
"night_idle_notice": "[b]You have not yet acted with all of your roles tonight. Please read the messages sent to you at beginning of night and ensure that you have successfully used every command you are able to use.[/b]",
"twilight_warning": "[b]A few villagers awake early and notice it is still dark outside. The night is almost over and there are still whispers heard in the village.[/b]",
"sunrise": "Night lasted [b]{0:0>2}:{1:0>2}[/b]. It is now daytime. The villagers awake, thankful for surviving the night, and search the village... ",
"sunrise": "Night lasted [b]{0:0>2}:{1:0>2}[/b]. It is now daytime of day {2}. The villagers awake, thankful for surviving the night, and search the village... ",
"not_daytime": "It is not daytime.",
"not_nighttime": "It is not nighttime.",
"player_meek_abstain": "{0:@} meekly abstains from voting anyone today.",
Expand Down Expand Up @@ -1063,7 +1063,7 @@
"gunner_overnight_fail_totem": "{0:@} had bullets and tried to shoot their assailant, but a blinding flash of light from a nearby totem caused the attack to miss.",
"gunner_overnight_fail_angel": "{0:@} had bullets and tried to shoot their assailant, but {=guardian angel!role:article} {=guardian angel!role} was on duty and foiled the attempt.",
"gunner_overnight_fail_bodyguard": "{0:@} had bullets and tried to shoot their assailant, but {2:@} intervened and received the gunshot instead.",
"night_begin": "It is now nighttime. All players check for PMs from me for instructions.",
"night_begin": "It is now nighttime of night {0}. All players check for PMs from me for instructions.",
"first_night_begin": "If you did not receive one, simply sit back, relax, and wait patiently for morning.",
"game_mode_not_found": "Mode {0:bold} not found.",
"werewolf_already_running": "Werewolf is already in play.",
Expand Down
4 changes: 2 additions & 2 deletions src/trans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def transition_day(var: GameState, game_id: int = 0):
killers: dict[UserOrLocation, list[UserOrSpecialTag]] = defaultdict(list)
kill_priorities: dict[UserOrSpecialTag, int] = defaultdict(int)
message: dict[UserOrSpecialTag, list[str]] = defaultdict(list)
message["*"].append(messages["sunrise"].format(minimum, sec))
message["*"].append(messages["sunrise"].format(minimum, sec, var.day_count))
dead: set[User] = set()
novictmsg = True
howl_count = 0
Expand Down Expand Up @@ -430,7 +430,7 @@ def transition_night(var: GameState):
event_end = Event("transition_night_end", {})
event_end.dispatch(var)

dmsg.append(messages["night_begin"])
dmsg.append(messages["night_begin"].format(var.night_count))

if var.night_count:
dmsg.append(messages["first_night_begin"])
Expand Down