aerinon
f6179cda03
Merge with doordev
2020-01-23 16:45:25 -07:00
aerinon
1e2daffc5b
Stonewall fix and preliminary crossed generation issues
2020-01-23 16:43:01 -07:00
aerinon
34a8b6e496
Merge branch 'DoorDev' into Inverted
2020-01-23 09:39:02 -07:00
aerinon
3937f4d9e9
Door shuffle setting added to spoiler
2020-01-23 09:10:11 -07:00
compiling
33b849a176
Speed hacks
...
- reduce the regions being checked every iteration when updating
- only sweep for crystal access when new locations are found, and when starting a new sphere
2020-01-23 20:08:37 +11:00
aerinon
4c0c8ea21a
Key and crystal sweep fixes
2020-01-22 12:35:13 -07:00
aerinon
7c03332b0b
Merge of compiling's multidoors branch into mine
2020-01-21 14:12:55 -07:00
compiling
2c3f5a9aff
Recheck region access when sweeping for crystal state succeeds.
2020-01-21 22:09:30 +11:00
compiling
123b49686a
Sweep for crystal access instead of all events (since events are manually collected in beatability check)
2020-01-20 23:07:14 +11:00
compiling
e0eff76b9b
Merge remote-tracking branch 'remotes/multi/multiworld_31' into multidoors
2020-01-19 18:18:43 +11:00
aerinon
c08fb4bd5e
Initial work for fixing standard (basic only so far)
2020-01-19 18:13:06 +11:00
compiling
4f7aea7dde
Sweep for events when checking beatability.
2020-01-19 15:04:11 +11:00
Bonta-kun
f988f7671b
--remote_items toggle: items will no longer be stored in the rom, a connection to a multiworld server will be required to receive them
2020-01-18 09:50:12 +01:00
compiling
9033b5331f
Optimise crystal checks a bit - only check regions with out of logic doors.
2020-01-18 14:01:06 +11:00
compiling
b6d17e5f12
Reintroduce sweep_for_crystal_access - currently required in certain layouts (key door blocks flow of blue-state between reachable rooms)
2020-01-17 21:19:31 +11:00
compiling
ee7d795780
Temp remove sweep_for_crystal_access - not required?
2020-01-16 22:15:55 +11:00
compiling
ee8c629ac7
Merge commit 'c4ae75bc2b866e4a304614200eac678fd4da4aee' into multidoors
2020-01-16 20:23:43 +11:00
compiling
62e56bc9ee
Check if spread_crystal_access should be called when each new region is reached.
2020-01-16 19:21:58 +11:00
aerinon
ef6b171233
First stab at fixing crystal switch spread - probably not done.
2020-01-15 16:28:22 -07:00
aerinon
c4ae75bc2b
Multiworld merge
2020-01-14 15:07:13 -07:00
Bonta-kun
ad278f91d6
Multiworld: clients will now be automatically be identified from the rom name and have their names and teams set by the host, meaning those need to be configured during seed gen
...
Player names will show up in spoiler log and hint tiles instead of player id
MultiClient: autoreconnect to mw server
2020-01-14 10:42:27 +01:00
compiling
4d35a02e99
Separate doorShuffle for each player
...
Add doorShuffle to spoiler metadata
2020-01-11 12:01:21 +11:00
compiling
a3a706d8c1
Merge remote-tracking branch 'remotes/door_rando/DoorDev' into Dev
2020-01-11 09:17:41 +11:00
compiling
e2df282201
Merge remote-tracking branch 'remotes/multi/multiworld_31' into Dev
2020-01-11 08:58:09 +11:00
Bonta-kun
2f5a3e24dd
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
Bonta-kun
77ae96cf1b
Refactor rom patching now that jsonrom patches can safely be merged
2020-01-10 07:02:44 +01:00
Bonta-kun
6bafdfafe6
Mystery: rom options can be set in weights file, eg
...
rom:
sprite:
random: 1
randomonhit: 1
mog: 1
disablemusic: off
quickswap:
on: 1
off: 0
menuspeed:
normal: 1
instant: 1
double: 1
triple: 1
quadruple: 1
half: 1
heartcolor:
red: 1
blue: 1
green: 1
yellow: 1
random: 1
heartbeep:
double: 1
normal: 1
half: 1
quarter: 1
off: 1
ow_palettes:
default: 1
random: 1
blackout: 1
uw_palettes:
default: 1
random: 1
blackout: 1
2020-01-09 17:46:07 +01:00
Bonta-kun
42b85d7a3c
Include sphere0 items in the spoiler log and in the playthrough
2020-01-09 08:31:49 +01:00
aerinon
19faf41e79
Retro to match Bonta solution
...
Minor gui updates
2020-01-06 15:56:14 -07:00
aerinon
6569d81e2a
Retro to match Bonta solution
...
Minor gui updates
2020-01-06 15:54:59 -07:00
aerinon
f26c83e852
Made the CollectionState crystal switch aware and added crystal rules
...
Small adjustment to big key forbidding
2020-01-06 15:32:33 -07:00
compiling
0c2580dea9
Fix conflicts
2020-01-05 21:51:07 +11:00
compiling
9803515315
Merge remote-tracking branch 'remotes/door_rando/DoorDev' into Dev
2020-01-04 21:33:42 +11:00
compiling
edd656b903
Swap implementation of Take Any fix to match Multiworld.
2020-01-03 08:27:22 +11:00
aerinon
fea605ae66
Fixing conflicts
2020-01-02 11:52:24 -07:00
aerinon
88849e921c
Revert "Revert "Cross Dungeon initial work""
...
This reverts commit fadc085b67 .
2020-01-02 11:37:47 -07:00
compiling
0eed4bb527
Add shop door ids to tables (used when shop locations are vanilla)
...
Do not replace Upgrade Fairy with retro shop
2020-01-02 16:33:00 +11:00
Bonta-kun
fe307b1ac7
bzzz bzzz
2019-12-30 03:03:53 +01:00
Bonta-kun
819f6dc975
Retro: fix take any entrances with default connections
2019-12-27 19:11:41 +01:00
Bonta-kun
aa080eb455
Include unreachable items in the spoiler log
2019-12-21 13:33:07 +01:00
Bonta-kun
4a16ba74e8
Fix triforce hunt icon showing for every player
2019-12-21 10:42:59 +01:00
aerinon
fadc085b67
Revert "Cross Dungeon initial work"
...
This reverts commit 35c3a07dc3 .
2019-12-19 16:24:58 -07:00
aerinon
35c3a07dc3
Cross Dungeon initial work
2019-12-19 14:48:09 -07:00
Bonta-kun
8721310cf7
World: include can_access_trock_eyebridge can_access_trock_front can_access_trock_big_chest can_access_trock_middle and fix_fake_world in the player specific attributes
2019-12-18 20:45:51 +01:00
Bonta-kun
36bdb5f487
Spoiler: reorder some settings for visibility
2019-12-17 21:12:05 +01:00
Bonta-kun
a24fe1f3bf
World.__init__: group player attributes to remove some redundancy
2019-12-17 21:09:33 +01:00
Bonta-kun
1ecb5fe40b
Individual settings: shufflebosses shuffleenemies enemy_health enemy_damage
2019-12-17 15:55:53 +01:00
Bonta-kun
8a5eef11ce
Individual settings: hints
2019-12-17 12:22:55 +01:00
Bonta-kun
d9281adc07
Individual settings: accessibility
2019-12-17 12:14:29 +01:00
Bonta-kun
e5246d5d5a
Individual settings: retro
2019-12-17 00:16:02 +01:00