审查启动窗口

1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml

@@ -45,6 +45,24 @@
           </li>
         </optionEffects>
       </li>
+      <li>
+        <label>我们想要接受晋级审查</label>
+        <useCustomColors>true</useCustomColors>
+        <normalColor>(255,255,255,255)</normalColor>
+        <hoverColor>(157,201,185,195)</hoverColor>
+        <textColor>(255,255,255,255)</textColor>
+        <textHoverColor>(255,255,255,255)</textHoverColor>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_OpenCustomUI">
+                <defName>WULA_GiveQuest_Colony_Promotion_UI_1</defName>
+              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
       <li>
         <label>再见</label>
         <useCustomColors>true</useCustomColors>
@@ -376,7 +394,7 @@
                     <kindDef>Combat</kindDef>
                     <commonality>100</commonality>
                     <options>
-                      <Wula_PIA_Heavy_Unit>1</Wula_PIA_Heavy_Unit>
+                      <Wula_PIA_Light_Unit>1</Wula_PIA_Light_Unit>
                     </options>
                   </li>
                 </pawnGroupMakers>

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -11,7 +11,7 @@
           <maskPath>SRA/Pawn/Mechanoid/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
           <shadowData>
             <volume>(0.2, 0.3, 0.2)</volume>
           </shadowData>
@@ -54,7 +54,7 @@
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -67,7 +67,7 @@
           <maskPath>Wula/Things/WULA_Attack_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -94,7 +94,7 @@
           <maskPath>Wula/Things/WULA_Constructor_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -111,7 +111,7 @@
           <maskPath>Wula/Things/WULA_Assault_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -314,6 +314,63 @@
   </PawnKindDef>
 
   <!-- 战斗类乌拉 -->
+  <PawnKindDef>
+    <defName>Wula_PIA_Light_Unit</defName>
+    <label>帝国冲锋队</label>
+    <race>WulaSpecies</race>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Wula/Item/WULA_Species_Icon</texPath>
+          <maskPath>SRA/Pawn/Mechanoid/AllegianceOverlays/None</maskPath>
+          <shaderType>CutoutWithOverlay</shaderType>
+          <graphicClass>Graphic_Multi</graphicClass>
+          <drawSize>1</drawSize>
+          <shadowData>
+            <volume>(0.2, 0.3, 0.2)</volume>
+          </shadowData>
+        </bodyGraphicData>
+      </li>
+    </lifeStages>
+    <minGenerationAge>18</minGenerationAge>
+		<maxGenerationAge>20</maxGenerationAge>
+    <combatPower>250</combatPower>
+    <initialWillRange>10~20</initialWillRange>
+    <initialResistanceRange>10~20</initialResistanceRange>
+    <itemQuality>Poor</itemQuality>
+    <minApparelQuality>Poor</minApparelQuality>
+    <maxApparelQuality>Poor</maxApparelQuality>
+    <isFighter>true</isFighter>
+    <apparelTags>
+      <li>Wula_Armor_Light</li>
+    </apparelTags>
+    <weaponTags>
+      <li>Wula_Melee_Weapon_T1</li>
+      <li>Wula_Ranged_Weapon_T1</li>
+    </weaponTags>
+    <apparelRequired>
+      <li>WULA_Assault_Troop_PowerArmor</li>
+      <li>WULA_Assault_Troop_Helmet</li>
+    </apparelRequired>
+    <weaponMoney>3000~8000</weaponMoney>
+    <biocodeWeaponChance>1</biocodeWeaponChance>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+    <techHediffsChance>1</techHediffsChance>
+    <apparelMoney>999999~999999</apparelMoney>
+    <techHediffsMoney>999999~999999</techHediffsMoney>
+    <techHediffsRequired>
+      <li>WULA_AutoJumpdrive</li>
+      <li>DeathAcidifier</li>
+    </techHediffsRequired>
+
+    <backstoryFiltersOverride>
+      <li>
+        <categories>
+          <li>Wula_Backstory_Categories</li>
+        </categories>
+      </li>
+    </backstoryFiltersOverride>
+  </PawnKindDef>
   <PawnKindDef>
     <defName>Wula_PIA_Heavy_Unit</defName>
     <label>军团重装步兵</label>
@@ -325,7 +382,7 @@
           <maskPath>SRA/Pawn/Mechanoid/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
           <shadowData>
             <volume>(0.2, 0.3, 0.2)</volume>
           </shadowData>
@@ -385,7 +442,7 @@
           <maskPath>SRA/Pawn/Mechanoid/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
           <shadowData>
             <volume>(0.2, 0.3, 0.2)</volume>
           </shadowData>
@@ -404,17 +461,13 @@
     <apparelTags Inherit="False">
       <li>Wula_Legion_Apparel</li>
     </apparelTags>
-    <weaponTags>
-      <li>Wula_Melee_Weapon_T2</li>
-    </weaponTags>
-    <weaponMoney>3000~8000</weaponMoney>
     <weaponMoney>0</weaponMoney>
     <apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
     <apparelMoney>99999~99999</apparelMoney>
   </PawnKindDef>
   <PawnKindDef>
     <defName>Wula_PIA_Legion_Escort_Unit</defName>
-    <label>重装卫队</label>
+    <label>帝国冲锋队</label>
     <race>WulaSpecies</race>
     <lifeStages>
       <li>
@@ -423,7 +476,7 @@
           <maskPath>SRA/Pawn/Mechanoid/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>1</drawSize>
           <shadowData>
             <volume>(0.2, 0.3, 0.2)</volume>
           </shadowData>
@@ -440,14 +493,16 @@
     <maxApparelQuality>Poor</maxApparelQuality>
     <isFighter>true</isFighter>
     <apparelTags>
-      <li>Wula_Armor_Super_Heavy</li>
+      <li>Wula_Armor_Light</li>
+      <li>Wula_Armor_Shield</li>
+      <li>WULA_Manpack_Loitering_Munition</li>
     </apparelTags>
     <weaponTags>
       <li>Wula_Melee_Weapon_T2</li>
     </weaponTags>
     <apparelRequired>
-      <li>WULA_Heavy_Infantry_PowerArmor</li>
+      <li>WULA_Assault_Troop_PowerArmor</li>
-      <li>WULA_Heavy_Infantry_Helmet</li>
+      <li>WULA_Assault_Troop_Helmet</li>
     </apparelRequired>
     <weaponMoney>3000~8000</weaponMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>

1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml

@@ -62,7 +62,7 @@
         </li>
         <li Class="QuestNode_Set">
           <name>taxInterval</name>
-          <value>250</value> <!-- 较短的测试间隔 -->
+          <value>600</value> <!-- 较短的测试间隔 -->
         </li>
 
         <li Class="QuestNode_Multiply">

1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml

@@ -1,6 +1,52 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!-- 初始任务 -->
+  <WulaFallenEmpire.EventDef>
+    <defName>WULA_GiveQuest_Colony_Promotion_UI_1</defName>
+    <label>未知通讯</label>
+    <portraitPath>Wula/Events/Portraits/WULA_Legion_2</portraitPath>
+    <characterName>「军团」,P.I.A</characterName>
+    <descriptions>
+      <li>晋级审查是一件大事情——你们确定你们已经准备好了吗？\n\n我和你们重申一下流程吧，我会派遣自己的一个分体和护卫队在你们殖民地考察12天，你要照顾我的分体和卫队的起居。如果一切顺利，考察完成之后你们将获得殖民地晋升的机会，舰队会为你们开放更多的许可科技。</li>
+    </descriptions>
+    <options>
+      <li>
+        <label>我们准备好了</label>
+        <useCustomColors>true</useCustomColors>
+        <normalColor>(255,255,255,255)</normalColor>
+        <hoverColor>(157,201,185,195)</hoverColor>
+        <textColor>(255,255,255,255)</textColor>
+        <textHoverColor>(255,255,255,255)</textHoverColor>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+              <li Class="WulaFallenEmpire.Effect_AddQuest">
+                <quest>WULA_Colony_Promotion</quest>
+              </li>
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>现在不是太合适···</label>
+        <useCustomColors>true</useCustomColors>
+        <normalColor>(255,255,255,255)</normalColor>
+        <hoverColor>(157,201,185,195)</hoverColor>
+        <textColor>(255,255,255,255)</textColor>
+        <textHoverColor>(255,255,255,255)</textHoverColor>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_OpenCustomUI">
+                <defName>Wula_UI_Legion_1</defName>
+              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+    </options>
+  </WulaFallenEmpire.EventDef>
   <IncidentDef>
     <defName>WULA_GiveQuest_Colony_Promotion</defName>
     <category>GiveQuest</category>
@@ -36,6 +82,18 @@
       <nodes>
         <li Class="QuestNode_GetMap" />
 
+        <!-- 生成物品奖励 -->
+        <li Class="QuestNode_GenerateThingSet">
+          <thingSetMaker>WULA_Colony_Promotion_Reward</thingSetMaker>
+          <storeAs>promotionReward</storeAs>
+        </li>
+        <!-- 产生超链接 -->
+        <li Class="WulaFallenEmpire.QuestNode_Hyperlinks">
+          <factionDefs>
+            <li>Wula_PIA_Legion_Faction</li>
+          </factionDefs>
+        </li>
+
         <!-- End if map removed -->
         <li Class="QuestNode_End">
           <inSignal>map.MapRemoved</inSignal>
@@ -428,9 +486,16 @@
         <!-- Shuttle sent away -->
         <li Class="QuestNode_Signal">
           <inSignal>pickupShipThing.SentSatisfied</inSignal>
-          <node Class="QuestNode_End">
+          <node Class="QuestNode_Sequence">
-            <outcome>Success</outcome>
+            <nodes>
-            <sendStandardLetter>true</sendStandardLetter>
+              <li Class="QuestNode_AddItemsReward">
+                <items>$promotionReward</items>
+              </li>
+              <li Class="QuestNode_End">
+                <outcome>Success</outcome>
+                <sendStandardLetter>true</sendStandardLetter>
+              </li>
+            </nodes>
           </node>
         </li>
         <li Class="QuestNode_Signal">
@@ -454,4 +519,24 @@
       </nodes>
     </root>
   </QuestScriptDef>
+  <ThingSetMakerDef>
+    <defName>WULA_Colony_Promotion_Reward</defName>
+    <root Class="ThingSetMaker_RandomOption">
+      <options>
+        <li>
+          <weight>1</weight>
+          <thingSetMaker Class="ThingSetMaker_StackCount">
+            <fixedParams>
+              <filter>
+                <thingDefs>
+                  <li>Techprint_WULA_Colony_License_LV2_Technology</li>
+                </thingDefs>
+              </filter>
+              <countRange>1</countRange>
+            </fixedParams>
+          </thingSetMaker>
+        </li>
+      </options>
+    </root>
+  </ThingSetMakerDef>
 </Defs>

1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml

@@ -564,9 +564,7 @@
     </costList>
     <apparel>
       <tags>
-        <li>Wula_Armor_Heavy</li>
+        <li>Wula_Armor_Light</li>
-        <li>RoyalTier5</li>
-        <li>Royal</li>
       </tags>
       <wornGraphicPath>Wula/Apparel/WULA_Assault_Troop_PowerArmor</wornGraphicPath>
     </apparel>
@@ -621,9 +619,7 @@
     </statBases>
     <apparel>
       <tags>
-        <li>Wula_Armor_Heavy</li>
+        <li>Wula_Armor_Light</li>
-        <li>RoyalTier5</li>
-        <li>Royal</li>
       </tags>
       <wornGraphicPath>Wula/Apparel/WULA_Assault_Troop_Helmet</wornGraphicPath>
     </apparel>
@@ -804,7 +800,7 @@
     </costList>
     <apparel>
       <tags>
-        <li>Wula_Armor_Super_Heavy</li>
+        <li>Wula_Armor_Shield</li>
       </tags>
       <bodyPartGroups>
         <li>Torso</li>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml

@@ -512,7 +512,7 @@
       <ComponentIndustrial>2</ComponentIndustrial>
     </costList>
     <weaponTags>
-      <li>Wula_Weapon_Init</li>
+      <li>Wula_Ranged_Weapon_T1</li>
       <li>Wula_Assault_Cat_Weapon</li>
     </weaponTags>
     <comps>
@@ -547,6 +547,7 @@
     <showPsycastEffects>False</showPsycastEffects>
     <hotKey>Misc11</hotKey>
     <showOnCharacterCard>false</showOnCharacterCard>
+    <aiCanUse>true</aiCanUse>
     <cooldownTicksRange>12800</cooldownTicksRange>
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
@@ -964,7 +965,7 @@
       <ComponentIndustrial>2</ComponentIndustrial>
     </costList>
     <weaponTags>
-      <li>Wula_Ranged_Weapon_T2</li>
+      <li>Wula_Ranged_Weapon_T1</li>
     </weaponTags>
     <modExtensions>
       <li Class="WulaFallenEmpire.ModExtension_ShootWithOffset">
@@ -1746,6 +1747,9 @@
       <li>ApparelUtility</li>
     </thingCategories>
     <apparel>
+      <tags>
+        <li>WULA_Manpack_Loitering_Munition</li>
+      </tags>
       <countsAsClothingForNudity>false</countsAsClothingForNudity>
       <scoreOffset>4</scoreOffset>
       <careIfWornByCorpse>false</careIfWornByCorpse>

1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml

@@ -378,6 +378,22 @@
           <insertTag>Humanlike_PreMain</insertTag>
         </li>
         
+        <!-- 添加军团成员的考察工作，优先级较低 -->
+        <!-- Idle wild man -->
+        <li Class="ThinkNode_ConditionalPawnKind">
+          <pawnKind>WULA_Legion_PawnKind</pawnKind>
+          <subNodes>
+            <li Class="ThinkNode_Tagger">
+              <tagToGive>Misc</tagToGive>
+              <subNodes>
+                <li Class="WulaFallenEmpire.JobGiver_InspectBuilding">
+                  <priority>15.0</priority>
+                </li>
+              </subNodes>
+            </li>
+          </subNodes>
+        </li>
+        
         <!-- Main colonist behavior core -->
         <li Class="ThinkNode_ConditionalColonist">
           <subNodes>
@@ -403,22 +419,6 @@
           <insertTag>Humanlike_PostMain</insertTag>
         </li>
 
-        <!-- 添加军团成员的考察工作，优先级较低 -->
-        <!-- Idle wild man -->
-        <li Class="ThinkNode_ConditionalPawnKind">
-          <pawnKind>WULA_Legion_PawnKind</pawnKind>
-          <subNodes>
-            <li Class="ThinkNode_Tagger">
-              <tagToGive>Misc</tagToGive>
-              <subNodes>
-                <li Class="WulaFallenEmpire.JobGiver_InspectBuilding">
-                  <priority>4.0</priority>
-                </li>
-              </subNodes>
-            </li>
-          </subNodes>
-        </li>
-
         <!-- Idle colonist -->
         <li Class="ThinkNode_ConditionalColonist">
           <subNodes>

Source/WulaFallenEmpire/EventSystem/Effect/EffectBase.cs

@@ -449,7 +449,6 @@ namespace WulaFallenEmpire
     public class Effect_AddQuest : EffectBase
     {
         public QuestScriptDef quest;
-
         public override void Execute(Window dialog = null)
         {
             if (quest == null)
@@ -457,11 +456,23 @@ namespace WulaFallenEmpire
                 Log.Error("[WulaFallenEmpire] Effect_AddQuest has a null quest Def.");
                 return;
             }
+            // 使用标准的任务生成方法，而不是创建raw quest
+            Quest newQuest = QuestUtility.GenerateQuestAndMakeAvailable(quest, 0);
 
-            Quest newQuest = Quest.MakeRaw();
+            if (newQuest != null)
-            newQuest.root = quest;
+            {
-            newQuest.id = Find.UniqueIDsManager.GetNextQuestID();
+                Log.Message($"[WulaFallenEmpire] Successfully added quest: {quest.defName}");
-            Find.QuestManager.Add(newQuest);
+
+                // 如果不是自动接受的任务，发送可用信件
+                if (!newQuest.root.autoAccept)
+                {
+                    QuestUtility.SendLetterQuestAvailable(newQuest);
+                }
+            }
+            else
+            {
+                Log.Error($"[WulaFallenEmpire] Failed to generate quest: {quest.defName}");
+            }
         }
     }