Skip to content

A Short Hike: Implement New Game #2577

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.

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 78 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 68 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
56c8354
Start a short hike
chandler05 Aug 8, 2023
9b54ddd
Complete setup
chandler05 Aug 8, 2023
5bffc2e
all items
chandler05 Aug 9, 2023
6e5e4e6
create rules and add seashells
chandler05 Aug 10, 2023
a1b822b
Fixes
chandler05 Aug 10, 2023
2e8d2ae
Add missing count count
chandler05 Aug 10, 2023
b0e642e
Add location rules and update item categories
chandler05 Aug 10, 2023
954cba6
Finish location data
chandler05 Aug 11, 2023
717af57
fixes
chandler05 Aug 11, 2023
b93e0ad
Rename one location
chandler05 Aug 12, 2023
86b507a
Send locations in slot data and clean up imports
chandler05 Aug 13, 2023
bf823ea
Remove redundant ID field
chandler05 Aug 13, 2023
7da82cd
Map in game IDs
chandler05 Aug 13, 2023
7825554
Fix incorrect location ids on Orange Island
BrandenEK Aug 14, 2023
238d920
Merge pull request #1 from BrandenEK/short-hike-fix
chandler05 Aug 14, 2023
8eac7ce
New items and locations
chandler05 Aug 15, 2023
07c851e
Remove boating manual and rename location
chandler05 Aug 15, 2023
723de68
Patch crashing issue
chandler05 Aug 16, 2023
19592c8
Add first options
chandler05 Aug 16, 2023
5602d4e
Merge branch 'ArchipelagoMW:main' into A-Short-Hike
chandler05 Aug 16, 2023
acd770d
Chest angles
chandler05 Aug 18, 2023
4439b3c
Add filler silver feathers option and progressive golden fishing rods
chandler05 Aug 20, 2023
1a425e4
Remove redundant rules
chandler05 Aug 20, 2023
f702d3b
Update rules
chandler05 Aug 24, 2023
515a912
Update Item Classifications
chandler05 Aug 25, 2023
f11cbb2
Merge branch 'ArchipelagoMW:main' into A-Short-Hike
chandler05 Sep 13, 2023
d36c85f
Documentation Update
chandler05 Sep 13, 2023
0396e90
Merge branch 'A-Short-Hike' of https://github.com/chandler05/Archipel…
chandler05 Sep 13, 2023
d471a25
Change location IDs
chandler05 Sep 25, 2023
e781bc4
Add many new options, logic fixes
chandler05 Nov 28, 2023
d56af3d
Merge branch 'A-Short-Hike' of https://github.com/chandler05/Archipel…
chandler05 Nov 28, 2023
8c3911c
Add completion_condition for spoiler log
chandler05 Nov 28, 2023
0dc2810
Update options to v0.4.4 and fix some bugs
chandler05 Nov 30, 2023
d24596c
Merge branch 'ArchipelagoMW:main' into A-Short-Hike
chandler05 Nov 30, 2023
a21e2ff
Fix formatting
chandler05 Dec 1, 2023
244e271
Update __init__.py
chandler05 Dec 1, 2023
05ccdc2
Add additional goals to world
chandler05 Dec 1, 2023
384069e
Goals logic
chandler05 Dec 2, 2023
1059b07
Merge branch 'ArchipelagoMW:main' into A-Short-Hike
chandler05 Dec 4, 2023
b06c877
Add PopTracker support
chandler05 Dec 4, 2023
e1d2c8e
Update IDs to new system
chandler05 Dec 7, 2023
c1fd4c7
Merge branch 'main' into A-Short-Hike
chandler05 Dec 8, 2023
1b38bd9
Respect starting inventory
chandler05 Dec 13, 2023
6c3679e
Remove extra options
chandler05 Dec 13, 2023
535ceed
Simplify with variable
chandler05 Dec 14, 2023
d9db0ee
Rename world to multiworld
chandler05 Dec 17, 2023
1533edd
Remove Fishing Journal requirements
chandler05 Dec 18, 2023
7932ab3
Update feathers in logic
chandler05 Dec 19, 2023
8bde558
Fixup small issues
chandler05 Jan 1, 2024
8f777f6
Merge branch 'main' into A-Short-Hike
chandler05 Jan 3, 2024
e27ba46
Merge branch 'main' into A-Short-Hike
chandler05 Jan 17, 2024
8e0eea9
Update feather counts for peak
chandler05 Feb 6, 2024
39d7bd2
Merge branch 'main' into A-Short-Hike
chandler05 Feb 6, 2024
926617a
Update Items.py Classifications
chandler05 Feb 11, 2024
1b05b31
Address all issues
chandler05 Feb 13, 2024
d310697
Merge branch 'main' into A-Short-Hike
chandler05 Feb 13, 2024
7747687
Remove leftover logging
chandler05 Feb 13, 2024
07415bf
Update __init__.py
chandler05 Feb 14, 2024
7924575
Merge branch 'main' into A-Short-Hike
chandler05 Feb 14, 2024
8d7b6e3
Remove old starting inventory behavior
chandler05 Feb 14, 2024
b5558a9
Merge branch 'main' into A-Short-Hike
chandler05 Feb 14, 2024
54539f6
Disable min feathers earlier on hard difficulty
chandler05 Feb 21, 2024
b74181b
Fix lambdas in rules
chandler05 Feb 21, 2024
5d0f17b
Merge branch 'main' into A-Short-Hike
chandler05 Feb 21, 2024
ce470a4
Add newline to Options
chandler05 Feb 21, 2024
0cac1e4
Merge branch 'main' into A-Short-Hike
chandler05 Feb 28, 2024
630a387
Merge branch 'main' into A-Short-Hike
Berserker66 Mar 3, 2024
b48143d
Remove location slot data, plus a few other small changes
chandler05 Mar 6, 2024
f9b8d5f
Fix conflicts
chandler05 Mar 6, 2024
d89cc06
Merge branch 'main' into A-Short-Hike
chandler05 Mar 6, 2024
f17fe59
Update __init__.py
chandler05 Mar 15, 2024
9bdcba1
Update README.md
chandler05 Mar 15, 2024
63bd74b
whoops
chandler05 Mar 15, 2024
edfacd5
Merge branch 'main' into A-Short-Hike
chandler05 Mar 15, 2024
aeb5295
Cost Multiplier option
chandler05 Mar 15, 2024
1437856
insert Cost Multiplier in slot data
chandler05 Mar 15, 2024
b93d893
Merge branch 'main' into A-Short-Hike
chandler05 Mar 20, 2024
8bbf591
Merge branch 'main' into A-Short-Hike
Berserker66 Mar 20, 2024
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Currently, the following games are supported:
* Landstalker: The Treasures of King Nole
* Final Fantasy Mystic Quest
* TUNIC
* A Short Hike

For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled
Expand Down
3 changes: 3 additions & 0 deletions docs/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@
# Shivers
/worlds/shivers/ @GodlFire

# A Short Hike
/worlds/shorthike/ @chandler05

# Sonic Adventure 2 Battle
/worlds/sa2b/ @PoryGone @RaspberrySpace

Expand Down
62 changes: 62 additions & 0 deletions worlds/shorthike/Items.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
from BaseClasses import ItemClassification
from typing import TypedDict, Dict, List, Set

class ItemDict(TypedDict):
name: str
id: int
count: int
classification: ItemClassification

base_id = 82000

item_table: List[ItemDict] = [
{"name": "Stick", "id": base_id + 1, "count": 8, "classification": ItemClassification.progression_skip_balancing},
{"name": "Seashell", "id": base_id + 2, "count": 23, "classification": ItemClassification.progression_skip_balancing},
{"name": "Golden Feather", "id": base_id + 3, "count": 0, "classification": ItemClassification.progression},
{"name": "Silver Feather", "id": base_id + 4, "count": 0, "classification": ItemClassification.useful},
{"name": "Bucket", "id": base_id + 5, "count": 0, "classification": ItemClassification.progression},
{"name": "Bait", "id": base_id + 6, "count": 2, "classification": ItemClassification.filler},
{"name": "Fishing Rod", "id": base_id + 7, "count": 2, "classification": ItemClassification.progression},
{"name": "Shovel", "id": base_id + 8, "count": 1, "classification": ItemClassification.progression},
{"name": "Toy Shovel", "id": base_id + 9, "count": 5, "classification": ItemClassification.progression_skip_balancing},
{"name": "Compass", "id": base_id + 10, "count": 1, "classification": ItemClassification.useful},
{"name": "Medal", "id": base_id + 11, "count": 3, "classification": ItemClassification.filler},
{"name": "Shell Necklace", "id": base_id + 12, "count": 1, "classification": ItemClassification.progression},
{"name": "Wristwatch", "id": base_id + 13, "count": 1, "classification": ItemClassification.progression},
{"name": "Motorboat Key", "id": base_id + 14, "count": 1, "classification": ItemClassification.progression},
{"name": "Pickaxe", "id": base_id + 15, "count": 3, "classification": ItemClassification.useful},
{"name": "Fishing Journal", "id": base_id + 16, "count": 1, "classification": ItemClassification.useful},
{"name": "A Stormy View Map", "id": base_id + 17, "count": 1, "classification": ItemClassification.filler},
{"name": "The King Map", "id": base_id + 18, "count": 1, "classification": ItemClassification.filler},
{"name": "The Treasure of Sid Beach Map", "id": base_id + 19, "count": 1, "classification": ItemClassification.filler},
{"name": "In Her Shadow Map", "id": base_id + 20, "count": 1, "classification": ItemClassification.filler},
{"name": "Sunhat", "id": base_id + 21, "count": 1, "classification": ItemClassification.filler},
{"name": "Baseball Cap", "id": base_id + 22, "count": 1, "classification": ItemClassification.filler},
{"name": "Provincial Park Hat", "id": base_id + 23, "count": 1, "classification": ItemClassification.filler},
{"name": "Headband", "id": base_id + 24, "count": 1, "classification": ItemClassification.progression},
{"name": "Running Shoes", "id": base_id + 25, "count": 1, "classification": ItemClassification.useful},
{"name": "Camping Permit", "id": base_id + 26, "count": 1, "classification": ItemClassification.progression},
{"name": "Walkie Talkie", "id": base_id + 27, "count": 1, "classification": ItemClassification.useful},

# Not in the item pool for now
#{"name": "Boating Manual", "id": base_id + ~, "count": 1, "classification": ItemClassification.filler},

# Different Coin Amounts (Fillers)
{"name": "7 Coins", "id": base_id + 28, "count": 3, "classification": ItemClassification.filler},
{"name": "15 Coins", "id": base_id + 29, "count": 1, "classification": ItemClassification.filler},
{"name": "18 Coins", "id": base_id + 30, "count": 1, "classification": ItemClassification.filler},
{"name": "21 Coins", "id": base_id + 31, "count": 2, "classification": ItemClassification.filler},
{"name": "25 Coins", "id": base_id + 32, "count": 7, "classification": ItemClassification.filler},
{"name": "27 Coins", "id": base_id + 33, "count": 1, "classification": ItemClassification.filler},
{"name": "32 Coins", "id": base_id + 34, "count": 1, "classification": ItemClassification.filler},
{"name": "33 Coins", "id": base_id + 35, "count": 6, "classification": ItemClassification.filler},
{"name": "50 Coins", "id": base_id + 36, "count": 1, "classification": ItemClassification.filler},

# Filler item determined by settings
{"name": "13 Coins", "id": base_id + 37, "count": 0, "classification": ItemClassification.filler},
]

group_table: Dict[str, Set[str]] = {
"Coins": {"7 Coins", "13 Coins", "15 Coins", "18 Coins", "21 Coins", "25 Coins", "27 Coins", "32 Coins", "33 Coins", "50 Coins"},
"Maps": {"A Stormy View Map", "The King Map", "The Treasure of Sid Beach Map", "In Her Shadow Map"},
}
Loading