BT84 Tweaking Tank AI.cmproj

davidAlittle · Jul 23, 2016 · cc8b712 · cc8b712
1 parent d06b8d1
commit cc8b712
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/BattleTank/Content/Blueprints/TankAIController_BP.uasset b/BattleTank/Content/Blueprints/TankAIController_BP.uasset
diff --git a/BattleTank/Content/Tank/Tank_BP.uasset b/BattleTank/Content/Tank/Tank_BP.uasset
diff --git a/BattleTank/Content/TankAIController_BP.uasset b/BattleTank/Content/TankAIController_BP.uasset
diff --git a/BattleTank/Content/_Levels/BattleGround.umap b/BattleTank/Content/_Levels/BattleGround.umap
diff --git a/BattleTank/Source/BattleTank/Private/TankAIController.cpp b/BattleTank/Source/BattleTank/Private/TankAIController.cpp
@@ -27,5 +27,8 @@ void ATankAIController::Tick(float DeltaTime)
 	auto AimingComponent = ControlledTank->FindComponentByClass<UTankAimingComponent>();
 	AimingComponent->AimAt(PlayerTank->GetActorLocation());
 
-	AimingComponent->Fire(); // TODO limit firing rate
+	if (AimingComponent->GetFiringState() == EFiringState::Locked)
+	{
+		AimingComponent->Fire(); // TODO limit firing rate
+	}
 }
diff --git a/BattleTank/Source/BattleTank/Private/TankAimingComponent.cpp b/BattleTank/Source/BattleTank/Private/TankAimingComponent.cpp
@@ -44,6 +44,12 @@ void UTankAimingComponent::TickComponent(float DeltaTime, enum ELevelTick TickTy
 	}
 }
 
+EFiringState UTankAimingComponent::GetFiringState() const
+{
+	return FiringState;
+}
+
+
 bool UTankAimingComponent::IsBarrelMoving()
 {
 	if (!ensure(Barrel)) { return false; }
@@ -115,4 +121,5 @@ void UTankAimingComponent::Fire()
 		Projectile->LaunchProjectile(LaunchSpeed);
 		LastFireTime = FPlatformTime::Seconds();
 	}
-}
+}
+
diff --git a/BattleTank/Source/BattleTank/Public/TankAIController.h b/BattleTank/Source/BattleTank/Public/TankAIController.h
@@ -12,12 +12,14 @@ UCLASS()
 class BATTLETANK_API ATankAIController : public AAIController
 {
 	GENERATED_BODY()
-
+
+protected:
+	// How close can the AI tank get
+	UPROPERTY(EditDefaultsOnly, Category = "Setup")
+	float AcceptanceRadius = 8000;
+
 private:
 	virtual void BeginPlay() override;
 
 	virtual void Tick(float DeltaSeconds) override;
-
-	// How close can the AI tank get
-	float AcceptanceRadius = 3000;
 };
diff --git a/BattleTank/Source/BattleTank/Public/TankAimingComponent.h b/BattleTank/Source/BattleTank/Public/TankAimingComponent.h
@@ -34,6 +34,8 @@ class BATTLETANK_API UTankAimingComponent : public UActorComponent
 	UFUNCTION(BlueprintCallable, Category = "Firing")
 	void Fire();
 
+	EFiringState GetFiringState() const;
+
 protected:
 	UPROPERTY(BlueprintReadOnly, Category = "State")
 	EFiringState FiringState = EFiringState::Reloading;