Move directly on track instead of Up/Down buttons.

1 files changed, 40 insertions, 37 deletions

diff --git a/rules.js b/rules.js
index 6970da0..2400c09 100644
--- a/rules.js
+++ b/rules.js
@@ -377,7 +377,7 @@ function game_view(state, current) {
         !game.active.includes(current)) {
         let inactive = states[game.state].inactive || game.state;
         view.prompt = Array.isArray(game.active)
-            ? `Waiting for other players to ${inactive}.`
+            ? `Waiting for ${game.active.join(" and ")} to ${inactive}.`
             : `Waiting for ${game.active} to ${inactive}.`;
     }
     else {
@@ -853,7 +853,7 @@ states.choose_area_ap = {
     inactive: 'choose area to use Action Points',
     prompt() {
         gen_spend_hero_points();
-        view.prompt = 'Choose area of the board to affect';
+        view.prompt = 'Use Action Points.';
         for (const track of tracks) {
             gen_action_standee(track.id);
         }
@@ -955,7 +955,7 @@ states.choose_card = {
     inactive: 'choose a card',
     prompt(player) {
         gen_spend_hero_points();
-        view.prompt = 'Choose a card to play this turn';
+        view.prompt = 'Choose a card to play this turn.';
         const faction = player_faction_map[player];
         if (game.selected_cards[faction].length === 0) {
             view.actions.undo = 0;
@@ -969,7 +969,6 @@ states.choose_card = {
         else {
             view.actions.undo = 1;
             view.actions.confirm = 1;
-            view.prompt = 'Confirm your actions or undo';
         }
     },
     spend_hp() {
@@ -1356,39 +1355,24 @@ states.move_track_up_or_down = {
     },
     prompt() {
         gen_spend_hero_points();
-        const { track_id } = get_active_node_args();
+        const { track_id, strength } = get_active_node_args();
         const can_move_up = can_move_track_up(track_id);
         const can_move_down = can_move_track_down(track_id);
         const track_name = get_track_name(track_id);
-        if (can_move_down && can_move_up) {
-            view.prompt = `Move ${track_name} up or down`;
-        }
-        else if (can_move_up) {
-            view.prompt = `Move ${track_name} up`;
-        }
-        else {
-            view.prompt = `Move ${track_name} down`;
-        }
-        if (can_move_up) {
-            gen_action('up');
-        }
-        if (can_move_down) {
-            gen_action('down');
-        }
+        if (can_move_up)
+            gen_move_track(track_id, strength);
+        if (can_move_down)
+            gen_move_track(track_id, -strength);
+        view.prompt = `Move ${track_name}.`;
     },
     spend_hp() {
         resolve_spend_hp();
     },
-    down() {
-        const node = get_active_node();
-        move_track(node.a.track_id, -1 * node.a.strength);
-        resolve_active_and_proceed();
-    },
-    up() {
-        const node = get_active_node();
-        move_track(node.a.track_id, node.a.strength);
-        resolve_active_and_proceed();
-    },
+    tr0(x) { move_track_to(0, x); resolve_active_and_proceed(); },
+    tr1(x) { move_track_to(1, x); resolve_active_and_proceed(); },
+    tr2(x) { move_track_to(2, x); resolve_active_and_proceed(); },
+    tr3(x) { move_track_to(3, x); resolve_active_and_proceed(); },
+    tr4(x) { move_track_to(4, x); resolve_active_and_proceed(); },
 };
 states.peek_fascist_cards = {
     inactive: 'peek at Fascist cards',
@@ -1421,10 +1405,10 @@ function resolve_spend_hp() {
 }
 function set_player_turn_prompt({ can_play_card, can_spend_hp, use_ap, use_momentum, use_morale_bonus, }) {
     if (can_play_card && can_spend_hp) {
-        view.prompt = 'Play a card or spend Hero points';
+        view.prompt = 'Player Turn: Use card or spend Hero points.';
     }
     else if (can_play_card && !can_spend_hp) {
-        view.prompt = 'Play a card';
+        view.prompt = 'Player Turn: Use card.';
     }
     else if (use_ap || use_morale_bonus || use_momentum) {
         const text_options = [];
@@ -1439,18 +1423,18 @@ function set_player_turn_prompt({ can_play_card, can_spend_hp, use_ap, use_momen
         }
         if (use_momentum) {
             view.prompt = can_spend_hp
-                ? 'Play second card or spend Hero Points'
-                : 'Play second card';
+                ? 'Play second card or spend Hero Points.'
+                : 'Play second card.';
         }
         else {
-            view.prompt = `Use ${text_options.join(', ')} or end turn`;
+            view.prompt = `Player Turn: Use ${text_options.join(', ')}.`;
         }
     }
     else if (can_spend_hp) {
-        view.prompt = 'Spend Hero Points or end turn';
+        view.prompt = 'Spend Hero Points.';
     }
     else {
-        view.prompt = 'End turn';
+        view.prompt = 'End turn.';
     }
 }
 states.player_turn = {
@@ -2373,11 +2357,30 @@ function get_government_track_direction(direction) {
         return 1;
     }
 }
+const track_action_name = [
+    "tr0",
+    "tr1",
+    "tr2",
+    "tr3",
+    "tr4"
+];
+function gen_move_track(track_id, change) {
+    const current_value = game.tracks[track_id];
+    let new_value = current_value + change;
+    new_value = Math.max(new_value, get_min_value_for_track(track_id));
+    new_value = Math.min(new_value, get_max_value_for_track(track_id));
+    gen_action(track_action_name[track_id], new_value);
+}
 function move_track(track_id, change) {
     const current_value = game.tracks[track_id];
     let new_value = current_value + change;
     new_value = Math.max(new_value, get_min_value_for_track(track_id));
     new_value = Math.min(new_value, get_max_value_for_track(track_id));
+    move_track_to(track_id, new_value);
+}
+function move_track_to(track_id, new_value) {
+    const current_value = game.tracks[track_id];
+    let change = new_value - current_value;
     game.tracks[track_id] = new_value;
     logi(`${get_track_name(track_id)} to ${new_value}`);
     check_initiative();