Commit Graph

919 Commits

Author SHA1 Message Date
aMannus 58977e72fa Merge branch 'develop-macready' into christmas-tree 2023-11-29 09:56:57 +01: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
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
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
Caladius 3809f4f05f Merge pull request #14 from PurpleHato/ToTChristmas
ToT Christmas
2023-11-28 14:27:26 -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
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
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
Adam Bird f2df029efa fix: skybox crash for mask shop (#3427) 2023-11-24 09:38:45 -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 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
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
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
Garrett Cox 044d32a46f Add gFixEyesOpenWhileSleeping (#3365) 2023-11-14 20:47:07 -05:00
Josh Bodner fb45b66903 Fix magic being zeroed out when using fast file select (#3389)
* Move to frame counter init to a place that fast file select also touches

* Undo removing old fix

* Reset on gameover
2023-11-14 17:08:45 -05:00
Adam Bird e66eb8756d Fix: Prevent patching custom models (#3367)
* fix prevent patching custom models

* prevent patching chests textures for custom chest models

* add tooltip for cosmetic editor about custom models

* chest texture handling for alt toggles
2023-11-14 16:37:03 -05:00
Malkierian 4e9040d761 [Feature] Remove performDelayedSave functionality from Autosave (#3387)
* Removes delayed save functionality, making autosave work everywhere except Ganon and Chamber of Sages scenes.

* Change AutoSave comment to remove the scenarios we no longer block autosave in.

* handle temp B on saving outside of kaleido

---------

Co-authored-by: Adam Bird <archez39@me.com>
2023-11-14 16:35:19 -05:00
Malkierian 304016ddd2 [Feature Fix] Tunics stolen by like likes now removed from the item buttons (#3375)
* Extends `Assignable Boots and Tunics` functionality to check for and remove Goron and Zora tunics from item buttons when like likes steal them.

* Comment documentation.
2023-11-14 00:12:08 -05:00
Ralphie Morell cf88b3d2bf Fix edge case of MS shuffle (#3364) 2023-11-13 23:45:15 -05:00
PurpleHato dd6271ecae ADD: No HUD Heart animation (#3348)
* ADD: No HUD Heart Animation

I've seen this requested multiple times for modding purposes for the case of using "lifebars" instead of hearts

* TWEAK: Move it under the the mods

* REM: Whitespace

* REM: Whitespace2

* Tweak: Cvar Oppsie
2023-11-13 18:13:46 -05:00
Caladius dbd96ddf29 Merge branch 'develop' into ChristmasWork 2023-11-08 15:17:33 -05:00
aMannus 7064ac9ac0 Add star to tree 2023-11-07 09:37:02 +01:00
Adam Bird 460b3d02f5 [OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)
* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules
2023-11-06 16:44:49 -06:00
aMannus 10990bb616 Update tree model 2023-11-06 19:59:53 +01:00
inspectredc 8b78cb832a items tied to items rather than slots + dpad items now work (#2884) 2023-11-05 22:33:51 -06:00
krm01 127f2651df vanilla bugfix for wall climbing on edge of polys (#3358)
* vanilla bugfix for wall climbing on edge of polys

* rename missed vars

* add CVar toggle
2023-11-05 12:07:44 -06:00
Adam Bird 7e9efeeadb [OTR Archive] Store soh version in OTR files and verify on launch/ask to regenerate (#3218)
* parse sohver arg and store version file in otr

* parse args for soh.otr gen only

* pass soh version from built in extractor

* update launch scripts, cmake and extract steps to pass soh version

* check otr versions and error or ask to regenerate

* add wiiu core header for osfatal

* review feedback

* remove soh dummy version for lus change instead

* only configure linux script for linux

* change lus commit

* rename soh version to port version

* fix submodules

* bump OTRExporter

* clean up error messages for switch/wiiu

* strings not char array

* typo

* init wiiu before otr detection

* Add message for mac/linux extraction

* remove unneeded exits

* change version number types to u16 to fix 32bit devices

* bump otrexporter
2023-11-05 12:34:39 -05:00
Adam Bird 44ee6da0aa fix quest assignment (#3343) 2023-11-04 22:52:09 +01:00
aMannus 711b392884 Move ending to christmas tree code 2023-11-04 22:09:58 +01:00
Caladius 51459c2225 Despawn Kakariko objects only when in Triforce Hunt Mode, clean up GBK event order.
Disabling End Title until that can be sorted.
2023-11-04 15:10:07 -04:00
aMannus 13474a2dcc Updated tree & updated GBK 2023-11-04 14:53:04 +01:00
aMannus 4e3f174de6 Merge branch 'ChristmasWork' into christmas-tree 2023-11-04 12:54:59 +01:00
aMannus 297540e859 Updated models & updated text 2023-11-04 11:54:18 +01:00