Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions lib/v3/models/rules/rulesets/rule_set.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const _maxNumberAirstrikes = 4;
const _maxTotalNumberUniversalDrones = 5;

class DefaultRuleSet extends RuleSet {
DefaultRuleSet(data, {required Settings settings})
DefaultRuleSet(DataV3 data, {required Settings settings})
: super(
FactionType.universal,
data,
Expand Down Expand Up @@ -173,7 +173,8 @@ abstract class RuleSet extends ChangeNotifier {
return mods;
}

StandardModification? getStandardUpgrade(modId, u, cg, roster) {
StandardModification? getStandardUpgrade(
String modId, Unit u, CombatGroup cg, UnitRoster roster) {
return buildStandardUpgrade(modId, u, cg, roster);
}

Expand All @@ -192,7 +193,7 @@ abstract class RuleSet extends ChangeNotifier {
return mods;
}

VeteranModification? getVeteranUpgrade(modId, u, cg) {
VeteranModification? getVeteranUpgrade(String modId, Unit u, CombatGroup cg) {
return buildVetUpgrade(modId, u, cg);
}

Expand All @@ -212,7 +213,8 @@ abstract class RuleSet extends ChangeNotifier {
return mods;
}

DuelistModification? getDuelistUpgrade(modId, u, cg, roster) {
DuelistModification? getDuelistUpgrade(
String modId, Unit u, CombatGroup cg, UnitRoster roster) {
return buildDuelistUpgrade(modId, u, cg, roster);
}

Expand Down Expand Up @@ -240,7 +242,8 @@ abstract class RuleSet extends ChangeNotifier {
return availableFactionMods;
}

FactionModification? getFactionModFromId(modId, ur, u) {
FactionModification? getFactionModFromId(
String modId, UnitRoster ur, Unit u) {
return factionModFromId(modId, ur, u);
}

Expand All @@ -263,7 +266,7 @@ abstract class RuleSet extends ChangeNotifier {
return availableUnitFilters;
}

CustomModification? getCustomUpgrade(modId) {
CustomModification? getCustomUpgrade(String modId) {
return buildCustomUpgrade(modId);
}

Expand Down Expand Up @@ -891,7 +894,7 @@ abstract class RuleSet extends ChangeNotifier {
}

/// Modifies an existing [Weapon] list based on current [Rule]s.
unitWeaponsModifier(List<Weapon> weapons) {
void unitWeaponsModifier(List<Weapon> weapons) {
final weaponModifierRules =
allEnabledRules(null).where((rule) => rule.modifyWeapon != null);
if (weaponModifierRules.isEmpty) {
Expand All @@ -904,7 +907,7 @@ abstract class RuleSet extends ChangeNotifier {
}

/// Modifies an existing [Trait] list based on current [Rule]s.
unitTraitsModifier(List<Trait> traits, Unit unit) {
void unitTraitsModifier(List<Trait> traits, Unit unit) {
final traitModifierRules =
allEnabledRules(null).where((rule) => rule.modifyTraits != null);
if (traitModifierRules.isEmpty) {
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class Settings {
return true;
}

reset() {
void reset() {
tooltipDelay =
const Duration(milliseconds: _defaultTooltipDelayInMilliseconds);
isExtendedContentAllowed = _defaultIsExtendedContentAllowed;
Expand Down
Loading
Loading