Merge pull request #26 from ZakisM/development

Merge development to master

Author: ZakisM

Cargo.lock

@@ -10,7 +10,7 @@ use serde::Deserialize;
 use strum::{Display, EnumString};
 use tracing::warn;
 
-use crate::bl3_save::arbitrary_bits::{ArbitraryBitVec, ArbitraryBits};
+use crate::arbitrary_bits::{ArbitraryBitVec, ArbitraryBits};
 use crate::game_data::{BALANCE_NAME_MAPPING, BALANCE_TO_INV_KEY};
 use crate::parser::read_be_signed_int;
 use crate::resources::{
@@ -172,7 +172,7 @@ pub enum WeaponType {
     Shotgun,
     #[strum(to_string = "SMG")]
     Smg,
-    #[strum(to_string = "AR")]
+    #[strum(to_string = "Assault Rifle")]
     Ar,
     #[strum(to_string = "Sniper")]
     Sniper,

bl3_save_edit_core/src/bl3_save/arbitrary_bits.rs renamed to bl3_save_edit_core/src/arbitrary_bits.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_core/src/bl3_item.rs

@@ -13,7 +13,6 @@ use crate::parser::{decrypt, encrypt, HeaderType};
 use crate::{file_helper, parser};
 
 pub mod ammo;
-pub mod arbitrary_bits;
 pub mod challenge_data;
 pub mod character_data;
 pub mod fast_travel_unlock_data;

bl3_save_edit_core/src/bl3_save/character_data.rs

@@ -1,3 +1,4 @@
+pub mod arbitrary_bits;
 pub mod bl3_item;
 pub mod bl3_profile;
 pub mod bl3_save;