summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/rules.js b/rules.js
index 87f0f4b..fcf25d0 100644
--- a/rules.js
+++ b/rules.js
@@ -2051,7 +2051,8 @@ function list_victims(p) {
function apply_hit(who) {
game.flash = block_name(who) + " takes a hit.";
- reduce_block(who, 'combat');
+ log_battle(block_name(who) + " takes a hit.");
+ reduce_block(who);
game.hits--;
if (game.hits === 0)
resume_battle();
@@ -2464,7 +2465,6 @@ exports.ready = function (scenario, options, players) {
exports.setup = function (seed, scenario, options) {
game = {
seed: seed,
- tournament: options && options.tournament ? 1 : 0,
c_hand: [],
p_hand: [],
c_card: 0,
@@ -2486,6 +2486,9 @@ exports.setup = function (seed, scenario, options) {
log: [],
};
+ if (options && options.tournament)
+ game.tournament = 1;
+
// Option for backwards compatible replays.
if (options && options.automatic_disruption)
game.automatic_disruption = 1;