#209 Fixed code bugs to add simple bots (#210)

xthebat · Feb 23, 2024 · 91ad7bd · 91ad7bd
1 parent f77f5d6
commit 91ad7bd
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 7 deletions.
diff --git a/Content/Characters/Blueprints/BP_Cloud9Character.uasset b/Content/Characters/Blueprints/BP_Cloud9Character.uasset
diff --git a/Source/Cloud9/Character/Cloud9Character.cpp b/Source/Cloud9/Character/Cloud9Character.cpp
@@ -275,7 +275,7 @@ void ACloud9Character::Tick(float DeltaSeconds)
 	Super::Tick(DeltaSeconds);
 
 	// Auto select any available weapon if nothing selected
-	if (not Inventory->GetSelectedWeapon())
+	if (not Inventory->GetSelectedWeapon() and not Inventory->IsEmpty())
 	{
 		Inventory->SelectOtherAvailableWeapon(false);
 	}

diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.cpp b/Source/Cloud9/Character/Components/Cloud9Inventory.cpp
@@ -33,6 +33,7 @@
 UCloud9Inventory::UCloud9Inventory()
 {
 	SelectedWeaponSlot = EWeaponSlot::NotSelected;
+	WeaponsCount = 0;
 
 	let SlotsNumber = StaticEnum<EWeaponSlot>()->NumEnums();
 	WeaponSlots.SetNum(SlotsNumber);
@@ -264,6 +265,7 @@ bool UCloud9Inventory::AddWeapon(const FWeaponConfig& Config, bool Select, bool
 
 	log(Display, "[Inventory='%s'] Added configured weapon = '%s'", *GetName(), *Config.ToString());
 
+	WeaponsCount++;
 	OnWeaponAddDelegate.Broadcast(Weapon);
 	return true;
 }
@@ -296,10 +298,13 @@ bool UCloud9Inventory::RemoveWeapon(EWeaponSlot Slot)
 	WeaponAt(Slot)->Destroy();
 	WeaponAt(Slot) = nullptr;
 
+	WeaponsCount--;
 	OnWeaponRemoveDelegate.Broadcast();
 	return true;
 }
 
+bool UCloud9Inventory::IsEmpty() const { return WeaponsCount == 0; }
+
 bool UCloud9Inventory::SelectOtherAvailableWeapon(bool Instant, bool Force)
 {
 	EWeaponSlot NewSlot = EWeaponSlot::NotSelected;

diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.h b/Source/Cloud9/Character/Components/Cloud9Inventory.h
@@ -107,6 +107,9 @@ class CLOUD9_API UCloud9Inventory
 	UFUNCTION(BlueprintCallable)
 	bool RemoveWeapon(EWeaponSlot Slot);
 
+	UFUNCTION(BlueprintCallable)
+	bool IsEmpty() const;
+
 	UFUNCTION(BlueprintCallable)
 	ACloud9WeaponBase* GetSelectedWeapon() const;
 
@@ -127,12 +130,15 @@ class CLOUD9_API UCloud9Inventory
 	UPROPERTY(BlueprintAssignable, meta=(AllowPrivateAccess), Category=Events)
 	FOnWeaponSwitchDelegate OnWeaponSwitchDelegate;
 
+	UPROPERTY(BlueprintReadOnly, meta=(AllowPrivateAccess), Category=State)
+	int WeaponsCount;
+
 	template <typename WeaponType = ACloud9WeaponBase>
 	WeaponType* WeaponAt(EWeaponSlot Slot) const { return WeaponSlots[Slot | EUEnum::To<int>{}]; }
 
 	template <typename WeaponType = ACloud9WeaponBase>
 	WeaponType*& WeaponAt(EWeaponSlot Slot) { return WeaponSlots[Slot | EUEnum::To<int>{}]; }
-
+	
 private:
 	bool SelectWeaponImpl(EWeaponSlot Slot, bool Instant, bool Force);
 

diff --git a/Source/Cloud9/Cloud9.h b/Source/Cloud9/Cloud9.h
@@ -25,4 +25,7 @@
 
 #include "CoreMinimal.h"
 
+// TODO: should be reworked somehow ... TRACE_CHANNEL
+#define TRACE_CHANNEL ECC_PhysicsBody
+
 DECLARE_LOG_CATEGORY_EXTERN(LogCloud9, Log, All);
diff --git a/Source/Cloud9/Contollers/Cloud9MouseController.cpp b/Source/Cloud9/Contollers/Cloud9MouseController.cpp
@@ -119,7 +119,7 @@ void UCloud9MouseController::ProcessCharacterView() const
 		{
 			FHitResult TraceHitResult;
 			let bIsHitValid = Controller->GetHitResultUnderCursor(
-				ECC_Visibility,
+				TRACE_CHANNEL,
 				true,
 				TraceHitResult);
 			Pawn->SetViewDirection(TraceHitResult, bIsHitValid);

diff --git a/Source/Cloud9/Environment/Cloud9ShootingRange.cpp b/Source/Cloud9/Environment/Cloud9ShootingRange.cpp
@@ -12,6 +12,8 @@ FName ACloud9ShootingRange::WidgetComponentName = "WidgetComponentName";
 
 ACloud9ShootingRange::ACloud9ShootingRange()
 {
+	// Disable collision to remove firearms hit screen
+	SetActorEnableCollision(false);
 	PrimaryActorTick.bCanEverTick = true;
 	ZoneComponent = CreateDefaultSubobject<UBoxComponent>(ZoneComponentName);
 	WidgetComponent = CreateDefaultSubobject<UWidgetComponent>(WidgetComponentName);
@@ -44,6 +46,9 @@ void ACloud9ShootingRange::OnConstruction(const FTransform& Transform)
 	WidgetComponent->SetWidgetClass(WidgetClass);
 	WidgetComponent->SetRelativeRotation({0.0f, 90.0f, 0.0f});
 	WidgetComponent->SetDrawSize({ZoneSize.X * 2.0f, ZoneSize.Z * 2.0f});
+	// Not work's quit well (currently disable all collision in constructor)
+	// But required for future to make possible for shooting range configuration
+	WidgetComponent->SetCollisionEnabled(ECollisionEnabled::NoCollision);
 }
 
 void ACloud9ShootingRange::BeginPlay()

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp
@@ -307,7 +307,7 @@ EFirearmFireStatus ACloud9WeaponFirearm::Fire(
 	EjectCase();
 
 	FHitResult CursorHit;
-	if (not Controller->GetHitResultUnderCursor(ECC_Visibility, true, CursorHit))
+	if (not Controller->GetHitResultUnderCursor(TRACE_CHANNEL, true, CursorHit))
 	{
 		log(Error, "Cursor not hit anything")
 		return EFirearmFireStatus::Success;
@@ -333,7 +333,7 @@ EFirearmFireStatus ACloud9WeaponFirearm::Fire(
 		LineHit,
 		StartLocation,
 		EndLocation,
-		ECC_Visibility,
+		TRACE_CHANNEL,
 		CollisionParams);
 
 	if (Settings->bIsPrintHitScanInfo)

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponGrenade.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponGrenade.cpp
@@ -275,7 +275,7 @@ bool ACloud9WeaponGrenade::OnGrenadeActionLoop()
 		this,
 		InstigatorController,
 		false,
-		ECC_Visibility);
+		TRACE_CHANNEL);
 	Explosion->FireImpulse();
 
 	if (let ExplodeSounds = GetWeaponInfo()->Sounds.ExplodeSounds; ExplodeSounds.Num() > 0)
@@ -387,7 +387,7 @@ bool ACloud9WeaponGrenade::Throw() const
 	}
 
 	FHitResult CursorHit;
-	if (not Controller->GetHitResultUnderCursor(ECC_Visibility, true, CursorHit))
+	if (not Controller->GetHitResultUnderCursor(TRACE_CHANNEL, true, CursorHit))
 	{
 		log(Error, "[Weapon='%s'] Cursor not hit anything", *GetName());
 		return false;