diff --git a/graphics/exported/battle/tooltip/ship-portrait.png b/graphics/exported/battle/tooltip/ship-portrait.png index be181f5..38b2a81 100644 Binary files a/graphics/exported/battle/tooltip/ship-portrait.png and b/graphics/exported/battle/tooltip/ship-portrait.png differ diff --git a/graphics/exported/ship/avenger/portrait.png b/graphics/exported/ship/avenger/portrait.png index 38762af..8b99142 100644 Binary files a/graphics/exported/ship/avenger/portrait.png and b/graphics/exported/ship/avenger/portrait.png differ diff --git a/graphics/exported/ship/avenger/sprite.png b/graphics/exported/ship/avenger/sprite.png index 731a70c..8e6599a 100644 Binary files a/graphics/exported/ship/avenger/sprite.png and b/graphics/exported/ship/avenger/sprite.png differ diff --git a/graphics/exported/ship/breeze/portrait.png b/graphics/exported/ship/breeze/portrait.png index 01cdabc..0451b18 100644 Binary files a/graphics/exported/ship/breeze/portrait.png and b/graphics/exported/ship/breeze/portrait.png differ diff --git a/graphics/exported/ship/breeze/sprite.png b/graphics/exported/ship/breeze/sprite.png index 4585bfe..201dbb7 100644 Binary files a/graphics/exported/ship/breeze/sprite.png and b/graphics/exported/ship/breeze/sprite.png differ diff --git a/graphics/exported/ship/commodore/portrait.png b/graphics/exported/ship/commodore/portrait.png index eab214b..459bddf 100644 Binary files a/graphics/exported/ship/commodore/portrait.png and b/graphics/exported/ship/commodore/portrait.png differ diff --git a/graphics/exported/ship/commodore/sprite.png b/graphics/exported/ship/commodore/sprite.png index ae13ae1..771bc59 100644 Binary files a/graphics/exported/ship/commodore/sprite.png and b/graphics/exported/ship/commodore/sprite.png differ diff --git a/graphics/exported/ship/creeper/portrait.png b/graphics/exported/ship/creeper/portrait.png index 11824f9..f521c76 100644 Binary files a/graphics/exported/ship/creeper/portrait.png and b/graphics/exported/ship/creeper/portrait.png differ diff --git a/graphics/exported/ship/creeper/sprite.png b/graphics/exported/ship/creeper/sprite.png index 2cc7cf3..9bf6739 100644 Binary files a/graphics/exported/ship/creeper/sprite.png and b/graphics/exported/ship/creeper/sprite.png differ diff --git a/graphics/exported/ship/falcon/portrait.png b/graphics/exported/ship/falcon/portrait.png index 9686988..33cebf9 100644 Binary files a/graphics/exported/ship/falcon/portrait.png and b/graphics/exported/ship/falcon/portrait.png differ diff --git a/graphics/exported/ship/falcon/sprite.png b/graphics/exported/ship/falcon/sprite.png index 90663ca..3b35c13 100644 Binary files a/graphics/exported/ship/falcon/sprite.png and b/graphics/exported/ship/falcon/sprite.png differ diff --git a/graphics/exported/ship/flea/portrait.png b/graphics/exported/ship/flea/portrait.png index 6583ec8..f28f3fd 100644 Binary files a/graphics/exported/ship/flea/portrait.png and b/graphics/exported/ship/flea/portrait.png differ diff --git a/graphics/exported/ship/flea/sprite.png b/graphics/exported/ship/flea/sprite.png index b3a54a8..9377ff4 100644 Binary files a/graphics/exported/ship/flea/sprite.png and b/graphics/exported/ship/flea/sprite.png differ diff --git a/graphics/exported/ship/jumper/portrait.png b/graphics/exported/ship/jumper/portrait.png index afae6bb..e05b875 100644 Binary files a/graphics/exported/ship/jumper/portrait.png and b/graphics/exported/ship/jumper/portrait.png differ diff --git a/graphics/exported/ship/jumper/sprite.png b/graphics/exported/ship/jumper/sprite.png index d8b850e..901f047 100644 Binary files a/graphics/exported/ship/jumper/sprite.png and b/graphics/exported/ship/jumper/sprite.png differ diff --git a/graphics/exported/ship/rhino/portrait.png b/graphics/exported/ship/rhino/portrait.png index b6adda8..ff3f8db 100644 Binary files a/graphics/exported/ship/rhino/portrait.png and b/graphics/exported/ship/rhino/portrait.png differ diff --git a/graphics/exported/ship/rhino/sprite.png b/graphics/exported/ship/rhino/sprite.png index 707c327..c309887 100644 Binary files a/graphics/exported/ship/rhino/sprite.png and b/graphics/exported/ship/rhino/sprite.png differ diff --git a/graphics/exported/ship/scout/portrait.png b/graphics/exported/ship/scout/portrait.png deleted file mode 100644 index eb0c41e..0000000 Binary files a/graphics/exported/ship/scout/portrait.png and /dev/null differ diff --git a/graphics/exported/ship/scout/sprite.png b/graphics/exported/ship/scout/sprite.png deleted file mode 100644 index d6e64e4..0000000 Binary files a/graphics/exported/ship/scout/sprite.png and /dev/null differ diff --git a/graphics/exported/ship/tomahawk/portrait.png b/graphics/exported/ship/tomahawk/portrait.png index 4a4ccfb..f142093 100644 Binary files a/graphics/exported/ship/tomahawk/portrait.png and b/graphics/exported/ship/tomahawk/portrait.png differ diff --git a/graphics/exported/ship/tomahawk/sprite.png b/graphics/exported/ship/tomahawk/sprite.png index f7c0760..24571be 100644 Binary files a/graphics/exported/ship/tomahawk/sprite.png and b/graphics/exported/ship/tomahawk/sprite.png differ diff --git a/graphics/exported/ship/trapper/portrait.png b/graphics/exported/ship/trapper/portrait.png index 373a619..9141e75 100644 Binary files a/graphics/exported/ship/trapper/portrait.png and b/graphics/exported/ship/trapper/portrait.png differ diff --git a/graphics/exported/ship/trapper/sprite.png b/graphics/exported/ship/trapper/sprite.png index 1ffeda9..0ff37c0 100644 Binary files a/graphics/exported/ship/trapper/sprite.png and b/graphics/exported/ship/trapper/sprite.png differ diff --git a/graphics/exported/ship/whirlwind/portrait.png b/graphics/exported/ship/whirlwind/portrait.png deleted file mode 100644 index 0de6783..0000000 Binary files a/graphics/exported/ship/whirlwind/portrait.png and /dev/null differ diff --git a/graphics/exported/ship/whirlwind/sprite.png b/graphics/exported/ship/whirlwind/sprite.png deleted file mode 100644 index 40422dd..0000000 Binary files a/graphics/exported/ship/whirlwind/sprite.png and /dev/null differ diff --git a/graphics/exported/ship/xander/portrait.png b/graphics/exported/ship/xander/portrait.png index 6b3720c..09a4907 100644 Binary files a/graphics/exported/ship/xander/portrait.png and b/graphics/exported/ship/xander/portrait.png differ diff --git a/graphics/exported/ship/xander/sprite.png b/graphics/exported/ship/xander/sprite.png index df36fc8..246eb1f 100644 Binary files a/graphics/exported/ship/xander/sprite.png and b/graphics/exported/ship/xander/sprite.png differ diff --git a/graphics/ships/_base.blend b/graphics/ships/_base.blend new file mode 100644 index 0000000..ca1c5bd Binary files /dev/null and b/graphics/ships/_base.blend differ diff --git a/graphics/ships/avenger.blend b/graphics/ships/avenger.blend index 9bdcb93..89e3cba 100644 Binary files a/graphics/ships/avenger.blend and b/graphics/ships/avenger.blend differ diff --git a/graphics/ships/breeze.blend b/graphics/ships/breeze.blend index 5cb44da..0ff49d1 100644 Binary files a/graphics/ships/breeze.blend and b/graphics/ships/breeze.blend differ diff --git a/graphics/ships/commodore.blend b/graphics/ships/commodore.blend index f6f8843..bb3e916 100644 Binary files a/graphics/ships/commodore.blend and b/graphics/ships/commodore.blend differ diff --git a/graphics/ships/creeper.blend b/graphics/ships/creeper.blend index 62aeef4..9dfdda8 100644 Binary files a/graphics/ships/creeper.blend and b/graphics/ships/creeper.blend differ diff --git a/graphics/ships/falcon.blend b/graphics/ships/falcon.blend index 30a7e5e..c25d3c6 100644 Binary files a/graphics/ships/falcon.blend and b/graphics/ships/falcon.blend differ diff --git a/graphics/ships/flea.blend b/graphics/ships/flea.blend index f5be735..3417579 100644 Binary files a/graphics/ships/flea.blend and b/graphics/ships/flea.blend differ diff --git a/graphics/ships/jumper.blend b/graphics/ships/jumper.blend index a375e03..5be6855 100644 Binary files a/graphics/ships/jumper.blend and b/graphics/ships/jumper.blend differ diff --git a/graphics/ships/rhino.blend b/graphics/ships/rhino.blend index c3b29cd..34d09ff 100644 Binary files a/graphics/ships/rhino.blend and b/graphics/ships/rhino.blend differ diff --git a/graphics/ships/scout.blend b/graphics/ships/scout.blend deleted file mode 100644 index 31bc48d..0000000 Binary files a/graphics/ships/scout.blend and /dev/null differ diff --git a/graphics/ships/textures/portrait_env_map.jpg b/graphics/ships/textures/portrait_env_map.jpg index 7185793..93063f2 100644 Binary files a/graphics/ships/textures/portrait_env_map.jpg and b/graphics/ships/textures/portrait_env_map.jpg differ diff --git a/graphics/ships/textures/whirlwind_reactor.png b/graphics/ships/textures/whirlwind_reactor.png deleted file mode 100644 index d729a42..0000000 Binary files a/graphics/ships/textures/whirlwind_reactor.png and /dev/null differ diff --git a/graphics/ships/tomahawk.blend b/graphics/ships/tomahawk.blend index 37797bc..44d9db5 100644 Binary files a/graphics/ships/tomahawk.blend and b/graphics/ships/tomahawk.blend differ diff --git a/graphics/ships/trapper.blend b/graphics/ships/trapper.blend index 20dc0f3..95c0a74 100644 Binary files a/graphics/ships/trapper.blend and b/graphics/ships/trapper.blend differ diff --git a/graphics/ships/whirlwind.blend b/graphics/ships/whirlwind.blend deleted file mode 100644 index d2cd923..0000000 Binary files a/graphics/ships/whirlwind.blend and /dev/null differ diff --git a/graphics/ships/xander.blend b/graphics/ships/xander.blend index 8e0b968..7843b80 100644 Binary files a/graphics/ships/xander.blend and b/graphics/ships/xander.blend differ diff --git a/graphics/ui/battle.svg b/graphics/ui/battle.svg index eb870d9..d797fdb 100644 --- a/graphics/ui/battle.svg +++ b/graphics/ui/battle.svg @@ -16,7 +16,7 @@ viewBox="0 0 1920 1080" id="svg2" version="1.1" - inkscape:version="0.92.1 r15371" + inkscape:version="0.92.2 (unknown)" sodipodi:docname="battle.svg" inkscape:export-filename="/home/michael/workspace/perso/spacetac/graphics/exported/battle/actionbar/power-generated.png" inkscape:export-xdpi="96" @@ -2840,15 +2840,6 @@ stdDeviation="7.1538857" id="feGaussianBlur11151" /> - @@ -3200,6 +3191,15 @@ x2="1006.6031" y2="471.59311" gradientUnits="userSpaceOnUse" /> + + inkscape:snap-page="true" + inkscape:window-width="1920" + inkscape:window-height="1037" + inkscape:window-x="0" + inkscape:window-y="20" + inkscape:window-maximized="0" /> @@ -7113,13 +7118,13 @@ + transform="translate(0,60)"> + transform="translate(0,50)"> + transform="translate(82)"> Plays in 2 turns + id="g13275" + transform="translate(0,22)"> @@ -7337,7 +7343,7 @@ + transform="translate(3.125,22)"> + transform="translate(9.375,22)"> + transform="translate(12.499999,22)"> + transform="translate(6.25,22)"> diff --git a/src/core/ShipModel.ts b/src/core/ShipModel.ts index 739ca60..a67ae86 100644 --- a/src/core/ShipModel.ts +++ b/src/core/ShipModel.ts @@ -31,10 +31,8 @@ module TK.SpaceTac { // TODO Store in cache var result: ShipModel[] = []; - result.push(new ShipModel("scout", "Scout")); result.push(new ShipModel("breeze", "Breeze")); result.push(new ShipModel("creeper", "Creeper")); - result.push(new ShipModel("whirlwind", "Whirlwind")); result.push(new ShipModel("tomahawk", "Tomahawk")); result.push(new ShipModel("avenger", "Avenger")); result.push(new ShipModel("commodore", "Commodore")); diff --git a/src/ui/battle/ArenaShip.ts b/src/ui/battle/ArenaShip.ts index cbb7c34..81c0ffa 100644 --- a/src/ui/battle/ArenaShip.ts +++ b/src/ui/battle/ArenaShip.ts @@ -62,7 +62,6 @@ module TK.SpaceTac.UI { this.sprite = this.battleview.newImage(`ship-${ship.model.code}-sprite`); this.sprite.rotation = ship.arena_angle; this.sprite.anchor.set(0.5, 0.5); - this.sprite.scale.set(0.4); this.add(this.sprite); // Add stasis effect diff --git a/src/ui/battle/BattleSplash.ts b/src/ui/battle/BattleSplash.ts index 2cdfb2a..dab3446 100644 --- a/src/ui/battle/BattleSplash.ts +++ b/src/ui/battle/BattleSplash.ts @@ -28,7 +28,7 @@ module TK.SpaceTac.UI { fleet1.ships.forEach((ship, index) => { let ship_card = view.game.add.image(-100 + index * 96, -26, "battle-splash-shipcard", 0); ship_card.anchor.set(0.5); - let ship_portrait = view.newImage(`ship-${ship.model.code}-portrait`); + let ship_portrait = view.newImage(`ship-${ship.model.code}-portrait`, -2, 2); ship_portrait.scale.set(0.3); ship_portrait.anchor.set(0.5); ship_card.addChild(ship_portrait); @@ -49,7 +49,7 @@ module TK.SpaceTac.UI { fleet2.ships.forEach((ship, index) => { let ship_card = view.game.add.image(-104 + index * 96, -32, "battle-splash-shipcard", 1); ship_card.anchor.set(0.5); - let ship_portrait = view.newImage(`ship-${ship.model.code}-portrait`); + let ship_portrait = view.newImage(`ship-${ship.model.code}-portrait`, -2, -12); ship_portrait.scale.set(0.3); ship_portrait.anchor.set(0.5); ship_card.angle = 180; diff --git a/src/ui/battle/ShipListItem.ts b/src/ui/battle/ShipListItem.ts index 69c4337..401ef80 100644 --- a/src/ui/battle/ShipListItem.ts +++ b/src/ui/battle/ShipListItem.ts @@ -34,8 +34,10 @@ module TK.SpaceTac.UI { this.player_indicator.angle = 90; this.addChild(this.player_indicator); - this.portrait = this.view.newImage(`ship-${ship.model.code}-portrait`, 18, 9); - this.portrait.scale.set(0.332, 0.332); + this.portrait = this.view.newImage(`ship-${ship.model.code}-sprite`, 62, 52); + this.portrait.anchor.set(0.5, 0.5); + this.portrait.scale.set(0.8, 0.8); + this.portrait.angle = 180; this.addChild(this.portrait); this.damage_indicator = new Phaser.Image(this.game, 18, 9, "battle-shiplist-damage", 0); diff --git a/src/ui/battle/ShipTooltip.ts b/src/ui/battle/ShipTooltip.ts index c653e6c..c5f4e23 100644 --- a/src/ui/battle/ShipTooltip.ts +++ b/src/ui/battle/ShipTooltip.ts @@ -23,19 +23,19 @@ module TK.SpaceTac.UI { builder.configure(10, 6, this.battleview.arena.getBoundaries()); - let portrait_bg = builder.image("battle-tooltip-ship-portrait"); + let portrait_bg = builder.image("battle-tooltip-ship-portrait", -18, -18); builder.in(portrait_bg, builder => { let portrait = builder.image(`ship-${ship.model.code}-portrait`, portrait_bg.width / 2, portrait_bg.height / 2); portrait.anchor.set(0.5); - portrait.scale.set(0.5); + portrait.scale.set(0.75); }); let enemy = !this.battleview.player.is(ship.fleet.player); - builder.text(ship.getName(), 168, 0, { color: enemy ? "#cc0d00" : "#ffffff", size: 22, bold: true }); + builder.text(ship.getName(), 230, 0, { color: enemy ? "#cc0d00" : "#ffffff", size: 22, bold: true }); if (ship.alive) { let turns = this.battleview.battle.getPlayOrder(ship); - builder.text((turns == 0) ? "Playing" : ((turns == 1) ? "Plays next" : `Plays in ${turns} turns`), 168, 36, { color: "#cccccc", size: 18 }); + builder.text((turns == 0) ? "Playing" : ((turns == 1) ? "Plays next" : `Plays in ${turns} turns`), 230, 36, { color: "#cccccc", size: 18 }); ShipTooltip.addValue(builder, 0, "#aa6f33", "character-attribute-precision", ship.getAttribute("precision")); ShipTooltip.addValue(builder, 1, "#c1f06b", "character-attribute-maneuvrability", ship.getAttribute("maneuvrability")); @@ -43,7 +43,7 @@ module TK.SpaceTac.UI { ShipTooltip.addValue(builder, 3, "#eb4e4a", "character-value-hull", ship.getValue("hull"), ship.getAttribute("hull_capacity")); ShipTooltip.addValue(builder, 4, "#2ad8dc", "character-value-shield", ship.getValue("shield"), ship.getAttribute("shield_capacity")); - let iy = 170; + let iy = 210; let effects = ship.active_effects.list(); if (effects.length > 0) { builder.text("Active effects", 0, iy, { color: "#ffffff", size: 18, bold: true }); @@ -76,7 +76,7 @@ module TK.SpaceTac.UI { } private static addValue(builder: UIBuilder, idx: number, color: string, icon: string, val: number, max?: number) { - let bg = builder.image("battle-tooltip-ship-value", 190 + idx * 72, 110, true); + let bg = builder.image("battle-tooltip-ship-value", 252 + idx * 68, 116, true); builder.in(bg).styled({ color: color, size: 18, center: true, vcenter: true, bold: true }, builder => { builder.image(icon, 0, -14, true);