From 6fed85d7059d7b48c504d0253f69cac201424fa2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 13 May 2024 16:27:48 +0100 Subject: [PATCH] Testing Brian Walker NPC --- EndlessVendetta/Content/Levels/OpenWorldRework.umap | 4 ++-- EndlessVendetta/Content/NPC/BP_NPC_Manager.uasset | 4 ++-- EndlessVendetta/Content/NPC/NPC_Walkers/BASE/AI_Walker.uasset | 3 +++ EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BB_Walker.uasset | 3 +++ .../Content/NPC/NPC_Walkers/BASE/BP_NPC_WalkerClass.uasset | 3 +++ .../NPC/NPC_Walkers/BASE/BTT_ArrivedAtWalkingSpot.uasset | 3 +++ EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BT_Walker.uasset | 3 +++ .../Content/NPC/NPC_Walkers/Brian/Walker_Brian.uasset | 3 +++ .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../Source/EndlessVendetta/NPC/NPC_WalkerClass.cpp | 2 +- EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.h | 2 +- 12 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/BASE/AI_Walker.uasset create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BB_Walker.uasset create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BP_NPC_WalkerClass.uasset create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BTT_ArrivedAtWalkingSpot.uasset create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BT_Walker.uasset create mode 100644 EndlessVendetta/Content/NPC/NPC_Walkers/Brian/Walker_Brian.uasset diff --git a/EndlessVendetta/Content/Levels/OpenWorldRework.umap b/EndlessVendetta/Content/Levels/OpenWorldRework.umap index 7d6d0ac9..002321c8 100644 --- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap +++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7022e27e25fda8ba4a23532e859892230abd46e20d24649cfc8da021e30c098f -size 45628665 +oid sha256:011ecbcd4df831b26edee3e1b440096c2c60eb574371821b39e80c6fcab58f2b +size 45629656 diff --git a/EndlessVendetta/Content/NPC/BP_NPC_Manager.uasset b/EndlessVendetta/Content/NPC/BP_NPC_Manager.uasset index 0c37f9ec..7a718fb4 100644 --- a/EndlessVendetta/Content/NPC/BP_NPC_Manager.uasset +++ b/EndlessVendetta/Content/NPC/BP_NPC_Manager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:695e5dfacbf5a11f4310ac933c64304a275669c54ad8d1b37e3b6dbc5aec0e9f -size 25006 +oid sha256:18e25795f948bfa6eea64f16638e013665ecd67faea773ae2924de23605628f8 +size 25166 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/AI_Walker.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/AI_Walker.uasset new file mode 100644 index 00000000..370ac3be --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/AI_Walker.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d1c485954fde5459cbdce695ed4a5e83aff31ecd871d794331acdc7a0673a46 +size 44397 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BB_Walker.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BB_Walker.uasset new file mode 100644 index 00000000..929359c1 --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BB_Walker.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:851c375ef4250e611e03fdc065f5fbb383e91cfd59378ff9a924a5e8c715ea6f +size 2570 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BP_NPC_WalkerClass.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BP_NPC_WalkerClass.uasset new file mode 100644 index 00000000..2c04aba2 --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BP_NPC_WalkerClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01357d9503a037b02d7b735a48b4597d31cb1f1176f29eab778e25d959224a0 +size 30317 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BTT_ArrivedAtWalkingSpot.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BTT_ArrivedAtWalkingSpot.uasset new file mode 100644 index 00000000..af3f0fcd --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BTT_ArrivedAtWalkingSpot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86b49fa0b91f881cf9641be5a138dbcb4edcf5d4bb33f26ed4852bac1bc914e6 +size 40076 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BT_Walker.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BT_Walker.uasset new file mode 100644 index 00000000..d53a4fd7 --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/BASE/BT_Walker.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cce707609befa148306a5d9716d889bbb660747e61ee412d206cb0a386608b29 +size 7889 diff --git a/EndlessVendetta/Content/NPC/NPC_Walkers/Brian/Walker_Brian.uasset b/EndlessVendetta/Content/NPC/NPC_Walkers/Brian/Walker_Brian.uasset new file mode 100644 index 00000000..445594c1 --- /dev/null +++ b/EndlessVendetta/Content/NPC/NPC_Walkers/Brian/Walker_Brian.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a101c3c9bfab060172001002e86dda86ba1014498de7778bd4810711488df11 +size 42784 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..23ab79b7 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:42f0c52e2c4c7389d520930da00589a206b1c5715de6903eff24277a3bd64e96 +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index 28c08c5d..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16f7b538fc11788aeefda67d9ef5cc07dc833571eba689fbafd778f1d309dee8 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.cpp b/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.cpp index 9479e4a2..085a6bc4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.cpp @@ -16,7 +16,7 @@ FVector ANPC_WalkerClass::UpdateWalkingTarget() int BoundsCheck = WalkingSpotIndex + Polarity; if (BoundsCheck < 0 || BoundsCheck >= WalkingSpots.Num()) Polarity *= -1; WalkingSpotIndex += Polarity; - return WalkingSpots[WalkingSpotIndex]; + return WalkingSpots[WalkingSpotIndex] + SpawnTransform.GetLocation(); } void ANPC_WalkerClass::EnableNPC() diff --git a/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.h b/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.h index 1a350e6b..ef58edde 100644 --- a/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/NPC/NPC_WalkerClass.h @@ -16,7 +16,7 @@ class ENDLESSVENDETTA_API ANPC_WalkerClass : public ACharacter bool bIsEnabled = true; protected: - UPROPERTY(VisibleAnywhere, Category = "NPC", meta = (MakeEditWidget = "true")) + UPROPERTY(EditAnywhere, Category = "NPC", meta = (MakeEditWidget = "true")) TArray WalkingSpots; public: