summaryrefslogtreecommitdiff
path: root/soh/src/code
AgeCommit message (Collapse)Author
2024-02-16fix the torchbriaguya
2024-02-15More player documentation from decomp (#3819)Pepe20129
* FallImpactInfo & AnimSfx stuff * IA function naming & Player_UseItem * ActionChange * Speed modes * Fix build * Misc cleanup * Name Player_Action funcs * PlayerAgeProperties * Most of the Player struct * Update z_player.c --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-15document dependencies per distro (#3933)briaguya
* start on arch * noconfirm * git * noconfirm * just skip cache * cmake * ninja * gcc * lsb * sdl2 * png * sdl net * boost * imagemagick and add opensuse * non interactive * git * cmake * add a bunch * things * more * try to matrix * soh otr i guess * needs * trying to figure out how matrix include works * make the matrix? * matrix debug * install? * echo? * yuck * cannot locate package false * parens for good measure * lsb * libsdl2 * suse * i forgot opensuse uses gcc-c++ instead of g++ for the package name * png * sdl * more * suse packages.... * fedora cmake * 2? * png * handle old sdl2 net * apt * not sure if this is a problem for both clang and gcc on opensuse or just clang * devel * cmake min version * def don't want this here but it's here for now * does this do anything * mantic because cmake version * libopengl? * fedora ninja * fedora g++ * lsb * fedora sdl * libpng * do a build * clang fix * give early returns values * ImageMagick * Update BUILDING.md * something * plain boost instead of devel? * not packing so we don't need this part * base? * don't have it can't need it * just use boost download on opensuse i guess * move workflow * bring back the file * lus main? * detach
2024-02-15Cosmetics Editor fixes for icons in z_message_PAL.c (#3914)Tina H. (sheepytina)
* Fix resetting button icon colours in message boxes. * Fix type/math error for custom color in textbox icon pulsing. * Fix type error for custom color in ocarina icon pulsing. * Make custom env colour math more closely match vanilla equivalents. * Make comments presentable.
2024-02-15Fix Cosmetics Editor getting stuck on weapon trails (#3913)Tina H. (sheepytina)
* Partially fix cosmetics editor getting stuck on sword trails. * No reason for "reset" to be static. * bombchu
2024-02-15[Enhancement] Preserve minimap toggle state between areas (#3906)Ted Newman
* Add enhancement to preserve minimap toggle state between areas * add map toggle enhancement to presets
2024-02-15Player State Docs (#3280)inspectredc
* state flags 1 * state flags 2 * state flags 3 * fill array
2024-02-15[Rando] Add Mix and Decouple support to Boss Entrances (#3261)Archez
* initial support for mixing boss entrances in the mixed pool * support decouple for boss entrances * missed decouple change * add blue warp exits to boss rooms in location access * add entrance get helper methods * fix assumed targets not using root in entrance name * add dedicated blue warp entrances and handle blue warp changes during generation * change bluewarp handling in game to use unique blue warp entrances * handle blue warps in entrance tracker * fix overriding all jabu and water temple rooms * fix grotto returns when exiting boss rooms/dungeons * fix blue warp logic by tracking original connected region key * use entrance enums * remove unneeded entrance values * fix decouple generation crash * fix jabu mq backwards logic
2024-02-15Pause Warp Enhancement (#3223)mckinlee
* Pause Warp Enhancement This commit introduces the PauseWarp mod, a feature that allows players to warp to different locations in the game directly from the pause menu. - Add PauseWarpState structure to manage flags and cooldowns for the pause warp feature. - Implement IsStateValid function for state validation. - Implement ResetStateFlags function to reset all state flags to default values. - Add InitiateWarp function to handle the initiation of warp sequences. - Implement HandleWarpConfirmation function to confirm and execute warp actions. - Implement HandleCooldowns function to manage various cooldown timers. - Add PauseWarp_Main function as the main logic, called every frame to handle pause warp functionality. - Map warp song messages to in-game text messages. * Warp Song Check -Now if you do not have a warp song you won't be able to select the empty slot and still teleport. * Added Audio Fanfares and Changed stateFlag1 to PLAYER_STATE1_IN_CUTSCENE -When selecting a warp song the audio for the applicable warp song will now play for a extra vanilla feel. -Changed the stateFlag1 because previously it just disabled input allowing enemies to harm you. Now that won't happen because the game is put into a cutscene state. * Feedback Update -A new hook was created 'OnPauseMenu' so now PauseWarp_Main is only called when the pause menu is open -Moved pauswarp.c to the Enhancements folder -Removed from graph.c PR Change: Changing to the main branch instead of sulu * Feedback Update #2 -Introduced new function 'PauseWarp_Idle' now that 'PauseWarp_Main' is no longer called every frame -Added C wrapper to access 'GameInteractor::IsSaveLoaded' and scrapped the 'IsStateValid' function -Added 'PauseWarp_Idle' to the the 'RegisterPauseWarp' function -Refactored the code some * Linux Compile Issue -Added a missing header that was causing a compile issue for linux -Hopefully, it won't crash * Minor Bug Fix -Now link won't get soft locked when warping to the same location twice * Update libultraship * Revert "Update libultraship" This reverts commit 746fc234795c06261a4fb69484f4656676f1eaaa. * Bug Fix -Added more checks to ensure vanilla behavior when a Ocarina is not in the players inventory. * WIP * Done unless I'm missing headers * now we done * clean up, these arn't needed anymore * Rename OnPauseMenu to OnKaleidoUpdate
2024-02-02Vanilla Behavior OverhaulGarrett Cox
Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-02-02Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright ↵Garrett Cox
into develop-rando-merge
2024-02-02Merge branch 'develop-macready' into macready-to-dev-2-2briaguya
2024-02-01[Graphics] Show Equipment Regardless of Age (#3830)Patrick12115
* Hookshot, Hammer, & Boomerang * Added the remainder of equipment and DL Patching for hands * Removed Mirror Shield Patch Messed with the front texture of shield * Child Hylian Shield Cheat Adds a cheat that allows Child Link to hold Hylian Shield as adult. Added to this since it uses the same way to render the shield * Debugging * Adds Scaling to Child Link with Adult Equipment * Fix Merge Conflict Blunders * More cleanup * Added Scaling checkbox and some clean up * Added an || ITEM_NONE * More cleanup and simplification * Accidently added spacer * Replace B_BTN_ITEM * Spacing Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Added most sheath functionality * Updated tooltips * removed child hylian shield and tweaked bow/slingshot Made child hylian shield cheat into a separate branch and hooked into existing bow/slingshot enhancement for drawing those * Prefixes * () --------- Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Increase Door Cull range (#3888)inspectredc
* cullzone * better cvar name * Update soh/src/code/z_actor.c * Update soh/src/code/z_actor.c --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Hurt Container Mode (#3336)Caladius
* Each Heart Container or full Heart Piece reduces Links hearts by 1 * Based on Briaguya's suggested Code but modified slightly as some parts were missing. * Static Bool * The episode without Captain Hook's Hook --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Lost Woods Ocarina Game Difficulty Options (#3371)Eric Hoey
* Menu options, note speed, unlimited playback time * Instant win * Add custom ocarina game cvar to all options and presets * Extra spaces * Add starting note count, ending note count by round, more presets * Block out vanilla code + comments * finish blocking out vanilla code * new documentation formatting * add starting notes to randomizer preset
2024-02-01Increase Crawl Speed (#3366)Eric Hoey
* Increase animation speeds, crawl speed, add magic numbers for camera timer, add to menu and presets * Remove extra space, reformat comments * Initialilze CVar at 0, Initialize default timer, set default case for timer, change all CVarGets to 1, reorg logic * Fix remaining CVars + unify logic * block out vanilla code + comments * new documentation formatting * Simplify camera swing fix * Remove redundant multiplication * Update soh/src/code/z_onepointdemo.c reduce code duplication Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Renames Freecam to Free Look. (#3771)Malkierian
Adds helper info for invert, distance, and transition speed options.
2024-01-31Merge remote-tracking branch 'origin/develop-macready' into ↵Adam Bird
mergeDevelopMacreadyJan31
2024-01-15Revert actor uncullZone related checks back to match decomp (#3828)inspectredc
2024-01-15Tweak: Improve pause menu dungeon map performance (#3773)Archez
* add map palettes per pulse to leverage shader caching * use unregister blended with kaleido maps * use Gfx_TextureCacheDelete for KD lava * bump lus * add miss tex clears for KD
2024-01-15Add Collision Header XML parser (#3396)Pepe20129
* Add Collision Header XML parser * Update CollisionHeaderFactory.cpp * Remove "Num" attributes * Fix crashes Prevent crash when the camera setting is negative Change some IntAttributes to UnsignedAttributes
2024-01-15Restore Original Scene Command Object List Behaviour (MacReady) (#3827)inspectredc
* Restore Original Scene_CommandObjectList Behaviour * remove some vrom stuff * add some comments
2024-01-15Remove OpenMenu Bar Check (#3817)Patrick12115
Having it set to just -6 makes the Glitch Tick stay in the same spot in game. when the F1 menu bar is open. At least on Windows
2024-01-15Rando: Shuffle Swim (Rando V3) (#3795)Pepe20129
* Shuffle Swim * Fix build
2024-01-14Rando: Shuffle Child's Wallet (Rando V3) (#3794)Pepe20129
* Shuffle Child's Wallet * Add support for "More info in file select" * Fix build * Fix build * Update randomizer.cpp * Update locacc_hyrule_field.cpp
2024-01-14Rando: Shuffle Beehives (Rando V3) (#3763)Pepe20129
* Shuffle Beehives * Address review * Fix build
2024-01-14Fishsanity - Rando v3 (#3738)Jordan Gilbreath
* Update z_fishing documentation from decomp * undo sCameraAt/Eye rename * forgot to include these defines Heehee * adding enums, settings * adding more stuff back in * more work * we're literally typing words into computer * include unordered map maybe this fixes mac build idk * wahoo * hmm * add make sure disabled flag gets popped * poggers in the chat? * doing some refactoring * fixing build * documentation, moving fishsanity instance to rando * move FS back to context, fixing build, mod progress since FS is needed during rando generation & provides perpetual info abt. fishsanity in the seed, seems to make more sense if it lives on the context * moving some stuff around * it's starting to get real in here * ELIMINATE FISHSANITYMETA * IT WROKS * Update trackers, fix pond fish flagging * ZD fish shuffle initial checkpoint * ZD fish "working" aside from the crashing * wrapping up * fix for partial pond shuffle * remove misc. unrelated debugconsole modification * updating GI model * get build working * add a todo for this * removeoopsie * Rework hints a bit * update hint loc * Use visual indicator instead of despawning caught fish --------- Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-01-08Add Invert Y-Axis and Apply Right-Stick Aiming to Z-Weapon Aiming (#3304)Eric Hoey
* Add right-stick aiming to third-person aim * Add Z-aiming CVar and inversion to Z-aiming * Create calculation for rel.right_stick and apply it in Z-aiming * Move option to First-Person section to match shield * Fix max/min aiming heights * Expand min/max + comment * block out vanilla + comments * block vanilla code better * Remove extra space * new documentation formatting * rewrite ==0 and !=0
2024-01-08Fixes parsing of spoiler files in plando mode. (#3823)Christopher Leggett
It was specifically failing on Hints because of changes to the spoiler output that were not reflected in the parsing code.
2024-01-05Make noclip only effect player (#3788)Garrett Cox
2024-01-02Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-mergeMalkierian
2024-01-02Remove special IAs (#3453)Pepe20129
* Remove special IAs * Add clarifying comment
2023-12-30Allows rendering custom models as Ice Traps in GetItem Animations. (#3760)Christopher Leggett
2023-12-28Merge pull request #3756 from HarbourMasters/developGarrett Cox
develop -> develop-rando
2023-12-28Rando: Shuffle Ocarina Buttons (Rando V3) (#3735)Pepe20129
* Shuffle Ocarina Buttons * Address review * Add trick names * Temporarily remove the ocarina button ice trap models * Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp Fix lost closing brackets from merge resolution. --------- Co-authored-by: Christopher Leggett <chris@leggett.dev>
2023-12-28Only emit changed flags (#3489)Garrett Cox
2023-12-26Add frame advance option to developer tools (#3435)Garrett Cox
2023-12-26docs: update `func_800FADF8` to `Audio_ResetActiveSequences` (#3471)briaguya
2023-12-26Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright ↵Garrett Cox
into develop-rando-develop
2023-12-18Fix some bugs with settings (#3525)Christopher Leggett
* Fixes off by one errors for a few settings. * Removes disable of shuffle options when starting with corresponding items. * Junks checks when shuffle is off and start with is on.
2023-12-18Merge tag '8.0.4' into HEADAdam Bird
MacReady Echo
2023-12-16more swordless fixes when time traveling (#3510)Adam Bird
2023-12-10Fixes some build errors resulting from merge.Christopher Leggett
2023-12-10Merge branch 'develop' into merge-developChristopher Leggett
# Conflicts: # soh/soh/Enhancements/custom-message/CustomMessageTypes.h # soh/soh/Enhancements/debugger/debugSaveEditor.h # soh/soh/Enhancements/item-tables/ItemTableTypes.h # soh/soh/Enhancements/mods.cpp # soh/soh/Enhancements/randomizer/3drando/entrance.cpp # soh/soh/Enhancements/randomizer/3drando/item_location.cpp # soh/soh/Enhancements/randomizer/3drando/keys.hpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp # soh/soh/Enhancements/randomizer/3drando/menu.cpp # soh/soh/Enhancements/randomizer/3drando/playthrough.cpp # soh/soh/Enhancements/randomizer/3drando/settings.cpp # soh/soh/Enhancements/randomizer/3drando/settings.hpp # soh/soh/Enhancements/randomizer/randomizer.cpp # soh/soh/Enhancements/randomizer/randomizerTypes.h # soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp # soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp # soh/soh/Enhancements/randomizer/randomizer_entrance.c # soh/soh/OTRGlobals.cpp # soh/src/code/z_sram.c # soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
2023-12-04Add tableId to getItemEntry (#3064)Garrett Cox
2023-12-04Fix OnItemReceive hook for items in the extendedVanillaGetItem table (#3063)Garrett Cox
2023-11-30Merge pull request #3468 from briaguya-ai/delta-to-devaMannus
MacReady Delta -> develop
2023-11-29Merge branch 'develop' into delta-to-devbriaguya
2023-11-28Flag tracker (#3447)Malkierian
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-03 10:28:01 +0000