Merge pull request #227 from jrconway3/issue-10-add-male-pants

Issue #10 Added "Male" Pants Assets, Fixed Hammer Walk

sheet_definitions/feet_socks_ankle.json

@@ -3,6 +3,7 @@
   "type_name" : "socks",
   "layer_1" : {
     "zPos" : 14,
+    "male" : "feet/socks/ankle/male/",
     "female" : "feet/socks/ankle/thin/",
     "teen" : "feet/socks/ankle/thin/",
     "pregnant" : "feet/socks/ankle/thin/"

sheet_definitions/feet_socks_high.json

@@ -3,6 +3,7 @@
   "type_name" : "socks",
   "layer_1" : {
     "zPos" : 14,
+    "male" : "feet/socks/high/male/",
     "female" : "feet/socks/high/thin/",
     "teen" : "feet/socks/high/thin/",
     "pregnant" : "feet/socks/high/thin/"

sheet_definitions/legs_cuffed.json

@@ -3,9 +3,9 @@
   "type_name": "legs",
   "layer_1": {
     "zPos": 20,
+    "male": "legs/cuffed/male/",
     "female": "legs/cuffed/thin/",
-    "teen": "legs/cuffed/thin/",
-    "pregnant": "legs/cuffed/thin/"
+    "teen": "legs/cuffed/thin/"
   },
   "variants": [
     "leather",

sheet_definitions/legs_hose.json

@@ -3,9 +3,9 @@
   "type_name": "legs",
   "layer_1": {
     "zPos": 20,
+    "male": "legs/hose/male/",
     "female": "legs/hose/thin/",
-    "teen": "legs/hose/thin/",
-    "pregnant": "legs/hose/thin/"
+    "teen": "legs/hose/thin/"
   },
   "variants": [
     "leather",

sheet_definitions/legs_leggings.json

@@ -3,9 +3,9 @@
   "type_name" : "legs",
   "layer_1" : {
     "zPos" : 20,
-    "female" : "legs/leggings/female/",
-    "pregnant" : "legs/leggings/female/",
-    "teen" : "legs/leggings/female/"
+    "male" : "legs/leggings/male/",
+    "female" : "legs/leggings/thin/",
+    "teen" : "legs/leggings/thin/"
   },
   "variants": [
     "black",
@@ -32,5 +32,24 @@
     "walnut",
     "white",
     "yellow"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h_bgslash",
+    "1h_halfslash"
   ]
 }

sheet_definitions/legs_leggings2.json

@@ -3,9 +3,9 @@
   "type_name": "legs",
   "layer_1": {
     "zPos": 20,
+    "male" : "legs/leggings2/male/",
     "female": "legs/leggings2/thin/",
-    "teen": "legs/leggings2/thin/",
-    "pregnant": "legs/leggings2/thin/"
+    "teen": "legs/leggings2/thin/"
   },
   "variants": [
     "leather",

sheet_definitions/legs_pants.json

@@ -6,7 +6,7 @@
     "male" : "legs/pants/male/",
     "muscular" : "legs/pants/male/",
     "female" : "legs/pants/female/",
-    "teen" : "legs/pants/teen/"
+    "teen" : "legs/pants/female/"
   },
   "variants": [
     "black",
@@ -33,5 +33,24 @@
     "walnut",
     "white",
     "yellow"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h_bgslash",
+    "1h_halfslash"
   ]
 }

sheet_definitions/legs_pants2.json

@@ -1,11 +1,11 @@
 {
-  "name": "Pants 2",
+  "name": "Long Pants",
   "type_name": "legs",
   "layer_1": {
     "zPos": 20,
+    "male": "legs/pants2/male/",
     "female": "legs/pants2/thin/",
-    "teen": "legs/pants2/thin/",
-    "pregnant": "legs/pants2/thin/"
+    "teen": "legs/pants2/thin/"
   },
   "variants": [
     "leather",

sheet_definitions/tool_rod.json

@@ -11,15 +11,17 @@
     "male": "tools/rod/background/",
     "muscular": "tools/rod/background/",
     "female": "tools/rod/background/",
-    "pregnant": "tools/rod/background/"
+    "pregnant": "tools/rod/background/",
+    "teen": "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/"
+    "pregnant": "tools/rod/foreground/",
+    "teen": "tools/rod/foreground/"
   },
   "variants": [
     "rod"

sheet_definitions/tool_smash.json

@@ -6,27 +6,30 @@
     "male": "tools/smash/universal/male/",
     "muscular": "tools/smash/universal/male/",
     "female": "tools/smash/universal/female/",
-    "pregnant": "tools/smash/universal/female/"
+    "pregnant": "tools/smash/universal/female/",
+    "teen": "tools/smash/universal/female/"
   },
   "layer_2": {
     "zPos": 9,
     "custom_animation": "slash_128",
     "male": "tools/smash/background/",
     "muscular": "tools/smash/background/",
     "female": "tools/smash/background/",
-    "pregnant": "tools/smash/background/"
+    "pregnant": "tools/smash/background/",
+    "teen": "tools/smash/background/"
   },
   "layer_3": {
     "zPos": 150,
     "custom_animation": "slash_128",
     "male": "tools/smash/foreground/",
     "muscular": "tools/smash/foreground/",
     "female": "tools/smash/foreground/",
-    "pregnant": "tools/smash/foreground/"
+    "pregnant": "tools/smash/foreground/",
+    "teen": "tools/smash/foreground/"
   },
   "variants": [
     "axe",
     "hammer",
     "pickaxe"
   ]
-}
+}

sheet_definitions/tool_thrust.json

@@ -6,14 +6,16 @@
     "male": "tools/thrust/background/",
     "muscular": "tools/thrust/background/",
     "female": "tools/thrust/background/",
-    "pregnant": "tools/thrust/background/"
+    "pregnant": "tools/thrust/background/",
+    "teen": "tools/thrust/background/"
   },
   "layer_2": {
     "zPos": 150,
     "male": "tools/thrust/foreground/",
     "muscular": "tools/thrust/foreground/",
     "female": "tools/thrust/foreground/",
-    "pregnant": "tools/thrust/foreground/"
+    "pregnant": "tools/thrust/foreground/",
+    "teen": "tools/thrust/foreground/"
   },
   "variants": [
     "hoe",

sheet_definitions/tool_whip.json

@@ -7,15 +7,17 @@
     "male": "tools/whip/background/",
     "muscular": "tools/whip/background/",
     "female": "tools/whip/background/",
-    "pregnant": "tools/whip/background/"
+    "pregnant": "tools/whip/background/",
+    "teen": "tools/whip/background/"
   },
   "layer_2": {
     "zPos": 150,
     "custom_animation": "tool_whip",
     "male": "tools/whip/",
     "muscular": "tools/whip/",
     "female": "tools/whip/",
-    "pregnant": "tools/whip/"
+    "pregnant": "tools/whip/",
+    "teen": "tools/whip/"
   },
   "variants": [
     "whip"