Set ability points after switching class

Author: ZakisM

bl3_save_edit_core/src/bl3_save/character_data.rs

@@ -367,8 +367,6 @@ impl CharacterData {
     }
 
     pub fn set_player_class(&mut self, player_class: PlayerClass) -> Result<()> {
-        self.player_class = player_class;
-
         let player_class_data = self
             .character
             .player_class_data
@@ -377,6 +375,18 @@ impl CharacterData {
 
         player_class_data.player_class_path = player_class.get_serializations()[0].to_string();
 
+        let ability_data = self
+            .character
+            .ability_data
+            .as_mut()
+            .context("failed to read Player ability data")?;
+
+        if self.player_level > 2 {
+            ability_data.ability_points = self.player_level - 2;
+        }
+
+        self.player_class = player_class;
+
         Ok(())
     }
 

bl3_save_edit_ui/src/state_mappers/manage_save/character.rs

@@ -164,18 +164,18 @@ pub fn map_character_state_to_save(
         .name_input
         .clone();
 
-    save.character_data.set_player_class(
+    save.character_data.set_player_level(
         manage_save_state
             .save_view_state
             .character_state
-            .player_class_selected_class,
+            .experience_points_input,
     )?;
 
-    save.character_data.set_player_level(
+    save.character_data.set_player_class(
         manage_save_state
             .save_view_state
             .character_state
-            .experience_points_input,
+            .player_class_selected_class,
     )?;
 
     save.character_data.set_head_skin_selected(