Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Plugins/NaItemSystem/Config/DefaultNaItemSystem.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[CoreRedirects]
+ClassRedirects=(OldName="/Script/NaItemSystem.NaItemType",NewName="/Script/NaItemSystem.UNaItemType")
+ClassRedirects=(OldName="/Script/NaItemSystem.NaItemStack",NewName="/Script/NaItemSystem.NaItemStack")
+ClassRedirects=(OldName="/Script/NaItemSystem.NaItemStack",NewName="/Script/NaItemSystem.NaItemStack")
+StructRedirects=(OldName="/Script/NaItemSystem.NaItemSlotPublicStyle",NewName="/Script/NaItemSystem.NaItemSlotStyle")
Original file line number Diff line number Diff line change
@@ -1,39 +1,8 @@
#pragma once
#include "BPLibraries/NaItemStatics.h"
#include "NaItemContainer.h"
#include "NaPublicDependencies/NaPublicDependencies.h"
#include "Components/NaGameModeItemSystemComponent.h"

void UNaItemStatics::FindEntryFromIndex(const FNaItemContainer& Target, int Position, ENaItemContainerFindingResult& ReturnType, UNaItemStack*& Result) {
FNaItemContainerFindingReturn Return = Target.Find(Position);
ReturnType = Return.Result;
Result = (ReturnType == ENaItemContainerFindingResult::ICFR_Filled) ? Return.Stack : nullptr;
}

bool UNaItemStatics::ResizeContainer(FNaItemContainer& Target, int NewSize, bool bForce) {
return Target.Resize(NewSize, bForce);
}

bool UNaItemStatics::AddItemEntry(FNaItemContainer& Target, int Position, UNaItemStack* Stack, bool bForce) {
return Target.AddEntry(Position, Stack, bForce);
}

int UNaItemStatics::AddOrStackItemEntry(FNaItemContainer& Target, int Position, UNaItemStack* Stack) {
return Target.AddOrStack(Position, Stack);
}

void UNaItemStatics::RemoveItemEntry(FNaItemContainer& Target, int Position) {
Target.RemoveEntry(Position);
}

bool UNaItemStatics::MoveItemEntry(FNaItemContainer& Target, int From, int To, bool bForce) {
return Target.MoveEntry(From, To, bForce);
}

void UNaItemStatics::SwapItemEntry(FNaItemContainer& Target, int P1, int P2) {
Target.SwapEntry(P1, P2);
}

UNaGameModeItemSystemComponent* UNaItemStatics::GetGameModeItemSystemComponent(UObject* WorldContext) {
return Cast<UNaGameModeItemSystemComponent>(UNaPublicDependencyStatics::GetNaGameModeSubunit(WorldContext, UNaGameModeItemSystemComponent::StaticClass()));
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#include "Components/NaItemInventoryComponent.h"
#include "NatriumItemSystem.h"

UNaItemInventoryComponent::UNaItemInventoryComponent()
{
bWantsInitializeComponent = true;
Inventory = nullptr;
}

void UNaItemInventoryComponent::InitializeComponent()
{
Super::InitializeComponent();
Inventory = UNaItemInventory::CreateInventory(this, InitSize);
}

UNaItemInventory* UNaItemInventoryComponent::GetInventory() const
{
return Inventory;
}

UNaItemStack* UNaItemInventoryComponent::GetSlot(int32 Slot) const
{
if (!Inventory)
{
return nullptr;
}
return Inventory->GetSlot(Slot);
}

int32 UNaItemInventoryComponent::GiveItem(UNaItemStack* Stack)
{
if (!Inventory)
{
UE_LOG(LogNaItem, Warning, TEXT("UNaItemInventoryComponent::GiveItem: Inventory is null"));
return Stack ? Stack->Count : 0;
}
return Inventory->GiveItem(Stack);
}

int32 UNaItemInventoryComponent::ConsumeItemByType(UNaItemType* Type, int32 Amount)
{
if (!Inventory)
{
UE_LOG(LogNaItem, Warning, TEXT("UNaItemInventoryComponent::ConsumeItemByType: Inventory is null"));
return 0;
}
return Inventory->ConsumeItemByType(Type, Amount);
}
Loading