fix: Some issues with EEPROM state change update propagation

Panakotta00 · Oct 17, 2024 · 41e8802 · 41e8802
1 parent b084cba
commit 41e8802
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 1 deletion.
diff --git a/Content/Buildings/Computer/Modules/CPU_Lua/UI/CPU_Lua_Widget.uasset b/Content/Buildings/Computer/Modules/CPU_Lua/UI/CPU_Lua_Widget.uasset
diff --git a/Source/FicsItNetworksComputer/Private/FINComputerCase.cpp b/Source/FicsItNetworksComputer/Private/FINComputerCase.cpp
@@ -7,6 +7,7 @@
 #include "FINAdvancedNetworkConnectionComponent.h"
 #include "FINComputerEEPROMDesc.h"
 #include "FINComputerFloppyDesc.h"
+#include "FINComputerRCO.h"
 #include "FINFileSystemSubsystem.h"
 #include "FINUtils.h"
 #include "Components/AudioComponent.h"
@@ -105,6 +106,7 @@ void AFINComputerCase::OnConstruction(const FTransform& transform) {
 			FInventoryStack stack;
 			if (DataStorage->GetStackFromIndex(0, stack) || stack.HasItems()) {
 				DataStorage->SetStateOnIndex(0, state);
+				GetWorld()->GetFirstPlayerController<AFGPlayerController>()->GetRemoteCallObjectOfClass<UFINComputerRCO>()->Multicast_ItemStateUpdated(DataStorage, stack.Item.GetItemClass());
 				return true;
 			}
 			return false;

diff --git a/Source/FicsItNetworksComputer/Private/FINComputerRCO.cpp b/Source/FicsItNetworksComputer/Private/FINComputerRCO.cpp
@@ -138,3 +138,7 @@ void UFINComputerRCO::SetLabel_Implementation(UFGInventoryComponent* Inventory,
 		Inventory->SetStateOnIndex(Index, state);
 	}
 }
+
+void UFINComputerRCO::Multicast_ItemStateUpdated_Implementation(class UFGInventoryComponent* Inventory, TSubclassOf<UFGItemDescriptor> Item) {
+	Inventory->OnItemAddedDelegate.Broadcast(Item, 0, Inventory);
+}
diff --git a/Source/FicsItNetworksComputer/Public/FINComputerRCO.h b/Source/FicsItNetworksComputer/Public/FINComputerRCO.h
@@ -56,4 +56,7 @@ class FICSITNETWORKSCOMPUTER_API UFINComputerRCO : public UFGRemoteCallObject {
 
 	UFUNCTION(Server, Reliable)
 	void SetLabel(UFGInventoryComponent* Inventory, int32 Index, const FString& Label);
+
+	UFUNCTION(NetMulticast, Unreliable)
+	void Multicast_ItemStateUpdated(class UFGInventoryComponent* Inventory, TSubclassOf<UFGItemDescriptor> Item);
 };
diff --git a/Source/FicsItNetworksLua/Private/FINLua/API/LuaComputerAPI.cpp b/Source/FicsItNetworksLua/Private/FINLua/API/LuaComputerAPI.cpp
@@ -202,7 +202,7 @@ namespace FINLua {
 
 				FString code = luaFIN_checkFString(L, 1);
 
-				if (Cast<UFINLuaProcessor>(kernel->GetProcessor())->SetEEPROM(code)) {
+				if (!Cast<UFINLuaProcessor>(kernel->GetProcessor())->SetEEPROM(code)) {
 					return luaL_error(L, "no eeprom set");
 				}
 

diff --git a/Source/FicsItNetworksLua/Private/FINLuaRCO.cpp b/Source/FicsItNetworksLua/Private/FINLuaRCO.cpp
@@ -1,8 +1,11 @@
 #include "FINLuaRCO.h"
 
 #include "FGInventoryComponent.h"
+#include "FGPlayerController.h"
 #include "FINComputerEEPROMDesc.h"
+#include "FINComputerRCO.h"
 #include "FINItemStateEEPROMLua.h"
+#include "Engine/World.h"
 #include "Net/UnrealNetwork.h"
 
 void UFINLuaRCO::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
@@ -19,5 +22,6 @@ void UFINLuaRCO::SetLuaEEPROMCode_Implementation(UFGInventoryComponent* Inventor
 		FFINItemStateEEPROMLua state = *luaState;
 		state.Code = NewCode;
 		Inventory->SetStateOnIndex(Index, FFGDynamicStruct(state));
+		GetWorld()->GetFirstPlayerController<AFGPlayerController>()->GetRemoteCallObjectOfClass<UFINComputerRCO>()->Multicast_ItemStateUpdated(Inventory, stack.Item.GetItemClass());
 	}
 }
diff --git a/Source/FicsItNetworksLua/Public/FINLuaRCO.h b/Source/FicsItNetworksLua/Public/FINLuaRCO.h
@@ -4,6 +4,8 @@
 #include "FGRemoteCallObject.h"
 #include "FINLuaRCO.generated.h"
 
+class UFGItemDescriptor;
+
 UCLASS()
 class FICSITNETWORKSLUA_API UFINLuaRCO : public UFGRemoteCallObject {
     GENERATED_BODY()