77ec3954dc
Various changes from PR feedback
2022-09-16 11:29:17 -05:00
8fa9baaaf6
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-14 12:23:47 -05:00
978ddcc5a6
Merge pull request #1471 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-14 10:58:59 -04:00
941cf65227
use strnlen for c string empty check ( #1352 )
...
* use strcmp for c string compare
* Update z_file_choose.c
Co-authored-by: briaguya <briaguya@alice>
2022-09-13 21:12:03 -04:00
18a26b480e
Use Color_RGB8 CVars in z_message_PAL ( #1372 )
2022-09-13 20:45:51 -04:00
67bbeca809
Another fix for getting items near critters. ( #1332 )
2022-09-13 20:45:23 -04:00
eda5a6ac91
Fix blocks not being pushed all the way ( #1363 )
2022-09-13 20:38:26 -04:00
420ebf3715
Fix amount of keys given for BotW
2022-09-13 01:13:20 -05:00
51e203eec0
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-13 00:07:58 -05:00
098407487a
Fix some issues with ice traps
2022-09-12 23:45:22 -05:00
cda28c402a
Fix dungeon reward stone rotation and add particles
2022-09-12 23:10:15 -05:00
c9359ab3ef
Simplify logic around shopsanity and fix some issues
2022-09-12 22:31:45 -05:00
14fbbea39a
Fix for custom draw methods overriding sold out sign
2022-09-12 16:46:54 -05:00
457356d74c
Allow buying tunics as child when shopsanity is on
2022-09-12 15:54:24 -05:00
4db2f44f7b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-11 11:32:50 -07:00
4c7424f848
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-10 10:16:02 -05:00
1eb6235ddc
Merge pull request #1456 from leggettc18/leggettc18/issue1437
...
Fixes Ice Trap as starting item.
2022-09-09 21:46:40 -04:00
944d5344dc
Applies fix to Song from Impa as well.
2022-09-09 19:20:20 -04:00
cfc24b16ca
crash on pause menu on linux (only in appimage)
...
Fixes #1437
2022-09-09 19:20:20 -04:00
aee6445a45
Fix merge error
2022-09-08 22:22:31 -07:00
0f0c438b1b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-08 22:04:30 -07:00
19b8e12933
Merge pull request #1449 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-09 00:16:36 -04:00
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
4a0269b3b1
Increment version
2022-09-08 19:10:03 -04:00
248b4d4d75
Fix issues with rendering songs
2022-09-07 11:11:44 -05:00
d928335dd2
Respect custom draw functions
2022-09-07 09:56:30 -05:00
cfc5d1d4e3
Fix merge error
...
Didn't mean to have Zhora changes in here yet
2022-09-06 14:05:29 -07:00
d96feaf4a4
Tidy up chain platform cutscene check
2022-09-06 14:00:09 -07:00
100d83151e
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-06 12:43:13 -07:00
9e6defe1b5
Fix merge mistake
2022-09-06 12:21:06 -07:00
b2f4d5e95a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-06 13:30:49 -05:00
99b9531cfd
Merge branch 'zhora-magic-arrows' into rando-enhanced-magic-arrows
2022-09-06 11:10:46 -07:00
37acd52016
Clarify var names and comments
2022-09-06 11:05:52 -07:00
5991be8256
Remove !=0 from cvar check
2022-09-06 10:57:08 -07:00
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
a999a51998
Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows
2022-09-06 08:50:37 -07:00
3b844375b7
Add missing pendingFlags ( #1414 )
2022-09-06 11:27:26 +02:00
acaf4e6bcc
Fixes sold out items not getting overwritten by the randomized info.
2022-09-06 02:42:55 -04:00
4d9bf936b1
Fixes order of operations so Rupees will be spent.
2022-09-06 01:12:11 -04:00
5d38b23850
Implements items selling out and fixes issues with purchasing some items.
2022-09-06 00:58:36 -04:00
db9f608177
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-05 21:41:18 -07:00
a99330a8a5
Fix #1417
2022-09-05 23:34:52 -05:00
c0b3f229fa
Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
2022-09-05 20:39:52 -04:00
885d6dc6c2
Merge pull request #1422 from garrettjoecox/scrubs-trials-persist
...
Add merchantPrices to save file instead of loading from active spoiler log
2022-09-05 19:41:58 -04:00
1c13fdec5f
Add trials required and merchant prices to save file instead of loading from active spoiler log
2022-09-05 14:55:34 -05:00
39852c9278
Fix Sold Out bug
2022-09-05 11:46:50 +02:00
983ab139d5
Add another flag to skip mask shop
2022-09-05 00:35:56 +02:00
adb7ce773e
Merge pull request #3 from leggettc18/pr/garrettjoecox/1329
...
Implement's Tycoon Wallet.
2022-09-04 14:30:47 -05:00
f282e25c16
Move all merchant messages to be generated on file load
2022-09-04 13:53:59 -05:00
9e617f8923
Implement's Tycoon Wallet.
2022-09-04 12:32:07 -04:00
Garrett Cox