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

Rebottle Blue Fire

Browse source
This commit is contained in:
Demur Rumed 2025-04-10 00:33:09 +00:00
parent 824c203b97
commit 5b9bb7ca90
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

@ -791,6 +791,11 @@ void SohMenu::AddMenuEnhancements() {
.CVar(CVAR_ENHANCEMENT("FastFarores")) .CVar(CVAR_ENHANCEMENT("FastFarores"))
.Options(CheckboxOptions().Tooltip("Greatly decreases cast time of Farore's Wind magic spell.")); .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 // Fixes
path.sidebarName = "Fixes"; path.sidebarName = "Fixes";
AddSidebarEntry("Enhancements", path.sidebarName, 3); 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 "z_en_ice_hono.h"
#include "objects/gameplay_keep/gameplay_keep.h" #include "objects/gameplay_keep/gameplay_keep.h"
#include <libultraship/libultra.h>
#define FLAGS 0 #define FLAGS 0
void EnIceHono_Init(Actor* thisx, PlayState* play); 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) { if (this->timer <= 0) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -331,6 +337,11 @@ void EnIceHono_SmallFlameMove(EnIceHono* this, PlayState* play) {
this->alpha -= 10; this->alpha -= 10;
this->alpha = CLAMP(this->alpha, 0, 255); this->alpha = CLAMP(this->alpha, 0, 255);
} }
if (CVarGetInteger(CVAR_ENHANCEMENT("RebottleBlueFire"), 0)) {
EnIceHono_CapturableFlame(this, play);
}
if (this->timer <= 0) { if (this->timer <= 0) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }