mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-03-03 10:11:51 -05:00
Code Issues Projects Releases Wiki Activity

Fix shield invert tooltips and X-axis application (#4802)

Browse Source 
* Update Forest and Carpenters CVars in the migrator.

* Fix shield invert tooltips and X-axis application.
This commit is contained in:
Malkierian 2025-01-04 00:41:14 -07:00 committed by GitHub
parent 8648cdeca5
commit bbc4cc3305
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@ -1582,9 +1582,9 @@ void SohInputEditorWindow::DrawCameraControlPanel() {
UIWidgets::PaddedEnhancementCheckbox("Invert Aiming Y Axis", CVAR_SETTING("Controls.InvertAimingYAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
UIWidgets::Tooltip("Inverts the Camera Y Axis in:\n-First-Person/C-Up view\n-Weapon Aiming");
UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming X Axis", CVAR_SETTING("Controls.InvertShieldAimingXAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
UIWidgets::Tooltip("Inverts the Shield Aiming Y Axis");
UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming Y Axis", CVAR_SETTING("Controls.InvertShieldAimingYAxis"));
UIWidgets::Tooltip("Inverts the Shield Aiming X Axis");
UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming Y Axis", CVAR_SETTING("Controls.InvertShieldAimingYAxis"));
UIWidgets::Tooltip("Inverts the Shield Aiming Y Axis");
UIWidgets::PaddedEnhancementCheckbox("Invert Z-Weapon Aiming Y Axis", CVAR_SETTING("Controls.InvertZAimingYAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
UIWidgets::Tooltip("Inverts the Camera Y Axis in:\n-Z-Weapon Aiming");
UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First-Person View", CVAR_SETTING("DisableFirstPersonAutoCenterView"));

4
soh/soh/config/ConfigMigrators.h
View File

@ -1321,12 +1321,12 @@ namespace SOH {
{ MigrationAction::Rename, "gRandomizeEnableBombchuDrops", "gRandoSettings.EnableBombchuDrops" },
{ MigrationAction::Rename, "gRandomizeEnableGlitchCutscenes", "gRandoSettings.EnableGlitchCutscenes" },
{ MigrationAction::Rename, "gRandomizeEnabledTricks", "gRandoSettings.EnabledTricks" },
{ MigrationAction::Rename, "gRandomizeForest", "gRandoSettings.Forest" },
{ MigrationAction::Rename, "gRandomizeForest", "gRandoSettings.ClosedForest" },
{ MigrationAction::Rename, "gRandomizeFrogsHint", "gRandoSettings.FrogsHint" },
{ MigrationAction::Rename, "gRandomizeFullWallets", "gRandoSettings.FullWallets" },
{ MigrationAction::Rename, "gRandomizeGanonTrial", "gRandoSettings.GanonTrial" },
{ MigrationAction::Rename, "gRandomizeGanonTrialCount", "gRandoSettings.GanonTrialCount" },
{ MigrationAction::Rename, "gRandomizeGerudoFortress", "gRandoSettings.GerudoFortress" },
{ MigrationAction::Rename, "gRandomizeGerudoFortress", "gRandoSettings.FortressCarpenters" },
{ MigrationAction::Rename, "gRandomizeGerudoKeys", "gRandoSettings.GerudoKeys" },
{ MigrationAction::Rename, "gRandomizeGossipStoneHints", "gRandoSettings.GossipStoneHints" },
{ MigrationAction::Rename, "gRandomizeGregHint", "gRandoSettings.GregHint" },

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -9269,7 +9269,7 @@ void Player_Action_80843188(Player* this, PlayState* play) {
f32 sp40;
sp54 = sControlInput->rel.stick_y * 100 * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 1) ? 1 : -1);
sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 0) ? -1 : 1);
sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingXAxis"), 0) ? -1 : 1);
sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
sp40 = Math_CosS(sp4E);