Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW

1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -341,6 +341,7 @@
     <defName>WULA_Energy_Furnace_DM_Engine</defName>
     <label>暗物质能源炉</label>
     <description>一台由暗物质作为能源驱动的合成人能源炉，拥有永不枯竭的动力，合成人安装后将不再需要充电。</description>
+    <tradeability>None</tradeability>
     <descriptionHyperlinks>
       <RecipeDef>Install_WULA_Energy_Furnace_DM_Engine</RecipeDef>
     </descriptionHyperlinks>
@@ -428,6 +429,7 @@
     <defName>WULA_Energy_Furnace_DM_CPU</defName>
     <label>暗物质处理器</label>
     <description>由填充非交互性暗物质微粒的卡西米尔共振腔构成的处理器，用于替换过时的生物处理器，极大增强合成人的意识。</description>
+    <tradeability>None</tradeability>
     <descriptionHyperlinks>
       <RecipeDef>Install_WULA_Energy_Furnace_DM_CPU</RecipeDef>
     </descriptionHyperlinks>
@@ -523,6 +525,7 @@
     <defName>WULA_Skeleton_Neutronium</defName>
     <label>零素骨架</label>
     <description>利用暗物质压缩而成的内嵌式中子装甲层和结构层，植入机械乌拉的体内时将使得她们获得强大的防御力。</description>
+    <tradeability>None</tradeability>
     <descriptionHyperlinks>
       <RecipeDef>Install_WULA_Energy_Furnace_DM_Engine</RecipeDef>
     </descriptionHyperlinks>

1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+  <PawnKindDef ParentName="HeavyMechanoidKind">
+    <defName>Wula_Psi_Titan_PawnKind</defName>
+    <label>PAt-52"灵能泰坦"</label>
+    <race>Wula_Psi_Titan</race>
+    <defaultFactionType>PlayerColony</defaultFactionType>
+    <allowInMechClusters>false</allowInMechClusters>
+    <combatPower>1000</combatPower>
+    <isBoss>true</isBoss>
+    <maxPerGroup>1</maxPerGroup>
+    <!-- <isGoodBreacher>true</isGoodBreacher> -->
+    <ecoSystemWeight>0.15</ecoSystemWeight>
+    <flyingAnimationFramePathPrefix>Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_Flying_</flyingAnimationFramePathPrefix>
+    <flyingAnimationFrameCount>1</flyingAnimationFrameCount>
+    <flyingAnimationTicksPerFrame>1</flyingAnimationTicksPerFrame>
+    <flyingAnimationDrawSize>1</flyingAnimationDrawSize>
+    <flyingAnimationDrawSizeIsMultiplier>false</flyingAnimationDrawSizeIsMultiplier>
+    <flyingAnimationInheritColors>true</flyingAnimationInheritColors>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin</texPath>
+          <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
+          <shaderType>CutoutWithOverlay</shaderType>
+          <graphicClass>Graphic_Multi</graphicClass>
+          <drawSize>4</drawSize>
+        </bodyGraphicData>
+      </li>
+    </lifeStages>
+    <weaponMoney>99999~99999</weaponMoney>
+
+    <weaponTags>
+      <li>WULA_RW_Photon_Missile_Weapon</li>
+    </weaponTags>
+
+    <controlGroupPortraitZoom>1</controlGroupPortraitZoom>
+
+    <abilities>
+      <li>FleshmelterBolt</li>
+      <li>AgonyPulse</li>
+    </abilities>
+  </PawnKindDef>
+</Defs>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml

@@ -395,7 +395,7 @@
         <verbClass>WulaFallenEmpire.Verb_ShootArc</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <damageDef>WULA_SP_Live_Shelter_Heal</damageDef>
-        <damageAmount>1.0</damageAmount>
+        <damageAmount>1</damageAmount>
         <EMPDamageAmount>0</EMPDamageAmount>
         <warmupTime>4</warmupTime>
         <range>20</range>
@@ -435,27 +435,6 @@
     </comps>
     <tradeability>None</tradeability>
   </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_SP_Live_Shelter</defName>
-    <label></label>
-    <thingClass>Projectile_Explosive</thingClass>
-    <graphicData>
-      <texPath>Things/Projectile/FleshmelterBolt</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>Mote</shaderType>
-      <drawSize>(1.5, 3)</drawSize>
-    </graphicData>
-    <projectile>
-      <damageDef>WULA_SP_Live_Shelter_Heal</damageDef>
-      <damageAmountBase>1</damageAmountBase>
-      <speed>1000</speed>
-      <!-- <soundAmbient>FleshmelterBolt_Launch</soundAmbient> -->
-      <explosionRadius>2</explosionRadius>
-      <explosionChanceToStartFire>0</explosionChanceToStartFire>
-      <armorPenetrationBase>3000</armorPenetrationBase>
-      <!-- <flyOverhead>true</flyOverhead> -->
-    </projectile>
-  </ThingDef>
   <AbilityDef ParentName="PsycastBase">
     <defName>WULA_MW_Scepter_Of_Feather_Ability</defName>
     <label>羽之杖：激励</label>
@@ -514,4 +493,98 @@
       </li>
     </comps>
   </HediffDef>
+
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Photon_Missile</defName>
+    <label>星光追猎术式</label>
+    <description>乌拉星人在舰船上用于代替导弹的一种特殊术式，当其被吟唱时，大量的灵能星光将倾巢而出追击轰炸敌军。万幸，依托于灵能泰坦这个庞大载体，该法术的威力并未遭到太多削弱。</description>
+    <techLevel>Ultra</techLevel>
+    <tradeability>None</tradeability>
+    <!-- <techLevel>Spacer</techLevel> -->
+    <uiIconPath>Wula/Weapon/WULA_SP_Spear_Impale</uiIconPath>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_Weapon_Empty</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <weaponTags>
+      <li>WULA_RW_Photon_Missile_Weapon</li>
+    </weaponTags>
+    <uiIconScale>0.75</uiIconScale>
+    <recipeMaker>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <costList Inherit="False">
+      <Steel>380</Steel>
+      <Plasteel>60</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <statBases>
+      <WorkToMake>40000</WorkToMake>
+      <Mass>0</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Photon_Missile</defaultProjectile>
+        <warmupTime>4.5</warmupTime>
+        <burstShotCount>16</burstShotCount>
+        <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+        <isMortar>true</isMortar>
+        <requireLineOfSight>false</requireLineOfSight>
+        <minRange>4</minRange>
+        <range>48</range>
+        <soundCast>AgonyPulse_Cast</soundCast>
+        <muzzleFlashScale>12</muzzleFlashScale>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Photon_Missile</defName>
+    <label>灵能星光</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Photon_Missile</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+    </graphicData>
+    <thingClass>WulaFallenEmpire.Projectile_CruiseMissile</thingClass>
+		<modExtensions>
+			<li Class="WulaFallenEmpire.CruiseMissileProperties">
+				<!-- 主爆炸参数 -->
+				<customDamageDef>Bomb</customDamageDef>
+				<customDamageAmount>8</customDamageAmount>
+				<customExplosionRadius>2</customExplosionRadius>
+				<customSoundExplode>MortarBomb_Explode</customSoundExplode>
+
+				<!-- 子爆炸系统 -->
+				<useSubExplosions>true</useSubExplosions>
+				<subExplosionCount>2</subExplosionCount>
+				<subExplosionRadius>1.5</subExplosionRadius>
+				<subExplosionDamage>5</subExplosionDamage>
+				<subExplosionSpread>6</subExplosionSpread>
+				<subDamageDef>Wula_Psi_Bomb</subDamageDef>
+				<subSoundExplode>MortarBomb_Explode</subSoundExplode>
+			</li>
+		</modExtensions>
+    <projectile>
+      <damageDef>Wula_Psi_Bomb</damageDef>
+      <damageAmountBase>8</damageAmountBase>
+      <speed>22</speed>
+      <explosionRadius>2</explosionRadius>
+      <armorPenetrationBase>0.1</armorPenetrationBase>
+      <flyOverhead>true</flyOverhead>
+      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+      <soundAmbient>MortarRound_Ambient</soundAmbient>
+    </projectile>
+  </ThingDef>
 </Defs>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ThingDef ParentName="HeavyMechanoid">
+		<defName>Wula_Psi_Titan</defName>
+		<label>PAt-52"灵能泰坦"</label>
+		<description>由乌拉帝国大教堂所开发的重型灵能机械体</description>
+    <uiIconPath>Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon</uiIconPath>
+    <statBases>
+      <!-- 心灵敏感，稍高 -->
+      <PsychicSensitivity>3</PsychicSensitivity>
+      <BandwidthCost>8</BandwidthCost>
+      <MoveSpeed>6</MoveSpeed>
+      <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
+      <ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>0.5</ArmorRating_Blunt>
+      <ArmorRating_Heat>0.25</ArmorRating_Heat>
+      <CarryingCapacity>1200</CarryingCapacity>
+      <ShootingAccuracyPawn>200</ShootingAccuracyPawn>
+      <!-- <IncomingDamageFactor>0.75</IncomingDamageFactor> -->
+
+      <MechEnergyLossPerHP MayRequire="Ludeon.RimWorld.Biotech">0.1</MechEnergyLossPerHP>
+      <WastepacksPerRecharge MayRequire="Ludeon.RimWorld.Biotech">5</WastepacksPerRecharge>
+
+      <!-- 飞行参数 -->
+      <MaxFlightTime>9999</MaxFlightTime>
+      <FlightCooldown>0</FlightCooldown>
+    </statBases>
+    <race>
+      <body>WULA_AI_Heavy_Panzer_Body</body>
+      <baseBodySize>15.0</baseBodySize>
+			<baseHealthScale>3.5</baseHealthScale>
+      <lifeStageAges>
+        <li>
+          <def>MechanoidFullyFormed</def>
+          <soundWounded>Pawn_Mech_Tunneler_Wounded</soundWounded>
+          <soundDeath>Pawn_Mech_Tunneler_Death</soundDeath>
+          <soundCall>Pawn_Mech_Tunneler_Call</soundCall>
+        </li>
+      </lifeStageAges>
+      <bulletStaggerEffecterDef>TunnelerSlowedDown</bulletStaggerEffecterDef>
+
+      <!-- 飞行参数 -->
+      <flightStartChanceOnJobStart>1</flightStartChanceOnJobStart>
+      <flightSpeedFactor>3</flightSpeedFactor>
+      <!-- <canFlyIntoMap>true</canFlyIntoMap> -->
+    </race>
+    <tools Inherit="False">
+      <li>
+        <label>灵能震爆</label>
+        <labelNoLocation>灵能震爆</labelNoLocation>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>10</power>
+        <cooldownTime>4</cooldownTime>
+        <linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="CompProperties_ProjectileInterceptor">
+        <radius>7</radius>
+        <interceptGroundProjectiles>true</interceptGroundProjectiles>
+        <color>(0.5, 0.3, 0.9)</color>
+        <reactivateEffect>BulletShieldGenerator_Reactivate</reactivateEffect>
+        <activeSound>BulletShield_Ambience</activeSound>
+        <hitPoints>10000</hitPoints>
+        <hitPointsRestoreInstantlyAfterCharge>true</hitPointsRestoreInstantlyAfterCharge>
+        <chargeDurationTicks>1800</chargeDurationTicks>
+        <rechargeHitPointsIntervalTicks>120</rechargeHitPointsIntervalTicks>
+        <minIdleAlpha>0.2</minIdleAlpha>
+        <drawWithNoSelection>True</drawWithNoSelection>
+        <disarmedByEmpForTicks>1500</disarmedByEmpForTicks>
+        <gizmoTipKey>ProjectileInterceptorTip</gizmoTipKey>
+      </li>
+    </comps>
+  </ThingDef>
+</Defs>