diff --git a/README.md b/README.md index ed041ce..6512f7b 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,17 @@ After making changes to sources, you need to recompile: * **[Michaël Lemaire](https://thunderk.net/)** - Code and graphics * **[Matthieu Desprez](https://github.com/edistra)** - Beta testing and ideas +* **[Viktor Hahn](https://opengameart.org/content/spaceships-6)** - Ship models + * This work, made by Viktor Hahn (Viktor.Hahn@web.de), is licensed under the Creative Commons Attribution 3.0 Unported License. http://creativecommons.org/licenses/by/3.0/ * **Nicolas Forgo** - Ship models * **[Phaser](http://phaser.io)** - Game engine * **[Kevin MacLeod](http://www.incompetech.com/)** - Musics + * "Full On" Kevin MacLeod (incompetech.com) + Licensed under Creative Commons: By Attribution 3.0 License + http://creativecommons.org/licenses/by/3.0/ + * "Walking Along" Kevin MacLeod (incompetech.com) + Licensed under Creative Commons: By Attribution 3.0 License + http://creativecommons.org/licenses/by/3.0/ ## Ships diff --git a/graphics/logo.svg b/graphics/logo.svg deleted file mode 100644 index 2e7e1b8..0000000 --- a/graphics/logo.svg +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/graphics/ships/avenger.blend b/graphics/ships/avenger.blend new file mode 100644 index 0000000..9bdcb93 Binary files /dev/null and b/graphics/ships/avenger.blend differ diff --git a/graphics/ships/breeze.blend b/graphics/ships/breeze.blend new file mode 100644 index 0000000..5cb44da Binary files /dev/null and b/graphics/ships/breeze.blend differ diff --git a/graphics/ships/commodore.blend b/graphics/ships/commodore.blend new file mode 100644 index 0000000..f6f8843 Binary files /dev/null and b/graphics/ships/commodore.blend differ diff --git a/graphics/ships/creeper.blend b/graphics/ships/creeper.blend new file mode 100644 index 0000000..62aeef4 Binary files /dev/null and b/graphics/ships/creeper.blend differ diff --git a/graphics/ships/falcon.blend b/graphics/ships/falcon.blend new file mode 100644 index 0000000..30a7e5e Binary files /dev/null and b/graphics/ships/falcon.blend differ diff --git a/graphics/ships/ship02.blend b/graphics/ships/scout.blend similarity index 100% rename from graphics/ships/ship02.blend rename to graphics/ships/scout.blend diff --git a/graphics/ships/ship01_reactor.xcf b/graphics/ships/ship01_reactor.xcf deleted file mode 100644 index cd8add5..0000000 Binary files a/graphics/ships/ship01_reactor.xcf and /dev/null differ diff --git a/graphics/ships/textures/avenger_diffuse.png b/graphics/ships/textures/avenger_diffuse.png new file mode 100644 index 0000000..4bb738e Binary files /dev/null and b/graphics/ships/textures/avenger_diffuse.png differ diff --git a/graphics/ships/textures/avenger_emission.png b/graphics/ships/textures/avenger_emission.png new file mode 100644 index 0000000..97b6712 Binary files /dev/null and b/graphics/ships/textures/avenger_emission.png differ diff --git a/graphics/ships/textures/avenger_normal.png b/graphics/ships/textures/avenger_normal.png new file mode 100644 index 0000000..07cc0d7 Binary files /dev/null and b/graphics/ships/textures/avenger_normal.png differ diff --git a/graphics/ships/textures/avenger_specular.png b/graphics/ships/textures/avenger_specular.png new file mode 100644 index 0000000..fa4c0f4 Binary files /dev/null and b/graphics/ships/textures/avenger_specular.png differ diff --git a/graphics/ships/textures/breeze_diffuse.png b/graphics/ships/textures/breeze_diffuse.png new file mode 100644 index 0000000..9677be0 Binary files /dev/null and b/graphics/ships/textures/breeze_diffuse.png differ diff --git a/graphics/ships/textures/breeze_emission.png b/graphics/ships/textures/breeze_emission.png new file mode 100644 index 0000000..b1e2ec0 Binary files /dev/null and b/graphics/ships/textures/breeze_emission.png differ diff --git a/graphics/ships/textures/breeze_normal.png b/graphics/ships/textures/breeze_normal.png new file mode 100644 index 0000000..11754bc Binary files /dev/null and b/graphics/ships/textures/breeze_normal.png differ diff --git a/graphics/ships/textures/breeze_specular.png b/graphics/ships/textures/breeze_specular.png new file mode 100644 index 0000000..b5292c7 Binary files /dev/null and b/graphics/ships/textures/breeze_specular.png differ diff --git a/graphics/ships/textures/commodore_diffuse.png b/graphics/ships/textures/commodore_diffuse.png new file mode 100644 index 0000000..8fada02 Binary files /dev/null and b/graphics/ships/textures/commodore_diffuse.png differ diff --git a/graphics/ships/textures/commodore_emission.png b/graphics/ships/textures/commodore_emission.png new file mode 100644 index 0000000..843a9c8 Binary files /dev/null and b/graphics/ships/textures/commodore_emission.png differ diff --git a/graphics/ships/textures/commodore_normal.png b/graphics/ships/textures/commodore_normal.png new file mode 100644 index 0000000..429b2e7 Binary files /dev/null and b/graphics/ships/textures/commodore_normal.png differ diff --git a/graphics/ships/textures/commodore_specular.png b/graphics/ships/textures/commodore_specular.png new file mode 100644 index 0000000..e7b67bb Binary files /dev/null and b/graphics/ships/textures/commodore_specular.png differ diff --git a/graphics/ships/textures/creeper_diffuse.png b/graphics/ships/textures/creeper_diffuse.png new file mode 100644 index 0000000..833fa83 Binary files /dev/null and b/graphics/ships/textures/creeper_diffuse.png differ diff --git a/graphics/ships/textures/creeper_emission.png b/graphics/ships/textures/creeper_emission.png new file mode 100644 index 0000000..0bc5038 Binary files /dev/null and b/graphics/ships/textures/creeper_emission.png differ diff --git a/graphics/ships/textures/creeper_normal.png b/graphics/ships/textures/creeper_normal.png new file mode 100644 index 0000000..a0ee4ed Binary files /dev/null and b/graphics/ships/textures/creeper_normal.png differ diff --git a/graphics/ships/textures/creeper_specular.png b/graphics/ships/textures/creeper_specular.png new file mode 100644 index 0000000..e658080 Binary files /dev/null and b/graphics/ships/textures/creeper_specular.png differ diff --git a/graphics/ships/textures/falcon_diffuse.png b/graphics/ships/textures/falcon_diffuse.png new file mode 100644 index 0000000..7979591 Binary files /dev/null and b/graphics/ships/textures/falcon_diffuse.png differ diff --git a/graphics/ships/textures/falcon_emission.png b/graphics/ships/textures/falcon_emission.png new file mode 100644 index 0000000..d2802cd Binary files /dev/null and b/graphics/ships/textures/falcon_emission.png differ diff --git a/graphics/ships/textures/falcon_normal.png b/graphics/ships/textures/falcon_normal.png new file mode 100644 index 0000000..90586a5 Binary files /dev/null and b/graphics/ships/textures/falcon_normal.png differ diff --git a/graphics/ships/textures/falcon_specular.png b/graphics/ships/textures/falcon_specular.png new file mode 100644 index 0000000..88daa3c Binary files /dev/null and b/graphics/ships/textures/falcon_specular.png differ diff --git a/graphics/ships/ship01_reactor.png b/graphics/ships/textures/whirlwind_reactor.png similarity index 100% rename from graphics/ships/ship01_reactor.png rename to graphics/ships/textures/whirlwind_reactor.png diff --git a/graphics/ships/ship03.blend b/graphics/ships/tomahawk.blend similarity index 100% rename from graphics/ships/ship03.blend rename to graphics/ships/tomahawk.blend diff --git a/graphics/ships/ship01.blend b/graphics/ships/whirlwind.blend similarity index 53% rename from graphics/ships/ship01.blend rename to graphics/ships/whirlwind.blend index b7e5f31..cbd7029 100644 Binary files a/graphics/ships/ship01.blend and b/graphics/ships/whirlwind.blend differ diff --git a/out/assets/images/ship/avenger/portrait.png b/out/assets/images/ship/avenger/portrait.png new file mode 100644 index 0000000..38762af Binary files /dev/null and b/out/assets/images/ship/avenger/portrait.png differ diff --git a/out/assets/images/ship/avenger/sprite.png b/out/assets/images/ship/avenger/sprite.png new file mode 100644 index 0000000..731a70c Binary files /dev/null and b/out/assets/images/ship/avenger/sprite.png differ diff --git a/out/assets/images/ship/breeze/portrait.png b/out/assets/images/ship/breeze/portrait.png new file mode 100644 index 0000000..01cdabc Binary files /dev/null and b/out/assets/images/ship/breeze/portrait.png differ diff --git a/out/assets/images/ship/breeze/sprite.png b/out/assets/images/ship/breeze/sprite.png new file mode 100644 index 0000000..4585bfe Binary files /dev/null and b/out/assets/images/ship/breeze/sprite.png differ diff --git a/out/assets/images/ship/commodore/portrait.png b/out/assets/images/ship/commodore/portrait.png new file mode 100644 index 0000000..eab214b Binary files /dev/null and b/out/assets/images/ship/commodore/portrait.png differ diff --git a/out/assets/images/ship/commodore/sprite.png b/out/assets/images/ship/commodore/sprite.png new file mode 100644 index 0000000..ae13ae1 Binary files /dev/null and b/out/assets/images/ship/commodore/sprite.png differ diff --git a/out/assets/images/ship/creeper/portrait.png b/out/assets/images/ship/creeper/portrait.png new file mode 100644 index 0000000..11824f9 Binary files /dev/null and b/out/assets/images/ship/creeper/portrait.png differ diff --git a/out/assets/images/ship/creeper/sprite.png b/out/assets/images/ship/creeper/sprite.png new file mode 100644 index 0000000..2cc7cf3 Binary files /dev/null and b/out/assets/images/ship/creeper/sprite.png differ diff --git a/out/assets/images/ship/falcon/portrait.png b/out/assets/images/ship/falcon/portrait.png new file mode 100644 index 0000000..9686988 Binary files /dev/null and b/out/assets/images/ship/falcon/portrait.png differ diff --git a/out/assets/images/ship/falcon/sprite.png b/out/assets/images/ship/falcon/sprite.png new file mode 100644 index 0000000..90663ca Binary files /dev/null and b/out/assets/images/ship/falcon/sprite.png differ diff --git a/src/core/ShipModel.ts b/src/core/ShipModel.ts index 0195c8b..fc98a87 100644 --- a/src/core/ShipModel.ts +++ b/src/core/ShipModel.ts @@ -32,11 +32,25 @@ module TS.SpaceTac { result.push(new ShipModel("scout", "Scout", 1, 2, SlotType.Hull, SlotType.Power, SlotType.Power, SlotType.Engine, SlotType.Weapon)); - result.push(new ShipModel("whirlwind", "Whirlwind", 1, 4, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + result.push(new ShipModel("breeze", "Breeze", 1, 0, SlotType.Hull, SlotType.Power, SlotType.Power, SlotType.Engine, SlotType.Engine, SlotType.Weapon)); + + result.push(new ShipModel("creeper", "Creeper", 1, 2, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, SlotType.Weapon, SlotType.Weapon)); - result.push(new ShipModel("tomahawk", "Tomahawk", 1, 6, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, SlotType.Engine, - SlotType.Weapon)); + result.push(new ShipModel("whirlwind", "Whirlwind", 1, 8, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("tomahawk", "Tomahawk", 1, 8, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("avenger", "Avenger", 1, 4, SlotType.Hull, SlotType.Shield, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("commodore", "Commodore", 1, 4, SlotType.Hull, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("falcon", "Falcon", 1, 2, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon, SlotType.Weapon, SlotType.Weapon)); return result; } diff --git a/src/ui/Preload.ts b/src/ui/Preload.ts index 98ce251..8d2f316 100644 --- a/src/ui/Preload.ts +++ b/src/ui/Preload.ts @@ -119,8 +119,13 @@ module TS.SpaceTac.UI { // Load ships this.loadShip("scout"); + this.loadShip("breeze"); + this.loadShip("creeper"); this.loadShip("whirlwind"); this.loadShip("tomahawk"); + this.loadShip("avenger"); + this.loadShip("commodore"); + this.loadShip("falcon"); // Load sounds this.loadSound("battle/ship-change.wav");