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

Added a time saver option to allow players to instantly put items away (#600)

Browse Source 
* Added a time saver option to allow players to instantly put items away

Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge

* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental

The FPS slider is now a text input

* Splitting into solely being a quick putaway PR

* Removed some leftover code from the split
This commit is contained in:
earthcrafterman 2022-07-21 20:31:49 -04:00 committed by Kenix3
parent 706e57dd7b
commit 3a9dd95abc
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libultraship/libultraship/ImGuiImpl.cpp
View File

@ -975,7 +975,8 @@ namespace SohImGui {
Tooltip("The default response to Kaepora Gaebora is\nalways that you understood what he said"); Tooltip("The default response to Kaepora Gaebora is\nalways that you understood what he said");
EnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback"); EnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback");
Tooltip("Skip the part where the Ocarina playback is called when you play\na song"); Tooltip("Skip the part where the Ocarina playback is called when you play\na song");
EnhancementCheckbox("Instant Putaway", "gInstantPutaway");
Tooltip("Allow Link to put items away without having to wait around");
ImGui::EndMenu(); ImGui::EndMenu();
} }
@ -1249,6 +1250,15 @@ namespace SohImGui {
if (ImGui::SliderInt("##FPSInterpolation", &val, 20, 250, "", ImGuiSliderFlags_AlwaysClamp)) if (ImGui::SliderInt("##FPSInterpolation", &val, 20, 250, "", ImGuiSliderFlags_AlwaysClamp))
{ {
if (val > 250)
{
val = 250;
}
else if (val < 20)
{
val = 20;
}
CVar_SetS32(fps_cvar, val); CVar_SetS32(fps_cvar, val);
needs_save = true; needs_save = true;
} }

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

@ -9905,9 +9905,16 @@ void func_808473D4(GlobalContext* globalCtx, Player* this) {
this->unk_837 = 20; this->unk_837 = 20;
} }
else if (this->unk_837 != 0) { else if (this->unk_837 != 0) {
if (CVar_GetS32("gInstantPutaway", 0) != 0)
{
this->unk_837 = 0;
}
else
{
doAction = DO_ACTION_NONE; doAction = DO_ACTION_NONE;
this->unk_837--; this->unk_837--;
} }
}
Interface_SetDoAction(globalCtx, doAction); Interface_SetDoAction(globalCtx, doAction);