diff --git a/Mystery.py b/Mystery.py index a346f945..525d5380 100644 --- a/Mystery.py +++ b/Mystery.py @@ -379,7 +379,7 @@ def roll_settings(weights, plando_options: typing.Set[str] = frozenset(("bosses" # TODO consider moving open_pyramid to an automatic variable in the core roller, set to True when # fast ganon + ganon at hole - ret.open_pyramid = goal in {'fast_ganon', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt', 'ganon_pedestal'} + ret.open_pyramid = ret.goal in {'crystals', 'ganontriforcehunt', 'localganontriforcehunt', 'ganonpedestal'} ret.crystals_gt = prefer_int(get_choice('tower_open', weights)) diff --git a/Rom.py b/Rom.py index 5a7fe9e8..d7f063dd 100644 --- a/Rom.py +++ b/Rom.py @@ -2072,10 +2072,6 @@ def write_strings(rom, world, player, team): this_item = items_to_hint.pop(0) this_location = world.find_items(this_item, player) local_random.shuffle(this_location) - # This looks dumb but prevents hints for Skull Woods Pinball Room's key safely with any item pool. - if this_location: - if this_location[0].name == 'Skull Woods - Pinball Room': - this_location.pop(0) if this_location: this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.' tt[hint_locations.pop(0)] = this_hint diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md index 4692fc67..d6d30d7c 100644 --- a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md +++ b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md @@ -64,5 +64,13 @@ alttp_msu-34.pcm ## A word of caution to streamers Many MSU packs use copyrighted music which is not permitted for use on platforms like Twitch and YouTube. -If you choose to stream copyrighted music, your VOD may be muted. In the worst scenario, you may receive a DMCA -take-down notice. Please be careful to only stream music for which you have the rights to do so. +If you choose to stream music from an MSU pack, please ensure you have permission to do so. If you stream +music which has not been licensed to you, or licensed for use in a stream in general, your VOD may be muted. +In the worst case, you may receive a DMCA take-down notice. Please be careful to only stream music for which +you have the rights to do so. + +##### Stream-safe MSU packs +Below is a list of MSU packs which, so far as we know, are safe to stream. More will be added to this list as +we learn of them. If you know of any we missed, please let us know! +- Vanilla Game Music +- [Smooth McGroove](https://drive.google.com/open?id=1JDa1jCKg5hG0Km6xNpmIgf4kDMOxVp3n) diff --git a/WebHostLib/templates/hostGame.html b/WebHostLib/templates/hostGame.html index a8d6e5b1..d31da02d 100644 --- a/WebHostLib/templates/hostGame.html +++ b/WebHostLib/templates/hostGame.html @@ -14,8 +14,12 @@
- To host a game, you need to upload a .multidata file or a .zip file
- created by the multiworld generator.
+ This page allows you to host a game which was not generated by the website. For example, if you have
+ generated a doors game on your own computer, you may upload the zip file created by the generator to
+ host the game here. This will also provide the tracker, and the ability for your players to download
+ their patch files.
+
+ In addition to a zip file created by the generator, you may upload a multidata file here as well.