Skip to content

Commit

Permalink
Joker fixes and Cop report change reverted for real this time (#1781)
Browse files Browse the repository at this point in the history
Joker can win if Dawn is occurring.

Added a Special Interaction between Joker and Assassin to make Joker
more like it's Split Decision version.
  • Loading branch information
SawJester authored Dec 12, 2024
1 parent ee0517c commit ca3f279
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Games/types/Mafia/information/BinaryAlignmentInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ module.exports = class BinaryAlignmentInfo extends Information{

getInfoFormated(){
super.getInfoRaw();
if(this.randomTarget == true){

return `You Learn that your ${this.target.name} is ${this.mainInfo}`
}
return `You Learn that your Target is ${this.mainInfo}`

//return `You Learn that your Target is ${this.mainInfo}`
}

isTrue() {
Expand Down
9 changes: 7 additions & 2 deletions Games/types/Mafia/roles/cards/WinIfNightKilled.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ module.exports = class WinIfNightKilled extends Card {
priority: PRIORITY_WIN_IF_CONDEMNED,
againOnFinished: true,
check: function (counts, winners) {
const assassinInGame = this.game.players.filter(
(p) => p.role.name === "Assassin"
);
if (this.data.nightKilled && !winners.groups[this.name]) {
winners.addPlayer(this.player, this.name);
return true;
if(assassinInGame.length <= 0){
return true;
}
}
},
};
Expand All @@ -20,7 +25,7 @@ module.exports = class WinIfNightKilled extends Card {
if (
player == this.player &&
deathType == "basic" &&
this.game.getStateName() == "Night"
(this.game.getStateName() == "Night" || this.game.getStateName() == "Dawn")
)
this.data.nightKilled = true;
},
Expand Down
10 changes: 10 additions & 0 deletions data/roles.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ const roleData = {
"If the target was attacked, the Bodyguard will kill one attacker and die.",
"If the target was the Celebrity, the Bodyguard will kill all attackers and die.",
],
SpecialInteractions: {
Celebrity: [
"If a Bodyguard is Protecting a Celebrity, the Bodyguard will kill all attackers and die.",
],
},
},
Doctor: {
alignment: "Village",
Expand Down Expand Up @@ -2992,6 +2997,11 @@ const roleData = {
"Wins if killed at Night.",
"No one else wins if the Joker wins.",
],
SpecialInteractions: {
Assassin: [
"If an Assassin is Present, Joker winning does not prevent other players from Winning.",
],
},
},
Admirer: {
alignment: "Independent",
Expand Down

0 comments on commit ca3f279

Please sign in to comment.