mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 09:31:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,068 Commits 6 Branches 52 Tags
f7707a3890da6eef3ddcf6559399bbb9d8fade53
Commit Graph

1068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Leggett f7707a3890 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-14 01:02:12 -04:00
Christopher Leggett 5998dcff7a Simplifies sram init for rando-specific items 2022-08-13 23:27:03 -04:00
Christopher Leggett 6c3fff7412 Fixes Link's Pocket items. 2022-08-13 22:56:46 -04:00
Christopher Leggett 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
Christopher Leggett 9940c9ed28 Fixes too many arguments error. 
Not sure why this didn't fail to build on Windows before.
 2022-08-13 16:38:33 -04:00
Christopher Leggett 76282830d3 Fixes LACS/Prelude situation... again. 2022-08-13 15:30:18 -04:00
Christopher Leggett 7cef38a70a Fixes "static drops" (i.e. sticks from withered babas) 2022-08-13 13:05:50 -04:00
Christopher Leggett 9ed7feb30a Realized I had the bgm conditions wrong. 2022-08-13 12:13:46 -04:00
Christopher Leggett 105eac4e53 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.
 2022-08-13 11:49:03 -04:00
Christopher Leggett 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
Christopher Leggett 58c9f64a16 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
 2022-08-13 01:44:19 -04:00
Christopher Leggett 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
Christopher Leggett 0c334615b6 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
 2022-08-13 00:38:09 -04:00
briaguya 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
Christopher Leggett 4cc492f383 Fixes some funky formatting that got committed earlier. 2022-08-13 00:28:19 -04:00
Christopher Leggett 69086f58c2 Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00
briaguya 8c965b4dc7 Merge pull request #1171 from aMannus/item-tracker-improvements 
Item tracker improvements
 2022-08-12 23:39:00 -04:00
briaguya 82f69a0f09 Merge pull request #1173 from lilDavid/adult_trade_fixes 
Adult trade shuffle bugfixes
 2022-08-12 23:37:28 -04:00
lilDavid 92d0d3e35e Let Cojiro crow in Adult Trade Shuffle 2022-08-12 17:12:52 -05:00
lilDavid e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
lilDavid 282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05:00
aMannus 4c9f2493d7 Brought CVar naming in line with others 2022-08-12 22:51:40 +02:00
lilDavid 947a97608c Save Editor Adult Trade Shuffle bugfixes: 
- Having multiple items with the collapsing header open rapidly cycles trade items
 - Unchecking any item's checkbox cycles the trade item (it should only do so if it's the one you've selected)
 - Setting the adult trade slot sets the wrong items' flags
 - Emptying the adult trade slot doesn't reset all trade items' flags
 2022-08-12 15:43:08 -05:00
aMannus 3689abd01f One more small code cleanup 2022-08-12 22:39:12 +02:00
aMannus 5f2bcb39c9 Small code cleanup 2022-08-12 22:16:23 +02:00
aMannus 4d7982911e More fixes and code cleanup 2022-08-12 22:08:10 +02:00
aMannus ff64bc42fb First pass fixes item tracker save loading 2022-08-12 18:21:28 +02:00
aMannus aa7380fe06 Added missing double defense 2022-08-12 13:14:15 +02:00
Christopher Leggett 2077636c92 Inverts CheckContainsRandoItem to CheckContainsVanillaItem. 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940895135
 2022-08-11 21:39:30 -04:00
Christopher Leggett 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
Christopher Leggett 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
Christopher Leggett e9c193146c Removes commented out function. 2022-08-11 12:32:09 -04:00
Christopher Leggett 929f196ac8 Re-implements GIMESSAGE_UNTRANSLATED as macro 2022-08-11 12:29:47 -04:00
aMannus 1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
briaguya 5156ccbfd5 Merge pull request #1154 from aMannus/maps-compasses-name-change 
Rando: Small fixes for "Maps/Compasses"
 2022-08-11 04:17:21 -04:00
aMannus e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus 67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00
briaguya 0017168aa4 Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop 
add check for mask shop being open to mask select
 2022-08-11 02:30:44 -04:00
briaguya 388319deac add kak gate check for mask select 2022-08-11 02:01:25 -04:00
Christopher Leggett 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
briaguya 2af572aa30 add check for mask shop being open to mask select 2022-08-11 01:51:43 -04:00
briaguya b03d23f61f Merge pull request #1152 from briaguya-ai/develop-zhora 
zhora -> rando-next
 2022-08-11 01:36:05 -04:00
Christopher Leggett cb81023255 Renames, relocates, and implements ModIndex enum. 2022-08-11 00:38:28 -04:00
Christopher Leggett 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
Kenix3 d34a6d7666 Fixes error in LUS where there were multiple Vertex classes declared. 2022-08-10 23:14:29 -04:00
briaguya 7ea210aa63 Merge pull request #1147 from PurpleHato/RandoItemTrackerV2 
FIX: Rando Item Tracker non initialized small key were not transparent
 2022-08-10 22:30:49 -04:00
PurpleHato 9ccc7908fa FIX: Rando Item Tracker non initialized small key were not transparent 2022-08-11 04:21:28 +02:00
briaguya 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
briaguya 23b2ed7bee Merge pull request #1146 from PurpleHato/KeysanityTranslation 
ADD: French Translation for Rando Custom Messages
 2022-08-10 21:25:28 -04:00