summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/StaticData/Items.cpp
AgeCommit message (Collapse)Author
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-10-18[Rando] Starting Items Rework (Cleaner Edition) (#1295)Caladius
* WIP * Reworked Starting Items * Clean up * Clean up 2 * default macro for cvar * Spoiler and Save File handling * Fix spoiler drop --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-15[Rando] Implement Triforce Hunt (#1071)Caladius
* Implement Triforce Hunt (needs Glitchless Seed Gen help) * Fix Credits Warping * Clean up logging * Fix Seed Gen * Remove test code. * Add Triforce Piece to item tracker * Allow for multiple models, pushing up because I dislike it and can't figure out a better way. * Majora Soul for Reward (needs work). Completed Triforce text * Clang * clean up comment * Remove SPDLOG * Updates based on Feedback * Cleanup * Cleanup again * Fix Ship Utils * Fix Tracker drawing * Feedback updates * clang because why not * Update to use ENTRANCE mapping. Thanks BalloonDude * Expand shuffle maximum and handle instances where a seed may not generate. * Undo menu text. * Fix Item Tracker... again and feedback changes. * Update define location to StaticData.h and update majora syntax * cleanup * Remove TriforceHunt.cpp again... * clean up * FOR REAL THIS TIME * Update ratio of required/max if the seed needs to adjust how many are in the pool due to generator issues. * clang
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-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-19fix bottle gids (#241)balloondude2
2025-02-14Boss Souls initial implementationGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-02-03Initial starting items implementationGarrett Cox
2025-01-31Change tingle maps to shop checks and more misc tweaks to messagingGarrett Cox
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-14Shuffle both Goron Lullaby checksGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2025-01-13Add more options for skipping item get cutscenesGarrett Cox
2025-01-13Shuffle Chateau bottle, fix related bugs (#166)Eblo
2025-01-10More cutscene skips & faster block pushesGarrett Cox
2025-01-08Add bombers notebook checkGarrett Cox
2025-01-07Fix item message iconsGarrett Cox
2025-01-05Increase amount of ammo given by junkGarrett Cox
2025-01-02Implement Keaton Mask and Letter to Mama Shuffles (#114)Caladius
* Implement Keaton Mask and Letter to Mama Shuffles * remove Letter to Mama Starting item * rude --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-02Shuffles Circus Leaders Mask (#110)Caladius
* Shuffles Circus Leaders Mask * Fix flag issue with circus leader mask
2025-01-01Shuffle Song of Soaring, add related skip (#117)Eblo
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
2024-12-31Shuffle Postman Hat (#109)Caladius
2024-12-31Add Alien Defense Check (#111)balloondude2
* alien check no logic * add cs skips * convert milk bottle * add aliens to logic
2024-12-31Shuffle Mask of Scents and other stuff (#104)Caladius
* Shuffles Mask of Scents * Deku Princess Event Access and cleans up logic reqs. * Shuffles Magic Mushroom * Check fix * remove mushroom shuffle * cleanup * Update ActorBehavior.cpp * Delete mm/2s2h/Rando/ActorBehavior/ObjKinoko.cpp * Update ActorBehavior.h * Update ActorBehavior.cpp * Update Central.cpp
2024-12-30Shuffles Spider House Rewards (#105)Caladius
* Shuffles Spider House Rewards, Wallet and Mask of Truth. * Adds Logic * Move ocean to right spot. * Logic for having all 30 tokens per spider house
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-29Shuffle Gold Dust and implement logic for gilded sword. (#99)Caladius
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-28Shuffle Don Gero Mask (#96)Caladius
* Shuffles Don Gero Mask * Clean up and skip cutscenes * clang why not * Add logic
2024-12-26New Moon Logic (#80)Caladius
* New Moon Logic * Fierce Deity Trade done (i hate it here) * Apply suggestions from code review --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-12-20Add minimal container style matches contents featureGarrett Cox
2024-12-19Events for seahorse, zora eggs, and pirate pictureGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2024-12-14Shuffle Shooting Galleries (#65)Eblo
* Shuffle Shooting Galleries, fix progressive bow * Add Shooting Gallery region checks
2024-12-14Another pass on the junk item conceptGarrett Cox
2024-12-14Revert change to temple map namesGarrett Cox
2024-12-14Bossa Nova Check & SkipGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2024-12-14Shuffle Gibdo Mask and related cutscene skips (#61)Eblo
2024-12-14Tingle checksGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2024-12-12Add Snowhead MVP regionGarrett Cox
2024-12-12Rename Items to Owl StatueCaladius
2024-12-12Initial Commit, no LogicCaladius
2024-12-11Add progressive swords and fix some sword related issuesGarrett Cox
2024-12-11Banker checks & EnhancementGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2024-12-10Second pass on Clock Town and beginning areas logicGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2024-12-10Blacksmith 🎲 (#46)Caladius
* Implement Razor and Gilded Sword checks at the Mountain Village Smithy * clang duh
2024-12-09Adjust draw for Fairy & Milk refillsGarrett Cox
2024-12-09Ikana Canyon and nearby regions logic mappedGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2024-12-08Great bay coast and nearby regions mapped in logicGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 05:16:39 +0000