Merge pull request #211 from jrconway3/issue-205-added-plate-body-all…

…-frames

* Issue #205 Added Plate Armour to All Frames

index.html

@@ -53427,54 +53427,54 @@ <h3>Torso</h3>
 				</li>
 
 				<!-- Armour -->
-				<li data-required="male,female,teen" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering">
+				<li data-required="male,female,teen">
 					<span class="condensed">Armour</span>
 					<ul>
-<li data-required="male,female,teen" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering"><span class="condensed">Plate</span><ul><li><input type="radio" id="armour-none" name="armour"> <label for="armour-none">No armour</label></li><li>
+<li data-required="male,female,teen" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering,idle,jump,run,sit,emote,climb,combat,1h_slash,1h_backslash,1h_halfslash"><span class="condensed">Plate</span><ul><li><input type="radio" id="armour-none" name="armour"> <label for="armour-none">No armour</label></li><li>
   <label for="armour-Plate_steel">
-    <input type="radio" id="armour-Plate_steel" name="armour" parentName="Plate" variant="steel" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/steel.png" data-layer_1_female="torso/armour/plate/female/steel.png" data-layer_1_teen="torso/armour/plate/male/steel.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_steel" name="armour" parentName="Plate" variant="steel" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/steel.png" data-layer_1_female="torso/armour/plate/female/steel.png" data-layer_1_teen="torso/armour/plate/teen/steel.png"  [CHECKED]>
     <span>steel</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_iron">
-    <input type="radio" id="armour-Plate_iron" name="armour" parentName="Plate" variant="iron" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/iron.png" data-layer_1_female="torso/armour/plate/female/iron.png" data-layer_1_teen="torso/armour/plate/male/iron.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_iron" name="armour" parentName="Plate" variant="iron" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/iron.png" data-layer_1_female="torso/armour/plate/female/iron.png" data-layer_1_teen="torso/armour/plate/teen/iron.png"  [CHECKED]>
     <span>iron</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_ceramic">
-    <input type="radio" id="armour-Plate_ceramic" name="armour" parentName="Plate" variant="ceramic" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/ceramic.png" data-layer_1_female="torso/armour/plate/female/ceramic.png" data-layer_1_teen="torso/armour/plate/male/ceramic.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_ceramic" name="armour" parentName="Plate" variant="ceramic" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/ceramic.png" data-layer_1_female="torso/armour/plate/female/ceramic.png" data-layer_1_teen="torso/armour/plate/teen/ceramic.png"  [CHECKED]>
     <span>ceramic</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_brass">
-    <input type="radio" id="armour-Plate_brass" name="armour" parentName="Plate" variant="brass" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/brass.png" data-layer_1_female="torso/armour/plate/female/brass.png" data-layer_1_teen="torso/armour/plate/male/brass.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_brass" name="armour" parentName="Plate" variant="brass" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/brass.png" data-layer_1_female="torso/armour/plate/female/brass.png" data-layer_1_teen="torso/armour/plate/teen/brass.png"  [CHECKED]>
     <span>brass</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_copper">
-    <input type="radio" id="armour-Plate_copper" name="armour" parentName="Plate" variant="copper" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/copper.png" data-layer_1_female="torso/armour/plate/female/copper.png" data-layer_1_teen="torso/armour/plate/male/copper.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_copper" name="armour" parentName="Plate" variant="copper" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/copper.png" data-layer_1_female="torso/armour/plate/female/copper.png" data-layer_1_teen="torso/armour/plate/teen/copper.png"  [CHECKED]>
     <span>copper</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_bronze">
-    <input type="radio" id="armour-Plate_bronze" name="armour" parentName="Plate" variant="bronze" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/bronze.png" data-layer_1_female="torso/armour/plate/female/bronze.png" data-layer_1_teen="torso/armour/plate/male/bronze.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_bronze" name="armour" parentName="Plate" variant="bronze" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/bronze.png" data-layer_1_female="torso/armour/plate/female/bronze.png" data-layer_1_teen="torso/armour/plate/teen/bronze.png"  [CHECKED]>
     <span>bronze</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_silver">
-    <input type="radio" id="armour-Plate_silver" name="armour" parentName="Plate" variant="silver" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/silver.png" data-layer_1_female="torso/armour/plate/female/silver.png" data-layer_1_teen="torso/armour/plate/male/silver.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_silver" name="armour" parentName="Plate" variant="silver" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/silver.png" data-layer_1_female="torso/armour/plate/female/silver.png" data-layer_1_teen="torso/armour/plate/teen/silver.png"  [CHECKED]>
     <span>silver</span>
   </label>
 </li>
 <li>
   <label for="armour-Plate_gold">
-    <input type="radio" id="armour-Plate_gold" name="armour" parentName="Plate" variant="gold" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/gold.png" data-layer_1_female="torso/armour/plate/female/gold.png" data-layer_1_teen="torso/armour/plate/male/gold.png"  [CHECKED]>
+    <input type="radio" id="armour-Plate_gold" name="armour" parentName="Plate" variant="gold" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=60 data-layer_1_male="torso/armour/plate/male/gold.png" data-layer_1_female="torso/armour/plate/female/gold.png" data-layer_1_teen="torso/armour/plate/teen/gold.png"  [CHECKED]>
     <span>gold</span>
   </label>
 </li>

palettes/ulpc-metal-palettes.json

@@ -71,15 +71,6 @@
         "#FFC95A",
         "#FFFF61"
     ],
-    "base": [
-        "#1D131E",
-        "#2E2533",
-        "#4D4A5D",
-        "#726B7E",
-        "#dfbd00",
-        "#ffe900",
-        "#ffff3a"
-    ],
     "source": [
         "#1D131E",
         "#2E2533",

sheet_definitions/torso_armour_plate.json

@@ -5,7 +5,7 @@
     "zPos": 60,
     "male": "torso/armour/plate/male/",
     "female": "torso/armour/plate/female/",
-    "teen": "torso/armour/plate/male/"
+    "teen": "torso/armour/plate/teen/"
   },
   "variants": [
     "steel",
@@ -16,5 +16,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h_backslash",
+    "1h_halfslash"
   ]
 }

source_index.html

@@ -908,7 +908,7 @@ <h3>Torso</h3>
 				</li>
 
 				<!-- Armour -->
-				<li data-required="male,female,teen" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering">
+				<li data-required="male,female,teen">
 					<span class="condensed">Armour</span>
 					<ul>
 						div_sheet_torso_armour_plate