Commit Graph

38 Commits

Author SHA1 Message Date
Garrett Cox
d60a82d67a Use randomizerInf 2022-09-02 11:47:57 -05:00
Garrett Cox
43d8a11de5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 11:07:21 -05:00
lil David
ea9db56914 Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic 2022-09-01 07:59:09 -05:00
Garrett Cox
67a890ed1e Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-08-26 21:41:21 -05: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
Garrett Cox
1e31d108e6 Various changes from feedback, and use new randomizerInf table 2022-08-25 13:49:02 -05:00
lilDavid
ad33aba9ba
Merge branch 'rando-next' into bombchu-logic 2022-08-25 11:23:30 -05: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
Garrett Cox
b7e3a72f85 Fix issue from bad merge and a few other small things 2022-08-24 11:00:02 -05:00
Garrett Cox
17aa82a2cd Initial work towards shopsanity, not fully working but some of it is 2022-08-22 13:23:27 -05:00
Garrett Cox
9f63aaae99 Initial work towards scrubsanity, got affordable prices mostly functional
Write and read prices from spoiler, move IdentifyScrub up to Randomizer

In a semi working state

Fix bug when going from c to cpp

Kill scrubs before they spawn if already purchased

Woopsie from rebase

Update soh/soh/OTRGlobals.cpp
2022-08-22 01:13:52 -05:00
Christopher Leggett
a2a8832a35
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-19 20:06:15 -04:00
briaguya
c1455cedea fix broken seed parsing 2022-08-19 10:56:26 -04:00
briaguya
289a6e5a82 start on RC object stuff 2022-08-18 06:15:02 -04:00
briaguya
11cc040710 add rcs to itemlocations in 3drando 2022-08-17 10:45:33 -04:00
lil David
f431f7df72 Add Bombchus in Logic rando setting and implement progressive chus 2022-08-17 08:22:09 -05:00
Christopher Leggett
c8d085cb49
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
Hopefully everything works here. Need to do some testing.
2022-08-13 22:43:19 -04:00
Christopher Leggett
69086f58c2
Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00
Christopher Leggett
cb81023255
Renames, relocates, and implements ModIndex enum. 2022-08-11 00:38:28 -04:00
aMannus
e259e87588 ADD: Enable Glitch-Useful Cutscenes option to rando 2022-08-10 21:51:10 +02:00
briaguya
d74220d3ac don't give link's pocket garbage 2022-08-10 11:55:47 -04:00
briaguya
f5d7955547 ensure itemlocations is big enough for every check 2022-08-10 11:39:10 -04:00
briaguya
d523ba5127 complete mask quest 2022-08-10 06:28:10 -04:00
briaguya
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
lilDavid
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle 2022-08-09 20:40:00 -05:00
Garrett Cox
8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
Garrett Cox
8b59466ce5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-07 15:41:44 -05:00
briaguya
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
lilDavid
6603a9a474 Add adult trade shuffle to randomizer 2022-08-06 12:58:08 -05:00
Garrett Cox
b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-06 00:48:55 -05:00
Garrett Cox
ed3cddbeaf Add option to shuffle frog song rupees 2022-08-05 09:52:11 -05:00
Garrett Cox
e9d1bf2d56 Initial work for keysanity 2022-08-04 22:28:21 -05:00
Christopher Leggett
41ea5c6685
Adds rando item table and way to differentiate tables in GetItemEntry. 2022-08-03 08:15:17 -04:00
Garrett Cox
c18203878b Add shuffleCows options for randomizer 2022-08-03 00:14:38 -05:00
aMannus
ee1bdd6899 Added no logic 2022-07-31 09:30:04 +02:00
aMannus
3be2dbd005 Added nighttime GS sun's song option 2022-07-20 14:33:12 +02:00
aMannus
51dae73387 Merge branch 'develop-zhora' into spoopy-spiders 2022-07-19 13:33:45 +02:00
briaguya
d45968270a
Address rando pr comments (#742)
* prefix randomizer methods with Randomizer_

* make filename a local var

* remove unused file, update malon to use new names

* move randomizertypes to randomizer directory

* rename to Randomizer_GetSettingValue

Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:20:07 -04:00