fix: new items n sprites

Author: ssouthcity

.gitattributes

@@ -0,0 +1 @@
+assets/sprites/**/* filter=lfs diff=lfs merge=lfs -text

assets/items/quintessence.item.toml

@@ -0,0 +1,4 @@
+id = "quintessence"
+name = "Quintessence"
+sprite = "sprites/items/quintessence.png"
+stack_size = 10

assets/items/ritual_doll.item.toml

@@ -0,0 +1,4 @@
+id = "ritual_doll"
+name = "Ritual Doll"
+sprite = "sprites/items/ritual_doll.png"
+stack_size = 5

assets/sprites/items/quintessence.png

@@ -182,6 +182,7 @@ fn setup(
     mut commands: Commands,
     item_assets: Res<ItemAssets>,
     mut item_defs: ResMut<Assets<ItemDef>>,
+    asset_server: Res<AssetServer>,
 ) {
     let items = item_defs
         .iter()
@@ -233,21 +234,33 @@ fn setup(
             .id();
 
         if let Some((asset_id, item_def)) = items_iter.next() {
-            commands.spawn((
-                Name::new(item_def.name.clone()),
-                InSlot(slot_id),
-                Item(item_defs.get_strong_handle(*asset_id).unwrap()),
-                Node {
-                    width: Val::Percent(80.0),
-                    height: Val::Percent(80.0),
+            let id = commands
+                .spawn((
+                    Name::new(item_def.name.clone()),
+                    InSlot(slot_id),
+                    Item(item_defs.get_strong_handle(*asset_id).unwrap()),
+                    Node {
+                        width: Val::Percent(80.0),
+                        height: Val::Percent(80.0),
+                        ..default()
+                    },
+                ))
+                .id();
+
+            if let Some(sprite_path) = &item_def.sprite {
+                commands.entity(id).insert(ImageNode {
+                    image: asset_server.load(sprite_path.clone()),
                     ..default()
-                },
-                ImageNode::default(),
-                AseSlice {
-                    aseprite: item_assets.aseprite.clone(),
-                    name: item_def.id.clone(),
-                },
-            ));
+                });
+            } else {
+                commands.entity(id).insert((
+                    ImageNode::default(),
+                    AseSlice {
+                        aseprite: item_assets.aseprite.clone(),
+                        name: item_def.id.clone(),
+                    },
+                ));
+            }
         }
     }
 }

assets/sprites/items/ritual_doll.png

@@ -23,6 +23,7 @@ pub fn plugin(app: &mut App) {
 pub struct ItemDef {
     pub id: String,
     pub name: String,
+    pub sprite: Option<String>,
     pub stack_size: u32,
 }
 
@@ -37,6 +38,7 @@ impl Indexable for ItemDef {
 pub struct ItemAssets {
     pub aseprite: Handle<Aseprite>,
     pub item_definitions: Handle<LoadedFolder>,
+    pub item_sprites: Handle<LoadedFolder>,
 }
 
 impl FromWorld for ItemAssets {
@@ -46,6 +48,7 @@ impl FromWorld for ItemAssets {
         Self {
             aseprite: asset_server.load("items.aseprite"),
             item_definitions: asset_server.load_folder("items"),
+            item_sprites: asset_server.load_folder("sprites/items"),
         }
     }
 }