Commit Graph

1314 Commits

Author SHA1 Message Date
Fabian Dill 48aff48740 logfile sanity check 2020-06-14 08:11:56 +02:00
Fabian Dill 4e6f976e1d Merge remote-tracking branch 'origin/master' 2020-06-14 07:45:07 +02:00
Fabian Dill 03a6227eef set up pony and waitress skeletons 2020-06-14 07:44:59 +02:00
caitsith2 6141a4dddc Fix the Localized Cross keys example 2020-06-13 21:27:32 -07:00
Fabian Dill c486cd77bb fix missed rename 2020-06-14 04:12:38 +02:00
Fabian Dill fdaba7e28c Merge branch 'bsdiff4_baserom'
# Conflicts:
#	Main.py
2020-06-13 22:51:44 +02:00
Fabian Dill ddc7be0794 update webhost 2020-06-13 22:49:57 +02:00
Chris 53744be44c Remove useless code and rebuild bundle file 2020-06-13 15:24:28 -04:00
Fabian Dill 35933b88c4
Merge pull request #110 from compiling/multiworld
OWG mandatory exit rules
2020-06-13 19:36:24 +02:00
compiling ca1740121e Reduce mandatory exits for OWG logic to only those that cannot be reached by glitches 2020-06-13 19:12:01 +10:00
Fabian Dill 7c5c32c49a include web host for multiple multiworlds
This is in proof of concept stage, but also as a how-to as I get about monthly asked how to run multiple MultiServer instances for Discord Bots.
2020-06-13 10:16:29 +02:00
Fabian Dill 5da5847805 allow multiserver to defer to embedded options 2020-06-13 08:37:05 +02:00
compiling 2199f18f16 Split mirror glitches into clips and offsets, with different rules (offsets need boots).
Fix inverted mirror rules - DM Descent is a mirror offset, East DM access is a mirror wrap (not in logic).
Add mirror clip to Desert East entrance (from east Mire Shed).
Add inverted mirror offset to hyrule castle ledge (placing a portal on the houlihan exit).
2020-06-13 15:39:58 +10:00
Fabian Dill 898a0b7a8f adjuster no longer needs to work with other basepatches, so it should not overwrite other basepatches. 2020-06-12 21:50:10 +02:00
Fabian Dill a77424d66a missed a rename 2020-06-11 22:19:46 +02:00
caitsith2 233d12be30 Change max triforce_pieces_required from 30 to 112. 2020-06-11 11:53:10 -07:00
Fabian Dill 5692041a5b call enemizer with binary rom data 2020-06-11 04:56:47 +02:00
Fabian Dill 403732e121
Merge pull request #108 from Berserker66/regression_fix_2
Place skull woods or universal key into generated item pools as appro…
2020-06-10 22:48:37 +02:00
caitsith2 fb0787a76d Place skull woods or universal key into generated item pools as appropriate. (and pop skull woods small key if explicitly placed in pinball chest). (5 rupees instead of universal key on hard/expert pool) 2020-06-10 13:41:28 -07:00
Fabian Dill 97af751010 beautify if tree 2020-06-10 21:29:42 +02:00
Fabian Dill 5f78ae4b1d
Merge pull request #107 from Berserker66/regression_fix
Fix skull woods for Location / Item players.
2020-06-10 21:26:13 +02:00
Fabian Dill 4125995bdd Adjust output to "BM" (Berserker's Multiworld) to differentiate spoiler logs, roms and server data at a glance
Rename _multidata to .multidata and embed .multidata as MultiServer-openable file into windows registry
2020-06-10 21:25:14 +02:00
caitsith2 ec1c7601b4 Fix skull woods for Location / Item players. 2020-06-10 12:23:33 -07:00
Fabian Dill 9d067b6f00 improve gui 2020-06-10 19:57:01 +02:00
Fabian Dill cd3c2f3c84 remove HTTP logging as it confuses users
might be worth to log it to a file, if we ever need to debug it
2020-06-10 19:10:11 +02:00
Fabian Dill aa0d9fa7fc Remove plando, as there's no intention in supporting it 2020-06-10 19:05:09 +02:00
Fabian Dill 3a1f98aab6 add minor_glitches to mystery 2020-06-10 19:02:11 +02:00
Fabian Dill 76e0c6474e add localcrosskeys example to easy.yaml 2020-06-10 07:58:59 +02:00
Fabian Dill 326262203f remove pinball key if keyshuffle 2020-06-10 06:17:10 +02:00
Fabian Dill 90b24e3d59 alias now goes to 16, same as rom-name. Also improve some docstrings 2020-06-10 06:13:14 +02:00
Fabian Dill 7d9d6b3ca1 only force pinball key in non glitched logic and non retro 2020-06-10 06:11:56 +02:00
Fabian Dill b3d8368b70 differentiate goal text for local triforce hunt 2020-06-10 03:34:07 +02:00
Fabian Dill b6c85375c4 actually make minorglitches usable 2020-06-10 03:24:19 +02:00
Fabian Dill 4192e0fabb fix verify 2020-06-09 22:12:46 +02:00
Fabian Dill 8f6fd314ef remove jsonout #2 2020-06-09 22:11:14 +02:00
Fabian Dill 9c9b5c5191 remove jsonout 2020-06-09 21:52:46 +02:00
caitsith2 de9ae7d111 baserom now derived from bmbp file. 2020-06-09 12:18:48 -07:00
Fabian Dill 9fcad5b392 fix that in a copied world progressive equipment would always say "on", including spoiler log 2020-06-09 18:44:02 +02:00
Fabian Dill 068d3e8695 fix crash if there are no cached adjuster settings
addresses #105
2020-06-09 18:02:15 +02:00
Fabian Dill 142c47b90f bump version 2020-06-09 08:38:52 +02:00
Fabian Dill 27901008bc fix that hints print already collected items again 2020-06-09 05:22:48 +02:00
Fabian Dill 030fa9c10b Merge branch 'msu_v32' 2020-06-09 04:59:14 +02:00
Fabian Dill 493906f0c5 fix crash if no cached server is in persistent storage 2020-06-09 04:53:49 +02:00
Fabian Dill 24a2c90819 Merge branch 'master' into msu_v32 2020-06-09 02:16:26 +02:00
caitsith2 0aa6bc5a94 Updated baserom patch 2020-06-08 11:55:40 -07:00
Fabian Dill 8a0bae0252
Merge pull request #103 from Berserker66/patch_changes
Allow patch.py to mass adjust roms. (It asks on first slot, and if yes is said, applies to ALL patches.)
Allow patch.py store target server address for patch.
2020-06-08 18:22:53 +02:00
Fabian Dill 9612e27531 correct webuidata log to debug level 2020-06-08 18:21:04 +02:00
CaitSith2 96bea214da
Merge branch 'master' into msu_v32 2020-06-08 02:04:41 -07:00
Fabian Dill ccf418a614 fix treasure hunt (aka triforce hunt) condition 2020-06-08 06:58:38 +02:00
Fabian Dill 10dca0461d update VC++ 2020-06-08 05:28:35 +02:00