nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Clean up rebase errors.

Browse Source
This commit is contained in:
Malkierian
2025-11-21 12:08:22 -07:00
parent d48461f965
commit 08fd5ff5cd
25 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/Enhancements/Holiday/AGreenSpoon.cpp
View File

@@ -62,11 +62,11 @@ static void OnConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Evil Gossip Stone", CVAR("EvilGossipStone"))) {
OnConfigurationChanged();
}
UIWidgets::Tooltip("Don't you dare talk to them.");
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("Evil Gossip Stone", CVAR("EvilGossipStone"))) {
// OnConfigurationChanged();
//}
//UIWidgets::Tooltip("Don't you dare talk to them.");
}
static void RegisterMod() {

8
soh/soh/Enhancements/Holiday/Archez.cpp
View File

@@ -1,7 +1,7 @@
#include "Holiday.hpp"
#include "Archez.h"
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh_assets.h"
@@ -110,9 +110,9 @@ static void ConfigurationChanged() {
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Snow Golems", CVAR("SnowGolems"))) {
ConfigurationChanged();
}
//if (UIWidgets::EnhancementCheckbox("Snow Golems", CVAR("SnowGolems"))) {
// ConfigurationChanged();
//}
UIWidgets::Tooltip("Overrides most charactor skeletons with snow balls to make them look like Snow Golems");
}

66
soh/soh/Enhancements/Holiday/Caladius.cpp
View File

@@ -21,7 +21,7 @@ uint64_t GetUnixTimestamp();
bool isFeverDisabled = false;
bool isExchangeDisabled = false;
float fontScale = 1.0f;
static float fontScale = 1.0f;
extern GetItemEntry vanillaQueuedItemEntry;
@@ -41,7 +41,7 @@ void OnTimeOver() {
int32_t calculateRemainingTime() {
int32_t timeRemaining =
((gSaveContext.sohStats.count[COUNT_ICE_TRAPS] * (CVarGetInteger(CVAR("ExtendTimer"), 0) * 600)) +
((gSaveContext.ship.stats.count[COUNT_ICE_TRAPS] * (CVarGetInteger(CVAR("ExtendTimer"), 0) * 600)) +
(CVarGetInteger(CVAR("StartTimer"), 0) * 600) - GAMEPLAYSTAT_TOTAL_TIME);
if (timeRemaining <= 0) {
OnTimeOver();
@@ -107,7 +107,7 @@ void Present_Update(Actor* actor, PlayState* play) {
uint32_t giftsCollected = CVarGetInteger(CVAR("GiftsCollected"), 0);
giftsCollected++;
CVarSetInteger(CVAR("GiftsCollected"), giftsCollected);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
std::string msg = std::to_string(giftsCollected).c_str();
msg += " Gifts in Inventory.";
Notification::Emit({
@@ -271,38 +271,38 @@ void CaladiusWindow::Draw() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Holiday Fever", CVAR("Fever.Enabled"))) {
OnFeverConfigurationChanged();
}
UIWidgets::Tooltip("Can you beat your objective before the Fever sets in?/n"
"- Obtaining Ice Traps extends your timer.");
if (CVarGetInteger(CVAR("Fever.Enabled"), 0)) {
if (UIWidgets::EnhancementSliderFloat("", "##FontScale", CVAR("FontScale"),
1.0f, 5.0f, "Font: %.1fx", 1.0f, false, false, isFeverDisabled)) {
OnFeverConfigurationChanged();
}
UIWidgets::PaddedEnhancementSliderInt("Starting Timer: %d minutes", "##StartTime", CVAR("StartTimer"),
5, 30, "", 15, true, true, false, isFeverDisabled);
UIWidgets::PaddedEnhancementSliderInt("Time Extensions: %d minutes", "##ExtendTime", CVAR("ExtendTimer"),
1, 10, "", 5, true, true, false, isFeverDisabled);
}
UIWidgets::PaddedSeparator();
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("Holiday Fever", CVAR("Fever.Enabled"))) {
// OnFeverConfigurationChanged();
//}
//UIWidgets::Tooltip("Can you beat your objective before the Fever sets in?/n"
// "- Obtaining Ice Traps extends your timer.");
//if (CVarGetInteger(CVAR("Fever.Enabled"), 0)) {
// if (UIWidgets::EnhancementSliderFloat("", "##FontScale", CVAR("FontScale"),
// 1.0f, 5.0f, "Font: %.1fx", 1.0f, false, false, isFeverDisabled)) {
// OnFeverConfigurationChanged();
// }
// UIWidgets::PaddedEnhancementSliderInt("Starting Timer: %d minutes", "##StartTime", CVAR("StartTimer"),
// 5, 30, "", 15, true, true, false, isFeverDisabled);
// UIWidgets::PaddedEnhancementSliderInt("Time Extensions: %d minutes", "##ExtendTime", CVAR("ExtendTimer"),
// 1, 10, "", 5, true, true, false, isFeverDisabled);
//}
//UIWidgets::PaddedSeparator();
if (UIWidgets::EnhancementCheckbox("Boulder Blitz", CVAR("Blitz.Enabled"))) {
OnBlitzChange();
}
UIWidgets::Tooltip("Boulders will randomly be replaced with other boulder types.");
UIWidgets::PaddedSeparator();
//if (UIWidgets::EnhancementCheckbox("Boulder Blitz", CVAR("Blitz.Enabled"))) {
// OnBlitzChange();
//}
//UIWidgets::Tooltip("Boulders will randomly be replaced with other boulder types.");
//UIWidgets::PaddedSeparator();
if (UIWidgets::EnhancementCheckbox("Ornament Exchange", CVAR("OrnExch.Enabled"))) {
OnPresentChange();
}
UIWidgets::Tooltip("See Malon as Young Link in Lon Lon Ranch to exchange Gifts for Ornaments!");
if (CVarGetInteger(CVAR("OrnExch.Enabled"), 0)) {
UIWidgets::PaddedEnhancementSliderInt("Gifts Required: %d Gifts", "##GiftsReq", CVAR("OrnExch.Amount"),
5, 30, "", 15, true, true, false, isExchangeDisabled);
}
//if (UIWidgets::EnhancementCheckbox("Ornament Exchange", CVAR("OrnExch.Enabled"))) {
// OnPresentChange();
//}
//UIWidgets::Tooltip("See Malon as Young Link in Lon Lon Ranch to exchange Gifts for Ornaments!");
//if (CVarGetInteger(CVAR("OrnExch.Enabled"), 0)) {
// UIWidgets::PaddedEnhancementSliderInt("Gifts Required: %d Gifts", "##GiftsReq", CVAR("OrnExch.Amount"),
// 5, 30, "", 15, true, true, false, isExchangeDisabled);
//}
}
static void RegisterMod() {

8
soh/soh/Enhancements/Holiday/Example.cpp
View File

@@ -27,10 +27,10 @@ static void OnConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("DoSomethingWithPots", CVAR("DoSomethingWithPots"))) {
OnConfigurationChanged();
}
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("DoSomethingWithPots", CVAR("DoSomethingWithPots"))) {
// OnConfigurationChanged();
//}
}
static void RegisterMod() {

14
soh/soh/Enhancements/Holiday/Fredomato.cpp
View File

@@ -1,11 +1,11 @@
#include "Holiday.hpp"
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "objects/object_dog/object_dog.h"
#include "soh/frame_interpolation.h"
#include "soh/Enhancements/randomizer/3drando/random.hpp"
#include "soh/Enhancements/randomizer/3drando/location_access.hpp"
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/custom-collectible/CustomCollectible.h"
#include "soh/Notification/Notification.h"
@@ -336,7 +336,7 @@ void SpawnCollectionPoint() {
EnItem00* collectionPoint = CustomCollectible::Spawn(859.0f, 347.0f, 5185.0f, 0xB000, 0, 0, NULL, NULL);
collectionPoint->actor.update = CollectionPoint_Update;
collectionPoint->actor.draw = CollectionPoint_Draw;
collectionPoint->actor.flags |= ACTOR_FLAG_DRAW_WHILE_CULLED;
collectionPoint->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED;
SkelAnime_InitFlex(gPlayState, &collectionPointSkelAnime, (FlexSkeletonHeader*)&object_toryo_Skel_007150,
(AnimationHeader*)&object_toryo_Anim_000E50, collectionPointJointTable, collectionPointMorphTable, 17);
}
@@ -425,9 +425,9 @@ static void ConfigurationChanged() {
COND_HOOK(OnPlayerUpdate, CVarGetInteger(CVAR("FredsQuest.Enabled"), 0), []() {
if (CVarGetInteger(CVAR("FredsQuest.EncumberedThreshold"), 60) == 0 || FredsQuestWoodOnHand <= CVarGetInteger(CVAR("FredsQuest.EncumberedThreshold"), 60)) {
GameInteractor::State::RunSpeedModifier = 0;
GameInteractor::State::MovementSpeedMultiplier = 0;
} else {
GameInteractor::State::RunSpeedModifier = -2;
GameInteractor::State::MovementSpeedMultiplier = -2;
}
});
@@ -447,7 +447,7 @@ static void DrawMenu() {
// UIWidgets::EnhancementSliderInt("Xs", "Xs", CVAR("tmpxs"), 0, UINT16_MAX, "%d", 1, false);
// UIWidgets::EnhancementSliderInt("Ys", "Ys", CVAR("tmpys"), 0, UINT16_MAX, "%d", 1, false);
// UIWidgets::EnhancementSliderInt("Zs", "Zs", CVAR("tmpzs"), 0, UINT16_MAX, "%d", 1, false);
if (UIWidgets::EnhancementCheckbox("Fred's Quest", CVAR("FredsQuest.Enabled"))) {
/*if (UIWidgets::EnhancementCheckbox("Fred's Quest", CVAR("FredsQuest.Enabled"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Collect wood and bring it to the collection point in Hyrule Field for a small reward.");
@@ -483,7 +483,7 @@ static void DrawMenu() {
if (UIWidgets::EnhancementSliderInt("Spawn Chance", "##RandomTraps.SpawnChance", CVAR("RandomTraps.SpawnChance"), 40, 2000, "%d", 1000, false)) {
ConfigurationChanged();
}
}
}*/
}
static void RegisterMod() {

22
soh/soh/Enhancements/Holiday/Grimey.cpp
View File

@@ -40,7 +40,7 @@ void Penguin_Init(Actor* actor, PlayState* play) {
actor->world.rot.y = penguin.targetRot = rand() % 0x10000;
penguins[actor] = penguin;
actor->gravity = -1.0f;
actor->flags &= ~ACTOR_FLAG_TARGETABLE;
actor->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
}
void Penguin_Update(Actor* actor, PlayState* play) {
@@ -77,7 +77,7 @@ void Penguin_Update(Actor* actor, PlayState* play) {
actor->speedXZ = 0.0f;
}
Actor_MoveForward(actor);
Actor_MoveXZGravity(actor);
Actor_UpdateBgCheckInfo(play, actor, 10.0f, 10.0f, 0.0f, 0xFF);
}
@@ -208,15 +208,15 @@ static void OnConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Penguins", CVAR("Penguins"))) {
OnConfigurationChanged();
}
UIWidgets::Tooltip("Penguins will spawn in huddles throughout hyrule");
if (UIWidgets::EnhancementCheckbox("Hailstorm", CVAR("Hailstorm"))) {
OnConfigurationChanged();
}
UIWidgets::Tooltip("Ever persistent hailstorm throughout hyrule");
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("Penguins", CVAR("Penguins"))) {
// OnConfigurationChanged();
//}
//UIWidgets::Tooltip("Penguins will spawn in huddles throughout hyrule");
//if (UIWidgets::EnhancementCheckbox("Hailstorm", CVAR("Hailstorm"))) {
// OnConfigurationChanged();
//}
//UIWidgets::Tooltip("Ever persistent hailstorm throughout hyrule");
}
static void RegisterMod() {

2
soh/soh/Enhancements/Holiday/Holiday.hpp
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <functional>
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/cosmetics/CosmeticsEditor.h"

74
soh/soh/Enhancements/Holiday/LL.cpp
View File

@@ -66,52 +66,52 @@ static void OnConfigurationChanged() {
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (ImGui::BeginMenu("Customize Rainbows")) {
UIWidgets::EnhancementCheckbox("Enable", CVAR("lEnableCustomRainbows"));
if (CVarGetInteger(CVAR("lEnableCustomRainbows"), 0)) {
ImGui::ColorEdit3("Color 1", (float*)&customColorZero, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Color 2", (float*)&customColorOne, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Color 3", (float*)&customColorMinusZero, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Color 4", (float*)&customColorMinusOne, ImGuiColorEditFlags_NoInputs);
//if (ImGui::BeginMenu("Customize Rainbows")) {
// UIWidgets::EnhancementCheckbox("Enable", CVAR("lEnableCustomRainbows"));
// if (CVarGetInteger(CVAR("lEnableCustomRainbows"), 0)) {
// ImGui::ColorEdit3("Color 1", (float*)&customColorZero, ImGuiColorEditFlags_NoInputs);
// ImGui::ColorEdit3("Color 2", (float*)&customColorOne, ImGuiColorEditFlags_NoInputs);
// ImGui::ColorEdit3("Color 3", (float*)&customColorMinusZero, ImGuiColorEditFlags_NoInputs);
// ImGui::ColorEdit3("Color 4", (float*)&customColorMinusOne, ImGuiColorEditFlags_NoInputs);
UIWidgets::PaddedText("Presets", true, false);
size_t rainbowPresetIdx = 0;
if (UIWidgets::EnhancementCombobox(CVAR("lCustomRainbowPreset"), RAINBOW_PRESET_NAMES, 0) &&
(rainbowPresetIdx = CVarGetInteger(CVAR("lCustomRainbowPreset"), 0)) <= RAINBOW_PRESET_LEN) { //paranoia
customColorZero = RAINBOW_PRESETS[rainbowPresetIdx][0];
customColorOne = RAINBOW_PRESETS[rainbowPresetIdx][1];
customColorMinusZero = RAINBOW_PRESETS[rainbowPresetIdx][2];
customColorMinusOne = RAINBOW_PRESETS[rainbowPresetIdx][3];
}
// UIWidgets::PaddedText("Presets", true, false);
// size_t rainbowPresetIdx = 0;
// if (UIWidgets::EnhancementCombobox(CVAR("lCustomRainbowPreset"), RAINBOW_PRESET_NAMES, 0) &&
// (rainbowPresetIdx = CVarGetInteger(CVAR("lCustomRainbowPreset"), 0)) <= RAINBOW_PRESET_LEN) { //paranoia
// customColorZero = RAINBOW_PRESETS[rainbowPresetIdx][0];
// customColorOne = RAINBOW_PRESETS[rainbowPresetIdx][1];
// customColorMinusZero = RAINBOW_PRESETS[rainbowPresetIdx][2];
// customColorMinusOne = RAINBOW_PRESETS[rainbowPresetIdx][3];
// }
Color_RGBA8 color1, color2, color3, color4;
color1.r = static_cast<uint8_t>(customColorZero.x * 255.0f);
color1.g = static_cast<uint8_t>(customColorZero.y * 255.0f);
color1.b = static_cast<uint8_t>(customColorZero.z * 255.0f);
// Color_RGBA8 color1, color2, color3, color4;
// color1.r = static_cast<uint8_t>(customColorZero.x * 255.0f);
// color1.g = static_cast<uint8_t>(customColorZero.y * 255.0f);
// color1.b = static_cast<uint8_t>(customColorZero.z * 255.0f);
color2.r = static_cast<uint8_t>(customColorOne.x * 255.0f);
color2.g = static_cast<uint8_t>(customColorOne.y * 255.0f);
color2.b = static_cast<uint8_t>(customColorOne.z * 255.0f);
// color2.r = static_cast<uint8_t>(customColorOne.x * 255.0f);
// color2.g = static_cast<uint8_t>(customColorOne.y * 255.0f);
// color2.b = static_cast<uint8_t>(customColorOne.z * 255.0f);
color3.r = static_cast<uint8_t>(customColorMinusZero.x * 255.0f);
color3.g = static_cast<uint8_t>(customColorMinusZero.y * 255.0f);
color3.b = static_cast<uint8_t>(customColorMinusZero.z * 255.0f);
// color3.r = static_cast<uint8_t>(customColorMinusZero.x * 255.0f);
// color3.g = static_cast<uint8_t>(customColorMinusZero.y * 255.0f);
// color3.b = static_cast<uint8_t>(customColorMinusZero.z * 255.0f);
color4.r = static_cast<uint8_t>(customColorMinusOne.x * 255.0f);
color4.g = static_cast<uint8_t>(customColorMinusOne.y * 255.0f);
color4.b = static_cast<uint8_t>(customColorMinusOne.z * 255.0f);
// color4.r = static_cast<uint8_t>(customColorMinusOne.x * 255.0f);
// color4.g = static_cast<uint8_t>(customColorMinusOne.y * 255.0f);
// color4.b = static_cast<uint8_t>(customColorMinusOne.z * 255.0f);
CVarSetColor(CVAR("lCustomRainbow1"), color1);
CVarSetColor(CVAR("lCustomRainbow2"), color2);
CVarSetColor(CVAR("lCustomRainbow3"), color3);
CVarSetColor(CVAR("lCustomRainbow4"), color4);
// CVarSetColor(CVAR("lCustomRainbow1"), color1);
// CVarSetColor(CVAR("lCustomRainbow2"), color2);
// CVarSetColor(CVAR("lCustomRainbow3"), color3);
// CVarSetColor(CVAR("lCustomRainbow4"), color4);
OnConfigurationChanged();
}
// OnConfigurationChanged();
// }
ImGui::EndMenu();
// ImGui::EndMenu();
}
//}
//if (UIWidgets::EnhancementCheckbox("DoSomethingWithPots", CVAR("DoSomethingWithPots"))) {
// OnConfigurationChanged();
//}

12
soh/soh/Enhancements/Holiday/NotProxySaw.cpp
View File

@@ -1,6 +1,6 @@
#include "Holiday.hpp"
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/custom-message/CustomMessageManager.h"
#include "include/message_data_fmt.h"
@@ -122,11 +122,11 @@ static void ConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Ganon Dating Sim", CVAR("GanonDatingSim"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Prior to fighting him at the top of his Castle, you make an attempt to convince Ganon to join you instead.");
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("Ganon Dating Sim", CVAR("GanonDatingSim"))) {
// ConfigurationChanged();
//}
//UIWidgets::Tooltip("Prior to fighting him at the top of his Castle, you make an attempt to convince Ganon to join you instead.");
}
static void RegisterMod() {

14
soh/soh/Enhancements/Holiday/Pablo.cpp
View File

@@ -137,14 +137,14 @@ void RegisterShiny() {
}
void ShinyDrawImGui() {
UIWidgets::PaddedEnhancementCheckbox("Enable Shiny Enemies", CVAR("Shiny.Enabled"), true, false);
UIWidgets::Tooltip("Allows enemies to be shiny.\nShiny enemies are 25% bigger and have 4 times the health but drop "
"the equivalent of a gold rupee upon death");
//UIWidgets::PaddedEnhancementCheckbox("Enable Shiny Enemies", CVAR("Shiny.Enabled"), true, false);
//UIWidgets::Tooltip("Allows enemies to be shiny.\nShiny enemies are 25% bigger and have 4 times the health but drop "
// "the equivalent of a gold rupee upon death");
if (CVarGetInteger(CVAR("Shiny.Enabled"), 0)) {
UIWidgets::PaddedEnhancementSliderInt("Shiny Chance: %d", "##ShinyChance", CVAR("Shiny.Chance"), 1, 8192, "", 8192, true, true, false, false, "");
UIWidgets::Tooltip("The chance for an enemy to be shiny is 1 / Shiny Chance");
}
//if (CVarGetInteger(CVAR("Shiny.Enabled"), 0)) {
// UIWidgets::PaddedEnhancementSliderInt("Shiny Chance: %d", "##ShinyChance", CVAR("Shiny.Chance"), 1, 8192, "", 8192, true, true, false, false, "");
// UIWidgets::Tooltip("The chance for an enemy to be shiny is 1 / Shiny Chance");
//}
}
#pragma endregion

36
soh/soh/Enhancements/Holiday/ProxySaw.cpp
View File

@@ -1,11 +1,11 @@
#include "Holiday.hpp"
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "objects/object_dog/object_dog.h"
#include "soh/frame_interpolation.h"
#include "soh/Enhancements/randomizer/3drando/random.hpp"
#include "soh/Enhancements/randomizer/3drando/location_access.hpp"
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
@@ -202,23 +202,23 @@ static void ConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
//ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Snowballs", CVAR("Snowballs"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Rogue snowballs will spawn in Hyrule Field and Kakariko Village.");
if (UIWidgets::EnhancementCheckbox("Lake Hylia Icebergs", CVAR("Icebergs"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Icebergs will spawn in Lake Hylia.");
if (UIWidgets::EnhancementCheckbox("Down the Rabbit Hole", CVAR("DownTheRabbitHole"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Random grottos will spawn throughout Hyrule. Who knows where they will take you?");
if (UIWidgets::EnhancementCheckbox("Super Bonk", CVAR("SuperBonk"))) {
ConfigurationChanged();
}
//if (UIWidgets::EnhancementCheckbox("Snowballs", CVAR("Snowballs"))) {
// ConfigurationChanged();
//}
//UIWidgets::Tooltip("Rogue snowballs will spawn in Hyrule Field and Kakariko Village.");
//if (UIWidgets::EnhancementCheckbox("Lake Hylia Icebergs", CVAR("Icebergs"))) {
// ConfigurationChanged();
//}
//UIWidgets::Tooltip("Icebergs will spawn in Lake Hylia.");
//if (UIWidgets::EnhancementCheckbox("Down the Rabbit Hole", CVAR("DownTheRabbitHole"))) {
// ConfigurationChanged();
//}
//UIWidgets::Tooltip("Random grottos will spawn throughout Hyrule. Who knows where they will take you?");
//if (UIWidgets::EnhancementCheckbox("Super Bonk", CVAR("SuperBonk"))) {
// ConfigurationChanged();
//}
}
static void RegisterMod() {

4
soh/soh/Enhancements/Holiday/Rando.cpp
View File

@@ -1,6 +1,6 @@
#include "Holiday.hpp"
#include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/custom-message/CustomMessageManager.h"
#include "include/message_data_fmt.h"
@@ -20,7 +20,7 @@ static void ConfigurationChanged() {
}
std::string message;
uint8_t current = gSaveContext.triforcePiecesCollected;
uint8_t current = gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected;
uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
if (current < required) {

10
soh/soh/Enhancements/Holiday/aMannus.cpp
View File

@@ -59,12 +59,12 @@ static void ConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
//ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Roc's Feather", CVAR("RocsFeather"))) {
ConfigurationChanged();
}
UIWidgets::Tooltip("Using Nayru's Love will now act as Roc's Feather instead! No magic required.");
//if (UIWidgets::EnhancementCheckbox("Roc's Feather", CVAR("RocsFeather"))) {
// ConfigurationChanged();
//}
//UIWidgets::Tooltip("Using Nayru's Love will now act as Roc's Feather instead! No magic required.");
}
static void RegisterMod() {

20
soh/soh/Enhancements/Holiday/lilDavid.cpp
View File

@@ -1,6 +1,6 @@
#include "Holiday.hpp"
#include "utils/StringHelper.h"
#include <ship/utils/StringHelper.h>
extern "C" {
#include "macros.h"
@@ -24,10 +24,10 @@ static void OnConfigurationChanged() {
if (!CVarGetInteger(CVAR("BombArrows.Enabled"), 0))
CVarSetInteger(CVAR("BombArrows.Active"), 0);
COND_HOOK(OnSaveFile, CVarGetInteger(CVAR("BombArrows.Enabled"), 0), [](int32_t file) {
COND_HOOK(OnSaveFile, CVarGetInteger(CVAR("BombArrows.Enabled"), 0), [](int32_t file, int32_t sectionID) {
std::string cvar = StringHelper::Sprintf("%s%d", CVAR("BombArrows.Save"), file);
CVarSetInteger(cvar.c_str(), CVarGetInteger(CVAR("BombArrows.Active"), 0));
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
});
COND_HOOK(OnLoadFile, CVarGetInteger(CVAR("BombArrows.Enabled"), 0), [](int32_t file) {
@@ -39,13 +39,13 @@ static void OnConfigurationChanged() {
std::string cvarFrom = StringHelper::Sprintf("%s%d", CVAR("BombArrows.Save"), from);
std::string cvarTo = StringHelper::Sprintf("%s%d", CVAR("BombArrows.Save"), to);
CVarSetInteger(cvarTo.c_str(), CVarGetInteger(cvarFrom.c_str(), 0));
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
});
COND_HOOK(OnDeleteFile, CVarGetInteger(CVAR("BombArrows.Enabled"), 0), [](int32_t file) {
std::string cvar = StringHelper::Sprintf("%s%d", CVAR("BombArrows.Save"), file);
CVarSetInteger(cvar.c_str(), 0);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
});
COND_ID_HOOK(OnActorInit, ACTOR_EN_ARROW, CVarGetInteger(CVAR("BombArrows.Enabled"), 0), [](void* actorRef) {
@@ -116,11 +116,11 @@ static void OnConfigurationChanged() {
}
static void DrawMenu() {
ImGui::SeparatorText(AUTHOR);
if (UIWidgets::EnhancementCheckbox("Bomb Arrows", CVAR("BombArrows.Enabled"))) {
OnConfigurationChanged();
}
UIWidgets::Tooltip("Equip bombs over an already equipped Bow to shoot bomb arrows");
//ImGui::SeparatorText(AUTHOR);
//if (UIWidgets::EnhancementCheckbox("Bomb Arrows", CVAR("BombArrows.Enabled"))) {
// OnConfigurationChanged();
//}
//UIWidgets::Tooltip("Equip bombs over an already equipped Bow to shoot bomb arrows");
}
static void RegisterMod() {

2
soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
View File

@@ -15,7 +15,7 @@ extern PlayState* gPlayState;
uint64_t GetUnixTimestamp();
}
float fontScale = 1.0f;
static float fontScale = 1.0f;
std::string timeDisplayTime = "";
ImTextureID textureDisplay = 0;
ImVec4 windowBG = ImVec4(0, 0, 0, 0.5f);

2
soh/soh/Enhancements/custom-collectible/CustomCollectible.cpp
View File

@@ -178,7 +178,7 @@ void CustomCollectible_Update(Actor* actor, PlayState* play) {
}
if (actor->gravity != 0.0f) {
Actor_MoveForward(actor);
Actor_MoveXZGravity(actor);
Actor_UpdateBgCheckInfo(play, actor, 20.0f, 15.0f, 15.0f, 0x1D);
}

1
soh/soh/Enhancements/mods.cpp
View File

@@ -7,6 +7,7 @@
#include "soh/Enhancements/enhancementTypes.h"
#include <soh/Enhancements/item-tables/ItemTableManager.h>
#include "soh/Enhancements/timesaver_hook_handlers.h"
#include "soh/Enhancements/randomizer/3drando/random.hpp"
#include "soh/Enhancements/randomizer/hook_handlers.h"
#include "soh/Enhancements/Holiday/Holiday.hpp"

1
soh/soh/Enhancements/randomizer/randomizer.h
View File

@@ -39,6 +39,7 @@ class Randomizer {
static const std::string IceTrapRandoMessageTableID;
static const std::string randoMiscHintsTableID;
static const std::string archipelagoItemsTableID;
static const std::string christmasTreeMessageTableID;
static Sprite* GetSeedTexture(uint8_t index);
bool SpoilerFileExists(const char* spoilerFileName);

2
soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View File

@@ -17,7 +17,7 @@
#include "soh/Enhancements/Holiday/Archez.h"
#define FLAGS \
(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED)
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
typedef enum {
/* 0 */ THROW_NORMAL,

10
soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c
View File

@@ -77,9 +77,9 @@ void EnChristmasTree_Talk(EnChristmasTree* this, PlayState* play) {
if (dialogState != TEXT_STATE_CHOICE) {
if ((dialogState == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { // advanced final textbox
// Teleport to credits when goal is reached.
if (gSaveContext.triforcePiecesCollected >= Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) {
gSaveContext.sohStats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME;
gSaveContext.sohStats.gameComplete = 1;
if (gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected >= Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) {
gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME;
gSaveContext.ship.stats.gameComplete = 1;
Play_PerformSave(play);
GameInteractor_SetTriforceHuntCreditsWarpActive(true);
this->actionFunc = EnChristmasTree_SetupEndTitle;
@@ -148,7 +148,7 @@ void EnChristmasTree_Update(Actor* thisx, PlayState* play) {
Actor_SetFocus(&this->actor, 80.0f);
uint8_t triforceHuntActive = Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
float percentageCompleted = (float)gSaveContext.triforcePiecesCollected /
float percentageCompleted = (float)gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected /
(float)Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
if ((percentageCompleted >= 1.0f || !triforceHuntActive) && !this->spawnedRupee) {
@@ -165,7 +165,7 @@ void EnChristmasTree_Draw(Actor* thisx, PlayState* play) {
float treeSize = 55.0f;
uint8_t triforceHuntActive = Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
float percentageCompleted = (float)gSaveContext.triforcePiecesCollected /
float percentageCompleted = (float)gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected /
(float)Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED);
OPEN_DISPS(play->state.gfxCtx);

1
soh/src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@@ -5,6 +5,7 @@
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#include "soh_assets.h"
#include "soh/Enhancements/Holiday/Archez.h"
#define FLAGS \

3
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@@ -8,6 +8,8 @@
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/Enhancements/Holiday/Archez.h"
#include "soh_assets.h"
#include "functions.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
@@ -2030,6 +2032,7 @@ void EnGo2_Update(Actor* thisx, PlayState* play) {
s32 EnGo2_DrawCurledUp(EnGo2* this, PlayState* play) {
Vec3f D_80A48554 = { 0.0f, 0.0f, 0.0f };
OPEN_DISPS(play->state.gfxCtx);
if (CVarGetInteger("gHoliday.Archez.SnowGolems", 0)) {
Matrix_Translate(0.0f, 10.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(1.75f, 1.75f, 1.75f, MTXMODE_APPLY);

9
soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
View File

@@ -373,13 +373,6 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
// no-op
} else
if (GameInteractor_Should(VB_TREE_DROP_ITEM, true, this)) {
if ((this->unk_14C >= 0) && (this->unk_14C < 0x64) && (CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0)) && !(INV_CONTENT(ITEM_STICK) == ITEM_NONE)) {
(numDrops = (Rand_ZeroOne() * 4));
for (i = 0; i < numDrops; ++i) {
Item_DropCollectible(play, &dropsSpawnPt, ITEM00_STICK);
}
}
} else {
if ((this->unk_14C >= 0) && (this->unk_14C < 0x64)) {
if (GameInteractor_Should(VB_TREE_DROP_COLLECTIBLE, true, this)) {
Item_DropCollectibleRandom(play, &this->actor, &dropsSpawnPt, this->unk_14C << 4);
@@ -388,7 +381,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
this->actor.home.rot.z &= 0x1FFF;
this->actor.home.rot.z |= 0xE000;
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, dropsSpawnPt.x, dropsSpawnPt.y, dropsSpawnPt.z, 0,
this->actor.world.rot.y, 0, this->actor.home.rot.z, true);
this->actor.world.rot.y, 0, this->actor.home.rot.z, true);
this->actor.home.rot.z = 0;
}
}

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

@@ -8576,7 +8576,7 @@ void Player_Action_808414F8(Player* this, PlayState* play) {
Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_LINEAR, play);
int32_t giSpeedModifier = GameInteractor_RunSpeedModifier();
int32_t giSpeedModifier = GameInteractor_MovementSpeedMultiplier();
if (giSpeedModifier != 0) {
if (giSpeedModifier > 0) {
speedTarget *= giSpeedModifier;

1
soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
View File

@@ -193,3 +193,4 @@ void EffectSsBomb2_Update(PlayState* play, u32 index, EffectSs* this) {
this->rEnvColorG = func_80027DD4(this->rEnvColorG, 255, divisor);
this->rEnvColorB = func_80027DD4(this->rEnvColorB, 255, divisor);
}
}