Merge pull request #419 from Ariemeth/fix_upgrade_names

Fixed upgrade names for dark hyena and valence
Ariemeth · Nov 5, 2024 · ef7a45b · ef7a45b
2 parents 04ec7a2 + 903e87c
commit ef7a45b
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 67 deletions.
diff --git a/lib/v3/models/mods/unitUpgrades/black_talon.dart b/lib/v3/models/mods/unitUpgrades/black_talon.dart
@@ -148,7 +148,7 @@ final UnitModification theta = UnitModification(name: 'Theta Upgrade')
           oldValue: buildWeapon('MGM')!, newValue: buildWeapon('MATM')!),
       description: '-MGM, +MATM');
 
-final UnitModification spectre = UnitModification(name: 'Spectra Upgrade')
+final UnitModification spectre = UnitModification(name: 'Spectre Upgrade')
   ..addMod(UnitAttribute.tv, createSimpleIntMod(2), description: 'TV +2')
   ..addMod(UnitAttribute.name, createSimpleStringMod(true, 'Spectre'))
   ..addMod(UnitAttribute.ew, createSetIntMod(3), description: 'EW 3+')

diff --git a/lib/v3/models/mods/unitUpgrades/unit_upgrades.dart b/lib/v3/models/mods/unitUpgrades/unit_upgrades.dart
@@ -320,7 +320,11 @@ List<UnitModification> getUnitMods(Unit unit) {
     case 'druid':
       return [eden.hydor];
     case 'valence':
-      return [universal.maulerFistSwap, universal.valenceClawSwap];
+      return [
+        universal.maulerFistSwap,
+        universal.sawBladeSwap,
+        universal.valenceClawSwap
+      ];
     case 'bricklayer':
       return [universal.sawBladeSwap, universal.vibroswordSwap];
     case 'engineering grizzly':

diff --git a/lib/v3/models/mods/unitUpgrades/universal.dart b/lib/v3/models/mods/unitUpgrades/universal.dart
@@ -13,6 +13,10 @@ import 'package:gearforce/v3/models/weapons/weapons.dart';
 final UnitModification sawBladeSwap = UnitModification(
     name: 'Saw Blade Swap',
     requirementCheck: (RuleSet? rs, UnitRoster? ur, CombatGroup? cg, Unit u) {
+      if (u.hasMod(maulerFistSwap.id)) {
+        return false;
+      }
+
       final hasMCW = u
           .attribute<List<Weapon>>(UnitAttribute.weapons,
               modIDToSkip: sawBladeSwap.id)
@@ -122,6 +126,10 @@ final UnitModification heavyChainswordSwap = UnitModification(
 final UnitModification maulerFistSwap = UnitModification(
     name: 'Mauler Fist Swap',
     requirementCheck: (RuleSet? rs, UnitRoster? ur, CombatGroup? cg, Unit u) {
+      if (u.hasMod(sawBladeSwap.id)) {
+        return false;
+      }
+
       final hasMCW = u
           .attribute<List<Weapon>>(UnitAttribute.weapons,
               modIDToSkip: maulerFistSwap.id)