Garrett Cox
51e203eec0
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-13 00:07:58 -05:00
Garrett Cox
098407487a
Fix some issues with ice traps
2022-09-12 23:45:22 -05:00
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
Sarge-117
d96feaf4a4
Tidy up chain platform cutscene check
2022-09-06 14:00:09 -07:00
Sarge-117
100d83151e
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-06 12:43:13 -07:00
Sarge-117
9e6defe1b5
Fix merge mistake
2022-09-06 12:21:06 -07:00
Garrett Cox
b2f4d5e95a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-06 13:30:49 -05:00
Sarge-117
99b9531cfd
Merge branch 'zhora-magic-arrows' into rando-enhanced-magic-arrows
2022-09-06 11:10:46 -07:00
Sarge-117
37acd52016
Clarify var names and comments
2022-09-06 11:05:52 -07:00
Sarge-117
5991be8256
Remove !=0 from cvar check
2022-09-06 10:57:08 -07:00
Sarge-117
a73729b9b1
Clarify var names and comments
...
Also preserve chain platform cutscene in spirit based on Link's position
2022-09-06 10:40:26 -07: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
Garrett Cox
8a3d1352d7
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-03 17:39:11 -05:00
aMannus
70ab1406e1
Incorporate magic arrows in rando settings
2022-09-03 22:56:09 +02:00
Sarge-117
a260f680d1
Merge branch 'rando-next' into rando-enhanced-magic-arrows
2022-09-03 12:17:23 -07:00
aMannus
6cd8d6ca3a
Clean up bool
2022-09-03 20:48:00 +02:00
Sarge-117
5a9540585a
Simplify mudwall collision check
2022-09-03 11:35:19 -07:00
Sarge-117
0151294648
Simplify mudwall collision check
...
There was no need to have a second collider specifically for Ice Arrow hits
2022-09-03 11:24:17 -07:00
Sarge-117
05f7b65d28
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-03 09:30:14 -07: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
Christopher Leggett
a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux.
2022-09-03 00:20:50 -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
Sarge-117
b5a881f9ab
Add magic arrow enhancements, non-rando
...
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
2022-09-01 18:21:44 -07:00
Sarge-117
83469f85e7
Move checkboxes to normal enhancement menu
...
Also comment clarity + capitalization
2022-09-01 17:47:25 -07:00
Sarge-117
b4d14e708e
Check for CVar only
...
Instead of (Cvar && n64dd)
2022-09-01 17:08:34 -07:00
Sarge-117
9b5774cca7
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-01 17:05:48 -07: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
