2025-7-30

1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -1004,12 +1004,12 @@
     </graphicData>
     <stackLimit>10</stackLimit>
     <statBases>
-      <MarketValue>1500</MarketValue> <!-- Slightly higher value -->
+      <MarketValue>1</MarketValue>
     </statBases>
     <thingCategories>
       <li>Drugs</li>
     </thingCategories>
-    <tradeability>Sellable</tradeability>
+    <tradeability>None</tradeability>
     <comps>
       <li Class="CompProperties_UseEffect">
         <compClass>WulaFallenEmpire.CompUseEffect_FixAllHealthConditions</compClass>

1.6/Defs/HediffDefs/Hediffs_WULA.xml

@@ -66,12 +66,6 @@
         </disablesNeeds>
       </li>
     </stages>
-    <comps>
-      <li Class="HediffCompProperties_ReactOnDamage">
-        <damageDefIncoming>EMP</damageDefIncoming>
-        <vomit>true</vomit>
-      </li>
-    </comps>
   </HediffDef>
 
   <HediffDef ParentName="ImplantHediffBase">

1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -2,7 +2,7 @@
 <Defs>
   <PawnKindDef>
     <defName>Wula_PawnKind</defName>
-    <label>乌拉</label>
+    <label>机械乌拉</label>
     <race>WulaSpecies</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <lifeStages>
@@ -46,7 +46,7 @@
   </PawnKindDef>
   <PawnKindDef>
     <defName>Wula_PawnKind_Ingame</defName>
-    <label>乌拉</label>
+    <label>机械乌拉</label>
     <race>WulaSpecies</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <lifeStages>
@@ -90,6 +90,42 @@
     </backstoryFiltersOverride>
   </PawnKindDef>
 
+  <PawnKindDef>
+    <defName>RealWula_PawnKind</defName>
+    <label>乌拉</label>
+    <race>WulaSpeciesReal</race>
+    <defaultFactionType>PlayerColony</defaultFactionType>
+    <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.1</drawSize>
+          <shadowData>
+            <volume>(0.2, 0.3, 0.2)</volume>
+          </shadowData>
+        </bodyGraphicData>
+      </li>
+    </lifeStages>
+    <minGenerationAge MayRequire="Ludeon.RimWorld.Biotech">18</minGenerationAge>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <combatPower>0</combatPower>
+    <initialWillRange>10~20</initialWillRange>
+    <initialResistanceRange>10~20</initialResistanceRange>
+    <itemQuality>Poor</itemQuality>
+    <isFighter>false</isFighter>
+    <apparelTags>
+      <li>Wula_Apparel_Init</li>
+    </apparelTags>
+    <abilities>
+    </abilities>
+    <weaponMoney>0</weaponMoney>
+    <apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
+    <apparelMoney>1000~2000</apparelMoney>
+  </PawnKindDef>
+
   <PawnKindDef ParentName="HeavyMechanoidKind">
     <defName>Wula_AI_Heavy_Panzer_PawnKind</defName>
     <label>SMp-38"萨克森"</label>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -2046,10 +2046,10 @@
     <statBases>
       <WorkToMake>40000</WorkToMake>
       <Mass>150</Mass>
-      <AccuracyTouch>0.8</AccuracyTouch>
-      <AccuracyShort>0.8</AccuracyShort>
-      <AccuracyMedium>0.7</AccuracyMedium>
-      <AccuracyLong>0.65</AccuracyLong>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.35</AccuracyLong>
       <RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
     </statBases>
     <weaponTags>
@@ -2068,11 +2068,11 @@
         <warmupTime>0.25</warmupTime>
         <range>36</range>
         <burstShotCount>10</burstShotCount>
-        <forcedMissRadius>0.1</forcedMissRadius>
+        <forcedMissRadius>0.35</forcedMissRadius>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <soundCast>Shot_TurretSniper</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
-        <muzzleFlashScale>18</muzzleFlashScale>
+        <muzzleFlashScale>12</muzzleFlashScale>
         <targetParams>
           <canTargetPawns>true</canTargetPawns>
           <canTargetLocations>true</canTargetLocations>
@@ -2107,9 +2107,9 @@
     </graphicData>
     <projectile>
       <damageDef>Bullet</damageDef>
-      <damageAmountBase>30</damageAmountBase>
+      <damageAmountBase>14</damageAmountBase>
       <speed>120</speed>
-      <explosionRadius>1.2</explosionRadius>
+      <explosionRadius>2.4</explosionRadius>
       <arcHeightFactor>0.4</arcHeightFactor>
       <soundExplode>Explosion_Rocket</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<AlienRace.ThingDef_AlienRace ParentName="Human">
+	<AlienRace.ThingDef_AlienRace Name="Race_Wula_Machine" ParentName="Human">
 		<defName>WulaSpecies</defName>
 		<label>机械乌拉</label>
 		<description>乌拉星人是一个曾统治银河系的堕落帝国的主要种族，机械乌拉则是仿照她们样貌制作的合成人——随着帝国的衰颓，大量乌拉合成人流散各地。她们拥有近乎无限的寿命，并且拥有一部分机械体的特性。</description>
@@ -518,6 +518,154 @@
     </comps>
 	</AlienRace.ThingDef_AlienRace>
 
+	<AlienRace.ThingDef_AlienRace ParentName="Race_Wula_Machine">
+		<defName>WulaSpeciesReal</defName>
+		<label>乌拉星人</label>
+		<description>一个源自远古时代的种族。她们曾将荣光播撒至银河的每一个角落，建立起庞大而强盛的乌拉帝国。然而，辉煌未能永恒，无情的分裂与惨烈的内战最终撕裂了这个帝国，将其拖入了衰亡的深渊，这些人则是乌拉帝国万古长战后仅存的遗孤。</description>
+    <uiIconPath>Wula/Things/WulaSpeciesReal/WULA_Species_Icon</uiIconPath>
+
+    <alienRace>
+      <!-- 核心设置 -->
+      <generalSettings>
+        <!-- 乌拉族的床是正常的 -->
+        <validBeds Inherit="False" />
+        <!-- 各种零件定义 -->
+        <alienPartGenerator>
+          <!-- 额外身体部件 -->
+          <bodyAddons Inherit="False">
+            <li>
+              <path>Wula/Things/WulaSpeciesReal/Addons/WULA_Bow_Tie</path>
+              <offsets>
+                <south>
+                  <offset>(0,0.32)</offset>
+                </south>
+                <north>
+                  <offset>(0,0.32)</offset>
+                </north>
+                <east>
+                  <offset>(-0.1,0.32)</offset>
+                </east>
+                <west>
+                  <offset>(-0.1,0.32)</offset>
+                </west>
+              </offsets>
+              <inFrontOfBody>true</inFrontOfBody>
+            </li>
+          </bodyAddons>
+        </alienPartGenerator>
+        <!-- 额外特质，暂时设为0 -->
+        <additionalTraits>0</additionalTraits>
+      </generalSettings>
+      <!-- 图形 -->
+			<graphicPaths>
+				<body>Wula/Things/WulaSpeciesReal/Bodies/</body>
+				<head>Wula/Things/WulaSpeciesReal/Heads/</head>
+				<skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton> 
+        <stump>Wula/Things/WulaSpeciesReal/Bodies</stump>
+			</graphicPaths>
+      <!-- 种族的允许和禁止特化设置 -->
+      <raceRestriction>
+        <!-- 食物列表 -->
+        <foodList Inherit="False" />
+        <onlyEatRaceRestrictedFood>false</onlyEatRaceRestrictedFood>
+        <!-- 允许的特质类型 -->
+        <traitList Inherit="False" />
+      </raceRestriction>
+      <!-- 想法设置 -->
+      <thoughtSettings>
+        <!-- 不会产生的想法 -->
+        <cannotReceiveThoughts Inherit="False" />
+      </thoughtSettings>
+      <!-- 关系设置，不会生成任何随机关系 -->
+      <relationSettings Inherit="False" />
+      <!-- 兼容性标签，非必要 -->
+      <compatibility>
+        <isFlesh>true</isFlesh>
+      </compatibility>
+    </alienRace>
+    
+    <!-- 以下是原版标签 -->
+    <!-- 受击音效 -->
+    <soundImpactDefault>BulletImpact_Flesh</soundImpactDefault>
+    <statBases>
+      <MoveSpeed>4</MoveSpeed>
+      <EatingSpeed>1</EatingSpeed>
+      <!-- 温度适应性 -->
+      <ComfyTemperatureMin>-10</ComfyTemperatureMin>
+      <ComfyTemperatureMax>10</ComfyTemperatureMax>
+      <!-- 心灵敏感，稍高 -->
+      <PsychicSensitivity>1.25</PsychicSensitivity>
+      <!-- 肉量 -->
+      <MeatAmount>60</MeatAmount>
+      <!-- 皮革量 -->
+      <LeatherAmount>75</LeatherAmount>
+      <!-- 谈判能力 -->
+      <NegotiationAbility>1</NegotiationAbility>
+      <!-- 社交效果，机械乌拉社交的影响很小 -->
+      <SocialImpact>1</SocialImpact>
+      <!-- 挖矿速度 -->
+      <MiningSpeed>1</MiningSpeed>
+      <!-- 采矿效率 -->
+      <MiningYield>1</MiningYield>
+      <!-- 种植速度 -->
+      <PlantWorkSpeed>1</PlantWorkSpeed>
+      <!-- 狩猎隐蔽 -->
+      <HuntingStealth>1</HuntingStealth>
+      <!-- 建造速度 -->
+      <ConstructionSpeed>1</ConstructionSpeed>
+      <!-- 研究速度 -->
+      <ResearchSpeed>1</ResearchSpeed>
+      <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0</VacuumResistance>
+    </statBases>
+
+    <race>
+      <fleshType>Normal</fleshType>
+      <thinkTreeMain>Humanlike</thinkTreeMain>
+      <thinkTreeConstant>HumanlikeConstant</thinkTreeConstant>
+      <intelligence>Humanlike</intelligence>
+      <bloodDef>Filth_Blood</bloodDef>
+			<baseHealthScale>1</baseHealthScale>
+			<leatherDef>Leather_Human</leatherDef>
+      <specificMeatDef>Meat_Human</specificMeatDef>
+			<!-- 身体类型 -->
+			<body>Human</body>
+      <foodType>OmnivoreHuman</foodType>
+      <!-- 年龄阶段 -->
+      <lifeExpectancy>150</lifeExpectancy>
+      <canFlyInVacuum>false</canFlyInVacuum>
+    </race>
+
+    <comps Inherit="False">
+			<!-- <li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.DrawFaceGraphicsComp</compClass>
+			</li>
+			<li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.HeadControllerComp</compClass>
+			</li>
+			<li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.EyeballControllerComp</compClass>
+			</li>
+      <li MayRequire="Nals.FacialAnimation">
+        <compClass>FacialAnimation.LidControllerComp</compClass>
+      </li>
+      <li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.BrowControllerComp</compClass>
+			</li>
+			<li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.MouthControllerComp</compClass>
+			</li>
+      <li MayRequire="Nals.FacialAnimation">
+        <compClass>FacialAnimation.SkinControllerComp</compClass>
+      </li>
+      <li MayRequire="Nals.FacialAnimation">
+				<compClass>FacialAnimation.FacialAnimationControllerComp</compClass>
+			</li> -->
+      <!--<li>
+        <compClass>FacialAnimation.EmotionControllerComp</compClass>
+      </li>-->
+      <!-- <li Class="CompProperties_DrugAddict"/> -->
+    </comps>
+	</AlienRace.ThingDef_AlienRace>
   
   <ThingDef Name="Wula_AI_Heavy_Panzer" ParentName="HeavyMechanoid">
 		<defName>Wula_AI_Heavy_Panzer</defName>

1.6/Defs/TraitDefs/Traits_WULA.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
+  <TraitDef>
+    <defName>WULA_BrokenPersonalityTrait</defName>
+    <commonality>0</commonality>
+    <degreeDatas>
+      <li>
+        <label>机械乌拉</label>
+        <description>{PAWN_nameDef}是机械乌拉。乌拉的思维模式与常人不同，在极端压力下，其模拟人格会彻底崩溃。</description>
+        <theOnlyAllowedMentalBreaks>
+          <li>Wula_BrokenPersonality</li>
+        </theOnlyAllowedMentalBreaks>
+      </li>
+    </degreeDatas>
+  </TraitDef>
+
   <TraitDef>
     <defName>WULA_Trait_Knight</defName>
     <forcedPassions>

1.6/Defs/TraitDefs/Traits_WULA_Broken.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <TraitDef>
-    <defName>WULA_BrokenPersonalityTrait</defName>
-    <commonality>0</commonality>
-    <degreeDatas>
-      <li>
-        <label>机械乌拉</label>
-        <description>{PAWN_nameDef}是机械乌拉。乌拉的思维模式与常人不同，在极端压力下，其模拟人格会彻底崩溃。</description>
-        <theOnlyAllowedMentalBreaks>
-          <li>Wula_BrokenPersonality</li>
-        </theOnlyAllowedMentalBreaks>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-</Defs>

1.6/Defs/WorkGivers/Wula_WorkGivers.xml

@@ -110,4 +110,4 @@
     </modExtensions>
   </WorkGiverDef>
 
-</Defs>
+</Defs>