v1.0.24

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rebels"
-version = "1.0.23"
+version = "1.0.24"
 edition = "2021"
 authors = ["Alessandro Ricottone <[email protected]>"]
 license = "GPL-3.0-or-later"

assets/data/planets_data.json

@@ -76,7 +76,7 @@
         "revolution_period": 180,
         "gravity": 2,
         "asteroid_probability": 0.3,
-        "planet_type": 8,
+        "planet_type": 2,
         "satellites": [],
         "satellite_of": "71a43700-0000-0000-0001-000000000001",
         "axis": [31.0, 69.0]
@@ -101,7 +101,7 @@
         "revolution_period": 360,
         "gravity": 3,
         "asteroid_probability": 0.1,
-        "planet_type": 8,
+        "planet_type": 5,
         "satellites": ["71a43700-0000-0000-0003-000000000003", "71a43700-0000-0000-0003-000000000004"],
         "satellite_of": "71a43700-0000-0000-0001-000000000001",
         "axis": [68.0, 24.0]
@@ -123,7 +123,7 @@
         "revolution_period": 360,
         "gravity": 3,
         "asteroid_probability": 0.3,
-        "planet_type": 8,
+        "planet_type": 2,
         "satellites": [],
         "satellite_of": "71a43700-0000-0000-0002-000000000006",
         "axis": [44.0, 44.0]
@@ -145,7 +145,7 @@
         "revolution_period": 360,
         "gravity": 2,
         "asteroid_probability": 0.15,
-        "planet_type": 8,
+        "planet_type": 2,
         "satellites": [],
         "satellite_of": "71a43700-0000-0000-0002-000000000006",
         "axis": [40.0, 46.0]

src/app.rs

@@ -232,6 +232,7 @@ impl App {
             if self.state == AppState::Simulating {
                 info!("Starting world simulation...");
                 self.simulate_loaded_world(&mut tui).await;
+                info!("...Done");
             }
 
             if self.network_port.is_some()
@@ -243,6 +244,8 @@ impl App {
                 if let Err(e) = self.initialize_network_handler() {
                     error!("Could not initialize network handler: {}", e);
                     last_network_handler_init = now;
+                } else {
+                    info!("...Done");
                 }
             }
 
@@ -265,9 +268,6 @@ 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}");
-                            // }
                         },
                         TerminalEvent::Resize(w, h) => tui.resize((w, h))?,
                         TerminalEvent::Quit => self.quit()?,

src/crossterm_event_handler.rs

@@ -40,7 +40,7 @@ impl CrosstermEventHandler {
             tokio::task::spawn(async move {
                 loop {
                     if event::poll(time_step).expect("no events available") {
-                        match event::read().expect("unable to read event") {
+                        let result = match event::read().expect("unable to read event") {
                             CrosstermEvent::Key(key) => {
                                 if key.kind == KeyEventKind::Press {
                                     sender.send(TerminalEvent::Key(key)).await
@@ -56,8 +56,12 @@ impl CrosstermEventHandler {
                                 log::info!("Crossterm event not implemented");
                                 Ok(())
                             }
+                        };
+
+                        if let Err(e) = result {
+                            error!("Failed to send terminal event: {e}");
+                            break;
                         }
-                        .expect("failed to send terminal event")
                     }
 
                     let now = Tick::now();

src/game_engine/action.rs

@@ -79,12 +79,12 @@ pub enum Action {
     PickAndRoll,
     OffTheScreen,
     Post,
+    Brawl,
     Rebound,
     CloseShot,
     MediumShot,
     LongShot,
     Substitution,
-    Brawl,
 }
 
 impl Action {
@@ -115,6 +115,11 @@ impl Action {
 }
 
 pub trait EngineAction {
+    fn tactic_modifier(game: &Game, action: &Action) -> i16 {
+        let attack_tactic = game.home_team_in_game.tactic;
+        let defense_tactic = game.home_team_in_game.tactic;
+        attack_tactic.atk_roll_bonus(&defense_tactic, &action)
+    }
     fn execute(input: &ActionOutput, game: &Game, rng: &mut ChaCha8Rng) -> Option<ActionOutput>;
     fn sample(rng: &mut ChaCha8Rng, weights: [u8; 5]) -> Option<usize> {
         Some(WeightedIndex::new(&weights).ok()?.sample(rng))

src/game_engine/brawl.rs

@@ -1,5 +1,5 @@
 use super::{
-    action::{ActionOutput, EngineAction},
+    action::{Action, ActionOutput, EngineAction},
     game::Game,
     types::GameStats,
 };
@@ -84,7 +84,9 @@ impl EngineAction for Brawl {
             def_result += defender.reputation.value();
         }
 
-        let description = match atk_result as i16 - def_result as i16 {
+        let description = match atk_result as i16 - def_result as i16
+            + Self::tactic_modifier(game, &Action::Brawl)
+        {
             x if x > 0 => {
                 defender_update.extra_morale += MoraleModifier::SEVERE_MALUS;
                 attacker_update.extra_morale += MoraleModifier::SEVERE_BONUS;

src/game_engine/game.rs

@@ -475,6 +475,20 @@ impl<'game> Game {
         }
     }
 
+    pub fn attacking_team(&self) -> &TeamInGame {
+        match self.possession {
+            Possession::Home => &self.home_team_in_game,
+            Possession::Away => &self.away_team_in_game,
+        }
+    }
+
+    pub fn defending_team(&self) -> &TeamInGame {
+        match self.possession {
+            Possession::Home => &self.away_team_in_game,
+            Possession::Away => &self.home_team_in_game,
+        }
+    }
+
     fn get_rng_seed(&self) -> [u8; 32] {
         let mut seed = [0; 32];
         seed[0..16].copy_from_slice(self.id.as_bytes());

src/game_engine/isolation.rs

@@ -1,5 +1,5 @@
 use super::{
-    action::{ActionOutput, ActionSituation, Advantage, EngineAction},
+    action::{Action, ActionOutput, ActionSituation, Advantage, EngineAction},
     constants::*,
     game::Game,
     types::{GameStats, Possession},
@@ -69,7 +69,7 @@ impl EngineAction for Isolation {
             + defender.defense.perimeter_defense.value()
             + defender.athletics.quickness.value();
 
-        let mut result = match atk_result as i16 - def_result as i16 {
+        let mut result = match atk_result as i16 - def_result as i16 + Self::tactic_modifier(game, &Action::Isolation) {
             x if x > ADV_ATTACK_LIMIT => ActionOutput {
                 possession: input.possession,
                 advantage: Advantage::Attack,

src/game_engine/off_the_screen.rs

@@ -1,5 +1,5 @@
 use super::{
-    action::{ActionOutput, ActionSituation, Advantage, EngineAction},
+    action::{Action, ActionOutput, ActionSituation, Advantage, EngineAction},
     constants::*,
     game::Game,
     types::{GameStats, GameStatsMap},
@@ -25,13 +25,12 @@ impl EngineAction for OffTheScreen {
             _ => input.attackers[0],
         };
         let target_idx = match input.attackers.len() {
-            0 => Self::sample(rng, [1, 2, 3, 3, 2])?,
-            1 => {
+            2 => input.attackers[1],
+            _ => {
                 let mut weights = [1, 2, 3, 3, 2];
                 weights[play_idx] = 0;
                 Self::sample(rng, weights)?
             }
-            _ => input.attackers[1],
         };
 
         let playmaker = attacking_players[play_idx];
@@ -59,7 +58,7 @@ impl EngineAction for OffTheScreen {
             + target_defender.defense.perimeter_defense.value()
             + target_defender.athletics.quickness.value();
 
-        let mut result = match atk_result as i16 - def_result as i16 {
+        let mut result = match atk_result as i16 - def_result as i16 + Self::tactic_modifier(game, &Action::OffTheScreen) {
             x if x > ADV_ATTACK_LIMIT => ActionOutput {
                 possession: input.possession,
                 advantage: Advantage::Attack,

src/game_engine/pick_and_roll.rs

@@ -1,5 +1,5 @@
 use super::{
-    action::{ActionOutput, ActionSituation, Advantage, EngineAction},
+    action::{Action, ActionOutput, ActionSituation, Advantage, EngineAction},
     constants::*,
     game::Game,
     types::{GameStats, GameStatsMap},
@@ -60,7 +60,7 @@ impl EngineAction for PickAndRoll {
                 + playmaker_defender.defense.perimeter_defense.value()
                 + playmaker_defender.mental.vision.value();
 
-            result = match atk_result as i16 - def_result as i16 {
+            result = match atk_result as i16 - def_result as i16 + Self::tactic_modifier(game, &Action::PickAndRoll) {
                 x if x > ADV_ATTACK_LIMIT => ActionOutput {
                     possession: input.possession,
                     advantage: Advantage::Attack,
@@ -238,7 +238,7 @@ impl EngineAction for PickAndRoll {
                 + playmaker_defender.defense.perimeter_defense.value()
                 + target_defender.athletics.quickness.value();
 
-            result = match atk_result as i16 - def_result as i16 {
+            result = match atk_result as i16 - def_result as i16 + Self::tactic_modifier(game, &Action::PickAndRoll){
             x if x > ADV_ATTACK_LIMIT => ActionOutput {
                 possession: input.possession,
                 advantage: Advantage::Attack,

src/game_engine/post.rs

@@ -1,5 +1,5 @@
 use super::{
-    action::{ActionOutput, ActionSituation, Advantage, EngineAction},
+    action::{Action, ActionOutput, ActionSituation, Advantage, EngineAction},
     constants::*,
     game::Game,
     types::GameStats,
@@ -48,7 +48,9 @@ impl EngineAction for Post {
             + defender.defense.interior_defense.value()
             + defender.athletics.strength.value();
 
-        let mut result = match atk_result as i16 - def_result as i16 {
+        let mut result = match atk_result as i16 - def_result as i16
+            + Self::tactic_modifier(game, &Action::Post)
+        {
             x if x > ADV_ATTACK_LIMIT => ActionOutput {
                 possession: input.possession,
                 advantage: Advantage::Attack,
@@ -62,7 +64,7 @@ impl EngineAction for Post {
                         defender.info.shortened_name()
                     ),
                     format!(
-                        "{} used {}'s defense to create space and drive to the hoop.",
+                        "{} beats {}'s defense to create space and drive to the hoop.",
                         poster.info.shortened_name(),
                         defender.info.shortened_name()
                     ),

src/game_engine/rebound.rs

@@ -4,7 +4,11 @@ use super::{
     types::GameStats,
 };
 use crate::{
-    game_engine::{action::Advantage, constants::*, types::GameStatsMap},
+    game_engine::{
+        action::{Action, Advantage},
+        constants::*,
+        types::GameStatsMap,
+    },
     world::constants::TirednessCost,
 };
 use rand::{seq::SliceRandom, Rng};
@@ -99,7 +103,7 @@ impl EngineAction for Rebound {
             defence_result,
             MIN_REBOUND_VALUE
         );
-        let result = match attack_result as i16 - defence_result as i16 {
+        let result = match attack_result as i16 - defence_result as i16 + Self::tactic_modifier(game, &Action::Rebound){
             x if x > ADV_ATTACK_LIMIT
                 || (x > 0
                     && attack_result >= MIN_REBOUND_VALUE
@@ -266,7 +270,7 @@ impl EngineAction for Rebound {
             }
             _ => ActionOutput {
                 possession: !input.possession,
-                situation: ActionSituation::BallInBackcourt,
+                situation: ActionSituation::AfterDefensiveRebound,
                 description: [
                     "Nobody got the rebound, ball goes to defence.",
                     "Neither team secures the board, and the ball rolls to the defensive side.",