From 9c396e318390d06a554f7e65b42e237cb1f20e36 Mon Sep 17 00:00:00 2001
From: "Elijah C. Voigt" <elijah.caine.mv@gmail.com>
Date: Sun, 5 May 2024 13:20:25 -0700
Subject: [PATCH] Loading is fixed and merging is partially fixed

Still have to get rid of one of the two merged pieces
---
 src/game.rs    |  2 +-
 src/loading.rs | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 27ca3ef..f6e5fa3 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -378,7 +378,7 @@ impl Board {
             //    qqd....."#,
     r#"........
     ...p....
-    ..p.....
+    ..p...p.
     ........"#,
         )
     }
diff --git a/src/loading.rs b/src/loading.rs
index ea00c26..9f243c5 100644
--- a/src/loading.rs
+++ b/src/loading.rs
@@ -53,26 +53,33 @@ fn exit_loading(mut cameras: Query<&mut Camera, With<Loading>>) {
 
 fn loading(
     server: Res<AssetServer>,
-    sprites: Res<Assets<Image>>,
+    images: Res<Assets<Image>>,
     gltfs: Res<Assets<Gltf>>,
     tweaks: Res<Assets<tweak::Tweaks>>,
     fonts: Res<Assets<Font>>,
     mut next_state: ResMut<NextState<GameState>>,
+    time: Res<Time>,
 ) {
-    let s = (!sprites.is_empty())
-        && sprites
+    let s = (!images.is_empty())
+        && images
             .ids()
-            .all(|id| server.is_loaded_with_dependencies(id));
+            .filter(|id| matches!(id, AssetId::Uuid { .. }))
+            .filter(|id| server.get_path(*id).is_some())
+            .all(|id| {
+                server.is_loaded_with_dependencies(id)
+            });
     let g = (!gltfs.is_empty()) && gltfs.ids().all(|id| server.is_loaded_with_dependencies(id));
     let t = (!tweaks.is_empty())
         && tweaks
             .ids()
             .all(|id| server.is_loaded_with_dependencies(id));
-    let f = (!fonts.is_empty()) && fonts.ids().all(|id| server.is_loaded_with_dependencies(id));
-
-    info!("Loading :: images: {} :: gltfs: {} :: tweaks: {} :: fonts: {}", s, g, t, f);
+    let f = !fonts.is_empty() &&
+        fonts.ids()
+             .filter(|id| server.get_path(*id).is_some())
+             .all(|id| server.is_loaded_with_dependencies(id));
 
     if s && g && t && f {
+        info!("Loading complete after {:?} seconds", time.elapsed_seconds());
         info!("Starting game intro");
         next_state.set(GameState::Intro)
     }