Reactivated Team support, fixed RegistryFaction return value

Author: muit

Source/Factions/Private/Factions/Faction.cpp

@@ -8,6 +8,26 @@
 
 const FFaction FFaction::NoFaction(NO_FACTION_NAME);
 
+FFaction::FFaction(const FGenericTeamId& InTeam)
+{
+	if (InTeam.GetId() != FGenericTeamId::NoTeam.GetId())
+	{
+		const UFactionsSettings* Settings = FFactionsModule::GetFactionManager();
+		if (Settings)
+		{
+			TArray<FName> Keys;
+			Settings->Factions.GetKeys(Keys);
+
+			if (Keys.IsValidIndex(InTeam.GetId()))
+			{
+				Name = Keys[InTeam.GetId()];
+				return;
+			}
+		}
+	}
+	Name = NO_FACTION_NAME;
+}
+
 bool FFaction::GetFactionInfo(FFactionInfo& Info) const
 {
 	const UFactionsSettings* Settings = FFactionsModule::GetFactionManager();
@@ -73,3 +93,26 @@ const ETeamAttitude::Type FFaction::GetAttitudeTowards(const FFaction& Other) co
 
     return FoundRelationPtr->Attitude;
 }
+
+const FGenericTeamId FFaction::GetTeam() const
+{
+	if (IsNone()) {
+		return FGenericTeamId::NoTeam;
+	}
+
+	const UFactionsSettings* Settings = FFactionsModule::GetFactionManager();
+	check(Settings);
+
+	TArray<FName> Keys;
+	Settings->Factions.GetKeys(Keys);
+
+	//Find Id
+	const int32 Id = Keys.IndexOfByKey(Name);
+	if (Id == INDEX_NONE || Id >= FGenericTeamId::NoTeam.GetId())
+	{
+		// If Faction ID is 255 or higher, Teams won't support it.
+		return FGenericTeamId::NoTeam;
+	}
+
+	return { static_cast<uint8>(Id) };
+}

Source/Factions/Private/FactionsLibrary.cpp

@@ -9,7 +9,10 @@ FFaction UFactionsLibrary::RegistryFaction(const FName& Name, const FFactionInfo
 	UFactionsSettings* Settings = FFactionsModule::GetFactionManager();
 	check(Settings);
 
-	return Settings->Internal_RegistryFaction(Name, FactionInfo);
+	Settings->Internal_RegistryFaction(Name, FactionInfo);
+
+	// Return the faction, won't be valid if its not registered
+	return { Name };
 }
 
 bool UFactionsLibrary::UnregistryFaction(FFaction Faction)

Source/Factions/Public/Factions/Faction.h

@@ -40,13 +40,8 @@ struct FACTIONS_API FFaction
 		: Name(Name)
 	{}
 
-    FFaction(const FGenericTeamId& InTeam)
-    {
-        /*if (InTeam.GetId() == FGenericTeamId::NoTeam.GetId())
-            Id = NO_FACTION;
-        else
-            Id = InTeam.GetId();*/
-    }
+	FFaction(const FGenericTeamId& InTeam);
+
 
 	/**
 	* Find the information of a faction
@@ -62,16 +57,6 @@ struct FACTIONS_API FFaction
 	*/
 	bool SetFactionInfo(const FFactionInfo& NewInfo) const;
 
-	const FGenericTeamId GetTeam() const {
-		/*if (Id == NO_FACTION || Id >= FGenericTeamId::NoTeam.GetId())
-		{*/
-			// If Faction ID is 255 or higher, Teams won't support it.
-			return FGenericTeamId::NoTeam;
-		/*}
-
-        return FGenericTeamId(Id);*/
-    }
-
 	bool IsNone() const;
 
     /**
@@ -103,4 +88,6 @@ struct FACTIONS_API FFaction
 	FName GetIdName() const {
 		return Name;
 	}
+
+	const FGenericTeamId GetTeam() const;
 };