diff --git a/SeagullGame/Content/AI/AIC_Enemy.uasset b/SeagullGame/Content/AI/AIC_Enemy.uasset index f35d6c3..b6c7684 100644 --- a/SeagullGame/Content/AI/AIC_Enemy.uasset +++ b/SeagullGame/Content/AI/AIC_Enemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ddabc007daa5c627c104ec5ea209f7d1383a51377436b2aaf27f4307b457e9a -size 100323 +oid sha256:e84f4c4f9c9d31f0454b202b543c6751b560f8eba676b65821a33443e05dd776 +size 100847 diff --git a/SeagullGame/Content/AI/BP_TillLocation.uasset b/SeagullGame/Content/AI/BP_TillLocation.uasset new file mode 100644 index 0000000..d513411 --- /dev/null +++ b/SeagullGame/Content/AI/BP_TillLocation.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4bec23285c9a2abe49786231c7001400cfbe310bc5525815360a5c095acd5e9 +size 22051 diff --git a/SeagullGame/Content/AI/BTT_FindRandomPatrol.uasset b/SeagullGame/Content/AI/BTT_FindRandomPatrol.uasset index e975094..e4ad50e 100644 --- a/SeagullGame/Content/AI/BTT_FindRandomPatrol.uasset +++ b/SeagullGame/Content/AI/BTT_FindRandomPatrol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee849ec64499a218dd28170b74ec5444966b9413e843089470be32975016312 -size 55215 +oid sha256:e91cc90e56acaf4f81a6aafb79fe6a66ad5744dd6136247d0a5201c3cf3f17e1 +size 66792 diff --git a/SeagullGame/Content/AI/BT_Enemy.uasset b/SeagullGame/Content/AI/BT_Enemy.uasset index 3050779..0df0c0c 100644 --- a/SeagullGame/Content/AI/BT_Enemy.uasset +++ b/SeagullGame/Content/AI/BT_Enemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d09eae4b7b49e783edb48b56c7ead31d784ae094233643be7d23a994dd634402 -size 20824 +oid sha256:8156bb275db8edc6839e9e0f5f898655c62a3197a1e3b1c0d67008b22c28b505 +size 20786 diff --git a/SeagullGame/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset b/SeagullGame/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset index fe9feea..d8cf105 100644 --- a/SeagullGame/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset +++ b/SeagullGame/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a63e4b739f75ec01983a0c5a5431e37cedf1a2773e7ca9d75ed2abb486d86b4f -size 158147 +oid sha256:457d2984b4fa80c892a8d8aae7045e5ba85fdb6b7c9103e5926024f79d21ac04 +size 158501 diff --git a/SeagullGame/Content/TopDown/Blueprints/BP_SeagullPlayer.uasset b/SeagullGame/Content/TopDown/Blueprints/BP_SeagullPlayer.uasset index 7bf9bd4..a7a0b36 100644 --- a/SeagullGame/Content/TopDown/Blueprints/BP_SeagullPlayer.uasset +++ b/SeagullGame/Content/TopDown/Blueprints/BP_SeagullPlayer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc39231f0aeea19293a25d2ae5ed43adb9784dc4f981ded95cfdef880bea0b73 -size 283848 +oid sha256:472e6991ed05dee5d5a20a691c0682990635d74ee5325d668cd412647eea2893 +size 294820 diff --git a/SeagullGame/Content/TopDown/Blueprints/PhilQuak.uasset b/SeagullGame/Content/TopDown/Blueprints/PhilQuak.uasset new file mode 100644 index 0000000..41828cb --- /dev/null +++ b/SeagullGame/Content/TopDown/Blueprints/PhilQuak.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d95c69c389f3d9994f23afc105402fc79094785d660a4978ea81c74db691b5d +size 104889 diff --git a/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/2/7X/1FYI857L9TLI4WAINRZZF7.uasset b/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/2/7X/1FYI857L9TLI4WAINRZZF7.uasset new file mode 100644 index 0000000..1856d1f --- /dev/null +++ b/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/2/7X/1FYI857L9TLI4WAINRZZF7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1d3df376842053af41c2678084d6890d00e8beaf0ee33ab13f3efa2d59f69d4 +size 4875 diff --git a/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/7/NI/LKUZ55O8ZYH2KA19OC79WI.uasset b/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/7/NI/LKUZ55O8ZYH2KA19OC79WI.uasset new file mode 100644 index 0000000..82b8874 --- /dev/null +++ b/SeagullGame/Content/__ExternalActors__/TopDown/Maps/TopDownMap/7/NI/LKUZ55O8ZYH2KA19OC79WI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42af9b7def97416acad94b7ba6be7e16404ada7fd7816d079c95670e593c8c29 +size 3647 diff --git a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp index 14a5ecf..89e1b34 100644 --- a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp +++ b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp @@ -158,6 +158,7 @@ void ASeagullGameCharacter::EndGame() void ASeagullGameCharacter::PickupItem() { + OnPlayerPickupItem.Broadcast(); if (IsValid(CurrentItem)) { DropItem(); diff --git a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h index 0ce0fc3..c32edf3 100644 --- a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h +++ b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h @@ -19,12 +19,16 @@ public: DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnPlayerDamage); + DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnPlayerPickupItem); + DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnGameEnd, FString, Message); + UPROPERTY(BlueprintAssignable, Category = "Events") + FOnPlayerDeath OnPlayerDeath; UPROPERTY(BlueprintAssignable, Category = "Events") FOnPlayerDeath OnPlayerDamage; UPROPERTY(BlueprintAssignable, Category = "Events") - FOnPlayerDeath OnPlayerDeath; + FOnPlayerPickupItem OnPlayerPickupItem; UPROPERTY(BlueprintAssignable, Category = "Events") FOnGameEnd OnGameEnd;