Commit Graph

412 Commits

Author SHA1 Message Date
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
Fabian Dill
0978daba69 Make sure shop slots obey accessibility rules.
The way this is checked is quite computationally expensive, should revisit later.
2021-01-11 19:56:18 +01:00
Fabian Dill
f12259dd7d Simplify ShopSlot Shuffling 2021-01-10 19:23:57 +01:00
Fabian Dill
9fcb317aca convert potion_shop_shuffle into 'w' shop_shuffle flag 2021-01-09 17:53:38 +01:00
Fabian Dill
aed763c58f make potion_shop_shuffle more consistent in type use 2021-01-09 17:29:31 +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
8ef78cc32a Add options to allow silent failed plando placements. 2021-01-05 09:56:39 -08:00
CaitSith2
a6d53aafb0 Add option to hard require plando item placement. 2021-01-04 13:50:42 -08:00
Fabian Dill
bd86a07115 make random world targeting smarter, in only considering possible unfilled locations 2021-01-04 15:14:20 +01:00
Fabian Dill
6bb7631382 fix unit tests 2021-01-03 17:16:07 +01: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
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
938ccccbd4 make Item hashable 2021-01-02 12:59:19 +01:00
Fabian Dill
f3b6be2b20 Item Plando Support 2021-01-02 12:49:43 +01:00
pepperpow
767c84a581 Merge branch 'shop-fill' into multishop-all 2020-12-15 02:36:48 -06:00
pepperpow
ffe5b4b1a1 Fixes to clients/servers for shop checks 2020-12-15 02:34:22 -06:00
Fabian Dill
9b0f49e813 Revert logical easy item functionality 2020-12-04 22:44:55 +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
360fcbea9e Add new patch, disallow single bee traps from shops 2020-12-02 20:00:08 -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
Fabian Dill
fc2f1dfd29 implement "non_local_items" 2020-11-22 22:53:31 +01: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
CaitSith2
52dd068577 Fix a typo 2020-10-07 13:48:18 -07:00
Fabian Dill
b5d91af752 New Logic:
Enemy Shuffle awareness
Easy Item Functionality awareness
Dark Room Logic option
Boss Item Shuffle option
Silverless Ganon is a Minor Glitch

Faster Dungeon Item Fill
2020-10-07 19:51:46 +02:00
CaitSith2
9812e2cca5 Add sprite_pool for limiting sprites used in randomonevent. 2020-10-06 13:22:03 -07:00
CaitSith2
dd1bf446ea Put bombos into logic for swordless players 2020-09-27 10:17:35 -07:00
Fabian Dill
5b19818d14 fix prize shuffle alignment in spoiler log 2020-09-20 04:37:12 +02:00
Fabian Dill
a668aa3b23 Make "Prize" shuffling an option 2020-09-20 04:35:45 +02:00
CaitSith2
f040e96bef Fix for Killable thieves, tile shuffle, bush shuffle always saying Yes in the spoiler log. 2020-09-14 23:09:47 -07:00
Fabian Dill
d32bfb7bdf Change "not found" style errors from RuntimeError (misc error) to KeyError (value not found for a given search key) 2020-09-13 17:07:46 +02:00
Fabian Dill
ada13a67fc rebuild world cache on cache miss 2020-09-08 15:02:37 +02:00
CaitSith2
096fc988c4 Show replacement items in shop spoiler if applicable 2020-09-01 21:23:43 -07:00
Fabian Dill
112868b751 remove duplicate shop setting in gui and make entrance/location cache renew slightly faster 2020-08-27 04:05:11 +02:00
Fabian Dill
6370f4793b Make triforce hunt item pool fully dynamic 2020-08-25 19:45:33 +02:00
Fabian Dill
d86eb69b4c Remove old fill algorithms that I have no intention to optimize or support in the future 2020-08-25 17:44:03 +02:00
Fabian Dill
6d38e87527 Refactor some shop code 2020-08-25 14:31:20 +02:00
Fabian Dill
ff79cb6e08 Fix custom item pool
fixes #136
2020-08-24 02:24:48 +02:00
Fabian Dill
9cabd41d3b shopsanity 2020-08-23 21:38:21 +02:00
Fabian Dill
26ab3dd69a Shop Shuffle
- more can be done here, but this works fine as a sometimes fun proof of concept
2020-08-23 15:03:06 +02:00
Fabian Dill
b5048d99b9 optimize sweep_for_events, some has_ functions and some minor things 2020-08-22 19:19:29 +02:00
Fabian Dill
45268b18f3 another round of optimizations and cleanup including some I/O multithreading
also alias sprite names with their file names as that's an often done mistake
2020-08-21 18:35:48 +02:00
Fabian Dill
685ff49711 make "universal" small key shuffle a thing and split it out of retro
also make retro usable independently from the other world modes in mystery
2020-08-20 20:13:00 +02:00
Fabian Dill
367c853300 optimize getting player names 2020-08-20 03:57:09 +02:00
Fabian Dill
cb4fa6dd33 Split enemy shuffle into its components 2020-08-19 23:24:17 +02:00
Fabian Dill
41163d50f5 default triforces in custom gui to their actual default 2020-08-16 16:49:48 +02:00