Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix Able to Place Items Outside of Grid

Browse Source
This commit is contained in:
Philip W 2023-10-26 10:52:42 +01:00
parent 58931ab222
commit 50791b67c3
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EndlessVendetta/Content/Inventory/M_Base_Rev.uasset Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9
size 18207

BIN
EndlessVendetta/Content/Inventory/MyBaseItem.uasset (Stored with Git LFS)
View File

Binary file not shown.

7
EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp
View File

@ -3,6 +3,13 @@
#include "BaseItem.h" #include "BaseItem.h"
void UBaseItem::PostInitProperties()
{
Super::PostInitProperties();
ItemSize = FItemSize(DefaultItemSize.X, DefaultItemSize.Y);
}
void UBaseItem::RotateItem() void UBaseItem::RotateItem()
{ {
if (CurrentItemRotation == Horizontal) if (CurrentItemRotation == Horizontal)

6
EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h
View File

@ -51,7 +51,9 @@ public:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
FText Description; FText Description;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
FItemSize ItemSize = FItemSize(); FVector2D DefaultItemSize = FVector2D(1);
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
FItemSize ItemSize;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
UMaterialInterface* ItemTexture; UMaterialInterface* ItemTexture;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
@ -63,6 +65,8 @@ public:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
bool bIsRotated = false; bool bIsRotated = false;
virtual void PostInitProperties() override;
UFUNCTION(BlueprintCallable, Category = "Item") UFUNCTION(BlueprintCallable, Category = "Item")
void RotateItem(); void RotateItem();
UFUNCTION(BlueprintCallable, Category = "Item") UFUNCTION(BlueprintCallable, Category = "Item")

4
EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp
View File

@ -109,7 +109,7 @@ bool UInventoryComponent::IsRoomAvailable(UBaseItem* Item, const int TopLeftInde
if (!IsTileValid(TileToCheck)) return false; if (!IsTileValid(TileToCheck)) return false;
TTuple<UBaseItem*, bool> ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); TTuple<UBaseItem*, bool> ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck));
if (ItemAtIndex.Get<1>()) return false; if (ItemAtIndex.Get<1>()) return false;
if (IsValid(ItemAtIndex.Get<0>())) return true; if (IsValid(ItemAtIndex.Get<0>())) return false;
} }
} }
return true; return true;
@ -183,7 +183,7 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator
bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const
{ {
if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows)
{ {
return true; return true;
} }