From 8e4985a89679dc8f23a119db8c1fa4019433606a Mon Sep 17 00:00:00 2001 From: SlayerOrnstein Date: Sat, 24 Jul 2021 01:44:55 -0400 Subject: [PATCH] fix: remove damageTypes key --- lib/src/entities/warframe_items/weapons.dart | 9 ++------- lib/src/models/warframe_items/weapon_models.dart | 4 ---- lib/src/models/warframe_items/weapon_models.g.dart | 10 ---------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/lib/src/entities/warframe_items/weapons.dart b/lib/src/entities/warframe_items/weapons.dart index 50b0918..85476dd 100644 --- a/lib/src/entities/warframe_items/weapons.dart +++ b/lib/src/entities/warframe_items/weapons.dart @@ -29,7 +29,7 @@ class WeaponItem extends FoundryItem { required dynamic damage, required this.totalDamage, required this.damagePerShot, - this.damageTypes, + // this.damageTypes, this.disposition, this.marketCost, this.sentinel, @@ -71,7 +71,7 @@ class WeaponItem extends FoundryItem { final dynamic _damage; final double totalDamage; final List damagePerShot; - final Map? damageTypes; + // final Map? damageTypes; final List? polarities; final int? marketCost; final int? disposition; @@ -102,7 +102,6 @@ class WeaponItem extends FoundryItem { _damage, damage, damagePerShot, - damageTypes, polarities, marketCost, disposition, @@ -136,7 +135,6 @@ class ProjectileWeapon extends WeaponItem { required dynamic damage, required double totalDamage, required List damagePerShot, - Map? damageTypes, List? polarities, int? disposition, int? marketCost, @@ -177,7 +175,6 @@ class ProjectileWeapon extends WeaponItem { damage: damage, totalDamage: totalDamage, damagePerShot: damagePerShot, - damageTypes: damageTypes, polarities: polarities, marketCost: marketCost, disposition: disposition, @@ -254,7 +251,6 @@ class MeleeWeapon extends WeaponItem { required dynamic damage, required double totalDamage, required List damagePerShot, - Map? damageTypes, List? polarities, int? disposition, int? marketCost, @@ -296,7 +292,6 @@ class MeleeWeapon extends WeaponItem { damage: damage, totalDamage: totalDamage, damagePerShot: damagePerShot, - damageTypes: damageTypes, polarities: polarities, marketCost: marketCost, disposition: disposition, diff --git a/lib/src/models/warframe_items/weapon_models.dart b/lib/src/models/warframe_items/weapon_models.dart index 7f4cd53..7883ede 100644 --- a/lib/src/models/warframe_items/weapon_models.dart +++ b/lib/src/models/warframe_items/weapon_models.dart @@ -39,7 +39,6 @@ class ProjectileWeaponModel extends ProjectileWeapon { int? buildQuantity, bool? consumeOnBuild, this.components, - required Map damageTypes, List? polarities, int? marketCost, bool? vaulted, @@ -83,7 +82,6 @@ class ProjectileWeaponModel extends ProjectileWeapon { skipBuildTimePrice: skipBuildTimePrice, buildQuantity: buildQuantity, consumeOnBuild: consumeOnBuild, - damageTypes: damageTypes, polarities: polarities, marketCost: marketCost, vaulted: vaulted, @@ -138,7 +136,6 @@ class MeleeWeaponModel extends MeleeWeapon { required dynamic damage, required double totalDamage, required List damagePerShot, - Map? damageTypes, List? polarities, dynamic marketCost, int? disposition, @@ -180,7 +177,6 @@ class MeleeWeaponModel extends MeleeWeapon { damage: damage, totalDamage: totalDamage, damagePerShot: damagePerShot, - damageTypes: damageTypes, polarities: polarities, marketCost: marketCost is String ? 0 : marketCost as int?, disposition: disposition, diff --git a/lib/src/models/warframe_items/weapon_models.g.dart b/lib/src/models/warframe_items/weapon_models.g.dart index 0ac739b..912d716 100644 --- a/lib/src/models/warframe_items/weapon_models.g.dart +++ b/lib/src/models/warframe_items/weapon_models.g.dart @@ -58,8 +58,6 @@ ProjectileWeaponModel _$ProjectileWeaponModelFromJson(Map json) { ?.map((e) => ComponentModel.fromJson(Map.from(e as Map))) .toList()), - damageTypes: $checkedConvert( - json, 'damageTypes', (v) => Map.from(v as Map)), polarities: $checkedConvert(json, 'polarities', (v) => (v as List?)?.map((e) => e as String).toList()), marketCost: $checkedConvert(json, 'marketCost', (v) => v as int?), @@ -114,7 +112,6 @@ Map _$ProjectileWeaponModelToJson( 'omegaAttenuation': instance.omegaAttenuation, 'totalDamage': instance.totalDamage, 'damagePerShot': instance.damagePerShot, - 'damageTypes': instance.damageTypes, 'polarities': instance.polarities, 'marketCost': instance.marketCost, 'disposition': instance.disposition, @@ -181,12 +178,6 @@ MeleeWeaponModel _$MeleeWeaponModelFromJson(Map json) { 'damagePerShot', (v) => (v as List).map((e) => (e as num).toDouble()).toList()), - damageTypes: $checkedConvert( - json, - 'damageTypes', - (v) => (v as Map?)?.map( - (k, e) => MapEntry(k as String, e as num), - )), polarities: $checkedConvert(json, 'polarities', (v) => (v as List?)?.map((e) => e as String).toList()), marketCost: $checkedConvert(json, 'marketCost', (v) => v), @@ -257,7 +248,6 @@ Map _$MeleeWeaponModelToJson(MeleeWeaponModel instance) => 'omegaAttenuation': instance.omegaAttenuation, 'totalDamage': instance.totalDamage, 'damagePerShot': instance.damagePerShot, - 'damageTypes': instance.damageTypes, 'polarities': instance.polarities, 'marketCost': instance.marketCost, 'disposition': instance.disposition,