diff --git a/Content/Assets/Rockets/Whistle/SM_Whistle.uasset b/Content/Assets/Rockets/Whistle/SM_Whistle.uasset index 117cfd9..5230e01 100644 Binary files a/Content/Assets/Rockets/Whistle/SM_Whistle.uasset and b/Content/Assets/Rockets/Whistle/SM_Whistle.uasset differ diff --git a/Content/Blueprints/BP_Chainer.uasset b/Content/Blueprints/BP_Chainer.uasset index df2fbfc..d914851 100644 Binary files a/Content/Blueprints/BP_Chainer.uasset and b/Content/Blueprints/BP_Chainer.uasset differ diff --git a/Content/Blueprints/BP_FirekrackersGameInstance.uasset b/Content/Blueprints/BP_FirekrackersGameInstance.uasset index 3731e10..925e427 100644 Binary files a/Content/Blueprints/BP_FirekrackersGameInstance.uasset and b/Content/Blueprints/BP_FirekrackersGameInstance.uasset differ diff --git a/Content/Blueprints/BP_FireworkBase.uasset b/Content/Blueprints/BP_FireworkBase.uasset index 300159a..862287a 100644 Binary files a/Content/Blueprints/BP_FireworkBase.uasset and b/Content/Blueprints/BP_FireworkBase.uasset differ diff --git a/Content/Blueprints/BP_FireworksPawn.uasset b/Content/Blueprints/BP_FireworksPawn.uasset index 7f9f5c2..d8d2ba5 100644 Binary files a/Content/Blueprints/BP_FireworksPawn.uasset and b/Content/Blueprints/BP_FireworksPawn.uasset differ diff --git a/Content/Blueprints/BP_Lighter.uasset b/Content/Blueprints/BP_Lighter.uasset index 6133ca8..ea698e1 100644 Binary files a/Content/Blueprints/BP_Lighter.uasset and b/Content/Blueprints/BP_Lighter.uasset differ diff --git a/Content/Blueprints/BP_Projectile.uasset b/Content/Blueprints/BP_Projectile.uasset index ef14b78..10b0fd4 100644 Binary files a/Content/Blueprints/BP_Projectile.uasset and b/Content/Blueprints/BP_Projectile.uasset differ diff --git a/Content/Blueprints/BP_SpawnManager.uasset b/Content/Blueprints/BP_SpawnManager.uasset index 773bca8..c11ef05 100644 Binary files a/Content/Blueprints/BP_SpawnManager.uasset and b/Content/Blueprints/BP_SpawnManager.uasset differ diff --git a/Content/Blueprints/BP_ZKiller.uasset b/Content/Blueprints/BP_ZKiller.uasset index b26e4a6..54c2a35 100644 Binary files a/Content/Blueprints/BP_ZKiller.uasset and b/Content/Blueprints/BP_ZKiller.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block.uasset b/Content/Blueprints/Blocks/BP_Block.uasset index 77a426b..fcb013c 100644 Binary files a/Content/Blueprints/Blocks/BP_Block.uasset and b/Content/Blueprints/Blocks/BP_Block.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Cluster.uasset b/Content/Blueprints/Fireworks/BP_Cluster.uasset index b60c435..f1a84bd 100644 Binary files a/Content/Blueprints/Fireworks/BP_Cluster.uasset and b/Content/Blueprints/Fireworks/BP_Cluster.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Impact.uasset b/Content/Blueprints/Fireworks/BP_Impact.uasset index 8948ee2..c00cbf5 100644 Binary files a/Content/Blueprints/Fireworks/BP_Impact.uasset and b/Content/Blueprints/Fireworks/BP_Impact.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_RocketGuided.uasset b/Content/Blueprints/Fireworks/BP_RocketGuided.uasset index 726ded1..8de4d8f 100644 Binary files a/Content/Blueprints/Fireworks/BP_RocketGuided.uasset and b/Content/Blueprints/Fireworks/BP_RocketGuided.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_RocketImpact.uasset b/Content/Blueprints/Fireworks/BP_RocketImpact.uasset index f72a9f0..72a921d 100644 Binary files a/Content/Blueprints/Fireworks/BP_RocketImpact.uasset and b/Content/Blueprints/Fireworks/BP_RocketImpact.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Sticky.uasset b/Content/Blueprints/Fireworks/BP_Sticky.uasset index 78829c9..c76d577 100644 Binary files a/Content/Blueprints/Fireworks/BP_Sticky.uasset and b/Content/Blueprints/Fireworks/BP_Sticky.uasset differ diff --git a/Content/Levels/L_MainLevel.umap b/Content/Levels/L_MainLevel.umap index 2dc9b6c..595f5e6 100644 Binary files a/Content/Levels/L_MainLevel.umap and b/Content/Levels/L_MainLevel.umap differ diff --git a/Content/Particles/P_ExplosionCluster.uasset b/Content/Particles/P_ExplosionCluster.uasset new file mode 100644 index 0000000..0032070 Binary files /dev/null and b/Content/Particles/P_ExplosionCluster.uasset differ diff --git a/Content/Particles/P_ExplosionRocket.uasset b/Content/Particles/P_ExplosionRocket.uasset new file mode 100644 index 0000000..38a553d Binary files /dev/null and b/Content/Particles/P_ExplosionRocket.uasset differ diff --git a/Content/Particles/P_ExplosionRocketGuided.uasset b/Content/Particles/P_ExplosionRocketGuided.uasset new file mode 100644 index 0000000..b3d8dcf Binary files /dev/null and b/Content/Particles/P_ExplosionRocketGuided.uasset differ diff --git a/Content/UI/UI_Button.uasset b/Content/UI/UI_Button.uasset index 645f4c0..7ae6ed4 100644 Binary files a/Content/UI/UI_Button.uasset and b/Content/UI/UI_Button.uasset differ diff --git a/Content/UI/UI_ButtonSmall.uasset b/Content/UI/UI_ButtonSmall.uasset index ba22a1e..b051612 100644 Binary files a/Content/UI/UI_ButtonSmall.uasset and b/Content/UI/UI_ButtonSmall.uasset differ diff --git a/Content/UI/UI_ShopTile.uasset b/Content/UI/UI_ShopTile.uasset index ebb589d..446345b 100644 Binary files a/Content/UI/UI_ShopTile.uasset and b/Content/UI/UI_ShopTile.uasset differ diff --git a/Content/UI/W_InLevelScreen.uasset b/Content/UI/W_InLevelScreen.uasset index 84a0104..0459b94 100644 Binary files a/Content/UI/W_InLevelScreen.uasset and b/Content/UI/W_InLevelScreen.uasset differ diff --git a/Content/UI/W_Shop.uasset b/Content/UI/W_Shop.uasset index dba7520..f4e994f 100644 Binary files a/Content/UI/W_Shop.uasset and b/Content/UI/W_Shop.uasset differ diff --git a/Source/FireworkDuels/FireworksPawn.cpp b/Source/FireworkDuels/FireworksPawn.cpp index 63edeca..b2667ef 100644 --- a/Source/FireworkDuels/FireworksPawn.cpp +++ b/Source/FireworkDuels/FireworksPawn.cpp @@ -204,7 +204,9 @@ void AFireworksPawn::ThrowObject(APickableObject* Object, EControllerHand Hand) Object->ThrowingHand = Hand; Object->DetachFromActor(FDetachmentTransformRules::KeepWorldTransform); Object->StaticMesh->SetSimulatePhysics(true); - Object->StaticMesh->SetPhysicsLinearVelocity(ApproximateThrowVelocity(Hand) * ThrowVelocityMultiplier); + if (!Object->IsRocket) { + Object->StaticMesh->SetPhysicsLinearVelocity(ApproximateThrowVelocity(Hand) * ThrowVelocityMultiplier); + } Object->ThrowEffects(); } diff --git a/Source/FireworkDuels/PickableObject.h b/Source/FireworkDuels/PickableObject.h index 35a87b3..5debbc4 100644 --- a/Source/FireworkDuels/PickableObject.h +++ b/Source/FireworkDuels/PickableObject.h @@ -47,6 +47,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) EControllerHand ThrowingHand; + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) + bool IsRocket = false; + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) void OnUsed();