v1.0.21

Author: ricott1

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rebels"
-version = "1.0.20"
+version = "1.0.21"
 edition = "2021"
 authors = ["Alessandro Ricottone <[email protected]>"]
 license = "GPL-3.0-or-later"
@@ -9,7 +9,7 @@ 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"]
+categories = ["games", "terminal"]
 
 [profile.release]
 strip = true
@@ -27,19 +27,19 @@ opt-level = 3
 anyhow = "1.0.93"
 async-trait = "0.1.83"
 chrono = "0.4.38"
-clap = { version = "4.5.20", features = ["derive"] }
+clap = { version = "4.5.21", 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 }
+flate2 = { version = "1.0.35", features = ["zlib-ng"], default-features = false }
 futures = "0.3.30"
 gif = "0.13.1"
 glam = "0.29.2"
 image = "0.25.5"
 imageproc = "0.25.0"
 include_dir = "0.7.4"
 itertools = "0.13.0"
-libp2p = { version = "0.52.4", features = [
+libp2p = { version = "0.54.1", features = [
     "noise",
     "ping",
     "tcp",
@@ -60,11 +60,11 @@ ratatui = { version = "0.29.0", features = ["unstable-backend-writer"] }
 rodio = "0.20.1"
 russh = "0.46.0"
 russh-keys = "0.46.0"
-serde = { version = "1.0.214", features = ["derive", "default"] }
+serde = { version = "1.0.215", features = ["derive", "default"] }
 serde_json = "1.0.132"
 serde_repr = "0.1.19"
 sha2 = "0.10.8"
-stream-download = { version = "0.11.2", features = ["reqwest-rustls"] }
+stream-download = { version = "0.12.0", features = ["reqwest-rustls"] }
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
 tokio = { version = "1.41.1", features = ["full"] }

Cargo.toml

@@ -15,10 +15,11 @@ use crossterm::event::{KeyCode, KeyModifiers};
 use futures::StreamExt;
 use libp2p::{gossipsub, swarm::SwarmEvent};
 use log::{error, info, warn};
+use rand::SeedableRng;
+use rand_chacha::ChaCha8Rng;
 use stream_download::storage::temp::TempStorageProvider;
 use stream_download::StreamDownload;
 use tokio::select;
-use void::Void;
 
 const NETWORK_HANDLER_INIT_INTERVAL: Tick = 10 * SECONDS;
 
@@ -138,7 +139,7 @@ impl App {
 
     pub async fn conditional_network_event(
         network_handler: &mut Option<NetworkHandler>,
-    ) -> Option<SwarmEvent<gossipsub::Event, Void>> {
+    ) -> Option<SwarmEvent<gossipsub::Event>> {
         match network_handler.as_mut() {
             Some(handler) => Some(handler.swarm.select_next_some().await),
             None => None,
@@ -155,6 +156,26 @@ impl App {
         Ok(())
     }
 
+    pub fn test_default() -> AppResult<Self> {
+        let mut app = App::new(None, true, true, true, false, None, None, None);
+        app.new_world();
+        let home_planet_id = app
+            .world
+            .planets
+            .keys()
+            .next()
+            .expect("There should be at elast one planet")
+            .clone();
+        app.world.own_team_id = app.world.generate_random_team(
+            &mut ChaCha8Rng::from_entropy(),
+            home_planet_id,
+            "own team".into(),
+            "ship_name".into(),
+        )?;
+
+        Ok(app)
+    }
+
     pub fn new(
         seed: Option<u64>,
         disable_network: bool,
@@ -244,9 +265,9 @@ impl App {
                         },
                         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}");
-                            }
+                            // 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()?,
@@ -445,7 +466,7 @@ impl App {
 
     pub fn handle_network_events(
         &mut self,
-        network_event: SwarmEvent<gossipsub::Event, Void>,
+        network_event: SwarmEvent<gossipsub::Event>,
     ) -> AppResult<()> {
         if let Some(network_handler) = &mut self.network_handler {
             if let Some(callback) = network_handler.handle_network_events(network_event) {

src/app.rs

@@ -10,17 +10,15 @@ use crate::types::{PlayerId, TeamId};
 use crate::types::{SystemTimeTick, Tick};
 use crate::world::world::World;
 use anyhow::anyhow;
-use libp2p::core::upgrade::Version;
 use libp2p::gossipsub::{self, IdentTopic, MessageId};
-use libp2p::swarm::{Config, SwarmEvent};
-use libp2p::{identity, noise, tcp, yamux, PeerId, Transport};
+use libp2p::swarm::SwarmEvent;
+use libp2p::{identity, noise, tcp, yamux, PeerId};
 use libp2p::{Multiaddr, Swarm};
 use log::{error, info};
 use std::collections::hash_map::DefaultHasher;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 use std::time::Duration;
-use void::Void;
 
 pub struct NetworkHandler {
     pub swarm: Swarm<gossipsub::Behaviour>,
@@ -39,14 +37,6 @@ impl Debug for NetworkHandler {
 impl NetworkHandler {
     pub fn new(seed_ip: Option<String>, tcp_port: u16) -> AppResult<Self> {
         let local_key = identity::Keypair::generate_ed25519();
-        let local_peer_id = PeerId::from(local_key.public());
-
-        let tcp_transport = tcp::tokio::Transport::default()
-            .upgrade(Version::V1Lazy)
-            .authenticate(noise::Config::new(&local_key)?)
-            .multiplex(yamux::Config::default())
-            .timeout(std::time::Duration::from_secs(20))
-            .boxed();
 
         // To content-address message, we can take the hash of message and use it as an ID.
         let message_id_fn = |message: &gossipsub::Message| {
@@ -72,12 +62,18 @@ impl NetworkHandler {
 
         gossipsub.subscribe(&IdentTopic::new(TOPIC))?;
 
-        let mut swarm = Swarm::new(
-            tcp_transport,
-            gossipsub,
-            local_peer_id,
-            Config::with_tokio_executor(),
-        );
+        let mut swarm = libp2p::SwarmBuilder::with_new_identity()
+            .with_tokio()
+            .with_tcp(
+                tcp::Config::default(),
+                noise::Config::new,
+                yamux::Config::default,
+            )?
+            .with_behaviour(|_| gossipsub)?
+            .with_swarm_config(|cfg| {
+                cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
+            })
+            .build();
 
         swarm.listen_on(format!("/ip4/0.0.0.0/tcp/{tcp_port}").parse()?)?;
 
@@ -108,17 +104,17 @@ impl NetworkHandler {
         Ok(msg_id)
     }
 
-    pub fn dial_seed(&mut self) -> AppResult<()> {
-        self.dial(self.seed_address.clone())
-    }
-
     fn dial(&mut self, address: Multiaddr) -> AppResult<()> {
         if address != self.address {
             self.swarm.dial(address)?;
         }
         Ok(())
     }
 
+    pub fn dial_seed(&mut self) -> AppResult<()> {
+        self.dial(self.seed_address.clone())
+    }
+
     pub fn send_msg(&mut self, msg: String) -> AppResult<MessageId> {
         self._send(NetworkData::Message(Tick::now(), msg))
     }
@@ -337,7 +333,7 @@ impl NetworkHandler {
 
     pub fn handle_network_events(
         &mut self,
-        event: SwarmEvent<gossipsub::Event, Void>,
+        event: SwarmEvent<gossipsub::Event>,
     ) -> Option<NetworkCallback> {
         match event {
             SwarmEvent::NewListenAddr { address, .. } => {

src/network/handler.rs

@@ -55,19 +55,12 @@ mod tests {
     #[ignore]
     #[test]
     fn test_trade() -> AppResult<()> {
-        let mut app = App::new(None, true, true, true, false, None, None, None);
-        app.new_world();
+        let mut app = App::test_default()?;
 
         let world = &mut app.world;
         let rng = &mut ChaCha8Rng::from_entropy();
 
         let home_planet_id = world.planets.keys().next().unwrap().clone();
-        world.own_team_id = world.generate_random_team(
-            rng,
-            home_planet_id,
-            "own team".into(),
-            "ship_name".into(),
-        )?;
 
         let target_team_id = world.generate_random_team(
             rng,

src/network/trade.rs

@@ -11,7 +11,6 @@ use itertools::Itertools;
 use libp2p::gossipsub::IdentTopic;
 use libp2p::{gossipsub, swarm::SwarmEvent};
 use tokio::select;
-use void::Void;
 
 const SEED_INFO_INTERVAL_MILLIS: Tick = 60 * SECONDS;
 
@@ -115,7 +114,7 @@ impl Relayer {
 
     pub fn handle_network_events(
         &mut self,
-        network_event: SwarmEvent<gossipsub::Event, Void>,
+        network_event: SwarmEvent<gossipsub::Event>,
     ) -> AppResult<()> {
         println!("Received network event: {:?}", network_event);
         match network_event {

src/relayer.rs

@@ -95,7 +95,7 @@ impl AsteroidSize {
         match self {
             AsteroidSize::Small => 0.2,
             AsteroidSize::Big => 1.0,
-            AsteroidSize::Huge => 3.0,
+            AsteroidSize::Huge => 4.0,
             AsteroidSize::Planet => 0.0,
         }
     }

src/space_adventure/asteroid.rs

@@ -4,7 +4,7 @@ use crate::ui::UI_SCREEN_SIZE;
 
 pub(crate) const FRICTION_COEFF: f32 = 0.1;
 pub(crate) const THRUST_MOD: f32 = 1.5;
-pub(crate) const FUEL_CONSUMPTION_MOD: f32 = 115_000.0;
+pub(crate) const FUEL_CONSUMPTION_MOD: f32 = 215_000.0;
 pub(crate) const MAX_SPACESHIP_SPEED_MOD: f32 = 0.135;
 
 pub(crate) const ASTEROID_GENERATION_PROBABILITY: f64 = 0.05;

src/space_adventure/constants.rs

@@ -387,12 +387,12 @@ impl SpaceAdventure {
                         self.stop_space_adventure();
 
                         return Ok(vec![
-                        UiCallback::PushUiPopup { popup_message:
-                            PopupMessage::Ok{
-                               message: "Danger! There's a breach in the hull.\nAll the resources in the stiva have been lost,\nyou need to go back to the base...".to_string() 
-                                , is_skippable:true, tick:Tick::now()}
-                            }
-                    ]);
+                            UiCallback::PushUiPopup { popup_message:
+                                PopupMessage::Ok {
+                                    message: "Danger! There's a breach in the hull.\nAll the resources in the stiva have been lost,\nyou need to go back to the base...".to_string(),
+                                    is_skippable:true, tick:Tick::now()}
+                                }
+                        ]);
                     }
                 }
                 time
@@ -417,24 +417,29 @@ impl SpaceAdventure {
             }
         }
 
-        // Resolve collisions
-        for layer in 0..MAX_LAYER {
-            let layer_entities = self.entities[layer].keys().collect_vec();
-            if layer_entities.len() == 0 {
-                continue;
-            }
+        // Resolve collisions (only if state is running)
+        match self.state {
+            SpaceAdventureState::Running { .. } => {
+                for layer in 0..MAX_LAYER {
+                    let layer_entities = self.entities[layer].keys().collect_vec();
+                    if layer_entities.len() == 0 {
+                        continue;
+                    }
 
-            for idx in 0..layer_entities.len() - 1 {
-                let entity = self.entities[layer]
-                    .get(layer_entities[idx])
-                    .expect("Entity should exist.");
-                for other_idx in idx + 1..layer_entities.len() {
-                    let other = self.entities[layer]
-                        .get(layer_entities[other_idx])
-                        .expect("Entity should exist.");
-                    callbacks.append(&mut resolve_collision_between(entity, other));
+                    for idx in 0..layer_entities.len() - 1 {
+                        let entity = self.entities[layer]
+                            .get(layer_entities[idx])
+                            .expect("Entity should exist.");
+                        for other_idx in idx + 1..layer_entities.len() {
+                            let other = self.entities[layer]
+                                .get(layer_entities[other_idx])
+                                .expect("Entity should exist.");
+                            callbacks.append(&mut resolve_collision_between(entity, other));
+                        }
+                    }
                 }
             }
+            _ => {}
         }
 
         // Execute callbacks
@@ -451,6 +456,8 @@ impl SpaceAdventure {
             self.insert_entity(Box::new(asteroid));
         }
 
+        let mut ui_callbacks = vec![];
+
         if difficulty_level > DIFFICULTY_FOR_ASTEROID_PLANET_GENERATION {
             match self.asteroid_planet_state {
                 AsteroidPlanetState::NotSpawned {
@@ -462,14 +469,19 @@ impl SpaceAdventure {
                         self.asteroid_planet_state = AsteroidPlanetState::Spawned {
                             image_number: id % MAX_ASTEROID_PLANET_IMAGE_TYPE,
                         };
+                        ui_callbacks.push(UiCallback::PushUiPopup { popup_message:
+                            PopupMessage::Ok {
+                            message: "You've found an asteroid! Bring the spaceship in touch with it to claim it.".to_string(),
+                                is_skippable:true, tick:Tick::now()}
+                            });
                     }
                 }
                 _ => {}
             }
         }
 
         // TODO: spawn enemy ship
-        Ok(vec![])
+        Ok(ui_callbacks)
     }
 
     pub fn image(&self, width: u32, height: u32, debug_view: bool) -> AppResult<RgbaImage> {

src/space_adventure/space.rs

@@ -605,7 +605,7 @@ impl SpaceshipEntity {
         let mut shooter_img = spaceship.shooter.image(size)?;
         shooter_img = rotate90(&shooter_img);
 
-        let y_offset = (shooter_img.height() - gif[0].height()) / 2;
+        let y_offset = shooter_img.height().saturating_sub(gif[0].height()) / 2;
         let mut shooter_positions = vec![];
         for x in 0..shooter_img.width() {
             for y in 0..shooter_img.height() {
@@ -635,8 +635,8 @@ impl SpaceshipEntity {
             hit_boxes,
             current_durability: spaceship.current_durability() as f32,
             durability: spaceship.durability() as f32,
-            base_thrust: spaceship.speed(0) * THRUST_MOD,
-            base_speed: spaceship.speed(0) * MAX_SPACESHIP_SPEED_MOD * team_speed_bonus,
+            base_thrust: spaceship.speed(0) * THRUST_MOD * team_speed_bonus,
+            base_speed: spaceship.speed(0) * MAX_SPACESHIP_SPEED_MOD,
             maneuverability: 0.0,
             fuel: fuel as f32,
             fuel_capacity: spaceship.fuel_capacity(),

src/space_adventure/spaceship.rs

@@ -402,10 +402,7 @@ pub fn resolve_collision_between(
                     id: one.id(),
                     damage: other.collision_damage(),
                 },
-                SpaceCallback::DamageEntity {
-                    id: other.id(),
-                    damage: one.collision_damage(),
-                },
+                SpaceCallback::DestroyEntity { id: other.id() },
             ];
         }
         (ColliderType::Asteroid, ColliderType::Spaceship) => resolve_collision_between(other, one),