From 136ba8e37f786d3c1ccf215a1589c8d083cc9762 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 13 Aug 2024 11:26:23 +0200 Subject: scots should be "up to" -- add pass button --- rules.js | 11 ++++++++++- rules.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/rules.js b/rules.js index 39b2cf4..5512a1c 100644 --- a/rules.js +++ b/rules.js @@ -9810,16 +9810,25 @@ states.scots = { gen_action_lord(lord); } } + view.actions.done = 1; } else { view.prompt = `Scots: You may add 1 men-at-arms and 1 militia to ${lord_name[game.who]}.`; let troops = map_get(game.event_scots, game.who, 0); if ((troops & 1) === 0) view.actions.add_militia = 1; + else + view.actions.add_militia = 0; if ((troops & 2) === 0) view.actions.add_men_at_arms = 1; + else + view.actions.add_men_at_arms = 0; + view.actions.pass = 1; } - view.actions.done = 1; + }, + pass() { + map_set(game.event_scots, game.who, 3); + game.who = NOBODY; }, done() { end_lancaster_event_scots(); diff --git a/rules.ts b/rules.ts index 49d62e7..7dc9f9a 100644 --- a/rules.ts +++ b/rules.ts @@ -11376,15 +11376,24 @@ states.scots = { gen_action_lord(lord) } } + view.actions.done = 1 } else { view.prompt = `Scots: You may add 1 men-at-arms and 1 militia to ${lord_name[game.who]}.` let troops = map_get(game.event_scots, game.who, 0) if ((troops & 1) === 0) view.actions.add_militia = 1 + else + view.actions.add_militia = 0 if ((troops & 2) === 0) view.actions.add_men_at_arms = 1 + else + view.actions.add_men_at_arms = 0 + view.actions.pass = 1 } - view.actions.done = 1 + }, + pass() { + map_set(game.event_scots, game.who, 3) + game.who = NOBODY }, done() { end_lancaster_event_scots() -- cgit v1.2.3