2025-7-24

2025-07-24 10:48:38 +08:00
parent 5af0d5e81f
commit c25b33fa75
38 changed files with 111 additions and 93 deletions
--- a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml
@@ -2,7 +2,7 @@

 <Defs>
  
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_normal</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -17,7 +17,7 @@
    <priority>0</priority>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_eyeMoving</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -31,7 +31,7 @@
    <roopIntervalMax>500</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_eyeMoving2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -45,7 +45,7 @@
    <roopIntervalMax>500</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_eyeFlicker</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -58,7 +58,7 @@
    <roopIntervalMax>30</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_blink</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml
@@ -2,7 +2,7 @@

 <Defs>
  <!-- 裸体想法 -->
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Thought_Naked</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_AttackMelee</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -19,7 +19,7 @@
    <priority>10200</priority>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>AttackMelee2</defName>
    <animationFrames>
      <li>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_AttackStatic</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -19,7 +19,7 @@
    <priority>10200</priority>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>AttackStatic2</defName>
    <animationFrames>
      <li>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_DoBill</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -24,7 +24,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_DoBill2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Goto</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Ingest</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_laydown</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -21,7 +21,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_laydown2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -39,7 +39,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_laydown3</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Lovin</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -50,7 +50,7 @@
    <priority>10400</priority>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Lovin2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Mine</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_RemoveApparel</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -36,7 +36,7 @@
    <roopIntervalMax>300</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_RemoveApparel2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -55,7 +55,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_RemoveApparel3</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Research</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -21,7 +21,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Research2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_SocialRelax</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_StandAndBeSociallyActive</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Strip</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -33,7 +33,7 @@
    <roopIntervalMax>300</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Strip2</defName>
    <animationFrames>
      <li>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_WaitCombat</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -17,7 +17,7 @@
    <priority>10200</priority>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Wait_Combat_Rare</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Wait_Downed</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -32,7 +32,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wait_Downed2</defName>
    <animationFrames>
      <li>
--- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml
+++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Wear</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -36,7 +36,7 @@
    <roopIntervalMax>300</roopIntervalMax>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_Wear2</defName>
 		<raceName>WulaSpecies</raceName>
    <animationFrames>
@@ -55,7 +55,7 @@
    <applyWhenStandingOnly>true</applyWhenStandingOnly>
  </FacialAnimation.FaceAnimationDef>

-  <FacialAnimation.FaceAnimationDef>
+  <FacialAnimation.FaceAnimationDef MayRequire="Nals.FacialAnimation">
    <defName>Wear3</defName>
    <animationFrames>
      <li>
--- a/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml
+++ b/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml
@@ -31,10 +31,8 @@
 						<li>Neck</li>
 					</groups>
 					<parts>
-						<!-- 头部 -->
 						<li>
 							<def>Head</def>
-							<customLabel>头部</customLabel>
 							<coverage>0.80</coverage>
 							<groups>
 								<li>UpperHead</li>
@@ -44,47 +42,67 @@
 							<parts>
 								<li>
 									<def>Skull</def>
-									<customLabel>颅骨</customLabel>
 									<coverage>0.18</coverage>
 									<depth>Inside</depth>
 									<groups>
 										<li>UpperHead</li>
+										<li>Eyes</li>
 										<li>FullHead</li>
 									</groups>
 									<parts>
 										<li>
 											<def>Brain</def>
-											<customLabel>生物处理器</customLabel>
 											<coverage>0.8</coverage>
 											<groups>
 												<li>UpperHead</li>
+												<li>Eyes</li>
 												<li>FullHead</li>
 											</groups>
 										</li>
+										<!-- 天线 -->
+										<li>
+											<def>WULA_Addons_Antenna_Bodypart</def>
+											<coverage>0.1</coverage>
+											<groups>
+												<li>UpperHead</li>
+											</groups>
+										</li>
 									</parts>
 								</li>
 								<li>
 									<def>Eye</def>
-									<customLabel>左视觉传感器</customLabel>
+									<customLabel>left eye</customLabel>
 									<coverage>0.07</coverage>
 									<groups>
 										<li>FullHead</li>
 										<li>Eyes</li>
 									</groups>
+									<woundAnchorTag>LeftEye</woundAnchorTag>
+									<flipGraphic>true</flipGraphic>
+									<visibleHediffRots>
+										<li>South</li>
+										<li>West</li>
+									</visibleHediffRots>
 								</li>
 								<li>
 									<def>Eye</def>
-									<customLabel>右视觉传感器</customLabel>
+									<customLabel>right eye</customLabel>
 									<coverage>0.07</coverage>
 									<groups>
 										<li>FullHead</li>
 										<li>Eyes</li>
 									</groups>
+									<woundAnchorTag>RightEye</woundAnchorTag>
+									<visibleHediffRots>
+										<li>South</li>
+										<li>East</li>
+									</visibleHediffRots>
 								</li>
 								<li>
 									<def>Ear</def>
-									<customLabel>左听觉传感器</customLabel>
+									<customLabel>left ear</customLabel>
 									<coverage>0.07</coverage>
+									<flipGraphic>true</flipGraphic>
 									<groups>
 										<li>UpperHead</li>
 										<li>FullHead</li>
@@ -92,7 +110,7 @@
 								</li>
 								<li>
 									<def>Ear</def>
-									<customLabel>右听觉传感器</customLabel>
+									<customLabel>right ear</customLabel>
 									<coverage>0.07</coverage>
 									<groups>
 										<li>UpperHead</li>
@@ -101,20 +119,29 @@
 								</li>
 								<li>
 									<def>Nose</def>
-									<customLabel>嗅觉传感器</customLabel>
 									<coverage>0.10</coverage>
 									<groups>
 										<li>FullHead</li>
-										<li>Teeth</li>
 									</groups>
 								</li>
-								<!-- 天线 -->
 								<li>
-									<def>WULA_Addons_Antenna_Bodypart</def>
-									<coverage>0.1</coverage>
+									<def>Jaw</def>
+									<coverage>0.15</coverage>
 									<groups>
-										<li>UpperHead</li>
+										<li>Teeth</li>
+										<li>FullHead</li>
+										<li>Mouth</li>
 									</groups>
+									<parts>
+										<li>
+											<def>Tongue</def>
+											<coverage>0.001</coverage>
+											<depth>Inside</depth>
+											<groups>
+												<li>FullHead</li>
+											</groups>
+										</li>
+									</parts>
 								</li>
 							</parts>
 						</li>
--- a/1.6/Defs/FaceShapeDefs/BrowShape.xml
+++ b/1.6/Defs/FaceShapeDefs/BrowShape.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.BrowShapeDef>
+  <FacialAnimation.BrowShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.BrowShapeDef>

-  <FacialAnimation.BrowShapeDef>
+  <FacialAnimation.BrowShapeDef MayRequire="Nals.FacialAnimation">
    <defName>flat</defName>
  </FacialAnimation.BrowShapeDef>

-  <FacialAnimation.BrowShapeDef>
+  <FacialAnimation.BrowShapeDef MayRequire="Nals.FacialAnimation">
    <defName>angled</defName>
  </FacialAnimation.BrowShapeDef>

-  <FacialAnimation.BrowShapeDef>
+  <FacialAnimation.BrowShapeDef MayRequire="Nals.FacialAnimation">
    <defName>s-shaped</defName>
  </FacialAnimation.BrowShapeDef>
 </Defs>
--- a/1.6/Defs/FaceShapeDefs/EmotionShape.xml
+++ b/1.6/Defs/FaceShapeDefs/EmotionShape.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.EmotionShapeDef>
+  <FacialAnimation.EmotionShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.EmotionShapeDef>

-  <FacialAnimation.EmotionShapeDef>
+  <FacialAnimation.EmotionShapeDef MayRequire="Nals.FacialAnimation">
    <defName>blush</defName>
  </FacialAnimation.EmotionShapeDef>
 </Defs>
--- a/1.6/Defs/FaceShapeDefs/EyeShape.xml
+++ b/1.6/Defs/FaceShapeDefs/EyeShape.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>    
-  <FacialAnimation.EyeballShapeDef>
+  <FacialAnimation.EyeballShapeDef MayRequire="Nals.FacialAnimation">
    <defName>normal</defName>
    <label>normal</label>
  </FacialAnimation.EyeballShapeDef>
--- a/1.6/Defs/FaceShapeDefs/HeadShape.xml
+++ b/1.6/Defs/FaceShapeDefs/HeadShape.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.HeadShapeDef>
+  <FacialAnimation.HeadShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.HeadShapeDef>

-  <FacialAnimation.HeadShapeDef>
+  <FacialAnimation.HeadShapeDef MayRequire="Nals.FacialAnimation">
    <defName>blush</defName>
  </FacialAnimation.HeadShapeDef>

--- a/1.6/Defs/FaceShapeDefs/LidOptionShape.xml
+++ b/1.6/Defs/FaceShapeDefs/LidOptionShape.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.LidOptionShapeDef>
+  <FacialAnimation.LidOptionShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.LidOptionShapeDef>
 </Defs>
--- a/1.6/Defs/FaceShapeDefs/LidShape.xml
+++ b/1.6/Defs/FaceShapeDefs/LidShape.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.LidShapeDef>
+  <FacialAnimation.LidShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.LidShapeDef>

-  <FacialAnimation.LidShapeDef>
+  <FacialAnimation.LidShapeDef MayRequire="Nals.FacialAnimation">
 	  <defName>close</defName>
    <disableEyeball>true</disableEyeball>
  </FacialAnimation.LidShapeDef>
--- a/1.6/Defs/FaceShapeDefs/MouthShape.xml
+++ b/1.6/Defs/FaceShapeDefs/MouthShape.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.MouthShapeDef>
+  <FacialAnimation.MouthShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.MouthShapeDef>

-  <FacialAnimation.MouthShapeDef>
+  <FacialAnimation.MouthShapeDef MayRequire="Nals.FacialAnimation">
    <defName>open</defName>
  </FacialAnimation.MouthShapeDef>
 </Defs>
--- a/1.6/Defs/FaceShapeDefs/SkinShape.xml
+++ b/1.6/Defs/FaceShapeDefs/SkinShape.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.SkinShapeDef>
+  <FacialAnimation.SkinShapeDef MayRequire="Nals.FacialAnimation">
  	<defName>normal</defName>
  </FacialAnimation.SkinShapeDef>
 </Defs>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml
@@ -2,7 +2,7 @@

 <Defs>
 	<!-- 眉毛的定义 -->
-	<FacialAnimation.BrowTypeDef>
+	<FacialAnimation.BrowTypeDef MayRequire="Nals.FacialAnimation">
 		<defName>Wula_BrowNormal</defName>
 		<texPath>Wula/Things/WulaSpecies/Brows/Normal</texPath>
 		<raceName>WulaSpecies</raceName>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <!-- <FacialAnimation.EmotionTypeDef>
+  <!-- <FacialAnimation.EmotionTypeDef MayRequire="Nals.FacialAnimation">
 	<defName>Wula_EmotionNormal</defName>
 	<texPath>Wula/Things/WulaSpecies/Emotions/Normal</texPath>
 	<raceName>WulaSpecies</raceName>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.EyeballTypeDef>
+  <FacialAnimation.EyeballTypeDef MayRequire="Nals.FacialAnimation">
    <defName>Wula_EyeNormal</defName>
 	  <!-- <texPath>Things/Pawn/Humanlike/Eyes/Normal</texPath> -->
    <raceName>WulaSpecies</raceName>
    <texPath>Wula/Things/WulaSpecies/Eyes/Normal</texPath>
 	  <altMaskPath>Wula/Things/WulaSpecies/Eyes/Common</altMaskPath>
    <shader>Map/CutoutSkinOverlay</shader>
-    <minColor>RGB(205,205,205)</minColor>
-    <maxColor>RGB(255,255,255)</maxColor>
-    <!-- <enableUnisexTexPath>True</enableUnisexTexPath> -->
+    <minColor>RGB(39,155,153)</minColor>
+    <maxColor>RGB(113,199,231)</maxColor>
+    <enableUnisexTexPath>True</enableUnisexTexPath>
  </FacialAnimation.EyeballTypeDef>
 </Defs>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.HeadTypeDef>
+  <FacialAnimation.HeadTypeDef MayRequire="Nals.FacialAnimation">
 	  <defName>Wula_HeadNormal</defName>
    <texPath>Wula/Things/WulaSpecies/Heads_Blank/Normal</texPath>
    <raceName>WulaSpecies</raceName>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.LidTypeDef>
+  <FacialAnimation.LidTypeDef MayRequire="Nals.FacialAnimation">
 	  <defName>Wula_LidNormal</defName>
 	  <texPath>Wula/Things/WulaSpecies/Lids/Normal</texPath>
    <raceName>WulaSpecies</raceName>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.MouthTypeDef>
+  <FacialAnimation.MouthTypeDef MayRequire="Nals.FacialAnimation">
 		<defName>Wula_MouthNormal</defName>
 		<texPath>Wula/Things/WulaSpecies/Mouth/Normal</texPath>
 		<raceName>WulaSpecies</raceName>
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <Defs>
-  <FacialAnimation.SkinTypeDef>
+  <FacialAnimation.SkinTypeDef MayRequire="Nals.FacialAnimation">
 	  <defName>Wula_SkinNormal</defName>
 	  <texPath>Wula/Things/WulaSpecies/Skins/Normal</texPath>
 	  <shader>Map/CutoutSkin</shader>
--- a/1.6/Defs/NeedDefs/WULA_Needs.xml
+++ b/1.6/Defs/NeedDefs/WULA_Needs.xml
@@ -18,7 +18,7 @@
      <li Class="WulaFallenEmpire.NeedDefExtension_Energy">
        <fallPerDay>1</fallPerDay>
        <maxLevel>1.0</maxLevel>
-        <deliverEnergyThreshold>0.05</deliverEnergyThreshold>
+        <!-- <deliverEnergyThreshold>0</deliverEnergyThreshold> -->
      </li>
    </modExtensions>
  </NeedDef>
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -11,15 +11,6 @@
      <generalSettings>
        <!-- 男性生成几率 -->
        <maleGenderProbability>0</maleGenderProbability>
-        <!-- 禁止生成的特质 -->
-        <disallowedTraits>
-          <li>
-            <defName Degree="-2">Beauty</defName>
-          </li>
-          <li>
-            <defName Degree="-1">Beauty</defName>
-          </li>
-        </disallowedTraits>
        <!-- 无视年龄疾病 -->
        <immuneToAge>true</immuneToAge>
 				<!-- 在口角中造成的最大伤害 -->
@@ -496,28 +487,28 @@
        </adaptableDamageDefs>
      </li>
 			<li>
-				<compClass>FacialAnimation.DrawFaceGraphicsComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.DrawFaceGraphicsComp</compClass>
 			</li>
 			<li>
-				<compClass>FacialAnimation.HeadControllerComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.HeadControllerComp</compClass>
 			</li>
 			<li>
-				<compClass>FacialAnimation.EyeballControllerComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.EyeballControllerComp</compClass>
 			</li>
      <li>
-        <compClass>FacialAnimation.LidControllerComp</compClass>
+        <compClass MayRequire="Nals.FacialAnimation">FacialAnimation.LidControllerComp</compClass>
      </li>
      <li>
-				<compClass>FacialAnimation.BrowControllerComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.BrowControllerComp</compClass>
 			</li>
 			<li>
-				<compClass>FacialAnimation.MouthControllerComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.MouthControllerComp</compClass>
 			</li>
      <li>
-        <compClass>FacialAnimation.SkinControllerComp</compClass>
+        <compClass MayRequire="Nals.FacialAnimation">FacialAnimation.SkinControllerComp</compClass>
      </li>
      <li>
-				<compClass>FacialAnimation.FacialAnimationControllerComp</compClass>
+				<compClass MayRequire="Nals.FacialAnimation">FacialAnimation.FacialAnimationControllerComp</compClass>
 			</li>
      <!--<li>
        <compClass>FacialAnimation.EmotionControllerComp</compClass>
--- a/Textures/Wula/Things/WulaSpecies/Lids/Normal/Unisex/close_south.png
+++ b/Textures/Wula/Things/WulaSpecies/Lids/Normal/Unisex/close_south.png
--- a/Textures/Wula/Things/WulaSpecies/Mouth/Normal/Unisex/open_east.png
+++ b/Textures/Wula/Things/WulaSpecies/Mouth/Normal/Unisex/open_east.png