Units that have an inherent SP no longer have that SP doubled

issue found by RoBear and verified by Jaeton

lib/models/unit/unit.dart

@@ -453,32 +453,30 @@ class Unit extends ChangeNotifier {
     if (commandLevel != CommandLevel.none) {
       // all commanders get 1 base cp
       cp = cp + 1;
-      cp = cp + _calculateSkillPoints();
+      // commanders convert their sp to cp
+      cp = cp + skillPoints;
     }
 
     return cp;
   }
 
   int get skillPoints {
-    return _calculateSkillPoints();
-  }
-
-  int _calculateSkillPoints() {
-    var sp = core.attribute(UnitAttribute.sp);
+    var sp = 0;
 
     for (var mod in this._mods) {
       sp = mod.applyMods(UnitAttribute.sp, sp);
     }
 
-    final numSPMods =
-        traits.where((trait) => trait.isSameType(Trait.SP(0))).length;
-
-    sp += numSPMods;
-
-    if (isVeteran) {
+    if (this.isVeteran) {
       sp += 1;
     }
 
+    for (var trait in this.traits) {
+      if (trait.isSameType(Trait.SP(0))) {
+        sp += trait.level ?? 0;
+      }
+    }
+
     return sp;
   }
 

lib/screens/roster/roster.dart

@@ -21,7 +21,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 const double _leftPanelWidth = 670.0;
 const double _titleHeight = 40.0;
 const double _menuTitleHeight = 50.0;
-const String _version = '1.2.23';
+const String _version = '1.2.24';
 const String _bugEmailAddress = '[email protected]';
 const String _dp9URL = 'https://www.dp9.com/';
 const String _sourceCodeURL = 'https://github.com/Ariemeth/gearforce-flutter';

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.2.23
+version: 1.2.24
 environment:
   sdk: ">=3.0.0"