From 01877b8e37cfcdbfb1cedee15e6247711374fbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 23 Feb 2015 01:00:00 +0100 Subject: [PATCH] Added action icons --- graphics/ui/actions.svg | 114 ++++++++++++++++++ src/assets/images/battle/action-active.png | Bin 9747 -> 8707 bytes src/assets/images/battle/action-inactive.png | Bin 5136 -> 3912 bytes src/assets/images/battle/actions/endturn.png | Bin 0 -> 1400 bytes .../images/battle/actions/fire-gatlinggun.png | Bin 0 -> 2657 bytes src/assets/images/battle/actions/move.png | Bin 127 -> 1782 bytes src/scripts/game/LootTemplate.ts | 4 +- src/scripts/game/Tools.ts | 5 - src/scripts/game/actions/FireWeaponAction.ts | 2 +- src/scripts/game/specs/AbstractWeapon.spec.ts | 2 +- src/scripts/game/specs/LootTemplate.spec.ts | 6 +- src/scripts/view/Preload.ts | 2 + src/scripts/view/battle/ActionIcon.ts | 3 +- 13 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 graphics/ui/actions.svg create mode 100644 src/assets/images/battle/actions/endturn.png create mode 100644 src/assets/images/battle/actions/fire-gatlinggun.png diff --git a/graphics/ui/actions.svg b/graphics/ui/actions.svg new file mode 100644 index 0000000..fc4ebe1 --- /dev/null +++ b/graphics/ui/actions.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/assets/images/battle/action-active.png b/src/assets/images/battle/action-active.png index a4861b55bc984311995bd9ed9bb83eb642706f49..c06a38a15db6391b2d343e5f41e0363f6fd2d23d 100644 GIT binary patch delta 8653 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 diff --git a/src/assets/images/battle/action-inactive.png b/src/assets/images/battle/action-inactive.png index 77ec3a34cdc5e5c51d90fa9f65df4e22bbd47ca8..46daf9e7714c95bda6e1a3ef1e34a923d01ac9a2 100644 GIT binary patch delta 3831 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 delta 5065 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 diff --git a/src/assets/images/battle/actions/endturn.png b/src/assets/images/battle/actions/endturn.png new file mode 100644 index 0000000000000000000000000000000000000000..a1efe392de1c4d1c49a3de310bba698d3486adcd GIT binary patch literal 1400 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 diff --git a/src/scripts/game/LootTemplate.ts b/src/scripts/game/LootTemplate.ts index f6b7d8b..05aff20 100644 --- a/src/scripts/game/LootTemplate.ts +++ b/src/scripts/game/LootTemplate.ts @@ -6,7 +6,7 @@ module SpaceTac.Game { // Type of slot this equipment will fit in slot: SlotType; - // Base name, lower cased + // Base name that will be given to generated equipment name: string; // Capability requirement ranges (indexed by AttributeCode) @@ -64,7 +64,7 @@ module SpaceTac.Game { var result = new Equipment(); result.slot = this.slot; - result.code = Tools.getClassName(this); + result.code = (this.name || "").toLowerCase().replace(/ /g, ""); result.name = this.name; result.distance = this.distance.getProportional(power); diff --git a/src/scripts/game/Tools.ts b/src/scripts/game/Tools.ts index 0e29723..2581bff 100644 --- a/src/scripts/game/Tools.ts +++ b/src/scripts/game/Tools.ts @@ -16,10 +16,5 @@ module SpaceTac.Game { return objectCopy; } - - // Get a class name, from an instance - static getClassName(object: any): string { - return object.constructor.name; - } } } diff --git a/src/scripts/game/actions/FireWeaponAction.ts b/src/scripts/game/actions/FireWeaponAction.ts index a4703cb..d73b239 100644 --- a/src/scripts/game/actions/FireWeaponAction.ts +++ b/src/scripts/game/actions/FireWeaponAction.ts @@ -9,7 +9,7 @@ module SpaceTac.Game { can_target_space: boolean; constructor(equipment: Equipment, can_target_space: boolean = false) { - super("fire", true, equipment); + super("fire-" + equipment.code, true, equipment); this.can_target_space = can_target_space; } diff --git a/src/scripts/game/specs/AbstractWeapon.spec.ts b/src/scripts/game/specs/AbstractWeapon.spec.ts index a9cc309..dc82ab9 100644 --- a/src/scripts/game/specs/AbstractWeapon.spec.ts +++ b/src/scripts/game/specs/AbstractWeapon.spec.ts @@ -15,7 +15,7 @@ module SpaceTac.Game.Specs { expect(effect.value).toEqual(51); var action = equipment.action; - expect(action.code).toEqual("fire"); + expect(action.code).toEqual("fire-superfireweapon"); expect(action.needs_target).toBe(true); }); diff --git a/src/scripts/game/specs/LootTemplate.spec.ts b/src/scripts/game/specs/LootTemplate.spec.ts index 4d6132d..1f76be4 100644 --- a/src/scripts/game/specs/LootTemplate.spec.ts +++ b/src/scripts/game/specs/LootTemplate.spec.ts @@ -18,7 +18,7 @@ module SpaceTac.Game.Specs { var equipment = template.generateFixed(0.0); expect(equipment.slot).toEqual(SlotType.Weapon); - expect(equipment.code).toEqual("LootTemplate"); + expect(equipment.code).toEqual("bulletator"); expect(equipment.name).toEqual("Bulletator"); expect(equipment.distance).toEqual(1); expect(equipment.blast).toEqual(1); @@ -32,7 +32,7 @@ module SpaceTac.Game.Specs { equipment = template.generateFixed(1.0); expect(equipment.slot).toEqual(SlotType.Weapon); - expect(equipment.code).toEqual("LootTemplate"); + expect(equipment.code).toEqual("bulletator"); expect(equipment.name).toEqual("Bulletator"); expect(equipment.distance).toEqual(3); expect(equipment.blast).toEqual(1); @@ -46,7 +46,7 @@ module SpaceTac.Game.Specs { equipment = template.generateFixed(0.5); expect(equipment.slot).toEqual(SlotType.Weapon); - expect(equipment.code).toEqual("LootTemplate"); + expect(equipment.code).toEqual("bulletator"); expect(equipment.name).toEqual("Bulletator"); expect(equipment.distance).toEqual(2); expect(equipment.blast).toEqual(1); diff --git a/src/scripts/view/Preload.ts b/src/scripts/view/Preload.ts index 31ce664..a9afc3b 100644 --- a/src/scripts/view/Preload.ts +++ b/src/scripts/view/Preload.ts @@ -28,6 +28,8 @@ module SpaceTac.View { this.loadImage("battle/arena/shipspriteplaying.png"); this.loadImage("battle/ship-card.png"); this.loadImage("battle/actions/move.png"); + this.loadImage("battle/actions/endturn.png"); + this.loadImage("battle/actions/fire-gatlinggun.png"); this.loadImage("battle/weapon/bullet.png"); this.loadImage("ship/scout/sprite.png"); this.loadImage("ship/scout/portrait.png"); diff --git a/src/scripts/view/battle/ActionIcon.ts b/src/scripts/view/battle/ActionIcon.ts index 9ac67ca..e49a01e 100644 --- a/src/scripts/view/battle/ActionIcon.ts +++ b/src/scripts/view/battle/ActionIcon.ts @@ -39,7 +39,7 @@ module SpaceTac.View { this.addChild(this.layer_active); // Icon layer - this.layer_icon = new Phaser.Image(this.game, 14, 17, "battle-actions-" + action.code, 0); + this.layer_icon = new Phaser.Image(this.game, 15, 18, "battle-actions-" + action.code, 0); this.addChild(this.layer_icon); // Click process @@ -106,6 +106,7 @@ module SpaceTac.View { updateActiveStatus(): void { var active = this.action.canBeUsed(this.battleview.battle, this.ship); Animation.setVisibility(this.game, this.layer_active, active, 500); + this.game.tweens.create(this.layer_icon).to({alpha: active ? 1 : 0.3}, 500).start(); this.input.useHandCursor = active; } }