[#41] Update UI

Orchaldir · Sep 17, 2023 · 39a163c · 39a163c
1 parent 2081feb
commit 39a163c
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 0 deletions.
diff --git a/resources/characters/characters.yaml b/resources/characters/characters.yaml
@@ -9,6 +9,11 @@
       skin:
         type: NormalSkin
         color: Fair
+      clothing:
+        type: Simple
+        pants:
+          style: Regular
+          color: Blue
     head:
       ears:
         type: Normal
@@ -66,6 +71,8 @@
       skin:
         type: Scales
         color: Red
+      clothing:
+        type: None
     head:
       ears:
         type: Normal
@@ -152,6 +159,11 @@
       skin:
         type: ExoticSkin
         color: White
+      clothing:
+        type: Simple
+        pants:
+          style: Regular
+          color: Red
     head:
       ears:
         type: Normal
@@ -206,6 +218,11 @@
       skin:
         type: ExoticSkin
         color: Green
+      clothing:
+        type: Simple
+        pants:
+          style: Regular
+          color: Purple
     head:
       ears:
         type: None
@@ -248,6 +265,11 @@
       skin:
         type: NormalSkin
         color: Light
+      clothing:
+        type: Simple
+        pants:
+          style: Regular
+          color: Gray
     head:
       ears:
         type: Normal

diff --git a/resources/templates/appearance_edit.html.tera b/resources/templates/appearance_edit.html.tera
@@ -437,6 +437,25 @@
                       {% endif %}
                     </ul>
                   </li>
+                  <li>
+                    <b>Clothing:</b> {{ macros::add_select(name="appearance.body.clothing.type", options=[ "None","Simple" ], selected=appearance.body.clothing.type, update=true) }}
+                    <ul>
+                      {% if appearance.body.clothing.type == "None" %}
+                      {% elif appearance.body.clothing.type == "Simple" %}
+                        <li>
+                          <b>Pants</b>
+                          <ul>
+                            <li>
+                              <b>Style:</b> {{ macros::add_select(name="appearance.body.clothing.pants.style", options=[ "Balloon","Bermuda","HotPants","Regular","Shorts" ], selected=appearance.body.clothing.pants.style, update=true) }}
+                            </li>
+                            <li>
+                              <b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.pants.color", options=[ "Aqua","Black","Blue","Fuchsia","Gray","Green","Lime","Maroon","Navy","Olive","Orange","Purple","Red","SaddleBrown","Silver","Teal","White","Yellow" ], selected=appearance.body.clothing.pants.color, update=true) }}
+                            </li>
+                          </ul>
+                        </li>
+                      {% endif %}
+                    </ul>
+                  </li>
                 </ul>
               </li>
               <li>

diff --git a/resources/templates/character.html.tera b/resources/templates/character.html.tera
@@ -438,6 +438,25 @@
                 {% endif %}
               </ul>
             </li>
+            <li>
+              <b>Clothing</b>: {{ appearance.body.clothing.type }}
+              <ul>
+                {% if appearance.body.clothing.type == "None" %}
+                {% elif appearance.body.clothing.type == "Simple" %}
+                  <li>
+                    <b>Pants</b>
+                    <ul>
+                      <li>
+                        <b>Style:</b> {{ appearance.body.clothing.pants.style }}
+                      </li>
+                      <li>
+                        <b>Color:</b> {{ appearance.body.clothing.pants.color }}
+                      </li>
+                    </ul>
+                  </li>
+                {% endif %}
+              </ul>
+            </li>
           </ul>
         </li>
         <li>

diff --git a/rpg_tools_core/examples/editor_macro.rs b/rpg_tools_core/examples/editor_macro.rs
@@ -4,6 +4,7 @@ extern crate rpg_tools_core;
 pub mod utils;
 
 use crate::utils::write_each;
+use macro_core::visitor::UI;
 use rpg_tools_core::model::character::appearance::Appearance;
 use rpg_tools_core::ui::editor::EditorVisitor;
 

diff --git a/rpg_tools_core/examples/viewer_macro.rs b/rpg_tools_core/examples/viewer_macro.rs
@@ -4,6 +4,7 @@ extern crate rpg_tools_core;
 pub mod utils;
 
 use crate::utils::write_each;
+use macro_core::visitor::UI;
 use rpg_tools_core::model::character::appearance::Appearance;
 use rpg_tools_core::ui::viewer::ViewerVisitor;