morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,389 Commits 3 Branches 10 Tags
569e0e30048bada32a17890c741e5da02dc8b806
Commit Graph

232 Commits

Author SHA1 Message Date
Fabian Dill
a646594f08 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
 2021-01-30 23:29:32 +01:00
pepperpow
82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
CaitSith2
7f74aa7cb0 Implement open_pyramid yaml settings 2021-01-29 13:27:42 -08:00
Chris Wilson
635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings. 
- Also fix a bug caused by the website settings always forcing options to lowercase
 2021-01-24 21:14:58 -05:00
Fabian Dill
c604dfe509 move networks commands to [str, Optional[dict]] across the board 
and some other updates
PrintHTML is an experiment and is unlikely the solution I'll go with
 2021-01-21 23:37:58 +01:00
Fabian Dill
670b8b4b11 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	WebUI.py
 2021-01-21 05:36:16 +01:00
Fabian Dill
b775bfa916 Merge branch 'main' into multishop 2021-01-19 01:02:57 +01:00
Fabian Dill
e2075686c2 fix ItemPlando defaults 2021-01-19 01:02:03 +01:00
Fabian Dill
2b730ab1d4 Merge branch 'main' into multishop 2021-01-18 22:30:05 +01:00
Fabian Dill
4fb8067b5e document item plando force parameter 2021-01-18 05:07:53 +01:00
Fabian Dill
f4281f81f5 Merge branch 'main' into multishop 2021-01-17 22:08:43 +01:00
Fabian Dill
446893c504 Document Item Plando 2021-01-17 17:58:58 +01:00
Fabian Dill
7333a15f1f handle merge conflicts after plando update 2021-01-17 06:54:38 +01:00
Fabian Dill
514cd19367 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
 2021-01-17 06:50:25 +01:00
Fabian Dill
3b5ba161de first two plando modules documented 2021-01-17 02:15:46 +01:00
Fabian Dill
67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Fabian Dill
a879e3fc8b use computed goal names for open_pyramid, just in case 2021-01-11 20:45:59 +01:00
Fabian Dill
9fcb317aca convert potion_shop_shuffle into 'w' shop_shuffle flag 2021-01-09 17:53:38 +01:00
Fabian Dill
e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop 
# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp
 2021-01-09 16:03:59 +01:00
CaitSith2
eea4cb5815 Make sure yamls that specify key drop plando locations don't fail. 2021-01-08 06:37:23 -08:00
CaitSith2
48812ad296 Fix bug regarding silent failed plando. 2021-01-08 06:35:12 -08:00
CaitSith2
8116407b88 Add Ice Rod Hunt goal 2021-01-07 12:49:34 -08:00
CaitSith2
07f97887d1 Fix bug with boss plandomizer 2021-01-06 11:12:23 -08:00
CaitSith2
3d13ab749e Allow specifying multiple items and locations to fill at once. 2021-01-06 09:55:16 -08:00
CaitSith2
a6d53aafb0 Add option to hard require plando item placement. 2021-01-04 13:50:42 -08:00
CaitSith2
bf5930e193 Catch plando errors that will never resolve at mystery rolling time. 2021-01-03 07:14:31 -08:00
Fabian Dill
8ebd36b5a7 update Archipelago 2021-01-03 14:32:32 +01:00
Fabian Dill
08ca4245c1 Merge branch 'main' into breaking_changes 
# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
 2021-01-03 13:13:59 +01:00
Fabian Dill
e7beb80219 Allow Mystery setting Misery Mire and Turtle Rock medallions 2021-01-02 23:00:14 +01:00
Fabian Dill
be162f5b8d Connections Plando Support 2021-01-02 22:41:03 +01:00
Fabian Dill
07df9b9e80 Text Plando Support 2021-01-02 16:44:58 +01:00
Fabian Dill
f3b6be2b20 Item Plando Support 2021-01-02 12:49:43 +01:00
Fabian Dill
3d53adf45c more debug/warning feedback for linked options 2021-01-02 05:24:53 +01:00
Fabian Dill
6256337df1 Manual Boss Placements 2020-12-31 13:23:32 +01:00
pepperpow
7b5bd016b9 Merge branch 'potion-shop' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:35:59 -06:00
pepperpow
608d96329f Shop Item Pool fill feature + multiworld player compatability 2020-11-23 20:05:04 -06:00
pepperpow
fe218fffa6 Potion Shop Changes 
(reduced)
 2020-11-23 19:00:11 -06:00
CaitSith2
4370447adc More fixes to non_local_items 2020-11-22 14:29:11 -08:00
Fabian Dill
fc2f1dfd29 implement "non_local_items" 2020-11-22 22:53:31 +01:00
CaitSith2
7312ffdf5f Recognize list as an unweighted list of choices. 2020-11-05 17:03:33 -08:00
Kaito Sinclaire
41a58084f1 Options for amount of time given in timer modes 
(Primarily to make Timed OHKO a viable multiworld and/or mystery option,
but also works with other timer modes as well)
 2020-10-28 16:20:59 -07:00
Fabian Dill
1d58f54101 move ALTTP to its own world folder 2020-10-24 05:38:56 +02:00
Fabian Dill
2d43cae88e palette fixes 2020-10-24 05:33:52 +02:00
Edos512
b91a627b32 Added options from Maseya Palette Randomizer (#145) 
Add remaining palette shuffle options
 2020-10-24 02:44:27 +02:00
CaitSith2
651e1a1901 Changes 
* Fix chests always being for yourself AND intended recipient for Race Rom seeds.
* Fix MultiMystery not being able to correctly pack Race Rom seeds into a zip file.
* Add tags to multidata for Race rom, Spoiler log, and Playthrough if spoiler log was generated.
 2020-10-21 02:02:13 -07:00
Fabian Dill
5436c062d3 Cast to number types explicitly in case they come as string from yaml in Mystery.py 2020-10-18 07:12:09 +02:00
Chris Wilson
c714131b37 Fix the player settings page generating yaml files with string keys containing integers 2020-10-18 00:51:50 -04:00
CaitSith2
f17682e997 Implement pedestal ganon goal 2020-10-15 15:24:52 -07:00
CaitSith2
4e0a2ad696 Actually iterate the dictionary correctly. 2020-10-14 20:33:12 -07:00
CaitSith2
99e21a68fb Add a more direct random-sprite-on-event yaml option 2020-10-14 12:46:05 -07:00