diff --git a/Content/Audio/AttenuationDrone.uasset b/Content/Audio/AttenuationDrone.uasset new file mode 100644 index 0000000..3040a58 --- /dev/null +++ b/Content/Audio/AttenuationDrone.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a0c78f8e13937399957ddbb7ca262754358ee4f24499c487eaf9478fe561b6f +size 1025 diff --git a/Content/Audio/AttenuationFriendlyDrone.uasset b/Content/Audio/AttenuationFriendlyDrone.uasset new file mode 100644 index 0000000..9567495 --- /dev/null +++ b/Content/Audio/AttenuationFriendlyDrone.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c014c0a5c3f04e2f8b1ff249b2ef95581fbd00dd408acc075368fb399111839 +size 1007 diff --git a/Content/Audio/AttenuationWhaleScream.uasset b/Content/Audio/AttenuationWhaleScream.uasset index c3a94a2..95f7ac6 100644 --- a/Content/Audio/AttenuationWhaleScream.uasset +++ b/Content/Audio/AttenuationWhaleScream.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2607449761b9c9604e3163818a3b7b2c00239f4443ccc1a35582ed41a7445cc6 -size 1433 +oid sha256:b3483c1b2f51de98e475d06372d872e92aee540dce3d7cb0caf3756660585974 +size 1508 diff --git a/Content/Blueprints/BP_PlayerCharacter.uasset b/Content/Blueprints/BP_PlayerCharacter.uasset index 272f01d..60226a1 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:c698d54210677d69b72288c4690852fe87aa96e9ad975a4fedaf057aff4350cc -size 467570 +oid sha256:103eedda8b1e0208c1bd34d24ed43f8202804b65bddea91bfd48dc6d7551789c +size 498183 diff --git a/Content/Blueprints/Boss/Boss.uasset b/Content/Blueprints/Boss/Boss.uasset index 27a40b1..cf0e9f3 100644 --- a/Content/Blueprints/Boss/Boss.uasset +++ b/Content/Blueprints/Boss/Boss.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74352e670328316645ca5fd2d1b36bba32a3e14ceeedbd14967d35eb25062065 -size 401203 +oid sha256:3a35abac6ddfb635381157a0bdf7ee5cb0256e4bd5bdabd4e79d452dd5f4c429 +size 398457 diff --git a/Content/Blueprints/Drone/Brutus.uasset b/Content/Blueprints/Drone/Brutus.uasset index d6fe65b..1874efc 100644 --- a/Content/Blueprints/Drone/Brutus.uasset +++ b/Content/Blueprints/Drone/Brutus.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc93b5b6be8a10cfc8081ded5729926462e4225b94644412d68d43da4dad4da2 -size 105617 +oid sha256:9b0bdcab59079737c6f94a2289301e9ac5c61f94a9d65cdf8350f50a5ad46a65 +size 104872 diff --git a/Content/Blueprints/Drone/Drone.uasset b/Content/Blueprints/Drone/Drone.uasset deleted file mode 100644 index a87f3ab..0000000 --- a/Content/Blueprints/Drone/Drone.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f033fa7327606f847643ed182988c32d4efc424df31817b05f9e0a897560f9d -size 106759 diff --git a/Content/Blueprints/Drone/DroneBP.uasset b/Content/Blueprints/Drone/DroneBP.uasset index aa71b01..9d7a058 100644 --- a/Content/Blueprints/Drone/DroneBP.uasset +++ b/Content/Blueprints/Drone/DroneBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d97b462d1e3580c6cf8012de49a08cc5473e577b5e5960ac71080939feb83de5 -size 580355 +oid sha256:11c9f3d306f657e365a31853b32d4a76d204e6411343c4b5a5e0713b6b1490f6 +size 184384 diff --git a/Content/Blueprints/Drone/DroneBP_2.uasset b/Content/Blueprints/Drone/DroneBP_2.uasset index 555dc1f..ba84f4e 100644 --- a/Content/Blueprints/Drone/DroneBP_2.uasset +++ b/Content/Blueprints/Drone/DroneBP_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84fb65ad27c66ff22486310ec0ff76e2bb28b562c7b042cb895d126cec2b472a -size 175596 +oid sha256:7fecdd64c1b8d5807adca014d33962762dce69b47fa64281bec838785e05c4bd +size 1721 diff --git a/Content/Blueprints/Drone/DroneSeeker2.uasset b/Content/Blueprints/Drone/DroneSeeker2.uasset index f6ca447..2c856bb 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:3eeb2e8977e27ab8a3ea8f7d5d910eec353f5818ee489166dd1132e96e8f5ecf -size 182761 +oid sha256:2b8e7426f496dbc66c12a480c0b05567b323f14c68437aecf459e9eee4bd4359 +size 183712 diff --git a/Content/Blueprints/Drone/FlockingZoneBP.uasset b/Content/Blueprints/Drone/FlockingZoneBP.uasset index a837c33..716bad1 100644 --- a/Content/Blueprints/Drone/FlockingZoneBP.uasset +++ b/Content/Blueprints/Drone/FlockingZoneBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d4b286e6e902c4a0cdf4cc2523a960b76fe01475b3bd627d04a63410e153dd7 -size 161479 +oid sha256:f22dcbf207fe97cc301c542ccda7f9de75cbe63754fbb313db896994aa41821e +size 173863 diff --git a/Content/Blueprints/Drone/FriendlyDrone_BP.uasset b/Content/Blueprints/Drone/FriendlyDrone_BP.uasset index 2935ab1..7e78258 100644 --- a/Content/Blueprints/Drone/FriendlyDrone_BP.uasset +++ b/Content/Blueprints/Drone/FriendlyDrone_BP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d79987cb792e919e1ff500d0857b9e4b9f737734aaa8517e0054adcf8529d71 -size 150650 +oid sha256:cf35c267ad1bb447e31d149d64ebdbc081f7de57c8cab9b01fd100f046a32dae +size 245340 diff --git a/Content/Blueprints/Drone/oldDroneBP.uasset b/Content/Blueprints/Drone/oldDroneBP.uasset new file mode 100644 index 0000000..e4df8d4 --- /dev/null +++ b/Content/Blueprints/Drone/oldDroneBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab77fdb9dbdb0e4e19a4df2367b08509ca27d41a9e32d8439bf37bab72d92b +size 634706 diff --git a/Content/Blueprints/SoundTrigger.uasset b/Content/Blueprints/SoundTrigger.uasset index 8d4c1c8..3f5caa8 100644 --- a/Content/Blueprints/SoundTrigger.uasset +++ b/Content/Blueprints/SoundTrigger.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df003f94f5284b4cabafeee3649c2d365333bda5ced233001571d8c1f6a258f8 -size 21546 +oid sha256:3ccda5f74a5faa57c99e3943c922bbc499700b4307ea3e5fafa473ee31ec747f +size 22936 diff --git a/Content/Maps/OptimizedMap.umap b/Content/Maps/OptimizedMap.umap index da85b60..05e743e 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:39503f1856d6cd4f89b23c10f28442a17ad6e132ee99ad1bc16346a80c765c54 -size 13474206 +oid sha256:9a52522c45077aa94ac495798d94549ecd2c55f65a706c2881f4559b7211fa3e +size 13474020 diff --git a/Source/Octogonia/Drone.cpp b/Source/Octogonia/Drone.cpp index 771f149..645c923 100644 --- a/Source/Octogonia/Drone.cpp +++ b/Source/Octogonia/Drone.cpp @@ -47,7 +47,7 @@ void ADrone::BeginPlay() Velocity *= MovementSpeed; startInterval = 0.f; SetSpeed(MaxSpeed); - SetEnergy(MaxEnergy); + SetEnergy(CurrentEnergy); } void ADrone::DestroyDrone(const FVector& hit1, const FVector& hit2) diff --git a/Source/Octogonia/Drone.h b/Source/Octogonia/Drone.h index fe62e23..329cac3 100644 --- a/Source/Octogonia/Drone.h +++ b/Source/Octogonia/Drone.h @@ -57,7 +57,7 @@ public: float FoodValue = 10.0f; // the remaining energy UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess)) - int CurrentEnergy = 100; + int CurrentEnergy = 0; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (AllowPrivateAccess)) float MaxSpeed = 200000; // the actual speed diff --git a/Source/Octogonia/PlayerCharacter.cpp b/Source/Octogonia/PlayerCharacter.cpp index 3430962..f03cd39 100644 --- a/Source/Octogonia/PlayerCharacter.cpp +++ b/Source/Octogonia/PlayerCharacter.cpp @@ -281,7 +281,8 @@ void APlayerCharacter::ChangeRightHandOrientation(FRotator newRotation) void APlayerCharacter::ChangeRightHandPosition(FVector newPosition) { - RightHandContainer->SetRelativeLocation(newPosition); + if (RightHandContainer != nullptr) + RightHandContainer->SetRelativeLocation(newPosition); } void APlayerCharacter::ChangeEnergyTextColor() diff --git a/Source/Octogonia/RailWagon.cpp b/Source/Octogonia/RailWagon.cpp index f430d0d..8741c00 100644 --- a/Source/Octogonia/RailWagon.cpp +++ b/Source/Octogonia/RailWagon.cpp @@ -108,6 +108,10 @@ void ARailWagon::UpdateWagonLocation() // If a RailSpline has been linked, we can safely position our wagon on it if (RailSpline) { + auto totalLength = RailSpline->GetSplineComponent()->GetSplineLength(); + if (splineDistance > totalLength) + splineDistance = totalLength; + FVector location = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World); FVector direction = RailSpline->GetSplineComponent()->GetDirectionAtDistanceAlongSpline(splineDistance, ESplineCoordinateSpace::World); @@ -116,7 +120,7 @@ void ARailWagon::UpdateWagonLocation() //Spawning Orbs if((long)splineDistance % 100 == 0) { - FVector orbLocation = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance+5000, ESplineCoordinateSpace::World); + FVector orbLocation = RailSpline->GetSplineComponent()->GetLocationAtDistanceAlongSpline(splineDistance+8000, ESplineCoordinateSpace::World); RailSpline->SpawnOrbs(orbLocation); } }