Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5b9bb7ca90 into fbbfc07ff1

Browse source
This commit is contained in:
Philip Dubé 2025-04-25 00:20:38 +00:00 • committed by GitHub
commit 916084a041
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/soh/SohGui/SohMenuEnhancements.cpp
View file

@ -825,6 +825,11 @@ void SohMenu::AddMenuEnhancements() {
.CVar(CVAR_ENHANCEMENT("FastFarores"))
.Options(CheckboxOptions().Tooltip("Greatly decreases cast time of Farore's Wind magic spell."));
AddWidget(path, "Bottles", WIDGET_SEPARATOR_TEXT);
AddWidget(path, "Rebottle Blue Fire", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("RebottleBlueFire"))
.Options(CheckboxOptions().Tooltip("Blue Fire dropped from bottle can be bottled."));
// Fixes
path.sidebarName = "Fixes";
AddSidebarEntry("Enhancements", path.sidebarName, 3);

11
soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
View file

@ -7,6 +7,8 @@
#include "z_en_ice_hono.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include <libultraship/libultra.h>
#define FLAGS 0
void EnIceHono_Init(Actor* thisx, PlayState* play);
@ -296,6 +298,10 @@ void EnIceHono_SpreadFlames(EnIceHono* this, PlayState* play) {
}
}
if (CVarGetInteger(CVAR_ENHANCEMENT("RebottleBlueFire"), 0)) {
EnIceHono_CapturableFlame(this, play);
}
if (this->timer <= 0) {
Actor_Kill(&this->actor);
}
@ -331,6 +337,11 @@ void EnIceHono_SmallFlameMove(EnIceHono* this, PlayState* play) {
this->alpha -= 10;
this->alpha = CLAMP(this->alpha, 0, 255);
}
if (CVarGetInteger(CVAR_ENHANCEMENT("RebottleBlueFire"), 0)) {
EnIceHono_CapturableFlame(this, play);
}
if (this->timer <= 0) {
Actor_Kill(&this->actor);
}