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
e12fda29fe
Merge branch 'get-item-rework' into merge-fix
2022-08-22 02:03:04 -04:00
Christopher Leggett
5298bda0e2
Merge branch 'rando-next', remote-tracking branch 'origin' into get-item-rework-rando-next
2022-08-21 16:42:15 -04:00
Christopher Leggett
1d9e52b169
Merge remote-tracking branch 'origin' into get-item-rework
2022-08-21 16:41:41 -04:00
Christopher Leggett
91cb6f2360
This should fix a bug with the Gerudo Archery minigame.
...
I wasn't able to get the bug to happen after making this change.
2022-08-21 16:40:16 -04:00
Christopher Leggett
2bbd618599
Cleans up another if statement in item00
2022-08-21 15:35:10 -04:00
Christopher Leggett
e5bca727ac
Cleans up an if statement for item00.
2022-08-21 15:22:18 -04:00
Christopher Leggett
e1b403a31b
Removes unused Randomizer_GetItemIdFromGetItemId.
2022-08-21 15:14:50 -04:00
Christopher Leggett
fc963cf44c
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-20 18:01:23 -04:00
Christopher Leggett
4dff1443a6
Fixes rendering of treasure chest game items.
2022-08-20 18:00:44 -04:00
Christopher Leggett
4f2f72b941
Adds Frog Reward hints from 3dsrando.
...
Fixes the intermittent crash when generating a seed rando-next started
having.
2022-08-20 13:07:53 -04:00
Christopher Leggett
2c410a5857
Fixes ice traps again.
2022-08-19 21:42:59 -04:00
Christopher Leggett
cec1c7dc07
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-19 20:06:39 -04: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
ad8179287e
Fix controller nav on WiiU ( #1258 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-20 02:03:28 +02:00
Christopher Leggett
a67c6b9e67
Fixes vanilla ice traps and randomized ice smoke
2022-08-19 19:36:44 -04:00
Christopher Leggett
4e2707aefc
Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework
2022-08-19 18:51:00 -04:00
briaguya
28bbaf6c45
Merge pull request #1249 from briaguya-ai/exclude-all-locations
...
add ability to exclude any location
2022-08-19 16:44:24 -04:00
briaguya
708c9a00f4
formatting cleanup
2022-08-19 13:18:48 -04:00
briaguya
1c52b58917
remove var leftover from debugging
2022-08-19 13:17:05 -04:00
briaguya
3b951efac2
rename columns, use excluded locations
2022-08-19 12:54:27 -04:00
briaguya
c1455cedea
fix broken seed parsing
2022-08-19 10:56:26 -04:00
briaguya
db7e1bf332
trying to figure stuff out
2022-08-19 10:36:54 -04:00
briaguya
0971b9aa78
only toggle menu with controller when controller nav enabled ( #1043 )
2022-08-19 15:46:11 +02:00
briaguya
0eee085981
save/load locations to a string cvar
2022-08-19 09:30:17 -04:00
briaguya
815f5a9101
don't filter on right
2022-08-19 06:38:39 -04:00
briaguya
f818380079
fix performance issues
2022-08-19 06:30:52 -04:00
briaguya
7f62d00200
fix double scrollbar issue
2022-08-19 04:53:35 -04:00
Christopher Leggett
3db2ce7085
Updates Zora's Sapphire Cutscene to use GetItemEntry
2022-08-18 22:06:28 -04:00
Christopher Leggett
35c2781efb
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-18 21:49:45 -04:00
briaguya
11a8dc85ee
filter on one side, trees on both
2022-08-18 15:50:25 -04:00
briaguya
fb3320c3ed
use macro for rco
2022-08-18 15:15:34 -04:00
briaguya
7fdb194dad
refactor location visibility filtering
2022-08-18 14:11:22 -04:00
qurious-pixel
9bc6aac81e
MacOS OTR ( #973 )
2022-08-18 19:40:41 +02:00
briaguya
dd9acbbb43
use ordered map to help arrange checks in imgui
2022-08-18 12:19:57 -04:00
briaguya
5ac69e0bd8
start filtering
2022-08-18 08:48:24 -04:00
briaguya
dbb4e3eefc
start on tree view
2022-08-18 08:20:52 -04:00
briaguya
3816ed11a4
add area names, fix kak bazaar
2022-08-18 08:20:35 -04:00
briaguya
a7d4aa8042
add areas to rcos
2022-08-18 07:37:24 -04:00
briaguya
289a6e5a82
start on RC object stuff
2022-08-18 06:15:02 -04:00
Christopher Leggett
7ee281182a
Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.
...
Repalces the model for Zora's Sapphire with the Dungeon Reward for JabuJabu's Belly when you find it in the miniboss room.
2022-08-17 21:43:52 -04:00
Christopher Leggett
a51b844a23
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-17 15:43:42 -04:00
Christopher Leggett
914af77234
Fixes fanfare getItemId overlap
2022-08-17 12:23:39 -04:00
briaguya
ae8c7cb509
add excluded locations set
2022-08-17 11:08:11 -04:00
briaguya
11cc040710
add rcs to itemlocations in 3drando
2022-08-17 10:45:33 -04:00
briaguya
5605542452
start playing with imgui filters
2022-08-17 09:03:27 -04:00
Christopher Leggett
525dcca499
Fixes some Sheik checks I had accidentally set the wrong flag for.
2022-08-17 01:07:28 -04:00
briaguya
c933d521c3
Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix
...
Fix Ganon's Boss Key hints for Keysanity
2022-08-17 00:09:26 -04:00
briaguya
03151647b1
Merge pull request #1227 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-16 23:59:11 -04:00
Kenix3
72981221ad
Merge pull request #1226 from HarbourMasters/develop-rachael
...
rachael -> zhora
2022-08-16 23:40:06 -04:00
