From a879e3fc8beaa2c7c5cc9a8cd86199c475d3a200 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 11 Jan 2021 20:45:59 +0100 Subject: [PATCH 1/6] use computed goal names for open_pyramid, just in case --- Mystery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mystery.py b/Mystery.py index a954c326e3..5cc5185046 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)) From 092fde54fd9e80734c046e5dad04aa6642367712 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 11 Jan 2021 19:59:27 -0500 Subject: [PATCH 2/6] Add a list of stream-safe MSU packs to the MSU-1 tutorial --- WebHostLib/static/assets/tutorial/zelda3/msu1_en.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md index 4692fc6774..3444453d47 100644 --- a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md +++ b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md @@ -66,3 +66,9 @@ alttp_msu-34.pcm 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. + +#### Stream-safe MSU packs +Below is a list of MSU packs which, so far as we know, do not violate copyright. More packs 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) From 4880d1265417b5da4dc6e0251d5212b68f1a4629 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 11 Jan 2021 23:03:54 -0500 Subject: [PATCH 3/6] Re-worded the MSU tutorial to be more technically correct. --- WebHostLib/static/assets/tutorial/zelda3/msu1_en.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md index 3444453d47..7496fb1695 100644 --- a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md +++ b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md @@ -64,11 +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, do not violate copyright. More packs will be added to this -list as we learn of them. If you know of any we missed, please let us know! +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) From 51003275d454c670dcec242f2bbfa3d25129f81c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 11 Jan 2021 23:05:06 -0500 Subject: [PATCH 4/6] Minor size adjustment to "Stream Safe MSU Packs" header --- WebHostLib/static/assets/tutorial/zelda3/msu1_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md index 7496fb1695..d6d30d7ca6 100644 --- a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md +++ b/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md @@ -69,7 +69,7 @@ music which has not been licensed to you, or licensed for use in a stream in gen 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 +##### 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 From 9aea7fa113da38d5ff9abf2733810f0a506f3039 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 12 Jan 2021 21:09:59 -0500 Subject: [PATCH 5/6] Update wording on host game page --- WebHostLib/templates/hostGame.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/WebHostLib/templates/hostGame.html b/WebHostLib/templates/hostGame.html index a8d6e5b12e..d31da02dad 100644 --- a/WebHostLib/templates/hostGame.html +++ b/WebHostLib/templates/hostGame.html @@ -14,8 +14,12 @@

Host Game

- 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.

From 85bef9d15e4cafb40f49ab7fd466df1344fd240e Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 13 Jan 2021 15:00:00 +0100 Subject: [PATCH 6/6] Remove a missed instance of Skull Woods - Pinball Room special handling --- Rom.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Rom.py b/Rom.py index cc5d14cbd5..abdb38e2f0 100644 --- a/Rom.py +++ b/Rom.py @@ -2070,10 +2070,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