mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 17:41:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,081 Commits 6 Branches 52 Tags
202805531f2c0416ef65d605bb4fdd67c8ea5aed
Commit Graph

1081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Leggett 202805531f Fixes issues with approaching bottleable items. 2022-08-14 18:40:48 -04:00
Christopher Leggett d541ea3b39 Another Skulltula Ice Trap fix. 2022-08-14 18:25:09 -04:00
Christopher Leggett ca54853f11 Merge pull request #1 from aMannus/tokensanity-code-cleanup 
Tokensanity code cleanup
 2022-08-14 17:35:07 -04:00
aMannus 8842d1ec0d Fixed newline end of file 2022-08-14 23:12:00 +02:00
aMannus 5f1c365a0c Eliminated copy pasta 2022-08-14 23:11:11 +02:00
Christopher Leggett 3f55409bee Should fix Skulltula Ice Traps. 2022-08-14 14:57:00 -04:00
Christopher Leggett e451d13e2b Some more changes to account for Skulltulas in new system. 2022-08-14 14:17:55 -04:00
Christopher Leggett 3bf92a348c Fixes crashes with Audio_PlayFanfare_Rando. 2022-08-14 13:19:41 -04:00
Christopher Leggett 203785f76a Fixes Link's Pocket being a Dungeon Reward from Impa. 2022-08-14 12:22:24 -04:00
Christopher Leggett 6d7498829d Wraps up a few missed type changes. 2022-08-14 11:54:43 -04:00
Christopher Leggett 0604dbfef8 Cleans up and updates item fanfares. 2022-08-14 11:43:25 -04:00
Christopher Leggett 1ab4b23011 Should fix some Skulltula oddities. 2022-08-14 11:26:00 -04:00
Christopher Leggett baa17dda27 Fixes build error for Windows and Mac 2022-08-14 01:32:31 -04:00
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