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

[#73] Outerwear #101

Merged
merged 45 commits into from
Nov 5, 2023
Merged

[#73] Outerwear #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
55ec63a
[#73] Move SleeveStyle
Orchaldir Nov 2, 2023
23acbf1
[#73] Move Neckline
Orchaldir Nov 2, 2023
87de972
[#73] Add Outerwear
Orchaldir Nov 2, 2023
6db0694
[#73] Add Outerwear
Orchaldir Nov 2, 2023
023be76
[#73] Add example
Orchaldir Nov 3, 2023
509515c
[#73] Add render_outerwear()
Orchaldir Nov 3, 2023
1cf012f
[#73] Add sleeves
Orchaldir Nov 3, 2023
e506a8f
[#73] Render coat torso
Orchaldir Nov 3, 2023
6dc117e
[#73] Add Polygon2dBuilder.reverse()
Orchaldir Nov 3, 2023
6e098f6
[#73] Render coat length
Orchaldir Nov 3, 2023
4b9797e
[#73] Fix Polygon2dBuilder.reverse()
Orchaldir Nov 3, 2023
6f507dc
[#73] Fix length rendering
Orchaldir Nov 3, 2023
85d985e
[#73] Refactor
Orchaldir Nov 3, 2023
8cbc845
[#73] Add example
Orchaldir Nov 3, 2023
6e233e5
[#73] Render closing
Orchaldir Nov 4, 2023
c4d191d
[#73] Improve Zipper
Orchaldir Nov 4, 2023
7526eb8
[#73] Render Buttons
Orchaldir Nov 4, 2023
8136204
[#73] Render Buttons
Orchaldir Nov 4, 2023
036bbbe
[#73] Render Buttons
Orchaldir Nov 4, 2023
5e88144
[#73] Render Buttons
Orchaldir Nov 4, 2023
7767754
[#73] Render Buttons
Orchaldir Nov 4, 2023
27dad26
[#73] Render Buttons
Orchaldir Nov 4, 2023
6d3198a
[#73] Improve rendering
Orchaldir Nov 4, 2023
7f52eaa
[#73] Add VeryDeppV
Orchaldir Nov 4, 2023
34a3da6
[#73] Add Cloak
Orchaldir Nov 4, 2023
0b14cd6
[#73] Refactor
Orchaldir Nov 4, 2023
b8b1a01
[#73] Render cloak
Orchaldir Nov 4, 2023
5d78aec
[#73] Render cloak
Orchaldir Nov 4, 2023
c30bf00
[#73] Render cloak
Orchaldir Nov 4, 2023
c8e28a0
[#73] Render cloak
Orchaldir Nov 4, 2023
611f14f
[#73] Render cloak
Orchaldir Nov 4, 2023
415eca4
[#73] Render cloak
Orchaldir Nov 4, 2023
65a87f5
[#73] Render cloak
Orchaldir Nov 4, 2023
ec74067
[#73] Refactor
Orchaldir Nov 4, 2023
761b187
[#73] MR
Orchaldir Nov 4, 2023
3b219b6
[#73] Render belt
Orchaldir Nov 4, 2023
54d2237
[#73] Fix rendering order
Orchaldir Nov 5, 2023
4d8a07a
[#73] Improve UI
Orchaldir Nov 5, 2023
6d830bf
[#73] Improve UI
Orchaldir Nov 5, 2023
3925d7c
[#73] Fix rendering order
Orchaldir Nov 5, 2023
129f126
[#73] Add config
Orchaldir Nov 5, 2023
2c37bfa
[#73] MR
Orchaldir Nov 5, 2023
ab5f282
[#73] Move
Orchaldir Nov 5, 2023
eab45ef
[#73] Update orc
Orchaldir Nov 5, 2023
388ff2b
[#73] Refactor
Orchaldir Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions resources/characters/characters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
sleeve_style: Long
neckline: Crew
color: White
outerwear:
type: Cloak
length: Ankle
outer_color: Green
inner_color: Green
head:
ears:
type: Normal
Expand Down Expand Up @@ -196,6 +201,8 @@
sleeve_style: Long
neckline: DeepV
color: Red
outerwear:
type: None
head:
ears:
type: Normal
Expand Down Expand Up @@ -256,16 +263,30 @@
type: Simple
footwear:
color: SaddleBrown
style: Sandals
style: Shoes
sole: Gray
pants:
style: Shorts
color: Purple
style: Regular
color: Navy
belt: null
shirt:
sleeve_style: None
sleeve_style: Long
neckline: Crew
color: Purple
color: Black
outerwear:
type: Coat
sleeve: Long
length: Knee
neckline: DeepV
closing:
type: SingleBreasted
buttons:
button:
size: Medium
color: Silver
count: 5
color: White
belt: null
head:
ears:
type: None
Expand Down Expand Up @@ -328,6 +349,8 @@
sleeve_style: Short
neckline: Crew
color: Gray
outerwear:
type: None
head:
ears:
type: Normal
Expand Down
107 changes: 105 additions & 2 deletions resources/templates/appearance_edit.html.tera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<img id="preview" src="/appearance/preview/front.svg" alt="Front Preview" width="75%"/>
<img id="preview" src="/appearance/preview/back.svg" alt="Back Preview" width="75%"/>
</div>
<div class="text">
<div class="editor">
<form id="appearanceForm" action="/appearance/{{ id }}/preview" method="post">
<ul>
<li>
Expand Down Expand Up @@ -552,13 +552,116 @@
<b>Sleeve Style:</b> {{ macros::add_select(name="appearance.body.clothing.shirt.sleeve_style", options=[ "Long","None","Short" ], selected=appearance.body.clothing.shirt.sleeve_style, update=true) }}
</li>
<li>
<b>Neckline:</b> {{ macros::add_select(name="appearance.body.clothing.shirt.neckline", options=[ "Boat","Crew","DeepV","None","Scoop","V" ], selected=appearance.body.clothing.shirt.neckline, update=true) }}
<b>Neckline:</b> {{ macros::add_select(name="appearance.body.clothing.shirt.neckline", options=[ "Boat","Crew","DeepV","None","Scoop","V","VeryDeepV" ], selected=appearance.body.clothing.shirt.neckline, update=true) }}
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.shirt.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.shirt.color, update=true) }}
</li>
</ul>
</li>
<li>
<b>Outerwear:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.type", options=[ "None","Cloak","Coat" ], selected=appearance.body.clothing.outerwear.type, update=true) }}
<ul>
{% if appearance.body.clothing.outerwear.type == "None" %}
{% elif appearance.body.clothing.outerwear.type == "Cloak" %}
<li>
<b>Length:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.length", options=[ "Hip","Knee","Ankle" ], selected=appearance.body.clothing.outerwear.length, update=true) }}
</li>
<li>
<b>Outer Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.outer_color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.outer_color, update=true) }}
</li>
<li>
<b>Inner Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.inner_color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.inner_color, update=true) }}
</li>
{% elif appearance.body.clothing.outerwear.type == "Coat" %}
<li>
<b>Sleeve:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.sleeve", options=[ "Long","None","Short" ], selected=appearance.body.clothing.outerwear.sleeve, update=true) }}
</li>
<li>
<b>Length:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.length", options=[ "Hip","Knee","Ankle" ], selected=appearance.body.clothing.outerwear.length, update=true) }}
</li>
<li>
<b>Neckline:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.neckline", options=[ "Boat","Crew","DeepV","None","Scoop","V","VeryDeepV" ], selected=appearance.body.clothing.outerwear.neckline, update=true) }}
</li>
<li>
<b>Closing:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.type", options=[ "None","SingleBreasted","DoubleBreasted","Zipper" ], selected=appearance.body.clothing.outerwear.closing.type, update=true) }}
<ul>
{% if appearance.body.clothing.outerwear.closing.type == "None" %}
{% elif appearance.body.clothing.outerwear.closing.type == "SingleBreasted" %}
<li>
<b>Buttons</b>
<ul>
<li>
<b>Button</b>
<ul>
<li>
<b>Size:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.buttons.button.size", options=[ "Small","Medium","Large" ], selected=appearance.body.clothing.outerwear.closing.buttons.button.size, update=true) }}
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.buttons.button.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.closing.buttons.button.color, update=true) }}
</li>
</ul>
</li>
<li><b>Count:</b> <input type="number" step="1" id="appearance.body.clothing.outerwear.closing.buttons.count" name="appearance.body.clothing.outerwear.closing.buttons.count" value="{{ appearance.body.clothing.outerwear.closing.buttons.count }}" onchange="updateAppearancePreview();"></li>
</ul>
</li>
{% elif appearance.body.clothing.outerwear.closing.type == "DoubleBreasted" %}
<li>
<b>Buttons</b>
<ul>
<li>
<b>Button</b>
<ul>
<li>
<b>Size:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.buttons.button.size", options=[ "Small","Medium","Large" ], selected=appearance.body.clothing.outerwear.closing.buttons.button.size, update=true) }}
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.buttons.button.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.closing.buttons.button.color, update=true) }}
</li>
</ul>
</li>
<li><b>Count:</b> <input type="number" step="1" id="appearance.body.clothing.outerwear.closing.buttons.count" name="appearance.body.clothing.outerwear.closing.buttons.count" value="{{ appearance.body.clothing.outerwear.closing.buttons.count }}" onchange="updateAppearancePreview();"></li>
</ul>
</li>
{% elif appearance.body.clothing.outerwear.closing.type == "Zipper" %}
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.closing.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.closing.color, update=true) }}
</li>
{% endif %}
</ul>
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.color, update=true) }}
</li>
<li>
{% if appearance.body.clothing.outerwear.belt %}
<b>Belt Availability:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.belt.availability", options=[ "true","false" ], selected="true", update=true) }}
</li>
<li>
<b>Belt</b>
<ul>
<li>
<b>Buckle</b>
<ul>
<li>
<b>Style:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.belt.buckle.style", options=[ "Box","Circle","Frame","Plate" ], selected=appearance.body.clothing.outerwear.belt.buckle.style, update=true) }}
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.belt.buckle.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.belt.buckle.color, update=true) }}
</li>
</ul>
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.belt.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.outerwear.belt.color, update=true) }}
</li>
</ul>
{% else %}
<b>Belt Availability:</b> {{ macros::add_select(name="appearance.body.clothing.outerwear.belt.availability", options=[ "true","false" ], selected="false", update=true) }}
{% endif %}
</li>
{% endif %}
</ul>
</li>
{% endif %}
</ul>
</li>
Expand Down
Loading
Loading