aMannus
83abf57766
Add skull token to links pocket
2022-08-26 23:51:36 +02:00
Christopher Leggett
53531c4481
Cleanup
2022-08-26 01:17:51 -04:00
Christopher Leggett
9148fa5aec
Adds custom particles to Freestanding Bean Pack item.
2022-08-25 20:48:28 -04:00
Christopher Leggett
4a51ab3187
Fixes bug where Bean Pack was also granting blue potion
2022-08-25 20:42:34 -04:00
Christopher Leggett
78e506a072
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack
2022-08-25 16:58:05 -04:00
briaguya
da07a8f409
Merge pull request #1300 from aMannus/tokensanity-bgs-fix
...
Rando: Tokensanity BGS and maps/compasses fix
2022-08-25 16:50:21 -04:00
briaguya
1cfa0a9623
Merge pull request #1264 from garrettjoecox/scrubsanity
...
Scrubsanity
2022-08-25 16:48:28 -04:00
briaguya
4919bddda2
Merge branch 'develop-zhora' into ztorn
2022-08-25 16:08:16 -04:00
Garrett Cox
1e31d108e6
Various changes from feedback, and use new randomizerInf table
2022-08-25 13:49:02 -05:00
Christopher Leggett
c2fed1a382
Fixes Lost Woods Bridge Ice Trap in Rando ( #1313 )
2022-08-25 20:16:43 +02:00
Garrett Cox
936513a9c4
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
2022-08-25 13:02:47 -05:00
aMannus
29b9f0b37e
Comment
2022-08-25 19:58:05 +02:00
aMannus
49b48fb7a4
Fix BGS and maps/keys textboxes
2022-08-25 19:56:34 +02:00
aMannus
9fda6a0764
Merge branch 'rando-next' into tokensanity-bgs-fix
2022-08-25 19:27:55 +02:00
Christopher Leggett
6ab13f389b
Fixes salesman to properly take 60 rupees from you.
2022-08-25 12:43:19 -04:00
lilDavid
ad33aba9ba
Merge branch 'rando-next' into bombchu-logic
2022-08-25 11:23:30 -05:00
briaguya
9f60a97307
Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix
...
Rando: Fix Winner PoH on skulltula's
2022-08-25 12:23:29 -04:00
aMannus
c22951353e
Renamed function
2022-08-25 18:04:52 +02:00
aMannus
69157640f6
Removed BGS flag in Item_Give()
2022-08-25 17:34:45 +02:00
Garrett Cox
5e9d1d61f1
Fix minor thing in sram
2022-08-25 10:34:39 -05:00
Garrett Cox
f7bd48aaca
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf
2022-08-25 10:27:34 -05:00
Garrett Cox
95372718a3
Transition a few things to randomizerInf flags
2022-08-25 10:27:31 -05:00
Christopher Leggett
90067be132
Fixes Dungeon Rewards from Song from Impa ( #1311 )
2022-08-25 17:19:17 +02:00
Christopher Leggett
ef1b662bf4
Finishes wiring up bean salesman settings and text.
2022-08-25 09:42:15 -04:00
aMannus
bc5ec24889
Ice trap fix
2022-08-25 09:54:08 +02:00
aMannus
2626f6c7e3
Fixed Winner PoH on skulltula's
2022-08-25 09:34:46 +02:00
aMannus
cc6e4238cf
Fixes BGS on skull tokens
2022-08-25 08:49:15 +02:00
briaguya
d2fe83edf4
Merge pull request #1295 from HarbourMasters/develop-zhora
...
quick zhora -> rando-next
2022-08-24 19:47:26 -04:00
Baoulettes
c0b9171f98
Cosmetics Editor Fixes ( #1287 )
2022-08-25 01:28:27 +02:00
Christopher Leggett
c4de29b7f1
Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman
2022-08-24 17:24:50 -04:00
Christopher Leggett
adf465c1a0
Sets up Magic Bean Salesman to sell a rando check for 60 rupees.
2022-08-24 17:20:45 -04:00
briaguya
f15b3880f3
Merge pull request #1292 from aMannus/custom-key-colors-fix
...
Rando: Custom key colors fix
2022-08-24 17:17:54 -04:00
aMannus
a48ac71762
Fixed lost woods target crash
2022-08-24 23:02:48 +02:00
aMannus
179c432ee1
Comment
2022-08-24 22:20:20 +02:00
aMannus
d5074c3e77
Fixes double def and split second wrong colors
2022-08-24 22:18:24 +02:00
Christopher Leggett
fe7aedc80d
Adds getItemEntry for Magic Bean Pack
2022-08-24 15:44:31 -04:00
Christopher Leggett
37fe5491b2
Always color in Double Defense
2022-08-24 13:58:25 -04:00
Christopher Leggett
ecd0e3e8bb
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys
2022-08-24 13:03:44 -04:00
Garrett Cox
693dc479d2
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
2022-08-24 10:22:57 -05:00
Garrett Cox
c6c08522e6
Custom message for free items
2022-08-24 10:19:41 -05:00
Christopher Leggett
69a7012b5a
Fixes grass-chest bug I inadvertently introduced.
2022-08-24 10:45:39 -04:00
Christopher Leggett
855147b265
Merge branch 'rando-next' into color-coded-keys
2022-08-24 00:17:37 -04:00
Christopher Leggett
6561073c7b
Implements ImGui Checkbox to enable or disable color-coded-keys.
2022-08-24 00:07:16 -04:00
Christopher Leggett
c7b998b33b
Implements better way to use new draw functions and adds Double Defense colors.
2022-08-23 23:48:14 -04:00
Christopher Leggett
28afbec341
Adds support for custom drawing functions, and adds one for Small Keys and Boss Keys.
2022-08-23 21:12:21 -04:00
briaguya
133cbcd6c8
Merge branch 'develop-zhora' into z-to-rn
2022-08-23 21:05:35 -04:00
Garrett Cox
31e8896856
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
2022-08-23 19:42:15 -05:00
Jake Edvenson
927ffd0b8b
Enhancement: Scarecrow song skip ( #1183 )
...
* Added Skip Scarecrow Song
Added in the option for if the user has the time saver for Scarecrow song enabled and has their Ocarina pulled out in range of Pierre.
Added Skip Scarecrow Song
New enhancement under time-savers that allows the user to only pull out their ocarina to summon Pierre.
* Added Default for Scarecrow summon
The scarecrow summon option now defaults to 0 and can be turned on individually. I haven't included it in any other presets so people don't feel like they're cheating.
* Checks if scarecrow song is in possession
* Fixed positional Scarecrow logic
* Fixed style
2022-08-23 20:30:06 -04:00
Baoulettes
d6ebce068d
fixes only ( #1255 )
2022-08-23 20:20:56 -04:00
lilDavid
4680641514
Add bombchu drops ( #1257 )
...
* Add bombchu drops
* Force 3D bombchu drops
* Move bombchu drop conditions for better clarity
* Fix grouping on chu drop condition
2022-08-23 20:14:17 -04:00
