Merge branch 'master' of github.com:m00nwtchr/cofd-pc-rs

m00nwtchr · Mar 12, 2024 · 544671a · 544671a
2 parents d46d575 + f991654
commit 544671a
Show file tree

Hide file tree

Showing 18 changed files with 2,094 additions and 792 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cofd/app/src/component/merits.rs b/cofd/app/src/component/merits.rs
@@ -83,6 +83,9 @@ impl<Message> Component<Message, iced::Renderer> for MeritComponent<Message> {
 
 		vec.push(Merit::_Custom(fl!("custom")));
 
+		let attributes = &character.attributes();
+		let skills = &character.skills();
+
 		let vec: Vec<Translated<Merit>> = vec
 			.iter()
 			.cloned()
@@ -91,7 +94,7 @@ impl<Message> Component<Message, iced::Renderer> for MeritComponent<Message> {
 					.merits
 					.iter()
 					.filter(|(merit, _)| *merit == *e)
-					.count() == 0 && e.is_available(&character)
+					.count() == 0 && e.is_available(&character, attributes, skills)
 			})
 			.map(Into::into)
 			.collect();

diff --git a/cofd/app/src/component/skills.rs b/cofd/app/src/component/skills.rs
@@ -120,7 +120,7 @@ impl<Message> SkillsComponent<Message> {
 				.on_press(Event::SpecialtySkillChanged(skill)),
 			);
 
-			let v = character.base_skills().get(&skill);
+			let v = character.base_skills().get(skill);
 			let val = character._modified(ModifierTarget::BaseSkill(skill));
 			let mod_ = val - v;
 

diff --git a/cofd/app/src/component/traits.rs b/cofd/app/src/component/traits.rs
@@ -6,7 +6,12 @@ use iced_lazy::Component;
 
 use cofd::{character::ArmorStruct, prelude::*};
 
-use crate::{fl, i18n::flt, Element, INPUT_PADDING};
+use crate::{
+	fl,
+	i18n::flt,
+	widget::dots::{Shape, SheetDots},
+	Element, INPUT_PADDING,
+};
 
 struct Traits {
 	size: u16,
@@ -37,7 +42,7 @@ pub fn traits_component<Message>(
 }
 
 #[derive(Clone)]
-pub struct Event(String, Trait);
+pub struct Event(u16, Trait);
 
 impl<Message> TraitsComponent<Message> {
 	fn new(character: &Character, on_change: impl Fn(u16, Trait) -> Message + 'static) -> Self {
@@ -67,22 +72,14 @@ impl<Message> Component<Message, iced::Renderer> for TraitsComponent<Message> {
 	type Event = Event;
 
 	fn update(&mut self, _state: &mut Self::State, event: Self::Event) -> Option<Message> {
-		if let Ok(val) = event.0.parse() {
-			Some((self.on_change)(val, event.1))
-		} else if event.0.is_empty() {
-			Some((self.on_change)(0, event.1))
-		} else {
-			None
-		}
+		Some((self.on_change)(event.0, event.1))
 	}
 
 	fn view(&self, _state: &Self::State) -> Element<Self::Event> {
 		let beats = row![
 			text(format!("{}:", fl!("beats"))),
 			text_input("", &format!("{}", self.traits.beats), |val| {
-				// if let Some(val) = val.parse() {
-				Event(val, Trait::Beats)
-				// }
+				Event(val.parse().unwrap_or(0), Trait::Beats)
 			})
 			.padding(INPUT_PADDING)
 		];
@@ -94,7 +91,7 @@ impl<Message> Component<Message, iced::Renderer> for TraitsComponent<Message> {
 					flt(&self.traits.splat, Some("beats")).unwrap()
 				)),
 				text_input("", &format!("{}", self.traits.alternate_beats), |val| {
-					Event(val, Trait::AlternateBeats)
+					Event(val.parse().unwrap_or(0), Trait::AlternateBeats)
 				})
 				.padding(INPUT_PADDING)
 			]

diff --git a/cofd/app/src/view/overview.rs b/cofd/app/src/view/overview.rs
@@ -49,6 +49,7 @@ pub enum Event {
 	// YSplatChanged(YSplat),
 	AbilityValChanged(Ability, u16),
 	AbilityChanged(Ability, Ability),
+	NewAbility(Ability),
 	MeritChanged(usize, Merit, u16),
 	// CustomAbilityChanged(Ability, String),
 	HealthChanged(Wound),
@@ -165,7 +166,7 @@ impl<Message> OverviewTab<Message> {
 				}
 
 				new = new.push(
-					pick_list(vec, None, |key| Event::AbilityValChanged(key.unwrap(), 0))
+					pick_list(vec, None, |key| Event::NewAbility(key.unwrap()))
 						.width(Length::Fill)
 						.padding(INPUT_PADDING)
 						.text_size(20),
@@ -199,7 +200,7 @@ where
 
 		match event {
 			Event::AttrChanged(val, attr) => *character.base_attributes_mut().get_mut(&attr) = val,
-			Event::SkillChanged(val, skill) => *character.base_skills_mut().get_mut(&skill) = val,
+			Event::SkillChanged(val, skill) => *character.base_skills_mut().get_mut(skill) = val,
 			Event::SpecialtyChanged(skill, i, val) => {
 				if let Some(vec) = character.specialties.get_mut(&skill) {
 					if val.is_empty() {
@@ -224,7 +225,10 @@ where
 				if character.has_ability(&ability) {
 					let val = character.remove_ability(&ability).unwrap_or_default();
 					character.add_ability(new, val);
-				} else {
+				}
+			}
+			Event::NewAbility(ability) => {
+				if !character.has_ability(&ability) {
 					character.add_ability(ability, 0);
 				}
 			}