Merge remote-tracking branch 'origin/master' into fish

Cargo.toml

@@ -17,4 +17,5 @@ parry2d = "0.4.0"
 log = "0.4.14"
 env_logger = "0.8.3"
 nalgebra = "0.26.1"
-rand = "0.8.3"
+rand = "0.8.3"
+tiled = "0.9.4"

assets/.gitignore

@@ -0,0 +1 @@
+savestate.json

src/gamecore.rs

@@ -1,14 +1,16 @@
 //! This file contains the global state of the game. Data here is passed around to all handler functions.
 
-use std::fmt;
+use std::{fmt, fs::File, io::BufReader};
 
 use raylib::{
     camera::Camera2D, math::Vector2, prelude::RaylibDrawHandle, RaylibHandle, RaylibThread,
 };
 
-use crate::{player::Player, resources::GlobalResources, world::World};
+use crate::{items::ShopItems, player::Player, resources::GlobalResources, world::World};
 
+use failure::Error;
 use log::debug;
+use serde::{Deserialize, Serialize};
 
 /// Overall states for the game
 #[derive(Debug, PartialEq, Copy, Clone)]
@@ -18,7 +20,7 @@ pub enum GameState {
     PauseMenu,
     GameQuit,
     InGame,
-    GameEnd
+    GameEnd,
 }
 
 impl fmt::Display for GameState {
@@ -27,6 +29,51 @@ impl fmt::Display for GameState {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, Default)]
+pub struct GameProgress {
+    coins: u32,
+    max_depth: f32,
+    fastest_time: Option<f64>,
+    inventory: Vec<ShopItems>,
+}
+
+impl GameProgress {
+    pub fn new() -> Self {
+        Self {
+            ..Default::default()
+        }
+    }
+
+    pub fn from_file(file: String) -> Result<Self, Error> {
+        // Load the file
+        let file = File::open(file)?;
+        let reader = BufReader::new(file);
+
+        // Deserialize
+        Ok(serde_json::from_reader(reader)?)
+    }
+
+    pub fn try_from_file(file: String) -> Self {
+        // Load from file
+        let loaded = GameProgress::from_file(file);
+        if loaded.is_ok() {
+            return loaded.unwrap();
+        } else {
+            return GameProgress::new();
+        }
+    }
+
+    pub fn to_file(&self, file: String) -> Result<(), Error> {
+        // Serialize
+        let json = serde_json::to_string(self)?;
+
+        // Write to file
+        std::fs::write(file, json)?;
+
+        Ok(())
+    }
+}
+
 /// This structure contains the entire game state, and should be passed around to various logic functions.
 pub struct GameCore {
     /// The game's overall state
@@ -50,10 +97,16 @@ pub struct GameCore {
 
     /// The player
     pub player: Player,
+    pub progress: GameProgress,
 }
 
 impl GameCore {
-    pub fn new(raylib: &mut RaylibHandle, thread: &RaylibThread, world: World) -> Self {
+    pub fn new(
+        raylib: &mut RaylibHandle,
+        thread: &RaylibThread,
+        world: World,
+        progress: GameProgress,
+    ) -> Self {
         Self {
             state: GameState::Loading,
             last_state: GameState::Loading,
@@ -71,6 +124,7 @@ impl GameCore {
             show_simple_debug_info: false,
             world: world,
             player: Player::new(),
+            progress: progress,
         }
     }
 

src/items.rs

@@ -0,0 +1,10 @@
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(tag = "t", content = "c")]
+pub enum ShopItems {
+    StunGun(u8),
+    AirBag,
+    Flashlight(u8),
+    Flippers(u8)
+}

src/logic/gameend.rs

@@ -59,6 +59,8 @@ impl Screen for GameEndScreen {
             Color::BLACK,
         );
 
+        // TODO: Save game progress
+
 
         // // Close and quit buttons
         // let bottom_left_button_dimensions = Rectangle {

src/main.rs

@@ -6,8 +6,9 @@ mod player;
 mod world;
 mod pallette;
 mod entities;
+mod items;
 
-use gamecore::{GameCore, GameState};
+use gamecore::{GameCore, GameProgress, GameState};
 use lib::{utils::profiler::GameProfiler, wrappers::audio::player::AudioPlayer};
 use log::info;
 use logic::{gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen};
@@ -42,8 +43,11 @@ fn main() {
     // Load the world
     let world = World::load_from_json("./assets/worlds/mainworld.json".to_string()).expect("Failed to load main world JSON");
 
+    // Load the game progress
+    let game_progress = GameProgress::try_from_file("./assets/savestate.json".to_string());
+
     // Set up the game's core state
-    let mut game_core = GameCore::new(&mut raylib, &raylib_thread, world);
+    let mut game_core = GameCore::new(&mut raylib, &raylib_thread, world, game_progress);
 
     // Set up the game's profiler
     let mut profiler = GameProfiler::new();