Commit Graph

299 Commits

Author SHA1 Message Date
AmazingAmpharos
3dcc63b44e Merge pull request #10 from KevinCathcart/Dev
Fix aga1 keysanity softlock
2018-01-08 10:40:19 -06:00
Kevin Cathcart
513ded2b18 Fix aga1 keysanity softlock 2018-01-08 02:06:03 -05:00
AmazingAmpharos
ea2b672400 0.5.2 final features update
0.5.2 final features update
2018-01-07 19:25:40 -06:00
Kevin Cathcart
4262cdb88b Add random sprite option
Fix accidental breakage of Adjuster
2018-01-07 20:19:39 -05:00
Kevin Cathcart
b01e083a79 Update sprites to vt28 official sprites 2018-01-07 19:30:17 -05:00
Kevin Cathcart
9a2198ac8f Bump version number & new logic hash 2018-01-07 04:49:47 -05:00
Kevin Cathcart
a57a64ecf9 Update base2current 2018-01-07 04:31:48 -05:00
Kevin Cathcart
f3bdc230a7 Misc minor improvements
Open dialogs now filter by correct file extensions

Sort sprites by name (instead of disk order)

Better handle blank author names in zspr files.

Sort paths by name. (Otherwise the Bomb shop entry if present looks
wrong)
2018-01-07 01:31:56 -05:00
Kevin Cathcart
07275316ed Fix and reformat spike cave logic 2018-01-06 23:08:20 -05:00
Kevin Cathcart
52c194822d Add logic support for new swordless Bombos pads 2018-01-06 22:20:08 -05:00
AmazingAmpharos
902097d728 Magic and Agahnim fix
Makes can_extend_magic take an argument for how much magic is needed in total. Fixes rule issues with Trinexx, spike cave, and swordless Agahnim's Tower.
2018-01-06 21:07:46 -06:00
AmazingAmpharos
fb09c05017 Better file output names
The adjuster now appends _adjusted to the pre-existing file name (before the extension) instead of a static output name.
2018-01-06 21:06:34 -06:00
AmazingAmpharos
193b3323b7 Merge pull request #8 from KevinCathcart/Dev
Update through Bomb Shop in paths
2018-01-06 18:58:19 -06:00
Kevin Cathcart
a155d455bb Add Bomb Shop to paths output if Pyramid Fairy Entrance is needed
Tweak internal handling of paths
2018-01-06 16:25:14 -05:00
Kevin Cathcart
a86573d529 Add an extra pass to get correct spheres after culling
For an example of a circumstance in which the existing code produces
incorrect spheres, consider the following item locations in the vanilla
entrance layout:

* byrna in sphere 0
* hammer in sphere 0
* gloves in sphere 0
* bottle in sphere 0
* bow in spike cave (sphere 1)
* cape in hype cave (sphere 1)
* flippers on bumper cave Ledge (sphere 2)
* lastly both Swamp and PoD are pendants.

Well the culling phase will remove Byrna, because cape is good enough to
still get the bow. But now the bow in sphere 1 depends on the cape also
from sphere 1.
2018-01-06 14:55:30 -05:00
Kevin Cathcart
9846f924d2 Add new 4 heart logic for spike cave and misery mire 2018-01-06 13:39:22 -05:00
Kevin Cathcart
a0c892ab98 Make location item checks less verbose, and always access world via the state variable 2018-01-05 22:46:00 -05:00
Kevin Cathcart
95f672a842 POD key for Key Logic 2018-01-05 20:21:24 -05:00
AmazingAmpharos
398de826f8 Fastmenu update
Fastmenu is now a variable menu speed setting instead of an on/off toggle. This update reflects that and gives the player a lot of options for the particular setting (normal, instant, double, triple, quadruple, half). A smaller change in this update is removing quickswap and fastmenu from the output file name of the randomizer (reflective of how the adjuster allows them to be shifted freely anyway) and shortening the verbiage for when progressive settings are changed (quality of life change there).
2018-01-05 16:53:29 -06:00
AmazingAmpharos
971c7b9365 Merge pull request #7 from KevinCathcart/Dev
Kevin's latest updates
2018-01-05 16:04:06 -06:00
Kevin Cathcart
ee61f7b3ac Handle turtle rock big key chest key-for-a-key 2018-01-05 02:02:58 -05:00
Kevin Cathcart
596ba13781 Fix Ice Palace softlock 2018-01-05 01:12:50 -05:00
Kevin Cathcart
6007aed5d7 Add a button to return to default link sprite 2018-01-05 00:42:35 -05:00
Kevin Cathcart
9982567227 Update base2current 2018-01-04 23:02:20 -05:00
Kevin Cathcart
79f1b0bbf3 Fix progressive requirements to respect overflow limits 2018-01-04 23:01:09 -05:00
Kevin Cathcart
c3bdef5c6c Add a paths section to spoiler log
This section will contain the first path found to each location listed
in the spoiler log's walkthrough.

Also implemented is a performance enhancement that more than cancels out
any slowdown caused by the above code.
2018-01-04 22:58:56 -05:00
AmazingAmpharos
dd72bb7581 Merge pull request #6 from KevinCathcart/Dev
Merge in lots of v28/holiday dev work
2018-01-04 18:08:26 -06:00
Kevin Cathcart
9c7a07a1d4 More VT28 logic updates 2018-01-02 21:41:28 -05:00
Kevin Cathcart
73ad4e5fbb Fix balanced algorithm to actually use restrrictive fill for dungeon items 2018-01-02 21:19:18 -05:00
Kevin Cathcart
e3ac7ee4a6 VT28 update: Keysanity has dungeon items in normal item pool 2018-01-02 21:19:18 -05:00
Kevin Cathcart
3adf4fadd1 Partial vt28 logic update 2018-01-02 21:19:17 -05:00
Kevin Cathcart
1c587f9ce1 Update various texts
Especially the puns. which now have more variety
2018-01-02 21:19:17 -05:00
Kevin Cathcart
13c5050cd8 Update Flute Boy Text 2018-01-02 21:19:05 -05:00
Kevin Cathcart
e6d23b8700 Add some useful developer commands to Utils.py
These can be used in the interactive python shell by importing Utils.py
2018-01-02 21:18:26 -05:00
Kevin Cathcart
a89260977e Update official sprites 2018-01-01 13:16:15 -05:00
Kevin Cathcart
b604179e51 Mark entry point files as executable for unix systems and add shebang lines 2018-01-01 13:11:11 -05:00
Kevin Cathcart
d8a26fce53 Add link to open unofficial sprite folder 2018-01-01 12:59:20 -05:00
Kevin Cathcart
23ea19017f Fix json decoding
Fix minor tooltip issue
2018-01-01 12:13:39 -05:00
Kevin Cathcart
d36b6b1beb Fix running on non-windows platforms
Also remove incorrect comment
2018-01-01 11:50:35 -05:00
Kevin Cathcart
ce30913121 Get sprite json from vt.alttp.run
Fix plando's sprite support

Always write both sprite and pallet (using the default if a sprite does
not include a pallet)
so that the adjuster still works.
2017-12-17 17:31:52 -05:00
Kevin Cathcart
823657bc26 Style fixes
A bunch of style fixes. Mostly white space and style import order
tweaks, but a few other stylistic changes are present too.
2017-12-17 17:05:39 -05:00
Kevin Cathcart
8b20e39588 Merge branch 'Dev' into sprites 2017-12-16 19:13:21 -05:00
Kevin Cathcart
2286adf289 Adjuster gui tweaks
Make the help button and output directory button available regardless of
selected tab.

Make controls on both tabs share underlying state where it makes sense
to do so.
2017-12-16 17:53:32 -05:00
Kevin Cathcart
b36723f2dd Fix get_all_state to correctly indicate mirror shield is is available if three progessive shields are in pool. 2017-12-16 15:38:48 -05:00
AmazingAmpharos
24043bce52 Wrong value fixes
Bee catchability was writing 0x08 instead of 0xF0 which causes crashing when bees spawn.
We wrote to the wrong value for Byrna's base cost which ended up corrupting the value of Cape cost.
Both are fixed.
2017-12-16 08:36:29 -06:00
AmazingAmpharos
1e4b0f0da3 Merge pull request #5 from KevinCathcart/Dev
Bunny logic and misc updates
2017-12-15 17:30:31 -06:00
Kevin Cathcart
6bd0664b7f Preliminary bunny logic 2017-12-14 20:09:02 -05:00
Kevin Cathcart
1cfbe2e9ef Refactor adjuster code to share code with Rom.py 2017-12-14 18:38:39 -05:00
Kevin Cathcart
9f8e412488 Improve code to always write out most values
Also fix minor command line issue
2017-12-14 18:38:39 -05:00
AmazingAmpharos
0e6dc992a0 Easy mode Lamps
This updates the Easy mode item pool to correctly support three Lamps, just like vt does.
2017-12-14 15:05:10 -06:00