add show_plan option

cc-client/src/battle_ui.rs

@@ -12,10 +12,24 @@ pub struct BattleUi {
 }
 
 impl BattleUi {
-    pub fn new(battle: &Battle, p1_name: String, p2_name: String) -> Self {
+    pub fn new(
+        battle: &Battle,
+        p1_name: String,
+        p1_show_plan: bool,
+        p2_name: String,
+        p2_show_plan: bool,
+    ) -> Self {
         BattleUi {
-            player_1_graphics: PlayerDrawState::new(battle.player_1.board.next_queue(), p1_name),
-            player_2_graphics: PlayerDrawState::new(battle.player_2.board.next_queue(), p2_name),
+            player_1_graphics: PlayerDrawState::new(
+                battle.player_1.board.next_queue(),
+                p1_name,
+                p1_show_plan,
+            ),
+            player_2_graphics: PlayerDrawState::new(
+                battle.player_2.board.next_queue(),
+                p2_name,
+                p2_show_plan,
+            ),
             time: 0,
         }
     }

cc-client/src/lib.rs

@@ -191,7 +191,11 @@ pub fn main() {
                     el_proxy,
                     executor,
                     state: match replay_file {
-                        Some(f) => Box::new(ReplayGame::new(f)),
+                        Some(f) => Box::new(ReplayGame::new(
+                            f,
+                            options.p1.show_plan,
+                            options.p2.show_plan,
+                        )),
                         None => Box::new(RealtimeGame::new(options, 0, 0).await),
                     },
                     p1: p1_gamepad,
@@ -237,13 +241,26 @@ impl Default for Options {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Default)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(default)]
 struct PlayerConfig<E: Default> {
     controls: input::UserInput,
     game: GameConfig,
     bot_config: BotConfig<E>,
     is_bot: bool,
+    show_plan: bool,
+}
+
+impl<E: Default> Default for PlayerConfig<E> {
+    fn default() -> Self {
+        Self {
+            controls: Default::default(),
+            game: Default::default(),
+            bot_config: Default::default(),
+            is_bot: false,
+            show_plan: true,
+        }
+    }
 }
 
 impl<E> PlayerConfig<E>

cc-client/src/player_draw.rs

@@ -14,6 +14,7 @@ pub struct PlayerDrawState {
     statistics: Statistics,
     garbage_queue: u32,
     dead: bool,
+    show_plan: bool,
     hold_piece: Option<Piece>,
     next_queue: VecDeque<Piece>,
     game_time: u32,
@@ -31,7 +32,7 @@ enum State {
 }
 
 impl PlayerDrawState {
-    pub fn new(queue: impl IntoIterator<Item = Piece>, name: String) -> Self {
+    pub fn new(queue: impl IntoIterator<Item = Piece>, name: String, show_plan: bool) -> Self {
         PlayerDrawState {
             board: ArrayVec::from([*ColoredRow::EMPTY; 40]),
             state: State::Delay,
@@ -46,6 +47,7 @@ impl PlayerDrawState {
             clear_splash: None,
             name,
             info: None,
+            show_plan,
         }
     }
 
@@ -331,41 +333,43 @@ impl PlayerDrawState {
             0,
         );
 
-        if let Some(ref info) = self.info {
-            let mut has_pc = false;
-            for (_, l) in info.plan() {
-                if l.perfect_clear {
-                    has_pc = true;
+        if self.show_plan {
+            if let Some(ref info) = self.info {
+                let mut has_pc = false;
+                for (_, l) in info.plan() {
+                    if l.perfect_clear {
+                        has_pc = true;
+                    }
                 }
-            }
 
-            // Draw bot plan
-            let mut y_map = [0; 40];
-            for i in 0..40 {
-                y_map[i] = i as i32;
-            }
-            for (placement, lock) in info.plan() {
-                for &(x, y, d) in &placement.cells_with_connections() {
-                    res.sprite_batch.draw(
-                        &res.sprites.plan[d.as_usize()],
-                        point2(offset_x + x as f32 + 4.0, y_map[y as usize] as f32 + 3.25),
-                        cell_color_to_color(placement.kind.0.color()),
-                    );
-                }
-                let mut new_map = [0; 40];
-                let mut j = 0;
+                // Draw bot plan
+                let mut y_map = [0; 40];
                 for i in 0..40 {
-                    if !lock.cleared_lines.contains(&i) {
-                        new_map[j] = y_map[i as usize];
-                        j += 1;
-                    }
+                    y_map[i] = i as i32;
                 }
-                y_map = new_map;
+                for (placement, lock) in info.plan() {
+                    for &(x, y, d) in &placement.cells_with_connections() {
+                        res.sprite_batch.draw(
+                            &res.sprites.plan[d.as_usize()],
+                            point2(offset_x + x as f32 + 4.0, y_map[y as usize] as f32 + 3.25),
+                            cell_color_to_color(placement.kind.0.color()),
+                        );
+                    }
+                    let mut new_map = [0; 40];
+                    let mut j = 0;
+                    for i in 0..40 {
+                        if !lock.cleared_lines.contains(&i) {
+                            new_map[j] = y_map[i as usize];
+                            j += 1;
+                        }
+                    }
+                    y_map = new_map;
 
-                if !has_pc && lock.placement_kind.is_hard() && lock.placement_kind.is_clear()
-                    || lock.perfect_clear
-                {
-                    break;
+                    if !has_pc && lock.placement_kind.is_hard() && lock.placement_kind.is_clear()
+                        || lock.perfect_clear
+                    {
+                        break;
+                    }
                 }
             }
         }

cc-client/src/realtime.rs

@@ -54,7 +54,13 @@ impl RealtimeGame {
         battle.replay.p1_name = p1_name.clone();
         battle.replay.p2_name = p2_name.clone();
         RealtimeGame {
-            ui: BattleUi::new(&battle, p1_name, p2_name),
+            ui: BattleUi::new(
+                &battle,
+                p1_name,
+                options.p1.show_plan,
+                p2_name,
+                options.p2.show_plan,
+            ),
             battle,
             options: Some(options),
             p1_input,

cc-client/src/replay.rs

@@ -22,10 +22,12 @@ pub struct ReplayGame {
     p1_info_updates: VecDeque<Option<cold_clear::Info>>,
     p2_info_updates: VecDeque<Option<cold_clear::Info>>,
     start_delay: u32,
+    p1_show_plan: bool,
+    p2_show_plan: bool,
 }
 
 impl ReplayGame {
-    pub fn new(file: impl Into<PathBuf>) -> Self {
+    pub fn new(file: impl Into<PathBuf>, p1_show_plan: bool, p2_show_plan: bool) -> Self {
         let file = file.into();
         let InfoReplay {
             replay,
@@ -41,13 +43,21 @@ impl ReplayGame {
             replay.garbage_seed,
         );
         ReplayGame {
-            ui: BattleUi::new(&battle, replay.p1_name, replay.p2_name),
+            ui: BattleUi::new(
+                &battle,
+                replay.p1_name,
+                p1_show_plan,
+                replay.p2_name,
+                p2_show_plan,
+            ),
             battle,
             updates: replay.updates,
             p1_info_updates,
             p2_info_updates,
             start_delay: 500,
             file,
+            p1_show_plan,
+            p2_show_plan,
         }
     }
 }
@@ -100,7 +110,13 @@ impl crate::State for ReplayGame {
                     replay.p2_seed,
                     replay.garbage_seed,
                 );
-                self.ui = BattleUi::new(&battle, replay.p1_name, replay.p2_name);
+                self.ui = BattleUi::new(
+                    &battle,
+                    replay.p1_name,
+                    self.p1_show_plan,
+                    replay.p2_name,
+                    self.p2_show_plan,
+                );
                 self.battle = battle;
                 self.updates = replay.updates;
                 self.p1_info_updates = p1_info_updates;