summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ActorBehavior/EnGirlA.cpp
AgeCommit message (Collapse)Author
9 daysFix static trap models leaking, and shop items not converting junk (#1811)Garrett Cox
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
9 daysAdd rando toggle for infinite Rupee purchases (#1794)Eblo
2026-04-26Make more checks repeatable (#1629)Eblo
2026-01-16Refactor junk cycling and trap models (#1452)Garrett Cox
2025-10-30[Rando] Implement Traps (#1287)Caladius
* Initial Trap Implementation with 1 Trap Example. * New TrapTypes and Per Trap Custom Messages * Spruce up Menu and add placeholders for toggling traps * Reordering and clean up * Seeded Trap Models * Trap Type Opt-in * Add Jinx Trap * Add Enemy (Like Like) Trap * Fix Shop Item draws and convert for Progressive * Placeholder for Custom Model * Implemented time trap[Please Squash this] (#13) * Implemented time trap * Finished comment because im braindead today * Forgot to fix indentation(whoops) * Changed things not mess with the games code, added some more Time Trap messages * Removed a include I forgot to yoink from the base code. * Removed header define for VerifyTimeSkip * Clangit * Missed some leftovers from a merge conflict. * Clang format throwing a fit over a empty line * Added Timeskip CVar placeholder * Fixed issue where game crashes past midnight * Added Moonfall skipping prevention messures. * Added fallback loop to handle the remaining cycles in the event of a overflow. * Cleaner implementation * Keep it simple stupid * changed function name to be more accurate * Removed outdated comment, used TimeSkipInc for moonfall skip prevention * Reverted max trap(accidentally pushed it while testing) * Removed old unused value * Reduced the iteration by 1 to be closer to where it was at before. * Will this fix Windows? * Added TRAP_TIME to trapToCvarMap * Corrected typo on comment * Clangit...again * Added calls to load environment values and adjust the weather. * Update Time Trap and clean up code * Add Flash effect to Time Trap * Added a few more timeTrapMessages * I hate you clang format * Fix Trading Post Kick Out Time * Added map for all locations I can think of that close. * Clangit yet again * Removed Inn handling because the edge case related to it closing cannot happen * Corrected a whoopie I made when I was dealing with a conflict * Removed pointless condition check that is always true * Removed duped variable * Removed unnecessary data from SCENE_8ITEMSHO kickout entry * Removed now used TRADING_POS_ACTOR_PARAM --------- Co-authored-by: Caladius <clatini88@gmail.com> * Comment out Kick Out code for later TODO * Clean out commented code * Adds Wallet Trap and updates some tooltips * More Trap Messages * Even more trap messages * moooooore messages * update for clang * Feedback changes for Time Trap * Update Trap functions * Fix Matrix call * Trap Model Import (Thanks Zrc) * rename * Adjust size * update name for uniformity * Update mm/2s2h/Rando/MiscBehavior/Traps.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/MiscBehavior/Traps.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * feedback updates * Update notifications to remove color codes from trap messages when item skip is on * VBify Object Dependency * Fix comma * fix headers * Refactor ObjectDependency hook * Check if item get cutscenes are being skipped * Use brackets for LUS include * Header update --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-29Bump LUS and OTRExporter, add null audio backend (#1289)Eblo
* Bump LUS and OTRExporter, add null audio backend * Missed an include change * And again * Thanks macOS * Another one * Bump LUS again, fixing SDL audio backend bug * Sync LUS bump changes to merged PRs * Bump LUS again * Update CMakeLists.txt includes
2025-09-16Update EnGirlA.cpp flagsEblo
2025-09-16Sync ACTOR_FLAG_ATTENTION_ENABLED in missed filesEblo
2025-04-06Cleanup includes (#1072)louist103
* Cleanup * Format * Fixes * Update macports-deps.txt * Fix mac * Update macports-deps.txt Co-authored-by: Archez <Archez@users.noreply.github.com> * Move includes around --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-02-21fix goron shop in spring (#247)balloondude2
2025-01-31Change tingle maps to shop checks and more misc tweaks to messagingGarrett Cox
2025-01-31Revise hints to not rely on existing text data (#199)Eblo
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-08Fix shop softlocksGarrett Cox
2025-01-07Sparkles on RI_NONE and Progressive Magic (#145)Caladius
2025-01-04Uniformed RC Naming (#132)Caladius
* Uniformed RC naming conventions, minor fixes and RCTYPE updates for freestanding and poh/hc * No Logic correction * Fix Woodfall Rupee * Revert Tingle to NPC * Fix Hag Freestanding
2024-12-29Remaining Bomb Bag and All-Night Mask (#103)Eblo
* Shuffle remaining bomb bag and All-Night Mask * Remove negated checks * Only use EnFsn rando behavior for special items
2024-12-29Various bug fixes:Garrett Cox
- Fix trapped stray fairy drawing when it shouldn't - Fix CSMC chests changing textures as you open them - Fix toilet hand taking trade item - Fix progressive magic not filling magic meter - Fix un-obtainable shop items not rendering - Fix trade item rotation not working while in active trade - Fix trade item rotation when slot was empty - Fix not being able to transform on clock tower rooftop - Fix collider hidden stray fairies going back to vanilla draw
2024-12-19Restock re-obtainable items in shopsGarrett Cox
2024-12-08Changes to ConvertItem to convert to junk items instead of blue rupeesGarrett Cox
2024-12-08Fix trading post at night not shuffling correctlyGarrett Cox
2024-10-26Various tweaks to ConvertItem process, and better support for SoT resetGarrett Cox
2024-10-25COND_HOOK macrosGarrett Cox
2024-10-10More tweaks to item00 and shuffled checksGarrett Cox
2024-10-10Fix magic hag's special itemGarrett Cox
2024-10-10Add shop prices and tweaks to spoiler generationGarrett Cox
2024-10-09Anddd clang formatGarrett Cox
2024-10-09Initial shopsanity implGarrett Cox