Skip to content

Stardew Valley: Turned the Treehouse into an unlockable item #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 21, 2023
Merged

Stardew Valley: Turned the Treehouse into an unlockable item #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a991d
- Added Leo's Treehouse as an AP item to be received so logic can han…
agilbert1412 Jul 21, 2023
25d42f6
- renamed variable
agilbert1412 Jul 21, 2023
737c1c2
- Incremented the data_version for stardew_valley
agilbert1412 Jul 21, 2023
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
2 changes: 1 addition & 1 deletion worlds/stardew_valley/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class StardewValleyWorld(World):
item_name_to_id = {name: data.code for name, data in item_table.items()}
location_name_to_id = {name: data.code for name, data in location_table.items()}

data_version = 2
data_version = 3
required_client_version = (0, 4, 0)

options: StardewOptions
Expand Down
1 change: 1 addition & 0 deletions worlds/stardew_valley/data/items.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ id,name,classification,groups,mod_name
284,Cute Baby,progression,"BABY",
285,Ugly Baby,progression,"BABY",
286,Deluxe Scarecrow Recipe,progression,"FESTIVAL,RARECROW",
287,Treehouse,progression,"GINGER_ISLAND",
4001,Burnt,trap,TRAP,
4002,Darkness,trap,TRAP,
4003,Frozen,trap,TRAP,
Expand Down
1 change: 1 addition & 0 deletions worlds/stardew_valley/items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ def create_walnut_purchase_rewards(item_factory: StardewItemFactory, world_optio
items.extend([item_factory("Boat Repair"),
item_factory("Open Professor Snail Cave"),
item_factory("Ostrich Incubator Recipe"),
item_factory("Treehouse"),
*[item_factory(item) for item in items_by_group[Group.WALNUT_PURCHASE]]])


Expand Down
3 changes: 1 addition & 2 deletions worlds/stardew_valley/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ def set_entrance_rules(logic, multi_world, player, world_options: StardewOptions
MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_wizard_basement, player),
logic.has_relationship(NPC.wizard, 4))
MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.mountain_to_leo_treehouse, player),
logic.has_relationship(NPC.leo, 6) & logic.can_reach_region(Region.island_south) &
logic.can_reach_region(Region.island_east) & logic.can_reach_region(Region.leo_hut))
logic.received("Treehouse"))
if ModNames.alec in world_options[options.Mods]:
MultiWorldRules.set_rule(multi_world.get_entrance(AlecEntrance.petshop_to_bedroom, player),
(logic.has_relationship(ModNPC.alec, 2) | magic.can_blink(logic)).simplify())
Expand Down
4 changes: 2 additions & 2 deletions worlds/stardew_valley/test/TestOptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def test_given_choice_when_generate_then_basic_checks(self):
continue
for value in option.options:
with self.subTest(f"{option.internal_name}: {value} [Seed: {seed}]"):
choices = {option.internal_name: option.options[value]}
multiworld = setup_solo_multiworld(choices, seed)
world_options = {option.internal_name: option.options[value]}
multiworld = setup_solo_multiworld(world_options, seed)
basic_checks(self, multiworld)


Expand Down