596d4cd392
More names
2022-08-19 14:45:18 +02:00
7639c0f2ed
Moved code to randomizer.cpp, fixes special chars
2022-08-19 14:41:20 +02:00
815f5a9101
don't filter on right
2022-08-19 06:38:39 -04:00
f818380079
fix performance issues
2022-08-19 06:30:52 -04:00
7f62d00200
fix double scrollbar issue
2022-08-19 04:53:35 -04:00
11a8dc85ee
filter on one side, trees on both
2022-08-18 15:50:25 -04:00
7fdb194dad
refactor location visibility filtering
2022-08-18 14:11:22 -04:00
5ac69e0bd8
start filtering
2022-08-18 08:48:24 -04:00
dbb4e3eefc
start on tree view
2022-08-18 08:20:52 -04:00
e500db810b
Code cleanup + more names
2022-08-18 13:55:59 +02:00
289a6e5a82
start on RC object stuff
2022-08-18 06:15:02 -04:00
bb6135fd2b
Spacing
2022-08-17 22:07:51 -07:00
e25fcc645b
More names, fixed translations
2022-08-17 23:57:31 +02:00
c1cec5a44a
First fully working implementation
2022-08-17 23:30:51 +02:00
f9766fa4a6
Initial language support and setup for randomizing
2022-08-17 22:30:21 +02:00
a51b844a23
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-17 15:43:42 -04:00
584f9d16f0
Fix line break
2022-08-17 11:26:07 -07:00
6862e400f5
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-17 11:11:00 -07:00
2c144c3aa6
Fix typo, fix Master Sword text
2022-08-17 11:10:37 -07:00
907871915d
fix question mark
2022-08-17 11:07:03 -07:00
3fb582a02b
ADD: BAGUETTE
2022-08-17 20:00:20 +02:00
8cb50a2ee1
Open Bombchu Bowling with chus
2022-08-17 10:44:34 -05:00
ae8c7cb509
add excluded locations set
2022-08-17 11:08:11 -04:00
55f71457d8
initial proof of concept
2022-08-17 16:45:19 +02:00
f431f7df72
Add Bombchus in Logic rando setting and implement progressive chus
2022-08-17 08:22:09 -05:00
5605542452
start playing with imgui filters
2022-08-17 09:03:27 -04:00
b6d6ede520
Fixes color replacement from being saved to the save file.
...
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
2022-08-16 23:04:14 -04:00
4be473fede
Add German translations
...
Thanks to Menzelmeister on Discord for translating to German
2022-08-15 14:02:48 -07:00
0e2530cd49
Fixes Ruto's Letter.
...
It was accidentally getting classified as a rando item.
2022-08-14 20:43:59 -04:00
76f25c18c0
Fixes Ruto's Letter.
...
It was accidentally getting classified as a rando item.
2022-08-14 20:15:33 -04:00
fa19df9201
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-14 10:16:35 -07:00
baa17dda27
Fixes build error for Windows and Mac
2022-08-14 01:32:31 -04:00
f7707a3890
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-14 01:02:12 -04:00
c8d085cb49
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
...
Hopefully everything works here. Need to do some testing.
2022-08-13 22:43:19 -04:00
7cef38a70a
Fixes "static drops" (i.e. sticks from withered babas)
2022-08-13 13:05:50 -04:00
d167f4a263
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.
2022-08-13 11:47:12 -04:00
11db45eef6
Extends GetItemEntry to include getItemId
...
Also adapts some existing calls for both the entry and the id to only
get the entry.
2022-08-13 01:32:36 -04:00
f70c1ff88a
Merge pull request #1160 from aMannus/rando-better-dupe-handling
...
Rando: Added more items to have dupe handling
2022-08-13 00:30:12 -04:00
69086f58c2
Cleanup, bugfixes, removing the `- 1`s from `z_player.c`
2022-08-13 00:22:34 -04:00
aa7380fe06
Added missing double defense
2022-08-12 13:14:15 +02:00
2077636c92
Inverts CheckContainsRandoItem to CheckContainsVanillaItem.
...
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940895135
2022-08-11 21:39:30 -04:00
e1084c0d6d
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
2022-08-11 21:24:03 -04:00
4b7548e998
Throws exception if an invalid itemID is used
...
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857
2022-08-11 21:16:39 -04:00
1e36de19aa
Added more duplicate item handling
2022-08-11 11:57:43 +02:00
e7c793df9b
Fixed comment too
2022-08-11 08:57:18 +02:00
ac70d92b31
Changed maps/compasses location in UI
2022-08-11 08:55:29 +02:00
67edf574f2
Rename maps/compasses
2022-08-11 08:35:37 +02:00
0431dce989
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.
2022-08-11 02:01:01 -04:00
cb81023255
Renames, relocates, and implements ModIndex enum.
2022-08-11 00:38:28 -04:00
cdd4628d7a
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.
2022-08-11 00:24:34 -04:00
85ad427b99
Merge pull request #1141 from aMannus/rando-gerudo-bridge-fix
...
Rando: Fix gerudo card incorrectly given to link when bridge is open
2022-08-10 21:44:49 -04:00
23b2ed7bee
Merge pull request #1146 from PurpleHato/KeysanityTranslation
...
ADD: French Translation for Rando Custom Messages
2022-08-10 21:25:28 -04:00
d73ab42641
ADD: French Translation for Rando Custom Messages
2022-08-11 03:02:36 +02:00
4787f2f98b
Removes some commented out code.
2022-08-10 21:00:52 -04:00
17c9ce7804
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework
2022-08-10 20:23:27 -04:00
1947278fdf
Fixes gerudo card bug with open bridge
2022-08-10 23:14:31 +02:00
e259e87588
ADD: Enable Glitch-Useful Cutscenes option to rando
2022-08-10 21:51:10 +02:00
0f6e7ede48
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-10 11:15:37 -07:00
af03a80ad3
Create const "NaviMsgCount"
...
So the number of messages doesn't have to be changed in 3 places when adding new entries
2022-08-10 11:06:38 -07:00
d523ba5127
complete mask quest
2022-08-10 06:28:10 -04:00
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
...
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
7f62802aef
Man I really had to split that up into three commits.. Fix from removing LACS setting
2022-08-10 01:19:21 -05:00
8abfa4821f
Anotha one (removing LACS stuff)
2022-08-10 01:17:19 -05:00
ec7e3d350a
Remove LACS settings for ganons key for now
2022-08-10 01:15:00 -05:00
e2ff584839
Add remaining tips
...
All the sample hints are now working under the new message system
2022-08-09 20:13:39 -07:00
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle
2022-08-09 20:40:00 -05:00
3c4405347d
Remove old stuff + add test messages
2022-08-09 18:35:39 -07:00
b4c9f4aa6e
Test switch to new message system
...
Testing setting up the table and calling the messages
2022-08-09 16:07:58 -07:00
608f493c5b
Update descriptions and defaults
2022-08-09 07:53:15 -05:00
bbce60e71c
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-09 00:01:46 -05:00
3472e83250
Use new custom message system, skulltula drops still broken text
2022-08-09 00:00:30 -05:00
e8c4378d17
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 22:47:29 -05:00
b9e18519a2
Removes Skulltula text auto-dismiss in tokensanity
...
More precisely, removes the auto-dimissal from the Skulltula
textbox when in a rando save and any token shuffle is on.
Bonus Fix: parses the Skullsanity setting from the spoilerfile,
which wasn't happening before.
2022-08-08 23:40:02 -04:00
ffc36efe50
Reimplements FOWL ice trap text boxes.
...
They got lost in the custom-messages merge. Reimplemented them
in the custom-messages system.
2022-08-08 23:11:45 -04:00
8410a79b26
Merge branch 'rando-next' into zhora-to-next
2022-08-08 22:27:04 -04:00
816fac6c06
Merge branch 'develop-zhora' into zhora-to-next
2022-08-08 22:23:06 -04:00
317de33a8b
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-08 21:43:04 -04:00
e63d84bd7d
Adapts this branch for cmake building.
2022-08-08 21:14:29 -04:00
4ea7f8371f
Rando: Zelda sequence fixes ( #1095 )
...
* Fixed zelda sequence oddities
* Fixed code inconsistency
* Adressed review comments
* Adressed review comments, removed unneccesary entrance skip
* Addressed some more review comments
* tiny cleanup
2022-08-08 19:59:06 -04:00
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
8f55dd0624
Add support for shuffling maps and compasses
2022-08-08 14:07:02 -05:00
58da0a5aa2
Some more partial ice trap fixing that wasn't pushed earlier
2022-08-07 17:19:26 -04:00
8b59466ce5
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-07 15:41:44 -05:00
0efb008213
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.
2022-08-07 13:17:06 -04:00
f7267be29a
Change shuffle cows to checkbox and remove extra line
2022-08-07 02:10:54 -05:00
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs
...
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
ea9d76621c
Fix issue with keysanity values not loading from spoiler file
2022-08-06 22:01:55 -05:00
c8289f5946
Skip lines in Adult Trade Shuffle description
2022-08-06 15:38:32 -05:00
77f2e56039
Support starts with and more options on ganons boss key
2022-08-06 14:07:46 -05:00
6603a9a474
Add adult trade shuffle to randomizer
2022-08-06 12:58:08 -05:00
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
b420638267
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-06 00:48:55 -05:00
5346217af3
Misc fixes
2022-08-06 00:29:05 -05:00
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04:00
4a78375c8f
And like magic, keysanity working :D
2022-08-05 23:08:46 -05:00
9a145221ec
Remove newline
2022-08-05 21:02:02 -05:00
528dbcdc17
More suggested changes
2022-08-05 14:59:04 -05:00
5de662a326
Fix ice traps
2022-08-05 12:05:22 -05:00
ed3cddbeaf
Add option to shuffle frog song rupees
2022-08-05 09:52:11 -05:00
11d7a78e62
More changes from suggestions
2022-08-05 01:38:45 -05:00
93d0d7443a
LUS Cleanup: Removes GameSettings class. Moves code to Imgui. ( #1036 )
...
* LUS Cleanup: Removes GameSettings class. Moves code to Imgui.
* Fixes more strdup problems and finalized removal of GameSetting.
* Reverts changes to Directory.h
* Update Directory.h
* Fixes PR.
* Update Directory.h
* Update rando_main.cpp
2022-08-05 01:03:11 -04:00
e9d1bf2d56
Initial work for keysanity
2022-08-04 22:28:21 -05:00
63ace6a4cc
Change ItemTableID to be uint16_t so we can use ModIndex for it.
2022-08-04 22:50:55 -04:00
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge
2022-08-04 20:54:51 -04:00
587147dc40
Remove count of cows from tooltip
2022-08-04 19:44:08 -05:00
ebcf574085
Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows
2022-08-04 19:42:58 -05:00
1da655adb5
Resolve merge conflicts with develop-zhora
2022-08-03 23:13:53 -04:00
8c2feb537d
Use 454+cowId to identify cows in randomizer.cpp
2022-08-03 11:26:14 -05:00
41ea5c6685
Adds rando item table and way to differentiate tables in GetItemEntry.
2022-08-03 08:15:17 -04:00
c18203878b
Add shuffleCows options for randomizer
2022-08-03 00:14:38 -05:00
a007bfd14a
Merge changes from develop-zhora
2022-08-02 19:17:08 -04:00
31af53957d
TWEAK: de de repetition
2022-08-03 00:58:51 +02:00
f281a07dfb
TWEAK: French dup entry
2022-08-03 00:52:14 +02:00
f7abf79bf3
update rando tooltips to utilize auto newlines
2022-08-02 13:26:26 -04:00
d1ddc2a0c3
Merge branch 'develop-zhora' into zhora-to-rnext-merge
2022-08-02 13:02:13 -04:00
c404d95b67
Adressed review comments
2022-08-02 13:38:17 +02:00
e479cb424b
Moved logic rules dropdown
2022-08-02 12:35:52 +02:00
44522e6518
merge rando-next
2022-08-02 12:31:24 +02:00
480053dfaa
Exposes FormatCustomMessage and uses it in FormatJsonHintText.
2022-08-01 23:05:29 -04:00
eae97cff79
Addresses most of bria's comments.
2022-08-01 21:44:28 -04:00
7b1b362e5a
More styling & layout changes
2022-08-01 13:23:21 +02:00
f7b8ad7eee
Some more padding
2022-08-01 08:50:11 +02:00
7a45380123
Automatically break long tooltip lines ( #925 )
...
* Remove manual newlines from the middle of sentences in tooltips and automatically break long lines instead
* Move split functionality into header so randomizer tooltips can use it
* Rewrite logic to be O(n)
* Found another typo
* Move helper function to libultraship to (hopefully) get Jenkins happy
* Fix typo I made when fixing the typo before
* Remove unneeded header
* Parameterize line length in case variable line length is desired in the future
2022-07-31 21:40:26 -04:00
2f9874c68f
Cleanup.
2022-07-31 19:31:22 -04:00
8b023188a0
Updated default window size to accomodate padding
2022-07-31 18:15:37 +02:00
da464c596e
Added padding to rando settings menu
2022-07-31 17:59:51 +02:00
ee1bdd6899
Added no logic
2022-07-31 09:30:04 +02:00
822476373b
Renames CustomMessage to CustomMessageManager
2022-07-25 22:33:38 -04:00
cd01e8b778
Moves deku scrub messages into CustomMessageTable.
2022-07-25 21:31:17 -04:00
2e450648a8
Reverted default values rainbow bridge settings
2022-07-25 18:28:59 +02:00
780e9f4669
Fixes storage of altar and ganon hints/text.
...
Only one language is stored in gSaveContext at the moment so store the one language in all 3 CustomMessageEntry languages.
2022-07-24 19:23:54 -04:00
a33c3d606a
Fixes minor oversight from previous commit.
2022-07-24 18:54:05 -04:00
a21998c489
Does some refactoring of rando custom message registration
...
The goal was less verbosity when adding new get-item messages later.
2022-07-24 18:47:55 -04:00
48d97975a0
Fixed crash
2022-07-24 00:28:54 +02:00
3758d8bb8d
Removed bool declaration
2022-07-23 20:36:46 +02:00
29b944df92
Fixed incompabitility options (again)
2022-07-23 20:00:32 +02:00
f49d397581
Removed unneccesary line
2022-07-23 19:22:22 +02:00
2d2d558657
Removed CVar updating in UI
2022-07-23 18:44:15 +02:00
59531f89b1
Adressed first comments
2022-07-23 11:28:07 +02:00
061c8c9fff
Small fix handling incompatible options
2022-07-22 21:59:09 +02:00
330b025453
Fixed minimum amounts rainbow bridge
2022-07-22 21:35:18 +02:00
af877a4cc6
Added +- buttons to sliders
2022-07-22 21:22:04 +02:00
0f4e65eb46
Removed unneeded check after UI changes
2022-07-22 19:58:27 +02:00
cbf4a9267f
Irmproved handling incompatibilities
2022-07-22 18:44:46 +02:00
0ee898bd56
Improved disabling of settings
...
For Skip Child Zelda (and possibly other options in the future)
2022-07-22 12:21:12 +02:00
97c37eb46a
Changed default values
...
Shuffle/open settings now align with the first option which makes it the option closest to vanilla.
Also added default values for rainbow bridge settings so they align with the max value instead of 0.
2022-07-22 09:48:30 +02:00
b5dc097587
Cleanup and move most hint logic to CustomMessage.
...
Haven't removed where rando stores the hints for itself and the ganon and altar hints are still pulled from the randomizer class' local storage, but gossip stone hints are pulled from the custom message table now.
2022-07-21 13:05:15 -04:00
6f082e1769
Fixed rename breaking maps/compasses
2022-07-21 17:32:28 +02:00
9ce552659a
Changed iceTrapped var name/type and tooltip
2022-07-21 12:22:36 +02:00
2c5bdbfd4b
Merge branch 'rando-next' into spoopy-spiders
2022-07-21 08:30:31 +02:00
aMannus