diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 0e60e1f..f7c98dc 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -100,12 +100,10 @@ FOVScale=0.011110 DoubleClickTime=0.200000 +ActionMappings=(ActionName="Grab_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click) +ActionMappings=(ActionName="Grab_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click) -+ActionMappings=(ActionName="Laser_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click) ++ActionMappings=(ActionName="Laser_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click) +ActionMappings=(ActionName="Use_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click) +ActionMappings=(ActionName="Use_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_X_Click) -+ActionMappings=(ActionName="Laser_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click) -+ActionMappings=(ActionName="Menu_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click) -+ActionMappings=(ActionName="Menu_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click) ++ActionMappings=(ActionName="Laser_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click) +AxisMappings=(AxisName="TriggerR",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) +AxisMappings=(AxisName="TriggerL",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) +AxisMappings=(AxisName="ScrollR",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) diff --git a/Content/Assets/Blocks/M_Block.uasset b/Content/Assets/Blocks/M_Block.uasset deleted file mode 100644 index 0e0033f..0000000 Binary files a/Content/Assets/Blocks/M_Block.uasset and /dev/null differ diff --git a/Content/Assets/Blocks/SM_Block.uasset b/Content/Assets/Blocks/SM_Block.uasset index 66fcbd1..d3c62f7 100644 Binary files a/Content/Assets/Blocks/SM_Block.uasset and b/Content/Assets/Blocks/SM_Block.uasset differ diff --git a/Content/Assets/Blocks/SM_Block_HitAfterglow.uasset b/Content/Assets/Blocks/SM_Block_HitAfterglow.uasset new file mode 100644 index 0000000..9fb84ef Binary files /dev/null and b/Content/Assets/Blocks/SM_Block_HitAfterglow.uasset differ diff --git a/Content/Blueprints/BP_FireworksPawn.uasset b/Content/Blueprints/BP_FireworksPawn.uasset index 7e9d89c..e9f260a 100644 Binary files a/Content/Blueprints/BP_FireworksPawn.uasset and b/Content/Blueprints/BP_FireworksPawn.uasset differ diff --git a/Content/Blueprints/BP_SpawnManager.uasset b/Content/Blueprints/BP_SpawnManager.uasset index bbaa162..689517e 100644 Binary files a/Content/Blueprints/BP_SpawnManager.uasset and b/Content/Blueprints/BP_SpawnManager.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block.uasset b/Content/Blueprints/Blocks/BP_Block.uasset index 305ca14..6277333 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_1.uasset b/Content/Blueprints/Blocks/BP_Block_1.uasset index f86d6df..eda293b 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_1.uasset and b/Content/Blueprints/Blocks/BP_Block_1.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_2.uasset b/Content/Blueprints/Blocks/BP_Block_2.uasset index cc3e009..0060296 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_2.uasset and b/Content/Blueprints/Blocks/BP_Block_2.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_3.uasset b/Content/Blueprints/Blocks/BP_Block_3.uasset index 854bda6..a09e6dd 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_3.uasset and b/Content/Blueprints/Blocks/BP_Block_3.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_4.uasset b/Content/Blueprints/Blocks/BP_Block_4.uasset index 146f099..c88ca9c 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_4.uasset and b/Content/Blueprints/Blocks/BP_Block_4.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_5.uasset b/Content/Blueprints/Blocks/BP_Block_5.uasset index 55d0477..2da80eb 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_5.uasset and b/Content/Blueprints/Blocks/BP_Block_5.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_RedDragon.uasset b/Content/Blueprints/Fireworks/BP_RedDragon.uasset index 14ac881..3010a82 100644 Binary files a/Content/Blueprints/Fireworks/BP_RedDragon.uasset and b/Content/Blueprints/Fireworks/BP_RedDragon.uasset differ diff --git a/Content/Blueprints/UI/BP_IngameScreen.uasset b/Content/Blueprints/UI/BP_IngameScreen.uasset index f501239..b94423c 100644 Binary files a/Content/Blueprints/UI/BP_IngameScreen.uasset and b/Content/Blueprints/UI/BP_IngameScreen.uasset differ diff --git a/Content/Blueprints/UI/BP_Menu.uasset b/Content/Blueprints/UI/BP_Menu.uasset index 4e4f723..4de542f 100644 Binary files a/Content/Blueprints/UI/BP_Menu.uasset and b/Content/Blueprints/UI/BP_Menu.uasset differ diff --git a/Content/Blueprints/UI/BP_WristMenu.uasset b/Content/Blueprints/UI/BP_WristMenu.uasset index f061820..00f4d1e 100644 Binary files a/Content/Blueprints/UI/BP_WristMenu.uasset and b/Content/Blueprints/UI/BP_WristMenu.uasset differ diff --git a/Content/Data/DT_FireworkTemplates.uasset b/Content/Data/DT_FireworkTemplates.uasset index 455816f..0649822 100644 Binary files a/Content/Data/DT_FireworkTemplates.uasset and b/Content/Data/DT_FireworkTemplates.uasset differ diff --git a/Content/Levels/L_MainLevel.umap b/Content/Levels/L_MainLevel.umap index b02a10f..d1bc49a 100644 Binary files a/Content/Levels/L_MainLevel.umap and b/Content/Levels/L_MainLevel.umap differ diff --git a/Content/Materials/M_Block.uasset b/Content/Materials/M_Block.uasset new file mode 100644 index 0000000..b2947cf Binary files /dev/null and b/Content/Materials/M_Block.uasset differ diff --git a/Content/Materials/M_BlockHit.uasset b/Content/Materials/M_BlockHit.uasset new file mode 100644 index 0000000..3810d16 Binary files /dev/null and b/Content/Materials/M_BlockHit.uasset differ diff --git a/Content/Assets/Blocks/M_Block_1.uasset b/Content/Materials/M_Block_1.uasset similarity index 79% rename from Content/Assets/Blocks/M_Block_1.uasset rename to Content/Materials/M_Block_1.uasset index 0e73497..470feef 100644 Binary files a/Content/Assets/Blocks/M_Block_1.uasset and b/Content/Materials/M_Block_1.uasset differ diff --git a/Content/Assets/Blocks/M_Block_2.uasset b/Content/Materials/M_Block_2.uasset similarity index 79% rename from Content/Assets/Blocks/M_Block_2.uasset rename to Content/Materials/M_Block_2.uasset index 6e3efa9..0c741b5 100644 Binary files a/Content/Assets/Blocks/M_Block_2.uasset and b/Content/Materials/M_Block_2.uasset differ diff --git a/Content/Assets/Blocks/M_Block_3.uasset b/Content/Materials/M_Block_3.uasset similarity index 78% rename from Content/Assets/Blocks/M_Block_3.uasset rename to Content/Materials/M_Block_3.uasset index 58a4299..9c01461 100644 Binary files a/Content/Assets/Blocks/M_Block_3.uasset and b/Content/Materials/M_Block_3.uasset differ diff --git a/Content/Assets/Blocks/M_Block_4.uasset b/Content/Materials/M_Block_4.uasset similarity index 79% rename from Content/Assets/Blocks/M_Block_4.uasset rename to Content/Materials/M_Block_4.uasset index 3a457d6..da206f2 100644 Binary files a/Content/Assets/Blocks/M_Block_4.uasset and b/Content/Materials/M_Block_4.uasset differ diff --git a/Content/Assets/Blocks/M_Block_5.uasset b/Content/Materials/M_Block_5.uasset similarity index 78% rename from Content/Assets/Blocks/M_Block_5.uasset rename to Content/Materials/M_Block_5.uasset index 34b2e5f..caaece1 100644 Binary files a/Content/Assets/Blocks/M_Block_5.uasset and b/Content/Materials/M_Block_5.uasset differ diff --git a/Content/Textures/T_Afterglow.uasset b/Content/Textures/T_Afterglow.uasset new file mode 100644 index 0000000..a6efe4e Binary files /dev/null and b/Content/Textures/T_Afterglow.uasset differ diff --git a/Content/UI/UI_ShopTile.uasset b/Content/UI/UI_ShopTile.uasset index fd28053..717aafe 100644 Binary files a/Content/UI/UI_ShopTile.uasset and b/Content/UI/UI_ShopTile.uasset differ diff --git a/Content/UI/W_Shop.uasset b/Content/UI/W_Shop.uasset index 7e8415b..56bb6b5 100644 Binary files a/Content/UI/W_Shop.uasset and b/Content/UI/W_Shop.uasset differ diff --git a/Source/FireworkDuels/BuildingBlock.cpp b/Source/FireworkDuels/BuildingBlock.cpp index 829dfcc..e55fa6a 100644 --- a/Source/FireworkDuels/BuildingBlock.cpp +++ b/Source/FireworkDuels/BuildingBlock.cpp @@ -14,9 +14,9 @@ ABuildingBlock::ABuildingBlock() } void ABuildingBlock::DepleteHealth(float Amount) { - Health =- Amount; - - if (Health <= 0.f) { + Health = Health - Amount; + if (Health <= 0.0f) { + UE_LOG(LogTemp, Warning, TEXT("Health below 0 - DestroyingBlock")); DestroyBlock(); } else { diff --git a/Source/FireworkDuels/BuildingBlock.h b/Source/FireworkDuels/BuildingBlock.h index 599ecde..6228898 100644 --- a/Source/FireworkDuels/BuildingBlock.h +++ b/Source/FireworkDuels/BuildingBlock.h @@ -15,11 +15,11 @@ public: // Sets default values for this actor's properties ABuildingBlock(); - UPROPERTY(EditDefaultsOnly) + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) UStaticMeshComponent* StaticMesh; - UPROPERTY(BlueprintReadWrite) - float Health = 100; + UPROPERTY(BlueprintReadWrite, EditAnywhere) + float Health = 100.0f; UPROPERTY(BlueprintReadOnly) float InitialHealth; diff --git a/Source/FireworkDuels/FireworksPawn.cpp b/Source/FireworkDuels/FireworksPawn.cpp index 806fca0..3d9c15f 100644 --- a/Source/FireworkDuels/FireworksPawn.cpp +++ b/Source/FireworkDuels/FireworksPawn.cpp @@ -268,19 +268,18 @@ void AFireworksPawn::DisableLaserOnHand(EControllerHand Hand) if (Hand == EControllerHand::Left) { TryShowLaserL = false; + LaserL->SetHiddenInGame(true); } else { TryShowLaserR = false; + LaserR->SetHiddenInGame(true); } } // Update laser visuals and trace void AFireworksPawn::TryUpdateLasers() { - // --- Left Hand --- - - // Check if this hand is grabbing anything, if not - continue - if (!IsGrabbingL) { + // --- Left Hand --- if (TryShowLaserL) { FVector StartLocation = LaserL->GetComponentLocation(); @@ -288,17 +287,9 @@ void AFireworksPawn::TryUpdateLasers() 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)); - } // If the laser is visible, and should not - hide it - else if(!LaserL->bHiddenInGame) - { - LaserL->SetHiddenInGame(true); - } - } + } // --- Right Hand --- - - // Check if this hand is grabbing anything, if not - continue - if (!IsGrabbingR) { if (TryShowLaserR) { FVector StartLocation = LaserR->GetComponentLocation(); @@ -306,10 +297,5 @@ void AFireworksPawn::TryUpdateLasers() 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)); - } // If the laser is visible, and should not - hide it - else if (!LaserR->bHiddenInGame) - { - LaserR->SetHiddenInGame(true); - } - } + } } \ No newline at end of file