summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
AgeCommit message (Collapse)Author
6 days[Rando] Shuffle Wonder Items (#1785)Eblo
* Shuffle Wonder Items * Add swordsman school gong Rupee * Add Termina Field wall items * Remove unneeded hardcoded actor position * Make EnItem00 wonder items invisible
11 daysShuffle butterflies (#1770)Garrett Cox
11 daysBeehive shuffle (#1773)Garrett Cox
2026-01-20Song of Soaring hint (#1482)Garrett Cox
2026-01-18Tree Shuffle (#1346)Caladius
Co-authored-by: Garrett <garrettjcox@gmail.com>
2025-11-20Convert mundane shuffles to ObjectExtension (#1297)Eblo
* Convert pot shuffle to ActorExtension * Convert crate shuffle to ActorExtension * Convert barrel shuffle to ActorExtension * Use ObjectExtension for mundane checks * Convert grass to ObjectExtension Add two missed grass checks in Woods of Mystery * Convert cows to ObjectExtension * Fix cow relocations * Convert freestandings to ObjectExtension * Convert remaining snowballs to use ActorListIndex * Wrong ID for one snowball * Apply feedback, document how identification works
2025-11-17Clean up check flags (#1324)Eblo
2025-10-30Convert to ObjectExtension (#1299)Eblo
* Replace ActorExtension with ObjectExtension * We only need cassert here, not all of LUS * Expose ObjectExtension_Free to C++ * Remove unneeded vector include
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-29[Rando] Enemy Drop Shuffle (#1282)Caladius
* Implement most of the Enemy Drops * Fix Glitchless Generation * Fix duplicate Logic Checks * Add Slime Items and fix Linux Floating Point. * Add Comment for Enemy Drops RC Sets * Adds Leever and fixes Position Check issue. * Adds GBC for Logic check * Add Hiploop * Adds Skullfish (Enemy only drops items inside GBT) * Feedback Updates * Updates * Update to Switch for Actor Selection * More Enemy Locations * Fix Mini Baba and remove actors that dont drop items * Update mm/2s2h/Rando/Logic/Logic.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Add case for ACTOR_BOSS_05 in Logic.h * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Clang format actor position * Need swim for Bio Deku Baba * Define RC_ENEMY_DROP_BIO_DEKU_BABA in checks * GitHub spacing how dare you * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Apply suggestion from @Eblo --------- 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-10-15[Rando] Shuffle Swim (#1087)Caladius
* Shuffle Swim + Central Logic * East Logic * Great Bay Temple (hopefully) * North Logic * Pirates Logic (Hopefully) * South Logic * West Logic * Fix Termina Field Logic * Fix Great Bay Temple Logic * Feedback Changes * Split Southern Swamp North * Update Swamp and GBC logic * missed one * Feedback Updates * fix syntax * Split Marine Lab Exterior from GBC * replace Bronze Scale wording in Menu. * Additional logic pass for swim ability * Mimic Deku hop failure event when touching water Separate Woodfall owl statue platform into own region * Import Model * Add to 2ship.o2r * Add Model Selector * Update Model * Clean remove model for replacement * Import new model extract from Dana * Testing * pathing change * Pushing for someone to look at the model crash issue. * Enable DrawAbilityItem to take in multiple items when more get added. This is ready to go. * Feedback Changes * clang * Revert "clang" This reverts commit e09482f8b83c39f4678a9c349ed9061f2e002251. * Undo clang for once lol * Do not skip pushing Mikau if no swim ability * How did I mess that up * Fix changes * clang bullsh*t --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-08-20[Rando] Add Frog Shuffle (#1115)balloondude2
* Draw a frog * wip * builds and doesn't crash * add to regions and fix flag stuff * notes * add menu option * progress * mostly works * format * fix postLimbCrash * fix logic * formatting * cleanup * move to DrawFuncs * rearrange includes to satisfy clang format * Make frogs give check when wearing Don Gero's Mask (#5) * add second text variation * fix init issue --------- Co-authored-by: Caladius <clatini88@gmail.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-05-18[Rando] Shuffle Grass v2 (#1155)balloondude2
* Initial Commit for Grasssanity * Migrate to Whole Numbers for consistency and fix Linux/macOS crash. * baguette * Implemented Romani Ranch grass checks. * Some Grottos, ABC Enums * Randomize poisoned + cleared swamp grass. * Added more Termina Field Grottos * Fix peahat grass location * Address Grottos sharing Coors * Snowhead region (wip) * Trimmed out regrowing grass and reenumerated. * Add Snowhead Region * Add Lone Peak Shrine * Add Ikana Region * Finish Ikana grottos * Revert ActorViewer * re-add line end * Add missing grass from Smiffics Strim * Thrown Grass actors now drop their appropriate RC's * remove comment * Revert ActorViewer * ugh * Add missing Grass... again * Logic cleanup * Update using Archez suggestions * Fixing grass... finally * Initial Commit for Grasssanity * Migrate to Whole Numbers for consistency and fix Linux/macOS crash. * baguette * Implemented Romani Ranch grass checks. * Some Grottos, ABC Enums * Randomize poisoned + cleared swamp grass. * Trimmed out regrowing grass and reenumerated. * Added more Termina Field Grottos * Fix peahat grass location * Address Grottos sharing Coors * Snowhead region (wip) * Add Snowhead Region * Add Lone Peak Shrine * Add Ikana Region * Finish Ikana grottos * Revert ActorViewer * re-add line end * Add missing grass from Smiffics Strim * Thrown Grass actors now drop their appropriate RC's * remove comment * Revert ActorViewer * ugh * Add missing Grass... again * Logic cleanup * Update using Archez suggestions * Fixing grass... finally * Dev Rebase * Use Entrance Builder where applicable. * Clang * remove unneeded Ternary, thanks Archez * split regions and build * prevent rando drops when not shuffled * clang format * fix include --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Caladius <clatini88@gmail.com>
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-03-31Fix free roam behavior with Romani reward (#1101)Eblo
2025-03-31[Rando] Halt moving objects when obtaining items (#1094)Eblo
* Halt bean platform during Get Item state in rando * Also halt if player has freezeTimer * Extend behavior to Deku Butler, moving platforms
2025-03-31[Rando] Implement Treasure Chest Game Checks (#1065)balloondude2
* implement treasure chest game checks * clean up * format * forgot to remove these
2025-03-17[Rando] Shuffle Swamp Tourism Center good photo reward (#1066)Eblo
2025-03-15Fix build on ubuntu 20.04 arm64 (#1067)Ben Willmore
2025-03-15[Rando] Seahorse Reunion Check (#1051)balloondude2
* implement seahorse hp check * formatting * be more explicit with the logic
2025-03-15Fix softlock with repeats for Anju's grandmother (#1054)Eblo
2025-03-15Rename Malon words to Romani (#1057)Archez
2025-03-08Implement snowball drop shuffle (#1034)Garrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-02-28Rando Check: Ghost Hut (Spirit House) Heart Piece (#1026)Joshua Sanchez
* Add check for Ikana Spirit House Owner Heart Piece * Add rando behavior/check handling for EnGb2 (Spirit House Owner) * Clang format pass on EnGb2.cpp * Update mm/2s2h/Rando/ActorBehavior/EnGb2.cpp --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-02-27[Rando] Shuffle Fisherman jumping minigame (#1023)Eblo
* Shuffle Fisherman jumping minigame * Account for ice arrows path in fisherman logic * Fix alignment in Checks.cpp
2025-02-16Shuffle Termina Field Grotto Scrub and Add Associated Misc Skip (#230)balloondude2
* shuffle scrub and add speed up * forgot to stage this change * no more ocarnia * simplify Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * clean up --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-02-15Hookshot hint (#231)Patrick12115
* Hookshot Hint * Add Checkbox * Clang it
2025-02-14Boss Souls initial implementationGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-02-13Rando: Add Checks for Milk Bar NPC Shop (#217)Joshua Sanchez
* Rando: Add Checks for Mr Barten's Milk Bar Shop Prompts (Milk/Chateau) * Rando: Add custom behavior for Mr Barten to support randomizing his shop options * Refactor: Alphabetically list Milk Bar npc shop checks * Refactor: Alphabetically list Milk Bar npc shop checks in Types.h * Refactor: Clean up references to Milk Bar purchase checks * Engine: Pass callback and script pointers as VB_EXEC_MSG_EVENT hook parameters * Add dialogue state tracking to EnTab ActorBehavior * Override default script and callback behavior in EnTab ActorBehavior * Clang-format on EnTab and remove extraneous LUSLOGs * Last pass on clang-format for #217 * Remove unused reference to EnTab actor script that was crashing builds on Linux/Mac * Add QueueNonCheckItem to MiscBehavior.h/cpp Allows actors to queue up Give Item events which go through the same flow as the Rando Save check queue. Should only be used for non-key items. * Swap EnTab behavior to granting RI Refills and remove all vanilla bottle checks * EnTab clang-format pass * Update mm/2s2h/Rando/ActorBehavior/EnTab.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Revert "Add QueueNonCheckItem to MiscBehavior.h/cpp" This reverts commit 4c274dbf907235b8518a9359c5b941d8e7c1f831. * Rando EnTab: Add RO_SHUFFLE_SHOPS check to SHOULD conditionals * Update EnTab rando shop shuffle behavior to give vanilla refill behavior with delayed bottle check * Remove now-unused MsgScript** parameter in VB_EXEC_MSG_EVENT This was introduced in an earlier commit for #217 but is no longer a necessary addition to the engine as a result of 5a4f0424b. * Remove unused LUSLOG that was breaking builds on Linux/Mac --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-02-13Add some access featuresGarrett Cox
2025-02-10Fix softlock on repeats with ??? at Stock Pot Inn (#222)Eblo
2025-01-27Shuffles Marine Lab Fish Heart Piece (#189)Caladius
* Shuffles Marine Lab Fish Heart Piece * Adds Logic --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-21Shuffles Zora Hall Scene Lights (#187)Caladius
* Shuffles Zora Hall Scene Lights * Add Logic
2025-01-21Shuffle Kotake Red Potion Bottle (#169)Caladius
* Shuffle Kotake Red Potion Bottle * Logic... OH YEA! * Fix Woods Kotake * clang * Final fix? * clang * ship it * update cycleObtained
2025-01-20Add swamp & ocean spider house hintsGarrett Cox
2025-01-20Add remains hint on clock town recruitment postersGarrett Cox
2025-01-19Shuffle Beaver Bros empty bottle and heart piece (#184)Eblo
* Shuffle Beaver Bros bottle and heart piece * Allow repeat rupee rewards for beaver races
2025-01-19Koume Tourist Shop Checks (#130)inspectredc
* tourist shop pictobox * logic fixes * boat archery * Remove todo * format
2025-01-14Shuffle both Goron Lullaby checksGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2025-01-13Shuffle Chateau bottle, fix related bugs (#166)Eblo
2025-01-10Replace Bomb Shopkeeper Held Item (#147)mckinlee
* firmly grasp it * Update mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Update mm/2s2h/Rando/ActorBehavior/EnSob1.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * check if it's shuffled --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-10Shuffle Keaton Quiz Heart Piece (#148)Eblo
* Shuffle Keaton Quiz Heart Piece * Fix Keaton quiz BGM, use SET_WEEKEVENTREG syntax
2025-01-10Fix Postman softlock (#158)Eblo
2025-01-08Add bombers notebook checkGarrett Cox
2025-01-06Only kill Winter Village owl if both Lens and magic are acquired (#142)Eblo
* Only kill owl if both Lens and magic are acquired * Rename kill owl VB
2025-01-05Fix Anju Stock Pot Inn check softlocks (#135)Eblo
2025-01-03Shuffles Barrels, Crates & Missed Freestanding Rupees (#125)Caladius
* Great Bay Temple Barrels * Great Bay Temple - Barrels and Crates * New Icons + Pirate Fortress * More shuffles/fixes * Stone Tower Temple + Inverted * Undo Debugging Tools. * Missed Freestanding Rupees in Snowhead Icicle room.
2025-01-02Shuffles Circus Leaders Mask (#110)Caladius
* Shuffles Circus Leaders Mask * Fix flag issue with circus leader mask
2025-01-01Misc fixesGarrett Cox
- add a few more one point skips - Persist check skipped to save - Add gold dust refill item - Properly convert gold dust/milk to refills - Fix logic in path to mountain village - Fix logic for mountain smithy checks - Fix goron race not granting gold dust refills on subsequent wins
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:35:38 +0000