vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Faction Test v1.0.1.0

Browse Source
This commit is contained in:
Regalis11
2023-02-16 15:01:28 +02:00
parent caa5a2f762
commit 2c5a7923b0
309 changed files with 7502 additions and 4335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Factions.cs
+13 -16
View File
@@ -2,6 +2,7 @@
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
namespace Barotrauma
{
@@ -27,28 +28,20 @@ namespace Barotrauma
/// Get what kind of affiliation this faction has towards the player depending on who they chose to side with via talents
/// </summary>
/// <returns></returns>
public static FactionAffiliation GetPlayerAffiliationStatus(Faction faction, ImmutableHashSet<Character>? characterList = null)
public static FactionAffiliation GetPlayerAffiliationStatus(Faction faction)
{
if (GameMain.GameSession?.Campaign?.Factions is not { } factions) { return FactionAffiliation.Neutral; }
characterList ??= GameSession.GetSessionCrewCharacters(CharacterType.Both);
foreach (Character character in characterList)
bool isHighest = true;
foreach (Faction otherFaction in factions)
{
if (character.Info is not { } info) { continue; }
if (otherFaction == faction || otherFaction.Reputation.Value < faction.Reputation.Value) { continue; }
foreach (Faction otherFaction in factions)
{
Identifier factionIdentifier = otherFaction.Prefab.Identifier;
if (info.GetSavedStatValue(StatTypes.Affiliation, factionIdentifier) > 0f)
{
return factionIdentifier == faction.Prefab.Identifier
? FactionAffiliation.Positive
: FactionAffiliation.Negative;
}
}
isHighest = false;
break;
}
return FactionAffiliation.Neutral;
return isHighest ? FactionAffiliation.Positive : FactionAffiliation.Negative;
}
public override string ToString()
@@ -88,6 +81,8 @@ namespace Barotrauma
public readonly LevelData.LevelType LevelType;
public readonly float MinReputation, MaxReputation;
public readonly float MinProbability, MaxProbability;
public readonly int MaxDistanceFromFactionOutpost;
public readonly bool DisallowBetweenOtherFactionOutposts;
public AutomaticMission(ContentXElement element, string parentDebugName)
{
@@ -102,6 +97,8 @@ namespace Barotrauma
float probability = element.GetAttributeFloat("probability", 0.0f);
MinProbability = element.GetAttributeFloat("minprobability", probability);
MaxProbability = element.GetAttributeFloat("maxprobability", probability);
MaxDistanceFromFactionOutpost = element.GetAttributeInt("maxdistance", int.MaxValue);
DisallowBetweenOtherFactionOutposts = element.GetAttributeBool(nameof(DisallowBetweenOtherFactionOutposts), false);
}
}
Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs
+9 -4
View File
@@ -58,7 +58,7 @@ namespace Barotrauma
Value = newReputation;
}
public void AddReputation(float reputationChange)
public float GetReputationChangeMultiplier(float reputationChange)
{
if (reputationChange > 0f)
{
@@ -68,7 +68,7 @@ namespace Barotrauma
reputationGainMultiplier *= 1f + character.GetStatValue(StatTypes.ReputationGainMultiplier, includeSaved: false);
reputationGainMultiplier *= 1f + character.Info?.GetSavedStatValue(StatTypes.ReputationGainMultiplier, Identifier) ?? 0;
}
reputationChange *= reputationGainMultiplier;
return reputationGainMultiplier;
}
else if (reputationChange < 0f)
{
@@ -78,9 +78,14 @@ namespace Barotrauma
reputationLossMultiplier *= 1f + character.GetStatValue(StatTypes.ReputationLossMultiplier, includeSaved: false);
reputationLossMultiplier *= 1f + character.Info?.GetSavedStatValue(StatTypes.ReputationLossMultiplier, Identifier) ?? 0;
}
reputationChange *= reputationLossMultiplier;
return reputationLossMultiplier;
}
Value += reputationChange;
return 1.0f;
}
public void AddReputation(float reputationChange)
{
Value += reputationChange * GetReputationChangeMultiplier(reputationChange);
}
public readonly NamedEvent<Reputation> OnReputationValueChanged = new NamedEvent<Reputation>();
Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Wallet.cs
+13 -29
View File
@@ -69,7 +69,7 @@ namespace Barotrauma
public Option<int> RewardDistributionChanged;
public Option<int> BalanceChanged;
public WalletChangedData MergeInto(WalletChangedData other)
public readonly WalletChangedData MergeInto(WalletChangedData other)
{
other.BalanceChanged = AddOptionalInt(other.BalanceChanged, BalanceChanged);
other.RewardDistributionChanged = AddOptionalInt(other.RewardDistributionChanged, RewardDistributionChanged);
@@ -80,32 +80,20 @@ namespace Barotrauma
static Option<int> AddOptionalInt(Option<int> a, Option<int> b)
{
return a switch
{
Some<int> some1 => b switch
{
Some<int> some2 => Option<int>.Some(some1.Value + some2.Value),
None<int> _ => Option<int>.Some(some1.Value),
_ => throw new ArgumentOutOfRangeException(nameof(b))
},
None<int> _ => b switch
{
Some<int> some1 => Option<int>.Some(some1.Value),
None<int> _ => Option<int>.None(),
_ => throw new ArgumentOutOfRangeException(nameof(b))
},
_ => throw new ArgumentOutOfRangeException(nameof(a))
};
bool hasValue1 = a.TryUnwrap(out var value1);
bool hasValue2 = b.TryUnwrap(out var value2);
return hasValue1
? hasValue2
? Option.Some(value1 + value2)
: Option.Some(value1)
: hasValue2
? Option.Some(value2)
: Option.None;
}
static Option<int> TurnToNoneIfZero(Option<int> option)
{
return option switch
{
Some<int> s => s.Value == 0 ? Option<int>.None() : option,
None<int> _ => option,
_ => throw new ArgumentOutOfRangeException(nameof(option))
};
return option.Bind(i => i == 0 ? Option.None : Option.Some(i));
}
}
}
@@ -223,12 +211,8 @@ namespace Barotrauma
};
}
public string GetOwnerLogName() => Owner switch
{
Some<Character> { Value: var character } => character.Name,
None<Character> _ => "the bank",
_ => throw new ArgumentOutOfRangeException(nameof(Owner))
};
public string GetOwnerLogName()
=> Owner.TryUnwrap(out var character) ? character.Name : "the bank";
partial void SettingsChanged(Option<int> balanceChanged, Option<int> rewardChanged);