Christopher Leggett
|
1763eda169
|
Implements a larger array of Sprites for the Icon Hash.
|
2022-09-07 20:23:22 -04:00 |
|
Garrett Cox
|
d94be06208
|
Fix localized item names for shopsanity
|
2022-09-07 12:08:29 -05:00 |
|
Garrett Cox
|
558f97741f
|
Merge branch 'use-3drando-item-names' of github.com:garrettjoecox/OOT into shopsanity
|
2022-09-07 11:58:07 -05: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
|
85bb09c70b
|
Remove log
|
2022-09-06 21:24:05 -05:00 |
|
Garrett Cox
|
f366e1d56e
|
Add missing newline
|
2022-09-06 21:19:43 -05:00 |
|
Garrett Cox
|
4dd9c99c11
|
Use another nested method instead of one at the top level to fetch the table
|
2022-09-06 21:17:55 -05:00 |
|
Garrett Cox
|
f47f27c19e
|
Use 3drando item table for parsing spoiler names
|
2022-09-06 19:42:01 -05:00 |
|
Sarge-117
|
cfc5d1d4e3
|
Fix merge error
Didn't mean to have Zhora changes in here yet
|
2022-09-06 14:05:29 -07:00 |
|
Sarge-117
|
d96feaf4a4
|
Tidy up chain platform cutscene check
|
2022-09-06 14:00:09 -07:00 |
|
Garrett Cox
|
5b4ce49688
|
Base whats in the bazaar shop on entranceIndex instead of age
|
2022-09-06 15:59:09 -05: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
|
d02114a9d8
|
Handle shop items in SaveManager
|
2022-09-06 13:36:56 -05:00 |
|
Garrett Cox
|
b02ab9185d
|
Rename randomizerMerchantPrices to merchantPrices
|
2022-09-06 13:32:59 -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 |
|
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 |
|
Sarge-117
|
a999a51998
|
Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows
|
2022-09-06 08:50:37 -07:00 |
|
aMannus
|
3b844375b7
|
Add missing pendingFlags (#1414)
|
2022-09-06 11:27:26 +02:00 |
|
Christopher Leggett
|
acaf4e6bcc
|
Fixes sold out items not getting overwritten by the randomized info.
|
2022-09-06 02:42:55 -04:00 |
|
briaguya
|
8d75603e4b
|
Merge pull request #1425 from garrettjoecox/1471-fix-shooting-gallery-rando-check
Fix #1417
|
2022-09-06 01:30:37 -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 |
|
Sarge-117
|
db9f608177
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-05 21:41:18 -07:00 |
|
Garrett Cox
|
a99330a8a5
|
Fix #1417
|
2022-09-05 23:34:52 -05:00 |
|
Garrett Cox
|
c9c648322d
|
Fix for a single zeroed merchantPrice entry
|
2022-09-05 22:30:39 -05:00 |
|
Garrett Cox
|
0ab4f21382
|
Fix issue when merchantPrices is empty
|
2022-09-05 22:14:39 -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 |
|
briaguya
|
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 |
|
briaguya
|
803ef49f6d
|
Merge pull request #1416 from aMannus/rando-skip-mask-shop-fix
Rando: Fix Complete Mask Quest & Mask Select interaction bugs
|
2022-09-05 19:27:00 -04:00 |
|
briaguya
|
bafd016cd9
|
Merge pull request #1413 from aMannus/rando-key-colors-default
Rando: Enable key colors matching dungeon by default
|
2022-09-05 19:09:37 -04:00 |
|
Garrett Cox
|
670a41bd08
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-05 15:33:15 -05:00 |
|
Garrett Cox
|
96a3354d45
|
Remove trialsRequired persisting in save manager
|
2022-09-05 15:12:30 -05:00 |
|
Garrett Cox
|
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 |
|
aMannus
|
fb5aff393a
|
tooltip line break
|
2022-09-05 16:54:02 +02:00 |
|
aMannus
|
9afe3ca746
|
Fix gerudo keys, add disabled checkbox
|
2022-09-05 16:48:59 +02:00 |
|
aMannus
|
39852c9278
|
Fix Sold Out bug
|
2022-09-05 11:46:50 +02:00 |
|
Sarge-117
|
da7dc55317
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-04 20:18:54 -07:00 |
|
Sarge-117
|
5aaaccb72d
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-04 15:36:12 -07:00 |
|
aMannus
|
983ab139d5
|
Add another flag to skip mask shop
|
2022-09-05 00:35:56 +02:00 |
|
Garrett Cox
|
45fc416963
|
Swap german and french translations for shop messages
|
2022-09-04 15:25:37 -05:00 |
|
Garrett Cox
|
ad1e051b59
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-04 15:23:18 -05:00 |
|
PurpleHato
|
a6937e9850
|
added hovertext for the number display
|
2022-09-04 21:31:50 +02:00 |
|
Garrett Cox
|
adb7ce773e
|
Merge pull request #3 from leggettc18/pr/garrettjoecox/1329
Implement's Tycoon Wallet.
|
2022-09-04 14:30:47 -05:00 |
|
Garrett Cox
|
f282e25c16
|
Move all merchant messages to be generated on file load
|
2022-09-04 13:53:59 -05:00 |
|
PurpleHato
|
47c7d3f061
|
always display XX/YY when in ammo/capacity mode
|
2022-09-04 20:39:56 +02:00 |
|
PurpleHato
|
e11ca62ee1
|
small tweaks and rename
|
2022-09-04 20:09:48 +02:00 |
|
PurpleHato
|
2c241d5fe8
|
Merge branch 'rando-next' into TrackerAmmoFix
|
2022-09-04 19:57:56 +02:00 |
|
Garrett Cox
|
6bf886ecae
|
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
|
2022-09-04 11:55:40 -05:00 |
|
Christopher Leggett
|
9e617f8923
|
Implement's Tycoon Wallet.
|
2022-09-04 12:32:07 -04:00 |
|
Garrett Cox
|
1bbde39439
|
Ensure itemTrackerNotes vector is not fully empty
|
2022-09-04 02:06:42 -05:00 |
|
Sarge-117
|
347154c4d1
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 22:31:21 -07:00 |
|
briaguya
|
6439c45f26
|
Merge pull request #1402 from garrettjoecox/beans-obtainability-fix
Fix for beans obtainability
|
2022-09-03 20:04:11 -04:00 |
|
PurpleHato
|
6dbc292ff3
|
Fix: changes to please new LUS
|
2022-09-04 01:22:15 +02:00 |
|
PurpleHato
|
ed96a0c272
|
Merge branch 'rando-next' into TrackerAmmoFix
|
2022-09-04 01:08:26 +02:00 |
|
PurpleHato
|
27f613b3f8
|
All color logic for all types
|
2022-09-04 01:03:28 +02:00 |
|
briaguya
|
e55ec29d66
|
Merge pull request #1396 from garrettjoecox/item-tracker-notes
Persist item tracker notes
|
2022-09-03 18:40:32 -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 |
|
PurpleHato
|
d4bc5875d7
|
tweak on main logic
|
2022-09-03 23:49:15 +02:00 |
|
Sarge-117
|
938ecef131
|
Tooltip wording + line break
|
2022-09-03 14:27:27 -07:00 |
|
Sarge-117
|
e9822eed62
|
Add line break in tooltip
|
2022-09-03 14:25:47 -07:00 |
|
Sarge-117
|
dc4d8e322b
|
Update tooltip
|
2022-09-03 14:19:59 -07:00 |
|
Sarge-117
|
27e58842b0
|
Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
|
2022-09-03 14:10:39 -07:00 |
|
aMannus
|
70ab1406e1
|
Incorporate magic arrows in rando settings
|
2022-09-03 22:56:09 +02:00 |
|
Garrett Cox
|
77a5d03019
|
Hook into file delete and clear notes
|
2022-09-03 15:46:33 -05:00 |
|
Garrett Cox
|
72660e2cfd
|
Fix for beans obtainability
|
2022-09-03 15:28:59 -05:00 |
|
PurpleHato
|
377c030469
|
Fixed capacity on ammmo tracking
|
2022-09-03 21:57:58 +02:00 |
|
Sarge-117
|
a260f680d1
|
Merge branch 'rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 12:17:23 -07:00 |
|
briaguya
|
d90145da47
|
Merge pull request #1391 from aMannus/rando-skip-scarecrow
Rando: Add Skip Scarecrow's Song option
|
2022-09-03 15:04:58 -04:00 |
|
briaguya
|
8e49f0465c
|
Merge pull request #1399 from aMannus/rando-bombchu-drops
Rando: Add Bombchu Drops
|
2022-09-03 15:03:30 -04:00 |
|
Sarge-117
|
e1da7bf9af
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 11:58:38 -07:00 |
|
aMannus
|
6cd8d6ca3a
|
Clean up bool
|
2022-09-03 20:48:00 +02:00 |
|
Sarge-117
|
b31b1ef157
|
Restore checkboxes in menu
Accidentally lost these during merge
|
2022-09-03 11:43:31 -07:00 |
|
Sarge-117
|
5a9540585a
|
Simplify mudwall collision check
|
2022-09-03 11:35:19 -07:00 |
|
aMannus
|
8d033c6766
|
Update settings.cpp
|
2022-09-03 20:29:45 +02: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 |
|
aMannus
|
ae0ccb9cca
|
Missing break
|
2022-09-03 20:18:54 +02:00 |
|
aMannus
|
274242e0d7
|
Implement rando bombchu drops
|
2022-09-03 20:17:12 +02:00 |
|
briaguya
|
cbc181bc0a
|
Merge pull request #1392 from lilDavid/re-add_progressive_chus
Reimplement progressive Bombchus + fix bowling Bombchu prize
|
2022-09-03 14:13:17 -04:00 |
|
Sarge-117
|
a397b07ec4
|
Update location access logic
Including MQ locations in Spirit and GC now
|
2022-09-03 10:37:14 -07:00 |
|
briaguya
|
98dbbfda13
|
Merge pull request #1395 from leggettc18/starting-bgs
Fixes Link starting with BGS
|
2022-09-03 13:36:12 -04:00 |
|
Sarge-117
|
bb04e9d97d
|
Restore checkboxes to enhancements menu
These got lost in the merge
|
2022-09-03 09:57:35 -07:00 |
|
Sarge-117
|
43372155f2
|
Fix mistake from merge
oops
|
2022-09-03 09:39:42 -07:00 |
|
Sarge-117
|
92bb55531a
|
Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows
|
2022-09-03 09:32:00 -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
|
ac6843ca57
|
Fix for overriding deku scrub messages
|
2022-09-03 10:34:35 -05:00 |
|
Garrett Cox
|
771d1dfbf5
|
Fix issues from LUS refactor
|
2022-09-03 10:09:51 -05:00 |
|
Garrett Cox
|
c037bfc16b
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-03 09:49:50 -05:00 |
|
Garrett Cox
|
b92b1eaee6
|
Use SohImGui::RequestCvarSaveOnNextTick
|
2022-09-03 09:33:54 -05:00 |
|
Garrett Cox
|
90bf5988ee
|
Adjust Hooks include
|
2022-09-03 09:30:53 -05:00 |
|
Garrett Cox
|
8be6f6e441
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes
|
2022-09-03 09:19:14 -05:00 |
|
Garrett Cox
|
ed8966054c
|
Persist item tracker notes
|
2022-09-03 09:15:05 -05:00 |
|
Christopher Leggett
|
e079c254f1
|
Fixes Link starting with BGS
|
2022-09-03 09:39:03 -04:00 |
|
Christopher Leggett
|
5421ad27c9
|
Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
|
2022-09-03 09:24:37 -04:00 |
|
lil David
|
f5fae6df32
|
Reimplement progressive Bombchus
|
2022-09-03 08:11:51 -05:00 |
|
aMannus
|
8d2f63419f
|
Implement Skip Scarecrow's Song
|
2022-09-03 14:40:41 +02:00 |
|