v1.0.20

Author: ricott1

Cargo.lock

@@ -1,7 +1,15 @@
 [package]
 name = "rebels"
-version = "1.0.19"
+version = "1.0.20"
 edition = "2021"
+authors = ["Alessandro Ricottone <[email protected]>"]
+license = "GPL-3.0-or-later"
+description = "Anarchic spacepirates playing basketball in your terminal"
+readme = "README.md"
+homepage = "https://github.com/ricott1/rebels-in-the-sky"
+repository = "https://github.com/ricott1/rebels-in-the-sky"
+keywords = ["cli", "pirates", "rebels", "game"]
+categories = ["games"]
 
 [profile.release]
 strip = true
@@ -16,17 +24,18 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
-anyhow = "1.0.91"
+anyhow = "1.0.93"
 async-trait = "0.1.83"
 chrono = "0.4.38"
 clap = { version = "4.5.20", features = ["derive"] }
 crossterm = "0.28.1"
 directories = "5.0.1"
 ed25519-dalek = "2.1.1"
+flate2 = { version = "1.0.17", features = ["zlib-ng"], default-features = false }
 futures = "0.3.30"
 gif = "0.13.1"
-glam = "0.29.0"
-image = "0.25.4"
+glam = "0.29.2"
+image = "0.25.5"
 imageproc = "0.25.0"
 include_dir = "0.7.4"
 itertools = "0.13.0"
@@ -48,20 +57,20 @@ rand = "0.8.5"
 rand_chacha = "0.3.1"
 rand_distr = "0.4.3"
 ratatui = { version = "0.29.0", features = ["unstable-backend-writer"] }
-rodio = "0.19.0"
-russh = "0.45.0"
-russh-keys = "0.45.0"
-serde = { version = "1.0.212", features = ["derive", "default"] }
+rodio = "0.20.1"
+russh = "0.46.0"
+russh-keys = "0.46.0"
+serde = { version = "1.0.214", features = ["derive", "default"] }
 serde_json = "1.0.132"
 serde_repr = "0.1.19"
 sha2 = "0.10.8"
-stream-download = { version = "0.9.0", features = ["reqwest-rustls"] }
+stream-download = { version = "0.11.2", features = ["reqwest-rustls"] }
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
-tokio = { version = "1.41.0", features = ["full"] }
+tokio = { version = "1.41.1", features = ["full"] }
 tokio-util = "0.7.12"
 tui-textarea = "0.7.0"
 unicode-width = "0.2.0"
-url = "2.5.2"
+url = "2.5.3"
 uuid = { version = "1.11.0", features = ["v4", "serde"] }
 void = "1.0.2"

Cargo.toml

@@ -25,7 +25,7 @@
         "resources": {},
         "filename": "sol",
         "rotation_period": 6,
-        "revolution_period": 180,
+        "revolution_period": 360,
         "gravity": 100,
         "asteroid_probability": 0.0,
         "planet_type": 1,
@@ -48,7 +48,7 @@
         "resources": {},
         "filename": "proxima",
         "rotation_period": 3,
-        "revolution_period": 120,
+        "revolution_period": 360,
         "gravity": 80,
         "asteroid_probability": 0.0,
         "planet_type": 1,
@@ -173,7 +173,7 @@
         },
         "filename": "earth",
         "rotation_period": 9,
-        "revolution_period": 120,
+        "revolution_period": 180,
         "gravity": 10,
         "asteroid_probability": 0.5,
         "planet_type": 2,
@@ -296,7 +296,7 @@
         },
         "filename": "rocky",
         "rotation_period": 9,
-        "revolution_period": 120,
+        "revolution_period": 360,
         "gravity": 2,
         "asteroid_probability": 0.0,
         "planet_type": 8,
@@ -323,7 +323,7 @@
         },
         "filename": "phobos",
         "rotation_period": 6,
-        "revolution_period": 120,
+        "revolution_period": 180,
         "gravity": 2,
         "asteroid_probability": 0.0,
         "planet_type": 8,

README.md

@@ -20,7 +20,7 @@ use stream_download::StreamDownload;
 use tokio::select;
 use void::Void;
 
-const NETWORK_HANDLER_INIT_INTERVAL: u128 = 10 * SECONDS;
+const NETWORK_HANDLER_INIT_INTERVAL: Tick = 10 * SECONDS;
 
 #[derive(Debug, PartialEq)]
 pub enum AppState {
@@ -40,6 +40,7 @@ pub struct App {
     seed_ip: Option<String>,
     network_port: Option<u16>,
     store_prefix: String,
+    pub new_version_notified: bool,
 }
 
 impl App {
@@ -194,6 +195,7 @@ impl App {
             seed_ip,
             network_port,
             store_prefix: store_prefix.to_string(),
+            new_version_notified: false,
         }
     }
 
@@ -227,7 +229,6 @@ impl App {
                 Some(streaming_data) = Self::conditional_audio_event(& self.audio_player) =>  self.handle_streaming_data(streaming_data)?,
                 Some(swarm_event) = Self::conditional_network_event(&mut self.network_handler) =>  self.handle_network_events(swarm_event)?,
                 app_event = tui.events.next() => {
-
                     match app_event{
                         TerminalEvent::Tick {tick} => {
                                 self.handle_tick_events(tick)?;
@@ -240,12 +241,13 @@ impl App {
                             if let Err(e) = tui.draw(&mut self.ui, &self.world, self.audio_player.as_ref()).await {
                                 error!("Drawing error: {e}");
                             }
-                            },
-                        TerminalEvent::Mouse(mouse_event) => {self.handle_mouse_events(mouse_event)?;
+                        },
+                        TerminalEvent::Mouse(mouse_event) => {
+                            self.handle_mouse_events(mouse_event)?;
                             if let Err(e) = tui.draw(&mut self.ui, &self.world, self.audio_player.as_ref()).await {
                                 error!("Drawing error: {e}");
                             }
-                            },
+                        },
                         TerminalEvent::Resize(w, h) => tui.resize((w, h))?,
                         TerminalEvent::Quit => self.quit()?,
                     }

assets/accessories/eye_patch_octopulp_central.png

@@ -39,6 +39,7 @@ pub enum ActionSituation {
     AfterOffensiveRebound,
     AfterLongOffensiveRebound,
     AfterDefensiveRebound,
+    AfterSubstitution,
     MissedShot,
     Turnover,
     CloseShot,

assets/data/planets_data.json

@@ -189,8 +189,12 @@ impl<'game> Game {
         game.attendance = attendance as u32;
         let mut default_output = ActionOutput::default();
         default_output.description = format!(
-            "{} vs {}. Game is about to start here on {}! There are {} people in the stadium.",
-            home_name, away_name, planet.name, game.attendance
+            "{} vs {}. Game is about to start here on {}! There are {} {}people in the stadium.",
+            home_name,
+            away_name,
+            planet.name,
+            game.attendance,
+            if game.attendance == 69 { "(nice) " } else { "" }
         );
         default_output.random_seed = seed;
         game.action_results.push(default_output);
@@ -280,7 +284,7 @@ impl<'game> Game {
             ActionSituation::LongShot => Action::LongShot,
             ActionSituation::MissedShot => Action::Rebound,
             ActionSituation::EndOfQuarter => Action::StartOfQuarter,
-            ActionSituation::BallInBackcourt => {
+            ActionSituation::AfterSubstitution | ActionSituation::BallInBackcourt => {
                 let brawl_probability = BRAWL_ACTION_PROBABILITY
                     * (self.home_team_in_game.tactic.brawl_probability_modifier()
                         + self.away_team_in_game.tactic.brawl_probability_modifier());
@@ -474,9 +478,8 @@ impl<'game> Game {
     fn get_rng_seed(&self) -> [u8; 32] {
         let mut seed = [0; 32];
         seed[0..16].copy_from_slice(self.id.as_bytes());
-        seed[16..32].copy_from_slice(self.starting_at.to_be_bytes().as_ref());
-        // Overwrite first two bytes with timer value
-        seed[0..2].copy_from_slice(self.timer.value.to_be_bytes().as_ref());
+        seed[16..24].copy_from_slice(self.starting_at.to_be_bytes().as_ref());
+        seed[24..26].copy_from_slice(self.timer.value.to_be_bytes().as_ref());
 
         seed
     }
@@ -719,7 +722,7 @@ impl<'game> Game {
                             ..Default::default()
                         });
                     }
-                    _ =>
+                    (false, false) =>
                     // Check if teams make substitutions. Only if ball is out
                     {
                         if let Some(sub) = Substitution::execute(action_input, self, rng) {
@@ -740,7 +743,7 @@ impl<'game> Game {
 mod tests {
     use super::Game;
     use crate::game_engine::types::TeamInGame;
-    use crate::types::GameId;
+    use crate::types::{AppResult, GameId};
     use crate::types::{SystemTimeTick, Tick};
     use crate::world::constants::DEFAULT_PLANET_ID;
     use crate::world::world::World;
@@ -749,36 +752,28 @@ mod tests {
 
     #[ignore]
     #[test]
-    fn test_game() {
+    fn test_game() -> AppResult<()> {
         let mut world = World::new(None);
         let rng = &mut ChaCha8Rng::seed_from_u64(world.seed);
 
-        // world.initialize(true);
-
-        // let home_planet = world.planets.get(&DEFAULT_PLANET_ID).unwrap();
-        let id0 = world
-            .generate_random_team(
-                rng,
-                DEFAULT_PLANET_ID.clone(),
-                "Testen".to_string(),
-                "Tosten".to_string(),
-            )
-            .unwrap();
-        let id1 = world
-            .generate_random_team(
-                rng,
-                DEFAULT_PLANET_ID.clone(),
-                "Holalo".to_string(),
-                "Halley".to_string(),
-            )
-            .unwrap();
-
-        let home_team = world.get_team(id0).unwrap().clone();
+        let id0 = world.generate_random_team(
+            rng,
+            DEFAULT_PLANET_ID.clone(),
+            "Testen".to_string(),
+            "Tosten".to_string(),
+        )?;
+        let id1 = world.generate_random_team(
+            rng,
+            DEFAULT_PLANET_ID.clone(),
+            "Holalo".to_string(),
+            "Halley".to_string(),
+        )?;
+
+        let home_team = world.get_team(&id0).unwrap().clone();
 
         let checked_player_id = home_team.player_ids[0];
         let quickness_before = world
-            .get_player(checked_player_id)
-            .unwrap()
+            .get_player_or_err(&checked_player_id)?
             .athletics
             .quickness
             .clone();
@@ -791,7 +786,7 @@ mod tests {
             home_team_in_game.unwrap(),
             away_team_in_game.unwrap(),
             Tick::now(),
-            &world.get_planet(DEFAULT_PLANET_ID.clone()).unwrap(),
+            &world.get_planet(&DEFAULT_PLANET_ID).unwrap(),
         );
 
         game.home_team_in_game
@@ -821,11 +816,12 @@ mod tests {
             let _ = world.handle_tick_events(Tick::now());
         }
         let quickness_after = world
-            .get_player(checked_player_id)
-            .unwrap()
+            .get_player_or_err(&checked_player_id)?
             .athletics
             .quickness
             .clone();
         println!("{} {}", quickness_before, quickness_after);
+
+        Ok(())
     }
 }

assets/head/octopulp1.png

@@ -14,7 +14,7 @@ use std::{
     collections::HashMap,
 };
 
-const MIN_REBOUND_VALUE: u16 = 42;
+const MIN_REBOUND_VALUE: u16 = 40;
 const REBOUND_POSITION_SCALING: f32 = 12.0;
 
 fn position_rebound_bonus(idx: usize) -> f32 {