mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity
1,633 Commits 3 Branches 37 Tags 133 MiB
c9359ab3ef
Commit Graph

468 Commits

Author SHA1 Message Date
Garrett Cox
c9359ab3ef Simplify logic around shopsanity and fix some issues 2022-09-12 22:31:45 -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
2c693d2f22
Merge pull request #1433 from garrettjoecox/use-3drando-item-names 
Use 3drando item table for parsing spoiler names
 2022-09-07 23:41:43 -04:00
Christopher Leggett
32c0af27a8
Hopefully makes Jenkins happy 2022-09-07 22:51:43 -04:00
Christopher Leggett
90cc2fa361
Changes filename format to icon indexes separated by dashes 2022-09-07 22:22:16 -04:00
Christopher Leggett
cb0f4ffd97
Prevents leading 0s added to hash from being in file name 2022-09-07 21:30:33 -04:00
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
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
Garrett Cox
5b4ce49688 Base whats in the bazaar shop on entranceIndex instead of age 2022-09-06 15:59:09 -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
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
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
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
9afe3ca746 Fix gerudo keys, add disabled checkbox 2022-09-05 16:48:59 +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
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
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
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
aMannus
8d033c6766 Update settings.cpp 2022-09-03 20:29:45 +02: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