暂存

2025-08-19 23:35:22 +08:00
parent fa975ce0c8
commit 8ba6a26591
6 changed files with 179 additions and 34 deletions
--- a/Source/WulaFallenEmpire/EventSystem/Effect.cs
+++ b/Source/WulaFallenEmpire/EventSystem/Effect.cs
@@ -506,43 +506,53 @@ namespace WulaFallenEmpire
                return;
            }

+            IncidentParms parms = new IncidentParms
+            {
+                target = map,
+                points = this.points,
+                faction = factionInst,
+                raidStrategy = this.raidStrategy,
+                raidArrivalMode = this.raidArrivalMode,
+                pawnGroupMakerSeed = Rand.Int,
+                forced = true
+            };
+
+            if (!RCellFinder.TryFindRandomPawnEntryCell(out parms.spawnCenter, map, CellFinder.EdgeRoadChance_Hostile))
+            {
+                Log.Error("[WulaFallenEmpire] Effect_TriggerRaid could not find a valid spawn center.");
+                return;
+            }
+
+            PawnGroupMakerParms groupMakerParms = new PawnGroupMakerParms
+            {
+                groupKind = this.groupKind ?? PawnGroupKindDefOf.Combat,
+                tile = map.Tile,
+                points = this.points,
+                faction = factionInst,
+                raidStrategy = this.raidStrategy,
+                seed = parms.pawnGroupMakerSeed
+            };
+            
+            List<Pawn> pawns;
            if (!pawnGroupMakers.NullOrEmpty())
            {
-                IncidentParms parms = new IncidentParms
-                {
-                    target = map,
-                    points = this.points,
-                    faction = factionInst,
-                    raidStrategy = this.raidStrategy,
-                    raidArrivalMode = this.raidArrivalMode,
-                    pawnGroupMakerSeed = Rand.Int,
-                    forced = true
-                };
+                var groupMaker = pawnGroupMakers.RandomElementByWeight(x => x.commonality);
+                pawns = groupMaker.GeneratePawns(groupMakerParms).ToList();
+            }
+            else
+            {
+                pawns = PawnGroupMakerUtility.GeneratePawns(groupMakerParms).ToList();
+            }

-                if (!RCellFinder.TryFindRandomPawnEntryCell(out parms.spawnCenter, map, CellFinder.EdgeRoadChance_Hostile))
-                {
-                    Log.Error("[WulaFallenEmpire] Effect_TriggerRaid could not find a valid spawn center.");
-                    return;
-                }
-
-                PawnGroupMakerParms groupMakerParms = new PawnGroupMakerParms
-                {
-                    groupKind = this.groupKind ?? PawnGroupKindDefOf.Combat,
-                    tile = map.Tile,
-                    points = this.points,
-                    faction = factionInst,
-                    raidStrategy = this.raidStrategy,
-                    seed = parms.pawnGroupMakerSeed
-                };
+            if (pawns.Any())
+            {
+                raidArrivalMode.Worker.Arrive(pawns, parms);
+                // Assign Lord and LordJob to make the pawns actually perform the raid.
+                raidStrategy.Worker.MakeLords(parms, pawns);
                
-                List<Pawn> pawns = PawnGroupMakerUtility.GeneratePawns(groupMakerParms).ToList();
-                if (pawns.Any())
+                if (!string.IsNullOrEmpty(letterLabel) && !string.IsNullOrEmpty(letterText))
                {
-                    raidArrivalMode.Worker.Arrive(pawns, parms);
-                    if (!string.IsNullOrEmpty(letterLabel) && !string.IsNullOrEmpty(letterText))
-                    {
-                        Find.LetterStack.ReceiveLetter(letterLabel, letterText, LetterDefOf.ThreatBig, pawns[0]);
-                    }
+                    Find.LetterStack.ReceiveLetter(letterLabel, letterText, LetterDefOf.ThreatBig, pawns[0]);
                }
            }
        }
@@ -577,4 +587,68 @@ namespace WulaFallenEmpire
            }
        }
    }
+
+    public class Effect_StoreRealPlayTime : Effect
+    {
+        public string variableName;
+
+        public override void Execute(Dialog_CustomDisplay dialog = null)
+        {
+            if (string.IsNullOrEmpty(variableName))
+            {
+                Log.Error("[WulaFallenEmpire] Effect_StoreRealPlayTime is not configured correctly (missing variableName).");
+                return;
+            }
+
+            var eventVarManager = Find.World.GetComponent<EventVariableManager>();
+            float realPlayTime = Find.GameInfo.RealPlayTimeInteracting;
+            Log.Message($"[EventSystem] Storing real play time ({realPlayTime}s) into variable '{variableName}'.");
+            eventVarManager.SetVariable(variableName, realPlayTime);
+        }
+    }
+
+    public class Effect_StoreDaysPassed : Effect
+    {
+        public string variableName;
+
+        public override void Execute(Dialog_CustomDisplay dialog = null)
+        {
+            if (string.IsNullOrEmpty(variableName))
+            {
+                Log.Error("[WulaFallenEmpire] Effect_StoreDaysPassed is not configured correctly (missing variableName).");
+                return;
+            }
+
+            var eventVarManager = Find.World.GetComponent<EventVariableManager>();
+            int daysPassed = GenDate.DaysPassed;
+            Log.Message($"[EventSystem] Storing days passed ({daysPassed}) into variable '{variableName}'.");
+            eventVarManager.SetVariable(variableName, daysPassed);
+        }
+    }
+
+    public class Effect_StoreColonyWealth : Effect
+    {
+        public string variableName;
+
+        public override void Execute(Dialog_CustomDisplay dialog = null)
+        {
+            if (string.IsNullOrEmpty(variableName))
+            {
+                Log.Error("[WulaFallenEmpire] Effect_StoreColonyWealth is not configured correctly (missing variableName).");
+                return;
+            }
+
+            Map currentMap = Find.CurrentMap;
+            if (currentMap == null)
+            {
+                Log.Error("[WulaFallenEmpire] Effect_StoreColonyWealth cannot execute without a current map.");
+                return;
+            }
+
+            var eventVarManager = Find.World.GetComponent<EventVariableManager>();
+            float wealth = currentMap.wealthWatcher.WealthTotal;
+            Log.Message($"[EventSystem] Storing colony wealth ({wealth}) into variable '{variableName}'.");
+            eventVarManager.SetVariable(variableName, wealth);
+        }
+    }
 }