generated from GarandPLG/rust-flake-template
GarandPLG
cd1822d05e
Refactor App, GameStates, SkirmishState and BoardState to carry a generic lifetime `'a`. Introduce a new `MarkedCells` type that holds marking state and selected unit, replacing the previous `marking_cells` flag and raw deque. Update related methods, keybindings, view implementations and module exports to use the new structures.
63 lines
1.9 KiB
Rust
63 lines
1.9 KiB
Rust
use crate::{
|
|
app::states::{
|
|
MainMenuState, PerkDecksState, SettingsState, SkillsConfigState, SkirmishState,
|
|
skirmish_states::BoardState,
|
|
},
|
|
cli::Cli,
|
|
};
|
|
use ratatui::layout::Rect;
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub struct GameStates<'a> {
|
|
pub main_menu: MainMenuState,
|
|
pub skirmish: SkirmishState<'a>,
|
|
pub perk_decks: PerkDecksState,
|
|
pub skills_config: SkillsConfigState,
|
|
pub settings: SettingsState,
|
|
}
|
|
|
|
impl GameStates<'_> {
|
|
pub fn new(args: &Cli, area: &Rect) -> Self {
|
|
Self {
|
|
main_menu: MainMenuState {
|
|
id: 0,
|
|
name: "Main Menu",
|
|
selected_view: 1,
|
|
},
|
|
skirmish: SkirmishState {
|
|
id: 1,
|
|
name: "Skirmish",
|
|
board: BoardState::new(
|
|
area,
|
|
args.map_width as usize,
|
|
args.map_height as usize,
|
|
args.zoom_level,
|
|
false,
|
|
),
|
|
side_panel: false,
|
|
turn_counter: 0,
|
|
},
|
|
perk_decks: PerkDecksState {
|
|
id: 2,
|
|
name: "Perk Decks",
|
|
selected_perk_deck: 0,
|
|
},
|
|
skills_config: SkillsConfigState {
|
|
id: 3,
|
|
name: "Skills Config",
|
|
selected_skill: 0,
|
|
},
|
|
settings: SettingsState {
|
|
username: args.username.clone(),
|
|
game_mode: args.game_mode.clone(),
|
|
perk_deck: args.perk_deck.clone(),
|
|
starting_wood: args.starting_wood.clone(),
|
|
starting_iron: args.starting_iron.clone(),
|
|
supply_limit: args.supply_limit.clone(),
|
|
xp_modifier: args.xp_modifier.clone(),
|
|
skill_points_limit: args.skill_points_limit.clone(),
|
|
},
|
|
}
|
|
}
|
|
}
|