summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/rules.js b/rules.js
index 5d7183d..3f80460 100644
--- a/rules.js
+++ b/rules.js
@@ -479,6 +479,7 @@ exports.view = function (state, player) {
}
}
return view
+ console.log('view', view)
}
// === ACTIONS ===========
@@ -4746,14 +4747,12 @@ function vm_return() {
vm_end_event()
}
// Check if auto-resolve opponent event (excluding Kiss of Death)
- else if (game.played_card !== C_KISS_OF_DEATH) {
- if (is_auto_resolve(game.played_card) &&
+ else if ((is_auto_resolve(game.played_card) && game.played_card !== C_KISS_OF_DEATH ) &&
((cards[game.played_card].side === 'C' && game.active === DEM) ||
(cards[game.played_card].side === 'D' && game.active === COM))
) {
vm_end_event()
- }
- } else {
+ } else {
game.state = 'vm_end_event'
}
}