From 32aeeb47b8ecdad76ed8e683b729e5cf07e48e0e Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Tue, 26 Nov 2024 23:03:59 -0700 Subject: [PATCH] beep --- messages/en.json | 10 +++++----- src/gamemodes/pactbreaker.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/messages/en.json b/messages/en.json index dc21afe7..2b4787ec 100644 --- a/messages/en.json +++ b/messages/en.json @@ -1445,9 +1445,9 @@ "pactbreaker_no_visit_twice_graveyard": "You may not visit the graveyard two nights in a row.", "pactbreaker_no_visit_twice_house": "You may not visit someone else's house two nights in a row.", "pactbreaker_no_id": "You do not have enough clue tokens to investigate someone.", - "pactbreaker_wolf_notify": "You are {=wolf!role:article} {=wolf!role:bold}. It is your job to eliminate the {=vampire!role:plural} and {=vigilante!role:plural} to re-establish your pact with the village.\n{=pactbreaker_notify!message}", - "pactbreaker_vampire_notify": "You are {=vampire!role:article} {=vampire!role:bold}. It is your job to kill all the villagers.\n{=pactbreaker_notify!message}", - "pactbreaker_vigilante_notify": "You are {=vigilante!role:article} {=vigilante!role:bold}. It is your job to eliminate the {=wolf!role:plural} and {=vampire!role:plural} to end their threat over the village.\n{=pactbreaker_notify!message}", + "pactbreaker_wolf_notify": "You are {=wolf!role:article} {=wolf!role:bold}. It is your job to eliminate the {=vampire!role:plural} and {=vigilante!role:plural} to re-establish your pact with the village.\n{=pactbreaker_notify!message}\nFinally, you can use \"{=kill!command} \" to kill someone in the stocks or a known {=vampire!role} or {=vigilante!role} instead of visting a location.", + "pactbreaker_vampire_notify": "You are {=vampire!role:article} {=vampire!role:bold}. It is your job to kill all the villagers.\n{=pactbreaker_notify!message}\nFinally, you can use \"{=kill!command} \" to kill someone in the stocks instead of visting a location.", + "pactbreaker_vigilante_notify": "You are {=vigilante!role:article} {=vigilante!role:bold}. It is your job to eliminate the {=wolf!role:plural} and {=vampire!role:plural} to end their threat over the village.\n{=pactbreaker_notify!message}.\nFinally, you can use \"{=kill!command} \" to kill someone in the stocks or a known {=wolf!role} or {=vampire!role} instead of visting a location.", "pactbreaker_villager_notify": "You are {=villager!role:article} {=villager!role:bold}. It is your job to either re-establish the pact with the {=wolf!role:plural} by killing the {=vigilante!role:plural} and {=vampire!role:plural} or to help the {=vigilante!role:plural} end the threat the {=wolf!role:plural} and {=vampire!role:plural} cause.\n{=pactbreaker_notify!message}", "pactbreaker_notify": "You may visit another player's house by using \"{=visit!command} \"; you can also visit the {=forest!command:bold}, {=square!command:bold}, or {=graveyard!command:bold}. Visiting allows you to collect evidence about other players. Alternatively, you can stay home by using \"{=pass!command}\" to make it harder for other players to collect evidence about you.", "pactbreaker_clue_notify": "You have {0:bold} clue {=token,tokens:plural({0})}. You may spend all of your clue tokens during the day (minimum 2) by using \"{=id!command} \" in PM to gain evidence on someone.", @@ -1476,8 +1476,8 @@ "pactbreaker_house_evidence": "While searching through {0:@}'s house, you discover proof that they are {1!role:article} {1!role:bold}!", "pactbreaker_house_empty": "Your search of {0:@}'s house last night did not turn up any useful evidence.", "pactbreaker_kill_fail": "You tried to find {0:@} last night but they were nowhere to be seen...", - "pactbreaker_shooter": "Knowing that {0:@} is {1!role:article} {1!role:bold}, you track them down and fire a silver crossbow bolt at them before they have the chance to react.", - "pactbreaker_shooter_stocks": "Knowing that {0:@} is {1!role:article} {1!role:bold}, you mercilessly kill them with your silver crossbow while they are vulnerable in the stocks.", + "pactbreaker_shooter": "Suspecting that {0:@} is up to no good, you track them down and fire a silver crossbow bolt at them before they have the chance to react.", + "pactbreaker_shooter_stocks": "Suspecting that {0:@} is up to no good, you mercilessly kill them with your silver crossbow while they are vulnerable in the stocks.", "pactbreaker_shot": "A sharp pain alerts you to a stalker as you get struck by a well-placed crossbow bolt. You spin around to look, the triumphant face of the {=vigilante!role} being the last thing you see...", "pactbreaker_shot_stocks": "While in the stocks, the triumphant face of the {=vigilante!role} steps in front of you and raises a crossbow. It is the last thing you see...", "pactbreaker_hunter": "Prowling the area last night, you come across {0:@} in the dim moonlight and launch an attack. They are too surprised to run or fight back, and quickly die from the onslaught.", diff --git a/src/gamemodes/pactbreaker.py b/src/gamemodes/pactbreaker.py index 811119b5..959643f8 100644 --- a/src/gamemodes/pactbreaker.py +++ b/src/gamemodes/pactbreaker.py @@ -291,7 +291,7 @@ def on_night_kills(self, evt: Event, var: GameState): killer_role = get_main_role(var, killer) victim_role = get_main_role(var, victim) have_evidence = victim in self.collected_evidence[killer] - is_home = self.visiting[victim] is get_home(var, victim) + is_home = victim is not self.in_stocks and self.visiting[victim] is get_home(var, victim) if victim_role == "wolf": is_safe = is_home or self.visiting[victim] is Forest elif victim_role == "vigilante": @@ -496,10 +496,10 @@ def on_night_death_message(self, evt: Event, var: GameState, victim: User, kille killer.send(messages["pactbreaker_hunter"].format(victim)) elif killer_role == "vigilante" and victim not in self.active_players and location is VillageSquare: victim.send(messages["pactbreaker_shot_stocks"]) - killer.send(messages["pactbreaker_shooter_stocks"].format(victim, victim_role)) + killer.send(messages["pactbreaker_shooter_stocks"].format(victim)) elif killer_role == "vigilante": victim.send(messages["pactbreaker_shot"]) - killer.send(messages["pactbreaker_shooter"].format(victim, victim_role)) + killer.send(messages["pactbreaker_shooter"].format(victim)) else: # shouldn't happen; indicates a bug in the mode raise RuntimeError(f"Unknown night death situation ({killer_role}/{victim_role}/{location.name})")