1

1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml

@@ -576,7 +576,7 @@
       <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
       <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
       <ArmorRating_Heat>2.0</ArmorRating_Heat>
-      <EquipDelay>10</EquipDelay>
+      <EquipDelay>2</EquipDelay>
       <!-- <EnergyShieldEnergyMax>0.25</EnergyShieldEnergyMax> -->
     </statBases>
     <equippedStatOffsets>
@@ -707,12 +707,12 @@
     <statBases>
       <WorkToMake>5000</WorkToMake>
       <MaxHitPoints>1000</MaxHitPoints>
-      <Mass>10</Mass>
+      <Mass>5</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+      <ArmorRating_Sharp>0.5</ArmorRating_Sharp>
-      <ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+      <ArmorRating_Blunt>0.5</ArmorRating_Blunt>
       <ArmorRating_Heat>0.2</ArmorRating_Heat>
-      <EquipDelay>3</EquipDelay>
+      <EquipDelay>0.1</EquipDelay>
       <!-- <EnergyShieldEnergyMax>4.0</EnergyShieldEnergyMax> -->
     </statBases>
     <equippedStatOffsets>
@@ -734,6 +734,21 @@
         <li>Legs</li>
       </bodyPartGroups>
       <wornGraphicPath>Wula/Apparel/WULA_Shield_Base</wornGraphicPath>
+      <wornGraphicData>
+        <renderUtilityAsPack>true</renderUtilityAsPack>
+        <north>
+          <!-- <scale>(0.7,0.7)</scale> -->
+        </north>
+        <south>
+          <offset>(0,0)</offset>
+        </south>
+        <east>
+          <offset>(-0.1,0)</offset>
+        </east>
+        <west>
+          <offset>(0.1,0)</offset>
+        </west>
+      </wornGraphicData>
     </apparel>
   </ThingDef>
 

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml

@@ -245,9 +245,9 @@
     <neverMultiSelect>True</neverMultiSelect>
     <drawerType>RealtimeOnly</drawerType>
     <graphicData>
-      <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
+      <texPath>Wula/Projectile/WULA_Huge_Shrapnel</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>(2,3)</drawSize>
+      <drawSize>(2.5,2.5)</drawSize>
     </graphicData>
     <projectile>
       <damageDef>WULA_GiantBomb</damageDef>
@@ -565,22 +565,22 @@
     <neverMultiSelect>True</neverMultiSelect>
     <drawerType>RealtimeOnly</drawerType>
     <graphicData>
-      <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
+      <texPath>Wula/Projectile/WULA_Rocket</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>(2,3)</drawSize>
+      <drawSize>(2,2.5)</drawSize>
     </graphicData>
     <projectile>
       <damageDef>Flame</damageDef>
-      <damageAmountBase>10</damageAmountBase>
+      <damageAmountBase>20</damageAmountBase>
       <speed>60</speed>
-      <explosionRadius>6</explosionRadius>
+      <explosionRadius>3.9</explosionRadius>
       <armorPenetrationBase>1.5</armorPenetrationBase>
       <flyOverhead>true</flyOverhead>
       <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
       <soundExplode>Explosion_Rocket</soundExplode>
       <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
       <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <stoppingPower>10</stoppingPower>
+      <stoppingPower>2</stoppingPower>
     </projectile>
     <modExtensions>
       <li Class="WulaFallenEmpire.NorthArcModExtension">

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml

@@ -943,7 +943,7 @@
       <AccuracyShort>0.75</AccuracyShort>
       <AccuracyMedium>0.65</AccuracyMedium>
       <AccuracyLong>0.45</AccuracyLong>
-      <RangedWeapon_Cooldown>0.25</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li>
@@ -1030,10 +1030,6 @@
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <soundInteract>Interact_Rifle</soundInteract>
-    <weaponClasses>
-      <li>LongShots</li>
-      <li>RangedHeavy</li>
-    </weaponClasses>
     <statBases>
       <WorkToMake>1300</WorkToMake>
       <Mass>3.5</Mass>
@@ -1041,7 +1037,7 @@
       <AccuracyShort>0.72</AccuracyShort>
       <AccuracyMedium>0.65</AccuracyMedium>
       <AccuracyLong>0.6</AccuracyLong>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
       <WULA_Alloy>70</WULA_Alloy>
@@ -1054,14 +1050,14 @@
         <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Penetrating_Beam</defaultProjectile>
-        <warmupTime>2.0</warmupTime>
+        <warmupTime>3.0</warmupTime>
         <range>28</range>
         <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
         <soundCast>Shot_BeamRepeater</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>9</muzzleFlashScale>
-        <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
+        <aimingChargeMote>Mote_WULA_Beam_Charge</aimingChargeMote>
         <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
       </li>
     </verbs>
@@ -1078,6 +1074,10 @@
         <changeTo>WULA_RW_Penetrating_Beam_Rifle_Ranged</changeTo>
         <abilityDef>WULA_RW_Penetrating_Beam_RifleSwitchAbility</abilityDef>
       </li>
+      <li Class="WulaFallenEmpire.CompProperties_GiveHediffOnShot">
+        <hediffDef>WULA_Beam_Weapon_Aiming_Hediff</hediffDef>
+        <severityToAdd>1</severityToAdd>
+      </li>
     </comps>
   </ThingDef>
   <ThingDef ParentName="BaseBullet">
@@ -1102,8 +1102,8 @@
     </graphicData>
     <projectile>
       <damageDef>BeamBypassShields</damageDef>
-      <damageAmountBase>6</damageAmountBase>
+      <damageAmountBase>2</damageAmountBase>
-      <armorPenetrationBase>0.8</armorPenetrationBase>
+      <armorPenetrationBase>0.4</armorPenetrationBase>
       <stoppingPower>1</stoppingPower>
     </projectile>
   </ThingDef>
@@ -1117,10 +1117,6 @@
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <soundInteract>Interact_Rifle</soundInteract>
-    <weaponClasses>
-      <li>LongShots</li>
-      <li>RangedHeavy</li>
-    </weaponClasses>
     <statBases>
       <WorkToMake>1300</WorkToMake>
       <Mass>3.5</Mass>
@@ -1128,7 +1124,7 @@
       <AccuracyShort>0.8</AccuracyShort>
       <AccuracyMedium>0.9</AccuracyMedium>
       <AccuracyLong>0.8</AccuracyLong>
-      <RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>0.1</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
       <WULA_Alloy>70</WULA_Alloy>
@@ -1148,13 +1144,13 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Penetrating_Beam_Ranged</defaultProjectile>
         <warmupTime>3.0</warmupTime>
-        <range>38</range>
+        <range>32</range>
         <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
         <soundCast>Shot_BeamRepeater</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>9</muzzleFlashScale>
-        <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
+        <aimingChargeMote>Mote_WULA_Beam_Charge</aimingChargeMote>
         <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
       </li>
     </verbs>
@@ -1171,6 +1167,10 @@
         <changeTo>WULA_RW_Penetrating_Beam_Rifle</changeTo>
         <abilityDef>WULA_RW_Penetrating_Beam_RifleSwitchAbility</abilityDef>
       </li>
+      <li Class="WulaFallenEmpire.CompProperties_GiveHediffOnShot">
+        <hediffDef>WULA_Beam_Weapon_Aiming_Hediff</hediffDef>
+        <severityToAdd>1</severityToAdd>
+      </li>
     </comps>
     <!--加上这个就行-->
     <!-- <tickerType>Normal</tickerType> -->
@@ -1196,7 +1196,7 @@
     </graphicData>
     <projectile>
       <damageDef>BeamBypassShields</damageDef>
-      <damageAmountBase>8</damageAmountBase>
+      <damageAmountBase>3</damageAmountBase>
       <armorPenetrationBase>0.8</armorPenetrationBase>
       <stoppingPower>1</stoppingPower>
     </projectile>
@@ -1725,7 +1725,7 @@
   <ThingDef ParentName="ApparelNoQualityBase">
     <defName>Apparel_WULA_Manpack_Loitering_Munition</defName>
     <label>MPl_8"蛭石"</label>
-    <description>派发给乌拉帝国突击队的一次性巡飞弹发射器，装有温压炸药，能对大量软目标造成范围性的伤害——而且不需要占用编制，允许突击队携带其他武器。</description>
+    <description>派发给乌拉帝国突击队的一次性火箭弹发射器，装有温压炸药，能对大量软目标造成范围性的伤害——而且不需要占用编制，允许突击队携带其他武器。</description>
     <graphicData>
       <texPath>Wula/Apparel/WULA_Manpack_Loitering_Munition</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -1818,17 +1818,25 @@
     <thingClass>WulaFallenEmpire.Projectile_ExplosiveTrackingBullet</thingClass>
     <projectile>
       <speed>25</speed>
-      <damageDef>Bomb</damageDef>
+      <damageDef>Flame</damageDef>
-      <damageAmountBase>60</damageAmountBase>
+      <explosionRadius>7</explosionRadius>
+      <damageAmountBase>20</damageAmountBase>
       <armorPenetrationBase>0.25</armorPenetrationBase>
       <stoppingPower>10</stoppingPower>
     </projectile>
     <modExtensions>
       <li Class="WulaFallenEmpire.ExplosiveTrackingBulletDef">
-        <explosionRadius>4.5</explosionRadius>
+        <explosionRadius>7</explosionRadius>
-        <damageDef>Bomb</damageDef>
+        <damageDef>Flame</damageDef>
       </li>
       <li Class="WulaFallenEmpire.TrackingBulletDef">
+        <tailFleckDef>WULA_Smoke_Tail</tailFleckDef>
+        <fleckMakeFleckTickMax>2</fleckMakeFleckTickMax>
+        <fleckDelayTicks>1</fleckDelayTicks>
+        <fleckMakeFleckNum>1~2</fleckMakeFleckNum>
+        <fleckScale>0.5~1.0</fleckScale>
+        <fleckSpeed>0.1~0.3</fleckSpeed>
+        <fleckAngle>-30~30</fleckAngle>
         <homingSpeed>0.75</homingSpeed>
         <initRotateAngle>0</initRotateAngle>
         <destroyTicksAfterLosingTrack>
@@ -2067,11 +2075,14 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Auto_GL</defName>
     <label>角砾岩榴弹</label>
+    <thingClass>WulaFallenEmpire.Projectile_NorthArcTrail</thingClass>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
+    <drawerType>RealtimeOnly</drawerType>
     <graphicData>
       <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
-    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
     <projectile>
       <damageDef>Bomb</damageDef>
       <damageAmountBase>8</damageAmountBase>
@@ -2086,9 +2097,19 @@
       <stoppingPower>10</stoppingPower>
     </projectile>
     <modExtensions>
+      <li Class="WulaFallenEmpire.NorthArcModExtension">
+        <northOffsetDistance>6</northOffsetDistance>
+        <curveSteepness>1.0</curveSteepness>
+        <useArcTrajectory>true</useArcTrajectory>
+      </li>
       <li Class="WulaFallenEmpire.TrackingBulletDef">
         <tailFleckDef>WULA_Smoke_Tail</tailFleckDef>
-        <fleckMakeFleckTickMax>1</fleckMakeFleckTickMax>
+        <fleckMakeFleckTickMax>2</fleckMakeFleckTickMax>
+        <fleckDelayTicks>1</fleckDelayTicks>
+        <fleckMakeFleckNum>1~2</fleckMakeFleckNum>
+        <fleckScale>0.5~1.0</fleckScale>
+        <fleckSpeed>0.1~0.3</fleckSpeed>
+        <fleckAngle>-30~30</fleckAngle>
       </li>
     </modExtensions>
   </ThingDef>