Merge branch 'develop'

woin2ee · Feb 11, 2025 · e5c0d37 · e5c0d37
2 parents 353281a + 1c3841a
commit e5c0d37
Show file tree

Hide file tree

Showing 53 changed files with 1,075 additions and 1,047 deletions.
diff --git a/assets/images/items/barnacles.png b/assets/images/items/barnacles.png
diff --git a/assets/images/items/batilisk_wing.png b/assets/images/items/batilisk_wing.png
diff --git a/assets/images/items/braised_eggplant.png b/assets/images/items/braised_eggplant.png
diff --git a/assets/images/items/cactus_flesh.png b/assets/images/items/cactus_flesh.png
diff --git a/assets/images/items/cactus_flower.png b/assets/images/items/cactus_flower.png
diff --git a/assets/images/items/cave_banana.png b/assets/images/items/cave_banana.png
diff --git a/assets/images/items/charred_nostrils.png b/assets/images/items/charred_nostrils.png
diff --git a/assets/images/items/cooked_wobster.png b/assets/images/items/cooked_wobster.png
diff --git a/assets/images/items/crops_seeds.png b/assets/images/items/crops_seeds.png
diff --git a/assets/images/items/dark_petals.png b/assets/images/items/dark_petals.png
diff --git a/assets/images/items/dead_wobster.png b/assets/images/items/dead_wobster.png
diff --git a/assets/images/items/deerclops_eyeball.png b/assets/images/items/deerclops_eyeball.png
diff --git a/assets/images/items/dried_kelp_fronds.png b/assets/images/items/dried_kelp_fronds.png
diff --git a/assets/images/items/eel.png b/assets/images/items/eel.png
diff --git a/assets/images/items/electric_milk.png b/assets/images/items/electric_milk.png
diff --git a/assets/images/items/extra_smelly_durian.png b/assets/images/items/extra_smelly_durian.png
diff --git a/assets/images/items/fish.png b/assets/images/items/fish.png
diff --git a/assets/images/items/fish_morsel.png b/assets/images/items/fish_morsel.png
diff --git a/assets/images/items/fish_steak.png b/assets/images/items/fish_steak.png
diff --git a/assets/images/items/foliage.png b/assets/images/items/foliage.png
diff --git a/assets/images/items/glow_berry.png b/assets/images/items/glow_berry.png
diff --git a/assets/images/items/grilled_watermelon.png b/assets/images/items/grilled_watermelon.png
diff --git a/assets/images/items/hot_pumpkin.png b/assets/images/items/hot_pumpkin.png
diff --git a/assets/images/items/juicy_berries.png b/assets/images/items/juicy_berries.png
diff --git a/assets/images/items/lesser_glow_berry.png b/assets/images/items/lesser_glow_berry.png
diff --git a/assets/images/items/lichen.png b/assets/images/items/lichen.png
diff --git a/assets/images/items/light_bulb.png b/assets/images/items/light_bulb.png
diff --git a/assets/images/items/lune_tree_blossom.png b/assets/images/items/lune_tree_blossom.png
diff --git a/assets/images/items/mandrake.png b/assets/images/items/mandrake.png
diff --git a/assets/images/items/milky_whites.png b/assets/images/items/milky_whites.png
diff --git a/assets/images/items/monster_meat.png b/assets/images/items/monster_meat.png
diff --git a/assets/images/items/moon_moth_wings.png b/assets/images/items/moon_moth_wings.png
diff --git a/assets/images/items/petals.png b/assets/images/items/petals.png
diff --git a/assets/images/items/phlegm.png b/assets/images/items/phlegm.png
diff --git a/assets/images/items/popcorn.png b/assets/images/items/popcorn.png
diff --git a/assets/images/items/popperfish_land.png b/assets/images/items/popperfish_land.png
diff --git a/assets/images/items/prepared_dragon_fruit.png b/assets/images/items/prepared_dragon_fruit.png
diff --git a/assets/images/items/raw_fish.png b/assets/images/items/raw_fish.png
diff --git a/assets/images/items/royal_jelly.png b/assets/images/items/royal_jelly.png
diff --git a/assets/images/items/sliced_pomegranate.png b/assets/images/items/sliced_pomegranate.png
diff --git a/assets/images/items/small_jerky.png b/assets/images/items/small_jerky.png
diff --git a/assets/images/items/succulent.png b/assets/images/items/succulent.png
diff --git a/assets/images/items/winter_koalefant_trunk.png b/assets/images/items/winter_koalefant_trunk.png
diff --git a/lib/main.dart b/lib/main.dart
@@ -18,8 +18,8 @@ Future<void> _clearPrefsIfNeeds() async {
 
   // 버전 명시
   const currentVersion = _PrefsVersion(
-    description: 'Add id(UUID) to `FarmPlantCardModel`',
-    number: 7,
+    description: 'Update model of items',
+    number: 8,
   );
 
   clearAndSet() async {

diff --git a/lib/models/v1/item/dst_object.dart b/lib/models/v1/item/dst_object.dart
@@ -1289,7 +1289,6 @@ class TurkeyDinner extends RecipeObject implements FoodObject {
               MeetRequirement(FoodValues({FoodValue(FoodValueCategory.vegetable, 0.5)})),
               MeetRequirement(FoodValues({FoodValue(FoodValueCategory.fruit, 0.5)})),
             }),
-            // TODO: When using Barnacle don't add Vegetable.
           }),
         );
 
@@ -2701,7 +2700,7 @@ class Barnacles implements FoodObject, IngredientObject {
   const Barnacles();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'barnacle';
 
   @override
   String get assetName => 'barnacles';
@@ -2725,7 +2724,7 @@ class BatiliskWing implements FoodObject, IngredientObject {
   const BatiliskWing();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'batwing';
 
   @override
   String get assetName => 'batilisk_wing';
@@ -2990,7 +2989,7 @@ class JuicyBerries implements CookableFood, IngredientObject {
   const JuicyBerries();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'berries_juicy';
 
   @override
   String get assetName => 'juicy_berries';
@@ -3042,7 +3041,7 @@ class WinterKoalefantTrunk implements CookableFood, IngredientObject {
   const WinterKoalefantTrunk();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'trunk_summer';
 
   @override
   String get assetName => 'winter_koalefant_trunk';
@@ -3051,7 +3050,7 @@ class WinterKoalefantTrunk implements CookableFood, IngredientObject {
   String get compositeAssetName => 'koalefant_trunks';
 
   @override
-  FoodValues? get foodValues => null;
+  FoodValues? get foodValues => const FoodValues({FoodValue(FoodValueCategory.meat, 1.0)});
 
   @override
   String get name => 'Winter Koalefant Trunk';
@@ -3096,7 +3095,7 @@ class Mandrake implements FoodObject, IngredientObject {
   const Mandrake();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'mandrake';
 
   @override
   String get assetName => 'mandrake';
@@ -3142,7 +3141,7 @@ class MonsterMeat implements FoodObject, IngredientObject {
   const MonsterMeat();
 
   @override
-  String get code => throw UnimplementedError();
+  String get code => 'monstermeat';
 
   @override
   String get assetName => 'monster_meat';

diff --git a/lib/models/v2/item/categories.dart b/lib/models/v2/item/categories.dart
@@ -16,17 +16,15 @@ class Food with _$Food, Item, Edible {
     required String assetName,
     required FoodType type,
   }) = _Food;
-}
 
-@freezed
-class CookableFood with _$CookableFood, Item, Edible, Cookable {
-  const factory CookableFood({
+  @With<Cookable>()
+  const factory Food.cookable({
     required String code,
     required String assetName,
     required FoodType type,
     required String cookedAssetName,
     required String? compositeAssetName,
-  }) = _CookableFood;
+  }) = CookableFood;
 }
 
 @freezed
@@ -36,16 +34,14 @@ class Ingredient with _$Ingredient, Item, UsingInCrockPot {
     required String assetName,
     required FoodValues? foodValues,
   }) = _Ingredient;
-}
 
-@freezed
-class EdibleIngredient with _$EdibleIngredient, Item, Edible, UsingInCrockPot {
-  const factory EdibleIngredient({
+  @With<Edible>()
+  const factory Ingredient.edible({
     required String code,
     required String assetName,
     required FoodType type,
     required FoodValues? foodValues,
-  }) = _EdibleIngredient;
+  }) = EdibleIngredient;
 }
 
 @freezed
@@ -57,7 +53,6 @@ class Plant with _$Plant, Item, Plantable {
     required Nutrient nutrient,
   }) = _Plant;
 
-  @With<Item>()
   @With<Edible>()
   @With<UsingInCrockPot>()
   const factory Plant.crop({
@@ -70,24 +65,33 @@ class Plant with _$Plant, Item, Plantable {
     required Seed seed,
   }) = Crop;
 
-  @With<Item>()
   const factory Plant.weed({
     required String code,
     required String assetName,
     required Nutrient nutrient,
     required Set<Season> seasons,
   }) = Weed;
 
-  @With<Item>()
+  @With<Edible>()
   @With<UsingInCrockPot>()
   const factory Plant.forgetMeLots({
     required String code,
     required String assetName,
     required Nutrient nutrient,
     required Set<Season> seasons,
+    required FoodType type,
     required FoodValues? foodValues,
   }) = ForgetMeLots;
 
+  @With<Edible>()
+  const factory Plant.edibleWeed({
+    required String code,
+    required String assetName,
+    required Nutrient nutrient,
+    required Set<Season> seasons,
+    required FoodType type,
+  }) = EdibleWeed;
+
   factory Plant.fromJson(Map<String, dynamic> json) => _$PlantFromJson(json);
 }
 
@@ -108,7 +112,7 @@ class Seed with _$Seed, Item, Edible, Cookable {
 }
 
 @freezed
-class Recipe with _$Recipe, Item, CookableInCrockPot {
+class Recipe with _$Recipe, Item, CookableWithCrockPot {
   const factory Recipe({
     required String code,
     required String assetName,
@@ -121,7 +125,6 @@ class Recipe with _$Recipe, Item, CookableInCrockPot {
     required StatusValue cookTimeValue,
   }) = _Recipe;
 
-  @With<Item>()
   @With<Edible>()
   const factory Recipe.edible({
     required String code,

diff --git a/lib/models/v2/item/category_mixins.dart b/lib/models/v2/item/category_mixins.dart
@@ -3,6 +3,9 @@ import 'package:dst_helper/models/v2/item/food_value.dart';
 import 'package:dst_helper/models/v2/item/nutrient.dart';
 import 'package:dst_helper/models/v2/item/requirement.dart';
 
+/// It defines the common properties of items.
+///
+/// The classes that adopt this mixin have `code` identifying the item and `assetName` that it is the same name as the image file.
 mixin Item {
   String get code;
   String get assetName;
@@ -16,25 +19,36 @@ enum FoodType {
   goodies,
 }
 
-mixin Edible on Item {
+mixin Edible implements Item {
   FoodType get type;
 }
 
-mixin Cookable on Item {
+/// It indicates that the item can be cooked.
+///
+/// All cooked items have the own cooked name.
+/// If the item doesn't have the own cooked name, should not adopt this mixin.
+///
+/// Some cookable items may have a composite asset that is a combination of the item and the cooked item.
+mixin Cookable implements Item {
   String get cookedAssetName;
   String? get compositeAssetName;
 }
 
-mixin Plantable on Item {
+/// It indicates plants that grow in the farmplant.
+mixin Plantable implements Item {
   Set<Season> get seasons;
   Nutrient get nutrient;
 }
 
-mixin UsingInCrockPot on Item {
+/// It indicates that the item can cook in the crock pot.
+///
+/// The item has the own food values to determine which recipe to be.
+mixin UsingInCrockPot implements Item {
   FoodValues? get foodValues;
 }
 
-mixin CookableInCrockPot on Item {
+/// It indicates that the item can be cooked in the crock pot.
+mixin CookableWithCrockPot implements Item {
   int get priority;
   Requirements get requirements;
 }
diff --git a/lib/models/v2/item/food_value.dart b/lib/models/v2/item/food_value.dart
@@ -54,18 +54,18 @@ class FoodValue with _$FoodValue {
 @freezed
 class FoodValues with _$FoodValues, Iterable {
   const factory FoodValues(
-    Set<FoodValue> rawValues,
+    List<FoodValue> rawValues,
   ) = _FoodValues;
   const FoodValues._();
 
   factory FoodValues.fromJson(Map<String, Object?> json) => _$FoodValuesFromJson(json);
 
   Set<FoodValue> get values {
-    for (var category in FoodValueCategory.values) {
-      var countPerCategory = rawValues.where((foodValue) => foodValue.category == category).length;
+    for (final category in FoodValueCategory.values) {
+      final countPerCategory = rawValues.where((foodValue) => foodValue.category == category).length;
       if (countPerCategory > 1) assert(false);
     }
-    return rawValues;
+    return rawValues.toSet();
   }
 
   @override

diff --git a/lib/models/v2/item/item.dart b/lib/models/v2/item/item.dart
@@ -1,4 +1,5 @@
 export 'categories.dart';
+export 'categories_extension.dart';
 export 'category_mixins.dart';
 export 'food_value.dart';
 export 'items.dart';