Added Burst firemode (with 2round and 3round blueprints).

Fixed overriding GetWorld() in BaseEmpiresWeapon and BaseFiremode
RoyAwesome · Nov 4, 2014 · db59ffd · db59ffd
1 parent 6971361
commit db59ffd
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 4 deletions.
diff --git a/Content/Blueprints/BE_Pistol.uasset b/Content/Blueprints/BE_Pistol.uasset
diff --git a/Content/Blueprints/BE_Rifle.uasset b/Content/Blueprints/BE_Rifle.uasset
diff --git a/Content/Blueprints/EmpPlayerState.uasset b/Content/Blueprints/EmpPlayerState.uasset
diff --git a/Content/Blueprints/EmpiresCharacter.uasset b/Content/Blueprints/EmpiresCharacter.uasset
diff --git a/Content/Blueprints/Firemodes/2RoundBurstFiremode.uasset b/Content/Blueprints/Firemodes/2RoundBurstFiremode.uasset
diff --git a/Content/Blueprints/Firemodes/3RoundBurstFiremode.uasset b/Content/Blueprints/Firemodes/3RoundBurstFiremode.uasset
diff --git a/Content/Blueprints/Weapons/BE_Pistol.uasset b/Content/Blueprints/Weapons/BE_Pistol.uasset
diff --git a/Content/Blueprints/Weapons/BE_Rifle.uasset b/Content/Blueprints/Weapons/BE_Rifle.uasset
diff --git a/Content/Blueprints/emp_bullet.uasset b/Content/Blueprints/emp_bullet.uasset
diff --git a/Source/Empires2/Private/BaseEmpiresWeapon.cpp b/Source/Empires2/Private/BaseEmpiresWeapon.cpp
@@ -35,7 +35,7 @@ void UBaseEmpiresWeapon::PostInitProperties()
 	}
 }
 
-UWorld* UBaseEmpiresWeapon::GetWorld()
+UWorld* UBaseEmpiresWeapon::GetWorld() const
 {
 	check(OwningCharacter);
 	return OwningCharacter->GetWorld();

diff --git a/Source/Empires2/Private/BaseFiremode.cpp b/Source/Empires2/Private/BaseFiremode.cpp
@@ -11,7 +11,7 @@ UBaseFiremode::UBaseFiremode(const class FPostConstructInitializeProperties& PCI
 
 }
 
-UWorld* UBaseFiremode::GetWorld()
+UWorld* UBaseFiremode::GetWorld() const
 {
 	check(Weapon);
 	return Weapon->GetWorld();

diff --git a/Source/Empires2/Private/BurstFiremode.cpp b/Source/Empires2/Private/BurstFiremode.cpp
@@ -0,0 +1,46 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#include "Empires2.h"
+#include "BurstFiremode.h"
+
+
+UBurstFiremode::UBurstFiremode(const class FPostConstructInitializeProperties& PCIP)
+	: Super(PCIP)
+{
+
+}
+
+void UBurstFiremode::BeginFire()
+{
+	Super::BeginFire();
+
+	BurstsRemaining = ShotsInBurst;
+
+	//Start a timer based off the first shot time
+	float FirstShotTime = Weapon->GetActiveFiremodeData().FirstShotFireDelay;
+	if (FirstShotTime != 0)
+	{
+		GetWorld()->GetTimerManager().SetTimer(this, &UBurstFiremode::HandleFire, FirstShotTime, false);
+	}
+	else
+	{
+		HandleFire();
+	}
+}
+
+void UBurstFiremode::HandleFire()
+{
+	BurstsRemaining--;
+
+	Weapon->FireShot();
+
+	if (IsFiring() && BurstsRemaining > 0)
+	{
+		//get the time until the next shot
+		float FireTime = (1.0f / Weapon->GetActiveFiremodeData().RoundsPerMinute) * 60.0f;
+
+		GetWorld()->GetTimerManager().SetTimer(this, &UBurstFiremode::HandleFire, FireTime, false);
+	}
+
+}
+
diff --git a/Source/Empires2/Public/BaseEmpiresWeapon.h b/Source/Empires2/Public/BaseEmpiresWeapon.h
@@ -98,7 +98,7 @@ class EMPIRES2_API UBaseEmpiresWeapon : public UObject
 
 	virtual void PostInitProperties() override;
 
-	virtual UWorld* GetWorld();
+	virtual UWorld* GetWorld() const override;
 
 	//Display Properties
 public:

diff --git a/Source/Empires2/Public/BaseFiremode.h b/Source/Empires2/Public/BaseFiremode.h
@@ -18,7 +18,7 @@ class EMPIRES2_API UBaseFiremode : public UObject
 public:
 		virtual void SetWeapon(class UBaseEmpiresWeapon* Weapon);
 
-		virtual UWorld* GetWorld();
+		virtual UWorld* GetWorld() const override;
 protected:
 
 	UBaseEmpiresWeapon* Weapon;
@@ -27,12 +27,20 @@ class EMPIRES2_API UBaseFiremode : public UObject
 	//FIRE CONTROL
 public:
 
+	/* Start the firing sequence. */
 	virtual void BeginFire();	
 
+	/* End the firing sequence */
 	virtual void EndFire();
 
+	//Actually Fire the bullet
 	virtual void HandleFire();
 
+	virtual bool CanFire()
+	{
+		return true;
+	}
+
 
 	//TODO: Implement Blueprint Hooks so designers can create their own firemodes
 	/*

diff --git a/Source/Empires2/Public/BurstFiremode.h b/Source/Empires2/Public/BurstFiremode.h
@@ -0,0 +1,28 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "BaseFiremode.h"
+#include "BurstFiremode.generated.h"
+
+/**
+ * 
+ */
+UCLASS(Blueprintable)
+class EMPIRES2_API UBurstFiremode : public UBaseFiremode
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void BeginFire() override;
+
+	virtual void HandleFire() override;
+
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = Firemode)
+	int32 ShotsInBurst;
+protected:
+	int32 BurstsRemaining;
+
+
+};