Christopher Leggett
|
bba59509f3
|
Removes some unused functions and variables in spoiler_log.cpp
|
2022-09-07 21:23:41 -04:00 |
|
Christopher Leggett
|
e3d174cc9b
|
Uses the hash instead of seed for spoilerfile name and icons.
|
2022-09-07 21:19:16 -04:00 |
|
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 |
|
Garrett Cox
|
0683b30bf2
|
Merge pull request #4 from leggettc18/pr/garrettjoecox/1329
Shopsanity Improvements/Bugfixes
|
2022-09-06 09:06:48 -05: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 |
|
briaguya
|
d2682998c4
|
Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled
Fix issue when merchantPrices is empty
|
2022-09-06 01:05:16 -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 |
|
briaguya
|
87a78cf87c
|
Merge pull request #1405 from PurpleHato/TrackerAmmoFix
Rando: Item Tracker currentAndMax rework
|
2022-09-04 18:35:46 -04:00 |
|
aMannus
|
fe413fd675
|
Set key colors to be on by default
|
2022-09-04 23:09:17 +02:00 |
|