Skip to content

Bugfixes for: RestrictEvents, GiveGifft & ObjectsInRange #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TorannD merged 9 commits into from
Mar 29, 2026
+50 −44
Merged

Bugfixes for: RestrictEvents, GiveGifft & ObjectsInRange #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e2a139
Allow Salvagers raids regarding of RestrictEvents
myszsoda Mar 5, 2026
39dfc33
Revert RestrictEvents allowing caravans
myszsoda Mar 20, 2026
9085b2a
Allow mechanoid raids regardless of RestrictEvents
myszsoda Mar 20, 2026
6395b20
Change 'GiveGift' patch condition & fix items being kept
myszsoda Mar 24, 2026
d2b21a5
Block settlements from sending objects when very damaged
myszsoda Mar 24, 2026
d52c552
Ignore space tiles in GetWorldObjectsInRange
myszsoda Mar 24, 2026
e6cbcae
Disable custom omsConsole interfaction in space
myszsoda Mar 25, 2026
c3ba575
Trader: Do not lose points on player faction trade
myszsoda Mar 28, 2026
eea11a1
Re-enable points increase from pod gifts
myszsoda Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions Source/RimWar/Harmony/HarmonyPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace RimWar.Harmony
[StaticConstructorOnStartup]
public class RimWarMod : Mod
{
public static int RimpointsPerGift = 90;
private static readonly Type patchType = typeof(RimWarMod);

public RimWarMod(ModContentPack content) : base(content)
Expand Down Expand Up @@ -99,11 +100,11 @@ public RimWarMod(ModContentPack content) : base(content)

//Prefix

//harmonyInstance.Patch(AccessTools.Method(typeof(FactionGiftUtility), "GiveGift", new Type[]
// {
// typeof(List<ActiveDropPodInfo>),
// typeof(Settlement)
// }, null), new HarmonyMethod(patchType, "GivePodGiftAsRimWarPoints_Prefix", null), null, null);
harmonyInstance.Patch(AccessTools.Method(typeof(FactionGiftUtility), "GiveGift", new Type[]
{
typeof(List<ActiveTransporterInfo>),
typeof(Settlement)
}, null), new HarmonyMethod(patchType, "GivePodGiftAsRimWarPoints_Prefix", null), null, null);
harmonyInstance.Patch(AccessTools.Method(typeof(FactionGiftUtility), "GiveGift", new Type[]
{
typeof(List<Tradeable>),
Expand Down Expand Up @@ -192,39 +193,28 @@ public RimWarMod(ModContentPack content) : base(content)
// }
//}

//public static bool GivePodGiftAsRimWarPoints_Prefix(List<ActiveDropPodInfo> pods, Settlement giveTo)
//{
// if(giveTo.Faction.PlayerRelationKind == FactionRelationKind.Ally)
// {
// RimWarSettlementComp rwsc = giveTo.GetComponent<RimWarSettlementComp>();
// if(rwsc != null)
// {
// int goodwillChange = FactionGiftUtility.GetGoodwillChange(pods.Cast<IThingHolder>(), giveTo);
// rwsc.RimWarPoints += goodwillChange * 100;
// return false;
// }
// else
// {
// return true;
// }
// }
// return true;
//}
public static bool GivePodGiftAsRimWarPoints_Prefix(List<ActiveTransporterInfo> pods, Settlement giveTo)
{
RimWarSettlementComp rwsc = giveTo.GetComponent<RimWarSettlementComp>();
if(rwsc != null)
{
int goodwillChange = FactionGiftUtility.GetGoodwillChange(pods.Cast<IThingHolder>(), giveTo);
rwsc.RimWarPoints += goodwillChange * RimWarMod.RimpointsPerGift;
}

return true;
}

public static bool GiveGiftAsRimWarPoints_Prefix(List<Tradeable> tradeables, Faction giveTo, GlobalTargetInfo lookTarget)
{
if (giveTo.PlayerRelationKind == FactionRelationKind.Ally)
Settlement s = Find.WorldObjects.SettlementAt(lookTarget.Tile);
if (s != null)
{
Settlement s = Find.WorldObjects.SettlementAt(lookTarget.Tile);
if(s != null)
RimWarSettlementComp rwsc = s.GetComponent<RimWarSettlementComp>();
if (rwsc != null)
{
RimWarSettlementComp rwsc = s.GetComponent<RimWarSettlementComp>();
if (rwsc != null)
{
int goodwillChange = FactionGiftUtility.GetGoodwillChange(tradeables, giveTo);
rwsc.RimWarPoints += goodwillChange * 90;
return false;
}
int goodwillChange = FactionGiftUtility.GetGoodwillChange(tradeables, giveTo);
rwsc.RimWarPoints += goodwillChange * RimWarMod.RimpointsPerGift;
}
}
return true;
Expand Down Expand Up @@ -944,7 +934,8 @@ public static bool CanFireNow_Ambush_EnemyFaction_RemovalPatch_Prefix(IncidentWo
Options.SettingsRef settingsRef = new Options.SettingsRef();
if (settingsRef.restrictEvents)
{
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" && !__instance.def.defName.Contains("Cult") && parms.quest == null &&
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" &&
!__instance.def.defName.Contains("Cult") && !__instance.def.defName.Contains("Salvagers") && parms.quest == null &&
!parms.forced && !__instance.def.workerClass.ToString().StartsWith("Rumor_Code") && !(parms.faction != null && parms.faction.Hidden))
{
__result = false;
Expand All @@ -960,7 +951,8 @@ public static bool CanFireNow_CaravanDemand_RemovalPatch_Prefix(IncidentWorker_C
Options.SettingsRef settingsRef = new Options.SettingsRef();
if (settingsRef.restrictEvents)
{
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" && !__instance.def.defName.Contains("Cult") && parms.quest == null &&
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" &&
!__instance.def.defName.Contains("Cult") && !__instance.def.defName.Contains("Salvagers") && parms.quest == null &&
!parms.forced && !__instance.def.workerClass.ToString().StartsWith("Rumor_Code") && !(parms.faction != null && parms.faction.Hidden))
{
__result = false;
Expand All @@ -976,7 +968,8 @@ public static bool CanFireNow_CaravanMeeting_RemovalPatch_Prefix(IncidentWorker_
Options.SettingsRef settingsRef = new Options.SettingsRef();
if (settingsRef.restrictEvents)
{
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" && !__instance.def.defName.Contains("Cult") && parms.quest == null &&
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" &&
!__instance.def.defName.Contains("Cult") && !__instance.def.defName.Contains("Salvagers") && parms.quest == null &&
!parms.forced && !__instance.def.workerClass.ToString().StartsWith("Rumor_Code") && !(parms.faction != null && parms.faction.Hidden))
{
__result = false;
Expand Down Expand Up @@ -1014,8 +1007,9 @@ public static bool CanFireNow_PawnsArrive_RemovalPatch_Prefix(IncidentWorker_Paw
Options.SettingsRef settingsRef = new Options.SettingsRef();
if (settingsRef.restrictEvents)
{
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" && !__instance.def.defName.Contains("Cult") && parms.quest == null &&
!parms.forced && !__instance.def.workerClass.ToString().StartsWith("Rumor_Code"))
if (__instance != null && __instance.def.defName != "VisitorGroup" && __instance.def.defName != "VisitorGroupMax" &&
!__instance.def.defName.Contains("Cult") && !__instance.def.defName.Contains("Salvagers") && !__instance.def.defName.Contains("Mechanoids") &&
parms.quest == null && !parms.forced && !__instance.def.workerClass.ToString().StartsWith("Rumor_Code"))
{
if(parms.faction != null)
{
Expand All @@ -1024,7 +1018,7 @@ public static bool CanFireNow_PawnsArrive_RemovalPatch_Prefix(IncidentWorker_Paw
return true;
}
}
if (__instance.def == IncidentDefOf.RaidEnemy || __instance.def == IncidentDefOf.RaidFriendly)
if (__instance.def == IncidentDefOf.RaidEnemy || __instance.def == IncidentDefOf.RaidFriendly || __instance.def == IncidentDefOf.TraderCaravanArrival)
{
__result = false;

Expand Down Expand Up @@ -1066,6 +1060,12 @@ public static class CommsConsole_RimWarOptions_Patch
{
private static void Postfix(Pawn negotiator, Faction faction, ref DiaNode __result)
{
// Do not allow custom options in space
if (negotiator.Map.TileInfo.Layer == Find.WorldGrid.Orbit)
{
return;
}

List<DiaOption> removeList = new List<DiaOption>();
removeList.Clear();
foreach (DiaOption x in __result.options)
Expand Down
4 changes: 2 additions & 2 deletions Source/RimWar/Planet/Trader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ public override void ArrivalAction()
IncidentUtility.DoSettlementTradeWithPoints(this, playerSettlement, this.rimwarData, IncidentUtility.PawnsArrivalModeOrRandom(PawnsArrivalModeDefOf.EdgeWalkIn), traderKind);
if (this.WarSettlementComp != null)
{
this.WarSettlementComp.RimWarPoints += Mathf.RoundToInt((this.RimWarPoints / 2f) * (Rand.Range(1.05f, 1.25f)));
this.WarSettlementComp.PointDamage += Mathf.RoundToInt(this.PointDamage / 2f);
this.WarSettlementComp.RimWarPoints += Mathf.RoundToInt((this.RimWarPoints) * (Rand.Range(1.05f, 1.25f)));
this.WarSettlementComp.PointDamage += Mathf.RoundToInt(this.PointDamage);
}
base.ArrivalAction();
});
Expand Down
6 changes: 3 additions & 3 deletions Source/RimWar/Planet/WorldComponent_PowerTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ public void AttemptScoutMission_UnThreaded(RimWarData rwd, RimWorld.Planet.Settl
if (wo is Caravan)
{
Caravan playerCaravan = wo as Caravan;
if ((playerCaravan.PlayerWealthForStoryteller / 200) <= (rwsComp.RimWarPoints * .5f) && ((Find.WorldGrid.TraversalDistanceBetween(wo.Tile, parentSettlement.Tile) <= Mathf.RoundToInt(targetRange * playerCaravan.Visibility)) || ignoreRestrictions))
if ((playerCaravan.PlayerWealthForStoryteller / 200) <= ((rwsComp.RimWarPoints - rwsComp.PointDamage) * .5f) && ((Find.WorldGrid.TraversalDistanceBetween(wo.Tile, parentSettlement.Tile) <= Mathf.RoundToInt(targetRange * playerCaravan.Visibility)) || ignoreRestrictions))
{
shouldExecute = true;
break;
Expand All @@ -1819,7 +1819,7 @@ public void AttemptScoutMission_UnThreaded(RimWarData rwd, RimWorld.Planet.Settl
else if (wo is WarObject)
{
WarObject warObject = wo as WarObject;
if (warObject.RimWarPoints <= (rwsComp.RimWarPoints * .5f) || ignoreRestrictions)
if (warObject.RimWarPoints <= ((rwsComp.RimWarPoints - rwsComp.PointDamage) * .5f) || ignoreRestrictions)
{
shouldExecute = true;
break;
Expand All @@ -1828,7 +1828,7 @@ public void AttemptScoutMission_UnThreaded(RimWarData rwd, RimWorld.Planet.Settl
else if (wo is RimWorld.Planet.Settlement)
{
RimWarSettlementComp rwsc = WorldUtility.GetRimWarSettlementAtTile(wo.Tile);
if (rwsc != null && (rwsc.RimWarPoints <= (rwsComp.RimWarPoints * .5f) || ignoreRestrictions))
if (rwsc != null && (rwsc.RimWarPoints <= ((rwsComp.RimWarPoints - rwsComp.PointDamage) * .5f) || ignoreRestrictions))
{
shouldExecute = true;
break;
Expand Down
6 changes: 6 additions & 0 deletions Source/RimWar/Planet/WorldUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,12 @@ public static List<WorldObject> GetWorldObjectsInRange(PlanetTile from, float ra
if (objectsInRange.Count >= maxObjectsPerScan)
break;

// Probably in future add attacks between same layers
if (to.Layer == Find.WorldGrid.Orbit)
{
continue;
}

if (from == to)
{
objectsInRange.Add(worldObjects[i]);
Expand Down