mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-15 22:15:16 -05:00
Code Issues Projects Releases Wiki Activity
1,721 Commits 3 Branches 37 Tags 141 MiB
42edeb25a6
Commit Graph

1327 Commits

Author SHA1 Message Date
Garrett Cox
676f8945ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes 2022-09-02 09:15:31 -05:00
Sarge-117
164a43c9cb Update logic for King Dodongo's room 
Explicitly check for BlueFireAccess && HasBottle here, since using the Ice Arrows on the bombable floor is tricky due to its collision being very tiny
 2022-09-01 22:00:46 -07: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
0626d80651 Fix missed comma 2022-09-01 17:13:34 -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
Christopher Leggett
812a1e7970
Added return statement in IsVanillaItem before keys. 2022-09-01 17:50:12 -04:00
briaguya
f391505b0e
Merge pull request #1344 from aMannus/more-random-rupee-names 
Rando: German and more English random rupee names
 2022-09-01 15:18:29 -04:00
aMannus
2f6e070223 Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-09-01 20:26:29 +02:00
aMannus
38dca43b3f Name changes and small layout changes 2022-09-01 20:25:10 +02:00
aMannus
1e13879c6b Removed name 2022-09-01 19:43:08 +02: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
a55eb572db fix keysanity related build issue 2022-09-01 12:06:41 -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
lil David
ea9db56914 Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic 2022-09-01 07:59:09 -05:00
aMannus
354905fb7d Added 1 more name 2022-09-01 11:06:05 +02:00
Sarge-117
0a2bbabbed First pass on logic 2022-08-31 21:13:09 -07:00
lilDavid
cfaed3ded0 Make Biggoron ignore whether you have BGS in rando 2022-08-31 22:07:34 -05:00
louist103
584a4ad818
Linux crash handler (#1209) 
* crash handler linux

* cleanups

* missing underscore

* more cleanups

* cleanups

* 32 bit
 2022-08-31 22:59:38 -04:00
Sarge-117
75e5330263 Add German 2022-08-31 17:23:16 -07:00
Sarge-117
d117b13c46 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-31 16:58:40 -07:00
briaguya
1f12caa5c9 fix oot ice trap check optimization issues 2022-08-31 18:15:09 -04:00
briaguya
32c36eb5c4
Merge pull request #1355 from leggettc18/rando-next-chest-fixes 
Randomizer: Fixes a few bugs related to chests.
 2022-08-31 16:15:46 -04:00
Christopher Leggett
042d6f3865
Fixes a few bugs related to chests. 2022-08-31 10:57:59 -04:00
Christopher Leggett
bf505dba5c
Fixes keys, maps, and compasses on develop-zhora rando (#1338) 
* Fixes keys, maps, and compasses on develop-zhora rando.

* Adds randotodo comment as a note to adapt for the keysanity situation.
 2022-08-31 15:25:58 +02:00
Christopher Leggett
776219fb52
Backports a fix for sheik checks from rando-next (#1340) 
* Fixes some Sheik checks I had accidentally set the wrong flag for.

* Removes duplicate switch case from cherry-pick
 2022-08-31 15:25:47 +02:00
aMannus
3502cea422 Renamed tabs 2022-08-31 10:10:28 +02:00
aMannus
c10693d281 Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-08-31 10:02:13 +02:00
Sarge-117
55fa913c78 Couple more 
Just need German for these

Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
 2022-08-30 15:24:44 -07:00
Sarge-117
d9ad01174b Merge remote-tracking branch 'upstream/rando-next' into update-navi-hints-rando 2022-08-30 14:22:11 -07:00
Sarge-117
b803c77f58 Add French translation 
Thanks to PurpleHato
 2022-08-30 14:22:02 -07:00
Sarge-117
c4c15e91bf Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-30 11:06:51 -07:00
Sarge-117
8e2f035278 Split into two enhancements 
"Blue Fire Arrows" and "Sunlight Arrows"
 2022-08-30 11:06:42 -07:00
Christopher Leggett
60257b98a4
Oops. Missed closing bracket. 2022-08-30 11:21:29 -04:00
Christopher Leggett
3856d1b0a7
Fixed small key case that was behind an else and shouldn't have been 2022-08-30 11:00:47 -04:00
Sarge-117
f4e53c54b5 Correct German spellings, add 2 more hints 2022-08-29 18:17:23 -07:00
Christopher Leggett
99674ff88c
Readds missing workaround for spirit temple and ganon's castle keys. 2022-08-29 19:19:01 -04:00
Garrett Cox
c7207d2e0a Move obtainability check up higher 2022-08-29 17:42:48 -05:00
Garrett Cox
8c6774fa35 More small changes 2022-08-29 16:00:47 -05:00
Garrett Cox
ded7ccab3f Minor fixes 2022-08-29 15:35:37 -05:00
Garrett Cox
5961c33ba9 Rename GetItemFromGet and move obtainability checks to a separate function 2022-08-29 15:26:27 -05:00
aMannus
1161873044 Moar names 2022-08-29 21:51:42 +02:00
Christopher Leggett
51dbee365a
Oops part 2 2022-08-29 01:04:13 -04:00
Christopher Leggett
f44c588a2c
Oops 2022-08-29 01:03:21 -04:00
Christopher Leggett
a84262dbf7
Bit of cleanup 2022-08-29 00:11:10 -04:00
Christopher Leggett
0a27714b8e
Adds missing case for RSK_GERUDO_KEYS from spoilerfile parsing. 2022-08-29 00:09:44 -04:00
Christopher Leggett
35d651f06e
When shuffled to Own Dungeon or below, give vanilla keys, maps, and compasses. 2022-08-28 23:54:13 -04:00
Christopher Leggett
760eaa4d97
Adds randotodo comment as a note to adapt for the keysanity situation. 2022-08-28 23:14:42 -04:00
Christopher Leggett
0de1cd96b1
Fixes keys, maps, and compasses on develop-zhora rando. 2022-08-28 23:14:29 -04:00
aMannus
fdc0aa9ab4 Code Cleanup 2022-08-28 21:07:18 +02:00
aMannus
2456473f49 Merge fix 2022-08-28 20:21:32 +02:00
aMannus
1c59995feb Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-08-28 20:19:19 +02:00
aMannus
77f4472902 Redone layout tabs/columns 2022-08-28 19:40:46 +02:00
Sarge-117
12ae59d133 Change bool name 
To make jenkins happy (I hope)
 2022-08-28 10:39:53 -07:00
Sarge-117
d510d8cde0 Comment clarity 2022-08-28 09:45:00 -07:00
Sarge-117
ee4cdf3317 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-28 09:08:44 -07:00
briaguya
6d4288c2a5
Merge pull request #1331 from leggettc18/ganon-trials 
Reimplements selecting different amounts of Ganon's Trials.
 2022-08-28 11:48:34 -04:00
Sarge-117
669f76d2f4 Implement Enhanced Magic Arrows 
Currently as a rando-only enhancement until it can be accounted for in logic
 2022-08-27 22:49:13 -07:00
Christopher Leggett
9c43f7225b
Adds captilization to French spoilerfile strings. 2022-08-27 18:45:21 -04:00
Christopher Leggett
fafd90482b
Refactor of some old rando code to use new functions. 2022-08-27 18:42:36 -04:00
Christopher Leggett
6aaef2179b
More Cleanup 2022-08-27 18:26:25 -04:00
Christopher Leggett
404a637ebd
Removes added function that went unused. 2022-08-27 15:56:11 -04:00
Christopher Leggett
dbd8909d26
Forgot to limit slider from 1-6 rather than 0-6 2022-08-27 15:53:57 -04:00
Christopher Leggett
4d8bfa97c0
UI Changes (dropdown and slider rather than checkbox and slider) 2022-08-27 15:51:14 -04:00
Christopher Leggett
3d8b8066da
More comment cleanup 2022-08-27 14:33:38 -04:00
Christopher Leggett
ff0ef4a6b4
ImGui/Commented out code cleanup. 2022-08-27 14:27:02 -04:00
Christopher Leggett
1bf8423f75
Reimplements selecting different amounts of Ganon's Trials. 2022-08-27 14:19:37 -04:00
Christopher Leggett
928a39fe9e
More Cleanup 2022-08-27 09:30:49 -04:00
Christopher Leggett
a572c11f4f
Fixes ice trap gidata not getting cleared after trap is sprung. (#1322) 2022-08-27 09:27:20 +02:00
Christopher Leggett
bf1b327a95
Cleanup and Documentation 2022-08-27 02:50:44 -04:00
Christopher Leggett
7fbb381db7
Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item. 2022-08-27 02:25:13 -04:00
Garrett Cox
67a890ed1e Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-08-26 21:41:21 -05:00
Christopher Leggett
62aeac51b9
ACTUALLY fixes adult trade items on save init this time. 2022-08-26 22:14:49 -04:00
Christopher Leggett
9f47099232
Properly handles starting link with adult trade items. 2022-08-26 21:17:12 -04:00
Christopher Leggett
05136c13b7
Fixes Link getting Song as pocket item (#1326) 2022-08-27 02:46:19 +02:00
aMannus
637f089485 some stuff 2022-08-27 00:42:54 +02:00
aMannus
83abf57766 Add skull token to links pocket 2022-08-26 23:51:36 +02:00
aMannus
4ebcc83161 Code styling 2022-08-26 15:13:34 +02:00
aMannus
9e6d61d7ec Incompatible checkboxes 2022-08-26 11:13:11 +02:00
aMannus
b43f77caba Columns in childs & code style changes 2022-08-26 09:56:34 +02:00
Christopher Leggett
53531c4481
Cleanup 2022-08-26 01:17:51 -04:00
Christopher Leggett
9148fa5aec
Adds custom particles to Freestanding Bean Pack item. 2022-08-25 20:48:28 -04:00
Christopher Leggett
4a51ab3187
Fixes bug where Bean Pack was also granting blue potion 2022-08-25 20:42:34 -04:00
Christopher Leggett
71e7fb9d70
Merge rando-next and rename scrub message table to merchant message table 2022-08-25 18:02:00 -04:00
Christopher Leggett
e9fa231ae6
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack 2022-08-25 17:45:41 -04:00
briaguya
0107699a6b more formatting 2022-08-25 17:29:09 -04:00
briaguya
866cb3166b formatting 2022-08-25 17:28:46 -04:00
briaguya
0bcc5b1310 no more blank spoilers 2022-08-25 17:27:37 -04:00
Christopher Leggett
78e506a072
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack 2022-08-25 16:58:05 -04:00
briaguya
da07a8f409
Merge pull request #1300 from aMannus/tokensanity-bgs-fix 
Rando: Tokensanity BGS and maps/compasses fix
 2022-08-25 16:50:21 -04:00
briaguya
1cfa0a9623
Merge pull request #1264 from garrettjoecox/scrubsanity 
Scrubsanity
 2022-08-25 16:48:28 -04:00
Christopher Leggett
5043309c63
Adds basic german text for bean salesman 2022-08-25 16:43:57 -04:00
Garrett Cox
dc9eeb18d9 Increase size of randomizerInf 2022-08-25 15:38:41 -05:00
briaguya
4919bddda2 Merge branch 'develop-zhora' into ztorn 2022-08-25 16:08:16 -04:00
Garrett Cox
c76ff719f4 Fix issue in spoiler generation 2022-08-25 13:53:04 -05:00
Garrett Cox
1e31d108e6 Various changes from feedback, and use new randomizerInf table 2022-08-25 13:49:02 -05:00
Christopher Leggett
3da197f0cd
Removes some magic numbers 2022-08-25 14:39:12 -04:00
Christopher Leggett
c2fed1a382
Fixes Lost Woods Bridge Ice Trap in Rando (#1313) 2022-08-25 20:16:43 +02:00
Garrett Cox
936513a9c4 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity 2022-08-25 13:02:47 -05:00
aMannus
29b9f0b37e Comment 2022-08-25 19:58:05 +02:00
aMannus
49b48fb7a4 Fix BGS and maps/keys textboxes 2022-08-25 19:56:34 +02:00
aMannus
9fda6a0764 Merge branch 'rando-next' into tokensanity-bgs-fix 2022-08-25 19:27:55 +02:00
Christopher Leggett
efd4ceb636
Colors keywords in bean salesman text. 2022-08-25 12:46:08 -04:00
Christopher Leggett
6ab13f389b
Fixes salesman to properly take 60 rupees from you. 2022-08-25 12:43:19 -04:00
Christopher Leggett
00838cb5b6
Adds french text for the bean salesman 2022-08-25 12:39:34 -04:00
lilDavid
ad33aba9ba
Merge branch 'rando-next' into bombchu-logic 2022-08-25 11:23:30 -05:00
briaguya
9f60a97307
Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix 
Rando: Fix Winner PoH on skulltula's
 2022-08-25 12:23:29 -04:00
briaguya
8a4c196566
Merge pull request #1312 from garrettjoecox/randomizer-inf 
Transition to randomizerInf flags
 2022-08-25 12:19:55 -04:00
aMannus
c22951353e Renamed function 2022-08-25 18:04:52 +02:00
briaguya
ed5a2d8a42
Merge pull request #1307 from aMannus/rando-menu-tweaks 
Rando: Small menu tweaks
 2022-08-25 11:57:03 -04:00
aMannus
69157640f6 Removed BGS flag in Item_Give() 2022-08-25 17:34:45 +02:00
Garrett Cox
5e9d1d61f1 Fix minor thing in sram 2022-08-25 10:34:39 -05:00
Garrett Cox
f7bd48aaca Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf 2022-08-25 10:27:34 -05:00
Garrett Cox
95372718a3 Transition a few things to randomizerInf flags 2022-08-25 10:27:31 -05:00
Christopher Leggett
90067be132
Fixes Dungeon Rewards from Song from Impa (#1311) 2022-08-25 17:19:17 +02:00
aMannus
9787f9d4f2 Swap hints & item pool 2022-08-25 16:34:48 +02:00
Christopher Leggett
5842beeb55
Fixes Bean Pack item from chest. 2022-08-25 10:11:35 -04:00
Christopher Leggett
ef1b662bf4
Finishes wiring up bean salesman settings and text. 2022-08-25 09:42:15 -04:00
briaguya
4ca146b4e1
Merge pull request #1299 from aMannus/bgs-dupe-fix 
Rando: Fix BGS dupe check
 2022-08-25 07:49:10 -04:00
aMannus
7de2c584b4 Rando menu tweaks 2022-08-25 11:11:24 +02:00
aMannus
c41de36c46 Comment 2022-08-25 10:36:28 +02:00
aMannus
6fd22f50ab Swapped logic to boss key 2022-08-25 10:35:04 +02:00
aMannus
954a96baeb tha fix 2022-08-25 10:27:04 +02:00
aMannus
bc5ec24889 Ice trap fix 2022-08-25 09:54:08 +02:00
aMannus
2626f6c7e3 Fixed Winner PoH on skulltula's 2022-08-25 09:34:46 +02:00
aMannus
cc6e4238cf Fixes BGS on skull tokens 2022-08-25 08:49:15 +02:00
aMannus
050a9db01d Fix BGS dupe check 2022-08-25 08:38:42 +02:00
briaguya
d2fe83edf4
Merge pull request #1295 from HarbourMasters/develop-zhora 
quick zhora -> rando-next
 2022-08-24 19:47:26 -04:00
Baoulettes
c0b9171f98
Cosmetics Editor Fixes (#1287) 2022-08-25 01:28:27 +02:00
Christopher Leggett
db6a397195
Adds new text for the bean salesman 2022-08-24 17:58:01 -04:00
Christopher Leggett
c4de29b7f1
Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman 2022-08-24 17:24:50 -04:00
Christopher Leggett
adf465c1a0
Sets up Magic Bean Salesman to sell a rando check for 60 rupees. 2022-08-24 17:20:45 -04:00
briaguya
f15b3880f3
Merge pull request #1292 from aMannus/custom-key-colors-fix 
Rando: Custom key colors fix
 2022-08-24 17:17:54 -04:00
briaguya
1d77b7fd24
Merge pull request #1293 from aMannus/rando-lost-woods-target-crash-fix 
Rando: Lost Woods target crash fix
 2022-08-24 17:16:15 -04:00
briaguya
0af2239473
Merge pull request #1290 from garrettjoecox/item-tracker-v3-fixes 
Item tracker v3 small fixes
 2022-08-24 17:14:38 -04:00
aMannus
a48ac71762 Fixed lost woods target crash 2022-08-24 23:02:48 +02:00
Garrett Cox
27ced1feca Move some comments around 2022-08-24 15:52:19 -05:00
aMannus
179c432ee1 Comment 2022-08-24 22:20:20 +02:00
aMannus
d5074c3e77 Fixes double def and split second wrong colors 2022-08-24 22:18:24 +02:00
Christopher Leggett
fe7aedc80d
Adds getItemEntry for Magic Bean Pack 2022-08-24 15:44:31 -04:00
Garrett Cox
29509341f9 Support hiding compasses and maps, move combo button behind floating window condition, add padding to windows mode 2022-08-24 13:15:00 -05:00
Christopher Leggett
37fe5491b2
Always color in Double Defense 2022-08-24 13:58:25 -04:00
Christopher Leggett
02a8ba8bb9
Fixes incorrect key order in DrawSmallKeys. 2022-08-24 13:16:14 -04:00
Christopher Leggett
821c7948d6
Cleanup 2022-08-24 13:06:48 -04:00
Christopher Leggett
ecd0e3e8bb
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys 2022-08-24 13:03:44 -04:00
Garrett Cox
b7e3a72f85 Fix issue from bad merge and a few other small things 2022-08-24 11:00:02 -05:00
Garrett Cox
693dc479d2 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity 2022-08-24 10:22:57 -05:00
briaguya
96d7602761
Merge pull request #1261 from garrettjoecox/item-tracker-v3 
Item tracker v3
 2022-08-24 11:20:47 -04:00
Garrett Cox
c6c08522e6 Custom message for free items 2022-08-24 10:19:41 -05:00
briaguya
61b6d162e8
Merge pull request #1288 from leggettc18/grass-chest-fix 
Fixes rando-next exclusive grass-chest bug I inadvertently introduced.
 2022-08-24 10:58:34 -04:00
Christopher Leggett
69a7012b5a
Fixes grass-chest bug I inadvertently introduced. 2022-08-24 10:45:39 -04:00
aMannus
0e288fc55d Merge branch 'rando-next' into rando-rupee-names 2022-08-24 15:51:02 +02:00
aMannus
684cd862f1 Renamed function 2022-08-24 15:29:45 +02:00
Christopher Leggett
855147b265
Merge branch 'rando-next' into color-coded-keys 2022-08-24 00:17:37 -04:00
Christopher Leggett
6561073c7b
Implements ImGui Checkbox to enable or disable color-coded-keys. 2022-08-24 00:07:16 -04:00
Christopher Leggett
c7b998b33b
Implements better way to use new draw functions and adds Double Defense colors. 2022-08-23 23:48:14 -04:00
briaguya
e7cd2fd649
Merge pull request #1087 from Sarge-117/rando-navi-tips 
Rando navi tips
 2022-08-23 21:53:34 -04:00
briaguya
a8def1fca8 fix old reference to GlobalCtx2 2022-08-23 21:13:47 -04:00
Christopher Leggett
28afbec341
Adds support for custom drawing functions, and adds one for Small Keys and Boss Keys. 2022-08-23 21:12:21 -04:00
briaguya
133cbcd6c8 Merge branch 'develop-zhora' into z-to-rn 2022-08-23 21:05:35 -04:00
Garrett Cox
31e8896856 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity 2022-08-23 19:42:15 -05:00
briaguya
b7e07bef2f
Merge pull request #1191 from leggettc18/get-item-rework-rando-next 
Get-item-rework-rando-next
 2022-08-23 20:40:08 -04:00
Jake Edvenson
927ffd0b8b
Enhancement: Scarecrow song skip (#1183) 
* Added Skip Scarecrow Song

Added in the option for if the user has the time saver for Scarecrow song enabled and has their Ocarina pulled out in range of Pierre.
Added Skip Scarecrow Song
New enhancement under time-savers that allows the user to only pull out their ocarina to summon Pierre.

* Added Default for Scarecrow summon

The scarecrow summon option now defaults to 0 and can be turned on individually. I haven't included it in any other presets so people don't feel like they're cheating.

* Checks if scarecrow song is in possession

* Fixed positional Scarecrow logic

* Fixed style
 2022-08-23 20:30:06 -04:00
Baoulettes
d6ebce068d
fixes only (#1255) 2022-08-23 20:20:56 -04:00
Sarge-117
45873ba71d Add CVar + Cvar check 
Defaults to "1"
 2022-08-23 17:16:19 -07:00
lilDavid
4680641514
Add bombchu drops (#1257) 
* Add bombchu drops

* Force 3D bombchu drops

* Move bombchu drop conditions for better clarity

* Fix grouping on chu drop condition
 2022-08-23 20:14:17 -04:00
Ada
d735616020
Adds game specific camera options (#1212) 
* Adds inversion options

* Fixes compilation

* Adds options to new detailed control editor

* Fixes inversion on C-Up view

* Fixes right stick aiming

* Fixes right stick aiming again

* Adds tooltip function + tooltips to gamecontroleditor.cpp

* Fixes tooltip for X axis

* Uses LUS tooltip function instead of new one

* Adds padding to camera control editor

To fit more in line with other enhancement checkboxes
 2022-08-23 20:12:14 -04:00
Christopher Leggett
168e84498f
Rework Get Item Table to be more flexible for adding custom items (#1050) 
* Adds ItemTableManager class.

* Implements new getItem table in game.

* Adds rando item table and way to differentiate tables in GetItemEntry.

* Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge

* Change ItemTableID to be uint16_t so we can use ModIndex for it.

* Should fix switch build

* Should fix switch build pt 2

* Adds new files to CMakeLists.

* Implements fixes for competing getItem calls.

* Correctly renders freestanding items

Particle effects are probably broken, need to fix them still, I pretty
much know how I would do that.

* Fixed Particle effects in the new getItem system.

* Fixes item fanfares

* Partially fixes Ice Traps

Obtaining a freestanding Ice Trap causes link to slide forward
and receiving one from an NPC plays the sound effect and damage
animation but doesn't freeze link.

* Some more partial ice trap fixing that wasn't pushed earlier

* Removes unused function override

* Replaces ::find with ::at and adds exception handling

* Removes some commented out code.

* Refactors rando's GetItemEntry array into two arrays.

One array is for the vanilla items that don't have GetItemEntries in
vanilla, the other is for rando exclusive items. They are stored in
separate arrays before getting added to the table so that we can apply
different modIndexes. The items in the first table have are handled
by the vanilla Item_Give, and the second table needed a custom
`Randomizer_Item_Give` function.

* Renames, relocates, and implements ModIndex enum.

* Removes now unused ItemIDs and GetItemIDs

Also makes all the necessary changes to other code that was still
using them indirectly through the GI to GID map that was removed.
There's quite a lot of changes here and I haven't had time to test them
yet.

* Re-implements GIMESSAGE_UNTRANSLATED as macro

* Removes commented out function.

* Throws exception if an invalid itemID is used

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857

* Removes ARRAY_SIZE in favor of ARRAY_COUNT

ARRAY_COUNT already exists in `macros.h`, I just didn't find it before.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943153833

* Inverts CheckContainsRandoItem to CheckContainsVanillaItem.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940895135

* Cleanup, bugfixes, removing the `- 1`s from `z_player.c`

* Fixes some funky formatting that got committed earlier.

* Adds else if to added fanfare sound cases.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940112924 and https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940113492

* Extends GetItemEntry to include getItemId

Also adapts some existing calls for both the entry and the id to only
get the entry.

* Extends GetItemEntry to include GID.

This allows for using it later when drawing freestanding items.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943168136

* Rando-specific items use new textId again.

This got lost when merging develop-zhora in because I didn't have custom
messages merged when I started this.

* Sets global modIndex to MOD_NONE on scene load

Fixes a crash when buying items in shops due to them
not triggering the rando code that normally sets these items.
May have also been crashing vanilla playthroughs.

* Realized I had the bgm conditions wrong.

* Fixes "static drops" (i.e. sticks from withered babas)

* Fixes LACS/Prelude situation... again.

* Fixes too many arguments error.

Not sure why this didn't fail to build on Windows before.

* Fixes Link's Pocket items.

* Simplifies sram init for rando-specific items

* Fixes issues with approaching bottleable items.

* Fixes Ruto's Letter.

It was accidentally getting classified as a rando item.

* Should re-fix freestanding ice traps

* Makes freestanding items set player->getItemEntry.

This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.

* Makes sure we aren't using getItemEntry when not randoed.

* Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck

* Introduce some new methods and migrate most actors to them

* Fixes ocarina game skull kids to set player->getItemEntry

* Sets `z_en_box.c` to set `player->getItemEntry`

* Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor

* Use GiveItemEntryFromActorWithFixedRange in item00

* Fixes Anju to set player->getItemEntry.

* Add a few missing cases

* Additional fix for Skull Kid

* Fixes vanilla ice traps and randomized ice smoke

* Fixes rendering of treasure chest game items.

* Removes unused `Randomizer_GetItemIdFromGetItemId`.

* Cleans up an if statement for item00.

* Cleans up another if statement in item00

* This should fix a bug with the Gerudo Archery minigame.

I wasn't able to get the bug to happen after making this change.

* Documents our new GiveItemEntry fuctions.

* Uses more descriptive type name for ItemIDs for creating custom messages.

* Fixes potential issue with if statement.

* Fixes missed type change.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2022-08-23 20:11:38 -04:00
Sarge-117
44e510e867 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-23 16:55:04 -07:00
aMannus
e2633c9be1 Moved name variables out of InsertRupeeName() 2022-08-23 23:36:59 +02:00
aMannus
e8c25fe528 Matched CMakeLists.txt spacing 2022-08-23 22:43:09 +02:00
aMannus
694c643aee Include missing files in CMakeLists.txt 2022-08-23 22:35:26 +02:00
aMannus
2283471b7b %RUPEE% -> #RUPEE# 2022-08-23 22:23:01 +02:00
aMannus
50b3038a13 Made functions static 2022-08-23 22:14:13 +02:00
Garrett Cox
20737a2045 Fix various issues including crash yay 2022-08-23 11:46:08 -05:00
Garrett Cox
b0cdfc1be1 Only update vectors when options change 2022-08-23 09:44:11 -05:00
Garrett Cox
267c27036c Allow aligning text to the left 2022-08-23 08:06:53 -05:00
lilDavid
6a900022c0 Pass vanilla ammo drops to logic 2022-08-23 07:47:21 -05:00
aMannus
35fefdecb0 Changed CVar name 2022-08-23 09:45:40 +02:00
aMannus
d0f8374c4c Changed checkbox to default to on, invert logic 2022-08-23 09:42:32 +02:00
Christopher Leggett
e12e1d67c6
Prevents optimizations for debug configuration on Windows. (#1270) 2022-08-23 09:32:49 +02:00
Garrett Cox
2e7fd2b0be More cleanup and tweaks 2022-08-23 00:33:07 -05:00
Christopher Leggett
28edabdbe4
Fixes missed type change. 2022-08-23 00:08:22 -04:00
Christopher Leggett
4ee1eba67b
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-22 19:48:34 -04:00
Christopher Leggett
3a67e2a806
Fixes potential issue with if statement. 2022-08-22 19:40:58 -04:00
Christopher Leggett
10c05892bf
Uses more descriptive type name for ItemIDs for creating custom messages. 2022-08-22 19:38:30 -04:00
Christopher Leggett
01dbfc71ad
Documents our new GiveItemEntry fuctions. 2022-08-22 19:32:42 -04:00
Garrett Cox
17aa82a2cd Initial work towards shopsanity, not fully working but some of it is 2022-08-22 13:23:27 -05:00
lil David
58aed3dc07 Correct bombchus in logic description to only include chu shop 2022-08-22 10:41:59 -05:00
th-2021
d39a1a0bdf
[macos] Embed dependencies for ZAPD in bundle (#1271) 2022-08-22 10:43:50 +02:00
Garrett Cox
9f63aaae99 Initial work towards scrubsanity, got affordable prices mostly functional 
Write and read prices from spoiler, move IdentifyScrub up to Randomizer

In a semi working state

Fix bug when going from c to cpp

Kill scrubs before they spawn if already purchased

Woopsie from rebase

Update soh/soh/OTRGlobals.cpp
 2022-08-22 01:13:52 -05:00
Christopher Leggett
e12fda29fe
Merge branch 'get-item-rework' into merge-fix 2022-08-22 02:03:04 -04:00
louist103
eed3942b81
Restore Gold skulltula CS from the "0.9" version (#1217) 
* GS CS

* add to defaults
 2022-08-21 22:11:23 -04:00
Ralphie Morell
f5112a709a
Add'l Console Commands (#1207) 
* Added console commands

* Style conformance
 2022-08-21 22:01:51 -04:00
PurpleHato
f6bb46a0dc
FIX: Disable Draw Distance, Miniboss music could still play in DC with Lizalfos under certain conditions (#1170) 
Thanks @jbodner09 for the report 💯
 2022-08-21 21:57:55 -04:00
Kenix3
51e4485966
LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 
* Merges GlobalCtx2 and Window classes.

* Includes condition variable in File.

* add mac specific include

* sstream to get past "implicit instantiation of undefined template" error

* switch/wiiu includes

* that file doesn't exist

* more wii u globalctx2 stuff

Co-authored-by: briaguya <briaguya@alice>
 2022-08-21 21:08:01 -04:00
Garrett Cox
58a60e3f44 Merge branch 'item-tracker-v3' of github.com:garrettjoecox/Shipwright into item-tracker-v3 2022-08-21 17:17:19 -05:00
Garrett Cox
f52ba103aa Attempt to fix windows build error 2022-08-21 17:07:24 -05:00
Christopher Leggett
5298bda0e2
Merge branch 'rando-next', remote-tracking branch 'origin' into get-item-rework-rando-next 2022-08-21 16:42:15 -04:00
Christopher Leggett
1d9e52b169
Merge remote-tracking branch 'origin' into get-item-rework 2022-08-21 16:41:41 -04:00
Christopher Leggett
91cb6f2360
This should fix a bug with the Gerudo Archery minigame. 
I wasn't able to get the bug to happen after making this change.
 2022-08-21 16:40:16 -04:00
Christopher Leggett
2bbd618599
Cleans up another if statement in item00 2022-08-21 15:35:10 -04:00
Christopher Leggett
e5bca727ac
Cleans up an if statement for item00. 2022-08-21 15:22:18 -04:00
Christopher Leggett
e1b403a31b
Removes unused Randomizer_GetItemIdFromGetItemId. 2022-08-21 15:14:50 -04:00
Garrett Cox
b3307883c7
Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp 2022-08-21 13:32:01 -05:00
Garrett Cox
3aa82eaaf1 Support only enabling while paused, better align dungeon name text 2022-08-21 12:59:40 -05:00
Sarge-117
7066536249 Add #define, fix conflicting delcaration 
Also re-ordered randomizer.cpp a bit to have the text array above CreateNaviRandoMessages()
 2022-08-20 22:17:02 -07:00
Christopher Leggett
fc963cf44c
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-20 18:01:23 -04:00
Christopher Leggett
4dff1443a6
Fixes rendering of treasure chest game items. 2022-08-20 18:00:44 -04:00
Christopher Leggett
7d2170c82b
Stops syncing GS Flags with GS Token Count with Skullsanity on. 2022-08-20 17:25:06 -04:00
Garrett Cox
341ac29fa5 Various tweaks, added button combo and re-added notes 2022-08-20 14:36:38 -05:00
Sarge-117
3adb17c55d Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-20 11:23:10 -07:00
Sarge-117
ccce87cb89 Change int to u8 
Jenkins plz
 2022-08-20 11:16:46 -07:00
Christopher Leggett
4f2f72b941
Adds Frog Reward hints from 3dsrando. 
Fixes the intermittent crash when generating a seed rando-next started
having.
 2022-08-20 13:07:53 -04:00
Sarge-117
6fc3c8cf77 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-20 00:13:56 -07:00
Christopher Leggett
2c410a5857
Fixes ice traps again. 2022-08-19 21:42:59 -04:00
Christopher Leggett
cec1c7dc07
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-19 20:06:39 -04:00
Christopher Leggett
a2a8832a35
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-19 20:06:15 -04:00
briaguya
ad8179287e
Fix controller nav on WiiU (#1258) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-20 02:03:28 +02:00
Christopher Leggett
a67c6b9e67
Fixes vanilla ice traps and randomized ice smoke 2022-08-19 19:36:44 -04:00
Christopher Leggett
4e2707aefc
Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework 2022-08-19 18:51:00 -04:00
briaguya
28bbaf6c45
Merge pull request #1249 from briaguya-ai/exclude-all-locations 
add ability to exclude any location
 2022-08-19 16:44:24 -04:00
Garrett Cox
02049fb9e1 Another big push, mostly done 2022-08-19 14:38:12 -05:00
briaguya
708c9a00f4 formatting cleanup 2022-08-19 13:18:48 -04:00
briaguya
1c52b58917 remove var leftover from debugging 2022-08-19 13:17:05 -04:00
briaguya
3b951efac2 rename columns, use excluded locations 2022-08-19 12:54:27 -04:00
briaguya
c1455cedea fix broken seed parsing 2022-08-19 10:56:26 -04:00
briaguya
db7e1bf332 trying to figure stuff out 2022-08-19 10:36:54 -04:00
briaguya
0971b9aa78
only toggle menu with controller when controller nav enabled (#1043) 2022-08-19 15:46:11 +02:00
briaguya
0eee085981 save/load locations to a string cvar 2022-08-19 09:30:17 -04:00
aMannus
1ff006fa9e Fixed newline 2022-08-19 14:45:55 +02:00
aMannus
596d4cd392 More names 2022-08-19 14:45:18 +02:00
aMannus
7639c0f2ed Moved code to randomizer.cpp, fixes special chars 2022-08-19 14:41:20 +02:00
briaguya
815f5a9101 don't filter on right 2022-08-19 06:38:39 -04:00
briaguya
f818380079 fix performance issues 2022-08-19 06:30:52 -04:00
Garrett Cox
252f5fe68a Initial work towards cleaning up item tracker 2022-08-19 03:59:06 -05:00
briaguya
7f62d00200 fix double scrollbar issue 2022-08-19 04:53:35 -04:00
Sarge-117
64b7dac91b Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-18 22:13:51 -07:00
Christopher Leggett
3db2ce7085
Updates Zora's Sapphire Cutscene to use GetItemEntry 2022-08-18 22:06:28 -04:00
Christopher Leggett
35c2781efb
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-18 21:49:45 -04:00
briaguya
11a8dc85ee filter on one side, trees on both 2022-08-18 15:50:25 -04:00
briaguya
fb3320c3ed use macro for rco 2022-08-18 15:15:34 -04:00
briaguya
7fdb194dad refactor location visibility filtering 2022-08-18 14:11:22 -04:00
qurious-pixel
9bc6aac81e
MacOS OTR (#973) 2022-08-18 19:40:41 +02:00
briaguya
dd9acbbb43 use ordered map to help arrange checks in imgui 2022-08-18 12:19:57 -04:00
lilDavid
170b759572 Make Bombchus buyable without a wallet 2022-08-18 10:38:49 -05:00
briaguya
5ac69e0bd8 start filtering 2022-08-18 08:48:24 -04:00