Commit Graph

3616 Commits

Author SHA1 Message Date
aMannus
22b7c342a8 Add preset info modal to archi save creation 2025-10-30 12:51:50 +01:00
aMannus
841caab026 Add modal to teach player about presets 2025-10-30 12:33:24 +01:00
aMannus
a03ba65465 Update version to 0.0.5 2025-10-30 10:48:40 +01:00
aMannus
f99f03aac9 Merge branch 'develop' into aManchipelago 2025-10-30 10:46:04 +01:00
aMannus
a5892590c1 Don't draw overhead items during GI animation 2025-10-30 10:45:19 +01:00
aMannus
c1f0f2a9b7 Create static hints for AP saves 2025-10-29 22:49:46 +01:00
Malkierian
4e913cc094 Merge pull request #5901 from Malkierian/copper-to-dev
Copper -> Dev 10/29
2025-10-29 14:41:56 -07:00
aMannus
d82934343c Handle receiving iron boots chest location externally 2025-10-29 22:30:32 +01:00
Malkierian
9f089aa6f8 Merge branch 'develop-copper' of github.com:Malkierian/Shipwright into develop 2025-10-29 13:54:22 -07:00
Jordan Longstaff
1ba6cf643d Modularize coloured ToT Medallions hook (#5877)
* Modularize colourized ToT Medallions hook

* Add overlooked reset of Forest Medallion colour

* Move asset variables to hook file

* Fix includes

* Remove forward declarations

* Use data structures to reduceboilerplate code

* Simplify data structures, reduce boilerplate even more

* Correct patchName2 checks

* Clang format

* Add brackets on if statements
2025-10-29 13:36:29 -07:00
Malkierian
b30191f369 Set cutsceneIndex to 0 to bypass cutscene shenanigans when spawning in ToT as adult. (#5899)
Unify savedSceneNum at -1 regardless of starting age.
2025-10-29 09:05:14 -07:00
aMannus
7ffd01f133 Let shuffled fairies spawn on link's location instead (#5890) 2025-10-28 20:54:00 -07:00
Jordan Longstaff
a419b431a7 Modularize Pause Warp hook (#5869)
* Modularize Pause Warp hook

* Make RegisterPauseMenuHooks static

* Merge pausewarp.c into hook module

* Use brackets with if statements

* Fix timer bug with spoiling items
2025-10-28 20:52:18 -07:00
Malkierian
48f4f56bac Change disabling rules for Skip Feeding Jabu-Jabu to reflect the fact that it only works in rando based on the rando setting. (#5889) 2025-10-28 17:01:59 -07:00
Pepper0ni
1b29c0cad3 fix logic error with detu tree torch room (#5898) 2025-10-28 16:57:16 -07:00
Malkierian
74312442d5 Fix wrong CVar on Hookshot Identifier. (#5883) 2025-10-25 19:52:22 -07:00
Jordan Longstaff
248fe8cb13 Modularize Reset Navi Timer hook (#5872)
* Modularize Reset Navi Timer hook

* Remove unnecessary sceneNum param name
2025-10-25 13:25:50 -07:00
Jordan Longstaff
c4f9712eff Modularize scene-specific Dirt Path fix (#5871)
* Modularize scene-specific Dirt Path fix

* Use macro in fix function

* Condition hook on fix being enabled

* Rename update function
2025-10-25 13:25:33 -07:00
Jordan Longstaff
cadae90c81 Modularize Floor Switches fix hook (#5870)
* Modularizes Floor Switches fix hook

* Remove unused include for z_obj_switch.h

* Convert to ID hook
2025-10-25 09:40:46 -07:00
Malkierian
ad2807ce32 Fix adding Enable Mods twice as search widget. (#5880)
Fix a couple typos in search widget extra terms.
2025-10-23 18:32:00 -07:00
aMannus
243acd2d4f Version to 0.0.4 2025-10-22 11:57:46 +02:00
Malkierian
ae1cee9b13 Bump to version Copper Alfa 9.1.0. (#5866) 2025-10-21 19:01:39 -07:00
Malkierian
56a05c392e Update to latest LUS commit with clip adjustments. (#5865) 2025-10-21 18:27:24 -07:00
aMannus
956188e7a5 Fix excluded location seed bleed 2025-10-21 20:29:35 +02:00
aMannus
a8379cc758 Reset tricks on AP parse 2025-10-21 19:10:28 +02:00
aMannus
de5972d67b Update version to 0.0.3 2025-10-21 14:22:16 +02:00
xxAtrain223
955ee9b9ba Fix doorType calculation for shutter doors (#5862) 2025-10-20 21:59:50 -07:00
aMannus
5e016d6864 Push version change 2025-10-21 00:43:38 +02:00
aMannus
bae8deb473 Fix bad merge conflict resolution 2025-10-21 00:25:39 +02:00
aMannus
37409ca2b4 Make linux happy, hopefully 2025-10-20 21:21:50 +02:00
aMannus
a85856e3a3 clang format 2025-10-20 20:55:36 +02:00
aMannus
a18cc8f067 Merge branch 'develop' into aManchipelago 2025-10-20 20:48:41 +02:00
aMannus
9228f4b35f Fix starting age 2025-10-20 20:33:29 +02:00
aMannus
433f4b7086 Fix triforce hunt count 2025-10-20 20:07:58 +02:00
Malkierian
dc5e9686c0 Mod Menu Tweaks (#5844)
* Fix mod order retention.
Remove mods in the CVar that no longer exist.

* Rework mod list init for enabled-by-default with extension changing to disable.

* Rework entire system for default enabled.
Disabled mods are renamed for sake of saving a CVar.
Menu now has an edit mode, cancel button, and apply & close.
Move Enable Alternate Assets to be Enable Mods in the mod menu.
Couple small fixes in the item tracker.

* Try to fix Mac.

* Remove disabling for Enable Mods while editing.
Add info about load order in relation to the list.

* Fix archives being added multiple times across multiple init passes.

* Add full-row drag and drop.
Swap columns.
Add information about dragging to header.

* Remove enable/disable flow, and setup the menu to only handle load order.
Change AltAssets to default on.
Move menu to Settings tab.
Move tab hotkey widget to mod menu.
Fix alt assets migrator value.

* Reverse list order for priority on top.

* Remove ExtensionType.
2025-10-20 10:51:56 -07:00
Philip Dubé
8d441f3ae5 fix rando hints for bridge requirements (#5857) 2025-10-20 10:51:43 -07:00
Malkierian
7004c1fc4f Fix GS not being marked as collected when not shuffled. (#5861) 2025-10-20 10:51:33 -07:00
aMannus
fbd21bb342 Add apworld version check on connecting 2025-10-18 22:37:22 +02:00
aMannus
49c74c75b0 clang format 2025-10-18 21:04:50 +02:00
aMannus
cbf847c1b9 Add new RSK's coming from develop 2025-10-18 20:53:24 +02:00
aMannus
5c0517af6f Merge branch 'develop' into aManchipelago 2025-10-18 20:52:01 +02:00
aMannus
e4c9bbfdf9 Add item and player names on AP shop items 2025-10-18 20:38:02 +02:00
aMannus
9a3b2f8da4 Update triforce hunt option parsing 2025-10-18 20:20:14 +02:00
Jordan Longstaff
c806f23494 Potion Shop back door open at night (#5849)
* Potion Shop back door open at night

* Rerun clang-format

* Standard initFunc naming
2025-10-17 08:18:12 -07:00
Philip Dubé
1cd2f60e24 sign hints: add gtg, display destination not source (#5850) 2025-10-17 08:17:53 -07:00
aMannus
71f09723cd Specify required AP version number 2025-10-17 14:32:25 +02:00
aMannus
6d624a1811 Implement random scrub prices 2025-10-17 13:17:41 +02:00
aMannus
c09ea6b76f AP ice trap models and tricknames 2025-10-17 11:19:35 +02:00
aMannus
786f0fec4c Add shop item and price parsing 2025-10-17 00:12:32 +02:00
aMannus
ab00eb9a8c Parsing fixes and more options 2025-10-16 23:14:28 +02:00