Skip to content

Commit 025a80f

Browse files
committed
*bugfixing
1 parent 803f437 commit 025a80f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

WarTech/WarTech/Helper.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ public static PlanetControlState CalculateActualAttacks(StarSystem system, Plane
9090
int randomDefence = rand.Next(maxDefence) + 1;
9191
if (randomAttack > randomDefence) {
9292
if (Fields.WarFatique[initialTarget] < 100) {
93-
Fields.WarFatique[initialTarget] += Fields.settings.FatiquePerLostAttack;
93+
Fields.WarFatique[initialTarget] = Mathf.Min(100, Fields.WarFatique[initialTarget] + Fields.settings.FatiquePerLostAttack);
9494
}
9595
}
9696
else {
9797
if (Fields.WarFatique[benefactor] < 100) {
98-
Fields.WarFatique[benefactor] += Fields.settings.FatiquePerLostAttack;
98+
Fields.WarFatique[benefactor] = Mathf.Min(100, Fields.WarFatique[benefactor] + Fields.settings.FatiquePerLostAttack);
9999
}
100100
}
101101
percentageLeft = Mathf.Max(0, randomAttack - randomDefence);
@@ -110,7 +110,7 @@ public static PlanetControlState CalculateActualAttacks(StarSystem system, Plane
110110
}
111111
else {
112112
if (Fields.WarFatique[initialTarget] < 100) {
113-
Fields.WarFatique[initialTarget] += Fields.settings.FatiquePerLostAttack;
113+
Fields.WarFatique[initialTarget] = Mathf.Min(100, Fields.WarFatique[initialTarget] + Fields.settings.FatiquePerLostAttack);
114114
}
115115
int attack = Mathf.Min(100 - attackerControl.percentage, Fields.factionResources.Find(x => x.faction == benefactor).offence);
116116
percentageLeft = attack;
@@ -208,7 +208,7 @@ public static void NegotiateAllies(Faction diplomat, SimGameState Sim, System.Ra
208208
if (rand.Next(1, 101) >= Fields.settings.BaseAllyChance / divider) {
209209
Fields.Allies[diplomat].Remove(faction.Key);
210210
Fields.Allies[faction.Key].Remove(diplomat);
211-
Fields.DiplomacyLog.Add("<color=" + Fields.settings.neutralcolor + ">" + GetFactionName(diplomat, Sim.DataManager) + "</color>" + " <color=" + Fields.settings.attackercolor + ">" + " annuled</color>" + " the non-aggression pact with " + "<color=" + Fields.settings.neutralcolor + ">" + GetFactionName(faction.Key, Sim.DataManager) + "</color>");
211+
Fields.DiplomacyLog.Add("<color=" + Fields.settings.neutralcolor + ">" + GetFactionName(diplomat, Sim.DataManager) + "</color>" + " <color=" + Fields.settings.attackercolor + ">" + " annulled</color>" + " the non-aggression pact with " + "<color=" + Fields.settings.neutralcolor + ">" + GetFactionName(faction.Key, Sim.DataManager) + "</color>");
212212
}
213213
}
214214
}

WarTech/WarTech/HolderClasses.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class Settings {
1515
public float priorityContactPayPercentage = 2f;
1616
public float FatiquePerLostAttack = 0.3f;
1717
public float FatiqueLostPerMonth = 3f;
18-
public float FatiqueRecoveredPerMonth = 3f;
18+
public float FatiqueRecoveredPerMonth = 5f;
1919
public float FatiquePerPlanetCapture = 1.5f;
2020
public string attackercolor = "#ee0000ff";
2121
public string defendercolor = "#00bb00ff";

WarTech/WarTech/Patch.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ static void Prefix(SimGameState __instance, int timeLapse) {
351351
}
352352
}
353353
else if (Helper.IsAtWar(pair.Key)) {
354-
Fields.WarFatique[pair.Key] += Fields.settings.FatiqueLostPerMonth;
354+
Fields.WarFatique[pair.Key] = Mathf.Min(100, Fields.WarFatique[pair.Key] + Fields.settings.FatiqueLostPerMonth);
355355
if (rand.Next(0, 101) < Fields.WarFatique[pair.Key]) {
356356
War war = Helper.getWar(pair.Key);
357357
if (war == null) {

0 commit comments

Comments
 (0)