Commit Graph

3213 Commits

Author SHA1 Message Date
Jerom Venneker
bf85a85aba Merge remote-tracking branch 'fork/aManchipelago' into AddArchipelagoClientLib 2025-05-31 01:03:29 +02:00
aMannus
df525c2f1e Merge branch 'develop' into aManchipelago 2025-05-30 23:49:18 +02:00
Pepe20129
f5d8f1eece Add ShuffleSongs.cpp & RO_SONG_SHUFFLE_OFF (#5534)
* ShuffleSongs.cpp

* Address review and fix build

* Update soh/soh/Enhancements/randomizer/settings.cpp

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

* Change back to "Off"

---------

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
2025-05-30 12:51:21 -07:00
Jerom Venneker
a2e7b21155 Fixed quote typo 2025-05-30 20:18:07 +02:00
aMannus
11d055c3f1 Fix windows build 2025-05-30 19:14:01 +02:00
aMannus
bbfcf8789c Merge pull request #70 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-05-30 18:59:33 +02:00
Jerom Venneker
03c93484fd Added Error messages when attempting to send messages while disconnected and when attempting to use local commands 2025-05-30 11:36:34 +02:00
Malkierian
40fa3c8d64 Convert RandomizerInf to the dynamic #define model to allow for automatic string names. (#5537) 2025-05-29 19:14:32 -07:00
Jerom Venneker
497700fe6a Added textbox to console window for chatting and server commands 2025-05-29 19:38:38 +02:00
Philip Dubé
2b360d4bbe Rebottle Blue Fire (#5375)
* Rebottle Blue Fire

* hookify
2025-05-29 07:06:53 -07:00
Jerom Venneker
7d49cb1281 Refactor so apclientpp.h doesn't have to be included a second time 2025-05-29 00:00:13 +02:00
Jerom Venneker
422b7d1950 Added proper archipelago textclient colors to the console 2025-05-28 22:52:14 +02:00
Jerom Venneker
cc40d3ca86 Moved hooks to Registration function and improved item queue filtering 2025-05-28 15:15:46 +02:00
Jerom Venneker
747da8d6b7 Added auto disconnect if loading a save accosiated with the wrong slot 2025-05-28 14:53:59 +02:00
Jerom Venneker
d9d453501e Corrected spelling on receive 2025-05-28 10:30:58 +02:00
Jerom Venneker
7a8a5a19a0 Don't Send or queue Unknown checks. Todo, figure out what triggers sending one 2025-05-28 10:21:24 +02:00
aMannus
d8a9355846 Merge pull request #69 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-05-27 23:18:17 +02:00
aMannus
9d3ea502bb Implement rewards gcbk settings & fix shopsanity 2025-05-27 23:12:01 +02:00
Malkierian
fa6f45bde5 Fix Preset List with no customs available (#5535)
* Surround preset file processing with the fs::exists check rather than returning early.

* clang
2025-05-27 13:19:14 -07:00
Jerom Venneker
6662818d95 Filtering out already locally checked locations from recieving location sync 2025-05-27 22:03:12 +02:00
Jerom Venneker
36cf22c196 Added some pretty (arbitrary) collors to the archipelago log 2025-05-27 21:28:19 +02:00
aMannus
44be44b513 Merge pull request #68 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-05-26 22:49:11 +02:00
Jerom Venneker
dbf8503369 Added text recieved from AP to the log 2025-05-26 22:07:58 +02:00
Jerom Venneker
5be1a2d419 Merge remote-tracking branch 'fork/aManchipelago' into AddArchipelagoClientLib 2025-05-26 20:54:49 +02:00
Jerom Venneker
f6359f1008 Added opening of local checks when synchinc locations 2025-05-26 20:51:49 +02:00
aMannus
66937c8423 Add icons to ap item notifications 2025-05-26 13:17:09 +02:00
aMannus
ba1af32ba4 Switch to outline-less ap item models 2025-05-26 11:05:05 +02:00
aMannus
d5f395493b Show item name and player in ap item pickup notification 2025-05-26 10:49:44 +02:00
aMannus
e6fec935d6 Load in new shuffle options data 2025-05-26 00:30:49 +02:00
Jerom Venneker
603c163167 Rework Item Queue, Repeated connections should no longer give multiple copies of the same item 2025-05-25 21:17:44 +02:00
aMannus
ab307fa3e9 Beginning of retrieving slot data (deathlink), various fixes 2025-05-25 11:29:13 +02:00
aMannus
2b6f81351c Hard code archipelago options 2025-05-24 12:12:18 +02:00
aMannus
ad0a73a32f Merge pull request #66 from jeromkiller/AddArchipelagoClientLib
Add archipelago client lib
2025-05-24 10:44:47 +02:00
Jordan Longstaff
4e8e6d2313 Move Rupee Dash Mode hook to its own file (#5178)
* Move Rupee Dash Mode hook to its own file

* Rename initFunc
2025-05-23 20:29:43 -07:00
Rozelette
8b4cad1710 Rework ActorViewer to use hooks (#5474)
* Rework ActorViewer to use hooks

* Rework ActorViewer to use hooks

* Remove ResetData
2025-05-23 18:47:08 -07:00
TheLynk
f2298c6a8e Add Two New Tricks "Navi dive" (#5477)
* add navi dive bottom of the well

* add kokiri sword logic for botw

* Optimisation Logic

* Add Navi Dive Lost Wood

* Update Logic

* Move IsChild in logic trick

* Add brackets

* Clang-Format

* Tweak Text

Tweak Text

* Final Push ?

* It's really the last push
2025-05-23 15:37:30 -07:00
Malkierian
99c3fa6006 Preset Manager (#5459)
* Add presets sidebar, proof of concept row-based listing.

* Complete and unify section check/x drawing.

* Add error state to InputString, and corresponding members and builders to InputOptions.
Implement saving and loading of preset files.

* Implement `Config::SetBlock()`.
Implement Apply.
Implement Delete.
Some json structure changes.

* Apply `CVarClear()` calls in CVar-prefixed widget functions.

* Comment out satellite preset pickers for now.

* clang

* Fix ButtonOptions initializer list.

* I hate clang...

* Loop new preset checkbox creation.
Restore auto-resizing to new preset popup.
Remove errant BeginDisabled in randomizer (merge artifact?).

* Add BlockInfo struct to make array with all info for each block.
Setup loops for all other same-ish situations (applying presets, setting up columns, etc) based on blockInfo.

* Save tracker windows info for later restoration.
Lay the groundwork for said restoration.

* Complete tracker window restoration on preset application.

* Fix RadioButtonsOptions builder parameter type.
Add race lockout to new and apply buttons.

* Revert application of CVarClear on UIWidgets widgets (need to preserve manually-set default states).

* Remove enhancements satellite picker.
Swap randomizer satellite picker to use the manager presets, only displays presets with randomizer section included.
Move built-in presets to the asset archive, and remove delete button on them.
Remove PresetEntries.cpp.

* Fix locations and tricks tabs not updating live when applying preset with new system.

* Apply RandoGenerating lockout to rando preset Apply button.

* Fix new presets not being properly filtered in satellite selectors.

* Fix currently selected presets getting deleted still being selected in satellite selectors.

* Change BigPoeTargetCount in preset files to 1.
2025-05-23 14:57:49 -07:00
Philip Dubé
3a069e621e Fix warnings (#5516)
* use size_t instead of uint8_t for hint ids

* va_arg int instead of s16

warning: second argument to 'va_arg' is of promotable type 's16' (aka 'short'); this va_arg has undefined behavior because arguments will be promoted to 'int' [-Wvarargs]

* more issues like #5443
2025-05-23 14:21:25 -07:00
Rozelette
a2541fded8 Exclude build dependencies from clang format (#5490) 2025-05-23 14:06:19 -07:00
nclok1405
150029fa49 Set default player name to "リンク" ("Link" in Katakana) when playing in Japanese (#5487) 2025-05-23 14:05:59 -07:00
Rozelette
e4448f491e Add ObjectExtension system (#5429) 2025-05-23 14:05:33 -07:00
Jordan Longstaff
db8440e744 Move Shadow Tag Mode hook to its own file (#5179)
* Move Shadow Tag Mode hook to its own file

* Rename initFunc
2025-05-23 14:04:43 -07:00
Jordan Longstaff
d8acc32876 Move Daytime Gold Skulltulas mod hook to its own file (#5174)
* Move Daytime Gold Skulltulas mod hook to its own file

* Fix externs?

* Rename initFunc
2025-05-23 14:04:20 -07:00
Malkierian
ae480e107e Implement Log Level selector setting (#5263)
* Implement Log Level selector setting.

* run clang

* Enum for default value.

* PR feedback: use CVAR_DEVELOPER_TOOLS in CVar builder.

* Slight change to try to force a PR update.

* screw you clang
2025-05-23 14:03:30 -07:00
Philip Dubé
ca32dfd246 Dampe Fire (#5521)
* No Dampe Fire

* spicy

* bikeshed
2025-05-23 14:03:20 -07:00
Philip Dubé
24013e2e5c skip bottling big poes (#5247)
* setting to skip bottling big poes

empty bottle still required to collect

avoids logic needing to work around player soft locking by filling bottles without poe collector access

* No option, zero option

* TEXT_BIG_POE_COLLECTED_RANDO

* update preset

* fix talking to poe collector after receiving item
2025-05-23 14:00:35 -07:00
Jerom Venneker
ea95ca0a9a Enabled Connecting and check synching when already in game 2025-05-23 19:28:42 +02:00
Jerom Venneker
a9e99e400c Removed IS_ARCHIPELAGO defines 2025-05-23 18:22:50 +02:00
Jerom Venneker
b2c2be034e Added Item Synch on game load 2025-05-23 18:04:08 +02:00
aMannus
c15abdc411 Init archipelago data, place different AP item types 2025-05-23 13:50:20 +02:00