CaitSith2
6095cfc586
If any shop shuffle slots are defined, define ALL of them to avoid information leakage.
2021-01-22 05:40:50 -08: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
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
ba07da6bba
Change ShopShuffle to operate within current Sphere
2021-01-17 22:58:52 +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
f3e686ba9a
Move Shop related stuff to a Shops module
2021-01-16 02:23:23 +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
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
Fabian Dill
df6ee1a08b
Fill Algorithm optimisations (somewhat minor, but easy pickings)
2020-08-14 00:34:41 +02:00
Fabian Dill
615192f65b
remove lamps_needed_for_dark_rooms variable
2020-08-01 06:26:30 +02:00
compiling
d046829eae
Change item placement rules to not be part of logic - they are used for local items and to prevent placing items in ways that would make seed generation impossible.
2020-07-16 18:59:23 +10:00
Fabian Dill
93ecf5988b
implement secrets.SystemRandom() for --race
2020-07-14 07:01:51 +02:00
compiling
1594d82fb2
Add logic for including nologic seeds in multiworlds (overworld glitch rules)
...
nologic seeds are generated as beatable only with no progression balancing, where it is assumed the player can always win no matter where items are placed.
Add superbunny and dungeon revival to minor glitch ruleset.
2020-07-12 20:19:45 +10:00
Fabian Dill
57fe16ab60
remove special rules for pinball room
2020-07-09 16:16:31 +02:00
Fabian Dill
dd19834e94
implement Silver Bow as default non-progressive Bow
2020-06-30 09:51:11 +02:00
Fabian Dill
521d3b0584
make larger trackers linked tables
2020-06-30 07:32:05 +02:00
CaitSith2
545bb8023c
Add ganon triforce hunt ( #117 )
...
* Add ganon triforce hunt
* Add self to license
* Correction of help message for Local Ganon Triforce Hunt.
* if 'triforcehunt in world.goal[player]:
2020-06-26 16:18:53 +02:00
Fabian Dill
d3d68fcba2
Rename Escape Dungeon to Hyrule Castle by vote on discord
2020-06-24 16:22:49 +02:00
Fabian Dill
f311d3a8b9
implement "crossover logic".
...
Makes it impossible that logical progression for a logic-having player is placed inside a no-logic world. All other placements remain available.
2020-06-19 03:01:23 +02:00
caitsith2
617312fd4b
add available_triforce_pieces
2020-06-17 01:02:54 -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
17f884d047
make triforce pieces required an option
2020-06-07 15:22:24 +02:00
Fabian Dill
2a649a749c
fix crash when quick filling locally locked trash items
2020-06-04 03:30:59 +02:00
Fabian Dill
e55726efca
make world-local items available as a general option
2020-06-03 22:13:58 +02:00
Fabian Dill
3864eb5071
fix /snes <snes_interface> if interface contains spaces (which it shouldn't, but meh)
2020-06-03 02:19:16 +02:00
Fabian Dill
daf3747bec
add progression balancing to spoiler
2020-05-20 22:30:21 +02:00
CaitSith2
0deac5ef9d
Add Bosses to spoiler log ( #96 )
2020-05-20 22:21:05 +02:00
Fabian Dill
11678fa20b
turn progression balancing into a per-player option
2020-05-18 03:54:29 +02:00
compiling
195f6c86d2
Replace world exploration with a faster algorithm - use BFS and keep track of all entrances that are currently blocked by progression items
2020-05-10 19:27:13 +10:00
Fabian Dill
1a53b0e69b
rename has_blunt_weapon to has_melee_weapon
2020-04-20 19:17:10 +02:00
Fabian Dill
860faf6ef5
unify versions
2020-04-20 14:50:49 +02:00
Fabian Dill
31d3b7ce84
implement glitch_boots as a proper CLI option
2020-04-16 11:02:16 +02:00
Fabian Dill
26ea2d5905
some optimization
2020-04-14 18:59:00 +02:00
Fabian Dill
2fb419263e
remove some instances of no longer existing __unicode__
2020-04-10 21:31:15 +02:00
Fabian Dill
01b7a590e7
add glitch_boots mystery node
2020-04-10 20:58:52 +02:00
Fabian Dill
2ebc133cab
add world get_type type checker
2020-04-10 20:54:18 +02:00
Fabian Dill
95d51d48bf
Merge branch 'pull/23'
...
# Conflicts:
# BaseClasses.py
# EntranceShuffle.py
# ItemList.py
# Mystery.py
# Rules.py
2020-04-08 15:07:19 +02:00
Fabian Dill
f89c28d5c2
Merge branch 'master' into pull/58
...
# Conflicts:
# AdjusterMain.py
# BaseClasses.py
# EntranceShuffle.py
# Gui.py
# InvertedRegions.py
# ItemList.py
# Main.py
# Plando.py
# Rom.py
# Rules.py
2020-04-04 09:16:39 +02:00
compiling
270fbce516
Fix bombs check
2020-03-15 21:59:06 +11:00
compiling
ab89f70fa3
Add 10 bombs as an uncle weapon for standard.
2020-03-15 11:09:34 +11:00
compiling
18c10dc7ad
Make retro arrows always require buying the wooden arrow.
...
The Silver Arrows grant the ability to shoot if they are non-progressive, but this is harder to model.
2020-03-15 10:12:22 +11:00
compiling
5c95cf8730
Fix Half Magic logic
2020-03-14 10:31:28 +11:00
Fabian Dill
4cb5af19d6
write spoiler in unicode
2020-03-10 00:36:26 +01:00
Fabian Dill
99e7d51f11
remove reachable cache. Seems I missed invalidations somewhere as the wrong state can be retained.
2020-03-08 05:41:56 +01:00
Fabian Dill
f583db3ee9
remove collections_extended dependency and replace with much faster stdlib Counter
2020-03-07 23:35:55 +01:00
Fabian Dill
27b6dd8bd7
some speed improvments
2020-03-07 23:20:11 +01:00
Fabian Dill
6059db3ea0
some general improvements. Mostly performance improvements of patching roms in multiworld with enemizer
2020-03-06 23:08:46 +01:00
Fabian Dill
e3beb702f8
fix clock mode, again
2020-03-04 13:55:03 +01:00
Fabian Dill
d49bb10534
remove unused checks (as indicated by new type annotations)
2020-03-03 00:17:36 +01:00
Fabian Dill
260e156316
add some annotations to BaseClasses.py
2020-03-03 00:12:14 +01:00
Fabian Dill
11e1ad6901
some small improvements for mystery
2020-02-23 17:06:44 +01:00