Merge pull request sanderfrenken#45 from sanderfrenken/add-fishing-rod

Add rod from https://opengameart.org/content/lpc-hand-tools

CREDITS.csv

@@ -14814,6 +14814,8 @@ shoulders/plate/male/iron.png,,"bluecarrot16, Johannes Sjölund (wulax)","CC-BY-
 shoulders/plate/male/silver.png,,"bluecarrot16, Johannes Sjölund (wulax)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,http://opengameart.org/content/lpc-clothing-updates,,,,,,,,,,,,,,OK
 shoulders/plate/male/steel.png,,"bluecarrot16, Johannes Sjölund (wulax)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,http://opengameart.org/content/lpc-clothing-updates,,,,,,,,,,,,,,OK
 todo/formal_vest stripes.png,,"bluecarrot16, Thane Brimhall (pennomi), laetissima","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-2-characters,https://opengameart.org/content/lpc-gentleman,,,,,,,,,,,,,,OK
+tools/rod/background/rod.png,,"bluecarrot16, Pierre Vigier, Tuomo Untinen, Johannes Sjölund (wulax), and Inboxninja","CC-BY-SA 3.0",https://opengameart.org/content/lpc-hand-tools,,,,,,,,,,,,,,,OK
+tools/rod/foreground/rod.png,,"bluecarrot16, Pierre Vigier, Tuomo Untinen, Johannes Sjölund (wulax), and Inboxninja","CC-BY-SA 3.0",https://opengameart.org/content/lpc-hand-tools,,,,,,,,,,,,,,,OK
 tools/smash/background/axe.png,,"bluecarrot16, Pierre Vigier, Tuomo Untinen, Johannes Sjölund (wulax), and Inboxninja","CC-BY-SA 3.0",https://opengameart.org/content/lpc-hand-tools,,,,,,,,,,,,,,,OK
 tools/smash/foreground/axe.png,,"bluecarrot16, Pierre Vigier, Tuomo Untinen, Johannes Sjölund (wulax), and Inboxninja","CC-BY-SA 3.0",https://opengameart.org/content/lpc-hand-tools,,,,,,,,,,,,,,,OK
 tools/smash/background/hammer.png,,"bluecarrot16, Pierre Vigier, Tuomo Untinen, Johannes Sjölund (wulax), and Inboxninja","CC-BY-SA 3.0",https://opengameart.org/content/lpc-hand-tools,,,,,,,,,,,,,,,OK

index.html

@@ -36204,6 +36204,13 @@ <h3>Legs</h3>
 			<!-- TOOLS -->
 			<h3>Tools</h3>
 			<ul>
+<li data-required="male,female,muscular,pregnant"><span class="condensed">Rod</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+  <label for="weapon-Rod_rod">
+    <input type="radio" id="weapon-Rod_rod" name="weapon" parentName="Rod" variant="rod" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=9 data-layer_1_custom_animation=tool_rod data-layer_1_male="tools/rod/background/rod.png" data-preview_row=10 data-layer_2_zpos=150 data-layer_2_custom_animation=tool_rod data-layer_2_male="tools/rod/foreground/rod.png" data-layer_1_female="tools/rod/background/rod.png" data-layer_2_female="tools/rod/foreground/rod.png" data-layer_1_muscular="tools/rod/background/rod.png" data-layer_2_muscular="tools/rod/foreground/rod.png" data-layer_1_pregnant="tools/rod/background/rod.png" data-layer_2_pregnant="tools/rod/foreground/rod.png"  [CHECKED]>
+    <span>rod</span>
+  </label>
+</li>
+</ul></li>
 <li data-required="male,female,muscular,pregnant"><span class="condensed">Smash</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
   <label for="weapon-Smash_axe">
     <input type="radio" id="weapon-Smash_axe" name="weapon" parentName="Smash" variant="axe" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=9 data-layer_1_custom_animation=tool_smash data-layer_1_male="tools/smash/background/axe.png" data-preview_row=10 data-layer_2_zpos=150 data-layer_2_custom_animation=tool_smash data-layer_2_male="tools/smash/foreground/axe.png" data-layer_1_female="tools/smash/background/axe.png" data-layer_2_female="tools/smash/foreground/axe.png" data-layer_1_muscular="tools/smash/background/axe.png" data-layer_2_muscular="tools/smash/foreground/axe.png" data-layer_1_pregnant="tools/smash/background/axe.png" data-layer_2_pregnant="tools/smash/foreground/axe.png"  [CHECKED]>

sheet_definitions/tool_rod.json

@@ -0,0 +1,23 @@
+{
+  "name" : "Rod",
+  "type_name" : "weapon",
+  "layer_1": {
+    "zPos": 9,
+    "custom_animation": "tool_rod",
+    "male": "tools/rod/background/",
+    "muscular": "tools/rod/background/",
+    "female": "tools/rod/background/",
+    "pregnant": "tools/rod/background/"
+  },
+  "layer_2": {
+    "zPos": 150,
+    "custom_animation": "tool_rod",
+    "male": "tools/rod/foreground/",
+    "muscular": "tools/rod/foreground/",
+    "female": "tools/rod/foreground/",
+    "pregnant": "tools/rod/foreground/"
+  },
+  "variants": [
+    "rod"
+  ]
+}

source_index.html

@@ -665,6 +665,7 @@ <h3>Legs</h3>
 			<!-- TOOLS -->
 			<h3>Tools</h3>
 			<ul>
+				div_sheet_tool_rod
 				div_sheet_tool_smash
 				div_sheet_tool_thrust
 			</ul>

sources/chargen.js

@@ -229,7 +229,7 @@ $(document).ready(function() {
 
     currentAnimationItemIndex = 0;
     if (activeCustomAnimation !== undefined && animationType === 'Other') {
-      for (var i = 0; i < activeCustomAnimation.frames[0].length; ++i) {
+      for (var i = 0; i < activeCustomAnimation.frames[0].length-1; ++i) {
         animationItems.push(i);
       }
       return
@@ -407,6 +407,8 @@ $(document).ready(function() {
           customAnimationDefinition = overSizeThrust;
         } else if (custom_animation == "tool_smash") {
           customAnimationDefinition = toolsSmash;
+        } else if (custom_animation == "tool_rod") {
+          customAnimationDefinition = toolRod;
         }
         activeCustomAnimation = customAnimationDefinition;
         const frameSize = customAnimationDefinition.frameSize;

sources/custom-animations.js

@@ -26,4 +26,14 @@ const toolSmash =  {
     ["13,0", "13,1", "13,2", "13,3", "13,4", "13,5"],
     ["14,0", "14,1", "14,2", "14,3", "14,4", "14,5"]
   ]
-}
+}
+
+const toolRod =  {
+  frameSize: 128,
+  frames: [
+    ["3,0", "3,1", "3,2", "3,3", "3,4", "3,5", "3,4", "3,4", "3,4", "3,5", "3,4", "3,2", "3,3"],
+    ["4,0", "4,1", "4,2", "4,3", "4,4", "4,5", "4,4", "4,4", "4,4", "4,5", "4,4", "4,2", "4,3"],
+    ["5,0", "5,1", "5,2", "5,3", "5,4", "5,5", "5,4", "5,4", "5,4", "5,5", "5,4", "5,2", "5,3"],
+    ["6,0", "6,1", "6,2", "6,3", "6,4", "6,5", "6,4", "6,4", "6,4", "6,5", "6,4", "6,2", "6,3"],
+  ]
+}