zc
This commit is contained in:
@@ -17,55 +17,61 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
"Do NOT blindly follow the player's requested amount. " +
|
||||
"If goodwill is low (< 0), give significantly less than asked or refuse. " +
|
||||
"If goodwill is high (> 50), you may give what is asked or slightly more. " +
|
||||
"Otherwise, give a moderate amount.";
|
||||
"Otherwise, give a moderate amount. " +
|
||||
"TIP: Use the `search_thing_def` tool first and then spawn by DefName (<defName> or put DefName into <name>) to avoid language mismatch.";
|
||||
public override string UsageSchema => "<spawn_resources><items><item><name>Item Name</name><count>Integer</count></item></items></spawn_resources>";
|
||||
|
||||
public override string Execute(string args)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (args == null) args = "";
|
||||
|
||||
// Custom XML parsing for nested items
|
||||
var itemsToSpawn = new List<(ThingDef def, int count)>();
|
||||
var substitutions = new List<string>();
|
||||
|
||||
// Match all <item>...</item> blocks
|
||||
var itemMatches = Regex.Matches(args, @"<item>(.*?)</item>", RegexOptions.Singleline);
|
||||
var itemMatches = Regex.Matches(args, @"<item\b[^>]*>(.*?)</item>", RegexOptions.Singleline | RegexOptions.IgnoreCase);
|
||||
|
||||
foreach (Match match in itemMatches)
|
||||
{
|
||||
string itemXml = match.Groups[1].Value;
|
||||
|
||||
// Extract name (supports <name> or <defName> for backward compatibility)
|
||||
string name = "";
|
||||
var nameMatch = Regex.Match(itemXml, @"<name>(.*?)</name>");
|
||||
if (nameMatch.Success)
|
||||
string ExtractTag(string xml, string tag)
|
||||
{
|
||||
name = nameMatch.Groups[1].Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
var defNameMatch = Regex.Match(itemXml, @"<defName>(.*?)</defName>");
|
||||
if (defNameMatch.Success) name = defNameMatch.Groups[1].Value;
|
||||
var m = Regex.Match(
|
||||
xml,
|
||||
$@"<{tag}\b[^>]*>(?:<!\[CDATA\[(.*?)\]\]>|(.*?))</{tag}>",
|
||||
RegexOptions.Singleline | RegexOptions.IgnoreCase);
|
||||
if (!m.Success) return null;
|
||||
string val = m.Groups[1].Success ? m.Groups[1].Value : m.Groups[2].Value;
|
||||
return val?.Trim();
|
||||
}
|
||||
|
||||
string name = ExtractTag(itemXml, "name") ?? ExtractTag(itemXml, "defName");
|
||||
|
||||
if (string.IsNullOrEmpty(name)) continue;
|
||||
|
||||
// Extract count
|
||||
var countMatch = Regex.Match(itemXml, @"<count>(.*?)</count>");
|
||||
if (!countMatch.Success) continue;
|
||||
if (!int.TryParse(countMatch.Groups[1].Value, out int count)) continue;
|
||||
string countStr = ExtractTag(itemXml, "count");
|
||||
if (string.IsNullOrEmpty(countStr)) continue;
|
||||
if (!int.TryParse(countStr, out int count)) continue;
|
||||
if (count <= 0) continue;
|
||||
|
||||
// Search for ThingDef
|
||||
ThingDef def = null;
|
||||
|
||||
// 1. Try exact defName match
|
||||
def = DefDatabase<ThingDef>.GetNamed(name, false);
|
||||
def = DefDatabase<ThingDef>.GetNamed(name.Trim(), false);
|
||||
|
||||
// 2. Try exact label match (case-insensitive)
|
||||
if (def == null)
|
||||
{
|
||||
foreach (var d in DefDatabase<ThingDef>.AllDefs)
|
||||
{
|
||||
if (d.label != null && d.label.Equals(name, StringComparison.OrdinalIgnoreCase))
|
||||
if (d.label != null && d.label.Equals(name.Trim(), StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
def = d;
|
||||
break;
|
||||
@@ -73,7 +79,7 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Try fuzzy search
|
||||
// 3. Try fuzzy search (thresholded)
|
||||
if (def == null)
|
||||
{
|
||||
var searchResult = ThingDefSearcher.ParseAndSearch(name);
|
||||
@@ -83,12 +89,36 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
}
|
||||
}
|
||||
|
||||
if (def != null && count > 0)
|
||||
// 4. Closest-match fallback: accept the best similar item even if not an exact match.
|
||||
if (def == null)
|
||||
{
|
||||
ThingDefSearcher.TryFindBestThingDef(name, out ThingDef best, out float score, itemsOnly: true, minScore: 0.15f);
|
||||
if (best != null && score >= 0.15f)
|
||||
{
|
||||
def = best;
|
||||
substitutions.Add($"'{name}' -> '{best.label}' (score {score:F2})");
|
||||
}
|
||||
}
|
||||
|
||||
if (def != null)
|
||||
{
|
||||
itemsToSpawn.Add((def, count));
|
||||
}
|
||||
}
|
||||
|
||||
if (itemsToSpawn.Count == 0)
|
||||
{
|
||||
// Fallback: allow natural language without <item> blocks.
|
||||
var parsed = ThingDefSearcher.ParseAndSearch(args);
|
||||
foreach (var r in parsed)
|
||||
{
|
||||
if (r.Def != null && r.Count > 0)
|
||||
{
|
||||
itemsToSpawn.Add((r.Def, r.Count));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (itemsToSpawn.Count == 0)
|
||||
{
|
||||
string msg = "Error: No valid items found in request. Usage: <spawn_resources><items><item><name>...</name><count>...</count></item></items></spawn_resources>";
|
||||
@@ -146,6 +176,11 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
|
||||
resultLog.Length -= 2; // Remove trailing comma
|
||||
resultLog.Append($" at {dropSpot}. {(isPaused ? "(placed immediately because game is paused)" : "(drop pods inbound)")}");
|
||||
|
||||
if (Prefs.DevMode && substitutions.Count > 0)
|
||||
{
|
||||
Messages.Message($"[WulaAI] Substitutions: {string.Join(", ", substitutions)}", MessageTypeDefOf.NeutralEvent);
|
||||
}
|
||||
return resultLog.ToString();
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user