diff --git a/Content/Assets/Sounds/Pickups/Pickup_Health_Cue.uasset b/Content/Assets/Sounds/Pickups/Pickup_Health_Cue.uasset new file mode 100644 index 0000000..1bfc0b4 Binary files /dev/null and b/Content/Assets/Sounds/Pickups/Pickup_Health_Cue.uasset differ diff --git a/Content/Assets/Sounds/Pickups/sw_Pickup_Health.uasset b/Content/Assets/Sounds/Pickups/sw_Pickup_Health.uasset new file mode 100644 index 0000000..a03fd5c Binary files /dev/null and b/Content/Assets/Sounds/Pickups/sw_Pickup_Health.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Blueprints/BP_RAY_Spawner.uasset b/Content/Assets/sA_PickupSet_1/Blueprints/BP_RAY_Spawner.uasset new file mode 100644 index 0000000..6b66704 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Blueprints/BP_RAY_Spawner.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_CoinBurst.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_CoinBurst.uasset new file mode 100644 index 0000000..dc39fd6 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_CoinBurst.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_Light.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_Light.uasset new file mode 100644 index 0000000..a16a205 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_Light.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_PickupCricle.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_PickupCricle.uasset new file mode 100644 index 0000000..bff5b66 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_PickupCricle.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleBurst.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleBurst.uasset new file mode 100644 index 0000000..dc4723f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleBurst.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleSprite.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleSprite.uasset new file mode 100644 index 0000000..d009dcd Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/NE_SimpleSprite.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/Ne_Aura.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/Ne_Aura.uasset new file mode 100644 index 0000000..4a57992 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraEmitters/Ne_Aura.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst.uasset new file mode 100644 index 0000000..240541b Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst2.uasset new file mode 100644 index 0000000..6a83d63 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_CoinBurst2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Coin_Shower.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Coin_Shower.uasset new file mode 100644 index 0000000..b2792a5 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Coin_Shower.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_1.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_1.uasset new file mode 100644 index 0000000..c65c5eb Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_2.uasset new file mode 100644 index 0000000..caa9680 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Energy_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_1.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_1.uasset new file mode 100644 index 0000000..7843dea Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_2.uasset new file mode 100644 index 0000000..b1d4f59 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_3.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_3.uasset new file mode 100644 index 0000000..30f982a Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Healing_3.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_1.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_1.uasset new file mode 100644 index 0000000..862f23c Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_2.uasset new file mode 100644 index 0000000..5c0a448 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Magic_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_1.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_1.uasset new file mode 100644 index 0000000..7676c39 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_2.uasset new file mode 100644 index 0000000..584d368 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_3.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_3.uasset new file mode 100644 index 0000000..c310602 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_3.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_4.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_4.uasset new file mode 100644 index 0000000..a5d967d Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_4.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_5.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_5.uasset new file mode 100644 index 0000000..443d78b Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Pickup_5.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield.uasset new file mode 100644 index 0000000..b6f0bfa Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_2.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_2.uasset new file mode 100644 index 0000000..12dd549 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_3.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_3.uasset new file mode 100644 index 0000000..b19cc2f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Shield_3.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Levels/LVL_Showroom.umap b/Content/Assets/sA_PickupSet_1/Levels/LVL_Showroom.umap new file mode 100644 index 0000000..633d6ee Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Levels/LVL_Showroom.umap differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Aura_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Aura_1.uasset new file mode 100644 index 0000000..8b7253b Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Aura_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Coin_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Coin_1.uasset new file mode 100644 index 0000000..6205f76 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Coin_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Fresnel.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Fresnel.uasset new file mode 100644 index 0000000..0ce0b8f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Fresnel.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Ground_Showscene.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Ground_Showscene.uasset new file mode 100644 index 0000000..25c7562 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Ground_Showscene.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Scroll_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Scroll_1.uasset new file mode 100644 index 0000000..65c6dcb Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Scroll_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/MI_Shield_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/MI_Shield_1.uasset new file mode 100644 index 0000000..0006f8f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/MI_Shield_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_AdditiveScrollNiagara.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_AdditiveScrollNiagara.uasset new file mode 100644 index 0000000..214fdc5 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_AdditiveScrollNiagara.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_Ground.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_Ground.uasset new file mode 100644 index 0000000..4a79ae0 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_Ground.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_Master_Fresnel.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_Master_Fresnel.uasset new file mode 100644 index 0000000..d399b1f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_Master_Fresnel.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_Master_MetalFX.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_Master_MetalFX.uasset new file mode 100644 index 0000000..d9c4cbd Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_Master_MetalFX.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_Master_RadialBeam.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_Master_RadialBeam.uasset new file mode 100644 index 0000000..e19d90e Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_Master_RadialBeam.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/M_sA_Aura.uasset b/Content/Assets/sA_PickupSet_1/Materials/M_sA_Aura.uasset new file mode 100644 index 0000000..e61d32a Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/M_sA_Aura.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Beam01.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Beam01.png new file mode 100644 index 0000000..9bfb021 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Beam01.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise00.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise00.png new file mode 100644 index 0000000..c338694 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise00.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise000.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise000.png new file mode 100644 index 0000000..91e5015 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise000.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.png new file mode 100644 index 0000000..4eb8188 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.uasset new file mode 100644 index 0000000..7215822 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise01.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.png new file mode 100644 index 0000000..9eca152 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.uasset new file mode 100644 index 0000000..c32730d Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise02.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.png new file mode 100644 index 0000000..5690be9 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.uasset new file mode 100644 index 0000000..4a715ae Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise04.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.png new file mode 100644 index 0000000..1543246 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.uasset new file mode 100644 index 0000000..b4c67c9 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise06.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.png new file mode 100644 index 0000000..bee884f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.uasset new file mode 100644 index 0000000..62513ea Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise07.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.png new file mode 100644 index 0000000..bd1edc9 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.uasset new file mode 100644 index 0000000..97135a1 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise08.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.png new file mode 100644 index 0000000..b2f9fca Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.uasset new file mode 100644 index 0000000..1a7b489 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise09.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise10.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise10.png new file mode 100644 index 0000000..eaea633 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise10.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.png new file mode 100644 index 0000000..ef2edc0 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.uasset new file mode 100644 index 0000000..cb4475b Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise11.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.png b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.png new file mode 100644 index 0000000..b73c7cc Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.png differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.uasset new file mode 100644 index 0000000..e635e6f Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/Noise12.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Beam_01.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Beam_01.uasset new file mode 100644 index 0000000..563c3a0 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Beam_01.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_1.uasset new file mode 100644 index 0000000..e1cb72b Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_2.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_2.uasset new file mode 100644 index 0000000..2160e4c Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseCloud_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseFurry.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseFurry.uasset new file mode 100644 index 0000000..4825395 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_NoiseFurry.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Noise_DistortedCaustic.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Noise_DistortedCaustic.uasset new file mode 100644 index 0000000..9b18286 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Noise_DistortedCaustic.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Ray_5.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Ray_5.uasset new file mode 100644 index 0000000..952793a Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Ray_5.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Shield_1.uasset b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Shield_1.uasset new file mode 100644 index 0000000..c101943 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Materials/Textures/T_Shield_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Coin_1.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Coin_1.uasset new file mode 100644 index 0000000..a64b2be Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Coin_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Energy_1.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Energy_1.uasset new file mode 100644 index 0000000..e2ec146 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Energy_1.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence.uasset new file mode 100644 index 0000000..9477a47 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_2.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_2.uasset new file mode 100644 index 0000000..f4836f6 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_2.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_3.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_3.uasset new file mode 100644 index 0000000..24cd1a2 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Defence_3.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Gem.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Gem.uasset new file mode 100644 index 0000000..2eb34c1 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Gem.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Health.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Health.uasset new file mode 100644 index 0000000..6349dc7 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Health.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Magic.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Magic.uasset new file mode 100644 index 0000000..115a2f1 Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_Magic.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_ss.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_ss.uasset new file mode 100644 index 0000000..7f39c6d Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Pickup_ss.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Models/SM_Plane.uasset b/Content/Assets/sA_PickupSet_1/Models/SM_Plane.uasset new file mode 100644 index 0000000..8c95b2e Binary files /dev/null and b/Content/Assets/sA_PickupSet_1/Models/SM_Plane.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_ARAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_ARAmmo.uasset new file mode 100644 index 0000000..ba83a9e Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_ARAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_GrenadeLauncherAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_GrenadeLauncherAmmo.uasset new file mode 100644 index 0000000..c33772f Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_GrenadeLauncherAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_PistolAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_PistolAmmo.uasset new file mode 100644 index 0000000..e7f3aa0 Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_PistolAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_RocketAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_RocketAmmo.uasset new file mode 100644 index 0000000..6d8fae7 Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_RocketAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_SMGAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_SMGAmmo.uasset new file mode 100644 index 0000000..20bbb70 Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_SMGAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_ShotgunAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_ShotgunAmmo.uasset new file mode 100644 index 0000000..192ea8e Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_ShotgunAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Ammo/BP_SniperAmmo.uasset b/Content/Blueprints/Pickups/Ammo/BP_SniperAmmo.uasset new file mode 100644 index 0000000..c5cb5e1 Binary files /dev/null and b/Content/Blueprints/Pickups/Ammo/BP_SniperAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_ARAmmo.uasset b/Content/Blueprints/Pickups/BP_ARAmmo.uasset index fbb2868..567b11c 100644 Binary files a/Content/Blueprints/Pickups/BP_ARAmmo.uasset and b/Content/Blueprints/Pickups/BP_ARAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_GrenadeLauncherAmmo.uasset b/Content/Blueprints/Pickups/BP_GrenadeLauncherAmmo.uasset index f9d176b..efeb70e 100644 Binary files a/Content/Blueprints/Pickups/BP_GrenadeLauncherAmmo.uasset and b/Content/Blueprints/Pickups/BP_GrenadeLauncherAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_PistolAmmo.uasset b/Content/Blueprints/Pickups/BP_PistolAmmo.uasset index 37aec5f..3d003ab 100644 Binary files a/Content/Blueprints/Pickups/BP_PistolAmmo.uasset and b/Content/Blueprints/Pickups/BP_PistolAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_RocketAmmo.uasset b/Content/Blueprints/Pickups/BP_RocketAmmo.uasset index 0ac9ace..0dd3e37 100644 Binary files a/Content/Blueprints/Pickups/BP_RocketAmmo.uasset and b/Content/Blueprints/Pickups/BP_RocketAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_SMGAmmo.uasset b/Content/Blueprints/Pickups/BP_SMGAmmo.uasset index bf3d54a..6266b59 100644 Binary files a/Content/Blueprints/Pickups/BP_SMGAmmo.uasset and b/Content/Blueprints/Pickups/BP_SMGAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_ShotgunAmmo.uasset b/Content/Blueprints/Pickups/BP_ShotgunAmmo.uasset index fe213ac..5049c63 100644 Binary files a/Content/Blueprints/Pickups/BP_ShotgunAmmo.uasset and b/Content/Blueprints/Pickups/BP_ShotgunAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/BP_SniperAmmo.uasset b/Content/Blueprints/Pickups/BP_SniperAmmo.uasset index 0823f59..2834bec 100644 Binary files a/Content/Blueprints/Pickups/BP_SniperAmmo.uasset and b/Content/Blueprints/Pickups/BP_SniperAmmo.uasset differ diff --git a/Content/Blueprints/Pickups/Buff/BP_HealthPickup.uasset b/Content/Blueprints/Pickups/Buff/BP_HealthPickup.uasset new file mode 100644 index 0000000..e647b22 Binary files /dev/null and b/Content/Blueprints/Pickups/Buff/BP_HealthPickup.uasset differ diff --git a/Content/Maps/BlasterMap.umap b/Content/Maps/BlasterMap.umap index 23a92ae..7d5dd79 100644 Binary files a/Content/Maps/BlasterMap.umap and b/Content/Maps/BlasterMap.umap differ diff --git a/Source/Blaster/Pickups/AmmoPickup.cpp b/Source/Blaster/Pickups/AmmoPickup.cpp index 4dedbdb..2693fdd 100644 --- a/Source/Blaster/Pickups/AmmoPickup.cpp +++ b/Source/Blaster/Pickups/AmmoPickup.cpp @@ -9,8 +9,6 @@ void AAmmoPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) { - UE_LOG(LogTemp, Warning, TEXT("AmmoPickup Overlap")); - Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult); ABlasterCharacter* BlasterCharacter = Cast(OtherActor); diff --git a/Source/Blaster/Pickups/AmmoPickup.h b/Source/Blaster/Pickups/AmmoPickup.h index cb230c4..7382a5a 100644 --- a/Source/Blaster/Pickups/AmmoPickup.h +++ b/Source/Blaster/Pickups/AmmoPickup.h @@ -23,7 +23,7 @@ protected: int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult - ); + ) override; private: UPROPERTY(EditAnywhere) diff --git a/Source/Blaster/Pickups/HealthPickup.cpp b/Source/Blaster/Pickups/HealthPickup.cpp new file mode 100644 index 0000000..0290717 --- /dev/null +++ b/Source/Blaster/Pickups/HealthPickup.cpp @@ -0,0 +1,44 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "HealthPickup.h" + +#include "NiagaraComponent.h" +#include "NiagaraFunctionLibrary.h" +#include "Blaster/Character/BlasterCharacter.h" + +AHealthPickup::AHealthPickup() +{ + bReplicates = true; + PickupEffectComponent = CreateDefaultSubobject(TEXT("PickupEffectComponent")); + PickupEffectComponent->SetupAttachment(RootComponent); +} + +void AHealthPickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, + bool bFromSweep, const FHitResult& SweepResult) +{ + Super::OnSphereOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult); + + ABlasterCharacter* BlasterCharacter = Cast(OtherActor); + if (BlasterCharacter) + { + + } + + Destroy(); +} + +void AHealthPickup::Destroyed() +{ + if (PickupEffect) + { + UNiagaraFunctionLibrary::SpawnSystemAtLocation( + this, + PickupEffect, + GetActorLocation(), + GetActorRotation() + ); + } + + Super::Destroyed(); +} diff --git a/Source/Blaster/Pickups/HealthPickup.h b/Source/Blaster/Pickups/HealthPickup.h new file mode 100644 index 0000000..f2b683d --- /dev/null +++ b/Source/Blaster/Pickups/HealthPickup.h @@ -0,0 +1,44 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Pickup.h" +#include "HealthPickup.generated.h" + +/** + * + */ +UCLASS() +class BLASTER_API AHealthPickup : public APickup +{ + GENERATED_BODY() + +public: + AHealthPickup(); + virtual void Destroyed() override; + +protected: + virtual void OnSphereOverlap( + UPrimitiveComponent* OverlappedComponent, + AActor* OtherActor, + UPrimitiveComponent* OtherComp, + int32 OtherBodyIndex, + bool bFromSweep, + const FHitResult& SweepResult + ) override; + +private: + UPROPERTY(EditAnywhere) + float HealAmount = 100.f; + + UPROPERTY(EditAnywhere) + float HealingTime = 5.f; + + UPROPERTY(VisibleAnywhere) + class UNiagaraComponent* PickupEffectComponent; + + UPROPERTY(EditAnywhere) + class UNiagaraSystem* PickupEffect; + +}; diff --git a/Source/Blaster/Pickups/Pickup.cpp b/Source/Blaster/Pickups/Pickup.cpp index 6d765d7..30c0525 100644 --- a/Source/Blaster/Pickups/Pickup.cpp +++ b/Source/Blaster/Pickups/Pickup.cpp @@ -44,7 +44,7 @@ void APickup::BeginPlay() void APickup::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) { - UE_LOG(LogTemp, Warning, TEXT("Pickup Overlap")); + } void APickup::Tick(float DeltaTime)