From 125ed792fb4134393c1350c7150c4a2f7ee538fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Fri, 20 Jan 2017 00:39:13 +0100
Subject: [PATCH] Removed action cancel button

---
 TODO                                          |   1 -
 graphics/ui/battle.svg                        | 139 ++++++++++++++++--
 out/assets/images/battle/action-active.png    | Bin 5317 -> 4455 bytes
 out/assets/images/battle/action-selected.png  | Bin 0 -> 410 bytes
 out/assets/images/battle/actionbar-cancel.png | Bin 6372 -> 0 bytes
 src/view/Preload.ts                           |   2 +-
 src/view/battle/ActionBar.spec.ts             |   5 +
 src/view/battle/ActionBar.ts                  |  14 --
 src/view/battle/ActionIcon.ts                 |  48 +++---
 9 files changed, 164 insertions(+), 45 deletions(-)
 create mode 100644 out/assets/images/battle/action-selected.png
 delete mode 100644 out/assets/images/battle/actionbar-cancel.png

diff --git a/TODO b/TODO
index 05ed18c..1e12370 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 * Add auto-move to attack
-* Re-style cancel button and allow to cancel by clicking the action again
 * Fix energy depleter effect not fading after one turn
 * Add equipment info (or summary) in ship tooltip
 * Handle effects overflowing ship tooltip when too numerous
diff --git a/graphics/ui/battle.svg b/graphics/ui/battle.svg
index 7ee3120..db81b2e 100644
--- a/graphics/ui/battle.svg
+++ b/graphics/ui/battle.svg
@@ -2,6 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -19,9 +20,22 @@
    sodipodi:docname="battle.svg"
    inkscape:export-filename="/tmp/whole.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   enable-background="new">
   <defs
      id="defs4">
+    <linearGradient
+       id="linearGradient5947"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1;"
+         offset="0"
+         id="stop5949" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:0;"
+         offset="1"
+         id="stop5951" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient10006">
@@ -388,6 +402,48 @@
          stdDeviation="1.4344999"
          id="feGaussianBlur5963" />
     </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Outer Glow"
+       id="filter6021-3-2">
+      <feFlood
+         flood-opacity="0.709804"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood6023-6-9" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite6025-7-1" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="4.2"
+         result="blur"
+         id="feGaussianBlur6027-5-2" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset6029-3-7" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite6031-5-0" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4497">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4499" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -396,11 +452,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="56.720009"
-     inkscape:cy="752.24415"
+     inkscape:zoom="8.0000004"
+     inkscape:cx="262.84553"
+     inkscape:cy="1129.2716"
      inkscape:document-units="px"
-     inkscape:current-layer="layer14"
+     inkscape:current-layer="layer27"
      showgrid="false"
      units="px"
      showguides="true"
@@ -928,7 +984,8 @@
       <g
          inkscape:groupmode="layer"
          id="layer10"
-         inkscape:label="Actions background">
+         inkscape:label="Actions background"
+         style="display:inline">
         <rect
            style="opacity:1;fill:#4c555b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5827)"
            id="rect4439"
@@ -1191,18 +1248,69 @@
            width="100%"
            height="100%" />
       </g>
+      <g
+         inkscape:groupmode="layer"
+         id="layer27"
+         inkscape:label="Action icon selected"
+         style="display:inline;opacity:1;filter:url(#filter4497)">
+        <path
+           style="opacity:1;fill:#e0f3ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 288.98108,-24.305884 0,10.076267 -10.07626,0"
+           id="rect4438"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-selected.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#rect4438"
+           id="use4441"
+           transform="matrix(-1,0,0,1,504.47831,0)"
+           width="100%"
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-selected.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#rect4438"
+           id="use4443"
+           transform="matrix(1,0,0,-1,0,-101.95737)"
+           width="100%"
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-selected.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#rect4438"
+           id="use4445"
+           transform="matrix(-1,0,0,-1,504.5061,-101.94119)"
+           width="100%"
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-selected.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+      </g>
       <g
          inkscape:groupmode="layer"
          id="layer24"
          inkscape:label="Action icon active"
-         style="display:inline">
+         style="display:none">
         <ellipse
            style="opacity:1;fill:#97d3fb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter10850)"
            id="path10840"
            cx="285.67114"
            cy="-51.10569"
            rx="1.7677671"
-           ry="32.79208" />
+           ry="32.79208"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-active.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
         <use
            x="0"
            y="0"
@@ -1210,7 +1318,10 @@
            id="use10854"
            transform="translate(-66.998368,0)"
            width="100%"
-           height="100%" />
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-active.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
         <use
            x="0"
            y="0"
@@ -1218,7 +1329,10 @@
            id="use10856"
            transform="matrix(0,1,-1,0,201.15465,-370.01085)"
            width="100%"
-           height="100%" />
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-active.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
         <use
            x="0"
            y="0"
@@ -1226,7 +1340,10 @@
            id="use10858"
            transform="matrix(0,1,-1,0,200.97788,-303.54282)"
            width="100%"
-           height="100%" />
+           height="100%"
+           inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-active.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
       </g>
     </g>
     <g
diff --git a/out/assets/images/battle/action-active.png b/out/assets/images/battle/action-active.png
index e687367136147f26eba52c85f3e391f4b6766671..3cdcc2d41bd2ee1f53908f65a0450c977e9ce672 100644
GIT binary patch
delta 4422
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
M07*qoM6N<$f*6s;^#A|>

delta 5291
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

diff --git a/out/assets/images/battle/action-selected.png b/out/assets/images/battle/action-selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cc233a791de08c07b581eb03daf95b766bbd102
GIT binary patch
literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^o*>M@1|$oMx$giemSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=E9oo-U3d
z6?5L++30uJK&16yw%D>yJYPhu4V;><G`89${o#pe%WGdKv2ts2x_8I_{2ratzn1%`
zyIendMsBTJSzR4h`>UDt86~_2-)t>?x3KcE8}rPWZ_6M0roCTV{MAF6Z^{`?Q`wcx
z4xZW}mO<`~lcHAG1hqF#x*u@(@Aumtvg}^pb{Cv+a=os)OJx6-ofme8WtPY;_P)3@
zTZKt<X@FSl@}=^d(=J~9)6WF-5+-Q4^J8uQ()%0I7H4mGA++$6+w}=$j4mr;xI|)q
z-PYpVB<>V@SHI*g&n|&gHi^@GnZL?pWj$VNVRSWl#Vw9|Phukd7e;9}UVXS*&gtyT
iz#Kn~Jj*M0=AM)f6WSKHHfQn@kd2<MelF{r5}E*hg`biD

literal 0
HcmV?d00001

diff --git a/out/assets/images/battle/actionbar-cancel.png b/out/assets/images/battle/actionbar-cancel.png
deleted file mode 100644
index ad6049a68a728762fe85856c98033ae019c03f36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6372
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

diff --git a/src/view/Preload.ts b/src/view/Preload.ts
index 3533207..9acb27a 100644
--- a/src/view/Preload.ts
+++ b/src/view/Preload.ts
@@ -32,9 +32,9 @@ module SpaceTac.View {
             this.loadImage("battle/arena/background.png");
             this.loadImage("battle/arena/ap-indicator.png");
             this.loadImage("battle/actionbar.png");
-            this.loadImage("battle/actionbar-cancel.png");
             this.loadImage("battle/action-inactive.png");
             this.loadImage("battle/action-active.png");
+            this.loadImage("battle/action-selected.png");
             this.loadImage("battle/action-tooltip.png");
             this.loadImage("battle/actionpointsnone.png");
             this.loadImage("battle/actionpointsempty.png");
diff --git a/src/view/battle/ActionBar.spec.ts b/src/view/battle/ActionBar.spec.ts
index 96459ca..bd3e627 100644
--- a/src/view/battle/ActionBar.spec.ts
+++ b/src/view/battle/ActionBar.spec.ts
@@ -67,20 +67,24 @@ module SpaceTac.View.Specs {
             // Weapon 1 leaves all choices open
             bar.actions[1].processClick();
             checkFading([], [0, 1, 2, 3]);
+            bar.actionEnded();
 
             // Weapon 2 can't be fired twice
             bar.actions[2].processClick();
             checkFading([2], [0, 1, 3]);
+            bar.actionEnded();
 
             // Not enough AP for both weapons
             ship.ap_current.set(7);
             bar.actions[2].processClick();
             checkFading([1, 2], [0, 3]);
+            bar.actionEnded();
 
             // Not enough AP to move
             ship.ap_current.set(3);
             bar.actions[1].processClick();
             checkFading([0, 1, 2], [3]);
+            bar.actionEnded();
 
             // Dynamic AP usage for move actions
             ship.ap_current.set(6);
@@ -94,6 +98,7 @@ module SpaceTac.View.Specs {
             checkFading([0, 1, 2], [3]);
             bar.actions[0].processHover(Game.Target.newFromLocation(5, 8));
             checkFading([0, 1, 2], [3]);
+            bar.actionEnded();
         });
     });
 }
diff --git a/src/view/battle/ActionBar.ts b/src/view/battle/ActionBar.ts
index dbeeb25..4034e2b 100644
--- a/src/view/battle/ActionBar.ts
+++ b/src/view/battle/ActionBar.ts
@@ -17,9 +17,6 @@ module SpaceTac.View {
         // Current ship, whose actions are displayed
         ship: Game.Ship;
 
-        // Cancel button
-        cancel: Phaser.Button;
-
         // Create an empty action bar
         constructor(battleview: BattleView) {
             super(battleview.game);
@@ -41,14 +38,6 @@ module SpaceTac.View {
             this.actionpointstemp.setBarImage("battle-actionpointsfull");
             this.addChild(this.actionpointstemp);
 
-            // Cancel button
-            this.cancel = new Phaser.Button(this.game, 849, 8, "battle-actionbar-cancel", () => {
-                this.actionEnded();
-            });
-            this.cancel.visible = false;
-            this.cancel.input.useHandCursor = true;
-            this.addChild(this.cancel);
-
             // Tooltip
             this.tooltip = new ActionTooltip(this);
             this.addChild(this.tooltip);
@@ -61,7 +50,6 @@ module SpaceTac.View {
             });
             this.actions = [];
             this.tooltip.setAction(null);
-            Animation.fadeOut(this.game, this.cancel, 200);
         }
 
         // Add an action icon
@@ -123,7 +111,6 @@ module SpaceTac.View {
 
         // Called by an action icon when the action is selected
         actionStarted(): void {
-            Animation.fadeIn(this.game, this.cancel, 200);
         }
 
         // Called by an action icon when the action has been applied
@@ -133,7 +120,6 @@ module SpaceTac.View {
                 action.resetState();
             });
             this.battleview.exitTargettingMode();
-            Animation.fadeOut(this.game, this.cancel, 200);
         }
     }
 }
diff --git a/src/view/battle/ActionIcon.ts b/src/view/battle/ActionIcon.ts
index b7f2fcc..b312221 100644
--- a/src/view/battle/ActionIcon.ts
+++ b/src/view/battle/ActionIcon.ts
@@ -16,6 +16,9 @@ module SpaceTac.View {
         // True if the action can be used
         active: boolean;
 
+        // True if the action is selected for use
+        selected: boolean;
+
         // True if an action is currently selected, and this one won't be available after its use
         fading: boolean;
 
@@ -28,6 +31,9 @@ module SpaceTac.View {
         // Layer applied when the action is active
         private layer_active: Phaser.Image;
 
+        // Layer applied when the action is selected
+        private layer_selected: Phaser.Image;
+
         // Create an icon for a single ship action
         constructor(bar: ActionBar, x: number, y: number, ship: Game.Ship, action: Game.BaseAction) {
             super(bar.game, x, y, "battle-action-inactive");
@@ -41,12 +47,20 @@ module SpaceTac.View {
 
             // Active layer
             this.active = false;
-            this.layer_active = new Phaser.Image(this.game, 0, 0, "battle-action-active", 0);
+            this.layer_active = new Phaser.Image(this.game, this.width / 2, this.height / 2, "battle-action-active", 0);
+            this.layer_active.anchor.set(0.5, 0.5);
             this.layer_active.visible = false;
             this.addChild(this.layer_active);
 
+            // Selected layer
+            this.selected = false;
+            this.layer_selected = new Phaser.Image(this.game, this.width / 2, this.height / 2, "battle-action-selected", 0);
+            this.layer_selected.anchor.set(0.5, 0.5);
+            this.layer_selected.visible = false;
+            this.addChild(this.layer_selected);
+
             // Icon layer
-            this.layer_icon = new Phaser.Image(this.game, this.layer_active.width / 2, this.layer_active.height / 2, "battle-actions-" + action.code, 0);
+            this.layer_icon = new Phaser.Image(this.game, this.width / 2, this.height / 2, "battle-actions-" + action.code, 0);
             this.layer_icon.anchor.set(0.5, 0.5);
             this.layer_icon.scale.set(0.25, 0.25);
             this.addChild(this.layer_icon);
@@ -74,8 +88,10 @@ module SpaceTac.View {
             if (!this.action.canBeUsed(this.battleview.battle, this.ship)) {
                 return;
             }
-
-            console.log("Action started", this.action);
+            if (this.selected) {
+                this.bar.actionEnded();
+                return;
+            }
 
             // End any previously selected action
             this.bar.actionEnded();
@@ -87,11 +103,8 @@ module SpaceTac.View {
             // Update fading statuses
             this.bar.updateFadings(this.action.getActionPointsUsage(this.battleview.battle, this.ship, null));
 
-            // Set the lighting color to highlight
-            if (this.game.renderType !== Phaser.HEADLESS) {
-                // Tint doesn't work in headless renderer
-                this.layer_active.tint = 0xFFD060;
-            }
+            // Set the selected state
+            this.setSelected(true);
 
             if (this.action.needs_target) {
                 // Switch to targetting mode (will apply action when a target is selected)
@@ -118,8 +131,6 @@ module SpaceTac.View {
 
         // Called when a target is selected
         processSelection(target: Game.Target): void {
-            console.log("Action target", this.action, target);
-
             if (this.action.apply(this.battleview.battle, this.ship, target)) {
                 this.bar.actionEnded();
             }
@@ -130,12 +141,18 @@ module SpaceTac.View {
             if (this.targetting) {
                 this.targetting = null;
             }
-            this.layer_active.tint = 0xFFFFFF;
+            this.setSelected(false);
             this.updateActiveStatus();
             this.updateFadingStatus(this.ship.ap_current.current);
             this.battleview.arena.range_hint.clearPrimary();
         }
 
+        // Set the selected state on this icon
+        setSelected(selected: boolean) {
+            this.selected = selected;
+            Animation.setVisibility(this.game, this.layer_selected, this.selected, 300);
+        }
+
         // Update the active status, from the action canBeUsed result
         updateActiveStatus(): void {
             var old_active = this.active;
@@ -152,12 +169,7 @@ module SpaceTac.View {
             var old_fading = this.fading;
             this.fading = this.active && !this.action.canBeUsed(this.battleview.battle, this.ship, remaining_ap);
             if (this.fading != old_fading) {
-                if (this.fading) {
-                    this.game.tweens.create(this.layer_active).to({ alpha: 0.4 }, 100).delay(180).to({ alpha: 1 }, 90).to({ alpha: 0.4 }, 80).delay(130).to({ alpha: 1 }, 100).to({ alpha: 0.4 }, 90).delay(160).to({ alpha: 0.8 }, 70).loop(true).start();
-                } else {
-                    this.game.tweens.removeFrom(this.layer_active);
-                    this.layer_active.alpha = this.active ? 1 : 0;
-                }
+                Animation.setVisibility(this.game, this.layer_active, this.active && !this.fading, 500);
             }
         }
     }