diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle.uasset new file mode 100644 index 00000000..1bde53c5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54ce3c12b0af1a925b76a52f2abaaaccbb62d731547232111261d7b544f02d43 +size 1718844 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle_Montage.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle_Montage.uasset new file mode 100644 index 00000000..e932157f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Animations/Sitting_Idle_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80f1521cdbf956ebd464532d63d197c3a803405de8540e8f8b8ef0aa335c2ac5 +size 8719 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset new file mode 100644 index 00000000..c7414918 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3c071fc62bab3f36e25126e3c4d2f5480da97d0a74b58cc66e9bed79190cd79 +size 70417 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Diffuse.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Diffuse.uasset new file mode 100644 index 00000000..18ab9e92 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70e39dab5abd1cc15c882dca65129ed047fab0323d47b7712873c5e2ab0b8446 +size 18953206 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Glossiness.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Glossiness.uasset new file mode 100644 index 00000000..59f2ea12 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Glossiness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a88bf7b8333663a49d11a85cace4e75e400c2bb3d2e92ddcc6de1038e484a77d +size 6288536 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal.uasset new file mode 100644 index 00000000..ed9f56d3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1931993c2a997a018f040bb71e693fb3e2a86f38fb6c994ad27c333cd31de0b8 +size 25276466 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal_ncl1_1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal_ncl1_1.uasset new file mode 100644 index 00000000..5c8c890a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Normal_ncl1_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b529fa71a3e20b9da7afadfb0b3adcc81fb7ca17881c72075a98d44bf1d8d2 +size 25276497 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Specular.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Specular.uasset new file mode 100644 index 00000000..427a9f9f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1001_Specular.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8de4bd0583cc793bb81e98d15b28bd28bb9f031c019c297fc66d3ab7c6b063f9 +size 61793 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1002_Diffuse.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1002_Diffuse.uasset new file mode 100644 index 00000000..032fef82 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_1002_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8e5eec6df34f944878ec7ed25916b8860b52afb4648bf81f8fc619ea527053e +size 5363877 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Body.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Body.uasset new file mode 100644 index 00000000..e2bc2625 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95f3b3c827cb3d3d7b8ab98ee8a6eda9173553832fd630ac1e3cdbbff2fbcc7e +size 13836 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Hair.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Hair.uasset new file mode 100644 index 00000000..acbea650 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/Ch42_Hair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c81cb357c26110e23209ba8f3b0b33bb071a2024225a7aabaabcb500861c3915 +size 10049 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/IK_TempGreasyRichChar.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/IK_TempGreasyRichChar.uasset new file mode 100644 index 00000000..4665649d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/IK_TempGreasyRichChar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03a59f1dbb65be2735d82e8dfdac06839406243255067cff95169b8bbf8d88b5 +size 64427 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_Mannequin_TempGreasyRichChar.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_Mannequin_TempGreasyRichChar.uasset new file mode 100644 index 00000000..2773718e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_Mannequin_TempGreasyRichChar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86361c1d7497fb3e4e308f982efd02c85a13772460a9f13e13ee55e2991717dd +size 15164 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_TempGreasyRichChar_Mannequin.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_TempGreasyRichChar_Mannequin.uasset new file mode 100644 index 00000000..1957c77a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/RTG_TempGreasyRichChar_Mannequin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:937aa918bb55eff6e7382975c4f9eeb6cf66a41575388ded37eaef178adf174f +size 36237 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar.uasset new file mode 100644 index 00000000..4f1a9caf --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c87de270e91410f9318cd525f2e28c59bad36534f8986571d729150ab7b1527 +size 7131042 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_PhysicsAsset.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_PhysicsAsset.uasset new file mode 100644 index 00000000..62fd0c5f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:396d80562530c4d244fde31f9412a46b2cdfc56677b1fcff58d63fb79152cce8 +size 30299 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_Skeleton.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_Skeleton.uasset new file mode 100644 index 00000000..810ba185 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Character/TempGreasyRichChar_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbc93d6f43b0144219c706853e18a6f85aadf74ce0a22d2bc7dcb2f49f6193ec +size 29673 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset new file mode 100644 index 00000000..17fcbf95 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8ab479df95c2cb7f6f6e2a50747f3e3c47ad70a236483703d518c47498173dc +size 22526 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/ABP_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/ABP_GreasyRick.uasset new file mode 100644 index 00000000..d9fb9661 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/ABP_GreasyRick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21c58b1119754ef6a67bdbb477988c2e338d82152ed77f9db80c89f698c78894 +size 357440 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/BS_MM_WalkRun.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/BS_MM_WalkRun.uasset new file mode 100644 index 00000000..db91876d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/BS_MM_WalkRun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d183d7e790226963f4a86f0d1abce0cfcd14af421a2d72003959586b73dadf0b +size 9796 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Fall_Loop.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Fall_Loop.uasset new file mode 100644 index 00000000..7c8d2c0c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Fall_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9df6e666544bf10a84c64781f23b54165256b2abde46d38a7e13772b945403e +size 279500 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Idle.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Idle.uasset new file mode 100644 index 00000000..70697fdf --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e005f59a8fd8e37a37cac8c746c2680bfa6ff11c9d5dc5c82fd9fe4e74c0611c +size 641242 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Jump.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Jump.uasset new file mode 100644 index 00000000..7861180c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Jump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f07404050c00b6ad0a578b7de82b7fdc5d36137876c01b5e9120493a7301ed1c +size 110303 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Land.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Land.uasset new file mode 100644 index 00000000..9ab3093b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Land.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa802220d3775c9d86d7d938b9be28521875f6b6adfb5b32ba918ba9bc64039b +size 111093 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Run_Fwd.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Run_Fwd.uasset new file mode 100644 index 00000000..752b3270 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Run_Fwd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb5d75f44d15f3db3b641b0e79e2d1b1eab2d02e42719cca99fd8c58c3437499 +size 193335 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_Fwd.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_Fwd.uasset new file mode 100644 index 00000000..363504a2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_Fwd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b2f7d55731b745717d2b39f79b6aaf4bfc6ad1ecdd83ec53509ecdd3a7cff0 +size 259689 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_InPlace.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_InPlace.uasset new file mode 100644 index 00000000..5a2df448 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/RetargetedABP/MM_Walk_InPlace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd08d99ada758f5961f7b48596d957c547f528a399e40781c04b622b63312311 +size 258197 diff --git a/EndlessVendetta/Content/Characters/Mannequins/Meshes/IK_Mannequin.uasset b/EndlessVendetta/Content/Characters/Mannequins/Meshes/IK_Mannequin.uasset index f363750b..642a2eff 100644 --- a/EndlessVendetta/Content/Characters/Mannequins/Meshes/IK_Mannequin.uasset +++ b/EndlessVendetta/Content/Characters/Mannequins/Meshes/IK_Mannequin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da9e25b2f5e13ecd06a78ad496fd153537d57f53a14e6e1a16b1d59642707fdb +oid sha256:8d214e56a7678bdc54fe742759b1296fe38a914544a5500d631594d2ad4e5af4 size 83291 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 1c2b2dfc..a79a02e7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e3683ec5d7106ad74a95eca5910654b88dd2afd80e4024f9aaa46af55499a18 -size 804499 +oid sha256:3b3943c1c4918895a70b44d6d95650a4bfb36b00eb98983ced859f3dff70bd54 +size 817216 diff --git a/EndlessVendetta/Content/Levels/OpenWorldRework.umap b/EndlessVendetta/Content/Levels/OpenWorldRework.umap index 9706adb1..4ca33af1 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:6a90a7b300adbf77b69016e54a3483cec9b900f19cda47be10923179fcd2c7de -size 293440913 +oid sha256:fee7a250942ce460d6851543e00ef15040149aaad722bfa494ec81012a407846 +size 293443366 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index a631635c..ac3f7536 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0a56993e787e3376de20030113bfdd35af9e53793d05502d00cb083e6160031 +oid sha256:6ba7c7b0ee09a438907efbf237854bd39fe5510343e95c17dafbfdd69a70d79b size 66790690 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/K1/58MA6LCG9V3BWWEPHFBLQO.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/K1/58MA6LCG9V3BWWEPHFBLQO.uasset index 5ad45d46..c9d0ce85 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/K1/58MA6LCG9V3BWWEPHFBLQO.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/K1/58MA6LCG9V3BWWEPHFBLQO.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf90068af9ba236bf3b3aac0f65d70eced4c12c6b814b4acbf9e816b4fdd14ce -size 7960 +oid sha256:f9bbfe401122e809ca3e23d49d45f8437e7f6e7e4b329f2b3b99c3e01010b4f3 +size 8037 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index 40096b70..56c8870d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -110,10 +110,10 @@ void UAC_PlayerDialogueInterpreter::MakeChoiceDialogue(const int Choice) void UAC_PlayerDialogueInterpreter::EndDialogue() { + OnEndDialogue.Broadcast(CurrentTextNode->Text); CurrentChoiceNode = nullptr; CurrentTextNode = nullptr; CurrentCharacterSpeaking = FDialogueCharacter(); - OnEndDialogue.Broadcast(); if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController()) { diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h index 4da84a18..931bd049 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.h @@ -24,7 +24,7 @@ public: DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnChoiceDialogue, UDialogueChoiceNode*, ChoiceNode); - DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnEndDialogue); + DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnEndDialogue, FText, FinalText); UPROPERTY(BlueprintAssignable, Category = "Dialogue") FOnStartDialogue OnStartDialogue;