From e5cd71f4e14aa43b9e216118814722137ba1c48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Sun, 12 Feb 2017 23:18:36 +0100
Subject: [PATCH] Display ship values variations in arena

---
 README.md                                     |  15 +++--
 TODO                                          |   3 +-
 .../battle/attributes/powercapacity.png       | Bin 0 -> 9225 bytes
 src/core/Ship.spec.ts                         |   4 +-
 src/core/Ship.ts                              |  22 +++---
 src/core/ShipValue.spec.ts                    |  20 +++---
 src/core/ShipValue.ts                         |  10 +--
 src/core/ai/BullyAI.spec.ts                   |  12 ++--
 src/core/events/ValueChangeEvent.ts           |   8 ++-
 src/ui/Preload.ts                             |   1 +
 src/ui/battle/Arena.ts                        |  11 +--
 src/ui/battle/ArenaShip.spec.ts               |  24 +++++++
 src/ui/battle/ArenaShip.ts                    |  63 +++++++++---------
 src/ui/battle/LogProcessor.ts                 |   8 +--
 src/ui/battle/ShipTooltip.ts                  |   2 +-
 15 files changed, 118 insertions(+), 85 deletions(-)
 create mode 100644 out/assets/images/battle/attributes/powercapacity.png
 create mode 100644 src/ui/battle/ArenaShip.spec.ts

diff --git a/README.md b/README.md
index c8e78f1..87edf2f 100644
--- a/README.md
+++ b/README.md
@@ -27,12 +27,17 @@ After making changes to sources, you need to recompile:
 
 In combat, a ship's vitals are represented by the HSP system (Hull-Shield-Power):
 
-* **Hull** - Amout of damage that a ship can receive before having to shut down all its systems
+* **Hull** - Amount of damage that a ship can sustain before having to engage emergency stasis
 * **Shield** - Amount of damage that the shield equipments may absorb to protect the Hull
 * **Power** - Available action points (some actions require more power than others)
 
 These values will be changed by various effects (usage of equipments, sustained damage...).
 
+Once the Hull of a ship is fully damaged (Hull=0), the ship engages its ESP, or Emergency
+Statis Protocol. This protocol activates a statis field that protects the ship for the
+remaining of the battle, preventing any further damage, but rendering it fully inoperent.
+For battle purpose, the ship is to be considered "dead".
+
 ### Attributes
 
 Attributes represent a ship's ability to use its HSP system:
@@ -67,11 +72,11 @@ Each equipment has minimal skill requirements to be used. For example, a weapon
 and "energy >= 3" to be equipped. A ship that does not meet these requirements will not be able to use 
 the equipment.
 
-As for attributes, skill values are controlled by equipments, effects and level up.
+Like for attributes, skill values are controlled by equipments, effects and level up.
 
-If an equipped item has a requirement of "time >= 2", that the ship has time skill of exactly 2, and that a
-temporary effect of "time -1" is active, the requirement is no longer fulfilled and the equipped item
-is then temporarily disabled (no more effects and cannot be used), until the "time -1" effect is lifted.
+If an equipped item has a requirement of "time skill >= 2", that the ship has "time skill" of exactly 2, and 
+that a temporary effect of "time skill -1" is active, the requirement is no longer fulfilled and the equipped 
+item is then temporarily disabled (no more effects and cannot be used), until the "time skill -1" effect is lifted.
 
 ## Drones
 
diff --git a/TODO b/TODO
index 978706d..06f9b26 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,11 @@
 * Drones: add tooltip
 * Drones: add hull points and take area damage
 * Drones: change the sprite angle for deploy animation
-* Better display of effects over ship sprite (repairs, sticky effects...)
 * Add a battle log display
 * Organize arena objects and information in layers
+* Prevent arena effects information (eg. "shield -36") to overflow out of the arena
 * Allow to cancel last moves
+* Identify ships in emergency stasis more clearly
 * Add more visual effects to weapons, hits and explosions
 * Effect should be random in a range (eg. "damage target 50-75")
 * Add an overload/cooling system
diff --git a/out/assets/images/battle/attributes/powercapacity.png b/out/assets/images/battle/attributes/powercapacity.png
new file mode 100644
index 0000000000000000000000000000000000000000..7247fe752458f3578e24e30f95422b7761fd35ab
GIT binary patch
literal 9225
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
Iie2RY0f=$kUjP6A

literal 0
HcmV?d00001

diff --git a/src/core/Ship.spec.ts b/src/core/Ship.spec.ts
index 1b88d80..c7155a3 100644
--- a/src/core/Ship.spec.ts
+++ b/src/core/Ship.spec.ts
@@ -107,8 +107,8 @@ module TS.SpaceTac.Specs {
             expect(ship.values.hull.get()).toEqual(40);
             expect(ship.values.shield.get()).toEqual(80);
             expect(battle.log.events.length).toBe(3);
-            expect(battle.log.events[0]).toEqual(new ValueChangeEvent(ship, ship.values.shield));
-            expect(battle.log.events[1]).toEqual(new ValueChangeEvent(ship, ship.values.hull));
+            expect(battle.log.events[0]).toEqual(new ValueChangeEvent(ship, ship.values.shield, -20));
+            expect(battle.log.events[1]).toEqual(new ValueChangeEvent(ship, ship.values.hull, -10));
             expect(battle.log.events[2]).toEqual(new DamageEvent(ship, 10, 20));
 
             battle.log.clear();
diff --git a/src/core/Ship.ts b/src/core/Ship.ts
index 0ac82e3..3294647 100644
--- a/src/core/Ship.ts
+++ b/src/core/Ship.ts
@@ -195,20 +195,20 @@ module TS.SpaceTac {
          * Returns true if the value changed.
          */
         setValue(name: keyof ShipValues, value: number, offset = false, log = true): boolean {
-            let changed: boolean;
+            let diff = 0;
             let val = this.values[name];
 
             if (offset) {
-                changed = val.add(value);
+                diff = val.add(value);
             } else {
-                changed = val.set(value);
+                diff = val.set(value);
             }
 
-            if (changed && log) {
-                this.addBattleEvent(new ValueChangeEvent(this, val));
+            if (log && diff != 0) {
+                this.addBattleEvent(new ValueChangeEvent(this, val, diff));
             }
 
-            return changed;
+            return diff != 0;
         }
 
         /**
@@ -226,10 +226,8 @@ module TS.SpaceTac {
          * Returns true if the value changed.
          */
         setAttribute(name: keyof ShipAttributes, value: number, log = true): boolean {
-            let changed: boolean;
             let attr = this.attributes[name];
-
-            changed = attr.set(value);
+            let diff = attr.set(value);
 
             // TODO more generic
             if (name == "power_capacity") {
@@ -240,11 +238,11 @@ module TS.SpaceTac {
                 this.values.hull.setMaximal(attr.get());
             }
 
-            if (changed && log) {
-                this.addBattleEvent(new ValueChangeEvent(this, attr));
+            if (log && diff != 0) {
+                this.addBattleEvent(new ValueChangeEvent(this, attr, diff));
             }
 
-            return changed;
+            return diff != 0;
         }
 
         // Initialize the action points counter
diff --git a/src/core/ShipValue.spec.ts b/src/core/ShipValue.spec.ts
index a8e7872..8e7aa7c 100644
--- a/src/core/ShipValue.spec.ts
+++ b/src/core/ShipValue.spec.ts
@@ -39,34 +39,34 @@ module TS.SpaceTac {
             expect(attr.get()).toBe(50);
         });
 
-        it("tells if value changed", function () {
-            var result: boolean;
+        it("tells the value variation", function () {
+            var result: number;
             var attr = new ShipValue("test", 50, 100);
             expect(attr.get()).toBe(50);
 
             result = attr.set(51);
-            expect(result).toBe(true);
+            expect(result).toBe(1);
 
             result = attr.set(51);
-            expect(result).toBe(false);
+            expect(result).toBe(0);
 
             result = attr.add(1);
-            expect(result).toBe(true);
+            expect(result).toBe(1);
 
             result = attr.add(0);
-            expect(result).toBe(false);
+            expect(result).toBe(0);
 
             result = attr.add(1000);
-            expect(result).toBe(true);
+            expect(result).toBe(48);
 
             result = attr.add(2000);
-            expect(result).toBe(false);
+            expect(result).toBe(0);
 
             result = attr.set(-500);
-            expect(result).toBe(true);
+            expect(result).toBe(-100);
 
             result = attr.add(-600);
-            expect(result).toBe(false);
+            expect(result).toBe(0);
         });
     });
 }
diff --git a/src/core/ShipValue.ts b/src/core/ShipValue.ts
index bf46f33..612a433 100644
--- a/src/core/ShipValue.ts
+++ b/src/core/ShipValue.ts
@@ -36,13 +36,13 @@ module TS.SpaceTac {
         /**
          * Set an absolute value
          * 
-         * Returns true if the value changed
+         * Returns the variation in value
          */
-        set(value: number): boolean {
+        set(value: number): number {
             var old_value = this.current;
             this.current = value;
             this.fix();
-            return this.current !== old_value;
+            return this.current - old_value;
         }
 
         /** 
@@ -50,11 +50,11 @@ module TS.SpaceTac {
          * 
          * Returns true if the value changed
          */
-        add(value: number): boolean {
+        add(value: number): number {
             var old_value = this.current;
             this.current += value;
             this.fix();
-            return this.current !== old_value;
+            return this.current - old_value;
         }
 
         /**
diff --git a/src/core/ai/BullyAI.spec.ts b/src/core/ai/BullyAI.spec.ts
index aa29179..1e52aff 100644
--- a/src/core/ai/BullyAI.spec.ts
+++ b/src/core/ai/BullyAI.spec.ts
@@ -235,17 +235,13 @@ module TS.SpaceTac.Specs {
             expect(battle.log.events.length).toBe(7);
 
             expect(battle.log.events[0]).toEqual(new MoveEvent(ship1, 2, 0));
-            expect(battle.log.events[1]).toEqual(new ValueChangeEvent(ship1,
-                new ShipValue("power", 2, 10)));
+            expect(battle.log.events[1]).toEqual(new ValueChangeEvent(ship1, new ShipValue("power", 2, 10), -4));
 
             expect(battle.log.events[2]).toEqual(new FireEvent(ship1, weapon, Target.newFromShip(ship2)));
-            expect(battle.log.events[3]).toEqual(new ValueChangeEvent(ship2,
-                new ShipValue("shield", 0)));
-            expect(battle.log.events[4]).toEqual(new ValueChangeEvent(ship2,
-                new ShipValue("hull", 5)));
+            expect(battle.log.events[3]).toEqual(new ValueChangeEvent(ship2, new ShipValue("shield", 0), -10));
+            expect(battle.log.events[4]).toEqual(new ValueChangeEvent(ship2, new ShipValue("hull", 5), -10));
             expect(battle.log.events[5]).toEqual(new DamageEvent(ship2, 10, 10));
-            expect(battle.log.events[6]).toEqual(new ValueChangeEvent(ship1,
-                new ShipValue("power", 1, 10)));
+            expect(battle.log.events[6]).toEqual(new ValueChangeEvent(ship1, new ShipValue("power", 1, 10), -1));
         });
     });
 }
diff --git a/src/core/events/ValueChangeEvent.ts b/src/core/events/ValueChangeEvent.ts
index d70fab4..b186d15 100644
--- a/src/core/events/ValueChangeEvent.ts
+++ b/src/core/events/ValueChangeEvent.ts
@@ -3,13 +3,17 @@
 module TS.SpaceTac {
     // Event logged when a ship value or attribute changed
     export class ValueChangeEvent extends BaseLogEvent {
-        // Saved version of the value
+        // Saved version of the current value
         value: ShipValue;
 
-        constructor(ship: Ship, value: ShipValue) {
+        // Value variation
+        diff: number;
+
+        constructor(ship: Ship, value: ShipValue, diff: number) {
             super("value", ship);
 
             this.value = copy(value);
+            this.diff = diff;
         }
     }
 }
diff --git a/src/ui/Preload.ts b/src/ui/Preload.ts
index 8ccb25b..84b66f5 100644
--- a/src/ui/Preload.ts
+++ b/src/ui/Preload.ts
@@ -56,6 +56,7 @@ module TS.SpaceTac.UI {
             this.loadImage("battle/actions/deploy-repairdrone.png");
             this.loadImage("battle/weapon/bullet.png");
             this.loadImage("battle/attributes/power.png");
+            this.loadImage("battle/attributes/powercapacity.png");
             this.loadImage("battle/attributes/effect-increase.png");
             this.loadImage("battle/attributes/effect-decrease.png");
             this.loadImage("battle/attributes/effect-limit.png");
diff --git a/src/ui/battle/Arena.ts b/src/ui/battle/Arena.ts
index 143f3ff..5b3f92c 100644
--- a/src/ui/battle/Arena.ts
+++ b/src/ui/battle/Arena.ts
@@ -2,6 +2,9 @@ module TS.SpaceTac.UI {
     // Graphical representation of a battle
     //  This is the area in the BattleView that will display ships with their real positions
     export class Arena extends Phaser.Group {
+        // Link to battleview
+        battleview: BattleView;
+
         // Arena background
         background: Phaser.Button;
 
@@ -11,9 +14,6 @@ module TS.SpaceTac.UI {
         // Input callback to receive mouse move events
         private input_callback: any;
 
-        // Link to battleview
-        private battleview: BattleView;
-
         // List of ship sprites
         private ship_sprites: ArenaShip[] = [];
 
@@ -75,8 +75,8 @@ module TS.SpaceTac.UI {
         // Initialize state (create sprites)
         init(): void {
             // Add ship sprites
-            this.battleview.battle.play_order.forEach((ship: Ship) => {
-                var sprite = new ArenaShip(this.battleview, ship);
+            this.battleview.battle.play_order.forEach(ship => {
+                var sprite = new ArenaShip(this, ship);
                 this.addChild(sprite);
                 this.ship_sprites.push(sprite);
             });
@@ -92,6 +92,7 @@ module TS.SpaceTac.UI {
             var sprite = this.findShipSprite(ship);
             if (sprite) {
                 sprite.alpha = 0.5;
+                sprite.displayEffect("Emergency Stasis", false);
             }
         }
 
diff --git a/src/ui/battle/ArenaShip.spec.ts b/src/ui/battle/ArenaShip.spec.ts
new file mode 100644
index 0000000..f964a4a
--- /dev/null
+++ b/src/ui/battle/ArenaShip.spec.ts
@@ -0,0 +1,24 @@
+/// <reference path="../TestGame.ts"/>
+
+module TS.SpaceTac.UI.Specs {
+    describe("ArenaShip", () => {
+        inbattleview_it("adds effects display", (battleview: BattleView) => {
+            let ship = battleview.battle.playing_ship;
+            let sprite = battleview.arena.findShipSprite(ship);
+
+            expect(sprite.effects.children.length).toBe(0);
+
+            sprite.displayValueChanged(new ValueChangeEvent(ship, ship.attributes.power_recovery, -4));
+
+            expect(sprite.effects.children.length).toBe(1);
+            let t1 = <Phaser.Text>sprite.effects.getChildAt(0);
+            expect(t1.text).toBe("power recovery -4");
+
+            sprite.displayValueChanged(new ValueChangeEvent(ship, ship.values.shield, 12));
+
+            expect(sprite.effects.children.length).toBe(2);
+            let t2 = <Phaser.Text>sprite.effects.getChildAt(1);
+            expect(t2.text).toBe("shield +12");
+        });
+    });
+}
diff --git a/src/ui/battle/ArenaShip.ts b/src/ui/battle/ArenaShip.ts
index e9c628e..fe5f084 100644
--- a/src/ui/battle/ArenaShip.ts
+++ b/src/ui/battle/ArenaShip.ts
@@ -16,30 +16,38 @@ module TS.SpaceTac.UI {
         // Frame to indicate the owner of the ship, and if it is playing
         frame: Phaser.Image;
 
+        // Effects display
+        effects: Phaser.Group;
+
         // Create a ship sprite usable in the Arena
-        constructor(battleview: BattleView, ship: Ship) {
-            super(battleview.game);
+        constructor(parent: Arena, ship: Ship) {
+            super(parent.game);
+            let battleview = parent.battleview;
 
             this.ship = ship;
             this.enemy = this.ship.getPlayer() != battleview.player;
 
             // Add ship sprite
-            this.sprite = new Phaser.Button(battleview.game, 0, 0, "ship-" + ship.model + "-sprite");
+            this.sprite = new Phaser.Button(this.game, 0, 0, "ship-" + ship.model + "-sprite");
             this.sprite.rotation = ship.arena_angle;
             this.sprite.anchor.set(0.5, 0.5);
             this.addChild(this.sprite);
 
             // Add playing effect
-            this.frame = new Phaser.Image(battleview.game, 0, 0, `battle-arena-ship-normal-${this.enemy ? "enemy" : "own"}`, 0);
+            this.frame = new Phaser.Image(this.game, 0, 0, `battle-arena-ship-normal-${this.enemy ? "enemy" : "own"}`, 0);
             this.frame.anchor.set(0.5, 0.5);
             this.addChild(this.frame);
 
             // Add hover effect
-            this.hover = new Phaser.Image(battleview.game, 0, 0, "battle-arena-ship-hover", 0);
+            this.hover = new Phaser.Image(this.game, 0, 0, "battle-arena-ship-hover", 0);
             this.hover.anchor.set(0.5, 0.5);
             this.hover.visible = false;
             this.addChild(this.hover);
 
+            // Effects display
+            this.effects = new Phaser.Group(this.game);
+            this.addChild(this.effects);
+
             // Handle input on ship sprite
             Tools.setHoverClick(this.sprite, () => battleview.cursorOnShip(ship), () => battleview.cursorOffShip(ship), () => battleview.cursorClicked());
 
@@ -75,33 +83,28 @@ module TS.SpaceTac.UI {
             }
         }
 
-        // Briefly display the damage done to the ship
-        displayDamage(hull: number, shield: number) {
-            if (hull > 0) {
-                var hull_text = new Phaser.Text(this.game, -20, -20, Math.round(hull).toString(),
-                    { font: "bold 16pt Arial", align: "center", fill: "#eb4e4a" });
-                hull_text.anchor.set(0.5, 0.5);
-                this.addChild(hull_text);
-                this.animateDamageText(hull_text);
-            }
-            if (shield > 0) {
-                var shield_text = new Phaser.Text(this.game, 20, -20, Math.round(shield).toString(),
-                    { font: "bold 16pt Arial", align: "center", fill: "#2ad8dc" });
-                shield_text.anchor.set(0.5, 0.5);
-                this.addChild(shield_text);
-                this.animateDamageText(shield_text);
-            }
+        /**
+         * Briefly show an effect on this ship
+         */
+        displayEffect(message: string, beneficial: boolean) {
+            let text = new Phaser.Text(this.game, 0, 20 * this.effects.children.length, message, { font: "14pt Arial", fill: beneficial ? "#afe9c6" : "#e9afaf" });
+            this.effects.addChild(text);
+
+            this.effects.position.set(-this.effects.width / 2, this.sprite.height * 0.7);
+
+            this.game.tweens.removeFrom(this.effects);
+            this.effects.alpha = 1;
+            let tween = this.game.tweens.create(this.effects).to({ alpha: 0 }, 500).delay(1000).start();
+            tween.onComplete.addOnce(() => this.effects.removeAll(true));
         }
 
-        private animateDamageText(text: Phaser.Text) {
-            text.alpha = 0;
-            var tween = this.game.tweens.create(text);
-            tween.to({ alpha: 1 }, 100, Phaser.Easing.Circular.In, false, 400);
-            tween.to({ y: -50, alpha: 0 }, 1000, Phaser.Easing.Circular.In, false, 1000);
-            tween.onComplete.addOnce(() => {
-                text.destroy();
-            });
-            tween.start();
+        /**
+         * Display interesting changes in ship values
+         */
+        displayValueChanged(event: ValueChangeEvent) {
+            let diff = event.diff;
+            let name = event.value.name;
+            this.displayEffect(`${name} ${diff < 0 ? "-" : "+"}${Math.abs(diff)}`, diff >= 0);
         }
     }
 }
diff --git a/src/ui/battle/LogProcessor.ts b/src/ui/battle/LogProcessor.ts
index 1d90259..0789fcd 100644
--- a/src/ui/battle/LogProcessor.ts
+++ b/src/ui/battle/LogProcessor.ts
@@ -72,10 +72,6 @@ module TS.SpaceTac.UI {
 
         // Damage to ship
         private processDamageEvent(event: DamageEvent): void {
-            var sprite = this.view.arena.findShipSprite(event.ship);
-            if (sprite) {
-                sprite.displayDamage(event.hull, event.shield);
-            }
             var item = this.view.ship_list.findItem(event.ship);
             if (item) {
                 item.setDamageHit();
@@ -92,10 +88,14 @@ module TS.SpaceTac.UI {
 
         // Ship value changed
         private processValueChangedEvent(event: ValueChangeEvent): void {
+            var sprite = this.view.arena.findShipSprite(event.ship);
+            sprite.displayValueChanged(event);
+
             var item = this.view.ship_list.findItem(event.ship);
             if (item) {
                 item.updateAttributes();
             }
+
             // TODO Update tooltip
         }
 
diff --git a/src/ui/battle/ShipTooltip.ts b/src/ui/battle/ShipTooltip.ts
index 6413822..668c9c1 100644
--- a/src/ui/battle/ShipTooltip.ts
+++ b/src/ui/battle/ShipTooltip.ts
@@ -136,7 +136,7 @@ module TS.SpaceTac.UI {
             }
 
             let text = `${effect.getDescription()} (${effect.duration} turns)`;
-            let color = effect.isBeneficial() ? "afe9c6" : "#e9afaf";
+            let color = effect.isBeneficial() ? "#afe9c6" : "#e9afaf";
             let effect_text = new Phaser.Text(this.game, 60, effect_group.height / 2, text, { font: "16pt Arial", fill: color });
             effect_text.anchor.set(0, 0.5);
             effect_group.addChild(effect_text);