Merge pull request #171 from jrconway3/issue-141-map-helmets-all-frames

Issue #141 Mapped All of Eliza's Helmets (Plus A Few More)
sanderfrenken · Jun 5, 2024 · 25c5641 · 25c5641
2 parents 02079ff + 1787bd6
commit 25c5641
Show file tree

Hide file tree

Showing 328 changed files with 674 additions and 360 deletions.
diff --git a/CREDITS.csv b/CREDITS.csv
diff --git a/index.html b/index.html
diff --git a/palettes/ulpc-metal-palettes.json b/palettes/ulpc-metal-palettes.json
@@ -71,13 +71,22 @@
         "#FFC95A",
         "#FFFF61"
     ],
+    "base": [
+        "#1D131E",
+        "#2E2533",
+        "#4D4A5D",
+        "#726B7E",
+        "#dfbd00",
+        "#ffe900",
+        "#ffff3a"
+    ],
     "source": [
-        "#000000",
         "#1D131E",
-        "#1B192B",
-        "#29253A",
-        "#343043",
-        "#484152",
-        "#726B7E"
+        "#2E2533",
+        "#4D4A5D",
+        "#726B7E",
+        "#867E7F",
+        "#C4B59F",
+        "#FFFFFF"
     ]
   }
diff --git a/sheet_definitions/hat_accessory_plumage.json b/sheet_definitions/hat_accessory_plumage.json
@@ -3,11 +3,11 @@
   "type_name": "accessory",
   "layer_1": {
     "zPos": 139,
-    "female": "hat/accessory/plumage/male/",
-    "pregnant": "hat/accessory/plumage/male/",
-    "male": "hat/accessory/plumage/male/",
-    "muscular": "hat/accessory/plumage/male/",
-    "teen": "hat/accessory/plumage/male/"
+    "female": "hat/accessory/plumage/adult/",
+    "pregnant": "hat/accessory/plumage/adult/",
+    "male": "hat/accessory/plumage/adult/",
+    "muscular": "hat/accessory/plumage/adult/",
+    "teen": "hat/accessory/plumage/adult/"
   },
   "variants": [
     "black",
@@ -34,5 +34,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"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_bascinet.json b/sheet_definitions/hat_helmet_bascinet.json
@@ -3,11 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 130,
-    "female": "hat/helmet/bascinet/male/",
-    "pregnant": "hat/helmet/bascinet/male/",
-    "male": "hat/helmet/bascinet/male/",
-    "muscular": "hat/helmet/bascinet/male/",
-    "teen": "hat/helmet/bascinet/male/"
+    "female": "hat/helmet/bascinet/adult/",
+    "pregnant": "hat/helmet/bascinet/adult/",
+    "male": "hat/helmet/bascinet/adult/",
+    "muscular": "hat/helmet/bascinet/adult/",
+    "teen": "hat/helmet/bascinet/adult/"
   },
   "variants": [
     "steel",
@@ -18,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_bascinet_pigface.json b/sheet_definitions/hat_helmet_bascinet_pigface.json
@@ -3,11 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 130,
-    "female": "hat/helmet/bascinet_pigface/male/",
-    "pregnant": "hat/helmet/bascinet_pigface/male/",
-    "male": "hat/helmet/bascinet_pigface/male/",
-    "muscular": "hat/helmet/bascinet_pigface/male/",
-    "teen": "hat/helmet/bascinet_pigface/male/"
+    "female": "hat/helmet/bascinet_pigface/adult/",
+    "pregnant": "hat/helmet/bascinet_pigface/adult/",
+    "male": "hat/helmet/bascinet_pigface/adult/",
+    "muscular": "hat/helmet/bascinet_pigface/adult/",
+    "teen": "hat/helmet/bascinet_pigface/adult/"
   },
   "variants": [
     "steel",
@@ -18,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_bascinet_pigface_raised.json b/sheet_definitions/hat_helmet_bascinet_pigface_raised.json
@@ -3,10 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 130,
-    "female": "hat/helmet/bascinet_pigface_raised/female/",
-    "pregnant": "hat/helmet/bascinet_pigface_raised/female/",
-    "male": "hat/helmet/bascinet_pigface_raised/male/",
-    "muscular": "hat/helmet/bascinet_pigface_raised/male/"
+    "female": "hat/helmet/bascinet_pigface_raised/adult/",
+    "pregnant": "hat/helmet/bascinet_pigface_raised/adult/",
+    "male": "hat/helmet/bascinet_pigface_raised/adult/",
+    "muscular": "hat/helmet/bascinet_pigface_raised/adult/",
+    "teen": "hat/helmet/bascinet_pigface_raised/adult/"
   },
   "variants": [
     "steel",
@@ -17,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_bascinet_round.json b/sheet_definitions/hat_helmet_bascinet_round.json
@@ -3,11 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 130,
-    "female": "hat/helmet/bascinet_round/male/",
-    "pregnant": "hat/helmet/bascinet_round/male/",
-    "male": "hat/helmet/bascinet_round/male/",
-    "muscular": "hat/helmet/bascinet_round/male/",
-    "teen": "hat/helmet/bascinet_round/male/"
+    "female": "hat/helmet/bascinet_round/adult/",
+    "pregnant": "hat/helmet/bascinet_round/adult/",
+    "male": "hat/helmet/bascinet_round/adult/",
+    "muscular": "hat/helmet/bascinet_round/adult/",
+    "teen": "hat/helmet/bascinet_round/adult/"
   },
   "variants": [
     "steel",
@@ -18,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_bascinet_round_raised.json b/sheet_definitions/hat_helmet_bascinet_round_raised.json
@@ -3,10 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 130,
-    "female": "hat/helmet/bascinet_round_raised/female/",
-    "pregnant": "hat/helmet/bascinet_round_raised/female/",
-    "male": "hat/helmet/bascinet_round_raised/male/",
-    "muscular": "hat/helmet/bascinet_round_raised/male/"
+    "female": "hat/helmet/bascinet_round_raised/adult/",
+    "pregnant": "hat/helmet/bascinet_round_raised/adult/",
+    "male": "hat/helmet/bascinet_round_raised/adult/",
+    "muscular": "hat/helmet/bascinet_round_raised/adult/",
+    "teen": "hat/helmet/bascinet_round_raised/adult/"
   },
   "variants": [
     "steel",
@@ -17,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_kettle.json b/sheet_definitions/hat_helmet_kettle.json
@@ -3,13 +3,32 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 135,
-    "female": "hat/helmet/kettle/male/",
-    "pregnant": "hat/helmet/kettle/male/",
-    "male": "hat/helmet/kettle/male/",
-    "muscular": "hat/helmet/kettle/male/",
-    "teen": "hat/helmet/kettle/male/"
+    "female": "hat/helmet/kettle/adult/",
+    "pregnant": "hat/helmet/kettle/adult/",
+    "male": "hat/helmet/kettle/adult/",
+    "muscular": "hat/helmet/kettle/adult/",
+    "teen": "hat/helmet/kettle/adult/"
   },
   "variants": [
     "steel"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_mail.json b/sheet_definitions/hat_helmet_mail.json
@@ -3,13 +3,32 @@
   "type_name": "bandana",
   "layer_1": {
     "zPos": 125,
-    "female": "hat/helmet/mail/male/",
-    "pregnant": "hat/helmet/mail/male/",
-    "male": "hat/helmet/mail/male/",
-    "muscular": "hat/helmet/mail/male/",
-    "teen": "hat/helmet/mail/male/"
+    "female": "hat/helmet/mail/adult/",
+    "pregnant": "hat/helmet/mail/adult/",
+    "male": "hat/helmet/mail/adult/",
+    "muscular": "hat/helmet/mail/adult/",
+    "teen": "hat/helmet/mail/adult/"
   },
   "variants": [
     "steel"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }
diff --git a/sheet_definitions/hat_helmet_morion.json b/sheet_definitions/hat_helmet_morion.json
@@ -3,11 +3,11 @@
   "type_name": "hat",
   "layer_1": {
     "zPos": 135,
-    "female": "hat/helmet/morion/male/",
-    "pregnant": "hat/helmet/morion/male/",
-    "male": "hat/helmet/morion/male/",
-    "muscular": "hat/helmet/morion/male/",
-    "teen": "hat/helmet/morion/male/"
+    "female": "hat/helmet/morion/adult/",
+    "pregnant": "hat/helmet/morion/adult/",
+    "male": "hat/helmet/morion/adult/",
+    "muscular": "hat/helmet/morion/adult/",
+    "teen": "hat/helmet/morion/adult/"
   },
   "variants": [
     "steel",
@@ -18,5 +18,24 @@
     "bronze",
     "silver",
     "gold"
+  ],
+  "animations": [
+    "spellcast",
+    "thrust",
+    "walk",
+    "slash",
+    "shoot",
+    "hurt",
+    "watering",
+    "idle",
+    "jump",
+    "run",
+    "sit",
+    "emote",
+    "climb",
+    "combat",
+    "1h_slash",
+    "1h/bgslash",
+    "1h_halfslash"
   ]
 }