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

Added Ammo Icon to Images

Browse Source
This commit is contained in:
MH261677 2023-02-06 23:51:45 +00:00
parent 73262b425e
commit 797c447d47
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Images/ammoicon.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Levels/MerchantPrototype.umap (Stored with Git LFS)
View File

Binary file not shown.

2
Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp
View File

@ -40,13 +40,11 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem)
BaseItem->StoredItems = this; BaseItem->StoredItems = this;
BaseItem->World = GetWorld(); BaseItem->World = GetWorld();
bool isNewItem = true; bool isNewItem = true;
// for every item in inventory
for (auto & Item : Items) for (auto & Item : Items)
{ {
//if the item is the same as the item that is being added //if the item is the same as the item that is being added
if (Item->ItemDisplayName.ToString() == BaseItem->ItemDisplayName.ToString()) if (Item->ItemDisplayName.ToString() == BaseItem->ItemDisplayName.ToString())
{ {
//add the amount of the item that is being added to the item in the inventory
Item->StackCount++; Item->StackCount++;
UE_LOG(LogTemp, Display, TEXT("ITEM STACKCOUNT: %d"), Item->StackCount); UE_LOG(LogTemp, Display, TEXT("ITEM STACKCOUNT: %d"), Item->StackCount);
isNewItem = false; isNewItem = false;

7
Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp
View File

@ -22,7 +22,6 @@ void UEatableItems::Use(ATempCharacter* Character)
{ {
Character->Health += 10; Character->Health += 10;
UE_LOG(LogTemp, Display, TEXT("Healed")); UE_LOG(LogTemp, Display, TEXT("Healed"));
//delete itself
Character->Inventory->RemoveItem(this); Character->Inventory->RemoveItem(this);
} }
else if (Character->Health >= 100) else if (Character->Health >= 100)
@ -37,11 +36,5 @@ void UEatableItems::Use(ATempCharacter* Character)
Character->Inventory->RemoveItem(this); Character->Inventory->RemoveItem(this);
} }
} }
/*
when player uses the item syrengine to debuff enemies
detect what enemie actors the player is fighting with
lower their damage by a value.
*/
} }

1
Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
View File

@ -33,6 +33,7 @@ void ATempCharacter::BeginPlay()
PlayerCapsule = GetCapsuleComponent(); PlayerCapsule = GetCapsuleComponent();
TArray<AActor*> AllActorsInScene; TArray<AActor*> AllActorsInScene;
//MAKE SURE POST PROCESSING IS IN THE SCENE OR GAME WILL CRASH
UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene);
PostProcessVolume = Cast<APostProcessVolume>(AllActorsInScene[0]); PostProcessVolume = Cast<APostProcessVolume>(AllActorsInScene[0]);
} }