Skip to content

Commit

Permalink
Revert "fix: openAnnouncements" (UltiMafia#1703)
Browse files Browse the repository at this point in the history 
Reverts UltiMafia#1700
  • Loading branch information
@Golbolco
Golbolco authored Aug 22, 2024
1 parent f60b39f commit 561d6f0
Show file tree
Hide file tree
Showing 14 changed files with 148 additions and 163 deletions.
22 changes: 11 additions & 11 deletions Games/core/Game.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1003,24 +1003,24 @@ module.exports = class Game {
for (let x = 0; x < currentBanishedPlayers.length; x++) {
let tempName = currentBanishedPlayers[x].role.name;
let tempModifier = currentBanishedPlayers[x].role.modifier;
currentBanishedRoles.push(`${tempName}:${tempModifier}`);
currentBanishedRoles.push(
`${tempName}:${tempModifier}`
);
}
let match = false;
let validRoles = [];
for (let x = 0; x < banishedRoles.length; x++) {
for (let y = 0; y < currentBanishedRoles.length; y++) {
if (banishedRoles[x] == currentBanishedRoles[y]) {
banishedRoles.slice(
banishedRoles.indexOf(banishedRoles[x]),
1
);
for(let y = 0; y < currentBanishedRoles.length; y++){
if(banishedRoles[x] == currentBanishedRoles[y]){
banishedRoles.slice(banishedRoles.indexOf(banishedRoles[x]), 1);
match = true;
}
}
if (!match) {
if(!match){
validRoles.push(banishedRoles[x]);
}
match = false;

}
banishedRoles = validRoles;
//banishedRoles.slice(banishedRoles.indexOf(newRole), 1);
Expand All @@ -1039,7 +1039,7 @@ module.exports = class Game {
this.events.emit("addBanished", rollQueue[0]);
this.rollQueue.shift();
}

this.players.map((p) => this.events.emit("BanishedAddOrRemove", p));

this.rollQueue = [];
Expand All @@ -1048,7 +1048,7 @@ module.exports = class Game {
this.events.emit("BanishedAddOrRemove", rollQueue[0]);
this.rollQueue.shift();
}

this.players.map((p) => this.events.emit("removeBanished", p));

this.rollQueue = [];
Expand All @@ -1059,7 +1059,7 @@ module.exports = class Game {
}
}

if (this.setup.closed) {
if (this.setup.closed){
this.players.map((p) => this.events.emit("addRequiredRole", p));

this.rollQueue = [];
Expand Down
8 changes: 1 addition & 7 deletions Games/types/Mafia/roles/Cult/Tormentor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ module.exports = class Tormentor extends Role {
super("Tormentor", player, data);

this.alignment = "Cult";
this.cards = [
"VillageCore",
"WinWithCult",
"MeetingCult",
"AddOrRemove1Banished",
"KillIfBanishedDiedDuringDay",
];
this.cards = ["VillageCore", "WinWithCult", "MeetingCult", "AddOrRemove1Banished","KillIfBanishedDiedDuringDay"];
}
};
2 changes: 1 addition & 1 deletion Games/types/Mafia/roles/Mafia/Hider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = class Hider extends Role {
"GuessAdversaryKill",
"AddHideAndSeek",
];
this.roleToGuess = ["Seeker", "Invader"];
this.roleToGuess = ["Seeker","Invader"];
this.meetingMods = {
"Guess Adversary": {
actionName: "Guess Seeker",
Expand Down
11 changes: 3 additions & 8 deletions Games/types/Mafia/roles/Village/Seeker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@ module.exports = class Seeker extends Role {
super("Seeker", player, data);

this.alignment = "Village";
this.cards = [
"VillageCore",
"WinWithVillage",
"GuessAdversaryKill",
"AddHideAndSeek",
];
this.roleToGuess = ["Hider", "Invader"];
this.cards = ["VillageCore", "WinWithVillage", "GuessAdversaryKill","AddHideAndSeek"];
this.roleToGuess = ["Hider","Invader"];
this.meetingMods = {
"Guess Adversary": {
actionName: "Guess Hider",
},
};
}
};
};
14 changes: 9 additions & 5 deletions Games/types/Mafia/roles/cards/Add1Banished.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,22 @@ module.exports = class Add1Banished extends Card {
for (let x = 0; x < currentBanishedPlayers.length; x++) {
let tempName = currentBanishedPlayers[x].role.name;
let tempModifier = currentBanishedPlayers[x].role.modifier;
currentBanishedRoles.push(`${tempName}:${tempModifier}`);
currentBanishedRoles.push(
`${tempName}:${tempModifier}`
);
}
let match = false;
let validRoles = [];
for (let x = 0; x < roles.length; x++) {
for (let y = 0; y < currentBanishedRoles.length; y++) {
if (roles[x] == currentBanishedRoles[y]) {
for(let y = 0; y < currentBanishedRoles.length; y++){

if(roles[x] == currentBanishedRoles[y]){

roles.slice(roles.indexOf(roles[x]), 1);
match = true;
}
}
if (!match) {
if(!match){
validRoles.push(roles[x]);
}
match = false;
Expand All @@ -49,7 +53,7 @@ module.exports = class Add1Banished extends Card {
}
roles = validRoles;
}
if (roles.length <= 0) return;
if(roles.length <= 0) return;
let newRole = Random.randArrayVal(roles);
shuffledPlayers[0].setRole(newRole, undefined, false, true);
//this.game.originalRoles[suffledPlayers[0].id] = newRole;
Expand Down
12 changes: 7 additions & 5 deletions Games/types/Mafia/roles/cards/Add2Banished.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,27 @@ module.exports = class Add2Banished extends Card {
for (let x = 0; x < currentBanishedPlayers.length; x++) {
let tempName = currentBanishedPlayers[x].role.name;
let tempModifier = currentBanishedPlayers[x].role.modifier;
currentBanishedRoles.push(`${tempName}:${tempModifier}`);
currentBanishedRoles.push(
`${tempName}:${tempModifier}`
);
}
let match = false;
let validRoles = [];
for (let x = 0; x < roles.length; x++) {
for (let y = 0; y < currentBanishedRoles.length; y++) {
if (roles[x] == currentBanishedRoles[y]) {
for(let y = 0; y < currentBanishedRoles.length; y++){
if(roles[x] == currentBanishedRoles[y]){
roles.slice(roles.indexOf(roles[x]), 1);
match = true;
}
}
if (!match) {
if(!match){
validRoles.push(roles[x]);
}
match = false;
}
roles = validRoles;
}
if (roles.length <= 0) return;
if(roles.length <= 0) return;
let newRole = Random.randArrayVal(roles);
shuffledPlayers[i].setRole(newRole, undefined, false, true);
//this.game.originalRoles[suffledPlayers[i].id] = newRole;
Expand Down
75 changes: 37 additions & 38 deletions Games/types/Mafia/roles/cards/AddHideAndSeek.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,73 +10,72 @@ module.exports = class AddHideAndSeek extends Card {
if (player != this.player) return;
this.player.role.data.reroll = true;

if (this.player.role.name == "Seeker") {
if(this.player.role.name == "Seeker"){
let players = this.game.players.filter(
(p) => p.role.alignment == "Mafia" || p.role.alignment == "Cult"
);
(p) =>
(p.role.alignment == "Mafia" || p.role.alignment == "Cult"));
let shuffledPlayers = Random.randomizeArray(players);
for (let x = 0; x < shuffledPlayers.length; x++) {
if (
shuffledPlayers[x].role.name == "Hider" ||
shuffledPlayers[x].role.name == "Invader"
) {
for(let x = 0; x < shuffledPlayers.length;x++){
if(shuffledPlayers[x].role.name == "Hider" || shuffledPlayers[x].role.name == "Invader"){
return;
}
}
shuffledPlayers = shuffledPlayers.filter((p) => !p.role.data.reroll);
if (shuffledPlayers.length <= 0) return;
if (shuffledPlayers[0].role.alignment == "Mafia") {
shuffledPlayers[0].setRole("Hider", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
} else {
if(shuffledPlayers.length <= 0) return;
if(shuffledPlayers[0].role.alignment == "Mafia"){
shuffledPlayers[0].setRole("Hider", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
}
else{
shuffledPlayers[0].setRole("Invader", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
}
} else if (this.player.role.name == "Hider") {
}
else if(this.player.role.name == "Hider"){
let players = this.game.players.filter(
(p) => p.role.alignment == "Village" || p.role.alignment == "Cult"
);
(p) =>
(p.role.alignment == "Village" || p.role.alignment == "Cult"));
let shuffledPlayers = Random.randomizeArray(players);
for (let x = 0; x < shuffledPlayers.length; x++) {
if (
shuffledPlayers[x].role.name == "Seeker" ||
shuffledPlayers[x].role.name == "Invader"
) {
for(let x = 0; x < shuffledPlayers.length;x++){
if(shuffledPlayers[x].role.name == "Seeker" || shuffledPlayers[x].role.name == "Invader"){
return;
}
}
shuffledPlayers = shuffledPlayers.filter((p) => !p.role.data.reroll);
if (shuffledPlayers.length <= 0) return;
if (shuffledPlayers[0].role.alignment == "Village") {
shuffledPlayers[0].setRole("Seeker", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
} else {
if(shuffledPlayers.length <= 0) return;
if(shuffledPlayers[0].role.alignment == "Village"){
shuffledPlayers[0].setRole("Seeker", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
}
else{
shuffledPlayers[0].setRole("Invader", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
}
} else if (this.player.role.name == "Invader") {
}
else if(this.player.role.name == "Invader"){
let players = this.game.players.filter(
(p) => p.role.alignment == "Village" || p.role.alignment == "Mafia"
);
(p) =>
(p.role.alignment == "Village" || p.role.alignment == "Mafia"));
let shuffledPlayers = Random.randomizeArray(players);
for (let x = 0; x < shuffledPlayers.length; x++) {
if (
shuffledPlayers[x].role.name == "Seeker" ||
shuffledPlayers[x].role.name == "Hider"
) {
for(let x = 0; x < shuffledPlayers.length;x++){
if(shuffledPlayers[x].role.name == "Seeker" || shuffledPlayers[x].role.name == "Hider"){
return;
}
}
shuffledPlayers = shuffledPlayers.filter((p) => !p.role.data.reroll);
if (shuffledPlayers.length <= 0) return;
if (shuffledPlayers[0].role.alignment == "Village") {
shuffledPlayers[0].setRole("Seeker", undefined, false, true);
if(shuffledPlayers.length <= 0) return;
if(shuffledPlayers[0].role.alignment == "Village"){
shuffledPlayers[0].setRole("Seeker", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
} else {
}
else{
shuffledPlayers[0].setRole("Hider", undefined, false, true);
shuffledPlayers[0].role.data.reroll = true;
}
}



},
};
}
Expand Down
Loading

0 comments on commit 561d6f0

Please sign in to comment.