fix: new items n sprites (#23)

ssouthcity · web-flow · commit 4cd76b785894 · 2025-09-10T21:19:35.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+assets/**/*.png filter=lfs diff=lfs merge=lfs -text
+assets/**/*.aseprite filter=lfs diff=lfs merge=lfs -text
diff --git a/assets/items/quintessence.item.toml b/assets/items/quintessence.item.toml
@@ -0,0 +1,4 @@
+id = "quintessence"
+name = "Quintessence"
+sprite = "sprites/items/quintessence.png"
+stack_size = 10
diff --git a/assets/items/ritual_doll.item.toml b/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
diff --git a/assets/sprites/items/quintessence.png b/assets/sprites/items/quintessence.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74e3c501e33731307041a295fc7b8fde77d1d16a4343e88951be8d51b4a75131
+size 8232
diff --git a/assets/sprites/items/ritual_doll.png b/assets/sprites/items/ritual_doll.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84cbe54e4ca8c16d98b48d3622332f6f70c3a0e2984c2c1876286c62ac1db54c
+size 52084
diff --git a/src/simulation/hud/item_slot.rs b/src/simulation/hud/item_slot.rs
@@ -118,7 +118,6 @@ fn on_slot_drag_and_drop(
     mut commands: Commands,
     item_query: Query<&InSlot>,
     slot_query: Query<&SlotOccupant>,
-    // names: Query<&Name>,
 ) {
     let destination_slot = trigger.target();
     let source_item = trigger.dropped;
@@ -131,18 +130,6 @@ fn on_slot_drag_and_drop(
         return;
     }
 
-    // info!(
-    //     "moving {} to {}",
-    //     names
-    //         .get(source_item)
-    //         .map(|a| a.to_string())
-    //         .unwrap_or("unknown".into()),
-    //     names
-    //         .get(destination_slot)
-    //         .map(|a| a.to_string())
-    //         .unwrap_or("unknown".into()),
-    // );
-
     let destination_item = slot_query
         .get(destination_slot)
         .map(|slotted_item| slotted_item.0);
@@ -182,6 +169,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 +221,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(),
+                    },
+                ));
+            }
         }
     }
 }
diff --git a/src/simulation/item/assets.rs b/src/simulation/item/assets.rs
@@ -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"),
         }
     }
 }
diff --git a/src/simulation/item/compendium.rs b/src/simulation/item/compendium.rs
@@ -37,6 +37,7 @@ fn spawn_item_compendium(
     mut commands: Commands,
     items: Res<Assets<ItemDef>>,
     item_assets: Res<ItemAssets>,
+    asset_server: Res<AssetServer>,
 ) {
     let mut items_sorted: Vec<_> = items.iter().map(|(_, a)| a).collect();
     items_sorted.sort_by(|a, b| a.name.cmp(&b.name));
@@ -71,44 +72,65 @@ fn spawn_item_compendium(
         .id();
 
     for item_def in items_sorted.iter() {
-        commands.spawn((
-            Node {
-                display: Display::Grid,
-                grid_template_columns: vec![
-                    RepeatedGridTrack::px(1, 64.0),
-                    RepeatedGridTrack::px(1, 256.0),
-                ],
-                grid_template_rows: vec![RepeatedGridTrack::px(2, 32.0)],
-                justify_items: JustifyItems::Start,
-                align_items: AlignItems::Center,
-                column_gap: Val::Px(16.0),
-                padding: UiRect::all(Val::Px(4.0)),
+        let item_box = commands
+            .spawn((
+                Node {
+                    display: Display::Grid,
+                    grid_template_columns: vec![
+                        RepeatedGridTrack::px(1, 64.0),
+                        RepeatedGridTrack::px(1, 256.0),
+                    ],
+                    grid_template_rows: vec![RepeatedGridTrack::px(2, 32.0)],
+                    justify_items: JustifyItems::Start,
+                    align_items: AlignItems::Center,
+                    column_gap: Val::Px(16.0),
+                    padding: UiRect::all(Val::Px(4.0)),
+                    ..default()
+                },
+                ChildOf(item_list),
+                BackgroundColor(Color::BLACK),
+            ))
+            .id();
+
+        let image = commands
+            .spawn((
+                Node {
+                    justify_self: JustifySelf::Center,
+                    grid_column: GridPlacement::span(1),
+                    grid_row: GridPlacement::span(2),
+                    width: Val::Px(56.0),
+                    height: Val::Px(56.0),
+                    ..default()
+                },
+                ChildOf(item_box),
+            ))
+            .id();
+
+        if let Some(sprite) = &item_def.sprite {
+            commands.entity(image).insert(ImageNode {
+                image: asset_server.load(sprite.clone()),
                 ..default()
-            },
-            ChildOf(item_list),
-            BackgroundColor(Color::BLACK),
-            children![
-                (
-                    Node {
-                        justify_self: JustifySelf::Center,
-                        grid_column: GridPlacement::span(1),
-                        grid_row: GridPlacement::span(2),
-                        width: Val::Px(56.0),
-                        height: Val::Px(56.0),
-                        ..default()
-                    },
-                    ImageNode::default(),
-                    AseSlice {
-                        aseprite: item_assets.aseprite.clone(),
-                        name: item_def.id.to_owned(),
-                    }
-                ),
-                (Text::new(item_def.name.to_owned()), TextColor(Color::WHITE),),
-                (
-                    Text::new(item_def.stack_size.to_string()),
-                    TextColor(Color::WHITE),
-                )
-            ],
+            });
+        } else {
+            commands.entity(image).insert((
+                ImageNode::default(),
+                AseSlice {
+                    aseprite: item_assets.aseprite.clone(),
+                    name: item_def.id.to_owned(),
+                },
+            ));
+        }
+
+        commands.spawn((
+            Text::new(item_def.name.to_owned()),
+            TextColor(Color::WHITE),
+            ChildOf(item_box),
+        ));
+
+        commands.spawn((
+            Text::new(item_def.stack_size.to_string()),
+            TextColor(Color::WHITE),
+            ChildOf(item_box),
         ));
     }
 }
diff --git a/src/ui/inspect/info.rs b/src/ui/inspect/info.rs
@@ -40,6 +40,7 @@ pub fn open_recipe_menu(
     recipe_index: Res<IndexMap<RecipeDef>>,
     held_relics: Query<&HeldRelic>,
     item_defs: Res<Assets<ItemDef>>,
+    asset_server: Res<AssetServer>,
 ) {
     let Ok(selected_recipe) = selected_recipes.get(inspected_entity.0) else {
         return;
@@ -188,22 +189,34 @@ pub fn open_recipe_menu(
             .get(&relic.0)
             .expect("Item referred to by HeldRelic component is not loaded");
 
-        commands.spawn((
-            ChildOf(relic_slot_id),
-            Name::new(item_def.name.clone()),
-            InSlot(relic_slot_id),
-            Item(relic.0.clone()),
-            Node {
-                width: Val::Percent(80.0),
-                height: Val::Percent(80.0),
+        let relic_image = commands
+            .spawn((
+                ChildOf(relic_slot_id),
+                Name::new(item_def.name.clone()),
+                InSlot(relic_slot_id),
+                Item(relic.0.clone()),
+                Node {
+                    width: Val::Percent(80.0),
+                    height: Val::Percent(80.0),
+                    ..default()
+                },
+            ))
+            .id();
+
+        if let Some(item_sprite) = &item_def.sprite {
+            commands.entity(relic_image).insert(ImageNode {
+                image: asset_server.load(item_sprite.clone()),
                 ..default()
-            },
-            ImageNode::default(),
-            AseSlice {
-                aseprite: item_assets.aseprite.clone(),
-                name: item_def.id.clone(),
-            },
-        ));
+            });
+        } else {
+            commands.entity(relic_image).insert((
+                ImageNode::default(),
+                AseSlice {
+                    aseprite: item_assets.aseprite.clone(),
+                    name: item_def.id.clone(),
+                },
+            ));
+        }
     }
 
     commands

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+assets/*/.png filter=lfs diff=lfs merge=lfs -text`
	`2`	`+assets/*/.aseprite filter=lfs diff=lfs merge=lfs -text`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ pub fn plugin(app: &mut App) {`
`23`	`23`	`pub struct ItemDef {`
`24`	`24`	`pub id: String,`
`25`	`25`	`pub name: String,`
	`26`	`+ pub sprite: Option<String>,`
`26`	`27`	`pub stack_size: u32,`
`27`	`28`	`}`
`28`	`29`
`@@ -37,6 +38,7 @@ impl Indexable for ItemDef {`
`37`	`38`	`pub struct ItemAssets {`
`38`	`39`	`pub aseprite: Handle<Aseprite>,`
`39`	`40`	`pub item_definitions: Handle<LoadedFolder>,`
	`41`	`+ pub item_sprites: Handle<LoadedFolder>,`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`impl FromWorld for ItemAssets {`
`@@ -46,6 +48,7 @@ impl FromWorld for ItemAssets {`
`46`	`48`	`Self {`
`47`	`49`	`aseprite: asset_server.load("items.aseprite"),`
`48`	`50`	`item_definitions: asset_server.load_folder("items"),`
	`51`	`+ item_sprites: asset_server.load_folder("sprites/items"),`
`49`	`52`	`}`
`50`	`53`	`}`
`51`	`54`	`}`