城破時當作被圍

luiges90 · Jan 5, 2020 · 52ea39c · 52ea39c
1 parent f6bc609
commit 52ea39c
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs b/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs
@@ -12512,7 +12512,7 @@ private void Sourrounded()
 
         public bool IsSurrounded()
         {
-            if (((this.BelongedFaction != null) && (this.Endurance > 0)) && this.Kind.HasDomination)
+            if (((this.BelongedFaction != null) && (this.Endurance > 0)))
             {
                 int num = 0;
                 foreach (Point point in this.ContactArea.Area)
@@ -12528,6 +12528,24 @@ public bool IsSurrounded()
                     return true;
                 }
             }
+            if (this.Endurance <= 0)
+            {
+                foreach (Point point in this.ContactArea.Area)
+                {
+                    Troop troopByPosition = Session.Current.Scenario.GetTroopByPosition(point);
+                    if (!((troopByPosition == null) || this.IsFriendlyWithoutTruce(troopByPosition.BelongedFaction)))
+                    {
+                        return true;
+                    }
+                }
+                foreach (Point point in this.ArchitectureArea.Area)
+                {
+                    Troop troopByPosition = Session.Current.Scenario.GetTroopByPosition(point);
+                    if (!((troopByPosition == null) || this.IsFriendlyWithoutTruce(troopByPosition.BelongedFaction)))
+                    {
+                        return true;
+                    }
+                }
             return false;
         }