mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,411 Commits 3 Branches 36 Tags 132 MiB
Commit Graph

217 Commits

Author SHA1 Message Date
Garrett Cox 5961c33ba9 Rename GetItemFromGet and move obtainability checks to a separate function 2022-08-29 15:26:27 -05:00
Christopher Leggett 9c43f7225b
Adds captilization to French spoilerfile strings. 2022-08-27 18:45:21 -04:00
Christopher Leggett 6aaef2179b
More Cleanup 2022-08-27 18:26:25 -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 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 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 71e7fb9d70
Merge rando-next and rename scrub message table to merchant message table 2022-08-25 18:02:00 -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
Christopher Leggett 5043309c63
Adds basic german text for bean salesman 2022-08-25 16:43:57 -04: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
Garrett Cox 936513a9c4 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity 2022-08-25 13:02:47 -05:00
Christopher Leggett efd4ceb636
Colors keywords in bean salesman text. 2022-08-25 12:46:08 -04:00
Christopher Leggett 00838cb5b6
Adds french text for the bean salesman 2022-08-25 12:39:34 -04: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 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
aMannus 7de2c584b4 Rando menu tweaks 2022-08-25 11:11:24 +02:00
aMannus 050a9db01d Fix BGS dupe check 2022-08-25 08:38:42 +02:00
Christopher Leggett db6a397195
Adds new text for the bean salesman 2022-08-24 17:58:01 -04:00
Christopher Leggett fe7aedc80d
Adds getItemEntry for Magic Bean Pack 2022-08-24 15:44:31 -04:00
Christopher Leggett 02a8ba8bb9
Fixes incorrect key order in DrawSmallKeys. 2022-08-24 13:16:14 -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
Garrett Cox c6c08522e6 Custom message for free items 2022-08-24 10:19:41 -05: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 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
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
aMannus e2633c9be1 Moved name variables out of InsertRupeeName() 2022-08-23 23:36:59 +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 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
Christopher Leggett e1b403a31b
Removes unused `Randomizer_GetItemIdFromGetItemId`. 2022-08-21 15:14:50 -04: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
Sarge-117 ccce87cb89 Change int to u8 
Jenkins plz
 2022-08-20 11:16:46 -07: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 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 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 0eee085981 save/load locations to a string cvar 2022-08-19 09:30:17 -04:00