Added 5 ship models : avenger, commodore, breeze, creeper and falcon

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
 

graphics/logo.svg

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="logo.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3803">
-      <stop
-         style="stop-color:#b99434;stop-opacity:1"
-         offset="0"
-         id="stop3805" />
-      <stop
-         id="stop3849"
-         offset="0.71379268"
-         style="stop-color:#907d4d;stop-opacity:0.78546715" />
-      <stop
-         style="stop-color:#6c6c6c;stop-opacity:0;"
-         offset="1"
-         id="stop3807" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803"
-       id="linearGradient4609"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3.326324,3.4488765)"
-       x1="395.9798"
-       y1="467.48386"
-       x2="684.88342"
-       y2="346.26553" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="499.73794"
-     inkscape:cy="518.05435"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-bbox="false" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="fill:#370e81;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:16.60000000000000142;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path2985"
-       sodipodi:cx="392.85715"
-       sodipodi:cy="475.21933"
-       sodipodi:rx="212.85715"
-       sodipodi:ry="212.85715"
-       d="m 605.71429,475.21933 a 212.85715,212.85715 0 1 1 -425.71429,0 212.85715,212.85715 0 1 1 425.71429,0 z" />
-    <path
-       style="fill:#6c6c6c;fill-opacity:1;stroke:#000000;stroke-width:9.93900000000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 255.83375,152.48166 286.90392,0 -56.25735,191.66626 -176.40603,0 z"
-       id="path3757"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3757"
-       id="use3759"
-       transform="matrix(-0.76604444,0.64278761,-0.64278761,-0.76604444,1009.3727,567.31849)"
-       width="744.09448"
-       height="1052.3622" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3757"
-       id="use3761"
-       transform="matrix(-0.76604444,-0.64278761,0.64278761,-0.76604444,380.44982,1077.1097)"
-       width="744.09448"
-       height="1052.3622" />
-    <path
-       style="fill:url(#linearGradient4609);fill-opacity:1;stroke:none"
-       d="M 395.26551,473.96321 732.65646,423.45558 657.90517,265.87178 z"
-       id="path3801"
-       inkscape:connector-curvature="0" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3801"
-       id="use3811"
-       transform="matrix(-1,0,0,1,790.23513,-1.428571)"
-       width="744.09448"
-       height="1052.3622" />
-  </g>
-</svg>

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;
         }

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");