-Renamed some stuff

worlds/stardew_valley/data/items.csv

@@ -510,10 +510,10 @@ id,name,classification,groups,mod_name
 562,Quality Bonus,filler,PLAYER_BUFF,
 563,Glow Bonus,filler,PLAYER_BUFF,
 564,Pet Bowl,progression,BUILDING,
-565,??HMTGF??,filler,"EASY_SECRET",
-566,??Pinky Lemon??,filler,"EASY_SECRET",
-567,??Foroguemon??,filler,"EASY_SECRET",
-568,Junimo Plush,filler,"EASY_SECRET",
+565,??HMTGF??,filler,"SIMPLE_SECRET",
+566,??Pinky Lemon??,filler,"SIMPLE_SECRET",
+567,??Foroguemon??,filler,"SIMPLE_SECRET",
+568,Junimo Plush,filler,"SIMPLE_SECRET",
 569,'Boat',filler,"FISHING_SECRET",
 570,Decorative Trash Can,filler,"FISHING_SECRET",
 571,Foliage Print,filler,"FISHING_SECRET",
@@ -526,7 +526,7 @@ id,name,classification,groups,mod_name
 578,Squirrel Figurine,filler,"FISHING_SECRET",
 579,'Vista',filler,"FISHING_SECRET",
 580,Wall Basket,filler,"FISHING_SECRET",
-581,Far Away Stone,progression,"EASY_SECRET",
+581,Far Away Stone,progression,"SIMPLE_SECRET",
 4001,Burnt Trap,trap,TRAP,
 4002,Darkness Trap,trap,TRAP,
 4003,Frozen Trap,trap,TRAP,

worlds/stardew_valley/data/locations.csv

@@ -357,14 +357,14 @@ id,region,name,tags,mod_name
 619,Junimo Kart 3,Junimo Kart: Red Hot Rollercoaster,"ARCADE_MACHINE,JUNIMO_KART",
 620,JotPK World 3,Journey of the Prairie King Victory,"ARCADE_MACHINE_VICTORY,JOTPK",
 621,Junimo Kart 4,Junimo Kart: Sunset Speedway (Victory),"ARCADE_MACHINE_VICTORY,JUNIMO_KART",
-701,Secret Woods,Old Master Cannoli,"RANDOMIZED_SECRETS,EASY_SECRET",
+701,Secret Woods,Old Master Cannoli,"SECRETSANITY,SIMPLE_SECRET",
 702,Beach,Beach Bridge Repair,MANDATORY,
 703,Desert,Galaxy Sword Shrine,MANDATORY,
 704,Farmhouse,Have a Baby,BABY,
 705,Farmhouse,Have Another Baby,BABY,
 706,Farmhouse,Spouse Stardrop,,
 707,Sewer,Krobus Stardrop,MANDATORY,
-708,Forest,Pot Of Gold,"RANDOMIZED_SECRETS,EASY_SECRET",
+708,Forest,Pot Of Gold,"SECRETSANITY,SIMPLE_SECRET",
 801,Forest,Help Wanted: Gathering 1,HELP_WANTED,
 802,Forest,Help Wanted: Gathering 2,HELP_WANTED,
 803,Forest,Help Wanted: Gathering 3,HELP_WANTED,
@@ -2447,49 +2447,49 @@ id,region,name,tags,mod_name
 4193,Pirate Cove,Pirate Darts 3,"WALNUTSANITY,WALNUTSANITY_PUZZLE",
 4194,Pirate Cove,Pirate Cove Patch Of Sand,"WALNUTSANITY,WALNUTSANITY_DIG",
 
-4201,Luau,Poison The Governor,"RANDOMIZED_SECRETS,EASY_SECRET",
-4202,Stardew Valley Fair,Grange Display Bribe,"RANDOMIZED_SECRETS,EASY_SECRET",
-4203,Stardew Valley Fair,Purple Lettuce,"RANDOMIZED_SECRETS,EASY_SECRET",
-4204,Marnie's Ranch,Make Marnie Laugh,"RANDOMIZED_SECRETS,EASY_SECRET",
-4205,Mayor's Manor,Jumpscare Lewis,"RANDOMIZED_SECRETS,EASY_SECRET",
-4206,Marnie's Ranch,Fine Purple Silk,"RANDOMIZED_SECRETS,EASY_SECRET",
-4207,Fishing,Lucky Purple Bobber,"RANDOMIZED_SECRETS,EASY_SECRET",
-4208,Witch's Hut,Free The Forsaken Souls,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4209,Feast of the Winter Star,Something For Santa,"RANDOMIZED_SECRETS,EASY_SECRET",
-4210,Menu,Thank the Devs,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4211,Menu,Annoy the Moon Man,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4212,Menu,Acknowledge the Lonely Stone,"RANDOMIZED_SECRETS,EASY_SECRET",
-4213,Menu,Take In The Nature,"RANDOMIZED_SECRETS,EASY_SECRET",
-4214,Town,??HMTGF??,"RANDOMIZED_SECRETS,EASY_SECRET",
-4215,Saloon,??Pinky Lemon??,"RANDOMIZED_SECRETS,EASY_SECRET",
-4216,Sam's House,??Foroguemon??,"RANDOMIZED_SECRETS,EASY_SECRET",
-4217,Town,Galaxies Will Heed Your Cry,"RANDOMIZED_SECRETS,EASY_SECRET",
-4218,Town,Junimo Plush,"RANDOMIZED_SECRETS,EASY_SECRET",
-4219,Town,Strange Sighting,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4220,Farm,'Boat',"RANDOMIZED_SECRETS,BEACH_FARM,FISHING_SECRET",
-4221,Town,Decorative Trash Can,"RANDOMIZED_SECRETS,FISHING_SECRET",
-4222,Island North,Foliage Print,"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4223,Gourmand Frog Cave,Frog Hat,"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4224,Pirate Cove,Gourmand Statue,"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4225,Forest,Iridium Krobus,"RANDOMIZED_SECRETS,FISHING_SECRET",
-4226,Boat Tunnel,Lifesaver,"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4227,Volcano - Floor 10,'Physics 101',"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4228,Desert,Pyramid Decal,"RANDOMIZED_SECRETS,FISHING_SECRET",
-4229,Volcano Secret Beach,Squirrel Figurine,"RANDOMIZED_SECRETS,FISHING_SECRET,GINGER_ISLAND",
-4230,Railroad,'Vista',"RANDOMIZED_SECRETS,FISHING_SECRET",
-4231,Secret Woods,Wall Basket,"RANDOMIZED_SECRETS,FISHING_SECRET",
-4232,The Mines - Floor 100,Summon Bone Serpent,"RANDOMIZED_SECRETS,EASY_SECRET",
-4233,Wizard Basement,Meowmere,"RANDOMIZED_SECRETS,EASY_SECRET",
-4234,Elliott's House,A Familiar Tune,"RANDOMIZED_SECRETS,EASY_SECRET",
-4235,Beach,Merperson Sighting,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4236,Forest,...Bigfoot?,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4237,Farmhouse,Flubber Experiment,"RANDOMIZED_SECRETS,EASY_SECRET",
-4238,Wizard Basement,Seems Fishy,"RANDOMIZED_SECRETS,EASY_SECRET",
-4239,Railroad,'Me me me me me me me me me me me me me me me me',"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
-4240,Menu,Nice Try,"RANDOMIZED_SECRETS,EASY_SECRET",
-4241,Menu,Enjoy your new life here,"RANDOMIZED_SECRETS,EASY_SECRET",
-4242,Menu,"What'd you expect?","RANDOMIZED_SECRETS,EASY_SECRET",
-4243,Farm,Secret Iridium Stackmaster Trophy,"RANDOMIZED_SECRETS,DIFFICULT_SECRET",
+4201,Luau,Poison The Governor,"SECRETSANITY,SIMPLE_SECRET",
+4202,Stardew Valley Fair,Grange Display Bribe,"SECRETSANITY,SIMPLE_SECRET",
+4203,Stardew Valley Fair,Purple Lettuce,"SECRETSANITY,SIMPLE_SECRET",
+4204,Marnie's Ranch,Make Marnie Laugh,"SECRETSANITY,SIMPLE_SECRET",
+4205,Mayor's Manor,Jumpscare Lewis,"SECRETSANITY,SIMPLE_SECRET",
+4206,Marnie's Ranch,Fine Purple Silk,"SECRETSANITY,SIMPLE_SECRET",
+4207,Fishing,Lucky Purple Bobber,"SECRETSANITY,SIMPLE_SECRET",
+4208,Witch's Hut,Free The Forsaken Souls,"SECRETSANITY,DIFFICULT_SECRET",
+4209,Feast of the Winter Star,Something For Santa,"SECRETSANITY,SIMPLE_SECRET",
+4210,Menu,Thank the Devs,"SECRETSANITY,DIFFICULT_SECRET",
+4211,Menu,Annoy the Moon Man,"SECRETSANITY,DIFFICULT_SECRET",
+4212,Menu,Acknowledge the Lonely Stone,"SECRETSANITY,SIMPLE_SECRET",
+4213,Menu,Take In The Nature,"SECRETSANITY,SIMPLE_SECRET",
+4214,Town,??HMTGF??,"SECRETSANITY,SIMPLE_SECRET",
+4215,Saloon,??Pinky Lemon??,"SECRETSANITY,SIMPLE_SECRET",
+4216,Sam's House,??Foroguemon??,"SECRETSANITY,SIMPLE_SECRET",
+4217,Town,Galaxies Will Heed Your Cry,"SECRETSANITY,SIMPLE_SECRET",
+4218,Town,Junimo Plush,"SECRETSANITY,SIMPLE_SECRET",
+4219,Town,Strange Sighting,"SECRETSANITY,DIFFICULT_SECRET",
+4220,Farm,'Boat',"SECRETSANITY,BEACH_FARM,FISHING_SECRET",
+4221,Town,Decorative Trash Can,"SECRETSANITY,FISHING_SECRET",
+4222,Island North,Foliage Print,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4223,Gourmand Frog Cave,Frog Hat,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4224,Pirate Cove,Gourmand Statue,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4225,Forest,Iridium Krobus,"SECRETSANITY,FISHING_SECRET",
+4226,Boat Tunnel,Lifesaver,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4227,Volcano - Floor 10,'Physics 101',"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4228,Desert,Pyramid Decal,"SECRETSANITY,FISHING_SECRET",
+4229,Volcano Secret Beach,Squirrel Figurine,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4230,Railroad,'Vista',"SECRETSANITY,FISHING_SECRET",
+4231,Secret Woods,Wall Basket,"SECRETSANITY,FISHING_SECRET",
+4232,The Mines - Floor 100,Summon Bone Serpent,"SECRETSANITY,SIMPLE_SECRET",
+4233,Wizard Basement,Meowmere,"SECRETSANITY,SIMPLE_SECRET",
+4234,Elliott's House,A Familiar Tune,"SECRETSANITY,SIMPLE_SECRET",
+4235,Beach,Merperson Sighting,"SECRETSANITY,DIFFICULT_SECRET",
+4236,Forest,...Bigfoot?,"SECRETSANITY,DIFFICULT_SECRET",
+4237,Farmhouse,Flubber Experiment,"SECRETSANITY,SIMPLE_SECRET",
+4238,Wizard Basement,Seems Fishy,"SECRETSANITY,SIMPLE_SECRET",
+4239,Railroad,'Me me me me me me me me me me me me me me me me',"SECRETSANITY,DIFFICULT_SECRET",
+4240,Menu,Nice Try,"SECRETSANITY,SIMPLE_SECRET",
+4241,Menu,Enjoy your new life here,"SECRETSANITY,SIMPLE_SECRET",
+4242,Menu,"What'd you expect?","SECRETSANITY,SIMPLE_SECRET",
+4243,Farm,Secret Iridium Stackmaster Trophy,"SECRETSANITY,DIFFICULT_SECRET",
 
 5001,Stardew Valley,Level 1 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
 5002,Stardew Valley,Level 2 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill

worlds/stardew_valley/items.py

@@ -90,7 +90,7 @@ class Group(enum.Enum):
     BOOK_POWER = enum.auto()
     LOST_BOOK = enum.auto()
     PLAYER_BUFF = enum.auto()
-    EASY_SECRET = enum.auto()
+    SIMPLE_SECRET = enum.auto()
     FISHING_SECRET = enum.auto()
     # Mods
     MAGIC_SPELL = enum.auto()
@@ -642,9 +642,9 @@ def create_secrets_items(item_factory: StardewItemFactory, options: StardewValle
     if options.secretsanity == Secretsanity.option_none:
         return
 
-    if options.secretsanity >= Secretsanity.option_reasonable:
-        items.extend(item_factory(item) for item in items_by_group[Group.EASY_SECRET])
-    if options.secretsanity >= Secretsanity.option_reasonable_fish:
+    if options.secretsanity >= Secretsanity.option_simple:
+        items.extend(item_factory(item) for item in items_by_group[Group.SIMPLE_SECRET])
+    if options.secretsanity >= Secretsanity.option_simple_and_fishing:
         items.extend(item_factory(item) for item in items_by_group[Group.FISHING_SECRET])
 
 

worlds/stardew_valley/locations.py

@@ -106,8 +106,8 @@ class LocationTags(enum.Enum):
     BOOKSANITY_POWER = enum.auto()
     BOOKSANITY_SKILL = enum.auto()
     BOOKSANITY_LOST = enum.auto()
-    RANDOMIZED_SECRETS = enum.auto()
-    EASY_SECRET = enum.auto()
+    SECRETSANITY = enum.auto()
+    SIMPLE_SECRET = enum.auto()
     FISHING_SECRET = enum.auto()
     DIFFICULT_SECRET = enum.auto()
 
@@ -500,9 +500,9 @@ def extend_secrets_locations(randomized_locations: List[LocationData], options:
         return
 
     locations = []
-    if options.secretsanity >= Secretsanity.option_reasonable:
-        locations.extend(locations_by_tag[LocationTags.EASY_SECRET])
-    if options.secretsanity >= Secretsanity.option_reasonable_fish:
+    if options.secretsanity >= Secretsanity.option_simple:
+        locations.extend(locations_by_tag[LocationTags.SIMPLE_SECRET])
+    if options.secretsanity >= Secretsanity.option_simple_and_fishing:
         locations.extend(locations_by_tag[LocationTags.FISHING_SECRET])
     if options.secretsanity >= Secretsanity.option_all:
         locations.extend(locations_by_tag[LocationTags.DIFFICULT_SECRET])

worlds/stardew_valley/options/options.py

@@ -635,16 +635,16 @@ class Moviesanity(Choice):
 class Secretsanity(Choice):
     """Add checks for the various secrets and easter eggs present in Stardew Valley. Some of them can be very obscure. If you enable this setting, you should expect to need the wiki a lot.
     None: None of the in-game secrets are checks
-    Reasonable: Only secrets that can reasonably be obtained quickly if you know what to do, are included
-    Reasonable + Fishing: Also includes the various secret fishable items around the world
+    Simple: Only secrets that can be obtained quickly and easily, if you know what to do, are included
+    Simple and Fishing: Also includes the various secret fishable items around the world
     All: All secrets are included. This includes some very difficult ones, generally due to very low odds of something purely RNG-based. Expect lots of grinding and hoping
     """
     internal_name = "secretsanity"
     display_name = "Secretsanity"
     default = 0
     option_none = 0
-    option_reasonable = 1
-    option_reasonable_fish = 2
+    option_simple = 1
+    option_simple_and_fishing = 2
     option_all = 3
 
 

worlds/stardew_valley/options/presets.py

@@ -128,7 +128,7 @@
     options.FriendsanityHeartSize.internal_name:    4,
     options.Booksanity.internal_name:               options.Booksanity.option_power_skill,
     options.Walnutsanity.internal_name:             [WalnutsanityOptionName.puzzles],
-    options.Secretsanity.internal_name:             options.Secretsanity.option_reasonable,
+    options.Secretsanity.internal_name:             options.Secretsanity.option_simple,
     options.NumberOfMovementBuffs.internal_name:    6,
     options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
     options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
@@ -174,7 +174,7 @@
     options.FriendsanityHeartSize.internal_name:    4,
     options.Booksanity.internal_name:               options.Booksanity.option_all,
     options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
-    options.Secretsanity.internal_name:             options.Secretsanity.option_reasonable_fish,
+    options.Secretsanity.internal_name:             options.Secretsanity.option_simple_and_fishing,
     options.NumberOfMovementBuffs.internal_name:    4,
     options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.default,
     options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,

worlds/stardew_valley/rules.py

@@ -875,7 +875,7 @@ def set_secrets_rules(logic: StardewLogic, multiworld: MultiWorld, player: int,
     if world_options.secretsanity == Secretsanity.option_none:
         return
 
-    if world_options.secretsanity >= Secretsanity.option_reasonable:
+    if world_options.secretsanity >= Secretsanity.option_simple:
         MultiWorldRules.add_rule(multiworld.get_location("Old Master Cannoli", player), logic.has(Fruit.sweet_gem_berry))
         MultiWorldRules.add_rule(multiworld.get_location("Pot Of Gold", player), logic.season.has(Season.spring))
         MultiWorldRules.add_rule(multiworld.get_location("Poison The Governor", player), logic.has(SpecialItem.lucky_purple_shorts))
@@ -904,7 +904,7 @@ def set_secrets_rules(logic: StardewLogic, multiworld: MultiWorld, player: int,
         MultiWorldRules.add_rule(multiworld.get_location("Flubber Experiment", player), logic.relationship.can_get_married() & logic.building.has_building(Building.slime_hutch) & logic.has(Machine.slime_incubator))
         MultiWorldRules.add_rule(multiworld.get_location("Seems Fishy", player), logic.money.can_spend_at(Region.wizard_basement, 500))
 
-    if world_options.secretsanity >= Secretsanity.option_reasonable_fish:
+    if world_options.secretsanity >= Secretsanity.option_simple_and_fishing:
         if world_options.farm_type == FarmType.option_beach:
             MultiWorldRules.add_rule(multiworld.get_location("'Boat'", player), logic.skill.can_fish(Region.farm))
         if world_options.exclude_ginger_island == ExcludeGingerIsland.option_false:

worlds/stardew_valley/test/rules/TestTools.py

@@ -12,7 +12,7 @@ class TestProgressiveToolsLogic(SVTestBase):
     options = {
         ToolProgression.internal_name: ToolProgression.option_progressive,
         SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
-        Secretsanity.internal_name: Secretsanity.option_reasonable,
+        Secretsanity.internal_name: Secretsanity.option_simple,
     }
 
     def test_sturgeon(self):