Skip to content

Commit

Permalink
update /icon and all coven can see coven icons
Browse files Browse the repository at this point in the history
  • Loading branch information
MargaretTheFool committed Dec 26, 2024
1 parent a15eff7 commit 54a5b08
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/Lang/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -2321,7 +2321,7 @@
"Command.qq": "→ Lobby will be posted on QQ website (China only)",
"Command.dump": "→ Output Log to Desktop",
"Command.death": "→ Display info on how you died",
"Command.icons": "<size=60%><br><color=#ff1919>╳</color> - The Player was marked by the <color=#ff1919>Blackmailer</color> and can't talk during the Meeting<br><color=#4682b4>☆</color> - Used by <color=#4682b4>Captain</color> to display themselves. Only Crewmates can see the <color=#4682b4>Captain's</color> star<br><color=#ff00ff>乂</color> - This player was hexed by the <color=#ff00ff>Hex Master</color> and will die if the <color=#ff00ff>Hex Master</color> isn't killed or ejected by the end of the Meeting.<br>♦ - Used by <color=#008080>Lawyer</color> or <color=#c0c0c0>Executioner</color> or <color=#ff9409>Follower</color>.<br><color=#ff9ace>♥</color> - Used by <color=#ff9ace>Lovers</color> or <color=#ff1493>Romantic</color>.<br><color=#00ff97>✚</color> - Used by <color=#00ff97>Medic</color> to mark their target.<br><color=#edc240>⦿</color> - This player is in a duel with the <color=#edc240>Pirate</color>.<br><color=#8666bd>!?</color> - This player was marked by the <color=#8666bd>Quizmaster</color> and must answer the question correctly to survive.<br><color=#404040>☜</color> - Used by <color=#404040>Schrödinger's cat</color> to mark their teammate.<br><color=#6697ff>◈</color> - This player marked by the <color=#6697ff>Shroud</color> and will die if the <color=#6697ff>Shroud</color> is not killed or ejected by the end of the meeting.<br><color=#b8fb4f>⚠</color> - This player is a <color=#b8fb4f>Snitch</color> or <color=#dee13d>Solsticer</color> who has finished their tasks.<br>★ - Used by <color=#f6f657>Super Star</color> or <color=#f46f4e>Cyber</color> or <color=#5573aa>Marshall</color>.<br><color=#ff1919>†</color> - This player was spelled and will die if the <color=#ff1919>Witch</color> is not killed by the end of the meeting.<br><color=#ff1919>∇</color> - Used by <color=#ff1919>Kamikaze</color> to mark their targets.<br><color=#ff1919>■</color> - Used by <color=#ff1919>Lightning</color> to mark their quantum ghosts.<br><color=#aa900d>⊠</color> - Used by <color=#aa900d>Jailer</color> to mark their prisoner.<br><color=#bf9f7a>●</color> - Used by <color=#bf9f7a>Baker</color> to mark who has Bread.<br><color=#A675A1>♠</color> - Used by <color=#A675A1>Soul Collector</color> to mark who's death they're predicting.<br><color=#e5f6b4>⦿</color> - Used by <color=#e5f6b4>Plaguebearer</color> to mark who they have plagued.<br><#ac42f2>♣</color> - Shown on the Coven member with the Necronomicon.",
"Command.icons": "<size=60%><br><color=#ff1919>╳</color> - The Player was marked by the <color=#ff1919>Blackmailer</color> and can't talk during the Meeting<br><color=#4682b4>☆</color> - Used by <color=#4682b4>Captain</color> to display themselves. Only Crewmates can see the <color=#4682b4>Captain's</color> star<br><color=#ff00ff>乂</color> - This player was hexed by the <color=#ff00ff>Hex Master</color> and will die if the <color=#ff00ff>Hex Master</color> isn't killed or ejected by the end of the Meeting.<br>♦ - Used by <color=#008080>Lawyer</color> or <color=#c0c0c0>Executioner</color> or <color=#ff9409>Follower</color>.<br><color=#ff9ace>♥</color> - Used by <color=#ff9ace>Lovers</color> or <color=#ff1493>Romantic</color>.<br><color=#00ff97>✚</color> - Used by <color=#00ff97>Medic</color> to mark their target.<br><color=#edc240>⦿</color> - This player is in a duel with the <color=#edc240>Pirate</color>.<br><color=#8666bd>!?</color> - This player was marked by the <color=#8666bd>Quizmaster</color> and must answer the question correctly to survive.<br><color=#404040>☜</color> - Used by <color=#404040>Schrödinger's cat</color> to mark their teammate.<br><color=#6697ff>◈</color> - This player marked by the <color=#6697ff>Shroud</color> and will die if the <color=#6697ff>Shroud</color> is not killed or ejected by the end of the meeting.<br><color=#b8fb4f>⚠</color> - This player is a <color=#b8fb4f>Snitch</color> or <color=#dee13d>Solsticer</color> who has finished their tasks.<br>★ - Used by <color=#f6f657>Super Star</color> or <color=#f46f4e>Cyber</color> or <color=#5573aa>Marshall</color>.<br><color=#ff1919>†</color> - This player was spelled and will die if the <color=#ff1919>Witch</color> is not killed by the end of the meeting.<br><color=#ff1919>∇</color> - Used by <color=#ff1919>Kamikaze</color> to mark their targets.<br><color=#ff1919>■</color> - Used by <color=#ff1919>Lightning</color> to mark their quantum ghosts.<br><color=#aa900d>⊠</color> - Used by <color=#aa900d>Jailer</color> to mark their prisoner.<br><color=#bf9f7a>●</color> - Used by <color=#bf9f7a>Baker</color> to mark who has Bread.<br><color=#A675A1>♠</color> - Used by <color=#A675A1>Soul Collector</color> to mark who's death they're predicting.<br><color=#e5f6b4>⦿</color> - Used by <color=#e5f6b4>Plaguebearer</color> to mark who they have plagued.<br><color=#ac42f2>♣</color> - Shown on the <color=#ac42f2>Coven</color> member with the Necronomicon. This is only shown to <color=#ac42f2>Coven</color>.<br><color=#ac42f2>⌘</color> - This player is Jinxed. This is only shown to <color=#ac42f2>Coven</color>.<br><color=#ac42f2>ø</color> - This player is Illusioned. This is only shown to <color=#ac42f2>Coven</color>.<br><color=#ac42f2>♻</color> - This player is Stoned. This is only shown to <color=#ac42f2>Coven</color>.<br><color=#ac42f2>✂</color> - This player is a Voodoo Doll. This is only shown to <color=#ac42f2>Coven</color>.",
"Command.start": "[Seconds] → Start the game",

"Command.iconinfo": "→ Display info on in-meeting icons",
Expand Down
9 changes: 9 additions & 0 deletions Roles/Coven/Illusionist.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,13 @@ private void OnPlayerDead(PlayerControl killer, PlayerControl deadPlayer, bool i


public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => (IllusionedPlayers.TryGetValue(seer.PlayerId, out var Targets) && Targets.Contains(seen.PlayerId)) ? ColorString(GetRoleColor(CustomRoles.Illusionist), "ø") : string.Empty;
public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
{
if (_Player == null) return string.Empty;
if (IllusionedPlayers[_Player.PlayerId].Contains(target.PlayerId) && seer.GetCustomRole().IsCovenTeam() && seer.PlayerId != _Player.PlayerId)
{
return ColorString(GetRoleColor(CustomRoles.Illusionist), "ø");
}
return string.Empty;
}
}
9 changes: 9 additions & 0 deletions Roles/Coven/Jinx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,15 @@ or CustomRoles.Veteran
}
public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false)
=> IsJinxed(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Jinx), "⌘") : string.Empty;
public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
{
if (_Player == null) return string.Empty;
if (IsJinxed(target.PlayerId) && seer.GetCustomRole().IsCovenTeam() && seer.PlayerId != _Player.PlayerId)
{
return ColorString(GetRoleColor(CustomRoles.Jinx), "⌘");
}
return string.Empty;
}


public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = KillCooldown.GetFloat();
Expand Down
9 changes: 9 additions & 0 deletions Roles/Coven/Medusa.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,15 @@ public static void SetStoned(PlayerControl player, IGameOptions opt)
}
}
public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false) => StonedPlayers[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.Medusa), "♻") : string.Empty;
public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
{
if (_Player == null) return string.Empty;
if (StonedPlayers[_Player.PlayerId].Contains(target.PlayerId) && seer.GetCustomRole().IsCovenTeam() && seer.PlayerId != _Player.PlayerId)
{
return ColorString(GetRoleColor(CustomRoles.Medusa), "♻");
}
return string.Empty;
}
public override void SetAbilityButtonText(HudManager hud, byte playerId)
{
hud.ReportButton.OverrideText(GetString("MedusaReportButtonText"));
Expand Down
9 changes: 9 additions & 0 deletions Roles/Coven/VoodooMaster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ public override void SetAbilityButtonText(HudManager hud, byte playerId) =>
hud.KillButton.OverrideText(GetString("ShamanButtonText"));
public override string GetMark(PlayerControl seer, PlayerControl seen = null, bool isForMeeting = false)
=> Dolls[seer.PlayerId].Contains(seen.PlayerId) ? ColorString(GetRoleColor(CustomRoles.VoodooMaster), "✂") : string.Empty;
public override string GetMarkOthers(PlayerControl seer, PlayerControl target, bool isForMeeting = false)
{
if (_Player == null) return string.Empty;
if (Dolls[_Player.PlayerId].Contains(target.PlayerId) && seer.GetCustomRole().IsCovenTeam() && seer.PlayerId != _Player.PlayerId)
{
return ColorString(GetRoleColor(CustomRoles.VoodooMaster), "✂");
}
return string.Empty;
}
public override string GetProgressText(byte playerId, bool comms)
=> ColorString(AbilityLimit >= 1 ? GetRoleColor(CustomRoles.VoodooMaster).ShadeColor(0.25f) : Color.gray, $"({AbilityLimit})");
public override bool ForcedCheckMurderAsKiller(PlayerControl killer, PlayerControl target)
Expand Down

0 comments on commit 54a5b08

Please sign in to comment.