v1.0.16hf

Author: ricott1

assets/head/octopulp1.png

@@ -396,11 +396,14 @@ impl<'game> Game {
     fn apply_tiredness_update(&mut self) {
         for team in [&mut self.home_team_in_game, &mut self.away_team_in_game] {
             for (id, player) in team.players.iter_mut() {
-                let stats = team.stats.get_mut(&id).unwrap();
+                let stats = team.stats.get_mut(&id).expect("Player should have stats");
                 if stats.is_playing() && !self.timer.is_break() {
                     stats.seconds_played += 1;
                     if !player.is_knocked_out() {
-                        stats.experience_at_position[stats.position.unwrap() as usize] += 1;
+                        stats.experience_at_position[stats
+                            .position
+                            .expect("Playing player should have a position")
+                            as usize] += 1;
                         player.add_tiredness(TirednessCost::LOW);
                     }
                 } else if player.tiredness > RECOVERING_TIREDNESS_PER_SHORT_TICK

assets/planets/.DS_Store

@@ -217,7 +217,12 @@ impl SwarmPanel {
                     format!(
                         "{} ({})",
                         team.name.clone(),
-                        peer_id.to_base58().chars().take(6).collect::<String>()
+                        peer_id
+                            .to_base58()
+                            .chars()
+                            .skip(8)
+                            .take(8)
+                            .collect::<String>()
                     ),
                     style,
                 )));
@@ -271,6 +276,8 @@ impl SwarmPanel {
                 continue;
             }
 
+            let peer_id = peer_id.unwrap();
+
             let line_split = Layout::horizontal([
                 Constraint::Length(32),
                 Constraint::Length(6),
@@ -293,10 +300,10 @@ impl SwarmPanel {
                         team.name,
                         world.team_rating(team.team_id).unwrap_or_default().stars(),
                         peer_id
-                            .unwrap()
                             .to_base58()
                             .chars()
-                            .take(6)
+                            .skip(8)
+                            .take(8)
                             .collect::<String>()
                     ),
                     UiCallbackPreset::GoToTeam {

src/engine/game.rs

@@ -6,6 +6,7 @@ use super::popup_message::PopupMessage;
 use super::splash_screen::{AudioPlayerState, SplashScreen};
 use super::traits::SplitPanel;
 use super::ui_callback::{CallbackRegistry, UiCallbackPreset};
+use super::utils::SwarmPanelEvent;
 use super::widgets::default_block;
 use super::{
     game_panel::GamePanel, my_team_panel::MyTeamPanel, new_team_screen::NewTeamScreen,
@@ -353,20 +354,22 @@ impl Ui {
                 active_render
             }
         };
-        if render_result.is_err() {
-            self.push_popup(PopupMessage::Error(
-                format!("Render error\n{}", render_result.err().unwrap().to_string()),
-                true,
-                Tick::now(),
-            ));
+        if let Err(err) = render_result {
+            let event = SwarmPanelEvent {
+                timestamp: Tick::now(),
+                peer_id: None,
+                text: format!("Render error\n{}", err.to_string()),
+            };
+            self.swarm_panel.push_log_event(event);
         }
 
-        if self.render_popup_messages(frame, area).is_err() {
-            self.push_popup(PopupMessage::Error(
-                "Popup render error".into(),
-                true,
-                Tick::now(),
-            ));
+        if let Err(err) = self.render_popup_messages(frame, area) {
+            let event = SwarmPanelEvent {
+                timestamp: Tick::now(),
+                peer_id: None,
+                text: format!("Popup render error\n{}", err.to_string()),
+            };
+            self.swarm_panel.push_log_event(event);
         }
         self.last_update = Instant::now();
     }

src/ui/swarm_panel.rs

@@ -241,20 +241,24 @@ pub fn render_challenge_button<'a>(
         frame.render_widget(decline_button, c_split[2]);
     } else {
         let challenge_button = if let Some(game_id) = team.current_game {
-            let game = world.get_game_or_err(game_id)?;
-            let game_text = if let Some(action) = game.action_results.last() {
-                format!(
-                    "{} {:>3}-{:<3} {}",
-                    game.home_team_in_game.name,
-                    action.home_score,
-                    action.away_score,
-                    game.away_team_in_game.name,
-                )
+            // The game is not necessarily part of the world if it's a network game.
+            let game_text = if let Ok(game) = world.get_game_or_err(game_id) {
+                if let Some(action) = game.action_results.last() {
+                    format!(
+                        "{} {:>3}-{:<3} {}",
+                        game.home_team_in_game.name,
+                        action.home_score,
+                        action.away_score,
+                        game.away_team_in_game.name,
+                    )
+                } else {
+                    format!(
+                        "{}   0-0   {}",
+                        game.home_team_in_game.name, game.away_team_in_game.name,
+                    )
+                }
             } else {
-                format!(
-                    "{}   0-0   {}",
-                    game.home_team_in_game.name, game.away_team_in_game.name,
-                )
+                "Unknown game".to_string()
             };
             Button::new(
                 format!("Playing - {}", game_text),

src/ui/ui.rs

@@ -93,8 +93,8 @@ pub const SOL_ID: Lazy<PlanetId> = Lazy::new(|| PlanetId::try_parse(SOL_STR).unw
 pub struct TirednessCost;
 impl TirednessCost {
     pub const NONE: f32 = 0.0;
-    pub const LOW: f32 = 0.0075;
-    pub const MEDIUM: f32 = 0.175;
+    pub const LOW: f32 = 0.005;
+    pub const MEDIUM: f32 = 0.15;
     pub const HIGH: f32 = 0.5;
     pub const SEVERE: f32 = 2.5;
     pub const CRITICAL: f32 = 5.0;