<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/mm/2s2h/Rando/GiveItem.cpp, branch develop-mion</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>[Rando] Implement Traps (#1287)</title>
<updated>2025-10-30T15:49:39+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-10-30T15:49:39+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c91588d8af126f68f032b65e552f6d8a029ded22'/>
<id>c91588d8af126f68f032b65e552f6d8a029ded22</id>
<content type='text'>
* 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 &lt;clatini88@gmail.com&gt;

* 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 &lt;7004497+Eblo@users.noreply.github.com&gt;

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* 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 &lt;58642183+sitton76@users.noreply.github.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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 &lt;clatini88@gmail.com&gt;

* 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 &lt;7004497+Eblo@users.noreply.github.com&gt;

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* 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 &lt;58642183+sitton76@users.noreply.github.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Implement Triforce Hunt (#1071)</title>
<updated>2025-10-15T16:48:06+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-10-15T16:48:06+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c95a7739f92465d3fc2e1a4eca2912ec47c2ed3a'/>
<id>c95a7739f92465d3fc2e1a4eca2912ec47c2ed3a</id>
<content type='text'>
* 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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Shuffle Swim (#1087)</title>
<updated>2025-10-15T16:39:07+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-10-15T16:39:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=da767c966d1102fa2dfe8f78627400ab23f4634c'/>
<id>da767c966d1102fa2dfe8f78627400ab23f4634c</id>
<content type='text'>
* 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 &lt;7004497+Eblo@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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 &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Use DungeonSceneIndex in port files</title>
<updated>2025-09-14T19:15:21+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-14T19:15:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=17b47c74700ba1d10888a1a605295ffb90e45c16'/>
<id>17b47c74700ba1d10888a1a605295ffb90e45c16</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update weekevent flags in enhancements</title>
<updated>2025-09-14T12:52:21+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-14T12:52:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=4c20d0c0d0c46021f7a1315b799dd8a10741d4c4'/>
<id>4c20d0c0d0c46021f7a1315b799dd8a10741d4c4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Add Frog Shuffle (#1115)</title>
<updated>2025-08-20T18:59:11+00:00</updated>
<author>
<name>balloondude2</name>
<email>55861555+balloondude2@users.noreply.github.com</email>
</author>
<published>2025-08-20T18:59:11+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=33a34f5ca38094f423608528a545f1fee55a8348'/>
<id>33a34f5ca38094f423608528a545f1fee55a8348</id>
<content type='text'>
* 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 &lt;clatini88@gmail.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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 &lt;clatini88@gmail.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Cleanup includes (#1072)</title>
<updated>2025-04-06T21:17:50+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-04-06T21:17:50+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=3d0feab897b065106f5d38ffbc55f075f990e784'/>
<id>3d0feab897b065106f5d38ffbc55f075f990e784</id>
<content type='text'>
* Cleanup

* Format

* Fixes

* Update macports-deps.txt

* Fix mac

* Update macports-deps.txt

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;

* Move includes around

---------

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Cleanup

* Format

* Fixes

* Update macports-deps.txt

* Fix mac

* Update macports-deps.txt

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;

* Move includes around

---------

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Boss Souls initial implementation</title>
<updated>2025-02-14T07:14:58+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2025-02-14T07:14:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=3087d1dd33b31605c6a7fb706d1f6a6aea8bb587'/>
<id>3087d1dd33b31605c6a7fb706d1f6a6aea8bb587</id>
<content type='text'>
Co-authored-by: Caladius &lt;Caladius@users.noreply.github.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Co-authored-by: Caladius &lt;Caladius@users.noreply.github.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Bomb bags and wallets now come full</title>
<updated>2025-02-03T18:21:55+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2025-02-03T18:21:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=a848aa136247a095e1bfa7c9b1df312371d81b11'/>
<id>a848aa136247a095e1bfa7c9b1df312371d81b11</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix red potion bottle (#202)</title>
<updated>2025-01-27T23:42:21+00:00</updated>
<author>
<name>balloondude2</name>
<email>55861555+balloondude2@users.noreply.github.com</email>
</author>
<published>2025-01-27T23:42:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c9dea021cc9e9aead33c9b5c5dc6cfae9e51c9c0'/>
<id>c9dea021cc9e9aead33c9b5c5dc6cfae9e51c9c0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
