mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 19:32:17 -05:00
Code Issues Projects Releases Wiki Activity

disable crit wiggle (#1629)

Browse Source 
* disable crit wiggle

* Set to zero in default preset
This commit is contained in:
louist103 2022-09-28 20:27:07 -04:00 committed by GitHub
parent 08915e5684
commit dc3c0dd9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/soh/GameMenuBar.cpp
View File

@ -312,6 +312,9 @@ namespace GameMenuBar {
CVar_SetS32("gGsCutscene", 0); CVar_SetS32("gGsCutscene", 0);
// Autosave // Autosave
CVar_SetS32("gAutosave", 0); CVar_SetS32("gAutosave", 0);
//Crit wiggle disable
CVar_SetS32("gDisableCritWiggle", 0);
} }
void applyEnhancementPresetVanillaPlus(void) { void applyEnhancementPresetVanillaPlus(void) {
@ -980,6 +983,9 @@ namespace GameMenuBar {
forceEnableSunLightArrows, forceEnableSunLightArrowsText, UIWidgets::CheckboxGraphics::Checkmark); forceEnableSunLightArrows, forceEnableSunLightArrowsText, UIWidgets::CheckboxGraphics::Checkmark);
UIWidgets::Tooltip("Allows Light Arrows to activate sun switches.\nMay require a room reload if toggled during gameplay."); UIWidgets::Tooltip("Allows Light Arrows to activate sun switches.\nMay require a room reload if toggled during gameplay.");
UIWidgets::PaddedEnhancementCheckbox("Disable Crit wiggle", "gDisableCritWiggle", true, false);
UIWidgets::Tooltip("Disable random camera wiggle at low health");
ImGui::EndMenu(); ImGui::EndMenu();
} }

8
soh/src/code/z_camera.c
View File

@ -1732,9 +1732,11 @@ s32 Camera_Normal1(Camera* camera) {
} }
// crit wiggle // crit wiggle
if (gSaveContext.health <= 16 && ((camera->globalCtx->state.frames % 256) == 0)) { if(!CVar_GetS32("gDisableCritWiggle",0)) {
wiggleAdj = Rand_ZeroOne() * 10000.0f; if (gSaveContext.health <= 16 && ((camera->globalCtx->state.frames % 256) == 0)) {
camera->inputDir.y = wiggleAdj + camera->inputDir.y; wiggleAdj = Rand_ZeroOne() * 10000.0f;
camera->inputDir.y = wiggleAdj + camera->inputDir.y;
}
} }
} else { } else {
anim->swing.swingUpdateRate = norm1->unk_0C; anim->swing.swingUpdateRate = norm1->unk_0C;