diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml index c4141223..9b717c18 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Constant.xml @@ -2,7 +2,7 @@ - + Wula_normal WulaSpecies @@ -17,7 +17,7 @@ 0 - + Wula_eyeMoving WulaSpecies @@ -31,7 +31,7 @@ 500 - + Wula_eyeMoving2 WulaSpecies @@ -45,7 +45,7 @@ 500 - + Wula_eyeFlicker WulaSpecies @@ -58,7 +58,7 @@ 30 - + Wula_blink WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml index c11da66d..0744774c 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/Constant/Thoughts.xml @@ -2,7 +2,7 @@ - + Wula_Thought_Naked WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml index 661eb517..b6942ed2 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackMelee.xml @@ -1,7 +1,7 @@  - + Wula_AttackMelee WulaSpecies @@ -19,7 +19,7 @@ 10200 - + AttackMelee2
  • diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml index 51d4df3b..63d5dbb9 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/AttackStatic.xml @@ -1,7 +1,7 @@  - + Wula_AttackStatic WulaSpecies @@ -19,7 +19,7 @@ 10200 - + AttackStatic2
  • diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml index 9a209090..f783638a 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/DoBill.xml @@ -1,7 +1,7 @@  - + Wula_DoBill WulaSpecies @@ -24,7 +24,7 @@ true - + Wula_DoBill2 WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml index 6fa5fdf6..b230b22c 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Goto.xml @@ -1,7 +1,7 @@  - + Wula_Goto WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml index f372c95a..a1fd2af0 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Ingest.xml @@ -1,7 +1,7 @@  - + Wula_Ingest WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml index c23112a4..620c1797 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/LayDown.xml @@ -1,7 +1,7 @@  - + Wula_laydown WulaSpecies @@ -21,7 +21,7 @@ true - + Wula_laydown2 WulaSpecies @@ -39,7 +39,7 @@ true - + Wula_laydown3 WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml index 1968b692..944b5c32 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Lovin.xml @@ -1,7 +1,7 @@  - + Wula_Lovin WulaSpecies @@ -50,7 +50,7 @@ 10400 - + Wula_Lovin2 WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml index cc4a2a4d..744d405c 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Mine.xml @@ -1,7 +1,7 @@  - + Wula_Mine WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml index ff9b81eb..0e6ad97b 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/RemoveApparel.xml @@ -1,7 +1,7 @@  - + Wula_RemoveApparel WulaSpecies @@ -36,7 +36,7 @@ 300 - + Wula_RemoveApparel2 WulaSpecies @@ -55,7 +55,7 @@ true - + Wula_RemoveApparel3 WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml index aae81dcf..7901c0e3 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Research.xml @@ -1,7 +1,7 @@  - + Wula_Research WulaSpecies @@ -21,7 +21,7 @@ true - + Wula_Research2 WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml index d49a20c3..b7dc5bfe 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/SocialRelax.xml @@ -1,7 +1,7 @@  - + Wula_SocialRelax WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml index f2944b99..049fd61e 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/StandAndBeSociallyActive.xml @@ -1,7 +1,7 @@  - + Wula_StandAndBeSociallyActive WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml index 4ca6e737..e97e520a 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Strip.xml @@ -1,7 +1,7 @@  - + Wula_Strip WulaSpecies @@ -33,7 +33,7 @@ 300 - + Strip2
  • diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml index 6743beb3..4bd47b92 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/WaitCombat.xml @@ -1,7 +1,7 @@  - + Wula_WaitCombat WulaSpecies @@ -17,7 +17,7 @@ 10200 - + Wula_Wait_Combat_Rare WulaSpecies diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml index 22e25f09..79e0e298 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wait_Downed.xml @@ -1,7 +1,7 @@  - + Wula_Wait_Downed WulaSpecies @@ -32,7 +32,7 @@ true - + Wait_Downed2
  • diff --git a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml index 52f31e03..22e60e7d 100644 --- a/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml +++ b/1.6/Defs/AnimationDefs/WulaSpecies/ForJobs/Wear.xml @@ -1,7 +1,7 @@  - + Wula_Wear WulaSpecies @@ -36,7 +36,7 @@ 300 - + Wula_Wear2 WulaSpecies @@ -55,7 +55,7 @@ true - + Wear3
  • diff --git a/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml b/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml index 7c07ec75..4027dbef 100644 --- a/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml +++ b/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml @@ -31,10 +31,8 @@
  • Neck
  • -
  • Head - 头部 0.80
  • UpperHead
  • @@ -44,47 +42,67 @@
  • Skull - 颅骨 0.18 Inside
  • UpperHead
  • +
  • Eyes
  • FullHead
  • Brain - 生物处理器 0.8
  • UpperHead
  • +
  • Eyes
  • FullHead
  • + +
  • + WULA_Addons_Antenna_Bodypart + 0.1 + +
  • UpperHead
  • + +
  • Eye - 左视觉传感器 + left eye 0.07
  • FullHead
  • Eyes
  • + LeftEye + true + +
  • South
  • +
  • West
  • +
  • Eye - 右视觉传感器 + right eye 0.07
  • FullHead
  • Eyes
  • + RightEye + +
  • South
  • +
  • East
  • +
  • Ear - 左听觉传感器 + left ear 0.07 + true
  • UpperHead
  • FullHead
  • @@ -92,7 +110,7 @@
  • Ear - 右听觉传感器 + right ear 0.07
  • UpperHead
  • @@ -101,20 +119,29 @@
  • Nose - 嗅觉传感器 0.10
  • FullHead
  • -
  • Teeth
  • -
  • - WULA_Addons_Antenna_Bodypart - 0.1 + Jaw + 0.15 -
  • UpperHead
  • +
  • Teeth
  • +
  • FullHead
  • +
  • Mouth
  • + +
  • + Tongue + 0.001 + Inside + +
  • FullHead
  • + + +
    diff --git a/1.6/Defs/FaceShapeDefs/BrowShape.xml b/1.6/Defs/FaceShapeDefs/BrowShape.xml index bc9c4d24..aa319906 100644 --- a/1.6/Defs/FaceShapeDefs/BrowShape.xml +++ b/1.6/Defs/FaceShapeDefs/BrowShape.xml @@ -1,19 +1,19 @@  - + normal - + flat - + angled - + s-shaped \ No newline at end of file diff --git a/1.6/Defs/FaceShapeDefs/EmotionShape.xml b/1.6/Defs/FaceShapeDefs/EmotionShape.xml index ac137869..27411cde 100644 --- a/1.6/Defs/FaceShapeDefs/EmotionShape.xml +++ b/1.6/Defs/FaceShapeDefs/EmotionShape.xml @@ -1,11 +1,11 @@  - + normal - + blush \ No newline at end of file diff --git a/1.6/Defs/FaceShapeDefs/EyeShape.xml b/1.6/Defs/FaceShapeDefs/EyeShape.xml index 2b8ab341..98a17569 100644 --- a/1.6/Defs/FaceShapeDefs/EyeShape.xml +++ b/1.6/Defs/FaceShapeDefs/EyeShape.xml @@ -1,7 +1,7 @@  - + normal diff --git a/1.6/Defs/FaceShapeDefs/HeadShape.xml b/1.6/Defs/FaceShapeDefs/HeadShape.xml index e8b3b92b..2f21e7f5 100644 --- a/1.6/Defs/FaceShapeDefs/HeadShape.xml +++ b/1.6/Defs/FaceShapeDefs/HeadShape.xml @@ -1,11 +1,11 @@  - + normal - + blush diff --git a/1.6/Defs/FaceShapeDefs/LidOptionShape.xml b/1.6/Defs/FaceShapeDefs/LidOptionShape.xml index 8b294da1..81991f19 100644 --- a/1.6/Defs/FaceShapeDefs/LidOptionShape.xml +++ b/1.6/Defs/FaceShapeDefs/LidOptionShape.xml @@ -1,7 +1,7 @@  - + normal \ No newline at end of file diff --git a/1.6/Defs/FaceShapeDefs/LidShape.xml b/1.6/Defs/FaceShapeDefs/LidShape.xml index 910cdf87..c9b2aed6 100644 --- a/1.6/Defs/FaceShapeDefs/LidShape.xml +++ b/1.6/Defs/FaceShapeDefs/LidShape.xml @@ -1,11 +1,11 @@  - + normal - + close true diff --git a/1.6/Defs/FaceShapeDefs/MouthShape.xml b/1.6/Defs/FaceShapeDefs/MouthShape.xml index 29be3cb4..49d44694 100644 --- a/1.6/Defs/FaceShapeDefs/MouthShape.xml +++ b/1.6/Defs/FaceShapeDefs/MouthShape.xml @@ -1,11 +1,11 @@  - + normal - + open \ No newline at end of file diff --git a/1.6/Defs/FaceShapeDefs/SkinShape.xml b/1.6/Defs/FaceShapeDefs/SkinShape.xml index 869c977e..a46ce91e 100644 --- a/1.6/Defs/FaceShapeDefs/SkinShape.xml +++ b/1.6/Defs/FaceShapeDefs/SkinShape.xml @@ -1,7 +1,7 @@  - + normal \ No newline at end of file diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml index ee9c30b1..c32fb92f 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/BrowType.xml @@ -2,7 +2,7 @@ - + Wula_BrowNormal Wula/Things/WulaSpecies/Brows/Normal WulaSpecies diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml index b00fde5e..06559631 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/EmotionType.xml @@ -1,7 +1,7 @@  - WulaSpecies Wula/Things/WulaSpecies/Eyes/Normal Wula/Things/WulaSpecies/Eyes/Common Map/CutoutSkinOverlay - RGB(205,205,205) - RGB(255,255,255) - + RGB(39,155,153) + RGB(113,199,231) + True \ No newline at end of file diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml index 7621eedb..276f682d 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/HeadType.xml @@ -1,7 +1,7 @@  - + Wula_HeadNormal Wula/Things/WulaSpecies/Heads_Blank/Normal WulaSpecies diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml index 92cb0e9c..4eb87b1f 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/LidType.xml @@ -1,7 +1,7 @@  - + Wula_LidNormal Wula/Things/WulaSpecies/Lids/Normal WulaSpecies diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml index 4abeef9d..981d5b89 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/MouthType.xml @@ -1,7 +1,7 @@  - + Wula_MouthNormal Wula/Things/WulaSpecies/Mouth/Normal WulaSpecies diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml index 70884ed1..4b1f33b8 100644 --- a/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml +++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/SkinType.xml @@ -1,7 +1,7 @@  - + Wula_SkinNormal Wula/Things/WulaSpecies/Skins/Normal Map/CutoutSkin diff --git a/1.6/Defs/NeedDefs/WULA_Needs.xml b/1.6/Defs/NeedDefs/WULA_Needs.xml index c924c832..d083ac9a 100644 --- a/1.6/Defs/NeedDefs/WULA_Needs.xml +++ b/1.6/Defs/NeedDefs/WULA_Needs.xml @@ -18,7 +18,7 @@
  • 1 1.0 - 0.05 +
  • diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 8798700e..41cc1522 100644 --- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -11,15 +11,6 @@ 0 - - -
  • - Beauty -
  • -
  • - Beauty -
  • -
    true @@ -496,28 +487,28 @@
  • - FacialAnimation.DrawFaceGraphicsComp + FacialAnimation.DrawFaceGraphicsComp
  • - FacialAnimation.HeadControllerComp + FacialAnimation.HeadControllerComp
  • - FacialAnimation.EyeballControllerComp + FacialAnimation.EyeballControllerComp
  • - FacialAnimation.LidControllerComp + FacialAnimation.LidControllerComp
  • - FacialAnimation.BrowControllerComp + FacialAnimation.BrowControllerComp
  • - FacialAnimation.MouthControllerComp + FacialAnimation.MouthControllerComp
  • - FacialAnimation.SkinControllerComp + FacialAnimation.SkinControllerComp
  • - FacialAnimation.FacialAnimationControllerComp + FacialAnimation.FacialAnimationControllerComp