monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,804 Commits 1 Branch 0 Tags 67 MiB
Commit Graph

2804 Commits

Author SHA1 Message Date
pepperpow 62435c8349 Added overworld bee trap disguises, shop indicators and new shop items 2021-01-20 04:22:26 -06:00
CaitSith2 dfc64266b9 Fix missed instances of ctx.ui_node.log_info 2021-01-20 00:30:54 -08:00
Fabian Dill 15b949d780 Merge branch 'main' into multishop 2021-01-20 03:19:38 +01:00
Fabian Dill dc9456f79a fix PyYAML version name to not trigger module updater 2021-01-20 03:18:46 +01:00
Fabian Dill 4b2a9b3e87 unroll unneeded inner generator expression 2021-01-20 03:17:51 +01:00
Fabian Dill 2e32ab152e Merge branch 'main' into multishop 
# Conflicts:
#	MultiClient.py
 2021-01-20 03:17:08 +01:00
Fabian Dill c5c64f846e update PyYAML 2021-01-20 03:13:17 +01:00
Fabian Dill c8616a6fe4 update prompt toolkit 2021-01-19 07:00:17 +01:00
Fabian Dill 276d49981e Convert WebUI to logging.Handler subclass 2021-01-19 06:37:35 +01:00
Fabian Dill 3f4df40ed1 optimize some things that really don't matter 2021-01-19 06:03:44 +01:00
Fabian Dill 7e18f93a3a copy shop slots to new world 2021-01-19 01:03:32 +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 b2d7229dde type shop as Shop 2021-01-18 04:53:02 +01:00
Fabian Dill 478e1f3a82 General coding pass on Shops 2021-01-18 04:48:20 +01:00
Fabian Dill a67d657882 Shopswap with higher spheres as well 2021-01-17 23:17:14 +01:00
Fabian Dill ba07da6bba Change ShopShuffle to operate within current Sphere 2021-01-17 22:58:52 +01:00
Fabian Dill f4281f81f5 Merge branch 'main' into multishop 2021-01-17 22:08:43 +01:00
Fabian Dill a87a79eb00 remove some duplicate code 2021-01-17 22:08:28 +01:00
Fabian Dill 0286a81755 plando world false is default 2021-01-17 21:42:28 +01:00
Fabian Dill 26314f7c13 Document Connection Plando 
and show where Connection Plando Errors come from
 2021-01-17 18:28:10 +01:00
Fabian Dill 446893c504 Document Item Plando 2021-01-17 17:58:58 +01:00
Fabian Dill 5693d8f414 name lint to lint 2021-01-17 06:59:46 +01:00
Fabian Dill 9d692e070e split github workflows 2021-01-17 06:58:54 +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 51692e7668 Merge remote-tracking branch 'origin/multishop' into multishop 2021-01-16 02:23:33 +01:00
Fabian Dill f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
CaitSith2 0c1b679100 Whoops, fix for backwards cherry-pick 2021-01-15 17:07:18 -08:00
CaitSith2 94b56d10f5 Add shops / old man cave to multidata 2021-01-15 17:04:50 -08:00
Fischfilet89 65fa39df95
Update weightedSettings.json (#162) 
fixed a typo at line 1020 regarding enemy health on the setting "armor-plated"
 2021-01-16 00:38:55 +01:00
Fabian Dill 25330bd730 Fix displaying Race Seeds 2021-01-16 00:32:52 +01:00
CaitSith2 f046ca806c Merge branch 'main' into multishop 2021-01-15 10:17:27 -08:00
Fabian Dill 97a5f412a8 remove take_any_locs in-place modifications 2021-01-15 19:13:22 +01:00
CaitSith2 10a4a89c5f Merge branch 'main' into multishop 2021-01-15 01:41:36 -08:00
CaitSith2 6427d246a2 Fix Take-Any caves being non deterministic 2021-01-15 01:32:51 -08:00
Fabian Dill 5afe44f9cb use multidata locations to get missing checks (in server) 2021-01-15 03:22:56 +01:00
Fabian Dill d214783932 If due to DR or Plando the world is not fulfilling access rules, default to can_beat_game for Shop Logic 2021-01-14 00:26:49 +01:00
Edos512 fd888d9e31
Update MSU spanish tutorial (#161) 
Added Stream-safe MSU packs section
 2021-01-13 22:35:49 +01:00
CaitSith2 082a7b7e41 Merge branch 'main' into multishop 2021-01-13 10:40:52 -08:00
CaitSith2 7bb115de72 Fix bug with placements always being empty. 
It will never be not empty, because every placement that succeeds gets its event set to true, and the conditional expects locations already placed within the fill to also not be events.
 2021-01-13 10:40:23 -08:00
Fabian Dill 67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Fabian Dill 85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling 2021-01-13 15:00:00 +01:00
Fabian Dill e8a57a4d24 Change hint for shop items to be "for sale" 
Lock Dungeon Prizes, as they're not supposed to be moved by any swapping mechanic
 2021-01-13 14:58:40 +01:00
Fabian Dill c0cdeef67a Optimize fulfills_accessibility by pruning to relevant locations 2021-01-13 14:27:17 +01:00
Chris Wilson 9aea7fa113 Update wording on host game page 2021-01-12 21:09:59 -05:00
Fabian Dill 32c5ee53e5 Test both item swap rules 2021-01-13 02:41:29 +01:00