Merge #299

299: Boss bomb throw always has another static bomb sprite behind the animated explosion r=odecay a=Zac8668

Closes #298 

Co-authored-by: Isaac <78173025+Zac8668@users.noreply.github.com>

Author: bors[bot]

src/fighter_state.rs

@@ -1447,7 +1447,9 @@ fn bomb_throw(
                             attack_enemy: false,
                         })
                         .insert(ItemBundle {
-                            item: Item,
+                            item: Item {
+                                spawn_sprite: false,
+                            },
                             item_meta_handle: attack.item_handle.clone(),
                             name: Name::new("Bomb Item"),
                         });

src/item.rs

@@ -38,7 +38,10 @@ pub struct ScriptItemGrabEvent {
 }
 
 #[derive(Component)]
-pub struct Item;
+pub struct Item {
+    /// Prevent the spawning of a Sprite component by load_items by setting this to false
+    pub spawn_sprite: bool,
+}
 
 #[derive(Bundle)]
 pub struct ItemBundle {
@@ -50,7 +53,7 @@ pub struct ItemBundle {
 impl ItemBundle {
     pub fn new(item_spawn_meta: &ItemSpawnMeta) -> Self {
         Self {
-            item: Item,
+            item: Item { spawn_sprite: true },
             item_meta_handle: item_spawn_meta.item_handle.clone(),
             // TODO: Actually include the item's name at some point
             name: Name::new("Map Item"),

src/loading.rs

@@ -12,7 +12,7 @@ use crate::{
     enemy::{Boss, Enemy, EnemyBundle},
     fighter::ActiveFighterBundle,
     input::MenuAction,
-    item::ItemBundle,
+    item::{Item, ItemBundle},
     metadata::{
         BorderImageMeta, FighterMeta, GameHandle, GameMeta, ItemMeta, LevelHandle, LevelMeta,
         Settings,
@@ -427,10 +427,16 @@ fn hot_reload_level(
 
 fn load_items(
     mut commands: Commands,
-    item_spawns: Query<(Entity, &Transform, &Handle<ItemMeta>), Without<Sprite>>,
+    item_spawns: Query<(Entity, &Transform, &Handle<ItemMeta>, Option<&Item>), Without<Sprite>>,
     item_assets: Res<Assets<ItemMeta>>,
 ) {
-    for (entity, transform, item_handle) in item_spawns.iter() {
+    for (entity, transform, item_handle, item) in item_spawns.iter() {
+        if let Some(item) = item {
+            if !item.spawn_sprite {
+                continue;
+            }
+        }
+
         if let Some(item_meta) = item_assets.get(item_handle) {
             commands.entity(entity).insert(SpriteBundle {
                 texture: item_meta.image.image_handle.clone(),