monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename author to authors for consistency

This commit is contained in:
Chris Wilson 2022-05-26 20:39:08 -04:00 committed by black-sliver
parent 0407df83b7
commit 17ba73b0b8
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@ -1516,7 +1516,7 @@ class Tutorial(NamedTuple):
language: str language: str
file_name: str file_name: str
link: str link: str
author: List[str] authors: List[str]
seeddigits = 20 seeddigits = 20

2
WebHost.py
View File

@ -67,7 +67,7 @@ def create_ordered_tutorials_file() -> typing.List[typing.Dict[str, typing.Any]]
'language': tutorial.language, 'language': tutorial.language,
'filename': game + '/' + tutorial.file_name, 'filename': game + '/' + tutorial.file_name,
'link': f'{game}/{tutorial.link}', 'link': f'{game}/{tutorial.link}',
'authors': tutorial.author 'authors': tutorial.authors
}] }]
} }

18
worlds/archipidle/__init__.py
View File

@ -7,14 +7,16 @@ from datetime import datetime
class ArchipIDLEWebWorld(WebWorld): class ArchipIDLEWebWorld(WebWorld):
theme = 'partyTime' theme = 'partyTime'
tutorials = [Tutorial( tutorials = [
"Setup Guide", Tutorial(
"A guide to playing ArchipIDLE", tutorial_name='Setup Guide',
"English", description='A guide to playing Archipidle',
"guide_en.md", language='English',
"guide/en", file_name='guide_en.md',
["Farrak Kilhn"] link='guide/en',
)] authors=['Farrak Kilhn']
)
]
class ArchipIDLEWorld(World): class ArchipIDLEWorld(World):

10
worlds/oot/__init__.py
View File

@ -82,7 +82,7 @@ class OOTWeb(WebWorld):
"Español", "Español",
"setup_es.md", "setup_es.md",
"setup/es", "setup/es",
setup.author setup.authors
) )
tutorials = [setup, setup_es] tutorials = [setup, setup_es]
@ -90,8 +90,8 @@ class OOTWeb(WebWorld):
class OOTWorld(World): class OOTWorld(World):
""" """
The Legend of Zelda: Ocarina of Time is a 3D action/adventure game. Travel through Hyrule in two time periods, The Legend of Zelda: Ocarina of Time is a 3D action/adventure game. Travel through Hyrule in two time periods,
learn magical ocarina songs, and explore twelve dungeons on your quest. Use Link's many items and abilities learn magical ocarina songs, and explore twelve dungeons on your quest. Use Link's many items and abilities
to rescue the Seven Sages, and then confront Ganondorf to save Hyrule! to rescue the Seven Sages, and then confront Ganondorf to save Hyrule!
""" """
game: str = "Ocarina of Time" game: str = "Ocarina of Time"
@ -577,7 +577,7 @@ class OOTWorld(World):
(loc.internal or loc.type == 'Drop') and loc.event and loc.locked and loc not in reachable] (loc.internal or loc.type == 'Drop') and loc.event and loc.locked and loc not in reachable]
for loc in unreachable: for loc in unreachable:
loc.parent_region.locations.remove(loc) loc.parent_region.locations.remove(loc)
# Exception: Sell Big Poe is an event which is only reachable if Bottle with Big Poe is in the item pool. # Exception: Sell Big Poe is an event which is only reachable if Bottle with Big Poe is in the item pool.
# We allow it to be removed only if Bottle with Big Poe is not in the itempool. # We allow it to be removed only if Bottle with Big Poe is not in the itempool.
bigpoe = self.world.get_location('Sell Big Poe from Market Guard House', self.player) bigpoe = self.world.get_location('Sell Big Poe from Market Guard House', self.player)
if not all_state.has('Bottle with Big Poe', self.player) and bigpoe not in reachable: if not all_state.has('Bottle with Big Poe', self.player) and bigpoe not in reachable:
@ -632,7 +632,7 @@ class OOTWorld(World):
if shufflebk in itempools: if shufflebk in itempools:
itempools[shufflebk].extend(dungeon.boss_key) itempools[shufflebk].extend(dungeon.boss_key)
# We can't put a dungeon item on the end of a dungeon if a song is supposed to go there. Make sure not to include it. # We can't put a dungeon item on the end of a dungeon if a song is supposed to go there. Make sure not to include it.
dungeon_locations = [loc for region in dungeon.regions for loc in region.locations dungeon_locations = [loc for region in dungeon.regions for loc in region.locations
if loc.item is None and ( if loc.item is None and (
self.shuffle_song_items != 'dungeon' or loc.name not in dungeon_song_locations)] self.shuffle_song_items != 'dungeon' or loc.name not in dungeon_song_locations)]