Commit Graph

815 Commits

Author SHA1 Message Date
compiling
dfcf6a1be0 Add new and old msu versions 2020-01-12 09:31:36 +11:00
aerinon
526eca50b0 --Fixed Aga Tower staircase (Push statue)
--Petting Zoo rename
--Gui fix for repeated options
--Eliminated bad rule - (It Required Desert BK even if wallslide not in desert)
2020-01-12 09:15:35 +11:00
compiling
f713fc238c Add doors to mystery. 2020-01-11 20:00:58 +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
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
aerinon
24a01bef98 Last commit to fix ice cross spilt the area logically in cross-dungeon
Wiki table function
Trap flags for gauntlet doors
2020-01-08 12:43:37 -07: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
aerinon
d6cd94d04b Enemizer support
Logic issue with Ice Cross (Top) fixed
Changed a couple GUI defaults
2020-01-07 13:14:04 -07:00
aerinon
fdf580c89c Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-01-07 08:53:16 -07:00
aerinon
ea685c6a74 Added Mire Torches holes
Fixed simple generation issue with crossed
Typo in gui
Killed the dungeon changer door in throne room
2020-01-07 08:53:06 -07:00
aerinon
787ffb1cf9 Merge remote-tracking branch 'origin/DoorDev' into DoorDev 2020-01-06 21:30:25 -07:00
aerinon
2cadb5a272 Minor typo fix
Fixed some hard-locks in crossed mode
2020-01-06 21:30:09 -07: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
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
AmazingAmpharos
733f6b1a61 Update GUI
The GUI was dysfunctional after the latest round of updates as it failed to address several new v31 features. The GUI should work again with this update and should allow proper interaction with all relevant options. Some aesthetic rework was necessary to account for the new large number of dropdowns.
2020-01-03 08:32:22 +11:00
compiling
edd656b903 Swap implementation of Take Any fix to match Multiworld. 2020-01-03 08:27:22 +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