v1.0.23

Author: ricott1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rebels"
-version = "1.0.22"
+version = "1.0.23"
 edition = "2021"
 authors = ["Alessandro Ricottone <[email protected]>"]
 license = "GPL-3.0-or-later"
@@ -65,13 +65,13 @@ serde = { version = "1.0.215", features = ["derive", "default"] }
 serde_json = "1.0.133"
 serde_repr = "0.1.19"
 sha2 = "0.10.8"
-stream-download = { version = "0.12.0", features = ["reqwest-rustls"] }
+stream-download = { version = "0.13.1", features = ["reqwest-rustls"] }
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
 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.3"
+url = "2.5.4"
 uuid = { version = "1.11.0", features = ["v4", "serde"] }
 void = "1.0.2"

README.md

@@ -5,12 +5,14 @@ https://github.com/user-attachments/assets/aaa02f04-06db-4da5-8fa4-732b60083e66
 
 
 It's the year 2101. Corporations have taken over the world.
-The only way to be free is to join a pirate crew and start plundering the galaxy. The only mean of survival is to play basketball.
+The only way to be free is to join a pirate crew and start plundering the galaxy. The only means of survival is to play basketball.
 
 Now it's your turn to go out there and make a name for yourself. Create your crew and start wandering the galaxy in search of worthy basketball opponents.
 
 The game is under heavy development and breaking changes are often introduced. If you can't continue an old game because the save file is invalid, you probably need to start a new one or open an issue to check if the save file can be migrated.
 
+[![Trailer on youtube](https://youtu.be/5Lu9MSgmTBc/0.jpg)](https://youtu.be/5Lu9MSgmTBc)
+
 ## Just try it out!
 
 Connect via SSH to try the game.
@@ -23,7 +25,13 @@ Save files are deleted after 2 days of inactivity.
 
 ### Build
 
-You need to have the rust toolchain installed --> https://www.rust-lang.org/tools/install. Then you can clone the repo and build the game with
+There are some dependencies to build:
+
+-   Linux: install `libasound2-dev` and `cmake` (for instance, on Ubuntu they can be installed with `sudo apt-get install -y libasound2-dev cmake`); 
+-   MacOs: install `cmake` (for instance, using [brew](https://formulae.brew.sh/formula/cmake));
+-   Windows: install [cmake](https://cmake.org/download/).
+
+You need to have the [rust toolchain](https://www.rust-lang.org/tools/install). Then you can clone the repo and build the game with
 
 `cargo build --release`
 
@@ -61,9 +69,9 @@ This game runs as a terminal application, meaning that you just need to run the
 
 Suggested minimal terminal size: 160x48. Not all terminals support the game colors nicely, so you might need to try different ones. Here is a list of tested terminals:
 
--   Linux: whatever the default terminal is, it should work
--   MacOs: [iTerm2](https://iterm2.com/), [tabby](https://tabby.sh/), [WezTerm](https://wezfurlong.org/wezterm/index.html)
--   Windows: [tabby](https://tabby.sh/)
+-   Linux: whatever the default terminal is, it should work;
+-   MacOs: [iTerm2](https://iterm2.com/), [tabby](https://tabby.sh/), [WezTerm](https://wezfurlong.org/wezterm/index.html);
+-   Windows: [tabby](https://tabby.sh/).
 
 **Important**: currently local bot teams are generated by default to make the game more enjoyable. This behaviour can be disabled by passing the `-f` flag to the executable. In the future, when more players will be available, the game will default to online teams only.
 
@@ -85,6 +93,18 @@ Join the [discord](https://discord.gg/ebjp33UrrV)! There is no fixed roadmap for
 
 It is almost guaranteed that you will encounter bugs along your journey. If you do, please open an issue and describe what happened. If you are a developer and want to contribute, feel free to open a pull request.
 
+## Running a relayer node
+
+Running a relayer node helps keep the game decentralized. You can do so by running `rebels -n`. Other players can connect with your relayer at startup using `rebels -i <RELAYER-NODE-IP4-OR-IP6>`. If you do so, please consider opening a PR to add your address to the following list of known relayers.
+
+### Additional relayer nodes
+
+- `85.214.130.204`
+
+## Running a SSH server
+
+You can also run a SSH server with `rebels -j`.  Other players can connect with your server using `ssh <USERNAME>@<SERVER-IP4-OR-IP6> -p 3788`.
+
 ## License
 
 This software is released under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) license.

src/app.rs

@@ -392,14 +392,12 @@ impl App {
                             text: format!("Failed to send own team to peers: {}", e),
                         });
                     }
-                } else {
-                    if let Err(e) = network_handler.dial_seed() {
-                        self.ui.swarm_panel.push_log_event(SwarmPanelEvent {
-                            timestamp: Tick::now(),
-                            peer_id: None,
-                            text: format!("Failed to dial seed: {}", e),
-                        });
-                    }
+                } else if let Err(e) = network_handler.dial_seed() {
+                    self.ui.swarm_panel.push_log_event(SwarmPanelEvent {
+                        timestamp: Tick::now(),
+                        peer_id: None,
+                        text: format!("Failed to dial seed: {}", e),
+                    });
                 }
             }
         }

src/crossterm_event_handler.rs

@@ -52,7 +52,10 @@ impl CrosstermEventHandler {
                             CrosstermEvent::Resize(w, h) => {
                                 sender.send(TerminalEvent::Resize(w, h)).await
                             }
-                            _ => unimplemented!(),
+                            _ => {
+                                log::info!("Crossterm event not implemented");
+                                Ok(())
+                            }
                         }
                         .expect("failed to send terminal event")
                     }

src/game_engine/isolation.rs

@@ -119,7 +119,6 @@ impl EngineAction for Isolation {
                         iso.info.shortened_name(),
                         defender.info.shortened_name()
                     ),
-                    
                     format!(
                         "{} cuts through {} and the help defense.",
                         iso.info.shortened_name(),
@@ -184,7 +183,6 @@ impl EngineAction for Isolation {
                         iso.info.shortened_name(),
                         defender.info.shortened_name()
                     ),
-                    
                 ].choose(rng).expect("There should be one option").clone(),
                 start_at: input.end_at,
                 end_at: input.end_at.plus(timer_increase),

src/game_engine/off_the_screen.rs

@@ -147,15 +147,15 @@ impl EngineAction for OffTheScreen {
                     ),
                     format!(
                         "{} tries to use the screen to get open for the shot, but {} is right there, forcing a bad attempt.",
-                        playmaker.info.shortened_name(), target.info.shortened_name(), 
-                    ),
+                        playmaker.info.shortened_name(), target.info.shortened_name(),
+                                        ),
                     format!(
                         "{} receives the pass from {} but can't escape {}'s tight defense, resulting in a rushed shot.",
                         playmaker.info.shortened_name(), target.info.shortened_name(), target_defender.info.shortened_name()
                     ),
                     format!(
                         "{} gets the pass after the screen, but {} doesn't give an inch, and the shot is off balance.",
-                        playmaker.info.shortened_name(), target.info.shortened_name(), 
+                        playmaker.info.shortened_name(), target.info.shortened_name(),
                     ),
                 ].choose(rng).expect("There should be one option").clone(),
                 assist_from: Some(play_idx),

src/game_engine/pick_and_roll.rs

@@ -130,7 +130,6 @@ impl EngineAction for PickAndRoll {
                     ..Default::default()
                 },
                 x if x > ADV_DEFENSE_LIMIT => {
-                    
                     match rng.gen_bool(0.5) {
                         false => ActionOutput {
                             possession: input.possession,
@@ -189,8 +188,6 @@ impl EngineAction for PickAndRoll {
                             ..Default::default()
                         }
                     }
-                    
-                    
             },
                 _ => {
                     playmaker_update.turnovers = 1;
@@ -281,7 +278,7 @@ impl EngineAction for PickAndRoll {
                 possession: input.possession,
                 advantage: Advantage::Neutral,
                 attackers: vec![target_idx],
-                defenders: vec![play_idx], 
+                defenders: vec![play_idx],
                 situation: ActionSituation::CloseShot,
                 description:[
                     format!(
@@ -316,7 +313,7 @@ impl EngineAction for PickAndRoll {
                 possession: input.possession,
                 advantage: Advantage::Defense,
                 attackers: vec![target_idx],
-                defenders: vec![target_idx], 
+                defenders: vec![target_idx],
                 situation: ActionSituation::MediumShot,
                 description:[
                     format!(
@@ -325,7 +322,7 @@ impl EngineAction for PickAndRoll {
                     ),
                     format!(
                         "The pick'n'roll is executed, but {} is quick to cover as {} passes to {}.",
-                       target_defender.info.shortened_name(), playmaker.info.shortened_name(), target.info.shortened_name(),  
+                       target_defender.info.shortened_name(), playmaker.info.shortened_name(), target.info.shortened_name(),
                     ),
                     format!(
                         "They try the pick'n'roll. {} passes to {} but {} sticks to {} like glue.",

src/game_engine/post.rs

@@ -67,7 +67,7 @@ impl EngineAction for Post {
                         defender.info.shortened_name()
                     ),
                     format!(
-                        "{} beats {} with a slick move and makes a strong move to the basket.",
+                        "{} beats {} with a slick step and makes a strong move to the basket.",
                         poster.info.shortened_name(),
                         defender.info.shortened_name()
                     ),

src/image/player.rs

@@ -154,7 +154,8 @@ impl PlayerImage {
         } else if info.population == Population::Octopulp {
             match rng.gen_range(0..=1) {
                 0 => Some(BeardImage::Octobeard1),
-                _ => Some(BeardImage::Octobeard2),
+                1 => Some(BeardImage::Octobeard2),
+                _ => unreachable!(),
             }
         } else {
             match rng.gen_range(1..=6) {
@@ -299,7 +300,8 @@ impl PlayerImage {
     pub fn set_wooden_leg(&mut self, rng: &mut ChaCha8Rng) {
         self.wooden_leg = match rng.gen_range(0..=1) {
             0 => Some(WoodenLegImage::Left),
-            _ => Some(WoodenLegImage::Right),
+            1 => Some(WoodenLegImage::Right),
+            _ => unreachable!(),
         };
     }
 
@@ -308,28 +310,34 @@ impl PlayerImage {
             Population::Galdari => match rng.gen_range(0..=2) {
                 0 => Some(EyePatchImage::LeftLow),
                 1 => Some(EyePatchImage::RightLow),
-                _ => Some(EyePatchImage::Central),
+                2 => Some(EyePatchImage::Central),
+                _ => unreachable!(),
             },
             Population::Polpett | Population::Yardalaim => match rng.gen_range(0..=1) {
                 0 => Some(EyePatchImage::LeftLow),
-                _ => Some(EyePatchImage::RightLow),
+                1 => Some(EyePatchImage::RightLow),
+                _ => unreachable!(),
             },
             Population::Octopulp => {
                 if self.head == HeadImage::Octopulp1 {
                     Some(EyePatchImage::OctopulpCentral)
                 } else if self.head == HeadImage::Octopulp2 {
                     match rng.gen_range(0..=1) {
                         0 => Some(EyePatchImage::LeftLow),
-                        _ => Some(EyePatchImage::RightLow),
+                        1 => Some(EyePatchImage::RightLow),
+                        _ => unreachable!(),
                     }
                 } else {
                     unreachable!()
                 }
             }
             Population::Pupparoll => Some(EyePatchImage::Pupparoll),
-            _ => match rng.gen_range(0..=1) {
-                0 => Some(EyePatchImage::LeftLow),
-                _ => Some(EyePatchImage::RightLow),
+            _ => match rng.gen_range(0..=3) {
+                0 => Some(EyePatchImage::LeftHigh),
+                1 => Some(EyePatchImage::LeftLow),
+                2 => Some(EyePatchImage::RightHigh),
+                3 => Some(EyePatchImage::RightLow),
+                _ => unreachable!(),
             },
         };
     }
@@ -338,12 +346,14 @@ impl PlayerImage {
         self.hook = if population == Population::Pupparoll {
             match rng.gen_range(0..=1) {
                 0 => Some(HookImage::LeftPupparoll),
-                _ => Some(HookImage::RightPupparoll),
+                1 => Some(HookImage::RightPupparoll),
+                _ => unreachable!(),
             }
         } else {
             match rng.gen_range(0..=1) {
                 0 => Some(HookImage::Left),
-                _ => Some(HookImage::Right),
+                1 => Some(HookImage::Right),
+                _ => unreachable!(),
             }
         };
     }

src/network/handler.rs

@@ -102,14 +102,18 @@ impl NetworkHandler {
         ];
 
         if let Some(ip) = seed_ip {
-            seed_addresses.push(
-                format!("/ip4/{ip}/tcp/{DEFAULT_SEED_PORT}")
-                    .parse()
-                    .expect("Invalid provided seed ip."),
-            );
+            if let Ok(address) = format!("/ip4/{ip}/tcp/{DEFAULT_SEED_PORT}").parse() {
+                seed_addresses.push(address);
+            } else if let Ok(address) = format!("/ip6/{ip}/tcp/{DEFAULT_SEED_PORT}").parse() {
+                seed_addresses.push(address);
+            }
         }
 
-        info!("Network handler started on port {}", tcp_port);
+        info!(
+            "Network handler started on port {} with {} seed addresses.",
+            tcp_port,
+            seed_addresses.len()
+        );
 
         Ok(Self {
             swarm,

src/network/network_callback.rs

@@ -210,7 +210,7 @@ impl NetworkCallback {
         seed_info: SeedInfo,
     ) -> AppCallback {
         Box::new(move |app: &mut App| {
-            log::info!("Got seed info: {:#?}", seed_info);
+            log::info!("Got seed info");
             let event = SwarmPanelEvent {
                 timestamp,
                 peer_id,

src/space_adventure/asteroid.rs

@@ -1,3 +1,4 @@
+use super::collisions::HitBox;
 use super::networking::ImageType;
 use super::space_callback::SpaceCallback;
 use super::visual_effects::VisualEffect;

src/space_adventure/collector.rs

@@ -1,4 +1,4 @@
-use super::{networking::ImageType, space_callback::SpaceCallback, traits::*};
+use super::{collisions::HitBox, networking::ImageType, space_callback::SpaceCallback, traits::*};
 use crate::register_impl;
 use glam::{I16Vec2, Vec2};
 use image::{Rgba, RgbaImage};