Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #141 Mapped All of Eliza's Helmets (Plus A Few More) #171

Merged
merged 5 commits into from
Jun 5, 2024
Merged

Issue #141 Mapped All of Eliza's Helmets (Plus A Few More) #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b39d4a5
* Issue #88 Added Mail Headwear to All Frames, Adjusted Directory Str…
jrconway3 Jun 4, 2024
4aa2594
* Issue #141 Added All Eliza's Helmets to All Frames, Added Bascinets…
jrconway3 Jun 4, 2024
1b71955
* Updated Credits for Eliza's Helmets
jrconway3 Jun 4, 2024
e803267
* Added Plumage to All Frames
jrconway3 Jun 4, 2024
1787bd6
* Issue #141 Mapped All of Eliza's Helmets to All Frames, Mapped Plum…
jrconway3 Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
220 changes: 0 additions & 220 deletions CREDITS.csv
View file
Open in desktop

Large diffs are not rendered by default.

348 changes: 272 additions & 76 deletions index.html
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions palettes/ulpc-metal-palettes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_accessory_plumage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_bascinet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_bascinet_pigface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
28 changes: 24 additions & 4 deletions sheet_definitions/hat_helmet_bascinet_pigface_raised.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_bascinet_round.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
28 changes: 24 additions & 4 deletions sheet_definitions/hat_helmet_bascinet_round_raised.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_kettle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_mail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
29 changes: 24 additions & 5 deletions sheet_definitions/hat_helmet_morion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
]
}
Loading
Loading