Switch to multiple ids for effect & ability source

Zerthox · Jan 12, 2025 · 4d1566d · 4d1566d
1 parent 2d47045
commit 4d1566d
Show file tree

Hide file tree

Showing 14 changed files with 344 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/reffect/Cargo.toml b/reffect/Cargo.toml
@@ -21,6 +21,7 @@ rfd = { version = "0.15.0", default-features = false }
 semver = { version = "1.0.17", features = ["serde"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.115"
+serde_with = "3.12.0"
 strum = { version = "0.26.1", features = ["derive"] }
 thiserror = "2.0.5"
 url = "2.5.0"

diff --git a/reffect/src/elements/list/icon.rs b/reffect/src/elements/list/icon.rs
@@ -99,7 +99,7 @@ impl Default for ListIcon {
         Self {
             enabled: true,
             name: "Unnamed".into(),
-            trigger: ProgressTrigger::effect(),
+            trigger: ProgressTrigger::buff(),
             filter: FilterTrigger::default(),
             icon: Icon::default(),
         }

diff --git a/reffect/src/lib.rs b/reffect/src/lib.rs
@@ -12,8 +12,7 @@ mod lockbox;
 mod render;
 mod render_util;
 mod schema;
-mod serde_bitflags;
-mod serde_migrate;
+mod serde;
 mod settings;
 mod texture_manager;
 mod tree;

diff --git a/reffect/src/serde_bitflags.rs → reffect/src/serde/bitflags.rs b/reffect/src/serde_bitflags.rs → reffect/src/serde/bitflags.rs
diff --git a/reffect/src/serde_migrate.rs → reffect/src/serde/migrate.rs b/reffect/src/serde_migrate.rs → reffect/src/serde/migrate.rs
diff --git a/reffect/src/serde/mod.rs b/reffect/src/serde/mod.rs
@@ -0,0 +1,5 @@
+pub mod bitflags;
+
+mod migrate;
+
+pub use self::migrate::*;