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
806 Commits 6 Branches 52 Tags
6c3fff741269c070da09d0a8ea23cde6973adfc4
Commit Graph

806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Leggett 6c3fff7412 Fixes Link's Pocket items. 2022-08-13 22:56:46 -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
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
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
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
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
Christopher Leggett 4787f2f98b Removes some commented out code. 2022-08-10 21:00:52 -04:00
Christopher Leggett dcb8e21314 Replaces ::find with ::at and adds exception handling 2022-08-10 20:57:47 -04:00
Christopher Leggett 6e37897449 Removes unused function override 2022-08-10 20:28:44 -04:00
Christopher Leggett 17c9ce7804 Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework 2022-08-10 20:23:27 -04:00
Kenix3 15fba97949 Fixes some missed conversions of Console class singleton within the class itself. 2022-08-10 00:38:56 -04:00
Kenix3 6766719969 Fixes issue in Apple builds where imgui was referring directly to Console.Commands 2022-08-10 00:38:56 -04:00
Kenix3 6484d9354d Fixes incorrect command string when adding basic console commands. 2022-08-10 00:38:56 -04:00
Kenix3 23fb885e09 Console class is now a proper object oriented class. 2022-08-10 00:38:56 -04:00
Kenix3 81cd594704 Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
Kenix3 797d9fab7c GameOverlay command handler no longer uses SPDLOG and prints to console. 2022-08-10 00:38:56 -04:00
briaguya 96c2033361 fix linux release mode crash (#1124) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-09 22:50:25 -04:00
Kenix3 7b11509010 Fixes missed Switch specific invocation of old Console logging macros. 2022-08-09 22:34:16 -04:00
Kenix3 a4804d7290 No longer passing in C strings to SendInfoMessage formatted overload. 2022-08-09 22:34:16 -04:00
Kenix3 5751b5c278 debugconsole now uses console output functions. 2022-08-09 22:34:16 -04:00
Kenix3 f97f9ae422 Sets default value of ConsoleLine channel to "Console" 2022-08-09 22:34:16 -04:00
Kenix3 c7ccd6dbff LUS Cleanup: Strips out the logging system created for the console 
Properly routes SPDLog to the console.
Creates an API to be able to send command responses back to the console.
Cleans up the console UI, hiding options when not needed.
Removes stdout console sink for Windows.
 2022-08-09 22:34:16 -04:00
Kenix3 1f351418e1 Removes a couple printf in favour of SPDLOG calls. 2022-08-09 22:34:16 -04:00
aMannus e4b58e5a0c TWEAK: Layout/styling overhaul for the F1 menu (#1026) 
* First pass of UX changes

* More padding/styling/layout

* More styling

* Moar styling

* Some more styling

* Implemented padding helpers

* More styling, added closing buttons to windows

* Fixed merge conflict mistake

* Fixed new enhancements

* Hopefully fix jenkins errors

* Changed button behaviour, more styling

* Tiny code cleanup

* Change buttons from close/open to > when open

* Small button spacing fix

* Small styling changes after merge

* Small fix after merge mistake
 2022-08-09 02:16:45 -04:00
Kenix3 0d9c390526 Removes no longer desired commented code. (#1105) 2022-08-08 21:53:36 -04:00
Kenix3 b924831eba Merge pull request #1104 from briaguya-ai/rachael-to-zhora 
rachael -> zhora
 2022-08-08 21:53:04 -04:00
briaguya 317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
briaguya fa090c51f6 Merge pull request #831 from leggettc18/custom-messages 
System for Creating and Storing Custom Messages
 2022-08-08 21:24:48 -04:00
Christopher Leggett e63d84bd7d Adapts this branch for cmake building. 2022-08-08 21:14:29 -04:00
Kenix3 5581f45050 Adds instructions for Visuals Studio 2019 2022-08-08 21:01:46 -04:00
Josh Bodner b6934b34db Re-add Windows dependencies to build instructions (#1102) 2022-08-08 20:04:55 -04:00
sholdee 5453c68399 [ci] docker improvements (#1101) 2022-08-08 19:59:43 -04:00
aMannus 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
th-2021 c803ff65ce fix path to ZAPD (#1092) 2022-08-08 19:58:43 -04:00
InfoManiac742 0e10b59307 Update z_kaleido_item.c (#1046) 2022-08-08 19:58:01 -04:00
InfoManiac742 4bf4ad3359 Update z_en_ru1.c (#1042) 2022-08-08 19:56:56 -04:00