From 3c8b1f7d6aa0682cf88535b682998ea5414bbec2 Mon Sep 17 00:00:00 2001
From: Colin McLeod <colin@roaminsight.com>
Date: Fri, 18 Dec 2015 01:05:49 -0800
Subject: [PATCH] Adding 2.5% discount

---
 app/js/shipyard/module-shipyard.js       | 1 +
 data                                     | 2 +-
 package.json                             | 2 +-
 test/fixtures/expected-builds.json       | 2 +-
 test/fixtures/valid-detailed-export.json | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js
index 4404c595..7fd6e5f5 100755
--- a/app/js/shipyard/module-shipyard.js
+++ b/app/js/shipyard/module-shipyard.js
@@ -166,6 +166,7 @@ angular.module('shipyard', ['ngLodash'])
    */
   .constant('Discounts', {
     '0%': 1,
+    '2.5%': 0.975,
     '5%': 0.95,
     '10%': 0.90,
     '15%': 0.85,
diff --git a/data b/data
index 9557c8dd..bb316e77 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 9557c8ddf5167f61a601854400b1fbfffcc3256e
+Subproject commit bb316e77b2d84eec0c9498bb21f0a51d2318ee8a
diff --git a/package.json b/package.json
index 4febdf5c..16e247ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"
diff --git a/test/fixtures/expected-builds.json b/test/fixtures/expected-builds.json
index dd97513b..e465fe5a 100644
--- a/test/fixtures/expected-builds.json
+++ b/test/fixtures/expected-builds.json
@@ -45,6 +45,6 @@
     "Attack": "25A5C4A4D6A4A3C1r0s0s0s0s000404-04-4a-5d27-.Iw18aQ==.Aw18aQ=="
   },
   "eagle": {
-    "Figther": "42A3A3A1D2A2A2C0p0p24-40532j.Iw19A===.Aw19A==="
+    "Figther": "42A3A3A1D2A2A2C0p0p24-40532j-.Iw1-EA==.Aw1-EA=="
   }
 }
\ No newline at end of file
diff --git a/test/fixtures/valid-detailed-export.json b/test/fixtures/valid-detailed-export.json
index 42e0f475..1d2869b6 100644
--- a/test/fixtures/valid-detailed-export.json
+++ b/test/fixtures/valid-detailed-export.json
@@ -3423,7 +3423,8 @@
           "class": 1,
           "rating": "A",
           "group": "Fuel Scoop"
-        }
+        },
+        null
       ]
     },
     "stats": {