Skip to content

Commit

Permalink
Merge branch 'FeralFederationUpdate' of https://github.com/tostov/com…
Browse files Browse the repository at this point in the history 
…batextended-1 into pr/Tostov/3359
  • Loading branch information
@N7Huntsman
N7Huntsman committed Aug 25, 2024
2 parents 806a42f + 9dbc6f3 commit 1ecc399
Show file tree
Hide file tree
Showing 13 changed files with 445 additions and 122 deletions.
37 changes: 37 additions & 0 deletions ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/FederationShellingResponse.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<CombatExtended.ShellingResponseDef ParentName="ShellingPreset_UltraBase">
<defName>CE_ShellingPreset_Federation</defName>
<defaultShellingPropability>0.7</defaultShellingPropability>
<defaultRaidPropability>0.05</defaultRaidPropability>
<defaultRaidMTBDays>1</defaultRaidMTBDays>
<projectiles Inherit="False">
<li>
<projectile>Bullet_Federation_PlasmaCluster</projectile>
<points>250</points>
<weight>0.75</weight>
</li>
<li>
<projectile>Bullet_Federation_PlasmaBlast</projectile>
<points>100</points>
<weight>0.10</weight>
</li>
</projectiles>
<worldObjects Inherit="False">
<li>
<worldObject>Settlement</worldObject>
<shellingPropability>1</shellingPropability>
<raidPropability>0.2</raidPropability>
<raidMTBDays>0.5</raidMTBDays>
</li>
<li>
<worldObject>Site</worldObject>
<shellingPropability>0.6</shellingPropability>
<raidPropability>0.05</raidPropability>
<raidMTBDays>1</raidMTBDays>
</li>
</worldObjects>
</CombatExtended.ShellingResponseDef>

</Defs>
130 changes: 123 additions & 7 deletions ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<graphicData>
<texPath>Things/Projectile/Plasma</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<suppressionFactor>6.0</suppressionFactor>
Expand All @@ -61,7 +62,7 @@
</projectile>
</ThingDef>

<!-- ========== Plasma Bombard Projectile =========== -->
<!-- ========== Plasma Artillery Projectile =========== -->

<ThingDef ParentName="BaseExplosiveBullet">
<defName>Bullet_PlasmaTurretBombard</defName>
Expand All @@ -77,9 +78,98 @@
<speed>0</speed>
<flyOverhead>true</flyOverhead>
<dropsCasings>false</dropsCasings>
<damageAmountBase>25</damageAmountBase>
<damageAmountBase>30</damageAmountBase>
<explosionRadius>2.5</explosionRadius>
<gravityFactor>2.5</gravityFactor>
<pelletCount>10</pelletCount>
<spreadMult>10</spreadMult>
<shellingProps>
<tilesPerTick>0.10</tilesPerTick>
<range>30</range>
</shellingProps>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseExplosiveBullet">
<defName>Bullet_Federation_PlasmaBlast</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>energy bolt</label>
<graphicData>
<texPath>Things/Projectile/MFlux</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Plasma</damageDef>
<speed>0</speed>
<flyOverhead>true</flyOverhead>
<dropsCasings>false</dropsCasings>
<damageAmountBase>120</damageAmountBase>
<explosionRadius>4</explosionRadius>
<gravityFactor>5</gravityFactor>
<shellingProps>
<tilesPerTick>0.005</tilesPerTick>
<range>50</range>
<iconPath>Things/Projectile/MFlux</iconPath>
</shellingProps>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseExplosiveBullet">
<defName>Bullet_Federation_PlasmaCluster</defName>
<thingClass>CombatExtended.ProjectileCE_HeightFuse</thingClass>
<label>energy bolt</label>
<graphicData>
<texPath>Things/Projectile/MFlux</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Smoke</damageDef>
<soundExplode>Explosion_OpticBurst</soundExplode>
<damageAmountBase>0</damageAmountBase>
<explosionRadius>0.9</explosionRadius>
<speed>0</speed>
<flyOverhead>true</flyOverhead>
<dropsCasings>false</dropsCasings>
<damageAmountBase>0</damageAmountBase>
<explosionRadius>2.5</explosionRadius>
<gravityFactor>5</gravityFactor>
<aimHeightOffset>11</aimHeightOffset>
<shellingProps>
<tilesPerTick>0.005</tilesPerTick>
<range>50</range>
<damage>0.46</damage>
<iconPath>Things/Projectile/MFlux</iconPath>
</shellingProps>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_Fragments">
<fragments>
<Bullet_Federation_PlasmaSub>15</Bullet_Federation_PlasmaSub>
</fragments>
<fragAngleRange>-90~-10</fragAngleRange>
</li>
</comps>
</ThingDef>

<ThingDef ParentName="BaseExplosiveBullet">
<defName>Bullet_Federation_PlasmaSub</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>energy bolt</label>
<graphicData>
<texPath>Things/Projectile/Plasma</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Plasma</damageDef>
<speed>3</speed>
<flyOverhead>true</flyOverhead>
<dropsCasings>false</dropsCasings>
<damageAmountBase>30</damageAmountBase>
<explosionRadius>2.5</explosionRadius>
<gravityFactor>0.01</gravityFactor>
</projectile>
</ThingDef>

Expand All @@ -94,8 +184,8 @@
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>40</damageAmountBase>
<explosionRadius>0.9</explosionRadius>
<damageAmountBase>36</damageAmountBase>
<explosionRadius>1</explosionRadius>
</projectile>
</ThingDef>

Expand All @@ -116,6 +206,10 @@
<dropsCasings>false</dropsCasings>
<damageAmountBase>120</damageAmountBase>
<explosionRadius>4</explosionRadius>
<shellingProps>
<tilesPerTick>0.01</tilesPerTick>
<range>45</range>
</shellingProps>
</projectile>
</ThingDef>

Expand All @@ -135,7 +229,7 @@
<gravityFactor>0.01</gravityFactor>
<dropsCasings>false</dropsCasings>
<damageAmountBase>30</damageAmountBase>
<explosionRadius>1.5</explosionRadius>
<explosionRadius>2.1</explosionRadius>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -271,12 +365,34 @@
</projectile>
</ThingDef>

<!-- ========== Plasma Caster Projectile =========== -->
<!-- ========== Plasma Caster Projectile =========== -->

<ThingDef ParentName="BasePlasmaBombCE">
<defName>Bullet_PlasmaCaster</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>plasma sphere</label>
<graphicData>
<texPath>Things/Projectile/Plasma</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Plasma</damageDef>
<speed>20</speed>
<gravityFactor>0.01</gravityFactor>
<dropsCasings>false</dropsCasings>
<damageAmountBase>25</damageAmountBase>
<explosionRadius>2.1</explosionRadius>
<pelletCount>4</pelletCount>
<spreadMult>4.45</spreadMult>
</projectile>
</ThingDef>

<!-- ========== Federation Plasma Caster Projectile =========== -->

<ThingDef ParentName="BasePlasmaBombCE">
<defName>Bullet_PlasmaCaster_Fed</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>plasma sphere</label>
<graphicData>
<texPath>Things/Projectile/Flux</texPath>
<graphicClass>Graphic_Single</graphicClass>
Expand All @@ -287,7 +403,7 @@
<speed>8</speed>
<gravityFactor>0.01</gravityFactor>
<dropsCasings>false</dropsCasings>
<damageAmountBase>75</damageAmountBase>
<damageAmountBase>90</damageAmountBase>
<explosionRadius>3.5</explosionRadius>
</projectile>
</ThingDef>
Expand Down
17 changes: 17 additions & 0 deletions ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Factions_Federation.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<!-- ========== Custom shelling response for mechs ========== -->
<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/FactionDef[defName="FPC"]</xpath>
<value>
<li Class="CombatExtended.FactionDefExtensionCE">
<shellingResponse>CE_ShellingPreset_Federation</shellingResponse>
</li>
<li Class="CombatExtended.WorldObjectHealthExtension">
<chanceToNegateDamage>0.2</chanceToNegateDamage>
</li>
</value>
</Operation>

</Patch>
21 changes: 21 additions & 0 deletions ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@
<li>StrappedHead</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel</xpath>
<value>
<parentTagDef>ApparelHead</parentTagDef>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]</xpath>
Expand Down Expand Up @@ -369,6 +376,13 @@
<li>StrappedHead</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/apparel</xpath>
<value>
<parentTagDef>ApparelHead</parentTagDef>
</value>
</Operation>

<!-- ========== Unity Guard Armor =========== -->
<Operation Class="PatchOperationAdd">
Expand Down Expand Up @@ -478,6 +492,13 @@
<li>StrappedHead</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/apparel</xpath>
<value>
<parentTagDef>ApparelHead</parentTagDef>
</value>
</Operation>

<!-- ========== Unity Guard Cloak =========== -->

Expand Down
24 changes: 24 additions & 0 deletions ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,28 @@
</ThingDef>
</value>
</Operation>

<!-- ========== Tools + Tradetag ========== -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades" or defName="AD_PBomb"]</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>Body</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>2</power>
<cooldownTime>1.75</cooldownTime>
<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
</li>
</tools>
<tradeTags Inherit="False">
<li>CE_MediumAmmo</li>
</tradeTags>
<allowedArchonexusCount>5</allowedArchonexusCount>
</value>
</Operation>
</Patch>
26 changes: 20 additions & 6 deletions ...atches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,26 @@
<SwayFactor>0.91</SwayFactor>
<Bulk>30</Bulk>
<Mass>25</Mass>
<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
</statBases>
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_PlasmaMechBombard</defaultProjectile>
<warmupTime>4</warmupTime>
<range>56</range>
<warmupTime>4.55</warmupTime>
<range>44</range>
<soundCast>RS_ShotHarmonizer</soundCast>
<muzzleFlashScale>17</muzzleFlashScale>
<soundCastTail>GunTail_Heavy</soundCastTail>
<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
</Properties>
<AmmoUser>
<magazineSize>3</magazineSize>
<reloadTime>10</reloadTime>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
Expand All @@ -36,19 +43,26 @@
<SwayFactor>1.21</SwayFactor>
<Bulk>28.00</Bulk>
<Mass>24.00</Mass>
<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>1.18</recoilAmount>
<recoilAmount>0.54</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_CrucibleCannon_CE</defaultProjectile>
<warmupTime>2.6</warmupTime>
<warmupTime>1.7</warmupTime>
<burstShotCount>13</burstShotCount>
<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
<range>75</range>
<soundCast>RS_ShotCR</soundCast>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
</Properties>
<AmmoUser>
<magazineSize>65</magazineSize>
<reloadTime>8</reloadTime>
</AmmoUser>
<FireModes>
<aimedBurstShotCount>5</aimedBurstShotCount>
<aiAimMode>AimedShot</aiAimMode>
Expand Down
4 changes: 2 additions & 2 deletions ...tches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<li>Blunt</li>
</capacities>
<power>15</power>
<cooldownTime>0.63</cooldownTime>
<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
<cooldownTime>0.95</cooldownTime>
<armorPenetrationBlunt>25.625</armorPenetrationBlunt>
<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
</li>
</tools>
Expand Down
Loading

0 comments on commit 1ecc399

Please sign in to comment.