[#43] Update

Orchaldir · Oct 28, 2023 · 1e873d9 · 1e873d9
1 parent e82cab5
commit 1e873d9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/resources/characters/characters.yaml b/resources/characters/characters.yaml
@@ -181,11 +181,7 @@
         pants:
           style: Balloon
           color: Red
-          belt:
-            buckle:
-              style: Circle
-              color: Gray
-            color: Black
+          belt: null
         shirt:
           sleeve_style: Long
           neckline: DeepV
@@ -253,11 +249,7 @@
         pants:
           style: Shorts
           color: Purple
-          belt:
-            buckle:
-              style: Box
-              color: Gray
-            color: Black
+          belt: null
         shirt:
           sleeve_style: None
           neckline: Crew

diff --git a/resources/templates/appearance_edit.html.tera b/resources/templates/appearance_edit.html.tera
@@ -468,6 +468,8 @@
                             <li>
                               {% if appearance.body.clothing.pants.belt %}
                               <b>Belt Availability:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.availability", options=[ "true","false" ], selected="true", update=true) }}
+                            </li>
+                            <li>
                               <b>Belt</b>
                               <ul>
                                 <li>

diff --git a/rpg_tools_core/src/ui/editor.rs b/rpg_tools_core/src/ui/editor.rs
@@ -24,8 +24,12 @@ impl EditorVisitor {
         &self.lines
     }
 
+    fn get_pretty_name(&self) -> String {
+        prettify(&self.get_name())
+    }
+
     fn get_name(&self) -> String {
-        prettify(self.path.last().unwrap())
+        self.path.last().unwrap().clone()
     }
 
     fn enter(&mut self) {
@@ -48,7 +52,7 @@ impl EditorVisitor {
     }
 
     fn add_selection(&mut self, path: &str, variants: &[String]) {
-        self.add_named_selection(&self.get_name(), path, variants, path);
+        self.add_named_selection(&self.get_pretty_name(), path, variants, path);
     }
 
     fn add_named_selection(&mut self, name: &str, path: &str, variants: &[String], selected: &str) {
@@ -105,17 +109,20 @@ impl UiVisitor for EditorVisitor {
         self.lines
             .push(format!("{}{{% if {} %}}", self.spaces, self.get_path(),));
         self.add_named_selection(
-            &format!("{} Availability", self.get_name()),
+            &format!("{} Availability", self.get_pretty_name()),
             &format!("{}.availability", self.get_path()),
             &vec!["true".to_string(), "false".to_string()],
             "\"true\"",
         );
+        let name = self.get_name();
+        self.leave_child();
+        self.enter_child(&name);
     }
 
     fn leave_option(&mut self) {
         self.lines.push(format!("{}{{% else %}}", self.spaces));
         self.add_named_selection(
-            &format!("{} Availability", self.get_name()),
+            &format!("{} Availability", self.get_pretty_name()),
             &format!("{}.availability", self.get_path()),
             &vec!["true".to_string(), "false".to_string()],
             "\"false\"",
@@ -130,7 +137,7 @@ impl UiVisitor for EditorVisitor {
             self.path.pop();
         } else {
             self.lines
-                .push(format!("{}<b>{}</b>", self.spaces, self.get_name()));
+                .push(format!("{}<b>{}</b>", self.spaces, self.get_pretty_name()));
             self.enter_list();
         }
     }