Merge branch 'StardewValleyAP0.3.9-dev' of https://github.com/agilber…

…t1412/Archipelago into StardewValleyAP0.3.9-dev

# Conflicts:
#	worlds/stardew_valley/logic.py

worlds/stardew_valley/data/__init__.py

@@ -9,7 +9,6 @@ class SeedData:
     name: str
     seasons: List[str]
     regions: List[str]
-    year: int
 
 
 @dataclass(frozen=True)
@@ -34,8 +33,7 @@ def load_crop_csv():
                                       [season for season in item["seed_seasons"].split(",")]
                                       if item["seed_seasons"] else [],
                                       [region for region in item["seed_regions"].split(",")]
-                                      if item["seed_regions"] else [],
-                                      int(item["seed_year"])))
+                                      if item["seed_regions"] else []))
                 crops.append(CropData(item["crop"],
                                       [season for season in item["farm_growth_seasons"].split(",")]
                                       if item["farm_growth_seasons"] else [],

worlds/stardew_valley/data/crops.csv

@@ -1,37 +1,37 @@
-crop,farm_growth_seasons,seed,seed_seasons,seed_regions,seed_year
-Amaranth,Fall,Amaranth Seeds,Fall,"Pierre's General Store,JojaMart",1
-Artichoke,Fall,Artichoke Seeds,Fall,"Pierre's General Store,JojaMart",2
-Beet,Fall,Beet Seeds,Fall,The Desert,1
-Blue Jazz,Spring,Jazz Seeds,Spring,"Pierre's General Store,JojaMart",1
-Blueberry,Summer,Blueberry Seeds,Summer,"Pierre's General Store,JojaMart",1
-Bok Choy,Fall,Bok Choy Seeds,Fall,"Pierre's General Store,JojaMart",1
-Cactus Fruit,,Cactus Seeds,,The Desert,1
-Cauliflower,Spring,Cauliflower Seeds,Spring,"Pierre's General Store,JojaMart",1
-Corn,"Summer,Fall",Corn Seeds,"Summer,Fall","Pierre's General Store,JojaMart",1
-Cranberries,Fall,Cranberry Seeds,Fall,"Pierre's General Store,JojaMart",1
-Eggplant,Fall,Eggplant Seeds,Fall,"Pierre's General Store,JojaMart",1
-Fairy Rose,Fall,Fairy Seeds,Fall,"Pierre's General Store,JojaMart",1
-Garlic,Spring,Garlic Seeds,Spring,"Pierre's General Store,JojaMart",2
-Grape,Fall,Grape Starter,Fall,"Pierre's General Store,JojaMart",1
-Green Bean,Spring,Bean Starter,Spring,"Pierre's General Store,JojaMart",1
-Hops,Summer,Hops Starter,Summer,"Pierre's General Store,JojaMart",1
-Hot Pepper,Summer,Pepper Seeds,Summer,"Pierre's General Store,JojaMart",1
-Kale,Spring,Kale Seeds,Spring,"Pierre's General Store,JojaMart",1
-Melon,Summer,Melon Seeds,Summer,"Pierre's General Store,JojaMart",1
-Parsnip,Spring,Parsnip Seeds,Spring,"Pierre's General Store,JojaMart",1
-Poppy,Summer,Poppy Seeds,Summer,"Pierre's General Store,JojaMart",1
-Potato,Spring,Potato Seeds,Spring,"Pierre's General Store,JojaMart",1
-Pumpkin,Fall,Pumpkin Seeds,Fall,"Pierre's General Store,JojaMart",1
-Radish,Summer,Radish Seeds,Summer,"Pierre's General Store,JojaMart",1
-Red Cabbage,Summer,Red Cabbage Seeds,Summer,"Pierre's General Store,JojaMart",2
-Rhubarb,Spring,Rhubarb Seeds,Spring,The Desert,1
-Starfruit,Summer,Starfruit Seeds,Summer,The Desert,1
-Strawberry,Spring,Strawberry Seeds,Spring,"Pierre's General Store,JojaMart",1
-Summer Spangle,Summer,Spangle Seeds,Summer,"Pierre's General Store,JojaMart",1
-Sunflower,"Summer,Fall",Sunflower Seeds,"Summer,Fall","Pierre's General Store,JojaMart",1
-Sweet Gem Berry,Fall,Rare Seed,"Spring,Summer",Traveling Cart,1
-Tomato,Summer,Tomato Seeds,Summer,"Pierre's General Store,JojaMart",1
-Tulip,Spring,Tulip Bulb,Spring,"Pierre's General Store,JojaMart",1
-Unmilled Rice,Spring,Rice Shoot,Spring,"Pierre's General Store,JojaMart",2
-Wheat,"Summer,Fall",Wheat Seeds,"Summer,Fall","Pierre's General Store,JojaMart",1
-Yam,Fall,Yam Seeds,Fall,"Pierre's General Store,JojaMart",1
+crop,farm_growth_seasons,seed,seed_seasons,seed_regions
+Amaranth,Fall,Amaranth Seeds,Fall,"Pierre's General Store,JojaMart"
+Artichoke,Fall,Artichoke Seeds,Fall,"Pierre's General Store,JojaMart"
+Beet,Fall,Beet Seeds,Fall,The Desert
+Blue Jazz,Spring,Jazz Seeds,Spring,"Pierre's General Store,JojaMart"
+Blueberry,Summer,Blueberry Seeds,Summer,"Pierre's General Store,JojaMart"
+Bok Choy,Fall,Bok Choy Seeds,Fall,"Pierre's General Store,JojaMart"
+Cactus Fruit,,Cactus Seeds,,The Desert
+Cauliflower,Spring,Cauliflower Seeds,Spring,"Pierre's General Store,JojaMart"
+Corn,"Summer,Fall",Corn Seeds,"Summer,Fall","Pierre's General Store,JojaMart"
+Cranberries,Fall,Cranberry Seeds,Fall,"Pierre's General Store,JojaMart"
+Eggplant,Fall,Eggplant Seeds,Fall,"Pierre's General Store,JojaMart"
+Fairy Rose,Fall,Fairy Seeds,Fall,"Pierre's General Store,JojaMart"
+Garlic,Spring,Garlic Seeds,Spring,"Pierre's General Store,JojaMart"
+Grape,Fall,Grape Starter,Fall,"Pierre's General Store,JojaMart"
+Green Bean,Spring,Bean Starter,Spring,"Pierre's General Store,JojaMart"
+Hops,Summer,Hops Starter,Summer,"Pierre's General Store,JojaMart"
+Hot Pepper,Summer,Pepper Seeds,Summer,"Pierre's General Store,JojaMart"
+Kale,Spring,Kale Seeds,Spring,"Pierre's General Store,JojaMart"
+Melon,Summer,Melon Seeds,Summer,"Pierre's General Store,JojaMart"
+Parsnip,Spring,Parsnip Seeds,Spring,"Pierre's General Store,JojaMart"
+Poppy,Summer,Poppy Seeds,Summer,"Pierre's General Store,JojaMart"
+Potato,Spring,Potato Seeds,Spring,"Pierre's General Store,JojaMart"
+Pumpkin,Fall,Pumpkin Seeds,Fall,"Pierre's General Store,JojaMart"
+Radish,Summer,Radish Seeds,Summer,"Pierre's General Store,JojaMart"
+Red Cabbage,Summer,Red Cabbage Seeds,Summer,"Pierre's General Store,JojaMart"
+Rhubarb,Spring,Rhubarb Seeds,Spring,The Desert
+Starfruit,Summer,Starfruit Seeds,Summer,The Desert
+Strawberry,Spring,Strawberry Seeds,Spring,"Pierre's General Store,JojaMart"
+Summer Spangle,Summer,Spangle Seeds,Summer,"Pierre's General Store,JojaMart"
+Sunflower,"Summer,Fall",Sunflower Seeds,"Summer,Fall","Pierre's General Store,JojaMart"
+Sweet Gem Berry,Fall,Rare Seed,"Spring,Summer",Traveling Cart
+Tomato,Summer,Tomato Seeds,Summer,"Pierre's General Store,JojaMart"
+Tulip,Spring,Tulip Bulb,Spring,"Pierre's General Store,JojaMart"
+Unmilled Rice,Spring,Rice Shoot,Spring,"Pierre's General Store,JojaMart"
+Wheat,"Summer,Fall",Wheat Seeds,"Summer,Fall","Pierre's General Store,JojaMart"
+Yam,Fall,Yam Seeds,Fall,"Pierre's General Store,JojaMart"

worlds/stardew_valley/logic.py

@@ -647,8 +647,7 @@ def can_buy_seed(self, seed: SeedData):
             item_rule = self.received(seed.name)
         season_rule = self.received(seed.seasons)
         region_rule = self.can_reach_any_region(seed.regions)
-        # year_rule = self.has_year_two() if seed.year == 2 else True_()
-        return season_rule & region_rule & item_rule  # & year_rule
+        return season_rule & region_rule & item_rule
 
     def can_grow_crop(self, crop: CropData):
         season_rule = self.received(crop.farm_growth_seasons)