From 5ed1985e2d2ddecdf57461eb1bcc403f71d90a85 Mon Sep 17 00:00:00 2001
From: Peter Bjerg Lidegaard <pbm@impact.dk>
Date: Fri, 18 Jun 2021 21:35:00 +0200
Subject: [PATCH] - Lowercased weapon lookup to make it case insensitive.

- Added the correct case name for weapons for completionist sake
---
 AD&D 2E Revised/2ESheet.html               | 231 +++++++++++++--------
 AD&D 2E Revised/html/2ESheet-base.html     |   1 +
 AD&D 2E Revised/javascript/sheetWorkers.js |   1 +
 AD&D 2E Revised/javascript/version.js      |  19 --
 AD&D 2E Revised/javascript/weapons.js      | 210 ++++++++++++-------
 5 files changed, 284 insertions(+), 178 deletions(-)

diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index 2bcd42c30e..83dd775724 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -25,6 +25,7 @@
                 <li>Cleaned up Heat Metal template</li>
                 <li>Cleaned up Magic missiles template. No longer has pop up</li>
                 <li>Improved the reading of magical bonuses for weapons. Now can read the bonus from anywhere in the weapon name, ie. "Short bow +1 (Flight Arrow)"</li>
+                <li>Weapon table auto fill is now case insensitive, so you can write "TwO-HaNdeD SwOrD" and still get the information filled in</li>
             </ul>
             <hr>
             <p>
@@ -19977,7 +19978,8 @@ charismaTable['chanotes'] = ['INVALID CHARISMA','','','','','','','','','','',''
 /* ---- Attributes tables end ---- */
 
 const weapons = {};
-weapons['Arquebus'] = {
+weapons['arquebus'] = {
+    'name': 'Arquebus',
     'rof': '1/3',
     'range': '50/150/210',
     'size': 'M',
@@ -19987,7 +19989,8 @@ weapons['Arquebus'] = {
     'large': '1d10',
     'knockdown': 'd8'
 };
-weapons['Battle axe'] = {
+weapons['battle axe'] = {
+    'name': 'Battle axe',
     'size': 'M',
     'type': 'S',
     'speed': 7,
@@ -19995,7 +19998,8 @@ weapons['Battle axe'] = {
     'large': '1d8',
     'knockdown': 'd10'
 };
-weapons['Blowgun (Barbed Dart)'] = {
+weapons['blowgun (barbed dart)'] = {
+    'name': 'Blowgun (Barbed Dart)',
     'rof': '2/1',
     'range': '10/20/30',
     'size': 'L',
@@ -20005,7 +20009,8 @@ weapons['Blowgun (Barbed Dart)'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Blowgun (Needle)'] = {
+weapons['blowgun (needle)'] = {
+    'name': 'Blowgun (Needle)',
     'rof': '2/1',
     'range': '10/20/30',
     'size': 'L',
@@ -20014,7 +20019,8 @@ weapons['Blowgun (Needle)'] = {
     'small-medium': '1',
     'large': '1',
 };
-weapons['Short bow (Flight arrow)'] = {
+weapons['short bow (flight arrow)'] = {
+    'name': 'Short bow (Flight arrow)',
     'rof': '2/1',
     'range': '50/100/150',
     'size': 'M',
@@ -20024,7 +20030,8 @@ weapons['Short bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Long bow (Flight arrow)'] = {
+weapons['long bow (flight arrow)'] = {
+    'name': 'Long bow (Flight arrow)',
     'rof': '2/1',
     'range': '70/140/210',
     'size': 'L',
@@ -20034,7 +20041,8 @@ weapons['Long bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Long bow (Sheaf arrow)'] = {
+weapons['long bow (sheaf arrow)'] = {
+    'name': 'Long bow (Sheaf arrow)',
     'rof': '2/1',
     'range': '50/100/150',
     'size': 'L',
@@ -20044,7 +20052,8 @@ weapons['Long bow (Sheaf arrow)'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Composite short bow (Flight arrow)'] = {
+weapons['composite short bow (flight arrow)'] = {
+    'name': 'Composite short bow (Flight arrow)',
     'rof': '2/1',
     'range': '50/100/180',
     'size': 'M',
@@ -20054,7 +20063,8 @@ weapons['Composite short bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Composite long bow (Flight arrow)'] = {
+weapons['composite long bow (flight arrow)'] = {
+    'name': 'Composite long bow (Flight arrow)',
     'rof': '2/1',
     'range': '60/120/210',
     'size': 'L',
@@ -20064,7 +20074,8 @@ weapons['Composite long bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Composite long bow (Sheaf arrow)'] = {
+weapons['composite long bow (sheaf arrow)'] = {
+    'name': 'Composite long bow (Sheaf arrow)',
     'rof': '2/1',
     'range': '40/80/170',
     'size': 'L',
@@ -20074,7 +20085,8 @@ weapons['Composite long bow (Sheaf arrow)'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Club'] = {
+weapons['club'] = {
+    'name': 'Club',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -20085,7 +20097,8 @@ weapons['Club'] = {
     'large': '1d3',
     'knockdown': 'd8'
 };
-weapons['Hand crossbow'] = {
+weapons['hand crossbow'] = {
+    'name': 'Hand crossbow',
     'rof': '1',
     'range': '20/40/60',
     'size': 'S',
@@ -20095,7 +20108,8 @@ weapons['Hand crossbow'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Light crossbow'] = {
+weapons['light crossbow'] = {
+    'name': 'Light crossbow',
     'rof': '1',
     'range': '60/120/180',
     'size': 'M',
@@ -20105,7 +20119,8 @@ weapons['Light crossbow'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Heavy crossbow'] = {
+weapons['heavy crossbow'] = {
+    'name': 'Heavy crossbow',
     'rof': '1/2',
     'range': '80/160/240',
     'size': 'M',
@@ -20115,7 +20130,8 @@ weapons['Heavy crossbow'] = {
     'large': '1d6+1',
     'knockdown': 'd6'
 };
-weapons['Dagger'] = {
+weapons['dagger'] = {
+    'name': 'Dagger',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -20126,7 +20142,8 @@ weapons['Dagger'] = {
     'large': '1d3',
     'knockdown': 'd6'
 };
-weapons['Dirk'] = {
+weapons['dirk'] = {
+    'name': 'Dirk',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -20137,7 +20154,8 @@ weapons['Dirk'] = {
     'large': '1d3',
     'knockdown': 'd6'
 };
-weapons['Dart'] = {
+weapons['dart'] = {
+    'name': 'Dart',
     'strength': true,
     'rof': '3/1',
     'range': '10/20/40',
@@ -20148,7 +20166,8 @@ weapons['Dart'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Footman\'s flail'] = {
+weapons['footman\'s flail'] = {
+    'name': 'Footman\'s flail',
     'size': 'M',
     'type': 'B',
     'speed': 7,
@@ -20156,7 +20175,8 @@ weapons['Footman\'s flail'] = {
     'large': '2d4',
     'knockdown': 'd12'
 };
-weapons['Footman\'s mace'] = {
+weapons['footman\'s mace'] = {
+    'name': 'Footman\'s mace',
     'size': 'M',
     'type': 'B',
     'speed': 7,
@@ -20164,7 +20184,8 @@ weapons['Footman\'s mace'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Footman\'s pick'] = {
+weapons['footman\'s pick'] = {
+    'name': 'Footman\'s pick',
     'size': 'M',
     'type': 'P',
     'speed': 7,
@@ -20172,7 +20193,8 @@ weapons['Footman\'s pick'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Hand axe'] = {
+weapons['hand axe'] = {
+    'name': 'Hand axe',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -20183,7 +20205,8 @@ weapons['Hand axe'] = {
     'large': '1d4',
     'knockdown': 'd10'
 };
-weapons['Harpoon'] = {
+weapons['harpoon'] = {
+    'name': 'Harpoon',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -20194,7 +20217,8 @@ weapons['Harpoon'] = {
     'large': '2d6',
     'knockdown': 'd8'
 };
-weapons['Horseman\'s flail'] = {
+weapons['horseman\'s flail'] = {
+    'name': 'Horseman\'s flail',
     'size': 'M',
     'type': 'B',
     'speed': 6,
@@ -20202,7 +20226,8 @@ weapons['Horseman\'s flail'] = {
     'large': '1d4+1',
     'knockdown': 'd10'
 };
-weapons['Horseman\'s mace'] = {
+weapons['horseman\'s mace'] = {
+    'name': 'Horseman\'s mace',
     'size': 'M',
     'type': 'B',
     'speed': 6,
@@ -20210,7 +20235,8 @@ weapons['Horseman\'s mace'] = {
     'large': '1d4',
     'knockdown': 'd8'
 };
-weapons['Horseman\'s pick'] = {
+weapons['horseman\'s pick'] = {
+    'name': 'Horseman\'s pick',
     'size': 'M',
     'type': 'P',
     'speed': 5,
@@ -20218,7 +20244,8 @@ weapons['Horseman\'s pick'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Javelin'] = {
+weapons['javelin'] = {
+    'name': 'Javelin',
     'strength': true,
     'rof': '1',
     'range': '20/40/60',
@@ -20229,7 +20256,8 @@ weapons['Javelin'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Knife'] = {
+weapons['knife'] = {
+    'name': 'Knife',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -20240,7 +20268,8 @@ weapons['Knife'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Heavy horse lance'] = {
+weapons['heavy horse lance'] = {
+    'name': 'Heavy horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -20248,7 +20277,8 @@ weapons['Heavy horse lance'] = {
     'large': '3d6',
     'knockdown': 'd12'
 };
-weapons['Light horse lance'] = {
+weapons['light horse lance'] = {
+    'name': 'Light horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 6,
@@ -20256,7 +20286,8 @@ weapons['Light horse lance'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Jousting lance'] = {
+weapons['jousting lance'] = {
+    'name': 'Jousting lance',
     'size': 'L',
     'type': 'P',
     'speed': 10,
@@ -20264,7 +20295,8 @@ weapons['Jousting lance'] = {
     'large': '1d2-1',
     'knockdown': 'd6'
 };
-weapons['Medium horse lance'] = {
+weapons['medium horse lance'] = {
+    'name': 'Medium horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -20272,7 +20304,8 @@ weapons['Medium horse lance'] = {
     'large': '2d6',
     'knockdown': 'd10'
 };
-weapons['Mancatcher'] = {
+weapons['mancatcher'] = {
+    'name': 'Mancatcher',
     'size': 'L',
     'type': '',
     'speed': 7,
@@ -20280,7 +20313,8 @@ weapons['Mancatcher'] = {
     'large': '—',
     'knockdown': 'd6'
 };
-weapons['Morning star'] = {
+weapons['morning star'] = {
+    'name': 'Morning star',
     'size': 'M',
     'type': 'P/B',
     'speed': 7,
@@ -20288,7 +20322,8 @@ weapons['Morning star'] = {
     'large': '1d6+1',
     'knockdown': 'd10'
 };
-weapons['Awl pike'] = {
+weapons['awl pike'] = {
+    'name': 'Awl pike',
     'size': 'L',
     'type': 'P',
     'speed': 13,
@@ -20296,7 +20331,8 @@ weapons['Awl pike'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Bardiche'] = {
+weapons['bardiche'] = {
+    'name': 'Bardiche',
     'size': 'L',
     'type': 'S',
     'speed': 9,
@@ -20304,7 +20340,8 @@ weapons['Bardiche'] = {
     'large': '2d6',
     'knockdown': 'd12'
 };
-weapons['Bec de corbin'] = {
+weapons['bec de corbin'] = {
+    'name': 'Bec de corbin',
     'size': 'L',
     'type': 'P/B',
     'speed': 9,
@@ -20312,7 +20349,8 @@ weapons['Bec de corbin'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Bill-guisarme'] = {
+weapons['bill-guisarme'] = {
+    'name': 'Bill-guisarme',
     'size': 'L',
     'type': 'P/S',
     'speed': 10,
@@ -20320,7 +20358,8 @@ weapons['Bill-guisarme'] = {
     'large': '1d10',
     'knockdown': 'd10'
 };
-weapons['Fauchard'] = {
+weapons['fauchard'] = {
+    'name': 'Fauchard',
     'size': 'L',
     'type': 'P/S',
     'speed': 8,
@@ -20328,14 +20367,16 @@ weapons['Fauchard'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Fauchard-fork'] = {
+weapons['fauchard-fork'] = {
+    'name': 'Fauchard-fork',
     'size': 'L',
     'type': 'P/S',
     'speed': 8,
     'small-medium': '1d8',
     'large': '1d10',
 };
-weapons['Glaive'] = {
+weapons['glaive'] = {
+    'name': 'Glaive',
     'size': 'L',
     'type': 'S',
     'speed': 8,
@@ -20343,7 +20384,8 @@ weapons['Glaive'] = {
     'large': '1d10',
     'knockdown': 'd10'
 };
-weapons['Glaive-guisarme'] = {
+weapons['glaive-guisarme'] = {
+    'name': 'Glaive-guisarme',
     'size': 'L',
     'type': 'P/S',
     'speed': 9,
@@ -20351,7 +20393,8 @@ weapons['Glaive-guisarme'] = {
     'large': '2d6',
     'knockdown': 'd10'
 };
-weapons['Guisarme'] = {
+weapons['guisarme'] = {
+    'name': 'Guisarme',
     'size': 'L',
     'type': 'S',
     'speed': 8,
@@ -20359,14 +20402,16 @@ weapons['Guisarme'] = {
     'large': '1d8',
     'knockdown': 'd10'
 };
-weapons['Guisarme-voulge'] = {
+weapons['guisarme-voulge'] = {
+    'name': 'Guisarme-voulge',
     'size': 'L',
     'type': 'P/S',
     'speed': 10,
     'small-medium': '2d4',
     'large': '2d4',
 };
-weapons['Halberd'] = {
+weapons['halberd'] = {
+    'name': 'Halberd',
     'size': 'L',
     'type': 'P/S',
     'speed': 9,
@@ -20374,14 +20419,16 @@ weapons['Halberd'] = {
     'large': '2d6',
     'knockdown': 'd12'
 };
-weapons['Hook fauchard'] = {
+weapons['hook fauchard'] = {
+    'name': 'Hook fauchard',
     'size': 'L',
     'type': 'P',
     'speed': 9,
     'small-medium': '1d4',
     'large': '1d4',
 };
-weapons['Lucern hammer'] = {
+weapons['lucern hammer'] = {
+    'name': 'Lucern hammer',
     'size': 'L',
     'type': 'P/B',
     'speed': 9,
@@ -20389,7 +20436,8 @@ weapons['Lucern hammer'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Military fork'] = {
+weapons['military fork'] = {
+    'name': 'Military fork',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -20397,7 +20445,8 @@ weapons['Military fork'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Partisan'] = {
+weapons['partisan'] = {
+    'name': 'Partisan',
     'size': 'L',
     'type': 'P',
     'speed': 9,
@@ -20405,7 +20454,8 @@ weapons['Partisan'] = {
     'large': '1d6+1',
     'knockdown': 'd8'
 };
-weapons['Ranseur'] = {
+weapons['ranseur'] = {
+    'name': 'Ranseur',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -20413,7 +20463,8 @@ weapons['Ranseur'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Spetum'] = {
+weapons['spetum'] = {
+    'name': 'Spetum',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -20421,7 +20472,8 @@ weapons['Spetum'] = {
     'large': '2d6',
     'knockdown': 'd8'
 };
-weapons['Voulge'] = {
+weapons['voulge'] = {
+    'name': 'Voulge',
     'size': 'L',
     'type': 'S',
     'speed': 10,
@@ -20429,7 +20481,8 @@ weapons['Voulge'] = {
     'large': '2d4',
     'knockdown': 'd12'
 };
-weapons['Quarterstaff'] = {
+weapons['quarterstaff'] = {
+    'name': 'Quarterstaff',
     'size': 'L',
     'type': 'B',
     'speed': 4,
@@ -20437,7 +20490,8 @@ weapons['Quarterstaff'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Scourge'] = {
+weapons['scourge'] = {
+    'name': 'Scourge',
     'size': 'S',
     'type': '',
     'speed': 5,
@@ -20445,7 +20499,8 @@ weapons['Scourge'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Sickle'] = {
+weapons['sickle'] = {
+    'name': 'Sickle',
     'size': 'S',
     'type': 'S',
     'speed': 4,
@@ -20453,7 +20508,8 @@ weapons['Sickle'] = {
     'large': '1d4',
     'knockdown': 'd4'
 };
-weapons['Sling (Bullet)'] = {
+weapons['sling (bullet)'] = {
+    'name': 'Sling (Bullet)',
     'strength': true,
     'rof': '1',
     'range': '50/100/200',
@@ -20464,7 +20520,8 @@ weapons['Sling (Bullet)'] = {
     'large': '1d6+1',
     'knockdown': 'd4'
 };
-weapons['Sling (Stone)'] = {
+weapons['sling (stone)'] = {
+    'name': 'Sling (Stone)',
     'strength': true,
     'rof': '1',
     'range': '40/80/160',
@@ -20475,7 +20532,8 @@ weapons['Sling (Stone)'] = {
     'large': '1d4',
     'knockdown': 'd4'
 };
-weapons['Spear'] = {
+weapons['spear'] = {
+    'name': 'Spear',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -20486,7 +20544,8 @@ weapons['Spear'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Staff sling (Bullet)'] = {
+weapons['staff sling (bullet)'] = {
+    'name': 'Staff sling (Bullet)',
     'strength': true,
     'rof': '2/1',
     'range': '—/30-60/90',
@@ -20496,7 +20555,8 @@ weapons['Staff sling (Bullet)'] = {
     'small-medium': '1d4+1',
     'large': '1d6+1',
 };
-weapons['Staff sling (Stone)'] = {
+weapons['staff sling (stone)'] = {
+    'name': 'Staff sling (Stone)',
     'strength': true,
     'rof': '2/1',
     'range': '—/30-60/90',
@@ -20507,7 +20567,8 @@ weapons['Staff sling (Stone)'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Bastard sword (One-handed)'] = {
+weapons['bastard sword (one-handed)'] = {
+    'name': 'Bastard sword (One-handed)',
     'size': 'M',
     'type': 'S',
     'speed': 6,
@@ -20515,7 +20576,8 @@ weapons['Bastard sword (One-handed)'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Bastard sword (Two-handed)'] = {
+weapons['bastard sword (two-handed)'] = {
+    'name': 'Bastard sword (Two-handed)',
     'size': 'M',
     'type': 'S',
     'speed': 8,
@@ -20523,7 +20585,8 @@ weapons['Bastard sword (Two-handed)'] = {
     'large': '2d8',
     'knockdown': 'd10'
 };
-weapons['Broad sword'] = {
+weapons['broad sword'] = {
+    'name': 'Broad sword',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -20531,7 +20594,8 @@ weapons['Broad sword'] = {
     'large': '1d6+1',
     'knockdown': 'd8'
 };
-weapons['Khopesh'] = {
+weapons['khopesh'] = {
+    'name': 'Khopesh',
     'size': 'M',
     'type': 'S',
     'speed': 9,
@@ -20539,7 +20603,8 @@ weapons['Khopesh'] = {
     'large': '1d6',
     'knockdown': 'd8'
 };
-weapons['Long sword'] = {
+weapons['long sword'] = {
+    'name': 'Long sword',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -20547,7 +20612,8 @@ weapons['Long sword'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Scimitar'] = {
+weapons['scimitar'] = {
+    'name': 'Scimitar',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -20555,7 +20621,8 @@ weapons['Scimitar'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Short sword'] = {
+weapons['short sword'] = {
+    'name': 'Short sword',
     'size': 'S',
     'type': 'P',
     'speed': 3,
@@ -20563,7 +20630,8 @@ weapons['Short sword'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Two-handed sword'] = {
+weapons['two-handed sword'] = {
+    'name': 'Two-handed sword',
     'size': 'L',
     'type': 'S',
     'speed': 10,
@@ -20571,7 +20639,8 @@ weapons['Two-handed sword'] = {
     'large': '3d6',
     'knockdown': 'd12'
 };
-weapons['Trident'] = {
+weapons['trident'] = {
+    'name': 'Trident',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -20579,7 +20648,8 @@ weapons['Trident'] = {
     'large': '3d4',
     'knockdown': 'd8'
 };
-weapons['Warhammer'] = {
+weapons['warhammer'] = {
+    'name': 'Warhammer',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -20590,7 +20660,8 @@ weapons['Warhammer'] = {
     'large': '1d4',
     'knockdown': 'd8'
 };
-weapons['Whip'] = {
+weapons['whip'] = {
+    'name': 'Whip',
     'size': 'M',
     'type': '',
     'speed': 8,
@@ -30425,6 +30496,7 @@ on('change:nonprof-penalty', function (eventInfo) {
 })
 
 function getWeaponWithBonus(weaponName) {
+    weaponName = weaponName?.toLowerCase();
     if (!weaponName)
         return undefined;
     
@@ -30656,25 +30728,6 @@ gemSections.forEach(i => {
 const sheetName = 'AD&D 2E Revised';
 const sheetVersion = '4.1.0';
 
-function moveStaticToRepeating(section, fieldsToMove) {
-    getAttrs(fieldsToMove, function (values) {
-        if (values[fieldsToMove[0]]) {
-            
-            console.log(`${fieldsToMove[0]} has a value. Moving static to repeating`);
-            
-            let newrowid = generateRowID();
-            let newValue = {};
-
-            for (const [field, value] of Object.entries(values)) {
-                newValue[`repeating_${section}_${newrowid}_${field}`] = value;
-                newValue[field] = '';
-            }
-            
-            setAttrs(newValue);
-        }
-    });
-}
-
 on('sheet:opened', function(){
     getAttrs(['character_sheet'],function(attrs){
         let cs=_.rest((attrs.character_sheet||'').match(/(.*?)(?:\s+v(.*))?$/)),
diff --git a/AD&D 2E Revised/html/2ESheet-base.html b/AD&D 2E Revised/html/2ESheet-base.html
index 2686fbc8d1..734d9c0c0f 100644
--- a/AD&D 2E Revised/html/2ESheet-base.html	
+++ b/AD&D 2E Revised/html/2ESheet-base.html	
@@ -25,6 +25,7 @@
                 <li>Cleaned up Heat Metal template</li>
                 <li>Cleaned up Magic missiles template. No longer has pop up</li>
                 <li>Improved the reading of magical bonuses for weapons. Now can read the bonus from anywhere in the weapon name, ie. "Short bow +1 (Flight Arrow)"</li>
+                <li>Weapon table auto fill is now case insensitive, so you can write "TwO-HaNdeD SwOrD" and still get the information filled in</li>
             </ul>
             <hr>
             <p>
diff --git a/AD&D 2E Revised/javascript/sheetWorkers.js b/AD&D 2E Revised/javascript/sheetWorkers.js
index 34b75c4eb9..4999c94d28 100644
--- a/AD&D 2E Revised/javascript/sheetWorkers.js	
+++ b/AD&D 2E Revised/javascript/sheetWorkers.js	
@@ -907,6 +907,7 @@ on('change:nonprof-penalty', function (eventInfo) {
 })
 
 function getWeaponWithBonus(weaponName) {
+    weaponName = weaponName?.toLowerCase();
     if (!weaponName)
         return undefined;
     
diff --git a/AD&D 2E Revised/javascript/version.js b/AD&D 2E Revised/javascript/version.js
index 9e959cac52..a1aa590870 100644
--- a/AD&D 2E Revised/javascript/version.js	
+++ b/AD&D 2E Revised/javascript/version.js	
@@ -3,25 +3,6 @@
 const sheetName = 'AD&D 2E Revised';
 const sheetVersion = '4.1.0';
 
-function moveStaticToRepeating(section, fieldsToMove) {
-    getAttrs(fieldsToMove, function (values) {
-        if (values[fieldsToMove[0]]) {
-            
-            console.log(`${fieldsToMove[0]} has a value. Moving static to repeating`);
-            
-            let newrowid = generateRowID();
-            let newValue = {};
-
-            for (const [field, value] of Object.entries(values)) {
-                newValue[`repeating_${section}_${newrowid}_${field}`] = value;
-                newValue[field] = '';
-            }
-            
-            setAttrs(newValue);
-        }
-    });
-}
-
 on('sheet:opened', function(){
     getAttrs(['character_sheet'],function(attrs){
         let cs=_.rest((attrs.character_sheet||'').match(/(.*?)(?:\s+v(.*))?$/)),
diff --git a/AD&D 2E Revised/javascript/weapons.js b/AD&D 2E Revised/javascript/weapons.js
index ad8146e2ff..495ad20e8e 100644
--- a/AD&D 2E Revised/javascript/weapons.js	
+++ b/AD&D 2E Revised/javascript/weapons.js	
@@ -1,5 +1,6 @@
 const weapons = {};
-weapons['Arquebus'] = {
+weapons['arquebus'] = {
+    'name': 'Arquebus',
     'rof': '1/3',
     'range': '50/150/210',
     'size': 'M',
@@ -9,7 +10,8 @@ weapons['Arquebus'] = {
     'large': '1d10',
     'knockdown': 'd8'
 };
-weapons['Battle axe'] = {
+weapons['battle axe'] = {
+    'name': 'Battle axe',
     'size': 'M',
     'type': 'S',
     'speed': 7,
@@ -17,7 +19,8 @@ weapons['Battle axe'] = {
     'large': '1d8',
     'knockdown': 'd10'
 };
-weapons['Blowgun (Barbed Dart)'] = {
+weapons['blowgun (barbed dart)'] = {
+    'name': 'Blowgun (Barbed Dart)',
     'rof': '2/1',
     'range': '10/20/30',
     'size': 'L',
@@ -27,7 +30,8 @@ weapons['Blowgun (Barbed Dart)'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Blowgun (Needle)'] = {
+weapons['blowgun (needle)'] = {
+    'name': 'Blowgun (Needle)',
     'rof': '2/1',
     'range': '10/20/30',
     'size': 'L',
@@ -36,7 +40,8 @@ weapons['Blowgun (Needle)'] = {
     'small-medium': '1',
     'large': '1',
 };
-weapons['Short bow (Flight arrow)'] = {
+weapons['short bow (flight arrow)'] = {
+    'name': 'Short bow (Flight arrow)',
     'rof': '2/1',
     'range': '50/100/150',
     'size': 'M',
@@ -46,7 +51,8 @@ weapons['Short bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Long bow (Flight arrow)'] = {
+weapons['long bow (flight arrow)'] = {
+    'name': 'Long bow (Flight arrow)',
     'rof': '2/1',
     'range': '70/140/210',
     'size': 'L',
@@ -56,7 +62,8 @@ weapons['Long bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Long bow (Sheaf arrow)'] = {
+weapons['long bow (sheaf arrow)'] = {
+    'name': 'Long bow (Sheaf arrow)',
     'rof': '2/1',
     'range': '50/100/150',
     'size': 'L',
@@ -66,7 +73,8 @@ weapons['Long bow (Sheaf arrow)'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Composite short bow (Flight arrow)'] = {
+weapons['composite short bow (flight arrow)'] = {
+    'name': 'Composite short bow (Flight arrow)',
     'rof': '2/1',
     'range': '50/100/180',
     'size': 'M',
@@ -76,7 +84,8 @@ weapons['Composite short bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Composite long bow (Flight arrow)'] = {
+weapons['composite long bow (flight arrow)'] = {
+    'name': 'Composite long bow (Flight arrow)',
     'rof': '2/1',
     'range': '60/120/210',
     'size': 'L',
@@ -86,7 +95,8 @@ weapons['Composite long bow (Flight arrow)'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Composite long bow (Sheaf arrow)'] = {
+weapons['composite long bow (sheaf arrow)'] = {
+    'name': 'Composite long bow (Sheaf arrow)',
     'rof': '2/1',
     'range': '40/80/170',
     'size': 'L',
@@ -96,7 +106,8 @@ weapons['Composite long bow (Sheaf arrow)'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Club'] = {
+weapons['club'] = {
+    'name': 'Club',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -107,7 +118,8 @@ weapons['Club'] = {
     'large': '1d3',
     'knockdown': 'd8'
 };
-weapons['Hand crossbow'] = {
+weapons['hand crossbow'] = {
+    'name': 'Hand crossbow',
     'rof': '1',
     'range': '20/40/60',
     'size': 'S',
@@ -117,7 +129,8 @@ weapons['Hand crossbow'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Light crossbow'] = {
+weapons['light crossbow'] = {
+    'name': 'Light crossbow',
     'rof': '1',
     'range': '60/120/180',
     'size': 'M',
@@ -127,7 +140,8 @@ weapons['Light crossbow'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Heavy crossbow'] = {
+weapons['heavy crossbow'] = {
+    'name': 'Heavy crossbow',
     'rof': '1/2',
     'range': '80/160/240',
     'size': 'M',
@@ -137,7 +151,8 @@ weapons['Heavy crossbow'] = {
     'large': '1d6+1',
     'knockdown': 'd6'
 };
-weapons['Dagger'] = {
+weapons['dagger'] = {
+    'name': 'Dagger',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -148,7 +163,8 @@ weapons['Dagger'] = {
     'large': '1d3',
     'knockdown': 'd6'
 };
-weapons['Dirk'] = {
+weapons['dirk'] = {
+    'name': 'Dirk',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -159,7 +175,8 @@ weapons['Dirk'] = {
     'large': '1d3',
     'knockdown': 'd6'
 };
-weapons['Dart'] = {
+weapons['dart'] = {
+    'name': 'Dart',
     'strength': true,
     'rof': '3/1',
     'range': '10/20/40',
@@ -170,7 +187,8 @@ weapons['Dart'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Footman\'s flail'] = {
+weapons['footman\'s flail'] = {
+    'name': 'Footman\'s flail',
     'size': 'M',
     'type': 'B',
     'speed': 7,
@@ -178,7 +196,8 @@ weapons['Footman\'s flail'] = {
     'large': '2d4',
     'knockdown': 'd12'
 };
-weapons['Footman\'s mace'] = {
+weapons['footman\'s mace'] = {
+    'name': 'Footman\'s mace',
     'size': 'M',
     'type': 'B',
     'speed': 7,
@@ -186,7 +205,8 @@ weapons['Footman\'s mace'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Footman\'s pick'] = {
+weapons['footman\'s pick'] = {
+    'name': 'Footman\'s pick',
     'size': 'M',
     'type': 'P',
     'speed': 7,
@@ -194,7 +214,8 @@ weapons['Footman\'s pick'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Hand axe'] = {
+weapons['hand axe'] = {
+    'name': 'Hand axe',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -205,7 +226,8 @@ weapons['Hand axe'] = {
     'large': '1d4',
     'knockdown': 'd10'
 };
-weapons['Harpoon'] = {
+weapons['harpoon'] = {
+    'name': 'Harpoon',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -216,7 +238,8 @@ weapons['Harpoon'] = {
     'large': '2d6',
     'knockdown': 'd8'
 };
-weapons['Horseman\'s flail'] = {
+weapons['horseman\'s flail'] = {
+    'name': 'Horseman\'s flail',
     'size': 'M',
     'type': 'B',
     'speed': 6,
@@ -224,7 +247,8 @@ weapons['Horseman\'s flail'] = {
     'large': '1d4+1',
     'knockdown': 'd10'
 };
-weapons['Horseman\'s mace'] = {
+weapons['horseman\'s mace'] = {
+    'name': 'Horseman\'s mace',
     'size': 'M',
     'type': 'B',
     'speed': 6,
@@ -232,7 +256,8 @@ weapons['Horseman\'s mace'] = {
     'large': '1d4',
     'knockdown': 'd8'
 };
-weapons['Horseman\'s pick'] = {
+weapons['horseman\'s pick'] = {
+    'name': 'Horseman\'s pick',
     'size': 'M',
     'type': 'P',
     'speed': 5,
@@ -240,7 +265,8 @@ weapons['Horseman\'s pick'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Javelin'] = {
+weapons['javelin'] = {
+    'name': 'Javelin',
     'strength': true,
     'rof': '1',
     'range': '20/40/60',
@@ -251,7 +277,8 @@ weapons['Javelin'] = {
     'large': '1d6',
     'knockdown': 'd6'
 };
-weapons['Knife'] = {
+weapons['knife'] = {
+    'name': 'Knife',
     'strength': true,
     'rof': '2/1',
     'range': '10/20/30',
@@ -262,7 +289,8 @@ weapons['Knife'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Heavy horse lance'] = {
+weapons['heavy horse lance'] = {
+    'name': 'Heavy horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -270,7 +298,8 @@ weapons['Heavy horse lance'] = {
     'large': '3d6',
     'knockdown': 'd12'
 };
-weapons['Light horse lance'] = {
+weapons['light horse lance'] = {
+    'name': 'Light horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 6,
@@ -278,7 +307,8 @@ weapons['Light horse lance'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Jousting lance'] = {
+weapons['jousting lance'] = {
+    'name': 'Jousting lance',
     'size': 'L',
     'type': 'P',
     'speed': 10,
@@ -286,7 +316,8 @@ weapons['Jousting lance'] = {
     'large': '1d2-1',
     'knockdown': 'd6'
 };
-weapons['Medium horse lance'] = {
+weapons['medium horse lance'] = {
+    'name': 'Medium horse lance',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -294,7 +325,8 @@ weapons['Medium horse lance'] = {
     'large': '2d6',
     'knockdown': 'd10'
 };
-weapons['Mancatcher'] = {
+weapons['mancatcher'] = {
+    'name': 'Mancatcher',
     'size': 'L',
     'type': '',
     'speed': 7,
@@ -302,7 +334,8 @@ weapons['Mancatcher'] = {
     'large': '—',
     'knockdown': 'd6'
 };
-weapons['Morning star'] = {
+weapons['morning star'] = {
+    'name': 'Morning star',
     'size': 'M',
     'type': 'P/B',
     'speed': 7,
@@ -310,7 +343,8 @@ weapons['Morning star'] = {
     'large': '1d6+1',
     'knockdown': 'd10'
 };
-weapons['Awl pike'] = {
+weapons['awl pike'] = {
+    'name': 'Awl pike',
     'size': 'L',
     'type': 'P',
     'speed': 13,
@@ -318,7 +352,8 @@ weapons['Awl pike'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Bardiche'] = {
+weapons['bardiche'] = {
+    'name': 'Bardiche',
     'size': 'L',
     'type': 'S',
     'speed': 9,
@@ -326,7 +361,8 @@ weapons['Bardiche'] = {
     'large': '2d6',
     'knockdown': 'd12'
 };
-weapons['Bec de corbin'] = {
+weapons['bec de corbin'] = {
+    'name': 'Bec de corbin',
     'size': 'L',
     'type': 'P/B',
     'speed': 9,
@@ -334,7 +370,8 @@ weapons['Bec de corbin'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Bill-guisarme'] = {
+weapons['bill-guisarme'] = {
+    'name': 'Bill-guisarme',
     'size': 'L',
     'type': 'P/S',
     'speed': 10,
@@ -342,7 +379,8 @@ weapons['Bill-guisarme'] = {
     'large': '1d10',
     'knockdown': 'd10'
 };
-weapons['Fauchard'] = {
+weapons['fauchard'] = {
+    'name': 'Fauchard',
     'size': 'L',
     'type': 'P/S',
     'speed': 8,
@@ -350,14 +388,16 @@ weapons['Fauchard'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Fauchard-fork'] = {
+weapons['fauchard-fork'] = {
+    'name': 'Fauchard-fork',
     'size': 'L',
     'type': 'P/S',
     'speed': 8,
     'small-medium': '1d8',
     'large': '1d10',
 };
-weapons['Glaive'] = {
+weapons['glaive'] = {
+    'name': 'Glaive',
     'size': 'L',
     'type': 'S',
     'speed': 8,
@@ -365,7 +405,8 @@ weapons['Glaive'] = {
     'large': '1d10',
     'knockdown': 'd10'
 };
-weapons['Glaive-guisarme'] = {
+weapons['glaive-guisarme'] = {
+    'name': 'Glaive-guisarme',
     'size': 'L',
     'type': 'P/S',
     'speed': 9,
@@ -373,7 +414,8 @@ weapons['Glaive-guisarme'] = {
     'large': '2d6',
     'knockdown': 'd10'
 };
-weapons['Guisarme'] = {
+weapons['guisarme'] = {
+    'name': 'Guisarme',
     'size': 'L',
     'type': 'S',
     'speed': 8,
@@ -381,14 +423,16 @@ weapons['Guisarme'] = {
     'large': '1d8',
     'knockdown': 'd10'
 };
-weapons['Guisarme-voulge'] = {
+weapons['guisarme-voulge'] = {
+    'name': 'Guisarme-voulge',
     'size': 'L',
     'type': 'P/S',
     'speed': 10,
     'small-medium': '2d4',
     'large': '2d4',
 };
-weapons['Halberd'] = {
+weapons['halberd'] = {
+    'name': 'Halberd',
     'size': 'L',
     'type': 'P/S',
     'speed': 9,
@@ -396,14 +440,16 @@ weapons['Halberd'] = {
     'large': '2d6',
     'knockdown': 'd12'
 };
-weapons['Hook fauchard'] = {
+weapons['hook fauchard'] = {
+    'name': 'Hook fauchard',
     'size': 'L',
     'type': 'P',
     'speed': 9,
     'small-medium': '1d4',
     'large': '1d4',
 };
-weapons['Lucern hammer'] = {
+weapons['lucern hammer'] = {
+    'name': 'Lucern hammer',
     'size': 'L',
     'type': 'P/B',
     'speed': 9,
@@ -411,7 +457,8 @@ weapons['Lucern hammer'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Military fork'] = {
+weapons['military fork'] = {
+    'name': 'Military fork',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -419,7 +466,8 @@ weapons['Military fork'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Partisan'] = {
+weapons['partisan'] = {
+    'name': 'Partisan',
     'size': 'L',
     'type': 'P',
     'speed': 9,
@@ -427,7 +475,8 @@ weapons['Partisan'] = {
     'large': '1d6+1',
     'knockdown': 'd8'
 };
-weapons['Ranseur'] = {
+weapons['ranseur'] = {
+    'name': 'Ranseur',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -435,7 +484,8 @@ weapons['Ranseur'] = {
     'large': '2d4',
     'knockdown': 'd8'
 };
-weapons['Spetum'] = {
+weapons['spetum'] = {
+    'name': 'Spetum',
     'size': 'L',
     'type': 'P',
     'speed': 8,
@@ -443,7 +493,8 @@ weapons['Spetum'] = {
     'large': '2d6',
     'knockdown': 'd8'
 };
-weapons['Voulge'] = {
+weapons['voulge'] = {
+    'name': 'Voulge',
     'size': 'L',
     'type': 'S',
     'speed': 10,
@@ -451,7 +502,8 @@ weapons['Voulge'] = {
     'large': '2d4',
     'knockdown': 'd12'
 };
-weapons['Quarterstaff'] = {
+weapons['quarterstaff'] = {
+    'name': 'Quarterstaff',
     'size': 'L',
     'type': 'B',
     'speed': 4,
@@ -459,7 +511,8 @@ weapons['Quarterstaff'] = {
     'large': '1d6',
     'knockdown': 'd10'
 };
-weapons['Scourge'] = {
+weapons['scourge'] = {
+    'name': 'Scourge',
     'size': 'S',
     'type': '',
     'speed': 5,
@@ -467,7 +520,8 @@ weapons['Scourge'] = {
     'large': '1d2',
     'knockdown': 'd4'
 };
-weapons['Sickle'] = {
+weapons['sickle'] = {
+    'name': 'Sickle',
     'size': 'S',
     'type': 'S',
     'speed': 4,
@@ -475,7 +529,8 @@ weapons['Sickle'] = {
     'large': '1d4',
     'knockdown': 'd4'
 };
-weapons['Sling (Bullet)'] = {
+weapons['sling (bullet)'] = {
+    'name': 'Sling (Bullet)',
     'strength': true,
     'rof': '1',
     'range': '50/100/200',
@@ -486,7 +541,8 @@ weapons['Sling (Bullet)'] = {
     'large': '1d6+1',
     'knockdown': 'd4'
 };
-weapons['Sling (Stone)'] = {
+weapons['sling (stone)'] = {
+    'name': 'Sling (Stone)',
     'strength': true,
     'rof': '1',
     'range': '40/80/160',
@@ -497,7 +553,8 @@ weapons['Sling (Stone)'] = {
     'large': '1d4',
     'knockdown': 'd4'
 };
-weapons['Spear'] = {
+weapons['spear'] = {
+    'name': 'Spear',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -508,7 +565,8 @@ weapons['Spear'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Staff sling (Bullet)'] = {
+weapons['staff sling (bullet)'] = {
+    'name': 'Staff sling (Bullet)',
     'strength': true,
     'rof': '2/1',
     'range': '—/30-60/90',
@@ -518,7 +576,8 @@ weapons['Staff sling (Bullet)'] = {
     'small-medium': '1d4+1',
     'large': '1d6+1',
 };
-weapons['Staff sling (Stone)'] = {
+weapons['staff sling (stone)'] = {
+    'name': 'Staff sling (Stone)',
     'strength': true,
     'rof': '2/1',
     'range': '—/30-60/90',
@@ -529,7 +588,8 @@ weapons['Staff sling (Stone)'] = {
     'large': '1d4',
     'knockdown': 'd6'
 };
-weapons['Bastard sword (One-handed)'] = {
+weapons['bastard sword (one-handed)'] = {
+    'name': 'Bastard sword (One-handed)',
     'size': 'M',
     'type': 'S',
     'speed': 6,
@@ -537,7 +597,8 @@ weapons['Bastard sword (One-handed)'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Bastard sword (Two-handed)'] = {
+weapons['bastard sword (two-handed)'] = {
+    'name': 'Bastard sword (Two-handed)',
     'size': 'M',
     'type': 'S',
     'speed': 8,
@@ -545,7 +606,8 @@ weapons['Bastard sword (Two-handed)'] = {
     'large': '2d8',
     'knockdown': 'd10'
 };
-weapons['Broad sword'] = {
+weapons['broad sword'] = {
+    'name': 'Broad sword',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -553,7 +615,8 @@ weapons['Broad sword'] = {
     'large': '1d6+1',
     'knockdown': 'd8'
 };
-weapons['Khopesh'] = {
+weapons['khopesh'] = {
+    'name': 'Khopesh',
     'size': 'M',
     'type': 'S',
     'speed': 9,
@@ -561,7 +624,8 @@ weapons['Khopesh'] = {
     'large': '1d6',
     'knockdown': 'd8'
 };
-weapons['Long sword'] = {
+weapons['long sword'] = {
+    'name': 'Long sword',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -569,7 +633,8 @@ weapons['Long sword'] = {
     'large': '1d12',
     'knockdown': 'd8'
 };
-weapons['Scimitar'] = {
+weapons['scimitar'] = {
+    'name': 'Scimitar',
     'size': 'M',
     'type': 'S',
     'speed': 5,
@@ -577,7 +642,8 @@ weapons['Scimitar'] = {
     'large': '1d8',
     'knockdown': 'd8'
 };
-weapons['Short sword'] = {
+weapons['short sword'] = {
+    'name': 'Short sword',
     'size': 'S',
     'type': 'P',
     'speed': 3,
@@ -585,7 +651,8 @@ weapons['Short sword'] = {
     'large': '1d8',
     'knockdown': 'd6'
 };
-weapons['Two-handed sword'] = {
+weapons['two-handed sword'] = {
+    'name': 'Two-handed sword',
     'size': 'L',
     'type': 'S',
     'speed': 10,
@@ -593,7 +660,8 @@ weapons['Two-handed sword'] = {
     'large': '3d6',
     'knockdown': 'd12'
 };
-weapons['Trident'] = {
+weapons['trident'] = {
+    'name': 'Trident',
     'size': 'L',
     'type': 'P',
     'speed': 7,
@@ -601,7 +669,8 @@ weapons['Trident'] = {
     'large': '3d4',
     'knockdown': 'd8'
 };
-weapons['Warhammer'] = {
+weapons['warhammer'] = {
+    'name': 'Warhammer',
     'strength': true,
     'rof': '1',
     'range': '10/20/30',
@@ -612,7 +681,8 @@ weapons['Warhammer'] = {
     'large': '1d4',
     'knockdown': 'd8'
 };
-weapons['Whip'] = {
+weapons['whip'] = {
+    'name': 'Whip',
     'size': 'M',
     'type': '',
     'speed': 8,