Skip to content

Commit

Permalink
Merge pull request #216 from jrconway3/issue-206-add-legion-armour-al…
Browse files Browse the repository at this point in the history
…l-frames

* #205 Added Legion Armour, Added Reduced Palette Chainmail Hood
  • Loading branch information
sanderfrenken authored Nov 13, 2024
2 parents f821392 + 77d6f39 commit 53a6a0b
Show file tree
Hide file tree
Showing 47 changed files with 90 additions and 414 deletions.
406 changes: 3 additions & 403 deletions CREDITS.csv

Large diffs are not rendered by default.

66 changes: 57 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30914,11 +30914,59 @@ <h3>Head</h3>
</li>
</ul></li>
<li data-required="male,female,teen,muscular,pregnant" 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">Mail</span><ul><li><input type="radio" id="bandana-none" name="bandana"> <label for="bandana-none">No bandana</label></li><li>
<label for="bandana-Mail_detailed">
<input type="radio" id="bandana-Mail_detailed" name="bandana" parentName="Mail" variant="detailed" matchBodyColor="false" data-preview_row=10 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=125 data-layer_1_male="hat/helmet/mail/adult/detailed.png" data-layer_1_female="hat/helmet/mail/adult/detailed.png" data-layer_1_teen="hat/helmet/mail/adult/detailed.png" data-layer_1_muscular="hat/helmet/mail/adult/detailed.png" data-layer_1_pregnant="hat/helmet/mail/adult/detailed.png" [CHECKED]>
<span>detailed</span>
</label>
</li>
<li>
<label for="bandana-Mail_steel">
<input type="radio" id="bandana-Mail_steel" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/steel.png" data-layer_1_female="hat/helmet/mail/adult/steel.png" data-layer_1_teen="hat/helmet/mail/adult/steel.png" data-layer_1_muscular="hat/helmet/mail/adult/steel.png" data-layer_1_pregnant="hat/helmet/mail/adult/steel.png" [CHECKED]>
<span>steel</span>
</label>
</li>
<li>
<label for="bandana-Mail_iron">
<input type="radio" id="bandana-Mail_iron" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/iron.png" data-layer_1_female="hat/helmet/mail/adult/iron.png" data-layer_1_teen="hat/helmet/mail/adult/iron.png" data-layer_1_muscular="hat/helmet/mail/adult/iron.png" data-layer_1_pregnant="hat/helmet/mail/adult/iron.png" [CHECKED]>
<span>iron</span>
</label>
</li>
<li>
<label for="bandana-Mail_ceramic">
<input type="radio" id="bandana-Mail_ceramic" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/ceramic.png" data-layer_1_female="hat/helmet/mail/adult/ceramic.png" data-layer_1_teen="hat/helmet/mail/adult/ceramic.png" data-layer_1_muscular="hat/helmet/mail/adult/ceramic.png" data-layer_1_pregnant="hat/helmet/mail/adult/ceramic.png" [CHECKED]>
<span>ceramic</span>
</label>
</li>
<li>
<label for="bandana-Mail_brass">
<input type="radio" id="bandana-Mail_brass" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/brass.png" data-layer_1_female="hat/helmet/mail/adult/brass.png" data-layer_1_teen="hat/helmet/mail/adult/brass.png" data-layer_1_muscular="hat/helmet/mail/adult/brass.png" data-layer_1_pregnant="hat/helmet/mail/adult/brass.png" [CHECKED]>
<span>brass</span>
</label>
</li>
<li>
<label for="bandana-Mail_copper">
<input type="radio" id="bandana-Mail_copper" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/copper.png" data-layer_1_female="hat/helmet/mail/adult/copper.png" data-layer_1_teen="hat/helmet/mail/adult/copper.png" data-layer_1_muscular="hat/helmet/mail/adult/copper.png" data-layer_1_pregnant="hat/helmet/mail/adult/copper.png" [CHECKED]>
<span>copper</span>
</label>
</li>
<li>
<label for="bandana-Mail_bronze">
<input type="radio" id="bandana-Mail_bronze" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/bronze.png" data-layer_1_female="hat/helmet/mail/adult/bronze.png" data-layer_1_teen="hat/helmet/mail/adult/bronze.png" data-layer_1_muscular="hat/helmet/mail/adult/bronze.png" data-layer_1_pregnant="hat/helmet/mail/adult/bronze.png" [CHECKED]>
<span>bronze</span>
</label>
</li>
<li>
<label for="bandana-Mail_silver">
<input type="radio" id="bandana-Mail_silver" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/silver.png" data-layer_1_female="hat/helmet/mail/adult/silver.png" data-layer_1_teen="hat/helmet/mail/adult/silver.png" data-layer_1_muscular="hat/helmet/mail/adult/silver.png" data-layer_1_pregnant="hat/helmet/mail/adult/silver.png" [CHECKED]>
<span>silver</span>
</label>
</li>
<li>
<label for="bandana-Mail_gold">
<input type="radio" id="bandana-Mail_gold" name="bandana" parentName="Mail" 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=125 data-layer_1_male="hat/helmet/mail/adult/gold.png" data-layer_1_female="hat/helmet/mail/adult/gold.png" data-layer_1_teen="hat/helmet/mail/adult/gold.png" data-layer_1_muscular="hat/helmet/mail/adult/gold.png" data-layer_1_pregnant="hat/helmet/mail/adult/gold.png" [CHECKED]>
<span>gold</span>
</label>
</li>
</ul></li>
<li data-required="male,female,teen,muscular,pregnant" 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">Tied Headband</span><ul><li><input type="radio" id="headcover-none" name="headcover"> <label for="headcover-none">No headcover</label></li><li>
<label for="headcover-Tied_Headband_black">
Expand Down Expand Up @@ -54731,51 +54779,51 @@ <h3>Torso</h3>
</label>
</li>
</ul></li>
<li data-required="male,female" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering"><span class="condensed">Legion</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/bgslash,1h_halfslash"><span class="condensed">Legion</span><ul><li><input type="radio" id="armour-none" name="armour"> <label for="armour-none">No armour</label></li><li>
<label for="armour-Legion_steel">
<input type="radio" id="armour-Legion_steel" name="armour" parentName="Legion" 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/legion/male/steel.png" data-layer_1_female="torso/armour/legion/female/steel.png" [CHECKED]>
<input type="radio" id="armour-Legion_steel" name="armour" parentName="Legion" 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/legion/male/steel.png" data-layer_1_female="torso/armour/legion/female/steel.png" data-layer_1_teen="torso/armour/legion/teen/steel.png" [CHECKED]>
<span>steel</span>
</label>
</li>
<li>
<label for="armour-Legion_iron">
<input type="radio" id="armour-Legion_iron" name="armour" parentName="Legion" 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/legion/male/iron.png" data-layer_1_female="torso/armour/legion/female/iron.png" [CHECKED]>
<input type="radio" id="armour-Legion_iron" name="armour" parentName="Legion" 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/legion/male/iron.png" data-layer_1_female="torso/armour/legion/female/iron.png" data-layer_1_teen="torso/armour/legion/teen/iron.png" [CHECKED]>
<span>iron</span>
</label>
</li>
<li>
<label for="armour-Legion_ceramic">
<input type="radio" id="armour-Legion_ceramic" name="armour" parentName="Legion" 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/legion/male/ceramic.png" data-layer_1_female="torso/armour/legion/female/ceramic.png" [CHECKED]>
<input type="radio" id="armour-Legion_ceramic" name="armour" parentName="Legion" 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/legion/male/ceramic.png" data-layer_1_female="torso/armour/legion/female/ceramic.png" data-layer_1_teen="torso/armour/legion/teen/ceramic.png" [CHECKED]>
<span>ceramic</span>
</label>
</li>
<li>
<label for="armour-Legion_brass">
<input type="radio" id="armour-Legion_brass" name="armour" parentName="Legion" 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/legion/male/brass.png" data-layer_1_female="torso/armour/legion/female/brass.png" [CHECKED]>
<input type="radio" id="armour-Legion_brass" name="armour" parentName="Legion" 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/legion/male/brass.png" data-layer_1_female="torso/armour/legion/female/brass.png" data-layer_1_teen="torso/armour/legion/teen/brass.png" [CHECKED]>
<span>brass</span>
</label>
</li>
<li>
<label for="armour-Legion_copper">
<input type="radio" id="armour-Legion_copper" name="armour" parentName="Legion" 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/legion/male/copper.png" data-layer_1_female="torso/armour/legion/female/copper.png" [CHECKED]>
<input type="radio" id="armour-Legion_copper" name="armour" parentName="Legion" 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/legion/male/copper.png" data-layer_1_female="torso/armour/legion/female/copper.png" data-layer_1_teen="torso/armour/legion/teen/copper.png" [CHECKED]>
<span>copper</span>
</label>
</li>
<li>
<label for="armour-Legion_bronze">
<input type="radio" id="armour-Legion_bronze" name="armour" parentName="Legion" 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/legion/male/bronze.png" data-layer_1_female="torso/armour/legion/female/bronze.png" [CHECKED]>
<input type="radio" id="armour-Legion_bronze" name="armour" parentName="Legion" 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/legion/male/bronze.png" data-layer_1_female="torso/armour/legion/female/bronze.png" data-layer_1_teen="torso/armour/legion/teen/bronze.png" [CHECKED]>
<span>bronze</span>
</label>
</li>
<li>
<label for="armour-Legion_silver">
<input type="radio" id="armour-Legion_silver" name="armour" parentName="Legion" 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/legion/male/silver.png" data-layer_1_female="torso/armour/legion/female/silver.png" [CHECKED]>
<input type="radio" id="armour-Legion_silver" name="armour" parentName="Legion" 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/legion/male/silver.png" data-layer_1_female="torso/armour/legion/female/silver.png" data-layer_1_teen="torso/armour/legion/teen/silver.png" [CHECKED]>
<span>silver</span>
</label>
</li>
<li>
<label for="armour-Legion_gold">
<input type="radio" id="armour-Legion_gold" name="armour" parentName="Legion" 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/legion/male/gold.png" data-layer_1_female="torso/armour/legion/female/gold.png" [CHECKED]>
<input type="radio" id="armour-Legion_gold" name="armour" parentName="Legion" 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/legion/male/gold.png" data-layer_1_female="torso/armour/legion/female/gold.png" data-layer_1_teen="torso/armour/legion/teen/gold.png" [CHECKED]>
<span>gold</span>
</label>
</li>
Expand Down
10 changes: 9 additions & 1 deletion sheet_definitions/hat_helmet_mail.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@
"teen": "hat/helmet/mail/adult/"
},
"variants": [
"steel"
"detailed",
"steel",
"iron",
"ceramic",
"brass",
"copper",
"bronze",
"silver",
"gold"
],
"animations": [
"spellcast",
Expand Down
22 changes: 21 additions & 1 deletion sheet_definitions/torso_armour_legion.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"layer_1": {
"zPos": 60,
"male": "torso/armour/legion/male/",
"female": "torso/armour/legion/female/"
"female": "torso/armour/legion/female/",
"teen": "torso/armour/legion/teen/"
},
"variants": [
"steel",
Expand All @@ -15,5 +16,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"
]
}
Binary file modified spritesheets/hat/helmet/mail/adult.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/brass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/bronze.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/ceramic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/copper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/detailed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/gold.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/iron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/adult/silver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/hat/helmet/mail/adult/steel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/hat/helmet/mail/detailed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/torso/armour/legion/female.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed spritesheets/torso/armour/legion/female/_steel.png
Binary file not shown.
Binary file added spritesheets/torso/armour/legion/female/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/brass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/bronze.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/ceramic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/copper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/gold.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/iron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/silver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/female/steel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/torso/armour/legion/male.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added spritesheets/torso/armour/legion/male/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified spritesheets/torso/armour/legion/male/brass.png
Binary file modified spritesheets/torso/armour/legion/male/bronze.png
Binary file modified spritesheets/torso/armour/legion/male/ceramic.png
Binary file modified spritesheets/torso/armour/legion/male/copper.png
Binary file modified spritesheets/torso/armour/legion/male/gold.png
Binary file modified spritesheets/torso/armour/legion/male/iron.png
Binary file modified spritesheets/torso/armour/legion/male/silver.png
Binary file modified spritesheets/torso/armour/legion/male/steel.png
Binary file added spritesheets/torso/armour/legion/teen.png
Binary file added spritesheets/torso/armour/legion/teen/base.png
Binary file added spritesheets/torso/armour/legion/teen/brass.png
Binary file added spritesheets/torso/armour/legion/teen/bronze.png
Binary file added spritesheets/torso/armour/legion/teen/ceramic.png
Binary file added spritesheets/torso/armour/legion/teen/copper.png
Binary file added spritesheets/torso/armour/legion/teen/gold.png
Binary file added spritesheets/torso/armour/legion/teen/iron.png
Binary file added spritesheets/torso/armour/legion/teen/silver.png
Binary file added spritesheets/torso/armour/legion/teen/steel.png

0 comments on commit 53a6a0b

Please sign in to comment.