summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ConvertItem.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>
2026-07-11Tweaks to sarias song behavior (#1780)Garrett Cox
2026-07-06Fix various Ship_Random() usage issuesGarrett
2026-03-19[Rando] Tycoon's Wallet (#1597)mckinlee
* big boy wallet * cleaner 4 digit support * feedback * #1605 explains this change --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-02-01Adjust obtainability for progressive time (#1529)Eblo
2026-01-22Check/Item Tracker improvements (#1492)Garrett Cox
2026-01-21Add static trap option (#1489)Garrett Cox
2026-01-20Shuffle some songs (#1481)Garrett Cox
2026-01-16UX pass on item tracker overhaul (#1460)Garrett Cox
2026-01-16Refactor junk cycling and trap models (#1452)Garrett Cox
2026-01-09[Rando] Shuffle Ocarina Buttons (#1303)Caladius
* Import Models * Give and Draw for Models * Logic updates, need to do Evans Song * Update OnFileCreate * Fixes * clang * Implement Japas Jam Session * Update naming uniformity * Rename Logic * ugh * Fixes VB, Logic, and removes magic numbers from Starting Items Macro. * Adds Item Tracker implementation * Adds Scarecrow song check and makes feedback changes. * Stop error chime from starting an EDM album. * Update mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Logic.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Logic.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Enhancements/Songs/SkipScarecrowSong.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Undo Swim change (no idea why i did this) * Reworked Hook * Cleanup * Clean up Fix bug with SkipScarecrowSong Fix Zora Ballad logic Grant Ocarina buttons when not shuffled Fix VB_PLAY_OCARINA_NOTE boolean Re-instantiate starting items RI adjustment Swap Ocarina right and left --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-01-06[Rando] Enemy Soul Shuffle (#1284)Caladius
* Add Aliens and initial code moved from old build. * Update Enemy Souls to latest Develop and fix issues. * Change Stalchild Animation to Idle * Fix Stalchild Eyes * Adds Hiploop to keep in line with Enemy Drops * correction * Update Matrix Calls * Remove comment * Remove Garo for now * Add Octorok Soul req for Upper Canyon Access * Add soul requirement for Red Switch * Grant Soul INF when the option is off * Adds Nejiron Soul * Add Flying Pot Soul * ew (#14) * cleanup * Add Bubble Soul * Adds Freezard * Change Soul behaivor to Invincible * header cleanup and arg consolidation * Fixes OnFileCreate to actually shuffle Enemy Souls. took this op. to fix up Boss Souls shuffling as it was needed to cleanly shuffle Enemy Souls. * Naming Updates * Name Updates pt2 * Add Tracker Icons and adds a Default to avoid erroring * Fix Iron Knuckle Helmet * revert item icon default and add soul flame to tatl target for enemies that are invincible. * Move VBs to GameInteractor_VanillaBehavior.h * Use VB_PERFORM_AC_COLLISION for enemy souls * Add enemy souls for closer parity with drops Stub out enemy draw funcs Use macros to streamline existing skeleton inits Logically account for enemy souls in CanKillEnemy Fix logical quirk with Ikana ice arrows * Draw everything * Remove unused INIT arg from SETUP_FLEX_SKEL * Add Igos, Keeta, Gomess Make soul RIs contiguous, separate boss and enemy Ignore target color for EnInvadepoh Remove Real Bombchus and Flying Pots for now Require Gekko and Snapper souls for beating both * Add Enemy Souls to item tracker * clang format --------- Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-01-05[Rando] Clock Shuffle + Logic (#1275)mckinlee
* Add Clocks as Items feature * refactor * some clean up * forgot to clangify * use proper randoinf flags and some fixes * proper skipsotcutscene fix * Animated Clock Item (Thank you Caladius!) * Close attempt at animating the clock, not perfect but a good start. * Git gud Clock * fix clock item get crash Co-Authored-By: Caladius <Caladius@users.noreply.github.com> * some enhancements * logic refactor, minor changes, and new enhancements * huge rework * clang * fix a oops; any day, not current day * housekeeping and starting items menu support * splits up some milkroad regions and fixes a audio bug * i suck at merging * feedback update * scarecrow dance fix * add clocks to new item tracker * day 2 bean patches * add time logic to enemy drops and simplify day 2 bean macro * rebrand to "Shuffle Time" * more eblo feedback * some more feedback * rename feedback * pauseSaveEntrance fix * fix take 2 * Time Shuffle cleanup Fix pause save Time Shuffle bug Fix event queue daytelop bug Finish merge commit header include Clean up with shouldRegister Co-authored-by: mckinlee <mckinlee@ymail.com> --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> 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-09-14Use DungeonSceneIndex in port filesEblo
2025-09-14Update weekevent flags in enhancementsEblo
2025-09-10Fix rando refills for Chateau Romani (#1216)Eblo
2025-09-10Revert "Merge develop-rena -> develop (#1258)" (#1269)Eblo
This reverts commit 47771de011abced823d9b699fffc8832fedff1b7.
2025-09-03Merge develop-rena -> develop (#1258)Eblo
* add health check preventing hop counter reset on death (#1214) * Fix rando refills for Chateau Romani (#1216) * Allow access to smithy checks without a sword (#1208) * Fix float slider labels (#1210) * Do not allow gameover audio to be changed (#1225) * Fix slider labels where position is None (#1227) * Fix BSoDT bugs with audio and early day change (#1228) * Properly configure INCLUDE_MPQ_SUPPORT (#1243) * Check previousBankValue in custom bank thresholds (#1232) * Restore vertices after geometry seams patch (#1237) * Fix softlock with Magic Hag's Blue Potion (#1252) * Revert "Fix cracking/buzzing with streamed audio (#1153)" (#1233) This reverts commit 120c657607dc3c7b5d8e063d457744733bb5b668. * [Rando] Reset cycle collectible flags on cycle save (#1254) * bump to Rena Bravo (#1257) --------- Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: balloondude2 <55861555+balloondude2@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-14Boss Souls initial implementationGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-02-06Remove bottle refills from junk rotation for nowGarrett Cox
2025-01-31Change tingle maps to shop checks and more misc tweaks to messagingGarrett Cox
2025-01-27fix red potion bottle (#202)balloondude2
2025-01-20Grant mask salesman checks when beginning seed, and prep for starting itemsGarrett Cox
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-06Add a few missing converts, and fix tingle maps giving the wrong mapGarrett Cox
2025-01-05Increase amount of ammo given by junkGarrett Cox
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-31Add CSMC for pots, fix some seed generation issuesGarrett Cox
2024-12-31Add Alien Defense Check (#111)balloondude2
* alien check no logic * add cs skips * convert milk bottle * add aliens to logic
2024-12-19Restock re-obtainable items in shopsGarrett Cox
2024-12-19Tweak item conversions for progressivesGarrett Cox
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-14Tingle checksGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
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-09Ikana Canyon and nearby regions logic mappedGarrett Cox
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2024-12-08Changes to ConvertItem to convert to junk items instead of blue rupeesGarrett Cox
2024-12-08better handling of trade item slot if the trade item was lost/swapped overGarrett Cox
2024-12-05Tweaks to song/remains names and more convertItem cases handledGarrett Cox
2024-10-26Various tweaks to ConvertItem process, and better support for SoT resetGarrett Cox
2024-10-09Initial shopsanity implGarrett Cox
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 09:47:54 +0000