feat: TESHarvestEvent implementation, minor cleanup

FlenarnTemp · Oct 3, 2024 · 90663c5 · 90663c5
1 parent 208bde6
commit 90663c5
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/Plugin/src/Events/TESHavestEvent.h b/Plugin/src/Events/TESHavestEvent.h
@@ -0,0 +1,39 @@
+#pragma once
+
+namespace RE
+{
+	namespace Cascadia
+	{
+		class TESHarvestEventWatcher :
+			public BSTEventSink<TESHarvestEvent::ItemHarvested>
+		{
+			virtual BSEventNotifyControl ProcessEvent(const TESHarvestEvent::ItemHarvested& a_event, BSTEventSource<TESHarvestEvent::ItemHarvested>*) override
+			{
+				if (a_event.harvestedBy == PlayerCharacter::GetSingleton())
+				{ 
+					DEBUG("Harvest event sent by player, harvested REFR: {}, harvest object: {}", a_event.referenceHarvested->GetFormEditorID(), a_event.itemHarvested->GetFormEditorID());	
+					const char* itemHarvested = a_event.itemHarvested->GetFormEditorID();
+
+					if (strcmp(itemHarvested, "CAS_LL_WoodPile_Random") == 0)
+					{
+						SendHUDMessage::ShowHUDMessage("Firewood Added.", nullptr, true, true);
+					}
+					else 
+					{
+						return BSEventNotifyControl::kContinue;
+					}
+
+				}
+
+				return BSEventNotifyControl::kContinue;
+			}
+		};
+
+		void RegisterTESHarvestEventSink()
+		{
+			TESHarvestEventWatcher* tesHarvestEvent = new TESHarvestEventWatcher();
+			TESHarvestEvent::ItemHarvested::GetEventSource()->RegisterSink(tesHarvestEvent);
+			INFO("Registered 'TESHarvestEvent::ItemHarvested' sink.");
+		}
+	}
+}
diff --git a/Plugin/src/Menus/PipboyMenu.h b/Plugin/src/Menus/PipboyMenu.h
@@ -40,17 +40,15 @@ namespace RE
 				{
 					if (_stricmp(currentSWFPath.GetString(), "Interface/PipboyMenu.swf") == 0)
 					{
-						Scaleform::GFx::Value loader;
-						Scaleform::GFx::Value urlRequest;
-						Scaleform::GFx::Value rootValue;
-						a_view->asMovieRoot->GetVariable(&rootValue, "root");
+						Scaleform::GFx::Value loader, urlRequest, root;
+						a_view->asMovieRoot->GetVariable(&root, "root");
 						a_view->asMovieRoot->CreateObject(&loader, "flash.display.Loader");
-						Scaleform::GFx::Value newSWFName = "CASPipboy.swf";
-						a_view->asMovieRoot->CreateObject(&urlRequest, "flash.net.URLRequest", &newSWFName, 1);
-						rootValue.SetMember("casPipboy_loader", &loader);
+						Scaleform::GFx::Value pipboy = "CASPipboy.swf";
+						a_view->asMovieRoot->CreateObject(&urlRequest, "flash.net.URLRequest", &pipboy, 1);
+						root.SetMember("casPipboy_loader", &loader);
 						Scaleform::GFx::Value casPipboy;
 						a_view->asMovieRoot->CreateObject(&casPipboy);
-						rootValue.SetMember("casPipboy", &casPipboy);
+						root.SetMember("casPipboy", &casPipboy);
 						RegisterFunction<PipboyReady>(&casPipboy, a_view->asMovieRoot, "ready");
 						RegisterFunction<PipboyHideWorkshopTab>(&casPipboy, a_view->asMovieRoot, "IsWorkshopTabHidden");
 						a_view->asMovieRoot->Invoke("root.casPipboy_loader.load", nullptr, &urlRequest, 1);

diff --git a/Plugin/src/main.cpp b/Plugin/src/main.cpp
@@ -2,6 +2,7 @@
 #include "Events/InputEvent.h"
 #include "Events/MenuOpenCloseEvent.h"
 #include "Events/TESInitScriptEvent.h"
+#include "Events/TESHavestEvent.h"
 #include "Events/TESHitEvent.h"
 #include "Menus/ExamineConfirmMenu.h"
 #include "Menus/PipboyMenu.h"
@@ -48,8 +49,9 @@ namespace
 			RE::Cascadia::DefineItemDegradationFormsFromGame();
 			RE::Cascadia::InputEventReceiverOverride::Install();
 			RE::Cascadia::BSAnimationGraphEventWatcher::Install();
-			RE::Cascadia::RegisterTESHitEventSink();
 			RE::Cascadia::RegisterTESInitScriptEventSink();
+			RE::Cascadia::RegisterTESHarvestEventSink();
+			RE::Cascadia::RegisterTESHitEventSink();
 			break;
 
 		case F4SE::MessagingInterface::kGameLoaded: