Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-04-24 15:00:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2345 from bumbadadabum/mafia

Browse Source 
Mafia: bugfixes
This commit is contained in:
Guangcong Luo 2015-12-25 02:40:49 +00:00
commit 47e5a7e42c
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
chat-plugins/mafia.js
View File

@ -125,7 +125,7 @@ class MafiaPlayer extends Rooms.RoomGamePlayer {
if (target === 'nobody') {
this.toExecute = null;
} else {
this.target = this.room.game.players[target];
this.target = this.game.players[target];
}
delete this.validTargets;
@ -315,6 +315,9 @@ class Mafia extends Rooms.RoomGame {
}
text += '<br/>';
}
if (!text) text = 'No votes yet.';
for (let i in this.players) {
let player = this.players[i];
if (this.voters.indexOf(player) > -1) {
@ -355,7 +358,8 @@ class Mafia extends Rooms.RoomGame {
}
}
this.gameEvent('initial', 'atStart', 1);
this.gamestate = 'initial';
this.gameEvent('atStart', 1);
}
end(image, content) {
@ -456,20 +460,24 @@ class Mafia extends Rooms.RoomGame {
switch (this.gamestate) {
case 'initial':
this.gamestate = 'night';
this.mafiaMeeting();
this.gameEvent('night', 'onNight', 2);
this.gameEvent('onNight', 2);
break;
case 'night':
this.gameEvent('day', 'onDay', 0.5);
this.gamestate = 'day';
this.gameEvent('onDay', 0.5);
break;
case 'day':
this.gamestate = 'lynch';
this.townMeeting();
this.gameEvent('lynch', 'onLynch', 2);
this.gameEvent('onLynch', 2);
break;
case 'lynch':
this.day++;
this.gamestate = 'night';
this.mafiaMeeting();
this.gameEvent('night', 'onNight', 2);
this.gameEvent('onNight', 2);
}
}
@ -543,9 +551,7 @@ class Mafia extends Rooms.RoomGame {
}
}
gameEvent(gamestate, event, timer) {
this.gamestate = gamestate;
gameEvent(event, timer) {
this.executionOrder = [];
for (let i in this.players) {