diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index f663f9e5..1d2c0112 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetColonistStatus.cs b/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetColonistStatus.cs
index 089339a5..2d9bb279 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetColonistStatus.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetColonistStatus.cs
@@ -11,13 +11,16 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
{
public override string Name => "get_colonist_status";
public override string Description => "Returns detailed status of colonists. Can be filtered to find the colonist in the worst condition (e.g., lowest mood, most injured). This helps the AI understand the colony's state without needing to know specific names.";
- public override string UsageSchema => "string (optional, can be 'lowest_mood', 'most_injured', 'hungriest', 'most_tired')";
+ public override string UsageSchema => "string (optional, can be 'lowest_mood', 'most_injured', 'hungriest', 'most_tired')true/false (optional, default true in DevMode, false otherwise)float 0-1 (optional, default 0.3)";
public override string Execute(string args)
{
try
{
string filter = null;
+ bool showAllNeeds = Prefs.DevMode;
+ float lowNeedThreshold = 0.3f;
+
if (!string.IsNullOrEmpty(args))
{
var parsedArgs = ParseXmlArgs(args);
@@ -25,6 +28,18 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
{
filter = filterStr.ToLower();
}
+
+ if (parsedArgs.TryGetValue("showAllNeeds", out string showAllNeedsStr) && bool.TryParse(showAllNeedsStr, out bool parsedShowAllNeeds))
+ {
+ showAllNeeds = parsedShowAllNeeds;
+ }
+
+ if (parsedArgs.TryGetValue("lowNeedThreshold", out string thresholdStr) && float.TryParse(thresholdStr, out float parsedThreshold))
+ {
+ if (parsedThreshold < 0f) lowNeedThreshold = 0f;
+ else if (parsedThreshold > 1f) lowNeedThreshold = 1f;
+ else lowNeedThreshold = parsedThreshold;
+ }
}
List allColonists = new List();
@@ -86,7 +101,7 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
foreach (var pawn in colonistsToReport)
{
- AppendPawnStatus(sb, pawn);
+ AppendPawnStatus(sb, pawn, showAllNeeds, lowNeedThreshold);
}
return sb.ToString();
@@ -97,7 +112,7 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
}
}
- private void AppendPawnStatus(StringBuilder sb, Pawn pawn)
+ private void AppendPawnStatus(StringBuilder sb, Pawn pawn, bool showAllNeeds, float lowNeedThreshold)
{
if (pawn == null) return;
sb.AppendLine($"- {pawn.Name.ToStringShort} ({pawn.def.label}, Age {pawn.ageTracker.AgeBiologicalYears}):");
@@ -106,17 +121,35 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
if (pawn.needs != null)
{
sb.Append(" Needs: ");
- bool anyNeedLow = false;
- foreach (var need in pawn.needs.AllNeeds)
+
+ bool anyReported = false;
+ var allNeeds = pawn.needs.AllNeeds;
+ if (allNeeds != null && allNeeds.Count > 0)
{
- if (need.CurLevelPercentage < 0.3f) // Report low needs
+ foreach (var need in allNeeds.OrderBy(n => n.CurLevelPercentage))
{
- sb.Append($"{need.LabelCap} ({need.CurLevelPercentage:P0}), ");
- anyNeedLow = true;
+ bool isLow = need.CurLevelPercentage < lowNeedThreshold;
+ if (!showAllNeeds && !isLow) continue;
+
+ string marker = isLow ? "!" : "";
+ sb.Append($"{marker}{need.LabelCap} ({need.CurLevelPercentage:P0})");
+ if (Prefs.DevMode && need.def != null)
+ {
+ sb.Append($"[{need.def.defName}]");
+ }
+ sb.Append(", ");
+ anyReported = true;
}
}
- if (!anyNeedLow) sb.Append("All needs satisfied. ");
- else sb.Length -= 2; // Remove trailing comma
+
+ if (!anyReported)
+ {
+ sb.Append(showAllNeeds ? "(none)" : $"All needs satisfied (>= {lowNeedThreshold:P0}).");
+ }
+ else
+ {
+ sb.Length -= 2; // Remove trailing comma
+ }
sb.AppendLine();
}
@@ -194,4 +227,4 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetMapPawns.cs b/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetMapPawns.cs
new file mode 100644
index 00000000..8dd75d30
--- /dev/null
+++ b/Source/WulaFallenEmpire/EventSystem/AI/Tools/Tool_GetMapPawns.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using RimWorld;
+using Verse;
+
+namespace WulaFallenEmpire.EventSystem.AI.Tools
+{
+ public class Tool_GetMapPawns : AITool
+ {
+ public override string Name => "get_map_pawns";
+ public override string Description => "Scans the current map and lists pawns. Supports filtering by relation (friendly/hostile/neutral), type (colonist/animal/mechanoid/humanlike), and status (prisoner/slave/guest/downed).";
+ public override string UsageSchema => "string (optional, comma-separated: friendly, hostile, neutral, colonist, animal, mech, humanlike, prisoner, slave, guest, wild, downed)int (optional, default 50)";
+
+ public override string Execute(string args)
+ {
+ try
+ {
+ var parsed = ParseXmlArgs(args);
+
+ string filterRaw = null;
+ if (parsed.TryGetValue("filter", out string f)) filterRaw = f;
+ int maxResults = 50;
+ if (parsed.TryGetValue("maxResults", out string maxStr) && int.TryParse(maxStr, out int mr))
+ {
+ maxResults = Math.Max(1, Math.Min(200, mr));
+ }
+
+ Map map = Find.CurrentMap;
+ if (map == null) return "Error: No active map.";
+
+ var filters = ParseFilters(filterRaw);
+
+ List pawns = map.mapPawns?.AllPawnsSpawned?.Where(p => p != null).ToList() ?? new List();
+ pawns = pawns.Where(p => MatchesFilters(p, filters)).ToList();
+
+ if (pawns.Count == 0) return "No pawns matched.";
+
+ pawns = pawns
+ .OrderByDescending(p => IsHostileToPlayer(p))
+ .ThenByDescending(p => p.RaceProps?.Humanlike ?? false)
+ .ThenBy(p => p.def?.label ?? "")
+ .ThenBy(p => p.Name?.ToStringShort ?? "")
+ .Take(maxResults)
+ .ToList();
+
+ StringBuilder sb = new StringBuilder();
+ sb.AppendLine($"Found {pawns.Count} pawns on map (showing up to {maxResults}):");
+
+ foreach (var pawn in pawns)
+ {
+ AppendPawnLine(sb, pawn);
+ }
+
+ return sb.ToString().TrimEnd();
+ }
+ catch (Exception ex)
+ {
+ return $"Error: {ex.Message}";
+ }
+ }
+
+ private static HashSet ParseFilters(string filterRaw)
+ {
+ var set = new HashSet(StringComparer.OrdinalIgnoreCase);
+ if (string.IsNullOrWhiteSpace(filterRaw)) return set;
+
+ var parts = filterRaw.Split(new[] { ',', ',', ';', '、', '|' }, StringSplitOptions.RemoveEmptyEntries);
+ foreach (var part in parts)
+ {
+ string token = part.Trim().ToLowerInvariant();
+ if (string.IsNullOrEmpty(token)) continue;
+
+ // Chinese aliases
+ if (token == "友方") token = "friendly";
+ else if (token == "敌方" || token == "敌对") token = "hostile";
+ else if (token == "中立") token = "neutral";
+ else if (token == "动物") token = "animal";
+ else if (token == "殖民者" || token == "殖民") token = "colonist";
+ else if (token == "机械体" || token == "机械" || token == "机甲") token = "mech";
+ else if (token == "人形" || token == "类人") token = "humanlike";
+ else if (token == "囚犯") token = "prisoner";
+ else if (token == "奴隶") token = "slave";
+ else if (token == "访客" || token == "客人") token = "guest";
+ else if (token == "野生") token = "wild";
+ else if (token == "倒地" || token == "昏迷") token = "downed";
+
+ set.Add(token);
+ }
+ return set;
+ }
+
+ private static bool MatchesFilters(Pawn pawn, HashSet filters)
+ {
+ if (filters == null || filters.Count == 0) return true;
+
+ bool anyMatched = false;
+ foreach (var f in filters)
+ {
+ bool matched = f switch
+ {
+ "friendly" => IsFriendlyToPlayer(pawn),
+ "hostile" => IsHostileToPlayer(pawn),
+ "neutral" => IsNeutralToPlayer(pawn),
+ "colonist" => pawn.IsFreeColonist,
+ "animal" => pawn.RaceProps?.Animal ?? false,
+ "mech" => pawn.RaceProps?.IsMechanoid ?? false,
+ "humanlike" => pawn.RaceProps?.Humanlike ?? false,
+ "prisoner" => pawn.IsPrisonerOfColony,
+ "slave" => pawn.IsSlaveOfColony,
+ "guest" => pawn.guest != null && pawn.Faction != null && pawn.Faction != Faction.OfPlayer,
+ "wild" => pawn.Faction == null && (pawn.RaceProps?.Animal ?? false),
+ "downed" => pawn.Downed,
+ _ => false
+ };
+
+ anyMatched |= matched;
+ }
+
+ return anyMatched;
+ }
+
+ private static bool IsHostileToPlayer(Pawn pawn)
+ {
+ return pawn != null && Faction.OfPlayer != null && pawn.HostileTo(Faction.OfPlayer);
+ }
+
+ private static bool IsFriendlyToPlayer(Pawn pawn)
+ {
+ if (pawn == null || Faction.OfPlayer == null) return false;
+ if (pawn.Faction == Faction.OfPlayer) return true;
+ if (pawn.Faction == null) return false;
+ return !pawn.HostileTo(Faction.OfPlayer);
+ }
+
+ private static bool IsNeutralToPlayer(Pawn pawn)
+ {
+ if (pawn == null || Faction.OfPlayer == null) return false;
+ if (pawn.Faction == null) return true; // wild/animals etc.
+ if (pawn.Faction == Faction.OfPlayer) return false;
+ return !pawn.HostileTo(Faction.OfPlayer);
+ }
+
+ private static void AppendPawnLine(StringBuilder sb, Pawn pawn)
+ {
+ string name = pawn.Name?.ToStringShort ?? pawn.LabelShortCap;
+ string kind = pawn.def?.label ?? "unknown";
+ string faction = pawn.Faction?.Name ?? (pawn.RaceProps?.Animal == true ? "Wild" : "None");
+ string relation = IsHostileToPlayer(pawn) ? "Hostile" : (pawn.Faction == Faction.OfPlayer ? "Player" : "Non-hostile");
+ string tags = BuildTags(pawn);
+ string pos = pawn.Position.IsValid ? pawn.Position.ToString() : "?";
+
+ sb.Append($"- {name} ({kind})");
+ sb.Append($" faction={faction} relation={relation} pos={pos}");
+ if (!string.IsNullOrEmpty(tags)) sb.Append($" tags=[{tags}]");
+ sb.AppendLine();
+ }
+
+ private static string BuildTags(Pawn pawn)
+ {
+ var tags = new List();
+ if (pawn.IsFreeColonist) tags.Add("colonist");
+ if (pawn.IsPrisonerOfColony) tags.Add("prisoner");
+ if (pawn.IsSlaveOfColony) tags.Add("slave");
+ if (pawn.guest != null && pawn.Faction != null && pawn.Faction != Faction.OfPlayer) tags.Add("guest");
+ if (pawn.Downed) tags.Add("downed");
+ if (pawn.InMentalState) tags.Add("mental");
+ if (pawn.Drafted) tags.Add("drafted");
+ if (pawn.RaceProps?.Humanlike ?? false) tags.Add("humanlike");
+ if (pawn.RaceProps?.Animal ?? false) tags.Add("animal");
+ if (pawn.RaceProps?.IsMechanoid ?? false) tags.Add("mech");
+ return string.Join(", ", tags.Distinct());
+ }
+ }
+}
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
index 96f71bcc..504a4fb3 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
@@ -163,6 +163,20 @@ Example (checking for Steel):
Steel
+## get_map_pawns
+Description: Scans the current map and lists pawns. Supports filtering by relation/type/status.
+Use this tool when:
+- You need to know what pawns are present on the map (raiders, visitors, animals, mechs, colonists).
+- The player claims there are threats or asks about who/what is nearby.
+Parameters:
+- filter: (OPTIONAL) Comma-separated filters: friendly, hostile, neutral, colonist, animal, mech, humanlike, prisoner, slave, guest, wild, downed.
+- maxResults: (OPTIONAL) Max lines to return (default 50).
+Usage:
+
+ hostile, humanlike
+ 50
+
+
## change_expression
Description: Changes your visual AI portrait to match your current mood or reaction.
Use this tool when:
@@ -233,6 +247,7 @@ When the player requests any form of resources, you MUST follow this multi-turn
_tools.Add(new Tool_SendReinforcement());
_tools.Add(new Tool_GetColonistStatus());
_tools.Add(new Tool_GetMapResources());
+ _tools.Add(new Tool_GetMapPawns());
_tools.Add(new Tool_ChangeExpression());
_tools.Add(new Tool_SearchThingDef());
}