Garrett Cox
cda28c402a
Fix dungeon reward stone rotation and add particles
2022-09-12 23:10:15 -05:00
Garrett Cox
c9359ab3ef
Simplify logic around shopsanity and fix some issues
2022-09-12 22:31:45 -05:00
Garrett Cox
14fbbea39a
Fix for custom draw methods overriding sold out sign
2022-09-12 16:46:54 -05:00
Garrett Cox
457356d74c
Allow buying tunics as child when shopsanity is on
2022-09-12 15:54:24 -05:00
Garrett Cox
4c7424f848
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-10 10:16:02 -05:00
briaguya
19b8e12933
Merge pull request #1449 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-09 00:16:36 -04:00
Sarge-117
a9f3aedf8e
Enhanced Magic Arrows (non-rando) ( #1376 )
...
* Add magic arrow enhancements, non-rando
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
* Update tooltip
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Update tooltip
* Add line break in tooltip
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Missed a couple
* Clean up chain platform cutscene check
2022-09-08 22:58:08 -04:00
Garrett Cox
248b4d4d75
Fix issues with rendering songs
2022-09-07 11:11:44 -05:00
Garrett Cox
d928335dd2
Respect custom draw functions
2022-09-07 09:56:30 -05:00
Garrett Cox
b2f4d5e95a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-06 13:30:49 -05:00
Christopher Leggett
acaf4e6bcc
Fixes sold out items not getting overwritten by the randomized info.
2022-09-06 02:42:55 -04:00
Christopher Leggett
4d9bf936b1
Fixes order of operations so Rupees will be spent.
2022-09-06 01:12:11 -04:00
Christopher Leggett
5d38b23850
Implements items selling out and fixes issues with purchasing some items.
2022-09-06 00:58:36 -04:00
Garrett Cox
a99330a8a5
Fix #1417
2022-09-05 23:34:52 -05:00
Christopher Leggett
c0b3f229fa
Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
2022-09-05 20:39:52 -04:00
aMannus
39852c9278
Fix Sold Out bug
2022-09-05 11:46:50 +02:00
Garrett Cox
f282e25c16
Move all merchant messages to be generated on file load
2022-09-04 13:53:59 -05:00
Garrett Cox
8a3d1352d7
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-03 17:39:11 -05:00
aMannus
6cd8d6ca3a
Clean up bool
2022-09-03 20:48:00 +02:00
Garrett Cox
c037bfc16b
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-03 09:49:50 -05:00
aMannus
8d2f63419f
Implement Skip Scarecrow's Song
2022-09-03 14:40:41 +02:00
briaguya
975a854054
Merge branch 'develop-zhora' into z-to-rando-next
2022-09-03 03:47:09 -04:00
Baoulettes
d2fa0d6485
Rando: Fix Fast File Select seed loading ( #1252 )
...
* FixRandoLoading
* better methode
2022-09-03 01:33:24 -04:00
Christopher Leggett
a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux.
2022-09-03 00:20:50 -04:00
David Chavez
0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS ( #1310 )
...
* Update LUS imported paths
* Introduce GameMenuBar
* Fix imports after LUS import paths change
* Move Randomizer
* Replace needs_save
* Migrate Developer Tools
* Migrate Cheats
* Migrate Enhancements
* Separate UIWidgets
* Add missing Hooks.cpp file
* Migrate Settings
* Remove UI methods from LUS
* Cleanup imports and exposed properties
* Cleanup more methods
* Fix project generation
* Fix CI compilation
* Remove resolved TODO
2022-09-03 00:00:04 -04:00
Garrett Cox
25ed66439e
Fix repeatable purchases and bottles rendering incorrectly
2022-09-02 17:23:37 -05:00
Garrett Cox
d1dac2a2ee
Add obtainability checks correctly
2022-09-02 15:22:09 -05:00
Garrett Cox
0277db578f
Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity
2022-09-02 14:33:32 -05:00
Garrett Cox
42858bf15e
Add shopsanity condition around shop changes
2022-09-02 13:27:59 -05:00
Garrett Cox
7a22763e55
Fix an issue with textId and with giving items with fanfare
2022-09-02 12:39:08 -05:00
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
Garrett Cox
ee2f38ad91
Renaming of some randomizer item/check/get methods
2022-09-02 10:34:20 -05:00
briaguya
26c41079bd
Merge pull request #1362 from lilDavid/rando_biggoron_fix
...
Randomizer: Fix Biggoron checks
2022-09-01 12:50:37 -04:00
briaguya
5a009590fc
Merge remote-tracking branch 'origin/develop-zhora' into ztorn
2022-09-01 12:06:25 -04:00
lil David
c84654b202
Always check n64ddFlag before bgsFlag
...
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
2022-09-01 09:23:08 -05:00
lil David
0a744cde01
Clarify comments
2022-09-01 08:11:17 -05:00
lil David
ea9db56914
Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic
2022-09-01 07:59:09 -05:00
lilDavid
cfaed3ded0
Make Biggoron ignore whether you have BGS in rando
2022-08-31 22:07:34 -05:00
Christopher Leggett
042d6f3865
Fixes a few bugs related to chests.
2022-08-31 10:57:59 -04:00
Christopher Leggett
776219fb52
Backports a fix for sheik checks from rando-next ( #1340 )
...
* Fixes some Sheik checks I had accidentally set the wrong flag for.
* Removes duplicate switch case from cherry-pick
2022-08-31 15:25:47 +02:00
briaguya
6d4288c2a5
Merge pull request #1331 from leggettc18/ganon-trials
...
Reimplements selecting different amounts of Ganon's Trials.
2022-08-28 11:48:34 -04:00
Christopher Leggett
fafd90482b
Refactor of some old rando code to use new functions.
2022-08-27 18:42:36 -04:00
Christopher Leggett
3d8b8066da
More comment cleanup
2022-08-27 14:33:38 -04:00
Christopher Leggett
1bf8423f75
Reimplements selecting different amounts of Ganon's Trials.
2022-08-27 14:19:37 -04:00
Christopher Leggett
928a39fe9e
More Cleanup
2022-08-27 09:30:49 -04:00
Christopher Leggett
a572c11f4f
Fixes ice trap gidata not getting cleared after trap is sprung. ( #1322 )
2022-08-27 09:27:20 +02:00
Christopher Leggett
bf1b327a95
Cleanup and Documentation
2022-08-27 02:50:44 -04:00
Christopher Leggett
7fbb381db7
Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.
2022-08-27 02:25:13 -04:00
Garrett Cox
67a890ed1e
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-08-26 21:41:21 -05:00
