女官可被臨幸

luiges90 · Feb 24, 2024 · 207c5a1 · 207c5a1
1 parent 61af87f
commit 207c5a1
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 237 deletions.
diff --git a/Content/Data/Plugins/TabListData.xml b/Content/Data/Plugins/TabListData.xml
@@ -1511,14 +1511,6 @@
                                         FontColor="4294967295"
                                         Align="Middle">
                                 </Column>
-                                <Column ID="135" Name="MakeMarryableList" IsNumber="false"
-                                        DisplayName="可赐婚予" MinWidth="300" DetailLevel="5"
-                                        FontName="方正隶变_GBK"
-                                        FontSize="12"
-                                        FontStyle="Regular"
-                                        FontColor="4294967295"
-                                        Align="Left">
-                                </Column>
                                 <Column ID="530" Name="Fund" IsNumber="false" DisplayName="銀兩"
                                         MinWidth="60" DetailLevel="9"
                                         FontName="方正隶变_GBK"
@@ -1570,7 +1562,7 @@
                                         Columns="1 83 84 154 155 156 157 158 163 159 160 161 162">
                                 </Tab>
                                 <Tab ID="14" Name="PersonRelations" DisplayName="人物关系"
-                                        Columns="1 121 122 123 125 126 132 133 135">
+                                        Columns="1 121 122 123 125 126 132 133">
                                 </Tab>
                                 <Tab ID="15" Name="PersonSpecialRelations" DisplayName="关系武将"
                                         Columns="1 181 180" ListKind="PersonRelationValue"

diff --git a/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs b/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs
@@ -16,6 +16,7 @@
 using System.Text;
 using System.Runtime.Serialization;
 using GameManager;
+using Steamworks;
 
 namespace GameObjects
 {
@@ -709,6 +710,26 @@ public PersonList PersonsExcludeNvGuan
             }
         }
 
+        public PersonList NvGuans
+        {
+            get
+            {
+                PersonList all = Session.Current.Scenario.GetPersonList(this);
+                PersonList result = new PersonList();
+
+                foreach (Person p in all)
+                {
+                    if (p.NvGuan)
+                    {
+                        result.Add(p);
+                    }
+                }
+
+                result.SetImmutable();
+                return result;
+            }
+        }
+
         public PersonList PromotableNvGuans
         {
             get
@@ -14991,6 +15012,11 @@ public PersonList meifaxianhuaiyundefeiziliebiao()
                 if (!person.faxianhuaiyun && this.BelongedFaction.Leader.isLegalFeiZiExcludeAge(person) && person.ArrivingDays <= 0)
                     meihuailiebiao.Add(person);
             }
+            foreach (Person person in this.NvGuans)
+            {
+                if (!person.faxianhuaiyun && this.BelongedFaction.Leader.isLegalFeiZi(person) && person.Spouse == this.BelongedFaction.Leader && person.ArrivingDays <= 0)
+                    meihuailiebiao.Add(person);
+            }
             return meihuailiebiao;
         }