Commit Graph

884 Commits

Author SHA1 Message Date
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
a57a52e286 Bump version 2020-01-23 09:39:58 -07:00
compiling
b5ea688847 Add inverted door shuffle 2020-01-23 19:53:04 +11:00
aerinon
4c0c8ea21a Key and crystal sweep fixes 2020-01-22 12:35:13 -07:00
aerinon
eff78a2389 More key logic fixes 2020-01-21 16:32:31 -07:00
aerinon
7c03332b0b Merge of compiling's multidoors branch into mine 2020-01-21 14:12:55 -07:00
aerinon
744f9dfea7 Rom update and added dungeon events 2020-01-21 14:01:57 -07:00
compiling
6659965cd4 Check game is winnable before creating the rom. 2020-01-21 23:46:08 +11:00
compiling
d7beb1dfcf Re-add Sweep for crystal access in playthrough algorithm (might not be called when sweeping for keys) 2020-01-21 00:39:17 +11:00
compiling
e0eff76b9b Merge remote-tracking branch 'remotes/multi/multiworld_31' into multidoors 2020-01-19 18:18:43 +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
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
aerinon
ef6b171233 First stab at fixing crystal switch spread - probably not done. 2020-01-15 16:28:22 -07:00
Bonta-kun
71cd0b917c Rom: fix enemizer patching 2020-01-14 22:13:37 +01: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
ead7c117a8 Skip the playthrough when run from the gui, if the spoiler isn't being created. 2020-01-12 21:20:14 +11:00
compiling
761d11a272 Don't edit rom name after writing it (causes problems for multi client/server checks)
Add door-shuffle type to rom filename.
2020-01-12 11:42:57 +11: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
239ea0f67c outputpath: use makedirs instead of mkdir 2020-01-10 07:25:16 +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
Bonta-kun
5db7e066da Sprites are now player specific, can be chosen from their sprite name rather than file path, support "random" choice and support "randomonhit" enemizer-only option 2020-01-09 02:30:00 +01:00
Bonta-kun
28011cf675 Built-in palette shuffle (including blackout) 2020-01-08 03:43:48 +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
Bonta-kun
eb7ca4fdf9 Implement --startinventory 2020-01-06 19:13:42 +01:00
Bonta-kun
a3657c02aa Multidata/save: moved away from pickle and store a compressed json instead 2020-01-05 20:22:29 +01: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
8efbf7bf08 Merge remote-tracking branch 'remotes/multi/multiworld_31' into Dev 2020-01-04 20:07:29 +11:00
compiling
74701b88a1 Swap implementation of Take Any fix to match Multiworld. 2020-01-03 08:36:02 +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
compiling
4921daccf3 Add Python 3.8 compatibility - replace deprecated function time.clock with time.perf_counter 2020-01-02 16:33:01 +11: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
compiling
584880be20 Add Python 3.8 compatibility - replace deprecated function time.clock with time.perf_counter 2020-01-02 12:38:26 +11:00
compiling
9109d811fc Add shop door ids to tables (used when shop locations are vanilla)
Do not replace Upgrade Fairy with retro shop
2020-01-02 12:33:56 +11:00
Bonta-kun
7aa9622c5e Escape assist: only get infinite bombs with enemizer or bombs/cane/bow start + high hp 2019-12-30 06:42:45 +01:00
Bonta-kun
fe307b1ac7 bzzz bzzz 2019-12-30 03:03:53 +01:00
Bonta-kun
4281dcc619 Skip enemizer patching with jsonout and no enemizercli 2019-12-28 18:12:11 +01:00
Bonta-kun
93f8a684f1 Move outputpath handling in main(), create path if it doesn't exist 2019-12-28 17:12:27 +01:00
Bonta-kun
197b8bd6c6 Actually enable bombs escape assist 2019-12-27 19:09:58 +01:00
aerinon
ee3cf80732 Mark regions as light/dark world after dungeons are connected up. 2019-12-24 07:15:34 -07:00