Skip to content

Commit

Permalink
[#43] Test
Browse files Browse the repository at this point in the history
  • Loading branch information
@Orchaldir
Orchaldir committed Oct 28, 2023
1 parent 2b8ff2f commit 5325c64
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 33 deletions.
21 changes: 14 additions & 7 deletions resources/templates/appearance_edit.html.tera
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,23 +466,30 @@
<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>
<li>
<b>Belt</b>
<b>Belt:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.available", options=[ "true","false" ], selected=appearance.body.clothing.pants.belt.available, update=true) }}
{% if appearance.body.clothing.pants.belt.available == "true" %}
<ul>
<li>
<b>Buckle</b>
<b>Value</b>
<ul>
<li>
<b>Style:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.buckle.style", options=[ "Box","Circle","Frame","Plate" ], selected=appearance.body.clothing.pants.belt.buckle.style, update=true) }}
<b>Buckle</b>
<ul>
<li>
<b>Style:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.value.buckle.style", options=[ "Box","Circle","Frame","Plate" ], selected=appearance.body.clothing.pants.belt.value.buckle.style, update=true) }}
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.value.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.pants.belt.value.buckle.color, update=true) }}
</li>
</ul>
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.pants.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.pants.belt.buckle.color, update=true) }}
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.pants.belt.value.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.belt.value.color, update=true) }}
</li>
</ul>
</li>
<li>
<b>Color:</b> {{ macros::add_select(name="appearance.body.clothing.pants.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.pants.belt.color, update=true) }}
</li>
</ul>
{% endif %}
</li>
</ul>
</li>
Expand Down
19 changes: 13 additions & 6 deletions resources/templates/character.html.tera
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,22 +468,29 @@
</li>
<li>
<b>Belt</b>
{% if appearance.body.clothing.pants.belt.available %}
<ul>
<li>
<b>Buckle</b>
<b>Value</b>
<ul>
<li>
<b>Style:</b> {{ appearance.body.clothing.pants.belt.buckle.style }}
<b>Buckle</b>
<ul>
<li>
<b>Style:</b> {{ appearance.body.clothing.pants.belt.value.buckle.style }}
</li>
<li>
<b>Color:</b> {{ appearance.body.clothing.pants.belt.value.buckle.color }}
</li>
</ul>
</li>
<li>
<b>Color:</b> {{ appearance.body.clothing.pants.belt.buckle.color }}
<b>Color:</b> {{ appearance.body.clothing.pants.belt.value.color }}
</li>
</ul>
</li>
<li>
<b>Color:</b> {{ appearance.body.clothing.pants.belt.color }}
</li>
</ul>
{% endif %}
</li>
</ul>
</li>
Expand Down
13 changes: 3 additions & 10 deletions rpg_tools_core/examples/editor_macro.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,9 @@ extern crate rpg_tools_core;
pub mod utils;

use crate::utils::write_each;
use macro_core::visitor::{visit_option, UI};
use macro_ui::ui;
use rpg_tools_core::model::size::Size;
use macro_core::visitor::UI;
use rpg_tools_core::model::character::appearance::Appearance;
use rpg_tools_core::ui::editor::EditorVisitor;
use serde::{Deserialize, Serialize};

#[derive(ui, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct Test {
pub option: Option<Size>,
}

fn main() {
println!("Generate tera code for editor");
Expand All @@ -22,7 +15,7 @@ fn main() {

println!("Start visit");

Test::visit(&mut visitor, "", false);
Appearance::visit(&mut visitor, "", false);

println!("Finished visit");

Expand Down
13 changes: 3 additions & 10 deletions rpg_tools_core/examples/viewer_macro.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,9 @@ extern crate rpg_tools_core;
pub mod utils;

use crate::utils::write_each;
use macro_core::visitor::{visit_option, UI};
use macro_ui::ui;
use rpg_tools_core::model::size::Size;
use macro_core::visitor::UI;
use rpg_tools_core::model::character::appearance::Appearance;
use rpg_tools_core::ui::viewer::ViewerVisitor;
use serde::{Deserialize, Serialize};

#[derive(ui, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct Test {
pub option: Option<Size>,
}

fn main() {
println!("Generate tera code for viewer");
Expand All @@ -22,7 +15,7 @@ fn main() {

println!("Start visit");

Test::visit(&mut visitor, "", false);
Appearance::visit(&mut visitor, "", false);

println!("Finished visit");

Expand Down
1 change: 1 addition & 0 deletions rpg_tools_core/src/model/equipment/appearance/pants.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::model::color::Color;
use crate::model::equipment::appearance::belt::Belt;
use macro_convert::Convert;
use macro_core::visitor::visit_option;
use macro_ui::ui;
use serde::{Deserialize, Serialize};

Expand Down

0 comments on commit 5325c64

Please sign in to comment.