diff --git a/Content/Blueprints/BP_FireworkBase.uasset b/Content/Blueprints/BP_FireworkBase.uasset index 4f0569f..300159a 100644 Binary files a/Content/Blueprints/BP_FireworkBase.uasset and b/Content/Blueprints/BP_FireworkBase.uasset differ diff --git a/Content/Blueprints/BP_Projectile.uasset b/Content/Blueprints/BP_Projectile.uasset index badd77c..ef14b78 100644 Binary files a/Content/Blueprints/BP_Projectile.uasset and b/Content/Blueprints/BP_Projectile.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block.uasset b/Content/Blueprints/Blocks/BP_Block.uasset index 4e3dc2e..77a426b 100644 Binary files a/Content/Blueprints/Blocks/BP_Block.uasset and b/Content/Blueprints/Blocks/BP_Block.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Basic.uasset b/Content/Blueprints/Blocks/BP_Block_Basic.uasset index b7b1f53..23bda64 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Basic.uasset and b/Content/Blueprints/Blocks/BP_Block_Basic.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Explosive.uasset b/Content/Blueprints/Blocks/BP_Block_Explosive.uasset index 71c4a8e..602c670 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Explosive.uasset and b/Content/Blueprints/Blocks/BP_Block_Explosive.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Moving.uasset b/Content/Blueprints/Blocks/BP_Block_Moving.uasset index d07de4e..d721ad4 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Moving.uasset and b/Content/Blueprints/Blocks/BP_Block_Moving.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Tough.uasset b/Content/Blueprints/Blocks/BP_Block_Tough.uasset index eac7c9a..bdd165d 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Tough.uasset and b/Content/Blueprints/Blocks/BP_Block_Tough.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Cluster.uasset b/Content/Blueprints/Fireworks/BP_Cluster.uasset index 195ce0f..b60c435 100644 Binary files a/Content/Blueprints/Fireworks/BP_Cluster.uasset and b/Content/Blueprints/Fireworks/BP_Cluster.uasset differ diff --git a/Content/Blueprints/UI/BP_WristMenu.uasset b/Content/Blueprints/UI/BP_WristMenu.uasset index 588c71d..706ee79 100644 Binary files a/Content/Blueprints/UI/BP_WristMenu.uasset and b/Content/Blueprints/UI/BP_WristMenu.uasset differ diff --git a/Content/Levels/L_MainLevel.umap b/Content/Levels/L_MainLevel.umap index b9ee4ba..2dc9b6c 100644 Binary files a/Content/Levels/L_MainLevel.umap and b/Content/Levels/L_MainLevel.umap differ diff --git a/Content/Materials/M_BlockVariants.uasset b/Content/Materials/M_BlockVariants.uasset index 64ae74e..f5e99d2 100644 Binary files a/Content/Materials/M_BlockVariants.uasset and b/Content/Materials/M_BlockVariants.uasset differ diff --git a/Content/Particles/P_BlockDestroy_Explosive.uasset b/Content/Particles/P_BlockDestroy_Explosive.uasset new file mode 100644 index 0000000..2d7cc84 Binary files /dev/null and b/Content/Particles/P_BlockDestroy_Explosive.uasset differ diff --git a/Content/Particles/P_BlockDestroy_Flying.uasset b/Content/Particles/P_BlockDestroy_Flying.uasset new file mode 100644 index 0000000..2cb0691 Binary files /dev/null and b/Content/Particles/P_BlockDestroy_Flying.uasset differ diff --git a/Content/Particles/P_BlockDestroy_Multihit.uasset b/Content/Particles/P_BlockDestroy_Multihit.uasset new file mode 100644 index 0000000..0566060 Binary files /dev/null and b/Content/Particles/P_BlockDestroy_Multihit.uasset differ diff --git a/Content/Particles/P_BlockDestroy.uasset b/Content/Particles/P_BlockDestroy_Variants.uasset similarity index 85% rename from Content/Particles/P_BlockDestroy.uasset rename to Content/Particles/P_BlockDestroy_Variants.uasset index e76cadd..2dc0ee7 100644 Binary files a/Content/Particles/P_BlockDestroy.uasset and b/Content/Particles/P_BlockDestroy_Variants.uasset differ diff --git a/Content/UI/W_Shop.uasset b/Content/UI/W_Shop.uasset index 543fe4d..dba7520 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 bf4afb3..63edeca 100644 --- a/Source/FireworkDuels/FireworksPawn.cpp +++ b/Source/FireworkDuels/FireworksPawn.cpp @@ -201,6 +201,7 @@ FVector AFireworksPawn::ApproximateThrowVelocity(EControllerHand Hand) // Throw object void AFireworksPawn::ThrowObject(APickableObject* Object, EControllerHand Hand) { + Object->ThrowingHand = Hand; Object->DetachFromActor(FDetachmentTransformRules::KeepWorldTransform); Object->StaticMesh->SetSimulatePhysics(true); Object->StaticMesh->SetPhysicsLinearVelocity(ApproximateThrowVelocity(Hand) * ThrowVelocityMultiplier); @@ -274,7 +275,7 @@ void AFireworksPawn::TryUpdateLasers() FVector EndLocation = StartLocation + (WidgetInteractionL->GetForwardVector() * WidgetInteractionL->InteractionDistance); GetWorld()->LineTraceSingleByChannel(CurrentLaserHitL, StartLocation, EndLocation, ECollisionChannel::ECC_Visibility); LaserL->SetHiddenInGame(false); - LaserL->SetRelativeScale3D(FVector((CurrentLaserHitL.Distance >= 5.0f ? CurrentLaserHitL.Distance : 1000.0f), LaserL->GetRelativeScale3D().Y, LaserL->GetRelativeScale3D().Z)); + LaserL->SetRelativeScale3D(FVector((CurrentLaserHitL.bBlockingHit ? CurrentLaserHitL.Distance / 5 : 1000.0f), LaserL->GetRelativeScale3D().Y, LaserL->GetRelativeScale3D().Z)); } // --- Right Hand --- @@ -284,6 +285,6 @@ void AFireworksPawn::TryUpdateLasers() FVector EndLocation = StartLocation + (WidgetInteractionR->GetForwardVector() * WidgetInteractionR->InteractionDistance); GetWorld()->LineTraceSingleByChannel(CurrentLaserHitR, StartLocation, EndLocation, ECollisionChannel::ECC_Visibility); LaserR->SetHiddenInGame(false); - LaserR->SetRelativeScale3D(FVector((CurrentLaserHitR.Distance >= 5.0f ? CurrentLaserHitR.Distance : 1000.0f), LaserR->GetRelativeScale3D().Y, LaserR->GetRelativeScale3D().Z)); + LaserR->SetRelativeScale3D(FVector((CurrentLaserHitR.bBlockingHit ? CurrentLaserHitR.Distance / 5 : 1000.0f), LaserR->GetRelativeScale3D().Y, LaserR->GetRelativeScale3D().Z)); } } \ No newline at end of file diff --git a/Source/FireworkDuels/PickableObject.h b/Source/FireworkDuels/PickableObject.h index f7e3814..35a87b3 100644 --- a/Source/FireworkDuels/PickableObject.h +++ b/Source/FireworkDuels/PickableObject.h @@ -44,6 +44,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) bool IsHeld; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + EControllerHand ThrowingHand; + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) void OnUsed();