diff --git a/lib/main.dart b/lib/main.dart index bbc6c881..4ce85b4c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,81 +1,93 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/screens/roster/roster.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/screens/roster/roster.dart'; import 'package:gearforce/widgets/roster_id.dart'; import 'package:gearforce/widgets/settings.dart'; +import 'package:gearforce/widgets/version_selector.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; +const _title = 'Gearforce'; + Future main() async { WidgetsFlutterBinding.ensureInitialized(); final baseUri = Uri.base; final idParam = baseUri.queryParameters['id']; - - if (idParam != null && idParam.isNotEmpty) { - print('loading id: $idParam'); - } - final appInfo = await PackageInfo.fromPlatform(); - final settings = Settings(); - await settings.load(); - var data = Data(); - data.load(settings).whenComplete(() { - runApp(MultiProvider( - providers: [ - Provider(create: (_) => data), - Provider(create: (_) => settings), - ], - child: GearForce( - data: data, - rosterId: RosterId(idParam), - version: appInfo.version, - settings: settings, + final versionSelector = VersionSelector(); + + final app = MaterialApp( + title: _title, + theme: ThemeData( + useMaterial3: true, + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.blue, + surface: Colors.white, + primary: Colors.blue, ), - )); - }); + ), + initialRoute: '/v3.1', + routes: { + '/v3.1': (context) => GearForceV3( + rosterId: RosterId(idParam), + version: appInfo.version, + versionSelector: versionSelector, + ), + }, + ); + + runApp(app); } -class GearForce extends StatefulWidget { - const GearForce({ +class GearForceV3 extends StatefulWidget { + const GearForceV3({ Key? key, - required this.data, required this.rosterId, required this.version, - required this.settings, + required this.versionSelector, }) : super(key: key); - final Data data; final RosterId rosterId; final String version; - final Settings settings; + final VersionSelector versionSelector; + @override - _GearForceState createState() => _GearForceState(); + _GearForceV3State createState() => _GearForceV3State(); } -class _GearForceState extends State { - _GearForceState(); +class _GearForceV3State extends State { + _GearForceV3State(); + + final Settings _settings = Settings(); + final DataV3 _data = DataV3(); + + @override + void initState() { + super.initState(); + _settings.load().then((_) { + _data.load(_settings).whenComplete(() { + setState(() {}); + }); + }); + } @override Widget build(BuildContext context) { final title = 'Gearforce'; - return MaterialApp( - title: title, - theme: ThemeData( - useMaterial3: true, - colorScheme: ColorScheme.fromSeed( - seedColor: Colors.blue, - surface: Colors.white, - primary: Colors.blue, - ), - ), - home: RosterWidget( + return MultiProvider( + providers: [ + Provider(create: (_) => _data), + Provider(create: (_) => _settings), + ], + child: RosterWidget( title: title, - data: widget.data, + data: _data, rosterId: widget.rosterId, version: widget.version, - settings: widget.settings, + settings: _settings, + versionSelector: widget.versionSelector, ), ); } diff --git a/lib/data/data.dart b/lib/v3/data/data.dart similarity index 92% rename from lib/data/data.dart rename to lib/v3/data/data.dart index 6eab632e..1cb66c3b 100644 --- a/lib/data/data.dart +++ b/lib/v3/data/data.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:flutter/services.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/unit/frame.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/unit/frame.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:gearforce/widgets/settings.dart'; const Map _factionUnitFiles = { @@ -27,7 +27,7 @@ const Map _factionUnitFiles = { FactionType.Utopia: 'assets/data/units/utopia.json', }; -class Data { +class DataV3 { late List _factions = []; final Map> _factionFrames = {}; diff --git a/lib/data/unit_filter.dart b/lib/v3/data/unit_filter.dart similarity index 88% rename from lib/data/unit_filter.dart rename to lib/v3/data/unit_filter.dart index 4a9062b4..2f7d6558 100644 --- a/lib/data/unit_filter.dart +++ b/lib/v3/data/unit_filter.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; class UnitFilter { final FactionType faction; diff --git a/lib/models/combatGroups/combat_group.dart b/lib/v3/models/combatGroups/combat_group.dart similarity index 92% rename from lib/models/combatGroups/combat_group.dart rename to lib/v3/models/combatGroups/combat_group.dart index 49693416..13c6aa3c 100644 --- a/lib/models/combatGroups/combat_group.dart +++ b/lib/v3/models/combatGroups/combat_group.dart @@ -1,18 +1,18 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; class CombatGroup extends ChangeNotifier { Group _primary = Group(GroupType.Primary); @@ -135,7 +135,7 @@ class CombatGroup extends ChangeNotifier { factory CombatGroup.fromJson( dynamic json, - Data data, + DataV3 data, Faction faction, RuleSet ruleset, UnitRoster roster, diff --git a/lib/models/combatGroups/group.dart b/lib/v3/models/combatGroups/group.dart similarity index 91% rename from lib/models/combatGroups/group.dart rename to lib/v3/models/combatGroups/group.dart index 7428f2f9..99229776 100644 --- a/lib/models/combatGroups/group.dart +++ b/lib/v3/models/combatGroups/group.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const RoleType _defaultRoleType = RoleType.GP; diff --git a/lib/models/factions/faction.dart b/lib/v3/models/factions/faction.dart similarity index 73% rename from lib/models/factions/faction.dart rename to lib/v3/models/factions/faction.dart index 27fb4a2e..83dab367 100644 --- a/lib/models/factions/faction.dart +++ b/lib/v3/models/factions/faction.dart @@ -1,16 +1,16 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart'; -import 'package:gearforce/models/rules/rulesets/leagueless/leagueless.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/utopia.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart'; +import 'package:gearforce/v3/models/rules/rulesets/leagueless/leagueless.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/utopia.dart'; import 'package:gearforce/widgets/settings.dart'; const String _emptySubFactionName = ''; @@ -23,7 +23,7 @@ class Faction { const Faction(this.factionType, this.rulesets, this.defaultSubFaction); - factory Faction.blackTalons(Data data, Settings settings) { + factory Faction.blackTalons(DataV3 data, Settings settings) { final rulesets = [ BlackTalons(data, settings, name: _emptySubFactionName), BlackTalons.BTRT(data, settings), @@ -33,7 +33,7 @@ class Faction { ]; return Faction(FactionType.BlackTalon, rulesets, rulesets.first); } - factory Faction.caprice(Data data, Settings settings) { + factory Faction.caprice(DataV3 data, Settings settings) { final rulesets = [ Caprice(data, settings, name: _emptySubFactionName), Caprice.CID(data, settings), @@ -42,7 +42,7 @@ class Faction { ]; return Faction(FactionType.Caprice, rulesets, rulesets.first); } - factory Faction.cef(Data data, Settings settings) { + factory Faction.cef(DataV3 data, Settings settings) { final rulesets = [ CEF(data, settings, name: _emptySubFactionName), CEF.CEFFF(data, settings), @@ -51,7 +51,7 @@ class Faction { ]; return Faction(FactionType.CEF, rulesets, rulesets.first); } - factory Faction.eden(Data data, Settings settings) { + factory Faction.eden(DataV3 data, Settings settings) { final rulesets = [ Eden(data, settings, name: _emptySubFactionName), Eden.EIF(data, settings), @@ -60,7 +60,7 @@ class Faction { ]; return Faction(FactionType.Eden, rulesets, rulesets.first); } - factory Faction.north(Data data, Settings settings) { + factory Faction.north(DataV3 data, Settings settings) { final rulesets = [ North(data, settings, name: _emptySubFactionName), North.NG(data, settings), @@ -70,7 +70,7 @@ class Faction { ]; return Faction(FactionType.North, rulesets, rulesets.first); } - factory Faction.nucoal(Data data, Settings settings) { + factory Faction.nucoal(DataV3 data, Settings settings) { final rulesets = [ NuCoal(data, settings, name: _emptySubFactionName), NuCoal.NSDF(data, settings), @@ -82,7 +82,7 @@ class Faction { ]; return Faction(FactionType.NuCoal, rulesets, rulesets.first); } - factory Faction.peaceRiver(Data data, Settings settings) { + factory Faction.peaceRiver(DataV3 data, Settings settings) { final rulesets = [ PeaceRiver(data, settings, name: _emptySubFactionName), PeaceRiver.PRDF(data, settings), @@ -91,7 +91,7 @@ class Faction { ]; return Faction(FactionType.PeaceRiver, rulesets, rulesets.first); } - factory Faction.south(Data data, Settings settings) { + factory Faction.south(DataV3 data, Settings settings) { final rulesets = [ South(data, settings, name: _emptySubFactionName), South.SRA(data, settings), @@ -102,7 +102,7 @@ class Faction { ]; return Faction(FactionType.South, rulesets, rulesets.first); } - factory Faction.utopia(Data data, Settings settings) { + factory Faction.utopia(DataV3 data, Settings settings) { final rulesets = [ Utopia(data, settings, name: _emptySubFactionName), Utopia.CAF(data, settings), @@ -111,7 +111,7 @@ class Faction { return Faction(FactionType.Utopia, rulesets, rulesets.first); } - factory Faction.leagueless(Data data, Settings settings) { + factory Faction.leagueless(DataV3 data, Settings settings) { final rulesets = [ Leagueless.North(data, settings), Leagueless.South(data, settings), @@ -122,7 +122,8 @@ class Faction { return Faction(FactionType.Leagueless, rulesets, rulesets.first); } - factory Faction.fromType(FactionType faction, Data data, Settings settings) { + factory Faction.fromType( + FactionType faction, DataV3 data, Settings settings) { switch (faction) { case FactionType.North: return Faction.north(data, settings); diff --git a/lib/models/factions/faction_type.dart b/lib/v3/models/factions/faction_type.dart similarity index 100% rename from lib/models/factions/faction_type.dart rename to lib/v3/models/factions/faction_type.dart diff --git a/lib/models/mods/base_modification.dart b/lib/v3/models/mods/base_modification.dart similarity index 87% rename from lib/models/mods/base_modification.dart rename to lib/v3/models/mods/base_modification.dart index d83efd35..655e2d41 100644 --- a/lib/models/mods/base_modification.dart +++ b/lib/v3/models/mods/base_modification.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/saved_mod.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/saved_mod.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; typedef RequirementCheck = bool Function( RuleSet, diff --git a/lib/models/mods/customUpgrades/custom_modifiation.dart b/lib/v3/models/mods/customUpgrades/custom_modifiation.dart similarity index 85% rename from lib/models/mods/customUpgrades/custom_modifiation.dart rename to lib/v3/models/mods/customUpgrades/custom_modifiation.dart index 1330e57f..646dfa9a 100644 --- a/lib/models/mods/customUpgrades/custom_modifiation.dart +++ b/lib/v3/models/mods/customUpgrades/custom_modifiation.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; const _customIDBase = 'mod::custom'; diff --git a/lib/models/mods/customUpgrades/custom_uprades.dart b/lib/v3/models/mods/customUpgrades/custom_uprades.dart similarity index 82% rename from lib/models/mods/customUpgrades/custom_uprades.dart rename to lib/v3/models/mods/customUpgrades/custom_uprades.dart index 03828466..70749b5c 100644 --- a/lib/models/mods/customUpgrades/custom_uprades.dart +++ b/lib/v3/models/mods/customUpgrades/custom_uprades.dart @@ -1,4 +1,4 @@ -import 'package:gearforce/models/mods/customUpgrades/custom_modifiation.dart'; +import 'package:gearforce/v3/models/mods/customUpgrades/custom_modifiation.dart'; import 'package:gearforce/widgets/settings.dart'; List getCustomMods(Settings settings) { diff --git a/lib/models/mods/duelist/duelist_modification.dart b/lib/v3/models/mods/duelist/duelist_modification.dart similarity index 96% rename from lib/models/mods/duelist/duelist_modification.dart rename to lib/v3/models/mods/duelist/duelist_modification.dart index 914e8b87..70f39741 100644 --- a/lib/models/mods/duelist/duelist_modification.dart +++ b/lib/v3/models/mods/duelist/duelist_modification.dart @@ -1,21 +1,21 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart' +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart' as vetMod; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _duelistIDBase = 'mod::duelist'; diff --git a/lib/models/mods/duelist/duelist_upgrades.dart b/lib/v3/models/mods/duelist/duelist_upgrades.dart similarity index 87% rename from lib/models/mods/duelist/duelist_upgrades.dart rename to lib/v3/models/mods/duelist/duelist_upgrades.dart index c62c7e85..f2842253 100644 --- a/lib/models/mods/duelist/duelist_upgrades.dart +++ b/lib/v3/models/mods/duelist/duelist_upgrades.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; List getDuelistMods( Unit u, diff --git a/lib/models/mods/factionUpgrades/black_talon.dart b/lib/v3/models/mods/factionUpgrades/black_talon.dart similarity index 84% rename from lib/models/mods/factionUpgrades/black_talon.dart rename to lib/v3/models/mods/factionUpgrades/black_talon.dart index f1f64cc6..bb163e06 100644 --- a/lib/models/mods/factionUpgrades/black_talon.dart +++ b/lib/v3/models/mods/factionUpgrades/black_talon.dart @@ -1,15 +1,15 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btit.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btrt.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btit.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btrt.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; const _baseFactionModId = 'mod::faction::blackTalon'; const theChosenId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/caprice.dart b/lib/v3/models/mods/factionUpgrades/caprice.dart similarity index 80% rename from lib/models/mods/factionUpgrades/caprice.dart rename to lib/v3/models/mods/factionUpgrades/caprice.dart index ff61d731..d0ec4547 100644 --- a/lib/models/mods/factionUpgrades/caprice.dart +++ b/lib/v3/models/mods/factionUpgrades/caprice.dart @@ -1,16 +1,16 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/cid.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/cid.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; const _baseFactionModId = 'mod::faction::caprice'; const cyberneticUpgradesId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/cef.dart b/lib/v3/models/mods/factionUpgrades/cef.dart similarity index 89% rename from lib/models/mods/factionUpgrades/cef.dart rename to lib/v3/models/mods/factionUpgrades/cef.dart index af7c75ca..050a5d85 100644 --- a/lib/models/mods/factionUpgrades/cef.dart +++ b/lib/v3/models/mods/factionUpgrades/cef.dart @@ -1,18 +1,18 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cefff.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cefff.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; const _baseFactionModId = 'mod::faction::cef'; const minveraId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/eden.dart b/lib/v3/models/mods/factionUpgrades/eden.dart similarity index 85% rename from lib/models/mods/factionUpgrades/eden.dart rename to lib/v3/models/mods/factionUpgrades/eden.dart index f92cae01..ceadec5c 100644 --- a/lib/models/mods/factionUpgrades/eden.dart +++ b/lib/v3/models/mods/factionUpgrades/eden.dart @@ -1,26 +1,26 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/mods/unitUpgrades/universal.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/eden/aef.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eif.dart'; -import 'package:gearforce/models/rules/rulesets/eden/enh.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/universal.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/aef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eif.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/enh.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _baseFactionModId = 'mod::faction::eden'; const lancersId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/faction_mod.dart b/lib/v3/models/mods/factionUpgrades/faction_mod.dart similarity index 84% rename from lib/models/mods/factionUpgrades/faction_mod.dart rename to lib/v3/models/mods/factionUpgrades/faction_mod.dart index 09ec0a3f..58862bad 100644 --- a/lib/models/mods/factionUpgrades/faction_mod.dart +++ b/lib/v3/models/mods/factionUpgrades/faction_mod.dart @@ -1,17 +1,17 @@ -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/black_talon.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart'; -import 'package:gearforce/models/mods/factionUpgrades/cef.dart'; -import 'package:gearforce/models/mods/factionUpgrades/eden.dart'; -import 'package:gearforce/models/mods/factionUpgrades/leagueless.dart'; -import 'package:gearforce/models/mods/factionUpgrades/north.dart'; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/mods/factionUpgrades/peace_river.dart'; -import 'package:gearforce/models/mods/factionUpgrades/south.dart'; -import 'package:gearforce/models/mods/factionUpgrades/utopia.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/black_talon.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/cef.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/eden.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/leagueless.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/north.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/peace_river.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/south.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/utopia.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; class FactionModification extends BaseModification { FactionModification({ diff --git a/lib/models/mods/factionUpgrades/leagueless.dart b/lib/v3/models/mods/factionUpgrades/leagueless.dart similarity index 87% rename from lib/models/mods/factionUpgrades/leagueless.dart rename to lib/v3/models/mods/factionUpgrades/leagueless.dart index 89701e97..14483a71 100644 --- a/lib/models/mods/factionUpgrades/leagueless.dart +++ b/lib/v3/models/mods/factionUpgrades/leagueless.dart @@ -1,15 +1,15 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/leagueless/leagueless.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/leagueless/leagueless.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _baseFactionModId = 'mod::faction::leagueless'; const olRustyId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/north.dart b/lib/v3/models/mods/factionUpgrades/north.dart similarity index 90% rename from lib/models/mods/factionUpgrades/north.dart rename to lib/v3/models/mods/factionUpgrades/north.dart index 95426268..96e489d0 100644 --- a/lib/models/mods/factionUpgrades/north.dart +++ b/lib/v3/models/mods/factionUpgrades/north.dart @@ -1,24 +1,24 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/north/nlc.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/rules/rulesets/north/umf.dart'; -import 'package:gearforce/models/rules/rulesets/north/wfp.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/nlc.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/umf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/wfp.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _baseFactionModId = 'mod::faction::northern'; const taskBuiltID = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/nucoal.dart b/lib/v3/models/mods/factionUpgrades/nucoal.dart similarity index 90% rename from lib/models/mods/factionUpgrades/nucoal.dart rename to lib/v3/models/mods/factionUpgrades/nucoal.dart index f648f2b5..c143fd19 100644 --- a/lib/models/mods/factionUpgrades/nucoal.dart +++ b/lib/v3/models/mods/factionUpgrades/nucoal.dart @@ -1,21 +1,21 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/hcsa.dart' as hcsa; -import 'package:gearforce/models/rules/rulesets/nucoal/nsdf.dart' as nsdf; -import 'package:gearforce/models/rules/rulesets/nucoal/pak.dart' as pak; -import 'package:gearforce/models/rules/rulesets/nucoal/th.dart' as th; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/hcsa.dart' as hcsa; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nsdf.dart' as nsdf; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/pak.dart' as pak; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/th.dart' as th; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; const _baseFactionModId = 'mod::faction::nucoal'; const highSpeedLowDragId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/peace_river.dart b/lib/v3/models/mods/factionUpgrades/peace_river.dart similarity index 93% rename from lib/models/mods/factionUpgrades/peace_river.dart rename to lib/v3/models/mods/factionUpgrades/peace_river.dart index 04e22d6c..de0d98ba 100644 --- a/lib/models/mods/factionUpgrades/peace_river.dart +++ b/lib/v3/models/mods/factionUpgrades/peace_river.dart @@ -1,21 +1,21 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/prdf.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/prdf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _baseFactionModId = 'mod::faction::peace river'; diff --git a/lib/models/mods/factionUpgrades/south.dart b/lib/v3/models/mods/factionUpgrades/south.dart similarity index 90% rename from lib/models/mods/factionUpgrades/south.dart rename to lib/v3/models/mods/factionUpgrades/south.dart index c6c07a1e..5138d74c 100644 --- a/lib/models/mods/factionUpgrades/south.dart +++ b/lib/v3/models/mods/factionUpgrades/south.dart @@ -1,21 +1,22 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rulesets/south/md.dart' as md; -import 'package:gearforce/models/rules/rulesets/south/milicia.dart' as milicia; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/rules/rulesets/south/sra.dart' as sra; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/md.dart' as md; +import 'package:gearforce/v3/models/rules/rulesets/south/milicia.dart' + as milicia; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/sra.dart' as sra; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _baseFactionModId = 'mod::faction::southern'; const prideOfTheSouthId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/factionUpgrades/utopia.dart b/lib/v3/models/mods/factionUpgrades/utopia.dart similarity index 91% rename from lib/models/mods/factionUpgrades/utopia.dart rename to lib/v3/models/mods/factionUpgrades/utopia.dart index 2f8cb10b..62a2a3cd 100644 --- a/lib/models/mods/factionUpgrades/utopia.dart +++ b/lib/v3/models/mods/factionUpgrades/utopia.dart @@ -1,17 +1,17 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/caf.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/ouf.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/caf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/ouf.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; const _baseFactionModId = 'mod::faction::utopia'; const quietDeathId = '$_baseFactionModId::10'; diff --git a/lib/models/mods/modification_option.dart b/lib/v3/models/mods/modification_option.dart similarity index 100% rename from lib/models/mods/modification_option.dart rename to lib/v3/models/mods/modification_option.dart diff --git a/lib/models/mods/mods.dart b/lib/v3/models/mods/mods.dart similarity index 96% rename from lib/models/mods/mods.dart rename to lib/v3/models/mods/mods.dart index 82ce409c..e653936f 100644 --- a/lib/models/mods/mods.dart +++ b/lib/v3/models/mods/mods.dart @@ -1,9 +1,9 @@ import 'dart:math'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; int Function(int) createSimpleIntMod( int change, { diff --git a/lib/models/mods/saved_mod.dart b/lib/v3/models/mods/saved_mod.dart similarity index 100% rename from lib/models/mods/saved_mod.dart rename to lib/v3/models/mods/saved_mod.dart diff --git a/lib/models/mods/standardUpgrades/standard_modification.dart b/lib/v3/models/mods/standardUpgrades/standard_modification.dart similarity index 97% rename from lib/models/mods/standardUpgrades/standard_modification.dart rename to lib/v3/models/mods/standardUpgrades/standard_modification.dart index 4b2688c6..12abdb10 100644 --- a/lib/models/mods/standardUpgrades/standard_modification.dart +++ b/lib/v3/models/mods/standardUpgrades/standard_modification.dart @@ -1,16 +1,16 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _standardIDBase = 'mod::standard'; diff --git a/lib/models/mods/standardUpgrades/standard_upgrades.dart b/lib/v3/models/mods/standardUpgrades/standard_upgrades.dart similarity index 88% rename from lib/models/mods/standardUpgrades/standard_upgrades.dart rename to lib/v3/models/mods/standardUpgrades/standard_upgrades.dart index e83bbc74..c5c88c30 100644 --- a/lib/models/mods/standardUpgrades/standard_upgrades.dart +++ b/lib/v3/models/mods/standardUpgrades/standard_upgrades.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; List getStandardMods( Unit u, diff --git a/lib/models/mods/unitUpgrades/black_talon.dart b/lib/v3/models/mods/unitUpgrades/black_talon.dart similarity index 92% rename from lib/models/mods/unitUpgrades/black_talon.dart rename to lib/v3/models/mods/unitUpgrades/black_talon.dart index 1092ce8b..b1f84f22 100644 --- a/lib/models/mods/unitUpgrades/black_talon.dart +++ b/lib/v3/models/mods/unitUpgrades/black_talon.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification psi = UnitModification(name: 'Psi Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/caprice.dart b/lib/v3/models/mods/unitUpgrades/caprice.dart similarity index 86% rename from lib/models/mods/unitUpgrades/caprice.dart rename to lib/v3/models/mods/unitUpgrades/caprice.dart index fd2a0710..0ba07400 100644 --- a/lib/models/mods/unitUpgrades/caprice.dart +++ b/lib/v3/models/mods/unitUpgrades/caprice.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification command = UnitModification(name: 'Command Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/cef.dart b/lib/v3/models/mods/unitUpgrades/cef.dart similarity index 92% rename from lib/models/mods/unitUpgrades/cef.dart rename to lib/v3/models/mods/unitUpgrades/cef.dart index ee302f77..96a59068 100644 --- a/lib/models/mods/unitUpgrades/cef.dart +++ b/lib/v3/models/mods/unitUpgrades/cef.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification command = UnitModification(name: 'Command Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/eden.dart b/lib/v3/models/mods/unitUpgrades/eden.dart similarity index 93% rename from lib/models/mods/unitUpgrades/eden.dart rename to lib/v3/models/mods/unitUpgrades/eden.dart index 953ecc2f..b76b0086 100644 --- a/lib/models/mods/unitUpgrades/eden.dart +++ b/lib/v3/models/mods/unitUpgrades/eden.dart @@ -1,9 +1,9 @@ -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification wizard = UnitModification(name: 'Wizard Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/north.dart b/lib/v3/models/mods/unitUpgrades/north.dart similarity index 93% rename from lib/models/mods/unitUpgrades/north.dart rename to lib/v3/models/mods/unitUpgrades/north.dart index a03747a3..d25ef4bb 100644 --- a/lib/models/mods/unitUpgrades/north.dart +++ b/lib/v3/models/mods/unitUpgrades/north.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification headHunter = UnitModification(name: 'Headhunter Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/nucoal.dart b/lib/v3/models/mods/unitUpgrades/nucoal.dart similarity index 92% rename from lib/models/mods/unitUpgrades/nucoal.dart rename to lib/v3/models/mods/unitUpgrades/nucoal.dart index 9f62696f..7dccb833 100644 --- a/lib/models/mods/unitUpgrades/nucoal.dart +++ b/lib/v3/models/mods/unitUpgrades/nucoal.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification cv = UnitModification(name: 'CV Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/unitUpgrades/peace_river.dart b/lib/v3/models/mods/unitUpgrades/peace_river.dart similarity index 96% rename from lib/models/mods/unitUpgrades/peace_river.dart rename to lib/v3/models/mods/unitUpgrades/peace_river.dart index 27c6b822..5825d6ad 100644 --- a/lib/models/mods/unitUpgrades/peace_river.dart +++ b/lib/v3/models/mods/unitUpgrades/peace_river.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const String _baseRuleId = 'mod::peace river'; diff --git a/lib/models/mods/unitUpgrades/south.dart b/lib/v3/models/mods/unitUpgrades/south.dart similarity index 95% rename from lib/models/mods/unitUpgrades/south.dart rename to lib/v3/models/mods/unitUpgrades/south.dart index 5b7eb863..bf0c0fc0 100644 --- a/lib/models/mods/unitUpgrades/south.dart +++ b/lib/v3/models/mods/unitUpgrades/south.dart @@ -1,15 +1,15 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final _plusMinusMatch = RegExp(r'^(\+|-)'); diff --git a/lib/models/mods/unitUpgrades/unit_modification.dart b/lib/v3/models/mods/unitUpgrades/unit_modification.dart similarity index 59% rename from lib/models/mods/unitUpgrades/unit_modification.dart rename to lib/v3/models/mods/unitUpgrades/unit_modification.dart index 1442aa4b..d128c889 100644 --- a/lib/models/mods/unitUpgrades/unit_modification.dart +++ b/lib/v3/models/mods/unitUpgrades/unit_modification.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; class UnitModification extends BaseModification { UnitModification({ diff --git a/lib/models/mods/unitUpgrades/unit_upgrades.dart b/lib/v3/models/mods/unitUpgrades/unit_upgrades.dart similarity index 91% rename from lib/models/mods/unitUpgrades/unit_upgrades.dart rename to lib/v3/models/mods/unitUpgrades/unit_upgrades.dart index 2e6a4e2e..61482208 100644 --- a/lib/models/mods/unitUpgrades/unit_upgrades.dart +++ b/lib/v3/models/mods/unitUpgrades/unit_upgrades.dart @@ -1,17 +1,18 @@ -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/unitUpgrades/black_talon.dart' +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/black_talon.dart' as blackTalon; -import 'package:gearforce/models/mods/unitUpgrades/caprice.dart' as caprice; -import 'package:gearforce/models/mods/unitUpgrades/cef.dart' as cef; -import 'package:gearforce/models/mods/unitUpgrades/eden.dart' as eden; -import 'package:gearforce/models/mods/unitUpgrades/north.dart' as north; -import 'package:gearforce/models/mods/unitUpgrades/nucoal.dart' as nucoal; -import 'package:gearforce/models/mods/unitUpgrades/peace_river.dart' +import 'package:gearforce/v3/models/mods/unitUpgrades/caprice.dart' as caprice; +import 'package:gearforce/v3/models/mods/unitUpgrades/cef.dart' as cef; +import 'package:gearforce/v3/models/mods/unitUpgrades/eden.dart' as eden; +import 'package:gearforce/v3/models/mods/unitUpgrades/north.dart' as north; +import 'package:gearforce/v3/models/mods/unitUpgrades/nucoal.dart' as nucoal; +import 'package:gearforce/v3/models/mods/unitUpgrades/peace_river.dart' as peaceRiver; -import 'package:gearforce/models/mods/unitUpgrades/south.dart' as south; -import 'package:gearforce/models/mods/unitUpgrades/universal.dart' as universal; -import 'package:gearforce/models/mods/unitUpgrades/utopia.dart' as utopia; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/south.dart' as south; +import 'package:gearforce/v3/models/mods/unitUpgrades/universal.dart' + as universal; +import 'package:gearforce/v3/models/mods/unitUpgrades/utopia.dart' as utopia; +import 'package:gearforce/v3/models/unit/unit.dart'; List getUnitMods(Unit unit) { switch (unit.core.frame.toLowerCase()) { diff --git a/lib/models/mods/unitUpgrades/universal.dart b/lib/v3/models/mods/unitUpgrades/universal.dart similarity index 95% rename from lib/models/mods/unitUpgrades/universal.dart rename to lib/v3/models/mods/unitUpgrades/universal.dart index d400e7cd..96e45bec 100644 --- a/lib/models/mods/unitUpgrades/universal.dart +++ b/lib/v3/models/mods/unitUpgrades/universal.dart @@ -1,14 +1,14 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification sawBladeSwap = UnitModification( name: 'Saw Blade Swap', diff --git a/lib/models/mods/unitUpgrades/utopia.dart b/lib/v3/models/mods/unitUpgrades/utopia.dart similarity index 91% rename from lib/models/mods/unitUpgrades/utopia.dart rename to lib/v3/models/mods/unitUpgrades/utopia.dart index 0f429a5a..4907631e 100644 --- a/lib/models/mods/unitUpgrades/utopia.dart +++ b/lib/v3/models/mods/unitUpgrades/utopia.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; final UnitModification antiTank = UnitModification(name: 'Anti-Tank Upgrade') ..addMod(UnitAttribute.tv, createSimpleIntMod(1), description: 'TV +1') diff --git a/lib/models/mods/veteranUpgrades/veteran_modification.dart b/lib/v3/models/mods/veteranUpgrades/veteran_modification.dart similarity index 96% rename from lib/models/mods/veteranUpgrades/veteran_modification.dart rename to lib/v3/models/mods/veteranUpgrades/veteran_modification.dart index 6190737b..0381d621 100644 --- a/lib/models/mods/veteranUpgrades/veteran_modification.dart +++ b/lib/v3/models/mods/veteranUpgrades/veteran_modification.dart @@ -1,17 +1,17 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; const _vetIDBase = 'mod::vet'; diff --git a/lib/models/mods/veteranUpgrades/veteran_upgrades.dart b/lib/v3/models/mods/veteranUpgrades/veteran_upgrades.dart similarity index 88% rename from lib/models/mods/veteranUpgrades/veteran_upgrades.dart rename to lib/v3/models/mods/veteranUpgrades/veteran_upgrades.dart index 47f108ef..e721d3fc 100644 --- a/lib/models/mods/veteranUpgrades/veteran_upgrades.dart +++ b/lib/v3/models/mods/veteranUpgrades/veteran_upgrades.dart @@ -1,6 +1,6 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; List getVeteranMods(Unit u, CombatGroup cg) { return [ diff --git a/lib/models/roster/roster.dart b/lib/v3/models/roster/roster.dart similarity index 95% rename from lib/models/roster/roster.dart rename to lib/v3/models/roster/roster.dart index 03a4c0a7..b572e2f8 100644 --- a/lib/models/roster/roster.dart +++ b/lib/v3/models/roster/roster.dart @@ -1,14 +1,14 @@ import 'package:flutter/widgets.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; import 'package:gearforce/widgets/settings.dart'; const _currentRulesVersion = '3.1 - May 2022'; @@ -49,7 +49,7 @@ class UnitRoster extends ChangeNotifier { } } - UnitRoster(Data data, Settings settings, {bool tryFix = true}) { + UnitRoster(DataV3 data, Settings settings, {bool tryFix = true}) { factionNotifier = ValueNotifier(Faction.blackTalons(data, settings)); rulesetNotifer = @@ -206,7 +206,7 @@ class UnitRoster extends ChangeNotifier { 'whenCreated': DateTime.now().toUtc().toString(), }; - factory UnitRoster.fromJson(dynamic json, Data data, Settings settings) { + factory UnitRoster.fromJson(dynamic json, DataV3 data, Settings settings) { final version = json['version'] as int; UnitRoster ur = UnitRoster(data, settings); ur.name = json['name'] as String?; @@ -315,7 +315,7 @@ class UnitRoster extends ChangeNotifier { } static String? _loadV2Faction( - String? faction, UnitRoster ur, Data data, Settings settings) { + String? faction, UnitRoster ur, DataV3 data, Settings settings) { if (faction != null) { try { final f = Faction.fromType( @@ -334,7 +334,7 @@ class UnitRoster extends ChangeNotifier { static String? _loadV3Faction( Map? factionJson, UnitRoster ur, - Data data, + DataV3 data, Settings settings, ) { if (factionJson == null) { diff --git a/lib/models/rules/alpha_beta/base.dart b/lib/v3/models/rules/alpha_beta/base.dart similarity index 100% rename from lib/models/rules/alpha_beta/base.dart rename to lib/v3/models/rules/alpha_beta/base.dart diff --git a/lib/models/rules/alpha_beta/rule_snipers.dart b/lib/v3/models/rules/alpha_beta/rule_snipers.dart similarity index 64% rename from lib/models/rules/alpha_beta/rule_snipers.dart rename to lib/v3/models/rules/alpha_beta/rule_snipers.dart index b41f10fe..baeecc9a 100644 --- a/lib/models/rules/alpha_beta/rule_snipers.dart +++ b/lib/v3/models/rules/alpha_beta/rule_snipers.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/alpha_beta/base.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/alpha_beta/base.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; final Rule ruleSnipers = Rule( name: 'Snipers', diff --git a/lib/models/rules/alpha_beta/veteran_combat_groups.dart b/lib/v3/models/rules/alpha_beta/veteran_combat_groups.dart similarity index 76% rename from lib/models/rules/alpha_beta/veteran_combat_groups.dart rename to lib/v3/models/rules/alpha_beta/veteran_combat_groups.dart index 8b6ac1f4..8de34374 100644 --- a/lib/models/rules/alpha_beta/veteran_combat_groups.dart +++ b/lib/v3/models/rules/alpha_beta/veteran_combat_groups.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/alpha_beta/base.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/alpha_beta/base.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; final Rule ruleVeteranCombatGroups = Rule( name: 'Veteran Combat Groups', diff --git a/lib/models/rules/faction_model_rules.dart b/lib/v3/models/rules/faction_model_rules.dart similarity index 78% rename from lib/models/rules/faction_model_rules.dart rename to lib/v3/models/rules/faction_model_rules.dart index 9497ea2e..e550d45b 100644 --- a/lib/models/rules/faction_model_rules.dart +++ b/lib/v3/models/rules/faction_model_rules.dart @@ -1,12 +1,13 @@ -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart' +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart' as caprice; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart' as cef; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart' as eden; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/rulesets/utopia/utopia.dart' as utopia; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart' as cef; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart' as eden; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/rulesets/utopia/utopia.dart' + as utopia; +import 'package:gearforce/v3/models/unit/unit.dart'; List GetModelFactionRules( Unit? unit, diff --git a/lib/models/rules/options/combat_group_options.dart b/lib/v3/models/rules/options/combat_group_options.dart similarity index 91% rename from lib/models/rules/options/combat_group_options.dart rename to lib/v3/models/rules/options/combat_group_options.dart index 6ad7597a..037b01b2 100644 --- a/lib/models/rules/options/combat_group_options.dart +++ b/lib/v3/models/rules/options/combat_group_options.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/roster/roster.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; class CombatGroupOption extends ChangeNotifier { CombatGroupOption( diff --git a/lib/models/rules/options/special_unit_filter.dart b/lib/v3/models/rules/options/special_unit_filter.dart similarity index 72% rename from lib/models/rules/options/special_unit_filter.dart rename to lib/v3/models/rules/options/special_unit_filter.dart index bc067c40..87b1f34e 100644 --- a/lib/models/rules/options/special_unit_filter.dart +++ b/lib/v3/models/rules/options/special_unit_filter.dart @@ -1,5 +1,5 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; class SpecialUnitFilter { final String text; diff --git a/lib/models/rules/rule.dart b/lib/v3/models/rules/rule.dart similarity index 91% rename from lib/models/rules/rule.dart rename to lib/v3/models/rules/rule.dart index 91de9048..6b61f519 100644 --- a/lib/models/rules/rule.dart +++ b/lib/v3/models/rules/rule.dart @@ -1,21 +1,21 @@ import 'package:flutter/widgets.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; -import 'package:gearforce/models/validation/validations.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; class Rule extends ChangeNotifier { Rule({ diff --git a/lib/models/rules/rule_types.dart b/lib/v3/models/rules/rule_types.dart similarity index 100% rename from lib/models/rules/rule_types.dart rename to lib/v3/models/rules/rule_types.dart diff --git a/lib/models/rules/rulesets/black_talons/black_talons.dart b/lib/v3/models/rules/rulesets/black_talons/black_talons.dart similarity index 68% rename from lib/models/rules/rulesets/black_talons/black_talons.dart rename to lib/v3/models/rules/rulesets/black_talons/black_talons.dart index 2f40eaf8..e984ea53 100644 --- a/lib/models/rules/rulesets/black_talons/black_talons.dart +++ b/lib/v3/models/rules/rulesets/black_talons/black_talons.dart @@ -1,15 +1,15 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/black_talon.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btat.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btit.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btrt.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btst.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/black_talon.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btat.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btit.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btrt.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btst.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::blackTalon::core'; @@ -26,7 +26,7 @@ const String _ruleSpecialOperatorsId = '$_baseRuleId::20'; */ class BlackTalons extends RuleSet { BlackTalons( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -62,13 +62,13 @@ class BlackTalons extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory BlackTalons.BTRT(Data data, Settings settings) => + factory BlackTalons.BTRT(DataV3 data, Settings settings) => BTRT(data, settings); - factory BlackTalons.BTIT(Data data, Settings settings) => + factory BlackTalons.BTIT(DataV3 data, Settings settings) => BTIT(data, settings); - factory BlackTalons.BTST(Data data, Settings settings) => + factory BlackTalons.BTST(DataV3 data, Settings settings) => BTST(data, settings); - factory BlackTalons.BTAT(Data data, Settings settings) => + factory BlackTalons.BTAT(DataV3 data, Settings settings) => BTAT(data, settings); } diff --git a/lib/models/rules/rulesets/black_talons/btat.dart b/lib/v3/models/rules/rulesets/black_talons/btat.dart similarity index 91% rename from lib/models/rules/rulesets/black_talons/btat.dart rename to lib/v3/models/rules/rulesets/black_talons/btat.dart index 88c7a407..f5b48a71 100644 --- a/lib/models/rules/rulesets/black_talons/btat.dart +++ b/lib/v3/models/rules/rulesets/black_talons/btat.dart @@ -1,6 +1,6 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/traits/trait.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; const String _baseRuleId = 'rule::blackTalon::btat'; const String _ruleShadowWarriorsId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/black_talons/btit.dart b/lib/v3/models/rules/rulesets/black_talons/btit.dart similarity index 87% rename from lib/models/rules/rulesets/black_talons/btit.dart rename to lib/v3/models/rules/rulesets/black_talons/btit.dart index 3a2b5761..a905633b 100644 --- a/lib/models/rules/rulesets/black_talons/btit.dart +++ b/lib/v3/models/rules/rulesets/black_talons/btit.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/black_talon.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/command.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/black_talon.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; const String _baseRuleId = 'rule::blackTalon::btit'; const String _ruleAlliesId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/black_talons/btrt.dart b/lib/v3/models/rules/rulesets/black_talons/btrt.dart similarity index 87% rename from lib/models/rules/rulesets/black_talons/btrt.dart rename to lib/v3/models/rules/rulesets/black_talons/btrt.dart index b001ec61..85c45527 100644 --- a/lib/models/rules/rulesets/black_talons/btrt.dart +++ b/lib/v3/models/rules/rulesets/black_talons/btrt.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/black_talon.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/black_talon.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; const String _baseRuleId = 'rule::blackTalon::btrt'; const String _ruleTheUnseenId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/black_talons/btst.dart b/lib/v3/models/rules/rulesets/black_talons/btst.dart similarity index 85% rename from lib/models/rules/rulesets/black_talons/btst.dart rename to lib/v3/models/rules/rulesets/black_talons/btst.dart index 323afa32..0c3f1038 100644 --- a/lib/models/rules/rulesets/black_talons/btst.dart +++ b/lib/v3/models/rules/rulesets/black_talons/btst.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelist; -import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; const String _baseRuleId = 'rule::blackTalon::btst'; const String _ruleAlliesId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/caprice/caprice.dart b/lib/v3/models/rules/rulesets/caprice/caprice.dart similarity index 77% rename from lib/models/rules/rulesets/caprice/caprice.dart rename to lib/v3/models/rules/rulesets/caprice/caprice.dart index 5ebcccbe..fd00e3bb 100644 --- a/lib/models/rules/rulesets/caprice/caprice.dart +++ b/lib/v3/models/rules/rulesets/caprice/caprice.dart @@ -1,17 +1,17 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart'; -import 'package:gearforce/models/mods/factionUpgrades/cef.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart' as cef; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/cid.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/cse.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/lrc.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart' as cef; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/cid.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/cse.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/lrc.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::caprice::core'; @@ -34,7 +34,7 @@ const String _ruleAbominationsId = '$_baseRuleId::30'; */ class Caprice extends RuleSet { Caprice( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -72,9 +72,9 @@ class Caprice extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory Caprice.CID(Data data, Settings settings) => CID(data, settings); - factory Caprice.CSE(Data data, Settings settings) => CSE(data, settings); - factory Caprice.LRC(Data data, Settings settings) => LRC(data, settings); + factory Caprice.CID(DataV3 data, Settings settings) => CID(data, settings); + factory Caprice.CSE(DataV3 data, Settings settings) => CSE(data, settings); + factory Caprice.LRC(DataV3 data, Settings settings) => LRC(data, settings); } final Rule ruleDuelingMounts = Rule( diff --git a/lib/models/rules/rulesets/caprice/cid.dart b/lib/v3/models/rules/rulesets/caprice/cid.dart similarity index 90% rename from lib/models/rules/rulesets/caprice/cid.dart rename to lib/v3/models/rules/rulesets/caprice/cid.dart index f0155365..93a4e4ca 100644 --- a/lib/models/rules/rulesets/caprice/cid.dart +++ b/lib/v3/models/rules/rulesets/caprice/cid.dart @@ -1,13 +1,14 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/milicia.dart' as milicia; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/milicia.dart' + as milicia; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::caprice::cid'; const String _ruleCommandersInvestmentId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/caprice/cse.dart b/lib/v3/models/rules/rulesets/caprice/cse.dart similarity index 91% rename from lib/models/rules/rulesets/caprice/cse.dart rename to lib/v3/models/rules/rulesets/caprice/cse.dart index c3e2e9b4..3702e2c9 100644 --- a/lib/models/rules/rulesets/caprice/cse.dart +++ b/lib/v3/models/rules/rulesets/caprice/cse.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::caprice::cse'; const String _ruleTheBestWayToMakeMoneyId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/caprice/lrc.dart b/lib/v3/models/rules/rulesets/caprice/lrc.dart similarity index 91% rename from lib/models/rules/rulesets/caprice/lrc.dart rename to lib/v3/models/rules/rulesets/caprice/lrc.dart index 58401b85..e96df913 100644 --- a/lib/models/rules/rulesets/caprice/lrc.dart +++ b/lib/v3/models/rules/rulesets/caprice/lrc.dart @@ -1,12 +1,12 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelistMod; -import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::caprice::lrc'; const String _ruleHeroesOfTheResistanceId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/cef/cef.dart b/lib/v3/models/rules/rulesets/cef/cef.dart similarity index 82% rename from lib/models/rules/rulesets/cef/cef.dart rename to lib/v3/models/rules/rulesets/cef/cef.dart index aedc1cc2..344b6595 100644 --- a/lib/models/rules/rulesets/cef/cef.dart +++ b/lib/v3/models/rules/rulesets/cef/cef.dart @@ -1,19 +1,20 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart' as caprice; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/cef.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cefff.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cefif.dart'; -import 'package:gearforce/models/rules/rulesets/cef/ceftf.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart' + as caprice; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cefff.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cefif.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/ceftf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::cef::core'; @@ -39,7 +40,7 @@ const String _ruleAlliesEdenId = '$_baseRuleId::60'; */ class CEF extends RuleSet { CEF( - Data data, + DataV3 data, Settings settings, { super.description, required super.name, @@ -77,9 +78,9 @@ class CEF extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory CEF.CEFFF(Data data, Settings settings) => CEFFF(data, settings); - factory CEF.CEFTF(Data data, Settings settings) => CEFTF(data, settings); - factory CEF.CEFIF(Data data, Settings settings) => CEFIF(data, settings); + factory CEF.CEFFF(DataV3 data, Settings settings) => CEFFF(data, settings); + factory CEF.CEFTF(DataV3 data, Settings settings) => CEFTF(data, settings); + factory CEF.CEFIF(DataV3 data, Settings settings) => CEFIF(data, settings); } final Rule ruleMinerva = Rule( diff --git a/lib/models/rules/rulesets/cef/cefff.dart b/lib/v3/models/rules/rulesets/cef/cefff.dart similarity index 90% rename from lib/models/rules/rulesets/cef/cefff.dart rename to lib/v3/models/rules/rulesets/cef/cefff.dart index 0db1c3de..8ba28f43 100644 --- a/lib/models/rules/rulesets/cef/cefff.dart +++ b/lib/v3/models/rules/rulesets/cef/cefff.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/cef.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart' +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/cef.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart' as vetMod; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart'; const String _baseRuleId = 'rule::cef::cefff'; const String _ruleDuelingFramesId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/cef/cefif.dart b/lib/v3/models/rules/rulesets/cef/cefif.dart similarity index 84% rename from lib/models/rules/rulesets/cef/cefif.dart rename to lib/v3/models/rules/rulesets/cef/cefif.dart index 28cdc85b..88fd54ec 100644 --- a/lib/models/rules/rulesets/cef/cefif.dart +++ b/lib/v3/models/rules/rulesets/cef/cefif.dart @@ -1,9 +1,9 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/pak.dart' as pak; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/pak.dart' as pak; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::cef::cefif'; const String _ruleTheAnvilId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/cef/ceftf.dart b/lib/v3/models/rules/rulesets/cef/ceftf.dart similarity index 88% rename from lib/models/rules/rulesets/cef/ceftf.dart rename to lib/v3/models/rules/rulesets/cef/ceftf.dart index 6ef96433..495a3323 100644 --- a/lib/models/rules/rulesets/cef/ceftf.dart +++ b/lib/v3/models/rules/rulesets/cef/ceftf.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart' +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart' as vetMod; -import 'package:gearforce/models/rules/rulesets/cef/cef.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; const String _baseRuleId = 'rule::cef::ceftf'; const String _ruleTheHammerId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/eden/aef.dart b/lib/v3/models/rules/rulesets/eden/aef.dart similarity index 89% rename from lib/models/rules/rulesets/eden/aef.dart rename to lib/v3/models/rules/rulesets/eden/aef.dart index 4a698a5c..608c54a9 100644 --- a/lib/models/rules/rulesets/eden/aef.dart +++ b/lib/v3/models/rules/rulesets/eden/aef.dart @@ -1,14 +1,14 @@ -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelistMod; -import 'package:gearforce/models/mods/factionUpgrades/eden.dart'; -import 'package:gearforce/models/mods/unitUpgrades/universal.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eif.dart' as eif; -import 'package:gearforce/models/rules/rulesets/eden/enh.dart' as enh; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/eden.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/universal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eif.dart' as eif; +import 'package:gearforce/v3/models/rules/rulesets/eden/enh.dart' as enh; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/unit/model_type.dart'; const String _baseRuleId = 'rule::eden::aef'; const String _ruleImprovisoId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/eden/eden.dart b/lib/v3/models/rules/rulesets/eden/eden.dart similarity index 86% rename from lib/models/rules/rulesets/eden/eden.dart rename to lib/v3/models/rules/rulesets/eden/eden.dart index 791be0a4..84b30423 100644 --- a/lib/models/rules/rulesets/eden/eden.dart +++ b/lib/v3/models/rules/rulesets/eden/eden.dart @@ -1,18 +1,19 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart' as caprice; -import 'package:gearforce/models/mods/factionUpgrades/eden.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/eden/aef.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eif.dart'; -import 'package:gearforce/models/rules/rulesets/eden/enh.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart' + as caprice; +import 'package:gearforce/v3/models/mods/factionUpgrades/eden.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/aef.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eif.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/enh.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::eden::core'; @@ -38,7 +39,7 @@ const String _ruleAlliesCapriceId = '$_baseRuleId::70'; */ class Eden extends RuleSet { Eden( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -74,9 +75,9 @@ class Eden extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory Eden.EIF(Data data, Settings settings) => EIF(data, settings); - factory Eden.ENH(Data data, Settings settings) => ENH(data, settings); - factory Eden.AEF(Data data, Settings settings) => AEF(data, settings); + factory Eden.EIF(DataV3 data, Settings settings) => EIF(data, settings); + factory Eden.ENH(DataV3 data, Settings settings) => ENH(data, settings); + factory Eden.AEF(DataV3 data, Settings settings) => AEF(data, settings); } final Rule ruleLancers = Rule( diff --git a/lib/models/rules/rulesets/eden/eif.dart b/lib/v3/models/rules/rulesets/eden/eif.dart similarity index 91% rename from lib/models/rules/rulesets/eden/eif.dart rename to lib/v3/models/rules/rulesets/eden/eif.dart index c3c39429..999c529e 100644 --- a/lib/models/rules/rulesets/eden/eif.dart +++ b/lib/v3/models/rules/rulesets/eden/eif.dart @@ -1,9 +1,9 @@ -import 'package:gearforce/models/mods/factionUpgrades/eden.dart'; -import 'package:gearforce/models/rules/rulesets/eden/aef.dart' as aef; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart'; -import 'package:gearforce/models/rules/rulesets/eden/enh.dart' as enh; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/mods/factionUpgrades/eden.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/aef.dart' as aef; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/enh.dart' as enh; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; const String _baseRuleId = 'rule::eden::eif'; const String _ruleImprovisoId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/eden/enh.dart b/lib/v3/models/rules/rulesets/eden/enh.dart similarity index 90% rename from lib/models/rules/rulesets/eden/enh.dart rename to lib/v3/models/rules/rulesets/eden/enh.dart index 3203aa34..8554dcc5 100644 --- a/lib/models/rules/rulesets/eden/enh.dart +++ b/lib/v3/models/rules/rulesets/eden/enh.dart @@ -1,9 +1,9 @@ -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelistMod; -import 'package:gearforce/models/mods/factionUpgrades/eden.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rulesets/eden/eden.dart'; -import 'package:gearforce/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/eden.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; const String _baseRuleId = 'rule::eden::enh'; const String _ruleChampionsId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/leagueless/leagueless.dart b/lib/v3/models/rules/rulesets/leagueless/leagueless.dart similarity index 94% rename from lib/models/rules/rulesets/leagueless/leagueless.dart rename to lib/v3/models/rules/rulesets/leagueless/leagueless.dart index bdd6529c..dad94ecb 100644 --- a/lib/models/rules/rulesets/leagueless/leagueless.dart +++ b/lib/v3/models/rules/rulesets/leagueless/leagueless.dart @@ -1,27 +1,30 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/leagueless.dart'; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rulesets/black_talons/btrt.dart' as btrt; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/rulesets/nucoal/th.dart' as th; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart' +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/leagueless.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/black_talons/btrt.dart' + as btrt; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/th.dart' as th; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart' as peaceRiver; -import 'package:gearforce/models/rules/rulesets/peace_river/pps.dart' as pps; -import 'package:gearforce/models/rules/rulesets/peace_river/prdf.dart' as prdf; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/rulesets/south/milicia.dart' as milicia; -import 'package:gearforce/models/rules/rulesets/south/south.dart' as south; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/pps.dart' as pps; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/prdf.dart' + as prdf; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/milicia.dart' + as milicia; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart' as south; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::leagueless::core'; @@ -146,7 +149,7 @@ final List _onlyThreeAllowedRules = [ */ class Leagueless extends RuleSet { Leagueless( - Data data, + DataV3 data, Settings settings, { super.description, required super.name, @@ -168,13 +171,13 @@ class Leagueless extends RuleSet { return [...super.availableUnitFilters(cgOptions)]; } - factory Leagueless.North(Data data, Settings settings) => + factory Leagueless.North(DataV3 data, Settings settings) => SourceNorth(data, settings); - factory Leagueless.South(Data data, Settings settings) => + factory Leagueless.South(DataV3 data, Settings settings) => SourceSouth(data, settings); - factory Leagueless.PeaceRiver(Data data, Settings settings) => + factory Leagueless.PeaceRiver(DataV3 data, Settings settings) => SourcePeaceRiver(data, settings); - factory Leagueless.NuCoal(Data data, Settings settings) => + factory Leagueless.NuCoal(DataV3 data, Settings settings) => SourceNuCoal(data, settings); } diff --git a/lib/models/rules/rulesets/north/ng.dart b/lib/v3/models/rules/rulesets/north/ng.dart similarity index 91% rename from lib/models/rules/rulesets/north/ng.dart rename to lib/v3/models/rules/rulesets/north/ng.dart index 00d2b62f..b6ef79a6 100644 --- a/lib/models/rules/rulesets/north/ng.dart +++ b/lib/v3/models/rules/rulesets/north/ng.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/nlc.dart' as nlc; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/rules/rulesets/north/umf.dart' as umf; -import 'package:gearforce/models/rules/rulesets/north/wfp.dart' as wfp; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/nlc.dart' as nlc; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/umf.dart' as umf; +import 'package:gearforce/v3/models/rules/rulesets/north/wfp.dart' as wfp; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::north::ng'; const String _rulePanNorthernId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/north/nlc.dart b/lib/v3/models/rules/rulesets/north/nlc.dart similarity index 93% rename from lib/models/rules/rulesets/north/nlc.dart rename to lib/v3/models/rules/rulesets/north/nlc.dart index e1f2594d..195b200a 100644 --- a/lib/models/rules/rulesets/north/nlc.dart +++ b/lib/v3/models/rules/rulesets/north/nlc.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/north.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/unit/command.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; const String _baseRuleId = 'rule::north::nlc'; const String _ruleChaplainId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/north/north.dart b/lib/v3/models/rules/rulesets/north/north.dart similarity index 90% rename from lib/models/rules/rulesets/north/north.dart rename to lib/v3/models/rules/rulesets/north/north.dart index df187130..87e40c8d 100644 --- a/lib/models/rules/rulesets/north/north.dart +++ b/lib/v3/models/rules/rulesets/north/north.dart @@ -1,20 +1,20 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/north.dart'; -import 'package:gearforce/models/rules/rulesets/north/ng.dart'; -import 'package:gearforce/models/rules/rulesets/north/nlc.dart'; -import 'package:gearforce/models/rules/rulesets/north/umf.dart'; -import 'package:gearforce/models/rules/rulesets/north/wfp.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/ng.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/nlc.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/umf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/wfp.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::north::core'; @@ -40,7 +40,7 @@ const String _ruleDragoonSquadId = '$_baseRuleId::50'; class North extends RuleSet { North( - Data data, + DataV3 data, Settings settings, { super.description, required super.name, @@ -78,10 +78,10 @@ class North extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory North.NG(Data data, Settings settings) => NG(data, settings); - factory North.WFP(Data data, Settings settings) => WFP(data, settings); - factory North.UMF(Data data, Settings settings) => UMF(data, settings); - factory North.NLC(Data data, Settings settings) => NLC(data, settings); + factory North.NG(DataV3 data, Settings settings) => NG(data, settings); + factory North.WFP(DataV3 data, Settings settings) => WFP(data, settings); + factory North.UMF(DataV3 data, Settings settings) => UMF(data, settings); + factory North.NLC(DataV3 data, Settings settings) => NLC(data, settings); } final Rule ruleTaskBuilt = Rule( diff --git a/lib/models/rules/rulesets/north/umf.dart b/lib/v3/models/rules/rulesets/north/umf.dart similarity index 91% rename from lib/models/rules/rulesets/north/umf.dart rename to lib/v3/models/rules/rulesets/north/umf.dart index e6329a8d..227a91b4 100644 --- a/lib/models/rules/rulesets/north/umf.dart +++ b/lib/v3/models/rules/rulesets/north/umf.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/north.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/north.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::north::umf'; const String _ruleLocalManufacturingId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/north/wfp.dart b/lib/v3/models/rules/rulesets/north/wfp.dart similarity index 92% rename from lib/models/rules/rulesets/north/wfp.dart rename to lib/v3/models/rules/rulesets/north/wfp.dart index 7e07ebfb..2c99ceb6 100644 --- a/lib/models/rules/rulesets/north/wfp.dart +++ b/lib/v3/models/rules/rulesets/north/wfp.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/north.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/north.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::north::wfp'; const String _rulePristineAntiquesId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/nucoal/hapf.dart b/lib/v3/models/rules/rulesets/nucoal/hapf.dart similarity index 80% rename from lib/models/rules/rulesets/nucoal/hapf.dart rename to lib/v3/models/rules/rulesets/nucoal/hapf.dart index c5714d06..c75c985e 100644 --- a/lib/models/rules/rulesets/nucoal/hapf.dart +++ b/lib/v3/models/rules/rulesets/nucoal/hapf.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/fha.dart' as fha; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/fha.dart' as fha; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; const String _baseRuleId = 'rule::nucoal::hapf'; const String _ruleSouthernSurplusId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/nucoal/hcsa.dart b/lib/v3/models/rules/rulesets/nucoal/hcsa.dart similarity index 95% rename from lib/models/rules/rulesets/nucoal/hcsa.dart rename to lib/v3/models/rules/rulesets/nucoal/hcsa.dart index 2748c72e..7bc9c1c3 100644 --- a/lib/models/rules/rulesets/nucoal/hcsa.dart +++ b/lib/v3/models/rules/rulesets/nucoal/hcsa.dart @@ -1,14 +1,14 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; const String _baseRuleId = 'rule::nucoal::hcsa'; diff --git a/lib/models/rules/rulesets/nucoal/kada.dart b/lib/v3/models/rules/rulesets/nucoal/kada.dart similarity index 88% rename from lib/models/rules/rulesets/nucoal/kada.dart rename to lib/v3/models/rules/rulesets/nucoal/kada.dart index 1e285420..ea5a0ff7 100644 --- a/lib/models/rules/rulesets/nucoal/kada.dart +++ b/lib/v3/models/rules/rulesets/nucoal/kada.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelist; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::nucoal::kada'; const String _ruleHeroesOfTheArenaId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/nucoal/nsdf.dart b/lib/v3/models/rules/rulesets/nucoal/nsdf.dart similarity index 85% rename from lib/models/rules/rulesets/nucoal/nsdf.dart rename to lib/v3/models/rules/rulesets/nucoal/nsdf.dart index e1a84a39..084168eb 100644 --- a/lib/models/rules/rulesets/nucoal/nsdf.dart +++ b/lib/v3/models/rules/rulesets/nucoal/nsdf.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; const String _baseRuleId = 'rule::nucoal::nsdf'; diff --git a/lib/models/rules/rulesets/nucoal/nucoal.dart b/lib/v3/models/rules/rulesets/nucoal/nucoal.dart similarity index 74% rename from lib/models/rules/rulesets/nucoal/nucoal.dart rename to lib/v3/models/rules/rulesets/nucoal/nucoal.dart index 0ea2fa3d..709ea7ef 100644 --- a/lib/models/rules/rulesets/nucoal/nucoal.dart +++ b/lib/v3/models/rules/rulesets/nucoal/nucoal.dart @@ -1,18 +1,18 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/hapf.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/hcsa.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/kada.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nsdf.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/pak.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/th.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/hapf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/hcsa.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/kada.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nsdf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/pak.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/th.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::nucoal::core'; @@ -31,7 +31,7 @@ const String _rulePortArthurKorpsId = '$_baseRuleId::20'; */ class NuCoal extends RuleSet { NuCoal( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -70,12 +70,12 @@ class NuCoal extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory NuCoal.NSDF(Data data, Settings settings) => NSDF(data, settings); - factory NuCoal.PAK(Data data, Settings settings) => PAK(data, settings); - factory NuCoal.HAPF(Data data, Settings settings) => HAPF(data, settings); - factory NuCoal.KADA(Data data, Settings settings) => KADA(data, settings); - factory NuCoal.TH(Data data, Settings settings) => TH(data, settings); - factory NuCoal.HCSA(Data data, Settings settings) => HCSA(data, settings); + factory NuCoal.NSDF(DataV3 data, Settings settings) => NSDF(data, settings); + factory NuCoal.PAK(DataV3 data, Settings settings) => PAK(data, settings); + factory NuCoal.HAPF(DataV3 data, Settings settings) => HAPF(data, settings); + factory NuCoal.KADA(DataV3 data, Settings settings) => KADA(data, settings); + factory NuCoal.TH(DataV3 data, Settings settings) => TH(data, settings); + factory NuCoal.HCSA(DataV3 data, Settings settings) => HCSA(data, settings); } final Rule ruleHumanistTech = Rule( diff --git a/lib/models/rules/rulesets/nucoal/pak.dart b/lib/v3/models/rules/rulesets/nucoal/pak.dart similarity index 91% rename from lib/models/rules/rulesets/nucoal/pak.dart rename to lib/v3/models/rules/rulesets/nucoal/pak.dart index 691e753d..123f3dde 100644 --- a/lib/models/rules/rulesets/nucoal/pak.dart +++ b/lib/v3/models/rules/rulesets/nucoal/pak.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; const String _baseRuleId = 'rule::nucoal::pak'; diff --git a/lib/models/rules/rulesets/nucoal/th.dart b/lib/v3/models/rules/rulesets/nucoal/th.dart similarity index 88% rename from lib/models/rules/rulesets/nucoal/th.dart rename to lib/v3/models/rules/rulesets/nucoal/th.dart index 6ffb2722..255b9c11 100644 --- a/lib/models/rules/rulesets/nucoal/th.dart +++ b/lib/v3/models/rules/rulesets/nucoal/th.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelist; -import 'package:gearforce/models/mods/factionUpgrades/nucoal.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart'; -import 'package:gearforce/models/rules/rulesets/nucoal/pak.dart' as pak; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart'; +import 'package:gearforce/v3/models/rules/rulesets/nucoal/pak.dart' as pak; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::nucoal::th'; diff --git a/lib/models/rules/rulesets/peace_river/peace_river.dart b/lib/v3/models/rules/rulesets/peace_river/peace_river.dart similarity index 81% rename from lib/models/rules/rulesets/peace_river/peace_river.dart rename to lib/v3/models/rules/rulesets/peace_river/peace_river.dart index fdab6f11..76c35813 100644 --- a/lib/models/rules/rulesets/peace_river/peace_river.dart +++ b/lib/v3/models/rules/rulesets/peace_river/peace_river.dart @@ -1,16 +1,17 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/peace_river.dart'; -import 'package:gearforce/models/mods/unitUpgrades/peace_river.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; -import 'package:gearforce/models/rules/rulesets/peace_river/pps.dart' as pps; -import 'package:gearforce/models/rules/rulesets/peace_river/prdf.dart' as prdf; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/peace_river.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/peace_river.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/pps.dart' as pps; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/prdf.dart' + as prdf; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::peaceriver::core'; @@ -35,7 +36,7 @@ const String _ruleArchitectsId = '$_baseRuleId::50'; */ class PeaceRiver extends RuleSet { PeaceRiver( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -79,11 +80,11 @@ class PeaceRiver extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory PeaceRiver.POC(Data data, Settings settings) => + factory PeaceRiver.POC(DataV3 data, Settings settings) => poc.POC(data, settings); - factory PeaceRiver.PPS(Data data, Settings settings) => + factory PeaceRiver.PPS(DataV3 data, Settings settings) => pps.PPS(data, settings); - factory PeaceRiver.PRDF(Data data, Settings settings) => + factory PeaceRiver.PRDF(DataV3 data, Settings settings) => prdf.PRDF(data, settings); } diff --git a/lib/models/rules/rulesets/peace_river/poc.dart b/lib/v3/models/rules/rulesets/peace_river/poc.dart similarity index 88% rename from lib/models/rules/rulesets/peace_river/poc.dart rename to lib/v3/models/rules/rulesets/peace_river/poc.dart index 4956a2d5..eef4980d 100644 --- a/lib/models/rules/rulesets/peace_river/poc.dart +++ b/lib/v3/models/rules/rulesets/peace_river/poc.dart @@ -1,13 +1,13 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/peace_river.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/peace_river.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::peaceriver::poc'; const String _ruleSpecialIssueId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/peace_river/pps.dart b/lib/v3/models/rules/rulesets/peace_river/pps.dart similarity index 92% rename from lib/models/rules/rulesets/peace_river/pps.dart rename to lib/v3/models/rules/rulesets/peace_river/pps.dart index 794044e3..9320e377 100644 --- a/lib/models/rules/rulesets/peace_river/pps.dart +++ b/lib/v3/models/rules/rulesets/peace_river/pps.dart @@ -1,13 +1,14 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; -import 'package:gearforce/models/rules/rulesets/peace_river/prdf.dart' as prdf; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/prdf.dart' + as prdf; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _exPOC = 'Ex-POC'; const String _exPRDF = 'Ex-PRDF'; diff --git a/lib/models/rules/rulesets/peace_river/prdf.dart b/lib/v3/models/rules/rulesets/peace_river/prdf.dart similarity index 92% rename from lib/models/rules/rulesets/peace_river/prdf.dart rename to lib/v3/models/rules/rulesets/peace_river/prdf.dart index 463b3ba3..abcc0abe 100644 --- a/lib/models/rules/rulesets/peace_river/prdf.dart +++ b/lib/v3/models/rules/rulesets/peace_river/prdf.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/peace_river.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/peace_river.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; const String PRDFSpecialRule1 = 'Ghost Strike: Models in one combat group using special operations ' + diff --git a/lib/models/rules/rulesets/rule_set.dart b/lib/v3/models/rules/rulesets/rule_set.dart similarity index 93% rename from lib/models/rules/rulesets/rule_set.dart rename to lib/v3/models/rules/rulesets/rule_set.dart index 6331783c..02171390 100644 --- a/lib/models/rules/rulesets/rule_set.dart +++ b/lib/v3/models/rules/rulesets/rule_set.dart @@ -1,38 +1,38 @@ import 'dart:math'; import 'package:flutter/widgets.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/mods/customUpgrades/custom_modifiation.dart'; -import 'package:gearforce/models/mods/customUpgrades/custom_uprades.dart'; -import 'package:gearforce/models/mods/duelist/duelist_upgrades.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_upgrades.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_upgrades.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_upgrades.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/rules/alpha_beta/rule_snipers.dart'; -import 'package:gearforce/models/rules/alpha_beta/veteran_combat_groups.dart'; -import 'package:gearforce/models/rules/faction_model_rules.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/validation/validations.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/mods/unitUpgrades/cef.dart' as cef; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/mods/customUpgrades/custom_modifiation.dart'; +import 'package:gearforce/v3/models/mods/customUpgrades/custom_uprades.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_upgrades.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_upgrades.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_upgrades.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_upgrades.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/rules/alpha_beta/rule_snipers.dart'; +import 'package:gearforce/v3/models/rules/alpha_beta/veteran_combat_groups.dart'; +import 'package:gearforce/v3/models/rules/faction_model_rules.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/cef.dart' as cef; import 'package:gearforce/widgets/settings.dart'; const coreTag = 'none'; @@ -57,7 +57,7 @@ class DefaultRuleSet extends RuleSet { } abstract class RuleSet extends ChangeNotifier { - final Data data; + final DataV3 data; final List? specialRules; final FactionType type; final String? description; diff --git a/lib/models/rules/rulesets/south/ese.dart b/lib/v3/models/rules/rulesets/south/ese.dart similarity index 94% rename from lib/models/rules/rulesets/south/ese.dart rename to lib/v3/models/rules/rulesets/south/ese.dart index 49c0e370..3a98dd10 100644 --- a/lib/models/rules/rulesets/south/ese.dart +++ b/lib/v3/models/rules/rulesets/south/ese.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; const String _baseRuleId = 'rule::south::ese'; diff --git a/lib/models/rules/rulesets/south/fha.dart b/lib/v3/models/rules/rulesets/south/fha.dart similarity index 86% rename from lib/models/rules/rulesets/south/fha.dart rename to lib/v3/models/rules/rulesets/south/fha.dart index 39501adf..38770693 100644 --- a/lib/models/rules/rulesets/south/fha.dart +++ b/lib/v3/models/rules/rulesets/south/fha.dart @@ -1,13 +1,14 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart' +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart' as duelistMod; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/milicia.dart' as milicia; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/milicia.dart' + as milicia; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::south::fha'; const String _ruleWroteTheBookId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/south/md.dart b/lib/v3/models/rules/rulesets/south/md.dart similarity index 92% rename from lib/models/rules/rulesets/south/md.dart rename to lib/v3/models/rules/rulesets/south/md.dart index f2f7355f..53f48c01 100644 --- a/lib/models/rules/rulesets/south/md.dart +++ b/lib/v3/models/rules/rulesets/south/md.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/south.dart'; -import 'package:gearforce/models/rules/rulesets/peace_river/poc.dart' as poc; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/south.dart'; +import 'package:gearforce/v3/models/rules/rulesets/peace_river/poc.dart' as poc; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; const _baseRuleId = 'rule::south::md'; const _ruleMekongeseExellenceId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/south/milicia.dart b/lib/v3/models/rules/rulesets/south/milicia.dart similarity index 86% rename from lib/models/rules/rulesets/south/milicia.dart rename to lib/v3/models/rules/rulesets/south/milicia.dart index 2b2286cd..e9464255 100644 --- a/lib/models/rules/rulesets/south/milicia.dart +++ b/lib/v3/models/rules/rulesets/south/milicia.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/south.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/rules/rulesets/south/sra.dart' as sra; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/south.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/sra.dart' as sra; const _baseRuleId = 'rule::south::milicia'; const _ruleConscriptionId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/south/south.dart b/lib/v3/models/rules/rulesets/south/south.dart similarity index 79% rename from lib/models/rules/rulesets/south/south.dart rename to lib/v3/models/rules/rulesets/south/south.dart index 3e628ffb..e7cb0e01 100644 --- a/lib/models/rules/rulesets/south/south.dart +++ b/lib/v3/models/rules/rulesets/south/south.dart @@ -1,18 +1,18 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/south.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rule_types.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/south/ese.dart'; -import 'package:gearforce/models/rules/rulesets/south/fha.dart'; -import 'package:gearforce/models/rules/rulesets/south/md.dart'; -import 'package:gearforce/models/rules/rulesets/south/milicia.dart'; -import 'package:gearforce/models/rules/rulesets/south/sra.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/south.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rule_types.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/ese.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/fha.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/md.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/milicia.dart'; +import 'package:gearforce/v3/models/rules/rulesets/south/sra.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; import 'package:gearforce/widgets/settings.dart'; const _baseRuleId = 'rule::south::core'; @@ -30,7 +30,7 @@ const ruleLionHuntersId = '$_baseRuleId::30'; */ class South extends RuleSet { South( - Data data, + DataV3 data, Settings settings, { super.description, required super.name, @@ -55,12 +55,12 @@ class South extends RuleSet { return [coreFilter, ...super.availableUnitFilters(cgOptions)]; } - factory South.SRA(Data data, Settings settings) => SRA(data, settings); - factory South.MILICIA(Data data, Settings settings) => + factory South.SRA(DataV3 data, Settings settings) => SRA(data, settings); + factory South.MILICIA(DataV3 data, Settings settings) => MILICIA(data, settings); - factory South.MD(Data data, Settings settings) => MD(data, settings); - factory South.ESE(Data data, Settings settings) => ESE(data, settings); - factory South.FHA(Data data, Settings settings) => FHA(data, settings); + factory South.MD(DataV3 data, Settings settings) => MD(data, settings); + factory South.ESE(DataV3 data, Settings settings) => ESE(data, settings); + factory South.FHA(DataV3 data, Settings settings) => FHA(data, settings); } const SouthFilters = const [ diff --git a/lib/models/rules/rulesets/south/sra.dart b/lib/v3/models/rules/rulesets/south/sra.dart similarity index 88% rename from lib/models/rules/rulesets/south/sra.dart rename to lib/v3/models/rules/rulesets/south/sra.dart index e4ed32b6..fdcb35d7 100644 --- a/lib/models/rules/rulesets/south/sra.dart +++ b/lib/v3/models/rules/rulesets/south/sra.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/mods/factionUpgrades/south.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rulesets/north/umf.dart' as umf; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/rulesets/south/south.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/south.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/umf.dart' as umf; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/rulesets/south/south.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; const String _baseRuleId = 'rule::south::sra'; const _rulePrideOfTheSouthId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/utopia/caf.dart b/lib/v3/models/rules/rulesets/utopia/caf.dart similarity index 94% rename from lib/models/rules/rulesets/utopia/caf.dart rename to lib/v3/models/rules/rulesets/utopia/caf.dart index 9e8eb172..9d612b85 100644 --- a/lib/models/rules/rulesets/utopia/caf.dart +++ b/lib/v3/models/rules/rulesets/utopia/caf.dart @@ -1,15 +1,16 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart' as caprice; -import 'package:gearforce/models/mods/factionUpgrades/utopia.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/utopia.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart' + as caprice; +import 'package:gearforce/v3/models/mods/factionUpgrades/utopia.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/utopia.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::utopia::caf'; const String _ruleAlliesId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/utopia/ouf.dart b/lib/v3/models/rules/rulesets/utopia/ouf.dart similarity index 89% rename from lib/models/rules/rulesets/utopia/ouf.dart rename to lib/v3/models/rules/rulesets/utopia/ouf.dart index 0ca10668..b147e4ab 100644 --- a/lib/models/rules/rulesets/utopia/ouf.dart +++ b/lib/v3/models/rules/rulesets/utopia/ouf.dart @@ -1,18 +1,18 @@ -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/caprice.dart' +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/caprice.dart' as capriceMods; -import 'package:gearforce/models/mods/factionUpgrades/cef.dart' as cefMods; -import 'package:gearforce/models/mods/factionUpgrades/utopia.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/rulesets/north/north.dart' as north; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/utopia.dart'; -import 'package:gearforce/models/validation/validations.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/cef.dart' as cefMods; +import 'package:gearforce/v3/models/mods/factionUpgrades/utopia.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rulesets/north/north.dart' as north; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/utopia.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; const String _baseRuleId = 'rule::utopia::ouf'; const String _ruleGreenwayCausticsId = '$_baseRuleId::10'; diff --git a/lib/models/rules/rulesets/utopia/utopia.dart b/lib/v3/models/rules/rulesets/utopia/utopia.dart similarity index 87% rename from lib/models/rules/rulesets/utopia/utopia.dart rename to lib/v3/models/rules/rulesets/utopia/utopia.dart index 97bb21d0..a5d87a72 100644 --- a/lib/models/rules/rulesets/utopia/utopia.dart +++ b/lib/v3/models/rules/rulesets/utopia/utopia.dart @@ -1,12 +1,12 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/data/unit_filter.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/caf.dart'; -import 'package:gearforce/models/rules/rulesets/utopia/ouf.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/data/unit_filter.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/caf.dart'; +import 'package:gearforce/v3/models/rules/rulesets/utopia/ouf.dart'; import 'package:gearforce/widgets/settings.dart'; const String _baseRuleId = 'rule::utopia::core'; @@ -37,7 +37,7 @@ const String _ruleExpendableId = '$_baseRuleId::40'; class Utopia extends RuleSet { Utopia( - Data data, + DataV3 data, Settings settings, { String? description, required String name, @@ -73,8 +73,8 @@ class Utopia extends RuleSet { return [...filters, ...super.availableUnitFilters(cgOptions)]; } - factory Utopia.CAF(Data data, Settings settings) => CAF(data, settings); - factory Utopia.OUF(Data data, Settings settings) => OUF(data, settings); + factory Utopia.CAF(DataV3 data, Settings settings) => CAF(data, settings); + factory Utopia.OUF(DataV3 data, Settings settings) => OUF(data, settings); } final Rule ruleDroneMatrix = Rule( diff --git a/lib/models/traits/trait.dart b/lib/v3/models/traits/trait.dart similarity index 100% rename from lib/models/traits/trait.dart rename to lib/v3/models/traits/trait.dart diff --git a/lib/models/unit/command.dart b/lib/v3/models/unit/command.dart similarity index 100% rename from lib/models/unit/command.dart rename to lib/v3/models/unit/command.dart diff --git a/lib/models/unit/frame.dart b/lib/v3/models/unit/frame.dart similarity index 85% rename from lib/models/unit/frame.dart rename to lib/v3/models/unit/frame.dart index f98f5308..443ea4ed 100644 --- a/lib/models/unit/frame.dart +++ b/lib/v3/models/unit/frame.dart @@ -1,5 +1,5 @@ -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; class Frame { const Frame({ diff --git a/lib/models/unit/model_type.dart b/lib/v3/models/unit/model_type.dart similarity index 100% rename from lib/models/unit/model_type.dart rename to lib/v3/models/unit/model_type.dart diff --git a/lib/models/unit/movement.dart b/lib/v3/models/unit/movement.dart similarity index 100% rename from lib/models/unit/movement.dart rename to lib/v3/models/unit/movement.dart diff --git a/lib/models/unit/role.dart b/lib/v3/models/unit/role.dart similarity index 100% rename from lib/models/unit/role.dart rename to lib/v3/models/unit/role.dart diff --git a/lib/models/unit/unit.dart b/lib/v3/models/unit/unit.dart similarity index 95% rename from lib/models/unit/unit.dart rename to lib/v3/models/unit/unit.dart index 51a35263..55d2fe2f 100644 --- a/lib/models/unit/unit.dart +++ b/lib/v3/models/unit/unit.dart @@ -1,21 +1,21 @@ import 'package:flutter/widgets.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/saved_mod.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; -import 'package:gearforce/models/validation/validations.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/saved_mod.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/validation/validations.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; class Unit extends ChangeNotifier { final UnitCore core; diff --git a/lib/models/unit/unit_attribute.dart b/lib/v3/models/unit/unit_attribute.dart similarity index 58% rename from lib/models/unit/unit_attribute.dart rename to lib/v3/models/unit/unit_attribute.dart index 270bd061..2f01385e 100644 --- a/lib/models/unit/unit_attribute.dart +++ b/lib/v3/models/unit/unit_attribute.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; enum UnitAttribute { name(String), diff --git a/lib/models/unit/unit_core.dart b/lib/v3/models/unit/unit_core.dart similarity index 94% rename from lib/models/unit/unit_core.dart rename to lib/v3/models/unit/unit_core.dart index 42265019..2f37ad09 100644 --- a/lib/models/unit/unit_core.dart +++ b/lib/v3/models/unit/unit_core.dart @@ -1,11 +1,11 @@ -import 'package:gearforce/models/factions/faction_type.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; class UnitCore { const UnitCore({ diff --git a/lib/models/validation/validations.dart b/lib/v3/models/validation/validations.dart similarity index 100% rename from lib/models/validation/validations.dart rename to lib/v3/models/validation/validations.dart diff --git a/lib/models/weapons/range.dart b/lib/v3/models/weapons/range.dart similarity index 100% rename from lib/models/weapons/range.dart rename to lib/v3/models/weapons/range.dart diff --git a/lib/models/weapons/weapon.dart b/lib/v3/models/weapons/weapon.dart similarity index 96% rename from lib/models/weapons/weapon.dart rename to lib/v3/models/weapons/weapon.dart index b13b807c..72f06ab3 100644 --- a/lib/models/weapons/weapon.dart +++ b/lib/v3/models/weapons/weapon.dart @@ -1,6 +1,6 @@ -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; class Weapon { const Weapon({ diff --git a/lib/models/weapons/weapon_modes.dart b/lib/v3/models/weapons/weapon_modes.dart similarity index 100% rename from lib/models/weapons/weapon_modes.dart rename to lib/v3/models/weapons/weapon_modes.dart diff --git a/lib/models/weapons/weapons.dart b/lib/v3/models/weapons/weapons.dart similarity index 98% rename from lib/models/weapons/weapons.dart rename to lib/v3/models/weapons/weapons.dart index 0e412a98..f25c1151 100644 --- a/lib/models/weapons/weapons.dart +++ b/lib/v3/models/weapons/weapons.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; final weaponMatch = RegExp(r'^((?[2-9])\s?[xX]\s?)?(?[BLMH])(?[a-zA-Z]+)'); diff --git a/lib/screens/roster/combatGroup/combat_group.dart b/lib/v3/screens/roster/combatGroup/combat_group.dart similarity index 96% rename from lib/screens/roster/combatGroup/combat_group.dart rename to lib/v3/screens/roster/combatGroup/combat_group.dart index 737093dd..89bc446b 100644 --- a/lib/screens/roster/combatGroup/combat_group.dart +++ b/lib/v3/screens/roster/combatGroup/combat_group.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/roster/combatGroup/group_header.dart'; -import 'package:gearforce/screens/upgrades/unit_upgrade_button.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/group_header.dart'; +import 'package:gearforce/v3/screens/upgrades/unit_upgrade_button.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:gearforce/widgets/unit_text_cell.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/combatGroup/combat_group_options_button.dart b/lib/v3/screens/roster/combatGroup/combat_group_options_button.dart similarity index 82% rename from lib/screens/roster/combatGroup/combat_group_options_button.dart rename to lib/v3/screens/roster/combatGroup/combat_group_options_button.dart index dabad98f..7ecd1005 100644 --- a/lib/screens/roster/combatGroup/combat_group_options_button.dart +++ b/lib/v3/screens/roster/combatGroup/combat_group_options_button.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/screens/roster/combatGroup/combat_group_options_dialog.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/combat_group_options_dialog.dart'; const _splashRadius = 20.0; diff --git a/lib/screens/roster/combatGroup/combat_group_options_dialog.dart b/lib/v3/screens/roster/combatGroup/combat_group_options_dialog.dart similarity index 92% rename from lib/screens/roster/combatGroup/combat_group_options_dialog.dart rename to lib/v3/screens/roster/combatGroup/combat_group_options_dialog.dart index 3ddff07d..ee834983 100644 --- a/lib/screens/roster/combatGroup/combat_group_options_dialog.dart +++ b/lib/v3/screens/roster/combatGroup/combat_group_options_dialog.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/screens/roster/combatGroup/delete_combat_group_dialog.dart'; -import 'package:gearforce/screens/roster/combatGroup/option_line.dart'; -import 'package:gearforce/screens/roster/combatGroup/rename_combat_group_dialog.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/delete_combat_group_dialog.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/option_line.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/rename_combat_group_dialog.dart'; import 'package:gearforce/widgets/options_section_title.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/combatGroup/combat_groups_display.dart b/lib/v3/screens/roster/combatGroup/combat_groups_display.dart similarity index 96% rename from lib/screens/roster/combatGroup/combat_groups_display.dart rename to lib/v3/screens/roster/combatGroup/combat_groups_display.dart index c815fd5c..2c62e83a 100644 --- a/lib/screens/roster/combatGroup/combat_groups_display.dart +++ b/lib/v3/screens/roster/combatGroup/combat_groups_display.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/combatGroup/combat_group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/combat_group.dart'; const double _tabBarHeight = 30.0; const double _addCGButtonHorizontalPadding = 10.0; diff --git a/lib/screens/roster/combatGroup/delete_combat_group_dialog.dart b/lib/v3/screens/roster/combatGroup/delete_combat_group_dialog.dart similarity index 100% rename from lib/screens/roster/combatGroup/delete_combat_group_dialog.dart rename to lib/v3/screens/roster/combatGroup/delete_combat_group_dialog.dart diff --git a/lib/screens/roster/combatGroup/group_actions_display.dart b/lib/v3/screens/roster/combatGroup/group_actions_display.dart similarity index 91% rename from lib/screens/roster/combatGroup/group_actions_display.dart rename to lib/v3/screens/roster/combatGroup/group_actions_display.dart index 3ca013fa..79d1f8a5 100644 --- a/lib/screens/roster/combatGroup/group_actions_display.dart +++ b/lib/v3/screens/roster/combatGroup/group_actions_display.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; import 'package:gearforce/widgets/display_value.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/combatGroup/group_header.dart b/lib/v3/screens/roster/combatGroup/group_header.dart similarity index 77% rename from lib/screens/roster/combatGroup/group_header.dart rename to lib/v3/screens/roster/combatGroup/group_header.dart index 957a660d..36782755 100644 --- a/lib/screens/roster/combatGroup/group_header.dart +++ b/lib/v3/screens/roster/combatGroup/group_header.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/combatGroup/combat_group_options_button.dart'; -import 'package:gearforce/screens/roster/combatGroup/group_actions_display.dart'; -import 'package:gearforce/screens/roster/combatGroup/veteran_group_checkbox_display.dart'; -import 'package:gearforce/screens/roster/combatGroup/select_role.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/combat_group_options_button.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/group_actions_display.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/veteran_group_checkbox_display.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/select_role.dart'; import 'package:gearforce/widgets/display_value.dart'; const _groupTypeNameWidth = 100.0; diff --git a/lib/screens/roster/combatGroup/option_line.dart b/lib/v3/screens/roster/combatGroup/option_line.dart similarity index 95% rename from lib/screens/roster/combatGroup/option_line.dart rename to lib/v3/screens/roster/combatGroup/option_line.dart index 7f01a2c0..2ddbf3a7 100644 --- a/lib/screens/roster/combatGroup/option_line.dart +++ b/lib/v3/screens/roster/combatGroup/option_line.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/rules/options/combat_group_options.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/rules/options/combat_group_options.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/combatGroup/rename_combat_group_dialog.dart b/lib/v3/screens/roster/combatGroup/rename_combat_group_dialog.dart similarity index 100% rename from lib/screens/roster/combatGroup/rename_combat_group_dialog.dart rename to lib/v3/screens/roster/combatGroup/rename_combat_group_dialog.dart diff --git a/lib/screens/roster/combatGroup/select_role.dart b/lib/v3/screens/roster/combatGroup/select_role.dart similarity index 89% rename from lib/screens/roster/combatGroup/select_role.dart rename to lib/v3/screens/roster/combatGroup/select_role.dart index b248bac6..5db99c38 100644 --- a/lib/screens/roster/combatGroup/select_role.dart +++ b/lib/v3/screens/roster/combatGroup/select_role.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; class SelectRole extends StatefulWidget { final Group group; diff --git a/lib/screens/roster/combatGroup/veteran_group_checkbox_display.dart b/lib/v3/screens/roster/combatGroup/veteran_group_checkbox_display.dart similarity index 95% rename from lib/screens/roster/combatGroup/veteran_group_checkbox_display.dart rename to lib/v3/screens/roster/combatGroup/veteran_group_checkbox_display.dart index 55cfb0a7..c2c8c1ee 100644 --- a/lib/screens/roster/combatGroup/veteran_group_checkbox_display.dart +++ b/lib/v3/screens/roster/combatGroup/veteran_group_checkbox_display.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/filehandler/downloader.dart b/lib/v3/screens/roster/filehandler/downloader.dart similarity index 85% rename from lib/screens/roster/filehandler/downloader.dart rename to lib/v3/screens/roster/filehandler/downloader.dart index 31992600..20813c80 100644 --- a/lib/screens/roster/filehandler/downloader.dart +++ b/lib/v3/screens/roster/filehandler/downloader.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:file_selector/file_selector.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/filehandler/fileHandler.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/filehandler/fileHandler.dart'; const String _defaultRosterFileName = 'hg-roster'; diff --git a/lib/screens/roster/filehandler/fileHandler.dart b/lib/v3/screens/roster/filehandler/fileHandler.dart similarity index 100% rename from lib/screens/roster/filehandler/fileHandler.dart rename to lib/v3/screens/roster/filehandler/fileHandler.dart diff --git a/lib/screens/roster/filehandler/uploader.dart b/lib/v3/screens/roster/filehandler/uploader.dart similarity index 72% rename from lib/screens/roster/filehandler/uploader.dart rename to lib/v3/screens/roster/filehandler/uploader.dart index e33d82ef..d5010897 100644 --- a/lib/screens/roster/filehandler/uploader.dart +++ b/lib/v3/screens/roster/filehandler/uploader.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'package:file_selector/file_selector.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/filehandler/fileHandler.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/filehandler/fileHandler.dart'; import 'package:gearforce/widgets/settings.dart'; -Future loadRoster(Data data, Settings settings) async { +Future loadRoster(DataV3 data, Settings settings) async { UnitRoster? resultRoster; const XTypeGroup typeGroup = XTypeGroup( diff --git a/lib/screens/roster/header/faction_rules_dialog.dart b/lib/v3/screens/roster/header/faction_rules_dialog.dart similarity index 95% rename from lib/screens/roster/header/faction_rules_dialog.dart rename to lib/v3/screens/roster/header/faction_rules_dialog.dart index 98cbb003..926189d8 100644 --- a/lib/screens/roster/header/faction_rules_dialog.dart +++ b/lib/v3/screens/roster/header/faction_rules_dialog.dart @@ -1,9 +1,9 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/screens/roster/header/faction_rules_line.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/screens/roster/header/faction_rules_line.dart'; const double _optionSectionWidth = 400; const double _optionSectionHeight = 33; diff --git a/lib/screens/roster/header/faction_rules_line.dart b/lib/v3/screens/roster/header/faction_rules_line.dart similarity index 97% rename from lib/screens/roster/header/faction_rules_line.dart rename to lib/v3/screens/roster/header/faction_rules_line.dart index 90dfa06e..ff0d5004 100644 --- a/lib/screens/roster/header/faction_rules_line.dart +++ b/lib/v3/screens/roster/header/faction_rules_line.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/rules/rule.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/roster/header/roster_header_info.dart b/lib/v3/screens/roster/header/roster_header_info.dart similarity index 92% rename from lib/screens/roster/header/roster_header_info.dart rename to lib/v3/screens/roster/header/roster_header_info.dart index d3dc56c0..8bceff89 100644 --- a/lib/screens/roster/header/roster_header_info.dart +++ b/lib/v3/screens/roster/header/roster_header_info.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/rules/rule.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/header/faction_rules_dialog.dart'; -import 'package:gearforce/screens/roster/header/select_faction.dart'; -import 'package:gearforce/screens/roster/header/select_force_leader.dart'; -import 'package:gearforce/screens/roster/header/select_subfaction.dart'; -import 'package:gearforce/screens/roster/roster_tv_totals_display_line.dart'; -import 'package:gearforce/screens/upgrades/unit_upgrade_button.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/header/faction_rules_dialog.dart'; +import 'package:gearforce/v3/screens/roster/header/select_faction.dart'; +import 'package:gearforce/v3/screens/roster/header/select_force_leader.dart'; +import 'package:gearforce/v3/screens/roster/header/select_subfaction.dart'; +import 'package:gearforce/v3/screens/roster/roster_tv_totals_display_line.dart'; +import 'package:gearforce/v3/screens/upgrades/unit_upgrade_button.dart'; import 'package:gearforce/widgets/display_value.dart'; import 'package:provider/provider.dart'; @@ -150,7 +150,7 @@ class RosterHeaderInfo extends StatelessWidget { bottom: 5, ), child: SelectFaction( - factions: Provider.of(context).factions(), + factions: Provider.of(context).factions(), selectedFaction: roster.factionNotifier, ), ), @@ -208,7 +208,7 @@ class RosterHeaderInfo extends StatelessWidget { bottom: 5, ), child: SelectSubFaction( - factions: Provider.of(context).factions(), + factions: Provider.of(context).factions(), selectedFaction: roster.factionNotifier, selectedSubFaction: roster.rulesetNotifer, ), diff --git a/lib/screens/roster/header/select_faction.dart b/lib/v3/screens/roster/header/select_faction.dart similarity index 89% rename from lib/screens/roster/header/select_faction.dart rename to lib/v3/screens/roster/header/select_faction.dart index 43e10dfa..2f876059 100644 --- a/lib/screens/roster/header/select_faction.dart +++ b/lib/v3/screens/roster/header/select_faction.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; @@ -25,7 +25,7 @@ class _SelectFactionState extends State { @override Widget build(BuildContext context) { - final data = context.watch(); + final data = context.watch(); final settings = context.watch(); return DropdownButton( value: widget.selectedFaction.value.factionType, diff --git a/lib/screens/roster/header/select_force_leader.dart b/lib/v3/screens/roster/header/select_force_leader.dart similarity index 94% rename from lib/screens/roster/header/select_force_leader.dart rename to lib/v3/screens/roster/header/select_force_leader.dart index e73aa790..f5847372 100644 --- a/lib/screens/roster/header/select_force_leader.dart +++ b/lib/v3/screens/roster/header/select_force_leader.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; class SelectForceLeader extends StatefulWidget { const SelectForceLeader({ diff --git a/lib/screens/roster/header/select_subfaction.dart b/lib/v3/screens/roster/header/select_subfaction.dart similarity index 93% rename from lib/screens/roster/header/select_subfaction.dart rename to lib/v3/screens/roster/header/select_subfaction.dart index bb0e2165..06421cdc 100644 --- a/lib/screens/roster/header/select_subfaction.dart +++ b/lib/v3/screens/roster/header/select_subfaction.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:gearforce/models/factions/faction.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/factions/faction.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; class SelectSubFaction extends StatefulWidget { const SelectSubFaction( diff --git a/lib/screens/roster/input_roster_id.dart b/lib/v3/screens/roster/input_roster_id.dart similarity index 90% rename from lib/screens/roster/input_roster_id.dart rename to lib/v3/screens/roster/input_roster_id.dart index 6b4153c9..736e0b98 100644 --- a/lib/screens/roster/input_roster_id.dart +++ b/lib/v3/screens/roster/input_roster_id.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/roster/roster.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; import 'package:gearforce/widgets/api/api_service.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; -Future showInputRosterId(BuildContext context, Data data) async { +Future showInputRosterId(BuildContext context, DataV3 data) async { final settings = context.read(); var result = await showDialog( @@ -18,7 +18,7 @@ Future showInputRosterId(BuildContext context, Data data) async { return null; } - return await ApiService.getRoster(data, result, settings); + return await ApiService.getV3Roster(data, result, settings); } class RosterIdInputDialog extends StatefulWidget { diff --git a/lib/screens/roster/markdown.dart b/lib/v3/screens/roster/markdown.dart similarity index 94% rename from lib/screens/roster/markdown.dart rename to lib/v3/screens/roster/markdown.dart index 6f384cd5..13712a2e 100644 --- a/lib/screens/roster/markdown.dart +++ b/lib/v3/screens/roster/markdown.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; void showGeneratedMarkdown( BuildContext context, diff --git a/lib/screens/roster/pdf/pdf.dart b/lib/v3/screens/roster/pdf/pdf.dart similarity index 94% rename from lib/screens/roster/pdf/pdf.dart rename to lib/v3/screens/roster/pdf/pdf.dart index 85d9b9f6..4f0960d2 100644 --- a/lib/screens/roster/pdf/pdf.dart +++ b/lib/v3/screens/roster/pdf/pdf.dart @@ -1,12 +1,12 @@ import 'dart:typed_data'; import 'package:file_selector/file_selector.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/pdf/record_sheet/record_sheet.dart'; -import 'package:gearforce/screens/roster/pdf/record_sheet/rules_sheet.dart'; -import 'package:gearforce/screens/roster/pdf/record_sheet/traits_sheet.dart'; -import 'package:gearforce/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart'; -import 'package:gearforce/screens/roster/pdf/unit_cards/vertical_unit_cards.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/pdf/record_sheet/record_sheet.dart'; +import 'package:gearforce/v3/screens/roster/pdf/record_sheet/rules_sheet.dart'; +import 'package:gearforce/v3/screens/roster/pdf/record_sheet/traits_sheet.dart'; +import 'package:gearforce/v3/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart'; +import 'package:gearforce/v3/screens/roster/pdf/unit_cards/vertical_unit_cards.dart'; import 'package:gearforce/widgets/pdf_settings.dart'; import 'package:pdf/pdf.dart'; import 'package:pdf/widgets.dart' as pw; diff --git a/lib/screens/roster/pdf/pdf_settings_dialog.dart b/lib/v3/screens/roster/pdf/pdf_settings_dialog.dart similarity index 100% rename from lib/screens/roster/pdf/pdf_settings_dialog.dart rename to lib/v3/screens/roster/pdf/pdf_settings_dialog.dart diff --git a/lib/screens/roster/pdf/record_sheet/combat_groups.dart b/lib/v3/screens/roster/pdf/record_sheet/combat_groups.dart similarity index 95% rename from lib/screens/roster/pdf/record_sheet/combat_groups.dart rename to lib/v3/screens/roster/pdf/record_sheet/combat_groups.dart index a30d565f..ff69e2b8 100644 --- a/lib/screens/roster/pdf/record_sheet/combat_groups.dart +++ b/lib/v3/screens/roster/pdf/record_sheet/combat_groups.dart @@ -1,11 +1,11 @@ import 'dart:math'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; import 'package:pdf/widgets.dart' as pw; const double _headerTextSize = 12; diff --git a/lib/screens/roster/pdf/record_sheet/header.dart b/lib/v3/screens/roster/pdf/record_sheet/header.dart similarity index 98% rename from lib/screens/roster/pdf/record_sheet/header.dart rename to lib/v3/screens/roster/pdf/record_sheet/header.dart index 215c2ffe..19b76731 100644 --- a/lib/screens/roster/pdf/record_sheet/header.dart +++ b/lib/v3/screens/roster/pdf/record_sheet/header.dart @@ -1,5 +1,5 @@ -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; import 'package:pdf/widgets.dart' as pw; const String _recordSheetHeadingText = 'Heavy Gear Blitz Force Record Sheet'; diff --git a/lib/screens/roster/pdf/record_sheet/record_sheet.dart b/lib/v3/screens/roster/pdf/record_sheet/record_sheet.dart similarity index 79% rename from lib/screens/roster/pdf/record_sheet/record_sheet.dart rename to lib/v3/screens/roster/pdf/record_sheet/record_sheet.dart index 05ee6c31..1e0c9f1c 100644 --- a/lib/screens/roster/pdf/record_sheet/record_sheet.dart +++ b/lib/v3/screens/roster/pdf/record_sheet/record_sheet.dart @@ -1,6 +1,6 @@ -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/pdf/record_sheet/combat_groups.dart'; -import 'package:gearforce/screens/roster/pdf/record_sheet/header.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/pdf/record_sheet/combat_groups.dart'; +import 'package:gearforce/v3/screens/roster/pdf/record_sheet/header.dart'; import 'package:pdf/widgets.dart' as pw; final sectionDivide = pw.Padding(padding: pw.EdgeInsets.only(bottom: 10.0)); diff --git a/lib/screens/roster/pdf/record_sheet/rules_sheet.dart b/lib/v3/screens/roster/pdf/record_sheet/rules_sheet.dart similarity index 95% rename from lib/screens/roster/pdf/record_sheet/rules_sheet.dart rename to lib/v3/screens/roster/pdf/record_sheet/rules_sheet.dart index 5ce944fc..881392d9 100644 --- a/lib/screens/roster/pdf/record_sheet/rules_sheet.dart +++ b/lib/v3/screens/roster/pdf/record_sheet/rules_sheet.dart @@ -1,5 +1,5 @@ -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rule.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rule.dart'; import 'package:gearforce/widgets/pdf_settings.dart'; import 'package:pdf/widgets.dart' as pw; diff --git a/lib/screens/roster/pdf/record_sheet/traits_sheet.dart b/lib/v3/screens/roster/pdf/record_sheet/traits_sheet.dart similarity index 97% rename from lib/screens/roster/pdf/record_sheet/traits_sheet.dart rename to lib/v3/screens/roster/pdf/record_sheet/traits_sheet.dart index 2cba8925..30c0c83b 100644 --- a/lib/screens/roster/pdf/record_sheet/traits_sheet.dart +++ b/lib/v3/screens/roster/pdf/record_sheet/traits_sheet.dart @@ -1,4 +1,4 @@ -import 'package:gearforce/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; import 'package:pdf/widgets.dart' as pw; const double _headerTextSize = 12; diff --git a/lib/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart b/lib/v3/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart similarity index 98% rename from lib/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart rename to lib/v3/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart index a6397715..80e2a2d1 100644 --- a/lib/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart +++ b/lib/v3/screens/roster/pdf/unit_cards/horizontal_unit_cards.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; import 'package:pdf/pdf.dart'; import 'package:pdf/widgets.dart' as pw; diff --git a/lib/screens/roster/pdf/unit_cards/vertical_unit_cards.dart b/lib/v3/screens/roster/pdf/unit_cards/vertical_unit_cards.dart similarity index 98% rename from lib/screens/roster/pdf/unit_cards/vertical_unit_cards.dart rename to lib/v3/screens/roster/pdf/unit_cards/vertical_unit_cards.dart index 1f78bbe6..c636f2a9 100644 --- a/lib/screens/roster/pdf/unit_cards/vertical_unit_cards.dart +++ b/lib/v3/screens/roster/pdf/unit_cards/vertical_unit_cards.dart @@ -1,8 +1,8 @@ -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; import 'package:pdf/pdf.dart'; import 'package:pdf/widgets.dart' as pw; diff --git a/lib/screens/roster/roster.dart b/lib/v3/screens/roster/roster.dart similarity index 91% rename from lib/screens/roster/roster.dart rename to lib/v3/screens/roster/roster.dart index 12e217bc..61a530be 100644 --- a/lib/screens/roster/roster.dart +++ b/lib/v3/screens/roster/roster.dart @@ -1,23 +1,24 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/filehandler/downloader.dart'; -import 'package:gearforce/screens/roster/filehandler/uploader.dart'; -import 'package:gearforce/screens/roster/input_roster_id.dart'; -import 'package:gearforce/screens/roster/markdown.dart'; -import 'package:gearforce/screens/roster/pdf/pdf.dart'; -import 'package:gearforce/screens/roster/pdf/pdf_settings_dialog.dart'; -import 'package:gearforce/screens/roster/roster_display.dart'; -import 'package:gearforce/screens/roster/show_roster_id.dart'; -import 'package:gearforce/screens/settings/application_settings_dialog.dart'; -import 'package:gearforce/screens/unitSelector/unit_selection.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/filehandler/downloader.dart'; +import 'package:gearforce/v3/screens/roster/filehandler/uploader.dart'; +import 'package:gearforce/v3/screens/roster/input_roster_id.dart'; +import 'package:gearforce/v3/screens/roster/markdown.dart'; +import 'package:gearforce/v3/screens/roster/pdf/pdf.dart'; +import 'package:gearforce/v3/screens/roster/pdf/pdf_settings_dialog.dart'; +import 'package:gearforce/v3/screens/roster/roster_display.dart'; +import 'package:gearforce/v3/screens/roster/show_roster_id.dart'; +import 'package:gearforce/v3/screens/settings/application_settings_dialog.dart'; +import 'package:gearforce/v3/screens/unitSelector/unit_selection.dart'; import 'package:gearforce/widgets/api/api_service.dart'; import 'package:gearforce/widgets/confirmation_dialog.dart'; import 'package:gearforce/widgets/pdf_settings.dart'; import 'package:gearforce/widgets/roster_id.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:gearforce/widgets/version_checker.dart'; +import 'package:gearforce/widgets/version_selector.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher_string.dart'; @@ -29,21 +30,23 @@ const String _dp9URL = 'https://www.dp9.com/'; const String _sourceCodeURL = 'https://github.com/Ariemeth/gearforce-flutter'; class RosterWidget extends StatefulWidget { - RosterWidget({ - Key? key, - required this.title, - required this.data, - required this.rosterId, - required this.version, - required this.settings, - }) : super(key: key); + RosterWidget( + {Key? key, + required this.title, + required this.data, + required this.rosterId, + required this.version, + required this.settings, + required this.versionSelector}) + : super(key: key); final String? title; - final Data data; + final DataV3 data; final RosterId rosterId; final String version; final hScrollController = ScrollController(); final Settings settings; + final VersionSelector versionSelector; @override _RosterWidgetState createState() => _RosterWidgetState(); @@ -65,7 +68,7 @@ class _RosterWidgetState extends State { return; } - final loadedRoster = await await ApiService.getRoster( + final loadedRoster = await await ApiService.getV3Roster( widget.data, widget.rosterId.Id!, widget.settings, @@ -77,7 +80,7 @@ class _RosterWidgetState extends State { @override Widget build(BuildContext context) { - final data = context.watch(); + final data = context.watch(); final appSettings = context.watch(); return Scaffold( @@ -87,6 +90,7 @@ class _RosterWidgetState extends State { title: Row( children: [ Text(widget.title!), + widget.versionSelector, Spacer(), VersionChecker( currentVersion: widget.version, diff --git a/lib/screens/roster/roster_display.dart b/lib/v3/screens/roster/roster_display.dart similarity index 83% rename from lib/screens/roster/roster_display.dart rename to lib/v3/screens/roster/roster_display.dart index 6a422393..83826a21 100644 --- a/lib/screens/roster/roster_display.dart +++ b/lib/v3/screens/roster/roster_display.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/screens/roster/combatGroup/combat_groups_display.dart'; -import 'package:gearforce/screens/roster/header/roster_header_info.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/combat_groups_display.dart'; +import 'package:gearforce/v3/screens/roster/header/roster_header_info.dart'; import 'package:provider/provider.dart'; class RosterDisplay extends StatelessWidget { diff --git a/lib/screens/roster/roster_tv_totals_display_line.dart b/lib/v3/screens/roster/roster_tv_totals_display_line.dart similarity index 100% rename from lib/screens/roster/roster_tv_totals_display_line.dart rename to lib/v3/screens/roster/roster_tv_totals_display_line.dart diff --git a/lib/screens/roster/show_roster_id.dart b/lib/v3/screens/roster/show_roster_id.dart similarity index 95% rename from lib/screens/roster/show_roster_id.dart rename to lib/v3/screens/roster/show_roster_id.dart index ded9ab9f..974f1a89 100644 --- a/lib/screens/roster/show_roster_id.dart +++ b/lib/v3/screens/roster/show_roster_id.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:gearforce/models/roster/roster.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; import 'package:gearforce/widgets/api/api_service.dart'; Future showRosterIdDialog(BuildContext context, UnitRoster roster) async { - final results = await ApiService.saveRoster(roster); + final results = await ApiService.saveV3Roster(roster); await showDialog( context: context, diff --git a/lib/screens/settings/application_settings_dialog.dart b/lib/v3/screens/settings/application_settings_dialog.dart similarity index 96% rename from lib/screens/settings/application_settings_dialog.dart rename to lib/v3/screens/settings/application_settings_dialog.dart index 02515377..061edf8c 100644 --- a/lib/screens/settings/application_settings_dialog.dart +++ b/lib/v3/screens/settings/application_settings_dialog.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/screens/settings/settings_checkbox_option_line.dart'; -import 'package:gearforce/screens/settings/settings_value_option_line.dart'; +import 'package:gearforce/v3/screens/settings/settings_checkbox_option_line.dart'; +import 'package:gearforce/v3/screens/settings/settings_value_option_line.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/settings/settings_checkbox_option_line.dart b/lib/v3/screens/settings/settings_checkbox_option_line.dart similarity index 100% rename from lib/screens/settings/settings_checkbox_option_line.dart rename to lib/v3/screens/settings/settings_checkbox_option_line.dart diff --git a/lib/screens/settings/settings_section_heading.dart b/lib/v3/screens/settings/settings_section_heading.dart similarity index 100% rename from lib/screens/settings/settings_section_heading.dart rename to lib/v3/screens/settings/settings_section_heading.dart diff --git a/lib/screens/settings/settings_value_option_line.dart b/lib/v3/screens/settings/settings_value_option_line.dart similarity index 100% rename from lib/screens/settings/settings_value_option_line.dart rename to lib/v3/screens/settings/settings_value_option_line.dart diff --git a/lib/screens/unit/unit_card.dart b/lib/v3/screens/unit/unit_card.dart similarity index 98% rename from lib/screens/unit/unit_card.dart rename to lib/v3/screens/unit/unit_card.dart index 7de1cedb..445070bc 100644 --- a/lib/screens/unit/unit_card.dart +++ b/lib/v3/screens/unit/unit_card.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/unit/unit_preview_dialog.dart b/lib/v3/screens/unit/unit_preview_dialog.dart similarity index 88% rename from lib/screens/unit/unit_preview_dialog.dart rename to lib/v3/screens/unit/unit_preview_dialog.dart index c61319cd..722f1b5c 100644 --- a/lib/screens/unit/unit_preview_dialog.dart +++ b/lib/v3/screens/unit/unit_preview_dialog.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/unit/unit_card.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/unit/unit_card.dart'; class UnitPreviewDialog extends StatelessWidget { final Unit unit; diff --git a/lib/screens/unitSelector/selected_unit_feedback.dart b/lib/v3/screens/unitSelector/selected_unit_feedback.dart similarity index 87% rename from lib/screens/unitSelector/selected_unit_feedback.dart rename to lib/v3/screens/unitSelector/selected_unit_feedback.dart index f7ec8bc9..1bd6bbc0 100644 --- a/lib/screens/unitSelector/selected_unit_feedback.dart +++ b/lib/v3/screens/unitSelector/selected_unit_feedback.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/unitSelector/unit_selection_text_Cell.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/unitSelector/unit_selection_text_Cell.dart'; class SelectedUnitFeedback extends StatelessWidget { final Unit unit; diff --git a/lib/screens/unitSelector/selected_unit_model_cell.dart b/lib/v3/screens/unitSelector/selected_unit_model_cell.dart similarity index 89% rename from lib/screens/unitSelector/selected_unit_model_cell.dart rename to lib/v3/screens/unitSelector/selected_unit_model_cell.dart index d7f8e2c7..869cb73c 100644 --- a/lib/screens/unitSelector/selected_unit_model_cell.dart +++ b/lib/v3/screens/unitSelector/selected_unit_model_cell.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/screens/unitSelector/unit_selection_text_Cell.dart'; +import 'package:gearforce/v3/screens/unitSelector/unit_selection_text_Cell.dart'; class SelectedUnitModelCell extends StatelessWidget { const SelectedUnitModelCell({ diff --git a/lib/screens/unitSelector/selection_filters.dart b/lib/v3/screens/unitSelector/selection_filters.dart similarity index 96% rename from lib/screens/unitSelector/selection_filters.dart rename to lib/v3/screens/unitSelector/selection_filters.dart index cd004c86..57c009b6 100644 --- a/lib/screens/unitSelector/selection_filters.dart +++ b/lib/v3/screens/unitSelector/selection_filters.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; import 'package:provider/provider.dart'; const _filterHint = 'Filter using a comma separated list'; diff --git a/lib/screens/unitSelector/unit_preview_button.dart b/lib/v3/screens/unitSelector/unit_preview_button.dart similarity index 86% rename from lib/screens/unitSelector/unit_preview_button.dart rename to lib/v3/screens/unitSelector/unit_preview_button.dart index 6c4b882e..f5634b10 100644 --- a/lib/screens/unitSelector/unit_preview_button.dart +++ b/lib/v3/screens/unitSelector/unit_preview_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/unit/unit_preview_dialog.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/unit/unit_preview_dialog.dart'; const _buttonIcon = Icons.menu_open_sharp; diff --git a/lib/screens/unitSelector/unit_selection.dart b/lib/v3/screens/unitSelector/unit_selection.dart similarity index 91% rename from lib/screens/unitSelector/unit_selection.dart rename to lib/v3/screens/unitSelector/unit_selection.dart index 4444660f..c241edf2 100644 --- a/lib/screens/unitSelector/unit_selection.dart +++ b/lib/v3/screens/unitSelector/unit_selection.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/rules/options/special_unit_filter.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/unitSelector/selected_unit_feedback.dart'; -import 'package:gearforce/screens/unitSelector/selected_unit_model_cell.dart'; -import 'package:gearforce/screens/unitSelector/selection_filters.dart'; -import 'package:gearforce/screens/unitSelector/unit_preview_button.dart'; -import 'package:gearforce/screens/unitSelector/unit_selection_text_Cell.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/rules/options/special_unit_filter.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/unitSelector/selected_unit_feedback.dart'; +import 'package:gearforce/v3/screens/unitSelector/selected_unit_model_cell.dart'; +import 'package:gearforce/v3/screens/unitSelector/selection_filters.dart'; +import 'package:gearforce/v3/screens/unitSelector/unit_preview_button.dart'; +import 'package:gearforce/v3/screens/unitSelector/unit_selection_text_Cell.dart'; import 'package:provider/provider.dart'; const _reactSymbol = 'ยป'; diff --git a/lib/screens/unitSelector/unit_selection_text_Cell.dart b/lib/v3/screens/unitSelector/unit_selection_text_Cell.dart similarity index 100% rename from lib/screens/unitSelector/unit_selection_text_Cell.dart rename to lib/v3/screens/unitSelector/unit_selection_text_Cell.dart diff --git a/lib/screens/upgrades/mod_option_button.dart b/lib/v3/screens/upgrades/mod_option_button.dart similarity index 89% rename from lib/screens/upgrades/mod_option_button.dart rename to lib/v3/screens/upgrades/mod_option_button.dart index fd2841bf..855a3929 100644 --- a/lib/screens/upgrades/mod_option_button.dart +++ b/lib/v3/screens/upgrades/mod_option_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/screens/upgrades/upgrade_options.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/screens/upgrades/upgrade_options.dart'; class ModOptionButton extends StatefulWidget { ModOptionButton({ diff --git a/lib/screens/upgrades/option_dropdown.dart b/lib/v3/screens/upgrades/option_dropdown.dart similarity index 95% rename from lib/screens/upgrades/option_dropdown.dart rename to lib/v3/screens/upgrades/option_dropdown.dart index 2d2580f5..af4b8d53 100644 --- a/lib/screens/upgrades/option_dropdown.dart +++ b/lib/v3/screens/upgrades/option_dropdown.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; class OptionDropdown extends StatefulWidget { OptionDropdown({ diff --git a/lib/screens/upgrades/unit_mod_line.dart b/lib/v3/screens/upgrades/unit_mod_line.dart similarity index 94% rename from lib/screens/upgrades/unit_mod_line.dart rename to lib/v3/screens/upgrades/unit_mod_line.dart index f5e0159a..81a8cce1 100644 --- a/lib/screens/upgrades/unit_mod_line.dart +++ b/lib/v3/screens/upgrades/unit_mod_line.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/upgrades/mod_option_button.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/upgrades/mod_option_button.dart'; const int _maxUpgradeNameLines = 2; const int _maxUpgradeDescriptionLines = 4; diff --git a/lib/screens/upgrades/unit_upgrade_button.dart b/lib/v3/screens/upgrades/unit_upgrade_button.dart similarity index 81% rename from lib/screens/upgrades/unit_upgrade_button.dart rename to lib/v3/screens/upgrades/unit_upgrade_button.dart index 8ae4a1e1..6674b9f1 100644 --- a/lib/screens/upgrades/unit_upgrade_button.dart +++ b/lib/v3/screens/upgrades/unit_upgrade_button.dart @@ -1,11 +1,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/roster/combatGroup/combat_group.dart'; -import 'package:gearforce/screens/upgrades/upgrades_dialog.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/roster/combatGroup/combat_group.dart'; +import 'package:gearforce/v3/screens/upgrades/upgrades_dialog.dart'; import 'package:provider/provider.dart'; class UnitUpgradeButton extends StatelessWidget { diff --git a/lib/screens/upgrades/upgrade_display_line.dart b/lib/v3/screens/upgrades/upgrade_display_line.dart similarity index 61% rename from lib/screens/upgrades/upgrade_display_line.dart rename to lib/v3/screens/upgrades/upgrade_display_line.dart index b8b30342..f9d146b0 100644 --- a/lib/screens/upgrades/upgrade_display_line.dart +++ b/lib/v3/screens/upgrades/upgrade_display_line.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/upgrades/unit_mod_line.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/upgrades/unit_mod_line.dart'; class UpgradeDisplayLine extends StatelessWidget { final BaseModification mod; diff --git a/lib/screens/upgrades/upgrade_options.dart b/lib/v3/screens/upgrades/upgrade_options.dart similarity index 89% rename from lib/screens/upgrades/upgrade_options.dart rename to lib/v3/screens/upgrades/upgrade_options.dart index eb03ddb0..15528f4e 100644 --- a/lib/screens/upgrades/upgrade_options.dart +++ b/lib/v3/screens/upgrades/upgrade_options.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/mods/modification_option.dart'; -import 'package:gearforce/screens/upgrades/option_dropdown.dart'; +import 'package:gearforce/v3/models/mods/modification_option.dart'; +import 'package:gearforce/v3/screens/upgrades/option_dropdown.dart'; class UpgradeOptions extends StatelessWidget { UpgradeOptions({ diff --git a/lib/screens/upgrades/upgrades_dialog.dart b/lib/v3/screens/upgrades/upgrades_dialog.dart similarity index 88% rename from lib/screens/upgrades/upgrades_dialog.dart rename to lib/v3/screens/upgrades/upgrades_dialog.dart index 96e19314..3f0819cf 100644 --- a/lib/screens/upgrades/upgrades_dialog.dart +++ b/lib/v3/screens/upgrades/upgrades_dialog.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/base_modification.dart'; -import 'package:gearforce/models/mods/customUpgrades/custom_modifiation.dart'; -import 'package:gearforce/models/mods/duelist/duelist_modification.dart'; -import 'package:gearforce/models/mods/factionUpgrades/faction_mod.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/screens/unit/unit_card.dart'; -import 'package:gearforce/screens/upgrades/upgrade_display_line.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/base_modification.dart'; +import 'package:gearforce/v3/models/mods/customUpgrades/custom_modifiation.dart'; +import 'package:gearforce/v3/models/mods/duelist/duelist_modification.dart'; +import 'package:gearforce/v3/models/mods/factionUpgrades/faction_mod.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/screens/unit/unit_card.dart'; +import 'package:gearforce/v3/screens/upgrades/upgrade_display_line.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/widgets/api/api_service.dart b/lib/widgets/api/api_service.dart index 99592a05..93e21f05 100644 --- a/lib/widgets/api/api_service.dart +++ b/lib/widgets/api/api_service.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/roster/roster.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:http/http.dart' as http; import 'package:uuid/uuid.dart'; @@ -12,8 +12,8 @@ const _game_storage_url = 'https://gs.metadiversions.com/gf'; class ApiService { const ApiService(); - static Future getRoster( - Data data, String id, Settings settings) async { + static Future getV3Roster( + DataV3 data, String id, Settings settings) async { // id must be a uuid if (!Uuid.isValidUUID(fromString: id.trim())) { return null; @@ -31,7 +31,7 @@ class ApiService { return null; } - static Future<(String?, String?)> saveRoster(UnitRoster roster) async { + static Future<(String?, String?)> saveV3Roster(UnitRoster roster) async { final Map payload = {}; payload['roster'] = roster.toJson(); final response = await http.post( diff --git a/lib/widgets/version_selector.dart b/lib/widgets/version_selector.dart new file mode 100644 index 00000000..e1378061 --- /dev/null +++ b/lib/widgets/version_selector.dart @@ -0,0 +1,42 @@ +import 'package:flutter/material.dart'; + +class VersionSelector extends StatefulWidget { + const VersionSelector(); + + @override + _VersionSelectorState createState() => _VersionSelectorState(); +} + +class _VersionSelectorState extends State { + String _currentSelectedVersion = 'v3.1'; + final versions = ['v3.1'] + .map((String value) => DropdownMenuItem( + value: value, + child: Text(value), + )) + .toList(); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.only(left: 15.0), + child: DropdownButton( + value: _currentSelectedVersion, + items: versions, + onChanged: (String? value) { + if (value == null) { + return; + } + + setState(() { + if (_currentSelectedVersion == value) { + return; + } + _currentSelectedVersion = value; + Navigator.pushNamed(context, '/${value}'); + }); + }, + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index d1e2c4f4..0c4b2661 100644 --- 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: 1.13.1 +version: 1.14.0 environment: sdk: ">=3.0.0" diff --git a/test/data/data_test.dart b/test/v3/data/data_test.dart similarity index 90% rename from test/data/data_test.dart rename to test/v3/data/data_test.dart index 056635e1..5d54eec4 100644 --- a/test/data/data_test.dart +++ b/test/v3/data/data_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/factions/faction_type.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/factions/faction_type.dart'; import 'package:gearforce/widgets/settings.dart'; void main() { @@ -11,96 +11,96 @@ void main() { }); test('loading the data files', () { - final data = Data(); + final data = DataV3(); expect(data.load(Settings()), completes); }); test('ensure faction list loaded', () async { - final data = Data(); + final data = DataV3(); await data .load(Settings()) .whenComplete(() => expect(data.factions().length, greaterThan(0))); }); test('ensure north unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.North]).length, greaterThan(0))); }); test('ensure south unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.South]).length, greaterThan(0))); }); test('ensure black talon unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.BlackTalon]).length, greaterThan(0))); }); test('ensure caprice unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.Caprice]).length, greaterThan(0))); }); test('ensure cef unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.CEF]).length, greaterThan(0))); }); test('ensure eden unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.Eden]).length, greaterThan(0))); }); test('ensure nucoal unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.NuCoal]).length, greaterThan(0))); }); test('ensure terrain unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.Terrain]).length, greaterThan(0))); }); test('ensure universal unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.Universal]).length, greaterThan(0))); }); test('ensure utopia unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.Utopia]).length, greaterThan(0))); }); test('ensure peace river unit list loads', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()).whenComplete(() => expect( data.getUnits(baseFactionFilters: [FactionType.PeaceRiver]).length, greaterThan(0))); }); test('test unitlist with name filter', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()); expect( data.getUnits( @@ -121,7 +121,7 @@ void main() { }); test('test unitlist with trait filter', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()); expect( data.getUnits( @@ -142,7 +142,7 @@ void main() { }); test('test unitlist with trait filter and name filter', () async { - final data = Data(); + final data = DataV3(); await data.load(Settings()); expect( data.getUnits( diff --git a/test/models/combatGroups/combat_groups_test.dart b/test/v3/models/combatGroups/combat_groups_test.dart similarity index 84% rename from test/models/combatGroups/combat_groups_test.dart rename to test/v3/models/combatGroups/combat_groups_test.dart index bb6eeb47..2addfead 100644 --- a/test/models/combatGroups/combat_groups_test.dart +++ b/test/v3/models/combatGroups/combat_groups_test.dart @@ -1,10 +1,10 @@ -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/movement.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/combatGroups/group_test.dart b/test/v3/models/combatGroups/group_test.dart similarity index 89% rename from test/models/combatGroups/group_test.dart rename to test/v3/models/combatGroups/group_test.dart index e41f92a8..31589fcb 100644 --- a/test/models/combatGroups/group_test.dart +++ b/test/v3/models/combatGroups/group_test.dart @@ -1,9 +1,9 @@ -import 'package:gearforce/models/combatGroups/group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/north.dart'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/role.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/combatGroups/group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/north.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/mods/modification_test.dart b/test/v3/models/mods/modification_test.dart similarity index 77% rename from test/models/mods/modification_test.dart rename to test/v3/models/mods/modification_test.dart index aed1efe5..7b2284da 100644 --- a/test/models/mods/modification_test.dart +++ b/test/v3/models/mods/modification_test.dart @@ -1,16 +1,16 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:test/test.dart'; void main() { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final RuleSet rs = DefaultRuleSet(data, settings: settings); test('check default modification constructor', () { final m = UnitModification( diff --git a/test/models/mods/mods_test.dart b/test/v3/models/mods/mods_test.dart similarity index 96% rename from test/models/mods/mods_test.dart rename to test/v3/models/mods/mods_test.dart index da8dd5e2..ee0f63ee 100644 --- a/test/models/mods/mods_test.dart +++ b/test/v3/models/mods/mods_test.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/mods/mods.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/mods/mods.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/mods/standardUpgrades/standard_modification_test.dart b/test/v3/models/mods/standardUpgrades/standard_modification_test.dart similarity index 94% rename from test/models/mods/standardUpgrades/standard_modification_test.dart rename to test/v3/models/mods/standardUpgrades/standard_modification_test.dart index 8553c466..a02cd073 100644 --- a/test/models/mods/standardUpgrades/standard_modification_test.dart +++ b/test/v3/models/mods/standardUpgrades/standard_modification_test.dart @@ -1,18 +1,18 @@ -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/mods/standardUpgrades/standard_modification.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/rules/rulesets/rule_set.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/mods/standardUpgrades/standard_modification.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; import 'package:gearforce/widgets/settings.dart'; import 'package:test/test.dart'; void main() { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final RuleSet rs = DefaultRuleSet(data, settings: settings); test('test Anti-Air Swap requirement check for weapon type', () { final w1 = buildWeapon('LATM', hasReact: true)!; diff --git a/test/models/mods/unitUpgrades/unit_upgrades_test.dart b/test/v3/models/mods/unitUpgrades/unit_upgrades_test.dart similarity index 88% rename from test/models/mods/unitUpgrades/unit_upgrades_test.dart rename to test/v3/models/mods/unitUpgrades/unit_upgrades_test.dart index 1476139e..b4d415cd 100644 --- a/test/models/mods/unitUpgrades/unit_upgrades_test.dart +++ b/test/v3/models/mods/unitUpgrades/unit_upgrades_test.dart @@ -1,6 +1,6 @@ -import 'package:gearforce/models/mods/unitUpgrades/north.dart'; -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/north.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/roster/roster_test.dart b/test/v3/models/roster/roster_test.dart similarity index 85% rename from test/models/roster/roster_test.dart rename to test/v3/models/roster/roster_test.dart index 50ae612d..c686a738 100644 --- a/test/models/roster/roster_test.dart +++ b/test/v3/models/roster/roster_test.dart @@ -1,10 +1,10 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:gearforce/data/data.dart'; -import 'package:gearforce/models/combatGroups/combat_group.dart'; -import 'package:gearforce/models/roster/roster.dart'; -import 'package:gearforce/models/unit/command.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/data/data.dart'; +import 'package:gearforce/v3/models/combatGroups/combat_group.dart'; +import 'package:gearforce/v3/models/roster/roster.dart'; +import 'package:gearforce/v3/models/unit/command.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:gearforce/widgets/settings.dart'; void main() { @@ -16,7 +16,7 @@ void main() { test('create default CombatGroup', () { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final roster = UnitRoster(data, settings); expect(roster.getCGs().length, equals(1), reason: 'check cg length to ensure proper construction'); @@ -24,7 +24,7 @@ void main() { test('get default cg', () { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final roster = UnitRoster(data, settings); final cg = roster.getCG('CG 1'); expect(cg!.name, equals('CG 1'), reason: 'check cg default name'); @@ -36,7 +36,7 @@ void main() { test('add new cg', () { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final roster = UnitRoster(data, settings); final cg = CombatGroup('test1'); cg.primary.addUnit(Unit(core: UnitCore.test())); @@ -50,7 +50,7 @@ void main() { test('check default active cg', () { final settings = Settings(); - final data = Data()..load(settings); + final data = DataV3()..load(settings); final roster = UnitRoster(data, settings); expect(roster.activeCG(), isNotNull, reason: 'active cg should not be null'); @@ -60,7 +60,7 @@ void main() { test('Single CGL picked up as only available leader', () async { final settings = Settings(); - final data = await Data() + final data = await DataV3() ..load(settings); final roster = UnitRoster(data, settings); expect(roster.getLeaders(null).length, 0); @@ -77,7 +77,7 @@ void main() { test('CO picked up as only available force leader with 2 leaders in roster', () async { final settings = Settings(); - final data = await Data() + final data = await DataV3() ..load(settings); final roster = UnitRoster(data, settings); expect(roster.getLeaders(null).length, 0); diff --git a/test/models/traits/trait_test.dart b/test/v3/models/traits/trait_test.dart similarity index 98% rename from test/models/traits/trait_test.dart rename to test/v3/models/traits/trait_test.dart index 2e618896..067e24e9 100644 --- a/test/models/traits/trait_test.dart +++ b/test/v3/models/traits/trait_test.dart @@ -1,4 +1,4 @@ -import 'package:gearforce/models/traits/trait.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/unit/frame_test.dart b/test/v3/models/unit/frame_test.dart similarity index 94% rename from test/models/unit/frame_test.dart rename to test/v3/models/unit/frame_test.dart index 6a57bb48..06ca026f 100644 --- a/test/models/unit/frame_test.dart +++ b/test/v3/models/unit/frame_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:gearforce/models/unit/frame.dart'; +import 'package:gearforce/v3/models/unit/frame.dart'; import 'package:test/test.dart'; const frameJSON = diff --git a/test/models/unit/movement_test.dart b/test/v3/models/unit/movement_test.dart similarity index 91% rename from test/models/unit/movement_test.dart rename to test/v3/models/unit/movement_test.dart index 686336de..30bbb879 100644 --- a/test/models/unit/movement_test.dart +++ b/test/v3/models/unit/movement_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:gearforce/models/unit/movement.dart'; +import 'package:gearforce/v3/models/unit/movement.dart'; import 'package:test/test.dart'; const validMovementJSON = '"W/G:6"'; diff --git a/test/models/unit/role_test.dart b/test/v3/models/unit/role_test.dart similarity index 97% rename from test/models/unit/role_test.dart rename to test/v3/models/unit/role_test.dart index 35ef6cf7..bb704bdf 100644 --- a/test/models/unit/role_test.dart +++ b/test/v3/models/unit/role_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:gearforce/models/unit/role.dart'; +import 'package:gearforce/v3/models/unit/role.dart'; import 'package:test/test.dart'; const validUnlimitedRoleJSON = '"GP+"'; diff --git a/test/models/unit/unit_core_test.dart b/test/v3/models/unit/unit_core_test.dart similarity index 96% rename from test/models/unit/unit_core_test.dart rename to test/v3/models/unit/unit_core_test.dart index 3591d644..5dd9ffaa 100644 --- a/test/models/unit/unit_core_test.dart +++ b/test/v3/models/unit/unit_core_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:gearforce/models/unit/model_type.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/unit/model_type.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; import 'package:test/test.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; const validUnitJSON = '{"model":"Hunter","tv":6,"role":"GP, SK,FS","mr":"W/G:6","arm":6,"h/s":"4/2","a":1,"gu":"4+","pi":"4+","ew":"6+","react-weapons":"LAC,LVB","mounted-weapons":"LRP,LAPGL,LPZ","traits":"Hands","type":"Gear", "height":1.5}'; diff --git a/test/models/unit/unit_test.dart b/test/v3/models/unit/unit_test.dart similarity index 95% rename from test/models/unit/unit_test.dart rename to test/v3/models/unit/unit_test.dart index 0177f5e5..a7821b2b 100644 --- a/test/models/unit/unit_test.dart +++ b/test/v3/models/unit/unit_test.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/mods/unitUpgrades/unit_modification.dart'; -import 'package:gearforce/models/unit/unit.dart'; -import 'package:gearforce/models/unit/unit_attribute.dart'; -import 'package:gearforce/models/unit/unit_core.dart'; +import 'package:gearforce/v3/models/mods/unitUpgrades/unit_modification.dart'; +import 'package:gearforce/v3/models/unit/unit.dart'; +import 'package:gearforce/v3/models/unit/unit_attribute.dart'; +import 'package:gearforce/v3/models/unit/unit_core.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/weapons/range_test.dart b/test/v3/models/weapons/range_test.dart similarity index 98% rename from test/models/weapons/range_test.dart rename to test/v3/models/weapons/range_test.dart index 45cddc10..be30db58 100644 --- a/test/models/weapons/range_test.dart +++ b/test/v3/models/weapons/range_test.dart @@ -1,4 +1,4 @@ -import 'package:gearforce/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/weapons/weapon_modes_test.dart b/test/v3/models/weapons/weapon_modes_test.dart similarity index 86% rename from test/models/weapons/weapon_modes_test.dart rename to test/v3/models/weapons/weapon_modes_test.dart index ddc18d9b..cdb0fe4d 100644 --- a/test/models/weapons/weapon_modes_test.dart +++ b/test/v3/models/weapons/weapon_modes_test.dart @@ -1,4 +1,4 @@ -import 'package:gearforce/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/weapons/weapon_test.dart b/test/v3/models/weapons/weapon_test.dart similarity index 96% rename from test/models/weapons/weapon_test.dart rename to test/v3/models/weapons/weapon_test.dart index eb74f640..308c57ca 100644 --- a/test/models/weapons/weapon_test.dart +++ b/test/v3/models/weapons/weapon_test.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/models/weapons/weapons_test.dart b/test/v3/models/weapons/weapons_test.dart similarity index 99% rename from test/models/weapons/weapons_test.dart rename to test/v3/models/weapons/weapons_test.dart index de4fbfcd..94f65a69 100644 --- a/test/models/weapons/weapons_test.dart +++ b/test/v3/models/weapons/weapons_test.dart @@ -1,7 +1,7 @@ -import 'package:gearforce/models/traits/trait.dart'; -import 'package:gearforce/models/weapons/range.dart'; -import 'package:gearforce/models/weapons/weapon_modes.dart'; -import 'package:gearforce/models/weapons/weapons.dart'; +import 'package:gearforce/v3/models/traits/trait.dart'; +import 'package:gearforce/v3/models/weapons/range.dart'; +import 'package:gearforce/v3/models/weapons/weapon_modes.dart'; +import 'package:gearforce/v3/models/weapons/weapons.dart'; import 'package:test/test.dart'; const _sizes = ['L', 'M', 'H'];