Input & Ability Fix

StellarWarp · Dec 2, 2023 · 4d47ddd · 4d47ddd
1 parent 7a99278
commit 4d47ddd
Show file tree

Hide file tree

Showing 13 changed files with 4,778 additions and 3,668 deletions.
diff --git a/Build/Windows/FileOpenOrder/CookerOpenOrder.log b/Build/Windows/FileOpenOrder/CookerOpenOrder.log
diff --git a/Build/Windows/FileOpenOrder/EditorOpenOrder.log b/Build/Windows/FileOpenOrder/EditorOpenOrder.log
diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
@@ -219,6 +219,7 @@ ManualIPAddress=
 +FunctionRedirects=(OldName="/Script/Cubeization.WorldDynamicTerrainControlSubsystem.SetCurrentPage",NewName="/Script/Cubeization.WorldDynamicTerrainControlSubsystem.InitCurrentPage")
 +FunctionRedirects=(OldName="/Script/Cubeization.WorldDynamicTerrainControlSubsystem.InitPage",NewName="/Script/Cubeization.WorldDynamicTerrainControlSubsystem.AddPage")
 +PropertyRedirects=(OldName="/Script/Cubeization.PageSetting.CurrentPage",NewName="/Script/Cubeization.PageSetting.StartPage")
++PropertyRedirects=(OldName="/Script/Cubeization.WeaponHitInfo.NormalImpulse",NewName="/Script/Cubeization.WeaponHitInfo.Impulse")
 
 [/Script/Engine.UserInterfaceSettings]
 RenderFocusRule=NavigationOnly

diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini
@@ -11,4 +11,5 @@ NetIndexFirstBitSegment=16
 +GameplayTagList=(Tag="Ability",DevComment="")
 +GameplayTagList=(Tag="Ability.Fire",DevComment="")
 +GameplayTagList=(Tag="Ability.Weapon",DevComment="")
++GameplayTagList=(Tag="Ability.WeaponActivated",DevComment="")
 
diff --git a/Content/AbilitySystem/GA_Fire.uasset b/Content/AbilitySystem/GA_Fire.uasset
diff --git a/Content/Chaos/Projectile_ForceField.uasset b/Content/Chaos/Projectile_ForceField.uasset
diff --git a/Content/Maps/NewWorld.umap b/Content/Maps/NewWorld.umap
diff --git a/Content/ThirdPerson/Input/IMC_Default.uasset b/Content/ThirdPerson/Input/IMC_Default.uasset
diff --git a/Source/Cubeization/AbilitySystem/Ability/GameplayAbility_Weapon.cpp b/Source/Cubeization/AbilitySystem/Ability/GameplayAbility_Weapon.cpp
@@ -11,24 +11,25 @@ void UGameplayAbility_Weapon::ActivateAbility(const FGameplayAbilitySpecHandle H
                                               const FGameplayAbilityActivationInfo ActivationInfo,
                                               const FGameplayEventData* TriggerEventData)
 {
-	//todo hack method remove this
-	float Time = GetWorld()->GetTimeSeconds();
-	if (!CommitAbility(Handle, ActorInfo, ActivationInfo) || Time - LastFireTime < FireInterval)
+	if (!CommitAbility(Handle, ActorInfo, ActivationInfo))
 	{
 		EndAbility(CurrentSpecHandle, CurrentActorInfo, CurrentActivationInfo, true, true);
 		return;
 	}
-	LastFireTime = Time;
+	//log LastFireTime and time
 
 	//direct raycast and spawn effect and damage
 
 	auto Actor = ActorInfo->AvatarActor.Get();
 	auto World = Actor->GetWorld();
 
+	FVector StartLocation = Actor->GetActorLocation();
+	FVector Direction = Actor->GetActorForwardVector();
+
 	FHitResult HitResult;
 	World->LineTraceSingleByChannel(HitResult,
-	                                Actor->GetActorLocation(),
-	                                Actor->GetActorLocation() + Actor->GetActorForwardVector() * 10000,
+	                                StartLocation,
+	                                StartLocation + Direction * 10000,
 	                                ECollisionChannel::ECC_Visibility,
 	                                FCollisionQueryParams::DefaultQueryParam,
 	                                FCollisionResponseParams::DefaultResponseParam);
@@ -42,7 +43,7 @@ void UGameplayAbility_Weapon::ActivateAbility(const FGameplayAbilitySpecHandle H
 	{
 		UNiagaraFunctionLibrary::SpawnSystemAtLocation(World, HitNiagaraEffect, HitResult.Location);
 		auto Trail = UNiagaraFunctionLibrary::SpawnSystemAtLocation(World, TrailNiagaraEffect,
-																	Actor->GetActorLocation(),
+																	StartLocation,
 																	Actor->GetActorRotation());
 		Trail->SetFloatParameter(L"Length", HitResult.Distance);
 	}
@@ -56,10 +57,11 @@ void UGameplayAbility_Weapon::ActivateAbility(const FGameplayAbilitySpecHandle H
 		return;
 	}
 
+	//call cpp only
 	WeaponRespond->NotifyWeaponHit_Implementation({
 		HitResult.Location,
 		HitResult.ImpactNormal,
-		HitResult.ImpactNormal, //impose,
+		Direction * ImpulseMultiplier,
 		HitResult,
 	});
 
@@ -94,5 +96,14 @@ void UGameplayAbility_Weapon::ActivateAbility(const FGameplayAbilitySpecHandle H
 	// UGameplayStatics::SpawnEmitterAtLocation(ActorInfo->AvatarActor->GetWorld(), Effect, HitResult.ImpactPoint);
 
 
-	Super::ActivateAbility(Handle, ActorInfo, ActivationInfo, TriggerEventData);
+
+	// Super::ActivateAbility(Handle, ActorInfo, ActivationInfo, TriggerEventData);
+
+	//delay end ability
+	FTimerHandle TimerHandle;
+	World->GetTimerManager().SetTimer(TimerHandle, [this]()
+	{
+		EndAbility(CurrentSpecHandle, CurrentActorInfo, CurrentActivationInfo, true, true);
+	}, FireInterval, false);
+
 }
diff --git a/Source/Cubeization/AbilitySystem/Ability/GameplayAbility_Weapon.h b/Source/Cubeization/AbilitySystem/Ability/GameplayAbility_Weapon.h
@@ -26,11 +26,12 @@ class UGameplayAbility_Weapon: public UGameplayAbility
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "GameplayAbility")
 	TObjectPtr<class UNiagaraSystem> TrailNiagaraEffect;
 
-	//hack
-	float LastFireTime = 0;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "GameplayAbility")
 	float FireInterval = 0.5f;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "GameplayAbility")
+	int ImpulseMultiplier = 1000;
+
 
 	virtual void ActivateAbility(const FGameplayAbilitySpecHandle Handle, const FGameplayAbilityActorInfo* ActorInfo, const FGameplayAbilityActivationInfo ActivationInfo, const FGameplayEventData* TriggerEventData) override;
 

diff --git a/Source/Cubeization/DynamicTerrain/TerrainRepresentationSubsystem.cpp b/Source/Cubeization/DynamicTerrain/TerrainRepresentationSubsystem.cpp
@@ -12,6 +12,9 @@ void UTerrainRepresentationSubsystem::Initialize(FSubsystemCollectionBase& Colle
 	Collection.InitializeDependency(UTerrainDataSubsystem::StaticClass());
 
 	Super::Initialize(Collection);
+
+	TerrainDataSubsystem = GetWorld()->GetSubsystem<UTerrainDataSubsystem>();
+
 }
 
 void UTerrainRepresentationSubsystem::Deinitialize()
@@ -28,7 +31,6 @@ void UTerrainRepresentationSubsystem::Tick(float DeltaTime)
 
 void UTerrainRepresentationSubsystem::NotifyDestruction(FWeaponHitInfo Info)
 {
-	auto TerrainDataSubsystem = GetWorld()->GetSubsystem<UTerrainDataSubsystem>();
 
 	FVector InnerPosition = Info.HitLocation - Info.HitNormal * 0.5f * TerrainDataSubsystem->CubeLength;
 
@@ -38,12 +40,16 @@ void UTerrainRepresentationSubsystem::NotifyDestruction(FWeaponHitInfo Info)
 	FIntVector2 CubeIndex = TerrainDataSubsystem->WorldPositionToLogicalIndex(InnerPosition);
 
 	DeferredReplacementQueue.Enqueue({CubeIndex, Info.HitLocation});
+
+	TerrainDataSubsystem->ApplyForce(
+		Info.HitLocation,
+		Info.Impulse.Z,
+		3);
 }
 
 
 void UTerrainRepresentationSubsystem::DeferredInstanceUpdate(UInstancedStaticMeshComponent* ISMC)
 {
-	auto TerrainDataSubsystem = GetWorld()->GetSubsystem<UTerrainDataSubsystem>();
 
 	auto& InstanceTransforms = ISMC->PerInstanceSMData;
 	auto& InstanceBodies = ISMC->InstanceBodies;

diff --git a/Source/Cubeization/DynamicTerrain/TerrainRepresentationSubsystem.h b/Source/Cubeization/DynamicTerrain/TerrainRepresentationSubsystem.h
@@ -29,6 +29,9 @@ class CUBEIZATION_API UTerrainRepresentationSubsystem : public UTickableWorldSub
 
 	TQueue<DeferredReplacementParams> DeferredReplacementQueue;
 
+	//initialize in Initialize
+	class UTerrainDataSubsystem* TerrainDataSubsystem;
+
 public:
 
 	virtual bool ShouldCreateSubsystem(UObject* Outer) const override { return true; }

diff --git a/Source/Cubeization/Weapons/WeaponRespond.h b/Source/Cubeization/Weapons/WeaponRespond.h
@@ -20,7 +20,7 @@ struct FWeaponHitInfo
 	FVector HitNormal;
 
 	UPROPERTY()
-	FVector NormalImpulse;
+	FVector Impulse;
 
 	UPROPERTY()
 	FHitResult HitResult;