Commit Graph

1949 Commits

Author SHA1 Message Date
aMannus 06cd814405 Default hearts color 2023-11-29 11:09:33 +01:00
aMannus 2a886a4a0e Default magic color, ornament hunt tracker icon, small fix 2023-11-29 10:39:26 +01:00
aMannus 58977e72fa Merge branch 'develop-macready' into christmas-tree 2023-11-29 09:56:57 +01:00
briaguya 818addfdda delta bump (#3465) 8.0.3 2023-11-29 01:32:15 -05:00
Malkierian f14c390364 [Vanilla Fix] Slow Down Darunia's Dance (#3438)
* Fix Darunia's dancing animation speed (static for now; needs toggle later).

* Moved previous code to toggleable fix in enhancements. Tweaked speed factors, partially successful.
2023-11-29 00:38:48 -05:00
Adam Bird dd5e72a023 limit entrance discovered saving to end of operation (#3459) 2023-11-29 00:29:25 -05:00
rozlette d523b104d8 Change declaration of Morpha tentacle verts to combine them all and avoid overlaps that result in dropped verts 2023-11-28 21:09:34 -08:00
Garrett Cox fdcd9a7508 Race Integrity QoL (#3445)
* Add gDisableChangingSettings

* Add support for dropping a config file to overwrite CVars
2023-11-28 23:42:37 -05:00
Malkierian c4f34624ba Flag tracker (#3447)
* Hook into flagset hooks for processing check tracking. Has some manual workarounds (some breaks still need to be found).
Remove areaChecks and looping functionality as redundant.

* Additional vanilla handling.

* Fix tracker not showing MQ checks in MQ non-rando.
Fix tracker marking non-MQ variants of dungeon checks (e.g. map chest, etc) when collecting in MQ.

* Set all areas to spoiled if not rando.

* Revert attempt to spoil in randomizer based on MQ dungeon count as I don't know how that works at the moment.

* Restore and update spoiling based on MQ dungeon settings (none, selection, or count of 12).
Fix Anju As Adult check.

* Remove Anchor-specific code :baguette:

* Use `ClearAreaTotals()` in `Teardown()` instead of the duplicate code there.

* Update to `ClearAreaChecksAndTotals()` with `vec.clear()` added.

* Fix type spoiling again. Now spoils on 0 MQ dungeons, not rando, if the option is enabled in check tracker settings, selection, or set number of 12.
Fix vanilla checks being marked collected in MQ dungeons.

* Fix 100 GS check.

* ACTUALLY fix 100 GS: change flag type to `RandomizerInf()` in `item_location.cpp`, add RC to RandoInf for it to the table. Also don't send GI for flag if father, falsely triggers ZR frogs minigame.

* Fix gravedigging tour tracking.

* Fix membership card check tracking.
Change scene and flag values to any existing enums.
Clarifying formatting for the checking loop vOrMQ conditions.

* Fix Gravedigging Tour tracking.
Simplify Always Win Gravedigging Tour and Fix Gravedigging Tour Glitch applications.
Modified all necessary paths to use vanilla GDT PoH collection flag instead of randomizer variant.

* Fix Kak Potion Shop being "seen" when entering as child.
2023-11-28 21:25:48 -05:00
Adam Bird 33fe8776bb Fix bugs dont despawn cheat to work with soil patches (#3457) 2023-11-29 02:02:45 +01:00
briaguya 02256fac66 bump LUS to 1.4.0 (#3461) 2023-11-29 01:37:54 +01:00
briaguya 621afc99f0 sort patch otrs (#3430) 2023-11-29 01:34:00 +01:00
Caladius f45c43abea Merge pull request #16 from garrettjoecox/fixes
Fixes
2023-11-28 16:40:39 -05:00
Garrett Cox 073daa8488 Fixes 2023-11-28 15:37:55 -06:00
inspectredc 9d215b6dce Separate Arrows Equip Dupe Fix (#3450)
* add gseparatearrow check for equip dupe fix

* update gseparatearrows tooltip
2023-11-28 22:13:00 +01:00
aMannus 420bdab328 Random Enemy Sizes fixes (#3452) 2023-11-28 14:30:36 -05:00
Caladius 3809f4f05f Merge pull request #14 from PurpleHato/ToTChristmas
ToT Christmas
2023-11-28 14:27:26 -05:00
Caladius 18961d9496 Merge pull request #15 from garrettjoecox/a-few-more-hats
A few misc changes
2023-11-28 14:27:10 -05:00
Adam Bird 717074ff86 Fix: Missing TextIDs for MQ PAL and change lava size (#3449)
* Fix text offset for MQ pal and add text ID asserts

* correct lava texture size
2023-11-28 20:11:03 +01:00
Garrett Cox 04dda555a9 A few misc changes 2023-11-28 00:20:57 -06:00
PurpleHato 5fdd828fe6 ToT assets + room display check 2023-11-28 05:06:28 +01:00
Caladius 69c4936d2d Merge pull request #12 from garrettjoecox/snoball
Add snowballs to kak & hyrule field
2023-11-27 18:09:17 -05:00
Caladius 3106947d50 Merge pull request #13 from aMannus/christmas-tree
Update to develop-macready and fix end title camera for christmas ornament hunt
2023-11-27 18:07:27 -05:00
Malkierian 3ab16b70c2 Changed all checks for !gPlayState to !GameInteractor::IsSaveLoaded() in mods.cpp for all the cheats, and added the same full check to others that really didn't need to be running outside of a game (like infinite rupees, magic, health, etc), and clear any triggering CVars. (#3441)
Changed `RegisterSwitchAge()` to clear the CVar instead of setting it to 0.
2023-11-27 23:00:25 +01:00
aMannus acac97ed16 Switch tunics and kokiri colors to be red by default 2023-11-27 21:52:43 +01:00
aMannus 48643c6aea Merge branch 'develop-macready' into christmas-tree 2023-11-27 12:51:44 +01:00
aMannus 17df3733c9 Fix Christmas Ornament final camera shot 2023-11-27 12:51:12 +01:00
Garrett Cox 435f8f7363 Add snowballs to kak & hyrule field 2023-11-27 02:25:15 -06:00
Malkierian 3cf9d655a7 Disable Fix Vine Fall when Climb Everything is enabled (#3439)
* Disable Fix Vine Fall when Climb Everything is enabled.

* Remove option disabling.
2023-11-26 11:34:54 -05:00
Caladius 523eeed956 Merge pull request #11 from garrettjoecox/test-christmas
Add festive hats & a few debug tools
2023-11-25 19:54:41 -05:00
Garrett Cox 8476896ebf Add festive hats 2023-11-24 12:14:22 -06:00
inspectredc 95f27ace2e Fix kokiri sword unequipping when using switch age cheat/enhancements (#3415)
* test fix for ks unequip

* remove unnecessary brackets
2023-11-24 09:40:42 -05:00
Salt d50ad4779d Fix #3417 Symlinks to Directories in Mods Dir Aren't Traversed (#3418) 2023-11-24 09:40:30 -05:00
Adam Bird f2df029efa fix: skybox crash for mask shop (#3427) 2023-11-24 09:38:45 -05:00
Garrett Cox bdb201201e Fix audio cutoff issues (#3428) 2023-11-24 09:38:13 -05:00
Adam Bird f4e4545180 Re-implement King Dodongo's Lava texture effects (#3434)
* fix alt backgrounds not always loading

* include gfx lookup with the original unload

* Add hook for alt toggle

* handle cpu modified texture for kd lava

* malloc array instead of illegal initialize
2023-11-23 09:07:30 -05:00
MelonSpeedruns d2adf55da3 removed patch file 2023-11-17 10:18:42 -05:00
MelonSpeedruns ba2d136d63 Merge branch 'ChristmasWork' into test-christmas 2023-11-17 10:18:00 -05:00
MelonSpeedruns bf5e4a6fa6 Cucco Lady hat 2023-11-17 10:17:15 -05:00
Caladius 4d77e5c2c3 Merge pull request #9 from aMannus/christmas-tree
Merge develop, big cleanup, change checks for non-triforce hunt, add more Dana kak models
2023-11-16 17:21:53 -05:00
aMannus c829dfb4ec Big cleanup, change checks for non-triforce hunt, add more Dana kak models 2023-11-16 21:37:41 +01:00
aMannus 5abd7e4957 Merge branch 'ChristmasWork' into christmas-tree 2023-11-16 20:18:42 +01:00
aMannus 1f5d81a8bf Merge branch 'develop' into christmas-tree 2023-11-16 20:18:10 +01:00
Caladius 6ba73171da Big boi commit, v2 Dana overlay DLs, un-unaliving Kak NPCs and moving them to better locations. Added Melons Wonder Item for the star and cleaned up their code for it. among other changes... 2023-11-16 13:55:37 -05:00
briaguya 0ddb0711ad Version bump to MacReady Charlie (#3406) 8.0.2 2023-11-15 23:22:09 -05:00
briaguya 3234256b03 bump lus (#3405) 2023-11-15 22:45:09 -05:00
inspectredc d8a7a6c764 Use Correct Player Boot Enums in CC (#3403) 2023-11-15 20:38:21 -05:00
Caladius f71cc5f1e1 Merge pull request #8 from aMannus/christmas-tree
Christmas Decorations base actor
2023-11-15 12:36:09 -05:00
aMannus ebaac0b063 Christmas Decorations base actor 2023-11-15 18:33:00 +01:00
Garrett Cox 2075213544 Merge pull request #3399 from HarbourMasters/develop-macready
macready -> dev
2023-11-14 22:24:48 -06:00