Commit Graph

799 Commits

Author SHA1 Message Date
compiling
dfafa59215 Fix conflicts 2020-01-11 09:04:11 +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
39a07a0624 Rom: dont block HC exit in standard with vanilla entrances to match website mystery behavior 2020-01-10 07:15:11 +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
240cf2d844 Mystery: pot_shuffle (on/off) 2020-01-09 09:13:50 +01:00
Bonta-kun
6bb71802ae Dont tag capacity upgrade shop as replaceable 2020-01-09 08:40:03 +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
feb925d2b1 Rom: cleaner disable_music patches to match what the website does 2020-01-08 08:17:25 +01:00
Bonta-kun
28011cf675 Built-in palette shuffle (including blackout) 2020-01-08 03:43:48 +01:00
Bonta-kun
99577d9e4c Mystery: safer strip 2020-01-06 20:14:16 +01:00
Bonta-kun
48305adaa0 Mystery: weights can now specify a default value for convenience, eg:
dungeon_items: full
startinventory:
  Pegasus Boots: on
2020-01-06 20:01:03 +01:00
Bonta-kun
7d05d697dd Mystery: can now roll for starting inventory items, eg:
startinventory:
  Pegasus Boots:
    'on': 1
    'off': 0
  Bombs (3):
    'on': 1
    'off': 1
2020-01-06 19:13:55 +01:00
Bonta-kun
71b4f6e94b Set default value for --enemizercli 2020-01-06 19:13:53 +01: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
Bonta-kun
1be0d62d4f MultiClient: allow different protocols if a prefix is present 2020-01-05 20:22:19 +01:00
compiling
0c2580dea9 Fix conflicts 2020-01-05 21:51:07 +11:00
Bonta-kun
28e7819fab Items table: include the 2nd progressive bow 2020-01-04 18:45:42 +01: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
aerinon
c475dc746c Better polarity match 2020-01-03 07:22:22 -07:00
compiling
74701b88a1 Swap implementation of Take Any fix to match Multiworld. 2020-01-03 08:36:02 +11:00
aerinon
4d27c2ad88 Merge pull request #16 from aerinon/CompilingDev
Compiling dev
2020-01-02 11:53:52 -07:00
aerinon
66598f7c30 Merge branch 'compiling-Dev2' into CompilingDev 2020-01-02 11:52:46 -07:00
aerinon
fea605ae66 Fixing conflicts 2020-01-02 11:52:24 -07:00
aerinon
41af3b8892 Merging of CrossDungeon into DoorDev 2020-01-02 11:42:40 -07:00
aerinon
88849e921c Revert "Revert "Cross Dungeon initial work""
This reverts commit fadc085b67.
2020-01-02 11:37:47 -07:00
aerinon
791d139e6b Merging of DoorDev into Cross - hopefully perserving all cross dungeon stuff 2020-01-02 11:31:33 -07:00
aerinon
438d765627 Directional typos on interior doors fixed.
Better batching support for mass testing of seed generation.

Generation issues fixed:
--Filler now tests with the key in the proposed location to enable alternate key rules
--Key rule checker now only considers key locations that the parent sphere did not have - better key rules
2020-01-02 11:15:27 -07:00
compiling
f6bad85a15 Remove Capacity Upgrade from Take Any locations, to match item randomizer 2020-01-02 16:33:01 +11: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
6b97cebec5 Work around for json patch - split out bow limit into a separate patch so that it can be overridden properly. 2020-01-02 16:33:00 +11:00
compiling
699b4c55a2 Remove Capacity Upgrade from Take Any locations, to match item randomizer 2020-01-02 16:23:03 +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
6966b0a798 Add a --keysanity shortcut to enable all dungeon items shuffles for convenience 2020-01-01 18:42:36 +01:00
Bonta-kun
0de0467b5c Inverted: connect lake hylia island to lw 2020-01-01 18:12:23 +01:00
aerinon
59f819aebd Fixed a couple of generation errors 2019-12-31 21:12:53 -07:00
aerinon
dcec274b63 Fix typo 2019-12-31 21:12:18 -07:00
aerinon
511cc62234 Fix typo 2019-12-31 11:44:30 -07:00
Bonta-kun
636a18cee9 Rom: sanitize hint_text input 2019-12-31 15:47:49 +01:00
Bonta-kun
1fc86274cc Items: consumables texts 2019-12-31 15:47:18 +01:00
Bonta-kun
2bce64778d Gui: fix default arguments for multiworld 2019-12-31 01:16:41 +01:00
Bonta-kun
63eecaa96c Fix arguments pre-parsing intercepting --help command 2019-12-30 20:43:43 +01:00
Bonta-kun
7088c148a2 Beemizer: fix potentially replacing all heart containers for progression 2019-12-30 20:28:33 +01:00