Allow modifying skill points of character

Author: ZakisM

bl3_save_edit_core/src/bl3_save/character_data.rs

@@ -40,6 +40,7 @@ pub struct CharacterData {
     pub character: Character,
     player_class: PlayerClass,
     player_level: i32,
+    ability_points: i32,
     guardian_rank: i32,
     head_skin_selected: GameDataKv,
     character_skin_selected: GameDataKv,
@@ -64,7 +65,15 @@ impl CharacterData {
                 .map(|p| p.player_class_path.as_str())
                 .context("failed to read player class")?,
         )?;
+
         let player_level = experience_to_level(character.experience_points)?;
+
+        let ability_points = character
+            .ability_data
+            .as_ref()
+            .context("failed to read Player ability data")?
+            .ability_points;
+
         let guardian_rank = character
             .guardian_rank_character_data
             .as_ref()
@@ -348,6 +357,7 @@ impl CharacterData {
             character,
             player_class,
             player_level,
+            ability_points,
             guardian_rank,
             head_skin_selected,
             character_skin_selected,
@@ -448,6 +458,26 @@ impl CharacterData {
         Ok(())
     }
 
+    pub fn ability_points(&self) -> i32 {
+        self.ability_points
+    }
+
+    pub fn set_ability_points(&mut self, ability_points: i32) -> Result<()> {
+        let ability_data = self
+            .character
+            .ability_data
+            .as_mut()
+            .context("failed to read Player ability data")?;
+
+        if ability_points != ability_data.ability_points {
+            ability_data.ability_points = ability_points;
+
+            self.ability_points = ability_points;
+        }
+
+        Ok(())
+    }
+
     pub fn guardian_rank(&self) -> i32 {
         self.guardian_rank
     }

bl3_save_edit_ui/src/bl3_ui.rs

@@ -362,7 +362,7 @@ impl Application for Bl3Application {
                                             .character_state
                                             .name_input = name_input;
                                     }
-                                    SaveCharacterInteractionMessage::XpLevel(level) => {
+                                    SaveCharacterInteractionMessage::Level(level) => {
                                         let xp_points = if level > 0 {
                                             REQUIRED_XP_LIST[level as usize - 1][0]
                                         } else {
@@ -378,7 +378,7 @@ impl Application for Bl3Application {
 
                                         character_state.experience_points_input = xp_points;
                                     }
-                                    SaveCharacterInteractionMessage::XpPoints(xp) => {
+                                    SaveCharacterInteractionMessage::ExperiencePoints(xp) => {
                                         let level = experience_to_level(xp as i32).unwrap_or(1);
 
                                         let character_state = &mut self
@@ -390,6 +390,12 @@ impl Application for Bl3Application {
 
                                         character_state.level_input = level;
                                     }
+                                    SaveCharacterInteractionMessage::AbilityPoints(points) => {
+                                        self.manage_save_state
+                                            .save_view_state
+                                            .character_state
+                                            .ability_points_input = points;
+                                    }
                                     SaveCharacterInteractionMessage::SduMessage(sdu_message) => {
                                         let sdu_unlocker = &mut self
                                             .manage_save_state

bl3_save_edit_ui/src/state_mappers/manage_save/character.rs

@@ -31,6 +31,11 @@ pub fn map_save_to_character_state(manage_save_state: &mut ManageSaveState) {
         .character_state
         .experience_points_input = save.character_data.character.experience_points;
 
+    manage_save_state
+        .save_view_state
+        .character_state
+        .ability_points_input = save.character_data.ability_points();
+
     manage_save_state
         .save_view_state
         .character_state
@@ -178,6 +183,13 @@ pub fn map_character_state_to_save(
             .player_class_selected_class,
     )?;
 
+    save.character_data.set_ability_points(
+        manage_save_state
+            .save_view_state
+            .character_state
+            .ability_points_input,
+    )?;
+
     save.character_data.set_head_skin_selected(
         &manage_save_state
             .save_view_state

bl3_save_edit_ui/src/views/manage_save/character/mod.rs

@@ -34,7 +34,9 @@ pub struct CharacterState {
     pub level_input: i32,
     pub xp_level_input_state: text_input::State,
     pub experience_points_input: i32,
-    pub xp_points_input_state: text_input::State,
+    pub experience_points_input_state: text_input::State,
+    pub ability_points_input: i32,
+    pub ability_points_input_state: text_input::State,
     pub skin_selectors: SkinSelectors,
     pub gear_unlocker: GearUnlocker,
     pub ammo_setter: AmmoSetter,
@@ -44,8 +46,9 @@ pub struct CharacterState {
 #[derive(Debug, Clone)]
 pub enum SaveCharacterInteractionMessage {
     Name(String),
-    XpLevel(i32),
-    XpPoints(i32),
+    Level(i32),
+    ExperiencePoints(i32),
+    AbilityPoints(i32),
     PlayerClassSelected(PlayerClass),
     SkinMessage(CharacterSkinSelectedMessage),
     GearMessage(CharacterGearUnlockedMessage),
@@ -176,7 +179,7 @@ pub fn view(character_state: &mut CharacterState) -> Container<Bl3Message> {
         .push(player_class)
         .spacing(20);
 
-    let xp_level = Container::new(
+    let level = Container::new(
         LabelledElement::create(
             "Level",
             Length::Units(60),
@@ -189,7 +192,7 @@ pub fn view(character_state: &mut CharacterState) -> Container<Bl3Message> {
                     |v| {
                         InteractionMessage::ManageSaveInteraction(
                             ManageSaveInteractionMessage::Character(
-                                SaveCharacterInteractionMessage::XpLevel(v),
+                                SaveCharacterInteractionMessage::Level(v),
                             ),
                         )
                     },
@@ -216,20 +219,20 @@ pub fn view(character_state: &mut CharacterState) -> Container<Bl3Message> {
     .height(Length::Units(36))
     .style(Bl3UiStyle);
 
-    let xp_points = Container::new(
+    let experience_points = Container::new(
         LabelledElement::create(
             "Experience",
             Length::Units(95),
             Tooltip::new(
                 NumberInput::new(
-                    &mut character_state.xp_points_input_state,
+                    &mut character_state.experience_points_input_state,
                     character_state.experience_points_input,
                     0,
                     Some(REQUIRED_XP_LIST[MAX_CHARACTER_LEVEL - 1][0]),
                     |v| {
                         InteractionMessage::ManageSaveInteraction(
                             ManageSaveInteractionMessage::Character(
-                                SaveCharacterInteractionMessage::XpPoints(v),
+                                SaveCharacterInteractionMessage::ExperiencePoints(v),
                             ),
                         )
                     },
@@ -256,7 +259,42 @@ pub fn view(character_state: &mut CharacterState) -> Container<Bl3Message> {
     .height(Length::Units(36))
     .style(Bl3UiStyle);
 
-    let xp_row = Row::new().push(xp_level).push(xp_points).spacing(20);
+    let ability_points = Container::new(
+        LabelledElement::create(
+            "Ability Points",
+            Length::Units(130),
+            NumberInput::new(
+                &mut character_state.ability_points_input_state,
+                character_state.ability_points_input,
+                0,
+                Some(i32::MAX),
+                |v| {
+                    InteractionMessage::ManageSaveInteraction(
+                        ManageSaveInteractionMessage::Character(
+                            SaveCharacterInteractionMessage::AbilityPoints(v),
+                        ),
+                    )
+                },
+            )
+            .0
+            .font(JETBRAINS_MONO)
+            .padding(10)
+            .size(17)
+            .style(Bl3UiStyle)
+            .into_element(),
+        )
+        .spacing(15)
+        .align_items(Align::Center),
+    )
+    .width(Length::Fill)
+    .height(Length::Units(36))
+    .style(Bl3UiStyle);
+
+    let experience_and_level_row = Row::new()
+        .push(level)
+        .push(experience_points)
+        .push(ability_points)
+        .spacing(20);
 
     let skin_unlocker = character_state.skin_selectors.view(&selected_class);
 
@@ -283,7 +321,7 @@ pub fn view(character_state: &mut CharacterState) -> Container<Bl3Message> {
 
     let all_contents = Column::new()
         .push(name_class_row)
-        .push(xp_row)
+        .push(experience_and_level_row)
         .push(skin_unlocker)
         .push(slot_sdu_row)
         .spacing(20);