From 8bf01a6c43746fbdfb463ae50209b84cef950eb1 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Tue, 29 Sep 2026 09:15:32 -0500 Subject: [PATCH] fix(scripts): the water gun blows Forbidden Valley candles out L_ACT_CANDLE also blows a candle out on the "waterspray" skill event; the port only did it on a hit. The 169 candles in Forbidden Valley now go out (and count for missions 850, 1431, 1529, 1566 and 1603) when sprayed. Check: spray a candle with the water gun: it goes out, smokes, relights after 5 seconds, and the candle missions count it. Co-Authored-By: Claude Opus 5.5 --- dScripts/02_server/Map/FV/FvCandle.cpp | 5 +++++ dScripts/02_server/Map/FV/FvCandle.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dScripts/02_server/Map/FV/FvCandle.cpp b/dScripts/02_server/Map/FV/FvCandle.cpp index 0c4344d03..805d1334c 100644 --- a/dScripts/02_server/Map/FV/FvCandle.cpp +++ b/dScripts/02_server/Map/FV/FvCandle.cpp @@ -19,6 +19,11 @@ void FvCandle::OnHit(Entity* self, Entity* attacker) { BlowOutCandle(self, attacker); } +// The water gun blows candles out too +void FvCandle::OnSkillEventFired(Entity* self, Entity* caster, const std::string& message) { + if (message == "waterspray" && caster) BlowOutCandle(self, caster); +} + void FvCandle::BlowOutCandle(Entity* self, Entity* blower) { if (self->GetBoolean(u"AmHit")) return; diff --git a/dScripts/02_server/Map/FV/FvCandle.h b/dScripts/02_server/Map/FV/FvCandle.h index e0cd4e040..97234f83a 100644 --- a/dScripts/02_server/Map/FV/FvCandle.h +++ b/dScripts/02_server/Map/FV/FvCandle.h @@ -6,6 +6,7 @@ class FvCandle : public CppScripts::Script public: void OnStartup(Entity* self); void OnHit(Entity* self, Entity* attacker); + void OnSkillEventFired(Entity* self, Entity* caster, const std::string& message) override; void OnTimerDone(Entity* self, std::string timerName); private: void BlowOutCandle(Entity* self, Entity* blower);