diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 64a49c0..0013278 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -63,7 +63,8 @@ bDefaultViewportMouseLock=True -ActionMappings=(ActionName="TriggerLeftHand",Key=MotionController_Left_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False) --ActionMappings=(ActionName="TriggerRightGrip1",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +-ActionMappings=(ActionName="TriggerRightGrip1",Key=LeftShift,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +-ActionMappings=(ActionName="TriggerLeftHand",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="Jump",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="TriggerLeftHand",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="TriggerRightHand",Key=RightMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False) @@ -71,6 +72,7 @@ bDefaultViewportMouseLock=True +ActionMappings=(ActionName="TriggerRightHand",Key=MotionController_Right_Trigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="TriggerRightGrip1",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="TriggerRightGrip1",Key=LeftShift,bShift=False,bCtrl=False,bAlt=False,bCmd=False) ++ActionMappings=(ActionName="TriggerLeftHand",Key=Gamepad_LeftShoulder,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -AxisMappings=(AxisName="LookRight",Key=MouseX,Scale=1.000000) -AxisMappings=(AxisName="LookUp",Key=MouseY,Scale=1.000000) -AxisMappings=(AxisName="WalkForward",Key=W,Scale=1.000000) diff --git a/Content/Audio/AttenuationWhaleScream.uasset b/Content/Audio/AttenuationWhaleScream.uasset new file mode 100644 index 0000000..99d9151 --- /dev/null +++ b/Content/Audio/AttenuationWhaleScream.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75cf7f054f5177c73166176f26352638d4798c52ca99658693bca64556102729 +size 997 diff --git a/Content/Audio/RobotWhaleScream-001.wav b/Content/Audio/RobotWhaleScream-001.wav new file mode 100644 index 0000000..714372b --- /dev/null +++ b/Content/Audio/RobotWhaleScream-001.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ec5b34f2d0a3a513f212e5a2741753c0c1f9ca709746dc73db5749cc9900b73 +size 2211366 diff --git a/Content/Audio/RobotWhaleScream-002.wav b/Content/Audio/RobotWhaleScream-002.wav new file mode 100644 index 0000000..2e20505 --- /dev/null +++ b/Content/Audio/RobotWhaleScream-002.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b0232d3b379f2510abda681841e4a2cc88a30ba040e3bc3061946eade5a3812 +size 1106010 diff --git a/Content/Audio/RobotWhaleScream-003.wav b/Content/Audio/RobotWhaleScream-003.wav new file mode 100644 index 0000000..1ff17c4 --- /dev/null +++ b/Content/Audio/RobotWhaleScream-003.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:861f7cbe6ee83568a9b780386de1fa80cbe86dd6266a221c302ed44d80d43a0a +size 369188 diff --git a/Content/Audio/RobotWhaleScream-004.wav b/Content/Audio/RobotWhaleScream-004.wav new file mode 100644 index 0000000..0896740 --- /dev/null +++ b/Content/Audio/RobotWhaleScream-004.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74890fa809b7f2f5b3d51bfc3901892660a6b3e78f97dbcfa1e29f4d820feea8 +size 369188 diff --git a/Content/Audio/RobotWhaleScream-005.wav b/Content/Audio/RobotWhaleScream-005.wav new file mode 100644 index 0000000..40b7062 --- /dev/null +++ b/Content/Audio/RobotWhaleScream-005.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d5ed8a24e8ee0345677e12f187bee047ff43989b353b8ab34483fd8406ebff0 +size 185380 diff --git a/Content/Audio/RobotWhaleScream-006.wav b/Content/Audio/RobotWhaleScream-006.wav new file mode 100644 index 0000000..2686d09 --- /dev/null +++ b/Content/Audio/RobotWhaleScream-006.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96efb8d823a2cbab381bae1a13c1f2800fde8807436f68c5c87aaa910d861cd6 +size 370024 diff --git a/Content/Audio/RobotWhaleScream.uasset b/Content/Audio/RobotWhaleScream.uasset new file mode 100644 index 0000000..1844f8f --- /dev/null +++ b/Content/Audio/RobotWhaleScream.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa40d4464b64837f0a4664ef1419a80b4ba44eb94f794b99bf4ecdc1f47b7ffc +size 375674 diff --git a/Content/Audio/RobotWhaleScream.wav b/Content/Audio/RobotWhaleScream.wav new file mode 100644 index 0000000..54aa66d --- /dev/null +++ b/Content/Audio/RobotWhaleScream.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93c72fd026e8b5444da42cf1a7e83726d1375d8a4f4c37b144e171525023bfc0 +size 2211448 diff --git a/Content/Audio/RobotWhaleScream.wv b/Content/Audio/RobotWhaleScream.wv new file mode 100644 index 0000000..b6df5b3 Binary files /dev/null and b/Content/Audio/RobotWhaleScream.wv differ diff --git a/Content/Audio/RobotWhaleSoundEffect.wav b/Content/Audio/RobotWhaleSoundEffect.wav new file mode 100644 index 0000000..3a1e569 --- /dev/null +++ b/Content/Audio/RobotWhaleSoundEffect.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e54b4391597bc9e57a1574fdded402c4e4f7fb40cf0013ee8eda121f7cf69a85 +size 11115232 diff --git a/Content/Blueprints/BP_EnergyOrb.uasset b/Content/Blueprints/BP_EnergyOrb.uasset index 457b563..8fe946f 100644 --- a/Content/Blueprints/BP_EnergyOrb.uasset +++ b/Content/Blueprints/BP_EnergyOrb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4514b8bc37e00eaeb30e3c2e210cb2f92be116e3edcc108247aa72677a37d421 -size 120058 +oid sha256:0f79990a8cf1dc534071a78239f73c8f17b6c0906f104da7f4ec15975bdff195 +size 129080 diff --git a/Content/Blueprints/BP_PlayerCharacter.uasset b/Content/Blueprints/BP_PlayerCharacter.uasset index 973013a..1d32cbd 100644 --- a/Content/Blueprints/BP_PlayerCharacter.uasset +++ b/Content/Blueprints/BP_PlayerCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f728da4d0e7bef906c8b2b8fbbb506ab15c7448b7811c5b6a385b356acfea5f -size 444010 +oid sha256:c189f8c56757807242673ecb319dd68f50bb53d76806f8496b4386f23e86af76 +size 457180 diff --git a/Content/Blueprints/BP_RailPod.uasset b/Content/Blueprints/BP_RailPod.uasset index 40d6eb2..1941dba 100644 --- a/Content/Blueprints/BP_RailPod.uasset +++ b/Content/Blueprints/BP_RailPod.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:570ecf3555a4a7bbb57c892b325d60ac6ad70c5fa10800c09e9e2fb05cbb6573 -size 156228 +oid sha256:3558dc25c8b0affe8eddd636de0490d0350493e955ae41591106252b7cf4995b +size 155717 diff --git a/Content/Blueprints/Drone/DroneSeeker2.uasset b/Content/Blueprints/Drone/DroneSeeker2.uasset index da0dc8a..59f035f 100644 --- a/Content/Blueprints/Drone/DroneSeeker2.uasset +++ b/Content/Blueprints/Drone/DroneSeeker2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bef26724c66d5c6c2627c37beb70c081116c1f46fb730b96a2c00270d492204b -size 164197 +oid sha256:8ac3f17d2c455f312f31f6611813d5de80fe4cd0405911748720b6c8549a53e8 +size 185138 diff --git a/Content/Blueprints/Left_Controller_Rumble.uasset b/Content/Blueprints/Left_Controller_Rumble.uasset new file mode 100644 index 0000000..d8f39b3 --- /dev/null +++ b/Content/Blueprints/Left_Controller_Rumble.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d534a407a0b05f87e30cd0a038eb11968c37ce50248f9ac58d8293e2226eae68 +size 1929 diff --git a/Content/Blueprints/NewForceFeedbackEffect.uasset b/Content/Blueprints/NewForceFeedbackEffect.uasset new file mode 100644 index 0000000..843d6be --- /dev/null +++ b/Content/Blueprints/NewForceFeedbackEffect.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d8c1f9bda599ee14aec8ee14fa5d9c8a3cb99c9ef86fcb4fc6a39df1875866d +size 539 diff --git a/Content/Blueprints/Right_Controller_Rumble.uasset b/Content/Blueprints/Right_Controller_Rumble.uasset new file mode 100644 index 0000000..b9cf505 --- /dev/null +++ b/Content/Blueprints/Right_Controller_Rumble.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66c3eb5afd926bee07272f5005a38e982d234054be756cc7c6c4d8017102935f +size 2122 diff --git a/Content/Blueprints/SoundTrigger.uasset b/Content/Blueprints/SoundTrigger.uasset new file mode 100644 index 0000000..8d4c1c8 --- /dev/null +++ b/Content/Blueprints/SoundTrigger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df003f94f5284b4cabafeee3649c2d365333bda5ced233001571d8c1f6a258f8 +size 21546 diff --git a/Content/Blueprints/SoundTriggrer.uasset b/Content/Blueprints/SoundTriggrer.uasset new file mode 100644 index 0000000..cf68fbb --- /dev/null +++ b/Content/Blueprints/SoundTriggrer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:534a522e98c4d6a5ad20df686a336c1de224c8b40746144080792733d9fb9032 +size 530 diff --git a/Content/Maps/OptimizedMap.umap b/Content/Maps/OptimizedMap.umap index d26428c..7f6ef4c 100644 --- a/Content/Maps/OptimizedMap.umap +++ b/Content/Maps/OptimizedMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:257041249d66efed361d3242d4b7d0998d753ad9ffc764d14e8addf1df40ffba -size 9369247 +oid sha256:5ae53259799164d2f11206f862a51cd1b2bb001471f735ae4d2df7ef63d2ba62 +size 13473017 diff --git a/Source/Octogonia/PlayerCharacter.cpp b/Source/Octogonia/PlayerCharacter.cpp index 2f5c0a6..3430962 100644 --- a/Source/Octogonia/PlayerCharacter.cpp +++ b/Source/Octogonia/PlayerCharacter.cpp @@ -133,6 +133,8 @@ void APlayerCharacter::TriggerRightHandPressed() if (EnergyLevel > 0) { isShooting = true; IsShootingChange(); + //device.TriggerHapticPulse(10, Valve.VR.EVRButtonId.k_EButton_SteamVR_TouchPad); + //USteamVRFunctionLibrary:: } } @@ -190,57 +192,60 @@ void APlayerCharacter::ShootLaser(USceneComponent *handSocket, float DeltaTime) if (EnergyLevel > 0) { - if (!isInHealingMode) - { - DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2); - //ShootParticleEffect(startLocation,endLocation,colorDamage); - } - else - { - DrawDebugLine(GetWorld(), startLocation, endLocation, colorHealing, true, DeltaTime*1.1, 0, 2); - //ShootParticleEffect(startLocation,endLocation,colorHealing); - } + isInHealingMode = false; FHitResult hitResult; GetWorld()->LineTraceSingleByChannel(hitResult, startLocation, endLocation, ECC_Visibility); + + //0DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2); + //ShootParticleEffect(startLocation,endLocation,colorDamage); - + if (hitResult.GetActor() && hitResult.GetActor()->IsA(ADrone::StaticClass())) { ADrone* Drone = Cast(hitResult.GetActor()); - if (!isInHealingMode) + + if (!Drone->IsFriendly) { - if (!Drone->IsFriendly) - { - Drone->DamageDrone(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000); - } + Drone->DamageDrone(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000); + } - else + else { - if (Drone->IsFriendly) - { - Drone->RestoreEnergy(LaserHPF*DeltaTime); - } + + isInHealingMode = true; + Drone->RestoreEnergy(LaserHPF*DeltaTime); } } if (hitResult.GetActor() && hitResult.GetActor()->IsA(ASeekerDrone::StaticClass())) { ASeekerDrone* Seeker = Cast(hitResult.GetActor()); - if (!isInHealingMode) - { - Seeker->ApplyDamage(LaserDPF*DeltaTime); - } + Seeker->ApplyDamage(LaserDPF*DeltaTime); + + } if (hitResult.GetComponent() && hitResult.GetComponent()->IsA(UDestructibleComponent::StaticClass())) { UDestructibleComponent* Destructible = Cast(hitResult.GetComponent()); Destructible->ApplyDamage(LaserDPF*DeltaTime, hitResult.ImpactPoint, (endLocation - startLocation).GetSafeNormal(), 1000); + + } + if (!isInHealingMode) + { + ChangeGunMaterial(); + ChangeEnergyTextColor(); + DrawDebugLine(GetWorld(), startLocation, endLocation, colorDamage, true, DeltaTime*1.1, 0, 2); + } + else + { + ChangeGunMaterial(); + ChangeEnergyTextColor(); + DrawDebugLine(GetWorld(), startLocation, endLocation, colorHealing, true, DeltaTime*1.1, 0, 2); } - ModifyEnergy(-LaserEnergyDrain); } else {