From 4655191030cd6ab40608adbfca8906bc1c3f1148 Mon Sep 17 00:00:00 2001
From: Russell <RussellChamp@gmail.com>
Date: Fri, 23 Jan 2015 15:57:07 +0000
Subject: [PATCH] Resolve the 0.1% chance issue with Weapons not generating due
 to a too high bonus

---
 index.html |  7 ++++---
 weapons.js | 29 ++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 8668b4d..1332c09 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <title>GrimoireJS</title>
-<script src="./jquery-2.1.1.min.js"></script>
-<script src="./lodash.js"></script>
+<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
 <script type="application/javascript" src="grimoire.js"></script>
 <script type="application/javascript" src="intelligence.js"></script>
 <script type="application/javascript" src="weapons.js"></script>
@@ -57,6 +57,7 @@
 <ul style="list-style-type:square">
 <li>All get*() function take a "type" argument that can be either 'minor', 'medium', or 'major'</li>
 <li>Try running Grimoire.getItems(2,2,2) to generate several minor, medium, and major items</li>
+<li>NOTE that all non-unique weapons are returned as "minor/medium/major melee/range weapon". It is up to the GM to determine what specific weapon this resolves to. It is recommend to check what proficiencies your players have. :)
 <li>Many get*() functions also have an optional paramater "source" that specifies which source material to pull from. Currently, only "CRB" and "APG" are supported.</li>
 </ul>
 <br/>
@@ -71,4 +72,4 @@ Create an intelligence by running Intelligence.getItemIntelligence().print()</di
  <li>Already input spells for wizard/sorceror, cleric, and druid. Check for other arcane and divine spells from other classes</li>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/weapons.js b/weapons.js
index 825507a..171f103 100644
--- a/weapons.js
+++ b/weapons.js
@@ -107,7 +107,7 @@ Weapons.getSpecific = function(type) {
         }
     }
 }; //end getSpecific
-     
+
 Weapons.data.meleeSpecial = [
         {'name': 'Bane', 'bonus': 1},
         {'name': 'Defending', 'bonus': 1},
@@ -432,7 +432,10 @@ Weapons.getWeapon = function(type, wClass, final) {
                         'cost': newWeapon.cost + Weapons.data.bonusCost[newWeapon.bonus + special.bonus].cost - Weapons.data.bonusCost[newWeapon.bonus].cost,
                     };
             }
-            break;            
+            else {
+              weapon = newWeapon; //Don't apply the new special
+            }
+            break;
         }
     }
     else if(type == 'medium') {
@@ -471,7 +474,10 @@ Weapons.getWeapon = function(type, wClass, final) {
                         'cost': newWeapon.cost + Weapons.data.bonusCost[newWeapon.bonus + special.bonus].cost - Weapons.data.bonusCost[newWeapon.bonus].cost,
                     };
             }
-            break;            
+            else {
+              weapon = newWeapon; //Don't apply the new special
+            }
+            break;
         }
     }
     else if(type == 'major') {
@@ -505,10 +511,23 @@ Weapons.getWeapon = function(type, wClass, final) {
                         'cost': newWeapon.cost + Weapons.data.bonusCost[newWeapon.bonus + special.bonus].cost - Weapons.data.bonusCost[newWeapon.bonus].cost,
                     };
             }
-            break;            
+            else {
+              weapon = newWeapon; //Don't apply the new special
+            }
+            break;
         }
     }
 
+    if(weapon === undefined || Object.keys(weapon).length === 0) {
+      var err = new Error();
+      console.log(type);
+      console.log(wClass);
+      console.log(final);
+      console.log("roll: " + roll);
+      console.log(newWeapon);
+      console.log(special);
+      return err.stack;
+    }
     var i = weapon.name.indexOf('+');
     if(i != -1) {
         //move the '+X' to the front
@@ -542,4 +561,4 @@ Weapons.getWeapons = function (numMinor, numMedium, numMajor, wClass) {
         weapons.push(Weapons.getWeapon('major', wClass));
     });
     return weapons;
-};
\ No newline at end of file
+};