diff --git a/graphics/ships/flea.blend b/graphics/ships/flea.blend new file mode 100644 index 0000000..f5be735 Binary files /dev/null and b/graphics/ships/flea.blend differ diff --git a/graphics/ships/jumper.blend b/graphics/ships/jumper.blend new file mode 100644 index 0000000..a375e03 Binary files /dev/null and b/graphics/ships/jumper.blend differ diff --git a/graphics/ships/rhino.blend b/graphics/ships/rhino.blend new file mode 100644 index 0000000..c3b29cd Binary files /dev/null and b/graphics/ships/rhino.blend differ diff --git a/graphics/ships/textures/flea_diffuse.png b/graphics/ships/textures/flea_diffuse.png new file mode 100644 index 0000000..13ca251 Binary files /dev/null and b/graphics/ships/textures/flea_diffuse.png differ diff --git a/graphics/ships/textures/flea_emission.png b/graphics/ships/textures/flea_emission.png new file mode 100644 index 0000000..84c7438 Binary files /dev/null and b/graphics/ships/textures/flea_emission.png differ diff --git a/graphics/ships/textures/flea_normal.png b/graphics/ships/textures/flea_normal.png new file mode 100644 index 0000000..f4e9b8b Binary files /dev/null and b/graphics/ships/textures/flea_normal.png differ diff --git a/graphics/ships/textures/flea_specular.png b/graphics/ships/textures/flea_specular.png new file mode 100644 index 0000000..f0ab6ae Binary files /dev/null and b/graphics/ships/textures/flea_specular.png differ diff --git a/graphics/ships/textures/jumper_diffuse.png b/graphics/ships/textures/jumper_diffuse.png new file mode 100644 index 0000000..1701940 Binary files /dev/null and b/graphics/ships/textures/jumper_diffuse.png differ diff --git a/graphics/ships/textures/jumper_emission.png b/graphics/ships/textures/jumper_emission.png new file mode 100644 index 0000000..aa56081 Binary files /dev/null and b/graphics/ships/textures/jumper_emission.png differ diff --git a/graphics/ships/textures/jumper_normal.png b/graphics/ships/textures/jumper_normal.png new file mode 100644 index 0000000..230dbd5 Binary files /dev/null and b/graphics/ships/textures/jumper_normal.png differ diff --git a/graphics/ships/textures/jumper_specular.png b/graphics/ships/textures/jumper_specular.png new file mode 100644 index 0000000..23daa74 Binary files /dev/null and b/graphics/ships/textures/jumper_specular.png differ diff --git a/graphics/ships/textures/rhino_diffuse.png b/graphics/ships/textures/rhino_diffuse.png new file mode 100644 index 0000000..4845c9f Binary files /dev/null and b/graphics/ships/textures/rhino_diffuse.png differ diff --git a/graphics/ships/textures/rhino_emission.png b/graphics/ships/textures/rhino_emission.png new file mode 100644 index 0000000..a16f7aa Binary files /dev/null and b/graphics/ships/textures/rhino_emission.png differ diff --git a/graphics/ships/textures/rhino_normal.png b/graphics/ships/textures/rhino_normal.png new file mode 100644 index 0000000..41d8fe1 Binary files /dev/null and b/graphics/ships/textures/rhino_normal.png differ diff --git a/graphics/ships/textures/rhino_specular.png b/graphics/ships/textures/rhino_specular.png new file mode 100644 index 0000000..7e482c6 Binary files /dev/null and b/graphics/ships/textures/rhino_specular.png differ diff --git a/graphics/ships/textures/trapper_diffuse.png b/graphics/ships/textures/trapper_diffuse.png new file mode 100644 index 0000000..528e64c Binary files /dev/null and b/graphics/ships/textures/trapper_diffuse.png differ diff --git a/graphics/ships/textures/trapper_emission.png b/graphics/ships/textures/trapper_emission.png new file mode 100644 index 0000000..3eeb2d2 Binary files /dev/null and b/graphics/ships/textures/trapper_emission.png differ diff --git a/graphics/ships/textures/trapper_normal.png b/graphics/ships/textures/trapper_normal.png new file mode 100644 index 0000000..b61e5ad Binary files /dev/null and b/graphics/ships/textures/trapper_normal.png differ diff --git a/graphics/ships/textures/trapper_specular.png b/graphics/ships/textures/trapper_specular.png new file mode 100644 index 0000000..2696d41 Binary files /dev/null and b/graphics/ships/textures/trapper_specular.png differ diff --git a/graphics/ships/textures/xander_diffuse.png b/graphics/ships/textures/xander_diffuse.png new file mode 100644 index 0000000..ae676a7 Binary files /dev/null and b/graphics/ships/textures/xander_diffuse.png differ diff --git a/graphics/ships/textures/xander_emission.png b/graphics/ships/textures/xander_emission.png new file mode 100644 index 0000000..9d86c07 Binary files /dev/null and b/graphics/ships/textures/xander_emission.png differ diff --git a/graphics/ships/textures/xander_normal.png b/graphics/ships/textures/xander_normal.png new file mode 100644 index 0000000..43aae70 Binary files /dev/null and b/graphics/ships/textures/xander_normal.png differ diff --git a/graphics/ships/textures/xander_specular.png b/graphics/ships/textures/xander_specular.png new file mode 100644 index 0000000..3a678b1 Binary files /dev/null and b/graphics/ships/textures/xander_specular.png differ diff --git a/graphics/ships/trapper.blend b/graphics/ships/trapper.blend new file mode 100644 index 0000000..20dc0f3 Binary files /dev/null and b/graphics/ships/trapper.blend differ diff --git a/graphics/ships/xander.blend b/graphics/ships/xander.blend new file mode 100644 index 0000000..8e0b968 Binary files /dev/null and b/graphics/ships/xander.blend differ diff --git a/out/assets/images/ship/flea/portrait.png b/out/assets/images/ship/flea/portrait.png new file mode 100644 index 0000000..6583ec8 Binary files /dev/null and b/out/assets/images/ship/flea/portrait.png differ diff --git a/out/assets/images/ship/flea/sprite.png b/out/assets/images/ship/flea/sprite.png new file mode 100644 index 0000000..b3a54a8 Binary files /dev/null and b/out/assets/images/ship/flea/sprite.png differ diff --git a/out/assets/images/ship/jumper/portrait.png b/out/assets/images/ship/jumper/portrait.png new file mode 100644 index 0000000..afae6bb Binary files /dev/null and b/out/assets/images/ship/jumper/portrait.png differ diff --git a/out/assets/images/ship/jumper/sprite.png b/out/assets/images/ship/jumper/sprite.png new file mode 100644 index 0000000..d8b850e Binary files /dev/null and b/out/assets/images/ship/jumper/sprite.png differ diff --git a/out/assets/images/ship/rhino/portrait.png b/out/assets/images/ship/rhino/portrait.png new file mode 100644 index 0000000..b6adda8 Binary files /dev/null and b/out/assets/images/ship/rhino/portrait.png differ diff --git a/out/assets/images/ship/rhino/sprite.png b/out/assets/images/ship/rhino/sprite.png new file mode 100644 index 0000000..707c327 Binary files /dev/null and b/out/assets/images/ship/rhino/sprite.png differ diff --git a/out/assets/images/ship/trapper/portrait.png b/out/assets/images/ship/trapper/portrait.png new file mode 100644 index 0000000..373a619 Binary files /dev/null and b/out/assets/images/ship/trapper/portrait.png differ diff --git a/out/assets/images/ship/trapper/sprite.png b/out/assets/images/ship/trapper/sprite.png new file mode 100644 index 0000000..1ffeda9 Binary files /dev/null and b/out/assets/images/ship/trapper/sprite.png differ diff --git a/out/assets/images/ship/xander/portrait.png b/out/assets/images/ship/xander/portrait.png new file mode 100644 index 0000000..6b3720c Binary files /dev/null and b/out/assets/images/ship/xander/portrait.png differ diff --git a/out/assets/images/ship/xander/sprite.png b/out/assets/images/ship/xander/sprite.png new file mode 100644 index 0000000..df36fc8 Binary files /dev/null and b/out/assets/images/ship/xander/sprite.png differ diff --git a/src/core/ShipModel.ts b/src/core/ShipModel.ts index fc98a87..790ba85 100644 --- a/src/core/ShipModel.ts +++ b/src/core/ShipModel.ts @@ -52,6 +52,20 @@ module TS.SpaceTac { result.push(new ShipModel("falcon", "Falcon", 1, 2, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, SlotType.Weapon, SlotType.Weapon, SlotType.Weapon, SlotType.Weapon)); + result.push(new ShipModel("flea", "Flea", 1, 0, SlotType.Hull, SlotType.Power, SlotType.Power, SlotType.Engine, SlotType.Engine, SlotType.Weapon)); + + result.push(new ShipModel("jumper", "Jumper", 1, 2, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("rhino", "Rhino", 1, 16, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon)); + + result.push(new ShipModel("trapper", "Trapper", 1, 8, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon)); + + result.push(new ShipModel("xander", "Xander", 1, 8, SlotType.Hull, SlotType.Shield, SlotType.Power, SlotType.Engine, + SlotType.Weapon, SlotType.Weapon)); + return result; } diff --git a/src/ui/Preload.ts b/src/ui/Preload.ts index a220056..4ea96a2 100644 --- a/src/ui/Preload.ts +++ b/src/ui/Preload.ts @@ -102,14 +102,19 @@ module TS.SpaceTac.UI { this.loadImage("equipment/rocketengine.png"); // Load ships - this.loadShip("scout"); - this.loadShip("breeze"); - this.loadShip("creeper"); - this.loadShip("whirlwind"); - this.loadShip("tomahawk"); this.loadShip("avenger"); + this.loadShip("breeze"); this.loadShip("commodore"); + this.loadShip("creeper"); this.loadShip("falcon"); + this.loadShip("flea"); + this.loadShip("jumper"); + this.loadShip("rhino"); + this.loadShip("scout"); + this.loadShip("tomahawk"); + this.loadShip("trapper"); + this.loadShip("whirlwind"); + this.loadShip("xander"); // Load sounds this.loadSound("battle/ship-change.wav");