Merge pull request #125 from red-life-project/dev

Dev to main

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Run cargo test w/ -D warnings
         if: ${{ runner.os == 'Linux' }}
-        run: cargo test headless -- --test-threads=1
+        run: cargo test -- --test-threads=1
         #env:
           #RUSTFLAGS: "-D warnings"
 
@@ -92,4 +92,4 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libudev-dev
 
       - name: Run cargo clippy --package game --all-targets -- -D warnings
-        run: cargo clippy --package game --all-targets #-- -D warnings
+        run: cargo clippy --package game --all-targets #-- -D warnings

.gitignore

@@ -85,3 +85,8 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+# Save files
+saves/
+
+game/saves/
+

game/Cargo.toml

@@ -10,9 +10,17 @@ serde = "1.0.145"
 serde_yaml = "0.9.13"
 ggez = "0.8.1"
 dyn-clone = "1.0.9"
+tracing = "0.1.37"
+tracing-subscriber = "0.3.16"
+fastrand = "1.8.0"
+chrono = "0.4.23"
 
 [build-dependencies]
 fs_extra = "1.2.0"
 
 [profile.dev.package.'*']
-opt-level = 3
+opt-level = 3
+
+[profile.release]
+lto = true
+panic = "abort"

game/src/backend/area.rs

@@ -1,10 +1,14 @@
+use crate::backend::utils::is_colliding;
 use crate::game_core::player::Player;
 use dyn_clone::DynClone;
 use ggez::graphics::Rect;
 use std::fmt::Debug;
 
 pub trait Area: DynClone + Debug {
     fn interact(&mut self, player: &Player);
+    fn is_interactable(&self, pos: (usize, usize)) -> bool {
+        is_colliding(pos, &self.get_interaction_area())
+    }
     fn get_collision_area(&self) -> Rect;
     fn get_interaction_area(&self) -> Rect;
 }

game/src/backend/error.rs

@@ -1,5 +1,9 @@
+use crate::backend::screen::StackCommand;
 use ggez::GameError;
 use std::io;
+use std::sync::mpsc::SendError;
+use tracing::error;
+
 #[warn(clippy::enum_variant_names)]
 #[derive(Debug)]
 pub enum RLError {
@@ -11,18 +15,31 @@ pub enum RLError {
 
 impl From<GameError> for RLError {
     fn from(e: GameError) -> Self {
+        error!("GameError: {}", e);
         RLError::Ui(e)
     }
 }
 
 impl From<serde_yaml::Error> for RLError {
     fn from(e: serde_yaml::Error) -> Self {
+        error!("Deserialization Error: {}", e);
         RLError::Deserialization(e)
     }
 }
 
-impl From<std::io::Error> for RLError {
-    fn from(e: std::io::Error) -> Self {
+impl From<io::Error> for RLError {
+    fn from(e: io::Error) -> Self {
+        error!("IO Error: {}", e);
         RLError::IO(e)
     }
 }
+
+impl From<SendError<StackCommand>> for RLError {
+    fn from(value: SendError<StackCommand>) -> Self {
+        error!("Could not send StackCommand: {}", value);
+        RLError::IO(io::Error::new(
+            io::ErrorKind::Other,
+            format!("Could not send StackCommand: {}", value),
+        ))
+    }
+}