generated from GarandPLG/rust-flake-template
Use VecDeque for tasks and marked cells
Replace `Vec` with `VecDeque` in `BoardState` marked cells, `DiggingTask` path, and `MinerUnit` tasks to enable efficient push/pop operations. Remove the `Copy` trait from several structs and enums, adjust derives accordingly, and use `as_ref` in `Option<Units>` implementations to avoid consuming the option. Update cell rendering to clone widgets and adjust `CellWidget::get_option_unit` to return a cloned `Option<Units>`. Add necessary `VecDeque` imports.
This commit is contained in:
@@ -11,6 +11,7 @@ use crate::app::{
|
|||||||
widgets::CellWidget,
|
widgets::CellWidget,
|
||||||
};
|
};
|
||||||
use ratatui::layout::Rect;
|
use ratatui::layout::Rect;
|
||||||
|
use std::collections::VecDeque;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct BoardState {
|
pub struct BoardState {
|
||||||
@@ -29,7 +30,7 @@ pub struct BoardState {
|
|||||||
player_base_coords: (usize, usize),
|
player_base_coords: (usize, usize),
|
||||||
enemy_base_coords: (usize, usize),
|
enemy_base_coords: (usize, usize),
|
||||||
pub marking_cells: bool,
|
pub marking_cells: bool,
|
||||||
marked_cells: Vec<(usize, usize)>,
|
marked_cells: VecDeque<(usize, usize)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BoardState {
|
impl BoardState {
|
||||||
@@ -105,7 +106,7 @@ impl BoardState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let marking_cells: bool = false;
|
let marking_cells: bool = false;
|
||||||
let marked_cells: Vec<(usize, usize)> = Vec::new();
|
let marked_cells: VecDeque<(usize, usize)> = VecDeque::new();
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
cells_area,
|
cells_area,
|
||||||
@@ -159,7 +160,7 @@ impl BoardState {
|
|||||||
cell.set_marked(true);
|
cell.set_marked(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.marked_cells.push((new_cell.0, new_cell.1));
|
self.marked_cells.push_back((new_cell.0, new_cell.1));
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn undo_marked_cell(&mut self) {
|
pub fn undo_marked_cell(&mut self) {
|
||||||
@@ -178,7 +179,7 @@ impl BoardState {
|
|||||||
|
|
||||||
self.get_mut_cell(new.0, new.1).set_selected(true);
|
self.get_mut_cell(new.0, new.1).set_selected(true);
|
||||||
|
|
||||||
self.marked_cells.pop();
|
self.marked_cells.pop_back();
|
||||||
|
|
||||||
self.focused_cell.set_focused_cell(new);
|
self.focused_cell.set_focused_cell(new);
|
||||||
}
|
}
|
||||||
@@ -190,7 +191,7 @@ impl BoardState {
|
|||||||
let cell: &mut CellWidget = self.get_mut_cell(row, col);
|
let cell: &mut CellWidget = self.get_mut_cell(row, col);
|
||||||
cell.set_marked(true);
|
cell.set_marked(true);
|
||||||
|
|
||||||
self.marked_cells.push((row, col));
|
self.marked_cells.push_back((row, col));
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn clear_marked_cells(&mut self) {
|
pub fn clear_marked_cells(&mut self) {
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
use crate::app::widgets::CellWidget;
|
use std::collections::VecDeque;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct DiggingTask {
|
pub struct DiggingTask {
|
||||||
// path: Vec<(usize, usize)>,
|
path: VecDeque<(usize, usize)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DiggingTask {
|
impl DiggingTask {
|
||||||
pub fn new(path: Vec<(u16, u16)>) -> Self {
|
pub fn new(path: VecDeque<(usize, usize)>) -> Self {
|
||||||
Self {
|
Self { path }
|
||||||
// path
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use crate::app::states::skirmish_states::tasks::DiggingTask;
|
use crate::app::states::skirmish_states::tasks::DiggingTask;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub enum Tasks {
|
pub enum Tasks {
|
||||||
Digging(DiggingTask),
|
Digging(DiggingTask),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
use crate::app::states::skirmish_states::{Players, tasks::Tasks, units::Unit};
|
use crate::app::states::skirmish_states::{Players, tasks::Tasks, units::Unit};
|
||||||
|
use std::collections::VecDeque;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct MinerUnit {
|
pub struct MinerUnit {
|
||||||
owner: Players,
|
owner: Players,
|
||||||
hp: u16,
|
hp: u16,
|
||||||
can_dig: bool,
|
can_dig: bool,
|
||||||
digging_power: f32,
|
digging_power: f32,
|
||||||
// tasks: Vec<Tasks>,
|
pub tasks: VecDeque<Tasks>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MinerUnit {
|
impl MinerUnit {
|
||||||
@@ -16,7 +17,7 @@ impl MinerUnit {
|
|||||||
hp: 100,
|
hp: 100,
|
||||||
can_dig: true,
|
can_dig: true,
|
||||||
digging_power: 0.55,
|
digging_power: 0.55,
|
||||||
// tasks: Vec::new(),
|
tasks: VecDeque::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,13 @@ use crate::app::states::skirmish_states::{
|
|||||||
units::{MinerUnit, Unit},
|
units::{MinerUnit, Unit},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub enum Units {
|
pub enum Units {
|
||||||
Miner(MinerUnit),
|
Miner(MinerUnit),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Units {
|
impl Units {
|
||||||
|
#[inline]
|
||||||
fn u(&self) -> &dyn Unit {
|
fn u(&self) -> &dyn Unit {
|
||||||
match self {
|
match self {
|
||||||
Self::Miner(m) => m,
|
Self::Miner(m) => m,
|
||||||
@@ -48,34 +49,34 @@ impl Unit for Units {
|
|||||||
|
|
||||||
impl Unit for Option<Units> {
|
impl Unit for Option<Units> {
|
||||||
fn is_unit(&self) -> bool {
|
fn is_unit(&self) -> bool {
|
||||||
self.map_or(false, |u| u.is_unit())
|
self.as_ref().map_or(false, |u| u.is_unit())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_tag(&self) -> char {
|
fn get_tag(&self) -> char {
|
||||||
self.map_or(' ', |u| u.get_tag())
|
self.as_ref().map_or(' ', |u| u.get_tag())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_name(&self) -> &'static str {
|
fn get_name(&self) -> &'static str {
|
||||||
self.map_or("", |u| u.get_name())
|
self.as_ref().map_or("", |u| u.get_name())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_owner(&self) -> Players {
|
fn get_owner(&self) -> Players {
|
||||||
self.map_or(Players::Unclaimed, |u| u.get_owner())
|
self.as_ref().map_or(Players::Unclaimed, |u| u.get_owner())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_hp(&self) -> u16 {
|
fn get_hp(&self) -> u16 {
|
||||||
self.map_or(0, |u| u.get_hp())
|
self.as_ref().map_or(0, |u| u.get_hp())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_max_hp(&self) -> u16 {
|
fn get_max_hp(&self) -> u16 {
|
||||||
self.map_or(0, |u| u.get_max_hp())
|
self.as_ref().map_or(0, |u| u.get_max_hp())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_can_dig(&self) -> bool {
|
fn get_can_dig(&self) -> bool {
|
||||||
self.map_or(false, |u| u.get_can_dig())
|
self.as_ref().map_or(false, |u| u.get_can_dig())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_digging_power(&self) -> f32 {
|
fn get_digging_power(&self) -> f32 {
|
||||||
self.map_or(0.0, |u| u.get_digging_power())
|
self.as_ref().map_or(0.0, |u| u.get_digging_power())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ impl Widget for BoardWidget<'_> {
|
|||||||
.cells
|
.cells
|
||||||
.get(row_idx + self.state.vertical_offset.get_value())
|
.get(row_idx + self.state.vertical_offset.get_value())
|
||||||
.and_then(|rows| rows.get(col_idx + self.state.horizontal_offset.get_value()))
|
.and_then(|rows| rows.get(col_idx + self.state.horizontal_offset.get_value()))
|
||||||
.map(|cell| cell.render(*cell_area, buf));
|
.map(|cell| cell.clone().render(*cell_area, buf));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ use ratatui::{
|
|||||||
widgets::{Block, BorderType, Borders, Paragraph, Widget},
|
widgets::{Block, BorderType, Borders, Paragraph, Widget},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct CellWidget {
|
pub struct CellWidget {
|
||||||
row: usize,
|
row: usize,
|
||||||
col: usize,
|
col: usize,
|
||||||
@@ -57,7 +57,7 @@ impl CellWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_option_unit(&self) -> Option<Units> {
|
pub fn get_option_unit(&self) -> Option<Units> {
|
||||||
self.unit
|
self.unit.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_structure(&mut self, structure: Structures) -> &mut Self {
|
pub fn set_structure(&mut self, structure: Structures) -> &mut Self {
|
||||||
|
|||||||
Reference in New Issue
Block a user