From 51fe3e67fbb88f7293445491ee4f1261026309c9 Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Wed, 13 Aug 2025 17:29:18 +0800
Subject: [PATCH] 2025-8-13

---
 1.6/1.6/Defs/EventDefs/EventDef_Wula.xml      | 53 ++++++++++---
 .../Weapons/WULA_Melee_Cleave.xml             | 79 -------------------
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    |  2 +-
 .../EventDef_WULA_FE_Spiritualist.xml         |  1 +
 .../Weapons/WULA_FE_Spiritualist_Weapon.xml   | 10 +--
 .../WULA_WeaponCategoryDefs.xml               |  0
 .../WeaponTraitDefs/WULA_WeaponTraitDefs.xml  |  0
 7 files changed, 47 insertions(+), 98 deletions(-)
 delete mode 100644 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
 rename 1.6/{1.6 => Anomaly}/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml (96%)
 rename 1.6/{1.6 => Odyssey}/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml (100%)
 rename 1.6/{1.6 => Odyssey}/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml (100%)

diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml
index 6ee92e33..75861cc2 100644
--- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml
+++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml
@@ -7,6 +7,37 @@
     <portraitPath>Wula/Events/Portraits/Wula_insignal</portraitPath>
     <characterName></characterName>
     <description>基站运转正常，通讯程序已启动。\n\n需要联络乌拉帝国的哪个派系？</description>
+    <immediateEffects>
+      <li>
+        <effects>
+          <!-- 检测dlc开启情况，以决定启动哪些系统 -->
+          <li Class="WulaFallenEmpire.Effect_ClearVariable">
+            <name>Wula_UI_Check_Odyssey_Is_Active</name>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_ClearVariable">
+            <name>Wula_UI_Check_Anomaly_Is_Active</name>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_SetVariable">
+            <name>Wula_UI_Check_Odyssey_Is_Active</name>
+            <value>0</value>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_SetVariable">
+            <name>Wula_UI_Check_Anomaly_Is_Active</name>
+            <value>0</value>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_ModifyVariable" MayRequire="Ludeon.RimWorld.Odyssey">
+            <name>Wula_UI_Check_Odyssey_Is_Active</name>
+            <value>1</value>
+            <operation>Add</operation>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_ModifyVariable" MayRequire="Ludeon.RimWorld.Anomaly">
+            <name>Wula_UI_Check_Anomaly_Is_Active</name>
+            <value>1</value>
+            <operation>Add</operation>
+          </li>
+        </effects>
+      </li>
+    </immediateEffects>
     <options>
       <li>
         <label>守密者，URa-1138「艾妮西娅」</label>
@@ -21,10 +52,16 @@
           </li>
         </optionEffects>
       </li>
-      <li>
-        <label>乌拉帝国 大教堂（尚在制作）</label>
+      <li>  
+        <label>乌拉帝国 大教堂</label>
+        <disabledReason><![CDATA[这个堕落乌拉派系不存在——它可能已经被摧毁或者未生成。\n生成该派系需要<color=#B174C9><b>异象</b></color>DLC支持]]></disabledReason>
+        <conditions>
+          <li Class="WulaFallenEmpire.Condition_FactionExists">
+            <factionDef>Wula_FE_Spiritualist_Faction</factionDef>
+          </li>
+        </conditions>
         <optionEffects>
-          <li>
+          <li Class="WulaFallenEmpire.ConditionalEffects">
             <effects>
               <li Class="WulaFallenEmpire.Effect_OpenCustomUI">
                 <defName>Wula_UI_FE_Spiritualist_1</defName>
@@ -34,16 +71,6 @@
           </li>
         </optionEffects>
       </li>
-      <li>
-        <label>乌拉帝国 图书馆（尚在制作）</label>
-        <optionEffects>
-          <li>
-            <effects>
-              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
-            </effects>
-          </li>
-        </optionEffects>
-      </li>
       <li>
         <label>退出</label>
         <optionEffects>
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
deleted file mode 100644
index 91d2c4de..00000000
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <!-- <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>WULA_MeleeWeapon_Cleaver</defName>
-    <label>CMl-91"裂空"</label>
-    <description>一把沉重但制作精良的双手战刃，挥舞时能对前方扇形区域内的多个敌人造成伤害。</description>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Glaive</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-      <drawSize>1.5</drawSize>
-    </graphicData>
-    <techLevel>Spacer</techLevel>
-    <costList>
-      <Plasteel>120</Plasteel>
-      <ComponentSpacer>4</ComponentSpacer>
-    </costList>
-    <statBases>
-      <WorkToMake>45000</WorkToMake>
-      <Mass>2.5</Mass>
-    </statBases>
-    <equippedAngleOffset>-65</equippedAngleOffset>
-    <tools>
-      <li>
-        <label>刃</label>
-        <capacities>
-          <li>WULA_CleaveAttack</li>
-        </capacities>
-        <power>20</power>
-        <cooldownTime>2</cooldownTime>
-      </li>
-      <li>
-        <label>柄</label>
-        <capacities>
-          <li>Blunt</li>
-        </capacities>
-        <power>9</power>
-        <cooldownTime>2</cooldownTime>
-      </li>
-    </tools>
-    <comps>
-      <li Class="WulaFallenEmpire.CompProperties_Cleave">
-        <cleaveAngle>70</cleaveAngle>
-        <cleaveRange>5.9</cleaveRange>
-        <cleaveDamageFactor>0.7</cleaveDamageFactor>
-        <damageDowned>false</damageDowned>
-        <explosionDamageDef>Bomb</explosionDamageDef>
-      </li>
-    </comps>
-    <recipeMaker>
-      <researchPrerequisite>WULA_FallenEmpire_Weapons</researchPrerequisite>
-      <skillRequirements>
-        <Crafting>10</Crafting>
-      </skillRequirements>
-      <recipeUsers>
-        <li>FabricationBench</li>
-      </recipeUsers>
-    </recipeMaker>
-  </ThingDef>
-  <ToolCapacityDef>
-    <defName>WULA_CleaveAttack</defName>
-    <label>cleave</label>
-  </ToolCapacityDef>
-  <ManeuverDef>
-    <defName>WULA_CleaveManeuver</defName>
-    <requiredCapacity>WULA_CleaveAttack</requiredCapacity>
-    <verb>
-      <verbClass>WulaFallenEmpire.Verb_MeleeAttack_Cleave</verbClass>
-      <meleeDamageDef>Cut</meleeDamageDef>
-    </verb>
-    <logEntryDef>MeleeAttack</logEntryDef>
-    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
-    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
-    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
-    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
-  </ManeuverDef> -->
-
-</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index 2c088f07..67fde841 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -361,7 +361,7 @@
         <damageDowned>false</damageDowned>
         <explosionDamageDef>Blunt</explosionDamageDef>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_Melee_Cleave</li>
 				</forcedTraits>
diff --git a/1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
similarity index 96%
rename from 1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
rename to 1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
index 4c717d3e..bfcecd00 100644
--- a/1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
+++ b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
+  <!-- 普通好感初始事件 -->
   <WulaFallenEmpire.EventDef>
     <defName>Wula_UI_FE_Spiritualist_1</defName>
     <label>乌拉帝国 大教堂</label>
diff --git a/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml b/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
index 19333462..d6152731 100644
--- a/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
+++ b/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
@@ -86,7 +86,7 @@
         <ammoCountPerCharge>2</ammoCountPerCharge>
         <baseReloadTicks>60</baseReloadTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_DamagePsychicScaling</li>
 					<li>WULA_ExtraPsychicSkill</li>
@@ -275,7 +275,7 @@
         <ammoCountPerCharge>2</ammoCountPerCharge>
         <baseReloadTicks>60</baseReloadTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_DamagePsychicScaling</li>
 					<li>WULA_ExtraPsychicSkill</li>
@@ -451,7 +451,7 @@
         <ammoCountPerCharge>2</ammoCountPerCharge>
         <baseReloadTicks>60</baseReloadTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_DamagePsychicScaling</li>
 					<li>WULA_ExtraPsychicSkill</li>
@@ -656,7 +656,7 @@
         <ammoCountPerCharge>10</ammoCountPerCharge>
         <baseReloadTicks>60</baseReloadTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_DamagePsychicScaling</li>
 					<li>WULA_ExtraPsychicSkill</li>
@@ -773,7 +773,7 @@
       </li>
     </verbs>
     <comps>
-      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
 				<forcedTraits>
 					<li>WULA_DamagePsychicScaling</li>
 					<li>WULA_PsychicIgnoreBlock</li>
diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml b/1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
similarity index 100%
rename from 1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
rename to 1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml b/1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml
similarity index 100%
rename from 1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml
rename to 1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml