Added new Caprice models from companion

Ariemeth · Jan 10, 2024 · cebaa58 · cebaa58
1 parent 127c49b
commit cebaa58
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 2 deletions.
diff --git a/assets/data/units/caprice.json b/assets/data/units/caprice.json
@@ -168,6 +168,230 @@
         }
       ]
     },
+    {
+      "name": "F-32 Maru",
+      "variants": [
+        {
+          "model": "Maru",
+          "tv": 5,
+          "role": "GP, SK, FS",
+          "mr": "W:7",
+          "arm": 5,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "LSMG (AI), MP, LSG",
+          "mounted-weapons": "LHG, LAPGL",
+          "traits": "Hands, Climber",
+          "type": "Gear",
+          "height": 1
+        },
+        {
+          "model": "Maru Sniper",
+          "tv": 6,
+          "role": "GP, SK, FS",
+          "mr": "W:7",
+          "arm": 5,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "LRF, MP, LSG",
+          "mounted-weapons": "LHG, LAPGL",
+          "traits": "Hands, Climber",
+          "type": "Gear",
+          "height": 1
+        },
+        {
+          "model": "Maru Rex",
+          "tv": 6,
+          "role": "GP, SK, FS",
+          "mr": "W:7",
+          "arm": 5,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "LSC, MP, LSG",
+          "mounted-weapons": "LHG, LAPGL",
+          "traits": "Hands, Climber",
+          "type": "Gear",
+          "height": 1
+        }
+      ]
+    },
+    {
+      "name": "F-55 Zikru",
+      "variants": [
+        {
+          "model": "Zikru",
+          "tv": 7,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 6,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "5+",
+          "react-weapons": "LAC, MP, MCW (Demo:4), LSG",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Climber, Sensors:24",
+          "type": "Gear",
+          "height": 1.5
+        },
+        {
+          "model": "Zikru Stalker",
+          "tv": 7,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 6,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "5+",
+          "react-weapons": "MFC, MP, MCW (Demo:4), LSG",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Climber, Sensors:24",
+          "type": "Gear",
+          "height": 1.5
+        },
+        {
+          "model": "Zikru Thumper",
+          "tv": 8,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 6,
+          "h/s": "3/3",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "5+",
+          "react-weapons": "LGL, MP, MCW (Demo:4), LSG",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Climber, Sensors:24",
+          "type": "Gear",
+          "height": 1.5
+        }
+      ]
+    },
+    {
+      "name": "F-27 Sarru",
+      "variants": [
+        {
+          "model": "Sarru",
+          "tv": 14,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 8,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "HAC, MP, HCW (Demo:4), LSG",
+          "mounted-weapons": "LATM (Link), MHG, MAPGL",
+          "traits": "Hands, Climber, Brawl:2, React+",
+          "type": "Gear",
+          "height": 2
+        },
+        {
+          "model": "Sarru Warranter",
+          "tv": 14,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 8,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "HRC, MP, HCW (Demo:4), LSG",
+          "mounted-weapons": "LATM (Link), MHG, MAPGL",
+          "traits": "Hands, Climber, Brawl:2, React+",
+          "type": "Gear",
+          "height": 2
+        },
+        {
+          "model": "Sarru Quasar",
+          "tv": 14,
+          "role": "GP, SK, FS",
+          "mr": "W:6",
+          "arm": 8,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "4+",
+          "ew": "6+",
+          "react-weapons": "LRG, MP, HCW (Demo:4), LSG",
+          "mounted-weapons": "LATM (Link), MHG, MAPGL",
+          "traits": "Hands, Climber, Brawl:2, React+",
+          "type": "Gear",
+          "height": 2
+        }
+      ]
+    },
+    {
+      "name": "F-112 Rabbu",
+      "variants": [
+        {
+          "model": "Rabbu",
+          "tv": 10,
+          "role": "GP, SK, FS",
+          "mr": "W/G:8",
+          "arm": 6,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "3+",
+          "ew": "6+",
+          "react-weapons": "MAC, MP, MCW (Demo:4)",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Stable, Brawl:1",
+          "type": "Gear",
+          "height": 1.5
+        },
+        {
+          "model": "Rabbu Warranter",
+          "tv": 10,
+          "role": "GP, SK, FS",
+          "mr": "W/G:8",
+          "arm": 6,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "3+",
+          "ew": "6+",
+          "react-weapons": "HSMG, MP, MCW (Demo:4)",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Stable, Brawl:1",
+          "type": "Gear",
+          "height": 1.5
+        },
+        {
+          "model": "Rabbu Sniper",
+          "tv": 11,
+          "role": "GP, SK, FS",
+          "mr": "W/G:8",
+          "arm": 6,
+          "h/s": "4/2",
+          "a": 1,
+          "gu": "4+",
+          "pi": "3+",
+          "ew": "6+",
+          "react-weapons": "HRF, MP, MCW (Demo:4)",
+          "mounted-weapons": "LHG, MAPGL",
+          "traits": "Hands, Stable, Brawl:1",
+          "type": "Gear",
+          "height": 1.5
+        }
+      ]
+    },
     {
       "name": "Kadesh",
       "variants": [

diff --git a/lib/models/mods/unitUpgrades/caprice.dart b/lib/models/mods/unitUpgrades/caprice.dart
@@ -23,3 +23,21 @@ final UnitModification command2 = UnitModification(name: 'Command Upgrade')
   ..addMod(UnitAttribute.ew, createSetIntMod(4), description: 'EW 4+')
   ..addMod(UnitAttribute.traits, createAddTraitToList(Trait.Comms()),
       description: '+Comms');
+
+final UnitModification jammer = UnitModification(name: 'Jammer Upgrade')
+  ..addMod(UnitAttribute.tv, createSimpleIntMod(2), description: 'TV +2')
+  ..addMod(UnitAttribute.name, createSimpleStringMod(false, 'Jammer'))
+  ..addMod(UnitAttribute.ew, createSetIntMod(4), description: 'EW 4+')
+  ..addMod(UnitAttribute.traits, createAddTraitToList(Trait.ECM()),
+      description: '+ECM')
+  ..addMod(UnitAttribute.traits, createAddTraitToList(Trait.ECCM()),
+      description: '+ECCM')
+  ..addMod(UnitAttribute.traits, createAddTraitToList(Trait.Sensors(36)),
+      description: '+Sensors:36');
+
+final UnitModification command3 = UnitModification(name: 'Command Upgrade')
+  ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1')
+  ..addMod(UnitAttribute.name, createSimpleStringMod(true, 'Command'))
+  ..addMod(UnitAttribute.ew, createSetIntMod(5), description: 'EW 5+')
+  ..addMod(UnitAttribute.traits, createAddTraitToList(Trait.Comms()),
+      description: '+Comms');
diff --git a/lib/models/mods/unitUpgrades/unit_upgrades.dart b/lib/models/mods/unitUpgrades/unit_upgrades.dart
@@ -213,6 +213,10 @@ List<UnitModification> getUnitMods(String frameName, Unit unit) {
       return [caprice.command2];
     case 'moab':
       return [caprice.command2];
+    case 'f-55 zikru':
+      return [caprice.command2, caprice.jammer];
+    case 'f-112 rabbu':
+      return [caprice.command3];
 
     // Utopia
     case 'commando armiger': //

diff --git a/lib/screens/roster/roster.dart b/lib/screens/roster/roster.dart
@@ -18,7 +18,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 = '0.101.0';
+const String _version = '0.102.0';
 const String _bugEmailAddress = '[email protected]';
 const String _dp9URL = 'https://www.dp9.com/';
 const String _sourceCodeURL = 'https://github.com/Ariemeth/gearforce-flutter';

diff --git a/pubspec.yaml b/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: 0.101.0
+version: 0.102.0
 
 environment:
   sdk: ">=3.0.0"