Skip to content

Commit

Permalink
Merge pull request #2877 from leukill/Development
Browse files Browse the repository at this point in the history 
Det's Energy Weapons patch
  • Loading branch information
@N7Huntsman
N7Huntsman authored Nov 13, 2023
2 parents a4dd65a + 0c7e484 commit 31f6d60
Show file tree
Hide file tree
Showing 5 changed files with 343 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/LaserChargePack.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<statBases>
<MarketValue>0.69</MarketValue>
</statBases>
<ammoClass>Charged</ammoClass>
<ammoClass>Laser</ammoClass>
</ThingDef>

<!-- ==================== Recipes ========================== -->
Expand Down
6 changes: 6 additions & 0 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
<description>Designed to combat mechanoids, the round creates an electrical current on impact, disrupting electronic systems temporarily.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>Laser</defName>
<label>laser</label>
<description>A concentrated beam or bolt of radiation, imparting disruptive energy into the target.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>IncendiaryFuel</defName>
<label>incendiary</label>
Expand Down
81 changes: 81 additions & 0 deletions Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Det's Energy Weapons</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_LaserBoltPistol</defName>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Bolt_LaserPistol</Ammo_LaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_LaserBoltRifle</defName>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Bolt_LaserRifle</Ammo_LaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_LaserBoltSniperRifle</defName>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Bolt_LaserSniperRifle</Ammo_LaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ================== Projectiles ================== -->
<ThingDef Name="BaseEnergyBoltBullet" ParentName="BaseBulletCE" Abstract="true">
<label>laser bolt</label>
<graphicData>
<texPath>Things/EnergyBolt</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<speed>156</speed>
<dropsCasings>false</dropsCasings>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseEnergyBoltBullet">
<defName>Bullet_Bolt_LaserPistol</defName>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>10</damageAmountBase>
<armorPenetrationSharp>17.5</armorPenetrationSharp>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseEnergyBoltBullet">
<defName>Bullet_Bolt_LaserRifle</defName>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>18</damageAmountBase>
<armorPenetrationSharp>17.5</armorPenetrationSharp>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseEnergyBoltBullet">
<defName>Bullet_Bolt_LaserSniperRifle</defName>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>20</damageAmountBase>
<armorPenetrationSharp>20.25</armorPenetrationSharp>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
</projectile>
</ThingDef>

</value>
</match>
</Operation>
</Patch>
254 changes: 254 additions & 0 deletions Patches/Det's Energy Weapons/Guns_Defs.XML
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationFindMod">
<mods>
<li>Det's Energy Weapons</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<!-- Damage -->
<li Class="PatchOperationAttributeSet">
<xpath>Defs/DamageDef[defName="EnergyDamage"]</xpath>
<attribute>ParentName</attribute>
<value>Flame</value>
</li>

<!-- Weapons -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Energy_Rifle</defName>
<statBases>
<Mass>6</Mass>
<Bulk>9</Bulk>
<SwayFactor>1.30</SwayFactor>
<ShotSpread>0.07</ShotSpread>
<SightsEfficiency>1.10</SightsEfficiency>
<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>1.24</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
<warmupTime>1.2</warmupTime>
<range>52</range>
<burstShotCount>3</burstShotCount>
<ticksBetweenBurstShots>12</ticksBetweenBurstShots>
<soundCast>Shot_EnergyRifle</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
</Properties>
<AmmoUser>
<magazineSize>20</magazineSize>
<reloadTime>4</reloadTime>
<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
<aiUseBurstMode>True</aiUseBurstMode>
<aimedBurstShotCount>3</aimedBurstShotCount>
</FireModes>
</li>

<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Energy_Gattler</defName>
<statBases>
<Mass>10</Mass>
<Bulk>15.0</Bulk>
<SwayFactor>2.0</SwayFactor>
<ShotSpread>0.3</ShotSpread>
<SightsEfficiency>1.10</SightsEfficiency>
<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>2.09</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Bolt_LaserRifle</defaultProjectile>
<warmupTime>2</warmupTime>
<range>48</range>
<burstShotCount>20</burstShotCount>
<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
<soundCast>Shot_EnergyRifle</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
</Properties>
<AmmoUser>
<magazineSize>80</magazineSize>
<reloadTime>6</reloadTime>
<ammoSet>AmmoSet_LaserBoltRifle</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
<aiUseBurstMode>True</aiUseBurstMode>
<aimedBurstShotCount>10</aimedBurstShotCount>
</FireModes>
</li>

<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Energy_Revolver</defName>
<statBases>
<Mass>1.8</Mass>
<Bulk>3.0</Bulk>
<SwayFactor>1.0</SwayFactor>
<ShotSpread>0.1</ShotSpread>
<SightsEfficiency>1.10</SightsEfficiency>
<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>1.6</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Bolt_LaserPistol</defaultProjectile>
<warmupTime>0.6</warmupTime>
<range>12</range>
<soundCast>Shot_EnergyRifle</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
</Properties>
<AmmoUser>
<magazineSize>9</magazineSize>
<reloadTime>3.50</reloadTime>
<ammoSet>AmmoSet_LaserBoltPistol</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
<aiUseBurstMode>FALSE</aiUseBurstMode>
</FireModes>
</li>

<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Energy_PrecisionRifle</defName>
<statBases>
<Mass>8</Mass>
<Bulk>13.0</Bulk>
<SwayFactor>1.70</SwayFactor>
<ShotSpread>0.04</ShotSpread>
<SightsEfficiency>2.10</SightsEfficiency>
<RangedWeapon_Cooldown>0.50</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>1.4</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Bolt_LaserSniperRifle</defaultProjectile>
<warmupTime>1.4</warmupTime>
<range>70</range>
<soundCast>Shot_EnergyRifle</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
</Properties>
<AmmoUser>
<magazineSize>12</magazineSize>
<reloadTime>4</reloadTime>
<ammoSet>AmmoSet_LaserBoltSniperRifle</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
<aiUseBurstMode>FALSE</aiUseBurstMode>
</FireModes>
</li>

<!-- Melee Tools -->
<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>stock</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<chanceFactor>1.5</chanceFactor>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>barrel</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>5</power>
<cooldownTime>2.02</cooldownTime>
<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>muzzle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
</li>
</tools>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName = "Energy_Gattler"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>stock</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<chanceFactor>1.5</chanceFactor>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>barrel</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>5</power>
<cooldownTime>2.02</cooldownTime>
<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>muzzle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
</li>
</tools>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName = "Energy_Revolver"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>grip</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>2</power>
<cooldownTime>1.54</cooldownTime>
<chanceFactor>1.5</chanceFactor>
<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
</li>
</tools>
</value>
</li>

</operations>
</match>
</Operation>
</Patch>
1 change: 1 addition & 0 deletions SupportedThirdPartyMods.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ Cybernetic Warfare and Special Weapons (Continued) |
Dark Ages : Medieval Tools |
Darkest Night SK Steam |
Darkest Rim: Core |
Det's Energy Weapons |
Devilstrand Animals |
Devilstrand Colour Bundle |
Dinosauria |
Expand Down

0 comments on commit 31f6d60

Please sign in to comment.