Skip to content

Commit

Permalink
puppeteer exists after dead message
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsSammyM committed Jan 3, 2025
1 parent ab98318 commit 4dbec3a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
12 changes: 6 additions & 6 deletions client/src/resources/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@
"chatMessage.jailedSomeone":"\\0 was dragged off to jail!",
"chatMessage.jailorDecideNotExecute":"The Jailor decided not to execute.",
"chatMessage.mediumHauntStarted":"\\0 has brought the dead to haunt \\1!",
"chatMessage.mediumExists":"There is a medium in this game, don't leave! Your information is important!",
"chatMessage.mediumExists":"There is some way to communicate with the living like a medium or puppeteer, don't leave! Your information could be very important!",
"chatMessage.jesterWon":"The Jester will get their revenge from the grave!",
"chatMessage.revolutionaryWon":"The Revolutionary got their target executed and won!",
"chatMessage.chronokaiserSpeedUp":"The Chronokaiser speeds up time. Each phase is \\0% faster.",
Expand Down Expand Up @@ -1503,11 +1503,11 @@
"wiki.article.role.escort.attributes":"* You can't be roleblocked\n* Your target is told when they are roleblocked, even if they are immune to being roleblocked",
"wiki.article.role.escort.extra":"* When someone is roleblocked, their visits are wiped, so they don't visit anyone",

"wiki.article.role.medium.reminder": "At night or obituary, speak with the dead. After you are dead, you can bring the dead to speak with a living player 2 times.",
"wiki.article.role.medium.guide": "- You can message the dead and other mediums at night or obituary\n- After you die, you can choose to haunt a living player 2 times\n - The player you haunt will be able to speak with the dead during night and obituary\n\n On the first night, you should attempt to contact any other possible mediums to learn if there are any. You should try to find information from other players and tell the town what dead players think about the game.",
"wiki.article.role.medium.reminder": "At night or obituary, speak with the dead. After you are dead, you can bring the dead to speak with a living player by haunting them.",
"wiki.article.role.medium.guide": "- You can message the dead and other mediums at night or obituary\n- After you die, you can choose to haunt a living player X times (X = Total players ÷ 5 (round up))\n - The player you haunt will be able to speak with the dead during night and obituary\n\n On the first night, you should attempt to contact any other possible mediums to learn if there are any. You should try to find information from other players and tell the town what dead players think about the game.",
"wiki.article.role.medium.abilities":"* At night or obituary, you can read and send messages in the dead chat group\n* While dead, choose a living player during the day to haunt at night, putting that player in the haunt chat group during the night and obituary.",
"wiki.article.role.medium.attributes":"* You may perform 2 haunts\n- When a player dies, they are told there exists a medium in the game",
"wiki.article.role.medium.extra":"* While in jail, you can't use the dead chat group, during the next obituary you can use the dead chat group\n - Haunted players can read AND send to dead chat, even if in jail\n* While any dead medium haunts any living player, all dead mediums, haunted players, and dead players are together in the dead chat group\n* Each medium can do 2 haunts, so 2 mediums can do four haunts",
"wiki.article.role.medium.attributes":"* You may perform X haunts (X = Total players ÷ 5 (round up))\n- When a player dies, they are told there exists a way to talk with the living",
"wiki.article.role.medium.extra":"* While in jail, you can't use the dead chat group, during the next obituary you can use the dead chat group\n - Haunted players can read AND send to dead chat, even if in jail\n* While any dead medium haunts any living player, all dead mediums, haunted players, and dead players are together in the dead chat group",

"wiki.article.role.retributionist.guide": "- At night, Select a dead town role to possess them, forcing them to use their ability on a living player\n- You can only possess dead players who's grave has a town role on it\n- You can possess the same player up to 2 times",
"wiki.article.role.retributionist.abilities":"- Visit 2 players\n - The first player has their first visit changed to the second player you visit\n- You can only select certain players\n - The first player you select must be a dead player with a town role on their grave\n - The second player you select must be any living player",
Expand Down Expand Up @@ -1789,7 +1789,7 @@
"wiki.article.role.puppeteer.reminder": "Each night, select a player to either kill them or recruit them.",
"wiki.article.role.puppeteer.guide":"- You may choose to do one of the following\n - Select and attack a player\n - Select a player to string up into a marionette\n - They are told they are strung up, and are now a fiends loyalist\n - They are attacked the following night, and every night until they die\n - At night all puppeteers and marionettes can chat in the puppeteer chat, even if dead\n - The players in the puppeteer chat that are dead can chat during the day or night\n- Your attack and convert are both armor-piercing",
"wiki.article.role.puppeteer.abilities":"- You may choose to do one of the following\n - Visit a player to attack them\n - Visit a player to string up into a marionette\n - They are told they are strung up, and are now a fiends loyalist\n - They are indirectly attacked (protection-piercing) every night by all puppeteers until they die, if there are no puppeteers they are still attacked\n - You can only use this X times (X = Total players ÷ 5 (round up))\n- Your attack and convert are both armor-piercing",
"wiki.article.role.puppeteer.attributes":"- You and the marionettes are all puppeteer insiders\n- Stringing someone up is armor-piercing\n - At night all puppeteers and marionettes can chat in the puppeteer chat, even if dead\n - The players in the puppeteer chat that are dead can chat during the day or night",
"wiki.article.role.puppeteer.attributes":"- You and the marionettes are all puppeteer insiders\n- Stringing someone up is armor-piercing\n - At night all puppeteers and marionettes can chat in the puppeteer chat, even if dead\n - The players in the puppeteer chat that are dead can chat during the day or night\n- When a player dies, they are told there exists a way to talk with the living",
"wiki.article.role.puppeteer.extra":"- You can't select anybody who is a puppeteer, marionette, or is being strung into a marionette\n- A puppeteer can't be stringed into a marionette\n- A marionette can't be stringed into a marionette twice, if 2 puppeteers choose a player to be turned into a marionette on the same night, they get the message only once",

"wiki.article.role.kira.reminder": "Each night, guess players roles, if all your guesses are correct, you attack all of the players you guessed.",
Expand Down
3 changes: 2 additions & 1 deletion client/src/resources/roles.json
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,8 @@
"text": "Erm... Guys? What do i do, they're gonna catch me!",
"chatGroup": "puppeteer",
"block": false
}
},
{"type": "mediumExists"}
]
},
"pyrolisk": {
Expand Down
4 changes: 4 additions & 0 deletions server/src/game/role/puppeteer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use serde::Serialize;

use crate::game::attack_power::AttackPower;
use crate::game::chat::ChatMessageVariant;
use crate::game::components::detained::Detained;
use crate::game::{
attack_power::DefensePower,
Expand Down Expand Up @@ -114,4 +115,7 @@ impl RoleStateImpl for Puppeteer {
crate::game::components::insider_group::InsiderGroupID::Puppeteer
].into_iter().collect()
}
fn on_any_death(self, game: &mut Game, _actor_ref: PlayerReference, dead_player_ref: PlayerReference) {
dead_player_ref.add_private_chat_message(game, ChatMessageVariant::MediumExists);
}
}

0 comments on commit 4dbec3a

Please sign in to comment.