Commit Graph

189 Commits

Author SHA1 Message Date
caitsith2 d7d7f32d0c Clean up get_choice(x,weights) if x in weights else y code. 2020-06-18 08:55:15 -07:00
caitsith2 f8ad83c86d yaml descriptions are now optional 2020-06-18 08:52:31 -07:00
caitsith2 75e185e437 Allow specififying returned default values. Disallow ALL zero weights. 2020-06-18 08:51:38 -07:00
caitsith2 63eb0ffc7b Max triforce pieces reduced to 90 2020-06-18 08:48:33 -07:00
caitsith2 d8bc5ca2a8 Set triforce pieces available to max of available and required. 2020-06-17 01:33:34 -07:00
caitsith2 617312fd4b add available_triforce_pieces 2020-06-17 01:02:54 -07:00
caitsith2 233d12be30 Change max triforce_pieces_required from 30 to 112. 2020-06-11 11:53:10 -07:00
Fabian Dill 3a1f98aab6 add minor_glitches to mystery 2020-06-10 19:02:11 +02:00
CaitSith2 96bea214da
Merge branch 'master' into msu_v32 2020-06-08 02:04:41 -07:00
Fabian Dill 17f884d047 make triforce pieces required an option 2020-06-07 15:22:24 +02:00
caitsith2 73d1f56ffb base rom changes
* V32 MSU
* All items from chests/received in dark rooms now visible.
* Regular bunny can read signs
* Players up to Player 255 supported on send/received.
2020-06-06 20:49:53 -07:00
Fabian Dill 59a26e071c clean up 2020-06-04 21:12:05 +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 f918efb645 implement skip_playthrough in mystery 2020-05-31 00:28:03 +02:00
Fabian Dill 11678fa20b turn progression balancing into a per-player option 2020-05-18 03:54:29 +02:00
Fabian Dill cb7d4d43e1 implement progression balancing as an option in CLI, gui and MultiMystery 2020-05-11 02:17:18 +02:00
Fabian Dill 4a5fe1333c don't crash on empty meta-ignore dicts 2020-05-07 08:26:50 +02:00
Fabian Dill 3017aa3b9f remove old debug stuff 2020-04-28 17:42:25 +02:00
CaitSith2 f380542bab
2.1.1 hotfix (#76)
* 2.1.1 hotfix
* debug log options that have nothing defined.
* make sure there is at least one value in the dictionary before considering it important.
* only attempt to create outputpath if it is defined.

* whoops
2020-04-26 02:57:20 +02:00
CaitSith2 8f91e86223
Put Linked options before name roll. (#74) 2020-04-25 05:49:59 +02:00
Fabian Dill 43bf11b296 A dangling " 2020-04-25 02:25:46 +02:00
Fabian Dill e98981b57e introduce linked options to mystery 2020-04-25 02:24:37 +02:00
CaitSith2 b90484acb7
Implement logging options in mystery.py (#73)
Required for using the multimystery.py from the doors branch without modifications.
2020-04-25 02:01:55 +02:00
Fabian Dill 5a6035f6b7 fix mystery naming with --samesettings 2020-04-22 13:52:03 +02:00
Fabian Dill 31d3b7ce84 implement glitch_boots as a proper CLI option 2020-04-16 11:02:16 +02:00
Fabian Dill c6a61e9008 Merge branch 'master' into owg_test 2020-04-14 03:49:33 +02:00
CaitSith2 34df144f8c
Changes (#64)
* Fix bug where collected maps show on item menu if compass shuffle is on, (and collected compasses if map shuffle is on.)

* Add Dungeon Counter Options
2020-04-13 00:46:32 +02:00
Fabian Dill 01b7a590e7 add glitch_boots mystery node 2020-04-10 20:58:52 +02:00
Fabian Dill 1c855fea9a refix yaml laoding 2020-04-10 06:41:32 +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 44086152a2 add remote_items to Mystery.py 2020-03-30 08:47:53 +02:00
CaitSith2 e9669a59c8
Move sprite warning to place where it can identify which file the warning applies to. (#54) 2020-03-28 18:43:02 +01:00
Fabian Dill 9b82f220bb improve some random things 2020-03-05 02:31:26 +01:00
Fabian Dill e3beb702f8 fix clock mode, again 2020-03-04 13:55:03 +01:00
Fabian Dill 5d0747585d pull names through files, always, unless gui. 2020-02-26 19:41:05 +01:00
Fabian Dill 11e1ad6901 some small improvements for mystery 2020-02-23 17:06:44 +01:00
Fabian Dill 76b92f960a copy over teams argument to allow it to work in mystery 2020-02-23 07:21:05 +01:00
Fabian Dill b755e9a9ee implement dict-based meta_ignore 2020-02-22 03:04:55 +01:00
Fabian Dill a5e3777484 fix an exception text 2020-02-18 09:50:50 +01:00
Fabian Dill 0220575c50 Meta-Mystery 2020-02-18 09:14:31 +01:00
DatXFire f66467c2f5
Return support for standard dungeon_items option (#33) 2020-02-17 19:29:25 +01:00
Fabian Dill 14e24037a5 împlement optional hint system (defaults to off) 2020-02-09 05:28:48 +01:00
qadan c10739e70c fixing up some stuff I broke 2020-02-08 19:17:34 -04:00
qadan d22ccdedb3 some changes 2020-02-06 12:20:50 -04:00
cassidy 21b8c73179
Add "timer" as individual setting (#23) 2020-02-03 02:10:56 +01:00
DatXFire 74e55a78db
Fix typo in Mystery.py (#21) 2020-02-01 06:08:03 +01:00
Fabian Dill 76f27ca7fd naming fixes 2020-01-30 23:03:54 +01:00
CaitSith2 42d4837cc0
fix for remove args. (#20) 2020-01-30 22:58:01 +01:00
Fabian Dill 588319ea72 remove extra args for compatibility 2020-01-30 12:02:08 +01:00
qadan 4b7694b50f updates 2020-01-28 18:19:07 -04:00
Fabian Dill c26d799fc1 remove debug logging line 2020-01-27 22:55:07 +01:00
Fabian Dill d595894990 Merge remote-tracking branch 'origin/master' 2020-01-27 22:52:16 +01:00
Fabian Dill c4cba170af add name option in yaml 2020-01-27 22:52:11 +01:00
CaitSith2 4b4a27992c Add in a way to see if the randomly selected sprite is actually valid… (#16)
* Add in a way to see if the randomly selected sprite is actually valid, and warn if it isn't, per yaml file.

* clean up code a bit, and import one less thing.
2020-01-26 01:37:29 +01:00
Fabian Dill 37933798cd fix a dungeon items regression 2020-01-23 08:35:52 +01:00
CaitSith2 18f15d80f9 MSU-1 (#13)
* Add Extended MSU as an option
2020-01-22 18:27:25 +01:00
CaitSith2 6fb732f4b9 Use the first dice roll. (#14) 2020-01-22 17:29:43 +01:00
Fabian Dill 06ea170ecd
Non progressive option (#12)
* allow non-progressive

* use the actual extended_collections module
2020-01-22 06:28:58 +01:00
qadan edd0a08143 Merge branch 'multiworld_31' of github.com:Bonta0/ALttPEntranceRandomizer into owg 2020-01-21 21:41:18 -04:00
CaitSith2 9e88eb48d2 Bug fix for multiple item quantity (#10) 2020-01-21 02:21:48 +01:00
CaitSith2 79a8123696 Starting item tweaks (#9)
* Starting item tweaks

* Add in capability to start with Progressive items higher than the first level.
* Auto-start no-logic seeds with Pegasus Boots.

``` #example
startinventory:
  Progressive Sword:
    0: 81
    1: 108
    2: 54
    3: 12
    4: 1
```

* Use .startwith() and support multiple ...

... items that can have multiples
2020-01-20 18:21:55 +01:00
Fabian Dill 8e5cf52e27 only heartbeep needs an "off" as text 2020-01-20 03:36:03 +01:00
Fabian Dill a2c9cf2f25 use "on"/"off" for rom options 2020-01-20 03:29:13 +01:00
Fabian Dill fa41f358fd introduce PyYAML and make associated changes 2020-01-19 23:30:22 +01:00
CaitSith2 154260d131
Update Mystery.py
Ignore comments in yaml files.
2020-01-19 01:25:51 -08:00
Fabian Dill 72c33a2348 Merge branch 'pull/5'
# Conflicts:
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
2020-01-18 14:41:11 +01:00
Bonta-kun e214f78293 Mystery: fix a regression in goals logic 2020-01-18 10:06:50 +01:00
Fabian Dill 236f79e143 fix fast_ganon 2020-01-16 20:00:02 +01:00
qadan 348887ce92 merge conflicts 2020-01-15 19:37:39 -04:00
Fabian Dill baab6a76ef
Merge pull request #1 from Bonta0/multiworld_31
Multiworld 31
2020-01-14 19:49:40 +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
Fabian Dill b3ec435b7e implement race as an option and cmd argument 2020-01-13 19:47:30 +01:00
Fabian Dill 85a4e9d409 initial upload 2020-01-12 17:03:30 +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 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
qadan 4d631adf7b getting there ... somethings up, needs testing 2020-01-03 03:49:56 -04:00
Bonta-kun 63eecaa96c Fix arguments pre-parsing intercepting --help command 2019-12-30 20:43:43 +01:00
Bonta-kun fe307b1ac7 bzzz bzzz 2019-12-30 03:03:53 +01:00
Bonta-kun c2530dce7d Mystery: fix triforcehunt argument 2019-12-18 20:46:16 +01:00
Bonta-kun 4b9e7d715c Mystery: correctly parse oddly indented yaml files 2019-12-18 20:41:59 +01:00
Bonta-kun 2ec59404a2 Mystery: always open the pyramid with fast_ganon 2019-12-18 20:34:08 +01:00
Bonta-kun fea3888b45 Mystery: separate dungeon items shuffling when requested 2019-12-18 20:33:09 +01:00
Bonta-kun 8aad6b6055 Mystery support different weights per player and can now roll different settings for everyone 2019-12-17 22:41:19 +01:00
Bonta-kun 261e9c40f9 Mystery: added a script to randomly generate game settings, uses same weights as Sahasrahbot 2019-12-16 02:05:33 +01:00