From 8adae0d977593006e64544c06661bb2d700a5d44 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 29 Apr 2024 13:26:28 +0100 Subject: [PATCH] Shortened Combat Training Introduction Cinematic --- .../Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset | 4 ++-- .../Tutorial/BountySpecificActors/Mayor/BP_NewMayor.uasset | 3 +++ .../Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset | 4 ++-- .../Tutorial/Checkpoints/CP_SelectCombat.uasset | 4 ++-- .../GadgetTraining/AI_CombatTraining_Speach.uasset | 3 +++ .../GadgetTraining/AI_CombatTraining_Speach.wav | 3 +++ .../CinematicSequences/GadgetTraining/BlinkGradient.png | 3 +++ .../CinematicSequences/GadgetTraining/BlinkGradient.uasset | 3 +++ .../GadgetTraining/GadgetTrainingSequence.uasset | 4 ++-- .../CinematicSequences/GadgetTraining/WBP_BlurAnim.uasset | 3 +++ .../Tutorial/GadgetGamemode/BP_BrainSpawner.uasset | 4 ++-- .../Tutorial/GadgetGamemode/BP_WaveComputer.uasset | 4 ++-- .../Content/BountySystem/Tutorial/MB_Training.uasset | 4 ++-- .../Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- .../Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../Content/StarterContent/Audio/Collapse01.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 6 +++--- 19 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_NewMayor.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.wav create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.png create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/WBP_BlurAnim.uasset diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset index cf489252..05390816 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:901c1749f7f8fc8d2e9626d51c1d9a81cd7b66d61848e9e07d896648edfcb915 -size 54720 +oid sha256:2807432a436e2a74ea556590d2177edeee3c5a1b9975e58296ede2a473db997f +size 2635 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_NewMayor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_NewMayor.uasset new file mode 100644 index 00000000..ed5b4bc6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_NewMayor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8919d6928e8a7a0253d0135f2b11341d2d9df375fde0886a65c4f69bdb8af2 +size 53405 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset index 94b1578b..c5347dd4 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47d5998f8b8eb42f63c66a5c950cd3923042113fbab7c1307ec3ca7f51d0ebd7 -size 39464 +oid sha256:e7b3eda0abe38f776683d4c5a5cc8118f17fec41524a2de1ce8a88b22c10c1d0 +size 68849 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset index 27ee9484..8f3b473e 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94fdccabfe717d535068965238dbfe093bc84d7f5506cd9ed4e0132a73baa4ec -size 49517 +oid sha256:8a2f9b5e5918eb7028a7348a699996ad046ccbf6b88e2fd524e590b32911c8eb +size 49323 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset new file mode 100644 index 00000000..9205661a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd82d031f6f0e12ed30770bacd73e269a8d2e0105560032fb50cb4a04b5af9f0 +size 2980326 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.wav b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.wav new file mode 100644 index 00000000..6e302357 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:babad6d9a782a2948463cae70ae4760f21032c98a5ea6fe8e76edbe25705e15f +size 3366956 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.png b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.png new file mode 100644 index 00000000..f2391f59 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff0e2332ad7afa8f5800f0b97df1ab46fb342d24e54db3cd5ce72529ae90dc6d +size 182793 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset new file mode 100644 index 00000000..7a96498a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:357f74c72b65c393ce8642f9ceb1d1513fbe8124bde833a45a0ebdd95fae59b7 +size 130150 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset index 7e4dddc6..6b28ab83 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:255940270ee954b498e570d5fef586d0d8b0da3e0938f3e655a0c72aee62ecbb -size 25179 +oid sha256:621353ba19ffa097da3ba813e42da146f2b7fe155723da5564c1c2a917e932d0 +size 33278 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/WBP_BlurAnim.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/WBP_BlurAnim.uasset new file mode 100644 index 00000000..74d17905 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/WBP_BlurAnim.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29ff812b2f0415bcc8a64266b28847c7a39d6601324787266c054f490e5f9477 +size 57987 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset index 1012bfea..76a0759b 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b7c0e77d2bb16956dd86c4baf504b4c92a8bbb47e34b4b7df29c089bfaf619 -size 25129 +oid sha256:ab59c22dc2163d26bbd5541bc684387409c212bab76b6860d2f5204541eccd9f +size 25519 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset index 77954124..8842314b 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:affc010c812d2b2a274bda48ccf69bb010bb74b7ab8cba56ebfe5b5a623219a0 -size 181981 +oid sha256:8ddde28d8cbae9fe4c18e7c22302a45b33be1fd66bbea8efabadae7361fcfc02 +size 157803 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index 04866db2..a3cfdced 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88530c75feaa3a5ae973962f72a1ca7b2c34be7a552a61db18a74b0c739c4a3f -size 27114 +oid sha256:e8baa41a467ba28fde6f88447a8a2147487b6609ae92ef16882234efc8b5f526 +size 26938 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset index 54224dff..2f78f8b2 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a3a1cd55d3cf0eeec5fd4a664af57b3a30284dfd006842f1e42a6c6c2dcd982 -size 164831 +oid sha256:bfb5a08bdde74f0b4331b61289277f4b7ee223d15e7b795f2294583b33d06d9d +size 150937 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 4bc754bf..d32127c7 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3bf622e6d85671adc92024e108597afaff730b35d431492c8cf1711c26696c3 -size 1025354 +oid sha256:ce787ff0a68360d0ece5fc6d6b0f836386f0429bc8db421ca9806162ab9bdd66 +size 1025380 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 5eb18af1..0a1407cf 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ed3962220f9b37fdb14b006b067d38ea49cfefd476be028a42523d03d2c9909 -size 1961339 +oid sha256:f4211d6e2a422b1e3f11cd0d904174b94961728a807725b7702dee221a52cb74 +size 1956244 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index ae0b63bf..5e3ff30e 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d28219b752cb299c285fa6a17e8ca3e2b9270270034787407cc2a28bde51e739 -size 353648 +oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d +size 348532 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..6c346533 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:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:66e856b0cf7404aa1ea67da95d15a6b5e3f4054a51188318d50553d3e44ea94a +size 53268 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index 53d88cf3..25145c42 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -76,7 +76,7 @@ void UAC_PlayerDialogueInterpreter::NextDialogue() if (IsValid(CurrentChoiceNode)) return; if (IsValid(CurrentTextNode)) { - CurrentVoiceOverAudioComponent->Stop(); + if (IsValid(CurrentVoiceOverAudioComponent)) CurrentVoiceOverAudioComponent->Stop(); if (CurrentTextNode->ChildrenNodes.Num() == 0) { EndDialogue(); @@ -142,7 +142,7 @@ void UAC_PlayerDialogueInterpreter::NextDialogue() void UAC_PlayerDialogueInterpreter::MakeChoiceDialogue(const int Choice) { if (!IsValid(CurrentChoiceNode)) return; - CurrentVoiceOverAudioComponent->Stop(); + if (IsValid(CurrentVoiceOverAudioComponent)) CurrentVoiceOverAudioComponent->Stop(); if (Cast(CurrentChoiceNode->ChildrenNodes[Choice])) { CurrentChoiceNode = Cast(CurrentChoiceNode->ChildrenNodes[Choice]); @@ -172,7 +172,7 @@ void UAC_PlayerDialogueInterpreter::EndDialogue() CurrentTextNode = nullptr; CurrentAddItemNode = nullptr; CurrentCharacterSpeaking = FDialogueCharacter(); - CurrentVoiceOverAudioComponent->Stop(); + if (IsValid(CurrentVoiceOverAudioComponent)) CurrentVoiceOverAudioComponent->Stop(); CurrentVoiceOverAudioComponent = nullptr; if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController())