Skip to content
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

Jump to bottom

Fix Highlands Names #13

Merged
merged 1 commit into from
Dec 6, 2023
Merged

Fix Highlands Names #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions worlds/stardew_valley/data/locations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,20 +2312,20 @@ id,region,name,tags,mod_name
6150,JojaMart,Friendsanity: Claire 12 <3,FRIENDSANITY,Stardew Valley Expanded
6151,JojaMart,Friendsanity: Claire 13 <3,FRIENDSANITY,Stardew Valley Expanded
6152,JojaMart,Friendsanity: Claire 14 <3,FRIENDSANITY,Stardew Valley Expanded
6153,Highlands,Friendsanity: Lance 1 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6154,Highlands,Friendsanity: Lance 2 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6155,Highlands,Friendsanity: Lance 3 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6156,Highlands,Friendsanity: Lance 4 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6157,Highlands,Friendsanity: Lance 5 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6158,Highlands,Friendsanity: Lance 6 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6159,Highlands,Friendsanity: Lance 7 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6160,Highlands,Friendsanity: Lance 8 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6161,Highlands,Friendsanity: Lance 9 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6162,Highlands,Friendsanity: Lance 10 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6163,Highlands,Friendsanity: Lance 11 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6164,Highlands,Friendsanity: Lance 12 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6165,Highlands,Friendsanity: Lance 13 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6166,Highlands,Friendsanity: Lance 14 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6153,Highlands Outside,Friendsanity: Lance 1 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6154,Highlands Outside,Friendsanity: Lance 2 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6155,Highlands Outside,Friendsanity: Lance 3 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6156,Highlands Outside,Friendsanity: Lance 4 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6157,Highlands Outside,Friendsanity: Lance 5 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6158,Highlands Outside,Friendsanity: Lance 6 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6159,Highlands Outside,Friendsanity: Lance 7 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6160,Highlands Outside,Friendsanity: Lance 8 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6161,Highlands Outside,Friendsanity: Lance 9 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6162,Highlands Outside,Friendsanity: Lance 10 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6163,Highlands Outside,Friendsanity: Lance 11 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6164,Highlands Outside,Friendsanity: Lance 12 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6165,Highlands Outside,Friendsanity: Lance 13 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6166,Highlands Outside,Friendsanity: Lance 14 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
6167,Jenkins' Residence,Friendsanity: Olivia 1 <3,FRIENDSANITY,Stardew Valley Expanded
6168,Jenkins' Residence,Friendsanity: Olivia 2 <3,FRIENDSANITY,Stardew Valley Expanded
6169,Jenkins' Residence,Friendsanity: Olivia 3 <3,FRIENDSANITY,Stardew Valley Expanded
Expand Down Expand Up @@ -2574,15 +2574,15 @@ id,region,name,tags,mod_name
7651,Alesia Shop,Tempered Galaxy Dagger,MANDATORY,Stardew Valley Expanded
7652,Isaac Shop,Tempered Galaxy Sword,MANDATORY,Stardew Valley Expanded
7653,Isaac Shop,Tempered Galaxy Hammer,MANDATORY,Stardew Valley Expanded
7654,Highlands,Lance's Diamond Wand,"MANDATORY,GINGER_ISLAND",Stardew Valley Expanded
7654,Lance's House Main,Lance's Diamond Wand,"MANDATORY,GINGER_ISLAND",Stardew Valley Expanded
7701,Island South,Fishsanity: Baby Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7702,Crimson Badlands,Fishsanity: Bonefish,FISHSANITY,Stardew Valley Expanded
7703,Forest,Fishsanity: Bull Trout,FISHSANITY,Stardew Valley Expanded
7704,Forest West,Fishsanity: Butterfish,FISHSANITY,Stardew Valley Expanded
7705,Island South,Fishsanity: Clownfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7706,Highlands,Fishsanity: Daggerfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7706,Highlands Outside,Fishsanity: Daggerfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7707,Mountain,Fishsanity: Frog,FISHSANITY,Stardew Valley Expanded
7708,Highlands,Fishsanity: Gemfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7708,Highlands Outside,Fishsanity: Gemfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
7709,Sprite Spring,Fishsanity: Goldenfish,FISHSANITY,Stardew Valley Expanded
7710,Secret Woods,Fishsanity: Grass Carp,FISHSANITY,Stardew Valley Expanded
7711,Forest West,Fishsanity: King Salmon,FISHSANITY,Stardew Valley Expanded
Expand Down
4 changes: 3 additions & 1 deletion worlds/stardew_valley/mods/mod_regions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@
RegionData(SVERegion.highlands, [SVEEntrance.highlands_to_lance, SVEEntrance.highlands_to_cave]),
RegionData(SVERegion.highlands_cavern, [SVEEntrance.to_dwarf_prison]),
RegionData(SVERegion.dwarf_prison),
RegionData(SVERegion.lances_house, [SVEEntrance.lance_ladder_to_highlands]),
RegionData(SVERegion.lances_house, [SVEEntrance.lance_to_ladder]),
RegionData(SVERegion.lances_ladder, [SVEEntrance.lance_ladder_to_highlands]),
RegionData(SVERegion.forest_west, [SVEEntrance.forest_west_to_spring, SVEEntrance.west_to_aurora,
SVEEntrance.use_bear_shop]),
RegionData(SVERegion.aurora_vineyard, [SVEEntrance.to_aurora_basement]),
Expand Down Expand Up @@ -253,6 +254,7 @@
ConnectionData(SVEEntrance.enter_summit, SVERegion.summit, flag=RandomizationFlag.NON_PROGRESSION),
ConnectionData(SVEEntrance.forest_to_fairhaven, SVERegion.fairhaven_farm, flag=RandomizationFlag.NON_PROGRESSION),
ConnectionData(SVEEntrance.highlands_to_lance, SVERegion.lances_house, flag=RandomizationFlag.NON_PROGRESSION),
ConnectionData(SVEEntrance.lance_to_ladder, SVERegion.lances_ladder),
ConnectionData(SVEEntrance.lance_ladder_to_highlands, SVERegion.highlands, flag=RandomizationFlag.NON_PROGRESSION),
ConnectionData(SVEEntrance.highlands_to_cave, SVERegion.highlands_cavern, flag=RandomizationFlag.NON_PROGRESSION),
ConnectionData(SVEEntrance.use_bear_shop, SVERegion.bear_shop),
Expand Down
9 changes: 5 additions & 4 deletions worlds/stardew_valley/strings/entrance_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class SVEEntrance:
guild_to_interior = "Guild Summit to Adventurer's Guild"
guild_to_mines = "Guild Summit to The Mines"
summit_to_boat = "Guild Summit to Marlon's Boat"
summit_to_highlands = "Guild Summit to Highlands"
summit_to_highlands = "Guild Summit to Highlands Outside"
to_aurora_basement = "Aurora Vineyard to Aurora Vineyard Basement"
outpost_to_badlands_entrance = "Galmoran Outpost to Badlands Entrance"
use_alesia_shop = "Talk to Alesia"
Expand All @@ -308,10 +308,11 @@ class SVEEntrance:
to_susan_house = "Railroad to Susan's House"
enter_summit = "Railroad to Summit"
fable_reef_to_guild = "Fable Reef to First Slash Guild"
highlands_to_lance = "Highlands to Lance's House Main"
highlands_to_cave = "Highlands to Highlands Cavern"
highlands_to_lance = "Highlands Outside to Lance's House Main"
lance_to_ladder = "Lance's House Main to Lance's House Ladder"
highlands_to_cave = "Highlands Outside to Highlands Cavern"
to_dwarf_prison = "Highlands Cavern to Highlands Cavern Prison"
lance_ladder_to_highlands = "Lance's House Ladder to Highlands"
lance_ladder_to_highlands = "Lance's House Ladder to Highlands Outside"
forest_west_to_spring = "Forest West to Sprite Spring"
west_to_aurora = "Forest West to Aurora Vineyard"
use_bear_shop = "Talk to Bear Shop"
Expand Down
5 changes: 3 additions & 2 deletions worlds/stardew_valley/strings/region_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,11 @@ class SVERegion:
guild_summit = "Guild Summit"
fable_reef = "Fable Reef"
first_slash_guild = "First Slash Guild"
highlands = "Highlands"
highlands = "Highlands Outside"
highlands_cavern = "Highlands Cavern"
dwarf_prison = "Highlands Cavern Prison"
lances_house = "Lance's House"
lances_house = "Lance's House Main"
lances_ladder = "Lance's House Ladder"
forest_west = "Forest West"
aurora_vineyard = "Aurora Vineyard"
aurora_vineyard_basement = "Aurora Vineyard Basement"
Expand Down
Loading