diff --git a/Content/Assets/Curves/DissolveCurve.uasset b/Content/Assets/Curves/DissolveCurve.uasset index ecb9f4d..1c8fc29 100644 Binary files a/Content/Assets/Curves/DissolveCurve.uasset and b/Content/Assets/Curves/DissolveCurve.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_Soft.uasset b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_Soft.uasset new file mode 100644 index 0000000..902747f Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_Soft.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow.uasset b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow.uasset new file mode 100644 index 0000000..275f09b Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow_LowDepth_Inst.uasset b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow_LowDepth_Inst.uasset new file mode 100644 index 0000000..b8d799c Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Flares/M_Lensflare_TB_SoftGlow_LowDepth_Inst.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/FX_EmissiveModulate.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/FX_EmissiveModulate.uasset new file mode 100644 index 0000000..40a7d9a Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/FX_EmissiveModulate.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/FadeBasedOnViewAngle.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/FadeBasedOnViewAngle.uasset new file mode 100644 index 0000000..f13ead6 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/FadeBasedOnViewAngle.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/HitFlash.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/HitFlash.uasset new file mode 100644 index 0000000..97a6572 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/HitFlash.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BaseColorTintAndContrast.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BaseColorTintAndContrast.uasset new file mode 100644 index 0000000..871a428 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BaseColorTintAndContrast.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BrightnessAdjust.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BrightnessAdjust.uasset new file mode 100644 index 0000000..2dd35a5 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_BrightnessAdjust.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_CharacterEffects.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_CharacterEffects.uasset new file mode 100644 index 0000000..c2c56cd Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_CharacterEffects.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_DeathFade.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_DeathFade.uasset new file mode 100644 index 0000000..d120a24 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_DeathFade.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_OrionCharacterAO.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_OrionCharacterAO.uasset new file mode 100644 index 0000000..8d54e0c Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_OrionCharacterAO.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_RoughnessAdjustment.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_RoughnessAdjustment.uasset new file mode 100644 index 0000000..539c397 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MF_RoughnessAdjustment.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_ScratchAndGrime.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_ScratchAndGrime.uasset new file mode 100644 index 0000000..76fdc05 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_ScratchAndGrime.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_Standard.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_Standard.uasset new file mode 100644 index 0000000..2f58fb6 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/MLC_Standard.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Functions/ML__Blank.uasset b/Content/Assets/ParagonDekker/FX/Materials/Functions/ML__Blank.uasset new file mode 100644 index 0000000..2ad9e34 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Functions/ML__Blank.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/MF_OrionRimlight.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/MF_OrionRimlight.uasset new file mode 100644 index 0000000..b56c19d Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/MF_OrionRimlight.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Chrome.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Chrome.uasset new file mode 100644 index 0000000..2b2e28b Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Chrome.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Dirty_Gun_Metal_1.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Dirty_Gun_Metal_1.uasset new file mode 100644 index 0000000..edd5cb8 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_Dirty_Gun_Metal_1.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_GlossyBlack_Latex.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_GlossyBlack_Latex.uasset new file mode 100644 index 0000000..a014e62 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_GlossyBlack_Latex.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_PurplePattern.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_PurplePattern.uasset new file mode 100644 index 0000000..29ea282 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_PurplePattern.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_White_shinyPaint.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_White_shinyPaint.uasset new file mode 100644 index 0000000..860a2e0 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_White_shinyPaint.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_blue_Metal.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_blue_Metal.uasset new file mode 100644 index 0000000..5bd6780 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/ML_blue_Metal.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/M_Dekker_Weapon_Bot.uasset b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/M_Dekker_Weapon_Bot.uasset new file mode 100644 index 0000000..a16592a Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Hero_Specific/M_Dekker_Weapon_Bot.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Param_Collections/GlobalGameplayCollection.uasset b/Content/Assets/ParagonDekker/FX/Materials/Param_Collections/GlobalGameplayCollection.uasset new file mode 100644 index 0000000..9039151 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Param_Collections/GlobalGameplayCollection.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Tech/M_Spline_Light_Scanner.uasset b/Content/Assets/ParagonDekker/FX/Materials/Tech/M_Spline_Light_Scanner.uasset new file mode 100644 index 0000000..0e00980 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Tech/M_Spline_Light_Scanner.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Materials/Trails/M_Bullet_Trail.uasset b/Content/Assets/ParagonDekker/FX/Materials/Trails/M_Bullet_Trail.uasset new file mode 100644 index 0000000..4fad8b1 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Materials/Trails/M_Bullet_Trail.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Meshes/Bots/SM_Dekker_BotFriend.uasset b/Content/Assets/ParagonDekker/FX/Meshes/Bots/SM_Dekker_BotFriend.uasset new file mode 100644 index 0000000..bb4c393 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Meshes/Bots/SM_Dekker_BotFriend.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Meshes/Shapes/SM_Holo_Projector_Beams.uasset b/Content/Assets/ParagonDekker/FX/Meshes/Shapes/SM_Holo_Projector_Beams.uasset new file mode 100644 index 0000000..07848c2 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Meshes/Shapes/SM_Holo_Projector_Beams.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Particles/Abilities/Cage/FX/P_Bot_Cage.uasset b/Content/Assets/ParagonDekker/FX/Particles/Abilities/Cage/FX/P_Bot_Cage.uasset new file mode 100644 index 0000000..1344c1e Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Particles/Abilities/Cage/FX/P_Bot_Cage.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Flares/T_Flare_Spikeball.uasset b/Content/Assets/ParagonDekker/FX/Textures/Flares/T_Flare_Spikeball.uasset new file mode 100644 index 0000000..8137d45 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Flares/T_Flare_Spikeball.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Gradients/Color/T_Muriel_Prism_03.uasset b/Content/Assets/ParagonDekker/FX/Textures/Gradients/Color/T_Muriel_Prism_03.uasset new file mode 100644 index 0000000..32e9f3e Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Gradients/Color/T_Muriel_Prism_03.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blank_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blank_N.uasset new file mode 100644 index 0000000..f6f90cf Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blank_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blue_Metal02.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blue_Metal02.uasset new file mode 100644 index 0000000..3495abe Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Blue_Metal02.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_UV2_RGB.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_UV2_RGB.uasset new file mode 100644 index 0000000..565e440 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_UV2_RGB.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M.uasset new file mode 100644 index 0000000..2ce51ef Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M2.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M2.uasset new file mode 100644 index 0000000..c78bbee Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_M2.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_N.uasset new file mode 100644 index 0000000..7e9948b Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_RGB.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_RGB.uasset new file mode 100644 index 0000000..55f22de Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Dekker_Weapon_RGB.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PaintedConstructionMetal_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PaintedConstructionMetal_N.uasset new file mode 100644 index 0000000..af33fec Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PaintedConstructionMetal_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01.uasset new file mode 100644 index 0000000..5985ddb Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01_N.uasset new file mode 100644 index 0000000..dda62a3 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_PlasticPattern01_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_D.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_D.uasset new file mode 100644 index 0000000..c4ff4be Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_D.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_N.uasset new file mode 100644 index 0000000..7e95fb7 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_ML_Rubber_Blue_01_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_D.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_D.uasset new file mode 100644 index 0000000..9b2d90a Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_D.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_N.uasset new file mode 100644 index 0000000..1913787 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_Rough_Plastic_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_metal02.uasset b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_metal02.uasset new file mode 100644 index 0000000..0645fa2 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Hero_Specific/T_metal02.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Beam_Gradient_02.uasset b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Beam_Gradient_02.uasset new file mode 100644 index 0000000..3f8af76 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Beam_Gradient_02.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Masks/T_SmokeTrailCoord1_Mask.uasset b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_SmokeTrailCoord1_Mask.uasset new file mode 100644 index 0000000..2172fe4 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_SmokeTrailCoord1_Mask.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Square_SoftEdges.uasset b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Square_SoftEdges.uasset new file mode 100644 index 0000000..7793fc9 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Masks/T_Square_SoftEdges.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01.uasset b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01.uasset new file mode 100644 index 0000000..fbd52ca Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01_N.uasset b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01_N.uasset new file mode 100644 index 0000000..54c96d3 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise01_N.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise03.uasset b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise03.uasset new file mode 100644 index 0000000..67dee6a Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Tile/Noise/T_AtmosphericCloudNoise03.uasset differ diff --git a/Content/Assets/ParagonDekker/FX/Textures/Tile/T_TestML_Mask.uasset b/Content/Assets/ParagonDekker/FX/Textures/Tile/T_TestML_Mask.uasset new file mode 100644 index 0000000..59b4fc5 Binary files /dev/null and b/Content/Assets/ParagonDekker/FX/Textures/Tile/T_TestML_Mask.uasset differ diff --git a/Content/Assets/Sounds/ElimBot/Buzz.uasset b/Content/Assets/Sounds/ElimBot/Buzz.uasset new file mode 100644 index 0000000..60faeda Binary files /dev/null and b/Content/Assets/Sounds/ElimBot/Buzz.uasset differ diff --git a/Content/Assets/Sounds/ElimBot/Buzz_Cue.uasset b/Content/Assets/Sounds/ElimBot/Buzz_Cue.uasset new file mode 100644 index 0000000..e171de4 Binary files /dev/null and b/Content/Assets/Sounds/ElimBot/Buzz_Cue.uasset differ diff --git a/Content/Assets/Sounds/ElimBot/Buzz_att.uasset b/Content/Assets/Sounds/ElimBot/Buzz_att.uasset new file mode 100644 index 0000000..9d17fef Binary files /dev/null and b/Content/Assets/Sounds/ElimBot/Buzz_att.uasset differ diff --git a/Content/Blueprints/Character/BP_BlasterCharacter.uasset b/Content/Blueprints/Character/BP_BlasterCharacter.uasset index 218f3c8..0f48b3a 100644 Binary files a/Content/Blueprints/Character/BP_BlasterCharacter.uasset and b/Content/Blueprints/Character/BP_BlasterCharacter.uasset differ diff --git a/Source/Blaster/Character/BlasterCharacter.cpp b/Source/Blaster/Character/BlasterCharacter.cpp index 1f43fd2..493f295 100644 --- a/Source/Blaster/Character/BlasterCharacter.cpp +++ b/Source/Blaster/Character/BlasterCharacter.cpp @@ -13,8 +13,10 @@ #include "Components/WidgetComponent.h" #include "GameFramework/CharacterMovementComponent.h" #include "GameFramework/SpringArmComponent.h" +#include "Kismet/GameplayStatics.h" #include "Kismet/KismetMathLibrary.h" #include "Net/UnrealNetwork.h" +#include "Particles/ParticleSystemComponent.h" ABlasterCharacter::ABlasterCharacter() @@ -80,6 +82,16 @@ void ABlasterCharacter::OnRep_ReplicatedMovement() TimeSinceLastMovementReplication = 0.f; } +void ABlasterCharacter::Destroyed() +{ + Super::Destroyed(); + + if (EliminationBotComponent) + { + EliminationBotComponent->DestroyComponent(); + } +} + void ABlasterCharacter::PostInitializeComponents() { Super::PostInitializeComponents(); @@ -148,6 +160,18 @@ void ABlasterCharacter::MulticastEliminated_Implementation() // Disable collision GetCapsuleComponent()->SetCollisionEnabled(ECollisionEnabled::NoCollision); GetMesh()->SetCollisionEnabled(ECollisionEnabled::NoCollision); + + // Elimination bot + if (EliminationBotEffect) + { + const FVector EliminationBotSpawnPoint(GetActorLocation().X, GetActorLocation().Y, GetActorLocation().Z + 200.f); + EliminationBotComponent = UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), EliminationBotEffect, EliminationBotSpawnPoint, GetActorRotation()); + + } + if (EliminationBotSound) + { + UGameplayStatics::SpawnSoundAtLocation(this, EliminationBotSound, GetActorLocation()); + } } void ABlasterCharacter::EliminationTimerFinished() diff --git a/Source/Blaster/Character/BlasterCharacter.h b/Source/Blaster/Character/BlasterCharacter.h index 32586ad..3605946 100644 --- a/Source/Blaster/Character/BlasterCharacter.h +++ b/Source/Blaster/Character/BlasterCharacter.h @@ -7,6 +7,7 @@ #include "Blaster/Types/TurningInPlace.h" #include "Components/TimelineComponent.h" #include "GameFramework/Character.h" +#include "Sound/SoundCue.h" #include "BlasterCharacter.generated.h" UCLASS() @@ -21,6 +22,7 @@ public: virtual void GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const override; virtual void PostInitializeComponents() override; virtual void OnRep_ReplicatedMovement() override; + virtual void Destroyed() override; void PlayFireMontage(bool bAiming); void PlayEliminatedMontage(); @@ -120,7 +122,7 @@ private: bool bEliminated = false; UPROPERTY(EditDefaultsOnly) - float EliminationDelay = 3.f; + float EliminationDelay = 2.f; FTimerHandle EliminationTimer; void EliminationTimerFinished(); @@ -144,7 +146,16 @@ private: // Material instance set on the Blueprint, used with the dynamic material instance UPROPERTY(EditAnywhere, Category = Elimination) UMaterialInstance* DissolveMaterialInstance; - + + // Elimination bot + UPROPERTY(EditAnywhere) + UParticleSystem* EliminationBotEffect; + + UPROPERTY(VisibleAnywhere) + UParticleSystemComponent* EliminationBotComponent; + + UPROPERTY(EditAnywhere) + USoundCue* EliminationBotSound; public: void SetOverlappingWeapon(AWeapon* Weapon); bool IsWeaponEquipped();