Merge pull request #167 from white-axe/editors

Implement the system, tileset and troop editors

Author: melody-rs

.gitignore

@@ -1,6 +1,6 @@
 #! Rust Build Output
 /target
-dist/
+dist
 
 #! GDB-related files
 .gdb_*
@@ -17,4 +17,4 @@ steamworks/*
 #! renderdoc
 captures/
 
-rustc-ice*
+rustc-ice*

Cargo.lock

@@ -106,7 +106,7 @@ bytemuck = { version = "1.14.0", features = [
     "derive",
     "min_const_generics",
 ] } # Bit casting between data types
-num-integer = "0.1.46" # Integer trait and implementations of some integer algorithms such as GCD and LCM
+num = "0.4.3" # Integer trait and implementations of some integer algorithms such as GCD and LCM
 
 # * Logging and diagnostics * #
 log = { version = "0.4", features = [

Cargo.toml

@@ -124,7 +124,7 @@ impl Data {
         ];
 
         for script_path in scripts_paths {
-            match handler.read_data(filesystem, format!("{script_path}")) {
+            match handler.read_data(filesystem, &script_path) {
                 Ok(s) => {
                     config.project.scripts_path = script_path;
                     scripts = Some(rpg::Scripts {

crates/core/src/data_cache.rs

@@ -25,6 +25,7 @@ alox-48.workspace = true
 
 # * Mathematics * #
 bytemuck.workspace = true
+num.workspace = true
 
 # * Useful procedural macros * #
 num_enum = "0.7.0"     # Procedural macros to make inter-operation between primitives and enums easier

crates/data/Cargo.toml

@@ -18,15 +18,13 @@
 pub mod id_serde;
 pub mod id_vec_serde;
 pub mod nil_padded_serde;
-pub mod optional_id_serde;
-pub mod optional_path_serde;
 
 pub mod id_alox;
 pub mod id_vec_alox;
 pub mod nil_padded_alox;
-pub mod optional_id_alox;
-pub mod optional_path_alox;
 
 mod parameter_type;
-
 pub use parameter_type::*;
+
+mod rpg_option;
+pub use rpg_option::*;