From 04035cce8c1127a3ddfb2cd0217acdbefd1d031f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Fri, 23 Jan 2015 01:00:00 +0100 Subject: [PATCH] Reorganized assets --- .../images/{ui => }/battle/actionbar.png | Bin .../{ui => }/battle/actionpointsempty.png | Bin .../{ui => }/battle/actionpointsfull.png | Bin .../background.png} | Bin .../images/battle/{ => arena}/ship01.png | Bin .../arena}/shipspritehover.png | Bin .../standard-bar-background.png} | Bin .../standard-bar-foreground.png} | Bin src/scripts/view/Preload.ts | 22 +++++++++--------- src/scripts/view/battle/ActionBar.ts | 6 ++--- src/scripts/view/battle/Arena.ts | 2 +- src/scripts/view/battle/ArenaShip.ts | 4 ++-- src/scripts/view/battle/ShipCard.ts | 2 +- src/scripts/view/battle/ShipListItem.ts | 2 +- src/scripts/view/common/ValueBar.ts | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) rename src/assets/images/{ui => }/battle/actionbar.png (100%) rename src/assets/images/{ui => }/battle/actionpointsempty.png (100%) rename src/assets/images/{ui => }/battle/actionpointsfull.png (100%) rename src/assets/images/battle/{arena-background.png => arena/background.png} (100%) rename src/assets/images/battle/{ => arena}/ship01.png (100%) rename src/assets/images/{ui/battle => battle/arena}/shipspritehover.png (100%) rename src/assets/images/{ui/bars/standard-background.png => common/standard-bar-background.png} (100%) rename src/assets/images/{ui/bars/standard-foreground.png => common/standard-bar-foreground.png} (100%) diff --git a/src/assets/images/ui/battle/actionbar.png b/src/assets/images/battle/actionbar.png similarity index 100% rename from src/assets/images/ui/battle/actionbar.png rename to src/assets/images/battle/actionbar.png diff --git a/src/assets/images/ui/battle/actionpointsempty.png b/src/assets/images/battle/actionpointsempty.png similarity index 100% rename from src/assets/images/ui/battle/actionpointsempty.png rename to src/assets/images/battle/actionpointsempty.png diff --git a/src/assets/images/ui/battle/actionpointsfull.png b/src/assets/images/battle/actionpointsfull.png similarity index 100% rename from src/assets/images/ui/battle/actionpointsfull.png rename to src/assets/images/battle/actionpointsfull.png diff --git a/src/assets/images/battle/arena-background.png b/src/assets/images/battle/arena/background.png similarity index 100% rename from src/assets/images/battle/arena-background.png rename to src/assets/images/battle/arena/background.png diff --git a/src/assets/images/battle/ship01.png b/src/assets/images/battle/arena/ship01.png similarity index 100% rename from src/assets/images/battle/ship01.png rename to src/assets/images/battle/arena/ship01.png diff --git a/src/assets/images/ui/battle/shipspritehover.png b/src/assets/images/battle/arena/shipspritehover.png similarity index 100% rename from src/assets/images/ui/battle/shipspritehover.png rename to src/assets/images/battle/arena/shipspritehover.png diff --git a/src/assets/images/ui/bars/standard-background.png b/src/assets/images/common/standard-bar-background.png similarity index 100% rename from src/assets/images/ui/bars/standard-background.png rename to src/assets/images/common/standard-bar-background.png diff --git a/src/assets/images/ui/bars/standard-foreground.png b/src/assets/images/common/standard-bar-foreground.png similarity index 100% rename from src/assets/images/ui/bars/standard-foreground.png rename to src/assets/images/common/standard-bar-foreground.png diff --git a/src/scripts/view/Preload.ts b/src/scripts/view/Preload.ts index 0d04173..6d5c35f 100644 --- a/src/scripts/view/Preload.ts +++ b/src/scripts/view/Preload.ts @@ -11,17 +11,17 @@ module SpaceTac.View { this.load.setPreloadSprite(this.preloadBar); // Load assets - this.load.image("ui-shiplist-own", "assets/images/battle/shiplist-own.png"); - this.load.image("ui-shiplist-enemy", "assets/images/battle/shiplist-enemy.png"); - this.load.image("ui-arena-background", "assets/images/battle/arena-background.png"); - this.load.image("ui-battle-actionbar", "assets/images/ui/battle/actionbar.png"); - this.load.image("ui-battle-actionpointsempty", "assets/images/ui/battle/actionpointsempty.png"); - this.load.image("ui-battle-actionpointsfull", "assets/images/ui/battle/actionpointsfull.png"); - this.load.image("ui-battle-shipspritehover", "assets/images/ui/battle/shipspritehover.png"); - this.load.image("ui-ship-card", "assets/images/battle/ship-card.png"); - this.load.image("arena-ship", "assets/images/battle/ship01.png"); - this.load.image("ui-bar-standard-background", "assets/images/ui/bars/standard-background.png"); - this.load.image("ui-bar-standard-foreground", "assets/images/ui/bars/standard-foreground.png"); + this.load.image("battle-shiplist-own", "assets/images/battle/shiplist-own.png"); + this.load.image("battle-shiplist-enemy", "assets/images/battle/shiplist-enemy.png"); + this.load.image("battle-arena-background", "assets/images/battle/arena/background.png"); + this.load.image("battle-actionbar", "assets/images/battle/actionbar.png"); + this.load.image("battle-actionpointsempty", "assets/images/battle/actionpointsempty.png"); + this.load.image("battle-actionpointsfull", "assets/images/battle/actionpointsfull.png"); + this.load.image("battle-arena-shipspritehover", "assets/images/battle/arena/shipspritehover.png"); + this.load.image("battle-ship-card", "assets/images/battle/ship-card.png"); + this.load.image("battle-arena-ship01", "assets/images/battle/arena/ship01.png"); + this.load.image("common-standard-bar-background", "assets/images/common/standard-bar-background.png"); + this.load.image("common-standard-bar-foreground", "assets/images/common/standard-bar-foreground.png"); } create() { diff --git a/src/scripts/view/battle/ActionBar.ts b/src/scripts/view/battle/ActionBar.ts index b926c26..5c9bad1 100644 --- a/src/scripts/view/battle/ActionBar.ts +++ b/src/scripts/view/battle/ActionBar.ts @@ -21,12 +21,12 @@ module SpaceTac.View { this.actions = []; this.ship = null; - super(battleview.game, 170, 0, "ui-battle-actionbar"); + super(battleview.game, 170, 0, "battle-actionbar"); battleview.ui.add(this); // Action points progress bar - this.actionpoints = new ValueBar(battleview.game, 119, 76, "ui-battle-actionpointsempty"); - this.actionpoints.setBarImage("ui-battle-actionpointsfull"); + this.actionpoints = new ValueBar(battleview.game, 119, 76, "battle-actionpointsempty"); + this.actionpoints.setBarImage("battle-actionpointsfull"); this.addChild(this.actionpoints); } diff --git a/src/scripts/view/battle/Arena.ts b/src/scripts/view/battle/Arena.ts index d64d5ad..6bbd9d5 100644 --- a/src/scripts/view/battle/Arena.ts +++ b/src/scripts/view/battle/Arena.ts @@ -23,7 +23,7 @@ module SpaceTac.View { super(battleview.game); - var background = new Phaser.Button(battleview.game, 0, 0, "ui-arena-background"); + var background = new Phaser.Button(battleview.game, 0, 0, "battle-arena-background"); var expected_width = 1280 - 252; var expected_height = 720 - 100; background.scale.set(expected_width / background.width, expected_height / background.height); diff --git a/src/scripts/view/battle/ArenaShip.ts b/src/scripts/view/battle/ArenaShip.ts index 0b0123d..e6f1e05 100644 --- a/src/scripts/view/battle/ArenaShip.ts +++ b/src/scripts/view/battle/ArenaShip.ts @@ -19,14 +19,14 @@ module SpaceTac.View { super(battleview.game); // Add hover effect - this.hover = new Phaser.Image(battleview.game, 0, 0, "ui-battle-shipspritehover", 0); + this.hover = new Phaser.Image(battleview.game, 0, 0, "battle-arena-shipspritehover", 0); this.hover.scale.set(0.4, 0.4); this.hover.anchor.set(0.5, 0.5); this.hover.visible = false; this.addChild(this.hover); // Add ship sprite - this.sprite = new Phaser.Button(battleview.game, 0, 0, "arena-ship"); + this.sprite = new Phaser.Button(battleview.game, 0, 0, "battle-arena-ship01"); this.sprite.scale.set(0.1, 0.1); this.sprite.rotation = ship.arena_angle; this.sprite.anchor.set(0.5, 0.5); diff --git a/src/scripts/view/battle/ShipCard.ts b/src/scripts/view/battle/ShipCard.ts index 4ef191d..6a80de2 100644 --- a/src/scripts/view/battle/ShipCard.ts +++ b/src/scripts/view/battle/ShipCard.ts @@ -8,7 +8,7 @@ module SpaceTac.View { // Build an empty ship card constructor(battleview: BattleView, x: number, y: number) { - super(battleview.game, x, y, "ui-ship-card"); + super(battleview.game, x, y, "battle-ship-card"); this.ship = null; this.visible = false; diff --git a/src/scripts/view/battle/ShipListItem.ts b/src/scripts/view/battle/ShipListItem.ts index f8fd92d..4acb96b 100644 --- a/src/scripts/view/battle/ShipListItem.ts +++ b/src/scripts/view/battle/ShipListItem.ts @@ -10,7 +10,7 @@ module SpaceTac.View { constructor(list: ShipList, x: number, y: number, ship: Game.Ship, owned: boolean) { this.ship = ship; - super(list.battleview.game, x, y, owned ? "ui-shiplist-own" : "ui-shiplist-enemy"); + super(list.battleview.game, x, y, owned ? "battle-shiplist-own" : "battle-shiplist-enemy"); this.input.useHandCursor = true; this.onInputOver.add(() => { diff --git a/src/scripts/view/common/ValueBar.ts b/src/scripts/view/common/ValueBar.ts index d1f9dc4..9fd5ffb 100644 --- a/src/scripts/view/common/ValueBar.ts +++ b/src/scripts/view/common/ValueBar.ts @@ -17,8 +17,8 @@ module SpaceTac.View { // Create a quick standard bar static newStandard(game: Phaser.Game, x: number, y: number): ValueBar { - var result = new ValueBar(game, x, y, "ui-bar-standard-background"); - result.setBarImage("ui-bar-standard-foreground", 5, 5); + var result = new ValueBar(game, x, y, "common-standard-bar-background"); + result.setBarImage("common-standard-bar-foreground", 5, 5); return result; }