From a09407e85923e8b5582508d8114d628893c6ffe0 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:46:15 +1000 Subject: [PATCH 1/7] Feral / Federation Partial Armor + Tweaks --- .../ThingDefs_Misc/Ammo_Fed.xml | 175 ++++++++++-------- .../ThingDefs_Misc/Fed_DamageDefs.xml | 15 +- .../ThingDefs_Misc/Fed_MechWeapons.xml | 3 +- .../ThingDefs_Misc/Fed_RangedWeapons.xml | 8 +- .../ThingDefs_Races/Race_Bion.xml | 104 +++++++++-- .../ThingDefs_Races/Race_FederatorMech.xml | 66 ++++++- .../ThingDefs_Races/Race_Hulk.xml | 50 +++-- .../ThingDefs_Races/Race_SeekerMech.xml | 30 ++- .../ThingDefs_Misc/Ammo_Feral.xml | 114 ++++-------- .../ThingDefs_Misc/Feral_MutantWeapons.xml | 20 +- .../ThingDefs_Races/Race_Ogrons.xml | 82 +++++++- .../ThingDefs_Races/Race_Razortooth.xml | 53 +++++- .../ThingDefs_Races/Race_Shadark.xml | 27 ++- .../ThingDefs_Races/Race_Twisted.xml | 25 +++ 14 files changed, 553 insertions(+), 219 deletions(-) diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml index 1ce65e7b29..2a11b2295e 100644 --- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml @@ -1,9 +1,53 @@ + + + + + + Things/Projectile/Mlaser + Graphic_Single + + + Optic + 100 + false + + + + + + + Things/Projectile/Cruciblebolt + Graphic_Single + + + Crucible + 100 + false + + + + + + CombatExtended.ProjectileCE_Explosive + + Things/Projectile/Plasma + Graphic_Single + + + 6.0 + 4.0 + Plasma + 16 + false + + + - + Bullet_HarvesterCannon CombatExtended.ProjectileCE_Explosive @@ -12,12 +56,7 @@ Graphic_Single - Optic - 106 - false - 12 - 5 - 14 + 36 1 @@ -39,8 +78,6 @@ true false 25 - 5 - 14 2.5 5 @@ -48,7 +85,7 @@ - + Bullet_CrucibleCannon_CE CombatExtended.ProjectileCE_Explosive @@ -57,22 +94,16 @@ Graphic_Single - Optic - 98 - false - 20 - 5 - 20 - 1 + 40 + 0.9 - + Bullet_PlasmaMechBombard CombatExtended.ProjectileCE_Explosive - Things/Projectile/MFlux Graphic_Single @@ -80,18 +111,17 @@ Plasma - 63 + 8 + 0.01 false - 50 - 5 - 14 + 120 4 - + Bullet_PlasmaRifle_Fed CombatExtended.ProjectileCE_Explosive @@ -101,11 +131,10 @@ Plasma - 54 + 20 + 0.01 false - 25 - 5 - 16 + 30 1.5 @@ -133,7 +162,7 @@ - + Bullet_AuxiliaryPistol @@ -141,18 +170,13 @@ Graphic_Single - Optic - 90 - false 8 - 1.5 - 8 - + Bullet_MakeshiftCrucibleRifle @@ -164,52 +188,52 @@ 90 false 13 - 2.5 - 10 - + Bullet_CrucibleRifle - + + 12 + + + + + Bullet_CrucibleRifleAD Things/Projectile/Laser Graphic_Single - Optic - 90 - false 12 - 3 - 12 - - + + Bullet_CruciblePistol - + + 10 + + + + + Bullet_CruciblePistolAD Things/Projectile/Laser Graphic_Single - Optic - 90 - false 10 - 1.5 - 10 - + Bullet_HeatCannon CombatExtended.ProjectileCE_Explosive @@ -222,35 +246,34 @@ Flame 90 false - 5 - 3.5 - 9 + 12 0.5 - - + + Bullet_CruciblePrecisionRifle - + + 20 + + + + + Bullet_CruciblePrecisionRifleAD Things/Projectile/Laser Graphic_Single - Optic - 90 - false 20 - 1.5 - 10 - + Bullet_PlasmaCaster CombatExtended.ProjectileCE_Explosive @@ -261,18 +284,17 @@ Plasma - 32 + 8 + 0.01 false - 25 - 30 - 8 - 2.5 + 75 + 3.5 - + Bullet_PlasmaBomb CombatExtended.ProjectileCE_Explosive @@ -294,20 +316,15 @@ - + Bullet_CrucibleCarbine - Things/Projectile/Laser + Things/Projectile/Mlaser Graphic_Single - Optic - 90 - false - 8 - 3.5 - 9 + 10 \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml index 27e11b6c05..ae0bb7b31a 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml @@ -1,16 +1,11 @@ - Defs/DamageDef[defName="Optic"] - -
  • - true -
    • -     -     - - - Defs/DamageDef[defName="Plasma"] + Defs/DamageDef[ + defName="Optic" or + defName="Crucible" or + defName="Plasma" + ]
  • true diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml index 9361800bcf..48046126ed 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml @@ -20,6 +20,7 @@ RS_ShotHarmonizer 17 GunTail_Heavy + true AimedShot @@ -35,7 +36,7 @@ 1.21 28.00 24.00 - 8 + 1.6 1.18 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml index 2991ded67c..c468c48b60 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml @@ -220,7 +220,7 @@ 1.56 CombatExtended.Verb_ShootCE true - Bullet_CrucibleRifle + Bullet_CrucibleRifleAD 1.1 6 18 @@ -283,7 +283,7 @@ 1.78 CombatExtended.Verb_ShootCE true - Bullet_CruciblePistol + Bullet_CruciblePistolAD 0.6 5 20 @@ -403,7 +403,7 @@ 1.06 CombatExtended.Verb_ShootCE true - Bullet_CruciblePrecisionRifle + Bullet_CruciblePrecisionRifleAD 1.1 75 RS_ShotCPR @@ -441,6 +441,7 @@ true + true @@ -471,6 +472,7 @@ true + true diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml index 8dd01f19e3..7ec17a04fc 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml @@ -9,41 +9,120 @@
    • + + + Defs/ThingDef[@Name="BaseBion"] + +
  • + +
  • + false + 0.25 + +
  • Eye
    • + + +
  • + false + 0.25 + +
  • Eye
    • + + + + +     +     Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Blunt - 12 + 30 Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Heat - 0.70 + 1.40 Defs/ThingDef[defName="Bion_Base"]/statBases/ArmorRating_Sharp - 22 + 44 0.70 + 1 Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Sharp - 18 + 36 + 15 0.90 + 1 Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat - 0.70 + 1.40 + + + + + Defs/ThingDef[defName="Bion_Base"]/comps + + Defs/ThingDef[defName="Bion_Base"] + + + + + + + + Defs/ThingDef[defName="Bion_Base"]/comps + +
  • + 700 + true + 600 + 5 + 0 + 16.5 + 6 + 0.7 +
    • +     +     + + + Defs/ThingDef[defName="Bion_Stalker"]/comps + + Defs/ThingDef[defName="Bion_Stalker"] + + + + + + + + Defs/ThingDef[defName="Bion_Stalker"]/comps + +
  • + 375 + true + 600 + 5 + 0 + 13.5 + 3 + 0.7 +
    • @@ -52,8 +131,8 @@ 50 50 - 1.2 - 1.2 + 1.3 + 1.3 0.15 0.15 0.1 @@ -82,7 +161,7 @@
  • Blunt
    •  - 2 + 8 1.5 LeftHand @@ -93,14 +172,14 @@ - 0.5 + 2.5
  • -
  • Blunt
    • +
  • Stab
    • - 2 + 12 1.5 RightHand @@ -111,7 +190,8 @@ - 0.5 + 2.5 + 5     diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml index fb7c6dbb04..58b6f98a8f 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml @@ -13,21 +13,22 @@ Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Blunt - 40 + 200 Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Sharp - 35 + 75 + 1 Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Heat - 0.95 + 1.90 @@ -36,8 +37,8 @@ 60 60 - 1.1 - 1.1 + 1.4 + 1.4 0.05 0.4 0.3 @@ -45,6 +46,56 @@ 0.80 + + + Defs/ThingDef[defName="Mech_Federator"]/comps + + Defs/ThingDef[defName="Mech_Federator"] + + + + + + + + Defs/ThingDef[defName="Mech_Federator"]/comps + +
  • + 1875 + true + 600 + 5 + 0 + 26.25 + 20 + 0.7 +
    • +     +     + + + Defs/ThingDef[defName="Mech_Federator"] + +
  • + +
  • + false + 0.25 + +
  • SightSensor
    • + + +
  • + false + 0.25 + +
  • SightSensor
    • + + + + +     +     Defs/ThingDef[defName="Mech_Federator"]/tools @@ -83,9 +134,9 @@
  • -
  • Blunt
    • +
  • Stab
    • - 35 + 45 2.67 RightHand @@ -97,6 +148,7 @@ 15 + 10 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml index bf7a9c4625..a751f8b182 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml @@ -13,21 +13,22 @@ Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Blunt - 20 + 50 Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Sharp - 25 + 50 + 1 - Defs/ThingDef[defName="Bion_Stalker"]/statBases/ArmorRating_Heat + Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Heat - 0.85 + 1.7 @@ -36,8 +37,8 @@ 60 60 - 1.2 - 1.2 + 1.3 + 1.3 0.10 0.2 0.10 @@ -45,6 +46,32 @@ 0.80     + + + Defs/ThingDef[defName="Bion_Hulk"]/comps + + Defs/ThingDef[defName="Bion_Hulk"] + + + + + + + + Defs/ThingDef[defName="Bion_Hulk"]/comps + +
  • + 1015 + true + 600 + 5 + 0 + 18.75 + 10 + 0.7 +
    • +     +     Defs/ThingDef[defName="Bion_Hulk"]/tools @@ -67,7 +94,7 @@
  • Blunt
    •  - 7 + 12 2.24 LeftHand @@ -78,14 +105,14 @@ - 2.5 + 7.5
  • -
  • Blunt
    • +
  • Stab
    • - 5 + 20 2.24 RightHand @@ -96,7 +123,8 @@ - 2.5 + 7.5 + 5 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml index 3735f915c9..68e8cfa06d 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml @@ -13,14 +13,15 @@ Defs/ThingDef[defName="Mech_Seeker"]/statBases - 5 + 8 Defs/ThingDef[defName="Mech_Seeker"]/statBases/ArmorRating_Sharp - 6 + 4 + 1 @@ -38,6 +39,31 @@ 1     + + + Defs/ThingDef[defName="Mech_Seeker"]/comps + + Defs/ThingDef[defName="Mech_Seeker"] + + + + + + + + Defs/ThingDef[defName="Mech_Seeker"]/comps + +
  • + 125 + true + 600 + 5 + 0 + 2 + 0 +
    • +     +     Defs/ThingDef[defName="Mech_Seeker"]/tools diff --git a/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml index d9941fbfbe..ef4cebb8db 100644 --- a/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml +++ b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml @@ -26,6 +26,15 @@ Bullet_Feral_Scrap + + + + AmmoSet_Feral_Rivet + + + Bullet_Feral_Rivet + + @@ -74,22 +83,26 @@ false + - - - - AmmoFeralNail - - AmmoRifles - Things/Ammo/Nail/Nail_c - + + Bullet_Feral_Rivet + + + Projectile/Crucifier + Graphic_Single + + + Bullet + 73 + false + 21 + 41 + 3 + + - - FeralNail - - nail - Rusty, pointy nails arranged in strips. - + @@ -97,43 +110,13 @@ AmmoSet_Feral_Nail - Bullet_Feral_Nail + Bullet_Feral_Nail - - - - A pointed, slightly rusty carpentry nail a few inches long. While an extremely inaccurate projectile at best, its shape means it tends to tumble when it strikes a target, leaving large wounds. - - 0.02 - 0.02 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting
    • -     - -
  • AmmoFeralNail
    • -     -     - - - Ammo_Feral_Nail - - - Things/Ammo/Nail - Graphic_StackCount - - - 0.02 - - FeralNail - - - - + + Bullet_Feral_Nail @@ -141,42 +124,13 @@ Graphic_Single - Bullet - 73 - false - 8 - 10 - 2.5 + 32 + 3 + 0.82 + 3 - - - - MakeAmmo_Feral_Nail - - Craft 500 steel nails. - Making nails. - -
  • - - -
  • Steel
    • - - - 15 - -     - - -
  • Steel
    • -     -     - - 500 - -     - diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml index 55af93956d..00c33404fe 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml @@ -42,11 +42,11 @@ 0.56 0.8 0.8 - 2.53 + 1.72 12 - 2.2 + 1.1 CombatExtended.Verb_ShootCE true Bullet_303British_FMJ @@ -89,24 +89,24 @@ 0.8 + 1.74 CombatExtended.Verb_ShootCE true Bullet_Feral_Scrap 0.6 - 24 + 18 ShotScatterStick GunTail_Heavy 12 1 + 5 20 - 10 + 3.5 AmmoSet_Feral_Scrap - 4 - true SuppressFire @@ -118,15 +118,15 @@ Feral_RivetCannon - 5.3 + 8 0.38 0.89 0.17 - 1.7 + 1.26 11.03 - 1.83 + 0.92 CombatExtended.Verb_ShootCE true Bullet_Feral_Nail @@ -141,7 +141,7 @@ 80 6.7 - AmmoSet_Feral_Nail + AmmoSet_Feral_Rivet 8 diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml index fc5b7148b0..a7415543e1 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml @@ -34,7 +34,85 @@ Defs/ThingDef[defName="Mutant_Ogron"]/statBases/ArmorRating_Blunt - 2 + 12 + + + + + Defs/ThingDef[defName="Mutant_Ogron"]/comps + + Defs/ThingDef[defName="Mutant_Ogron"] + + + + + + + + Defs/ThingDef[defName="Mutant_Ogron"]/comps + +
  • + 1500 + true + 600 + 5 + 0.25 +
    • +     +     + + + Defs/ThingDef[defName="Mutant_Ogron"] + +
  • + +
  • + false + 0.25 + +
  • Shoulder
    • +
  • Arm
    • +
  • Hand
    • +
  • Leg
    • +
  • Foot
    • + + +
  • + false + 0.1 + +
  • Shoulder
    • +
  • Arm
    • +
  • Hand
    • +
  • Leg
    • +
  • Foot
    • + + +
  • + false + 0.65 + +
  • Head
    • +
  • Neck
    • + + +
  • + false + 0.65 + +
  • Head
    • +
  • Neck
    • + + + + +     +     + + + Defs/ThingDef[defName="Mutant_Ogron"]/statBases + + 0 @@ -91,4 +169,6 @@     + +     \ No newline at end of file diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml index 65ecd3fa58..771725a7e4 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml @@ -15,13 +15,62 @@ Defs/ThingDef[defName="Mutant_Razortooth"]/statBases 20 - 2 - 1 + 4 + 0.25 0.18 0.05 0.4 + + + Defs/ThingDef[defName="Mutant_Razortooth"]/comps + + Defs/ThingDef[defName="Mutant_Razortooth"] + + + + + + + + Defs/ThingDef[defName="Mutant_Razortooth"]/comps + +
  • + 800 + true + 600 + 5 + 0.25 +
    • +     +     + + + Defs/ThingDef[defName="Mutant_Razortooth"] + +
  • + +
  • + false + 0.25 + +
  • Leg
    • +
  • Paw
    • + + +
  • + false + 0.25 + +
  • Leg
    • +
  • Paw
    • + + + + +     +     Defs/ThingDef[defName="Mutant_Razortooth"]/tools diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml index 66f3be6eee..3900cc386c 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml @@ -13,12 +13,37 @@ Defs/ThingDef[defName="Mutant_Shadark"]/statBases - 1 + 4 + 0.35 + 0.5 1 1 0 + + + Defs/ThingDef[defName="Mutant_Shadark"]/comps + + Defs/ThingDef[defName="Mutant_Shadark"] + + + + + + + + Defs/ThingDef[defName="Mutant_Shadark"]/comps + +
  • + 650 + true + 600 + 5 + 0.25 +
    • +     +     Defs/ThingDef[defName="Mutant_Shadark"]/tools diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml index a9f75c3d2d..81c167e62d 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Twisted.xml @@ -13,11 +13,36 @@ Defs/ThingDef[defName="Mutant_Twisted"]/statBases + 4 + 0.35 0.5 1 0.5 + + + Defs/ThingDef[defName="Mutant_Twisted"]/comps + + Defs/ThingDef[defName="Mutant_Twisted"] + + + + + + + + Defs/ThingDef[defName="Mutant_Twisted"]/comps + +
  • + 675 + true + 600 + 5 + 0.25 +
    • +     +     Defs/ThingDef[defName="Mutant_Twisted"]/tools From 02839956cdc44f37b097049b9e037521ecc6d3e8 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:55:26 +1000 Subject: [PATCH 2/7] Update Feral_MutantWeapons.xml Fix default projectile --- .../Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml index 00c33404fe..73ed0a058d 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Misc/Feral_MutantWeapons.xml @@ -129,7 +129,7 @@ 0.92 CombatExtended.Verb_ShootCE true - Bullet_Feral_Nail + Bullet_Feral_Rivet 1.1 48 8 @@ -205,4 +205,4 @@
  • SmokeSpore
    •  - \ No newline at end of file + From f8a74c3dc7e837f31392f8a47ff0b047797ac35d Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 23 Aug 2024 20:16:33 -0400 Subject: [PATCH 3/7] Add no ammo 'reload' to crucible cannon --- .../Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml index 48046126ed..ca901604ed 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml @@ -53,5 +53,9 @@ 5 AimedShot + + 52 + 9.2 +     \ No newline at end of file From 806a42f5ded95edd5c7e4c86b75b54f3cbf83a9c Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 23 Aug 2024 20:16:41 -0400 Subject: [PATCH 4/7] Housekeeping --- .../Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml | 3 +-- .../Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml | 7 +------ .../Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml index ef4cebb8db..f4314bb539 100644 --- a/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml +++ b/ModPatches/Rimsenal Feral/Defs/Rimsenal Feral/ThingDefs_Misc/Ammo_Feral.xml @@ -26,8 +26,7 @@ Bullet_Feral_Scrap - - + AmmoSet_Feral_Rivet diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml index a7415543e1..19e055a76a 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml @@ -67,7 +67,6 @@
  • - false 0.25
  • Shoulder
    • @@ -78,7 +77,6 @@
  • - false 0.1
  • Shoulder
    • @@ -89,7 +87,6 @@
  • - false 0.65
  • Head
    • @@ -97,7 +94,6 @@
  • - false 0.65
  • Head
    • @@ -169,6 +165,5 @@     - - + \ No newline at end of file diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml index 3900cc386c..9419f68fa9 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Shadark.xml @@ -102,4 +102,5 @@ + \ No newline at end of file From ba6cbe713f7b32d66bc89559e422d7b134872deb Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Sat, 24 Aug 2024 23:27:43 +1000 Subject: [PATCH 5/7] More Tweaks Reload added for all non-static federation weapons. In general it's 3 full auto bursts, 5 for MG-ish weapons (heat projector, crucible cannon). Overall adjustments to warm-up, cooldown and recoil to compensate. Tool added for grenade and bomb. Further partial armor tweaks. Buffs to federator to match its whopping 1k of combat power and not make the raids before it is part of the raidgroups *harder* than afterwards. Painshock removed from all federation mechs and bions. Damage reduction removed. Added parentdef tag to headgear to hopefully prevent rendering bug. --- .../ThingDefs_Misc/Ammo_Fed.xml | 29 ++- .../ThingDefs_Misc/Fed_Apparel.xml | 21 +++ .../ThingDefs_Misc/Fed_Explosives.xml | 24 +++ .../ThingDefs_Misc/Fed_MechWeapons.xml | 26 ++- .../ThingDefs_Misc/Fed_MeleeWeapons.xml | 4 +- .../ThingDefs_Misc/Fed_RangedWeapons.xml | 165 ++++++++++++------ .../ThingDefs_Races/Race_Bion.xml | 42 +++-- .../ThingDefs_Races/Race_FederatorMech.xml | 43 +++-- .../ThingDefs_Races/Race_Hulk.xml | 5 +- .../ThingDefs_Races/Race_SeekerMech.xml | 1 - 10 files changed, 255 insertions(+), 105 deletions(-) diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml index 2a11b2295e..e855311e98 100644 --- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml @@ -35,6 +35,7 @@ Things/Projectile/Plasma Graphic_Single + TransparentPostLight 6.0 @@ -135,7 +136,7 @@ 0.01 false 30 - 1.5 + 2.1 @@ -271,12 +272,34 @@ - + Bullet_PlasmaCaster CombatExtended.ProjectileCE_Explosive + + Things/Projectile/Plasma + Graphic_Single + + + Plasma + 20 + 0.01 + false + 25 + 2.1 + 4 + 4.45 + + + + + + + Bullet_PlasmaCaster_Fed + CombatExtended.ProjectileCE_Explosive + Things/Projectile/Flux Graphic_Single @@ -287,7 +310,7 @@ 8 0.01 false - 75 + 90 3.5 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml index 74e1db1329..1a7950fec6 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml @@ -180,6 +180,13 @@
  • StrappedHead
    • + + + Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel + + ApparelHead + + Defs/ThingDef[defName="Apparel_JudicatorH"] @@ -369,6 +376,13 @@
  • StrappedHead
    •  + + + Defs/ThingDef[defName="Apparel_MarksmanGearH"]/apparel + + ApparelHead + + @@ -478,6 +492,13 @@
  • StrappedHead
    •  + + + Defs/ThingDef[defName="Apparel_UGHelmet"]/apparel + + ApparelHead + + diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml index a095d2a798..3690bdda7a 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml @@ -221,4 +221,28 @@ + + + + + Defs/ThingDef[defName="AD_FedPlasmaGrenades" or defName="AD_PBomb"] + + +
  • + + +
  • Blunt
    • + + 2 + 1.75 + 1.0 + Base + +     + +
  • CE_MediumAmmo
    • +     + 5 +     +     \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml index 48046126ed..2716829a83 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml @@ -9,19 +9,26 @@ 0.91 30 25 - 5 + 2.6 CombatExtended.Verb_ShootCE true Bullet_PlasmaMechBombard - 4 - 56 + 4.55 + 44 RS_ShotHarmonizer 17 GunTail_Heavy true + + true + + + 3 + 10 + AimedShot @@ -36,19 +43,26 @@ 1.21 28.00 24.00 - 1.6 + 0.4 - 1.18 + 0.54 CombatExtended.Verb_ShootCE true Bullet_CrucibleCannon_CE - 2.6 + 1.7 13 22 75 RS_ShotCR + + true + + + 65 + 8 + 5 AimedShot diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml index 55577b4d6b..22339438f1 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml @@ -23,8 +23,8 @@
  • Blunt
    • 15 - 0.63 - 5.625 + 0.95 + 25.625 Head diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml index c468c48b60..c28c9a1116 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml @@ -101,22 +101,29 @@ 1.34 10.80 5.60 - 0.75 + 0.45 - 1.48 + 0.74 CombatExtended.Verb_ShootCE true Bullet_PlasmaRifle_Fed - 1.1 + 1.35 55 RS_ShotCR 12 GunTail_Heavy + + true + FALSE + + 3 + 5 + @@ -131,11 +138,11 @@ 1.50 - 2 + 1 CombatExtended.Verb_ShootCE true Bullet_AuxiliaryPistol - 0.55 + 0.8 2 25 18 @@ -145,6 +152,10 @@ FALSE + + 6 + 3 + @@ -160,17 +171,21 @@ 1.15 - 1.56 + 0.78 CombatExtended.Verb_ShootCE true Bullet_MakeshiftCrucibleRifle - 1.1 + 1.7 55 RS_ShotCP GunTail_Heavy 9 + + 6 + 6 + @@ -184,15 +199,15 @@ 1.44 9.50 4.80 - 0.95 + 0.35 - 1.56 + 0.78 CombatExtended.Verb_ShootCE true Bullet_CrucibleRifle - 1.1 - 6 + 1.6 + 5 25 55 RS_ShotCR @@ -203,6 +218,10 @@ TRUE AimedShot + + 15 + 4 + @@ -214,15 +233,15 @@ 1.44 9.50 4.80 - 0.95 + 0.35 - 1.56 + 0.78 CombatExtended.Verb_ShootCE true Bullet_CrucibleRifleAD - 1.1 - 6 + 1.6 + 5 18 55 RS_ShotCR @@ -233,6 +252,10 @@ TRUE AimedShot     + + 15 + 4 + @@ -245,17 +268,17 @@ 1.08 3.90 2.40 - 0.75 + 0.35 - 1.78 + 0.89 CombatExtended.Verb_ShootCE true Bullet_CruciblePistol - 0.6 + 0.7 5 - 20 - 12 + 15 + 21 RS_ShotCP 12 @@ -266,6 +289,10 @@ 3 FALSE + + 15 + 3 + @@ -277,17 +304,17 @@ 1.08 3.90 2.40 - 0.75 + 0.35 - 1.78 + 0.89 CombatExtended.Verb_ShootCE true Bullet_CruciblePistolAD - 0.6 + 0.7 5 - 20 - 12 + 15 + 21 RS_ShotCP 12 @@ -298,6 +325,10 @@ 3 FALSE + + 15 + 3 + @@ -309,16 +340,16 @@ 1.48 12.70 7.50 - 0.90 + 0.35 - 1.58 + 0.79 CombatExtended.Verb_ShootCE true Bullet_HeatCannon - 1.1 + 1.35 5 - 50 + 40 55 RS_ShotHC 12 @@ -330,6 +361,10 @@ 3 FALSE + + 30 + 6 + @@ -340,16 +375,16 @@ 1.48 12.70 7.50 - 0.90 + 0.35 - 1.58 + 0.79 CombatExtended.Verb_ShootCE true Bullet_HeatCannon - 1.1 + 1.35 5 - 50 + 40 55 RS_ShotHC 12 @@ -361,6 +396,10 @@ 3 FALSE + + 30 + 6 + @@ -372,14 +411,14 @@ 1.46 12.40 5.20 - 0.95 + 0.35 - 1.06 + 0.53 CombatExtended.Verb_ShootCE true Bullet_CruciblePrecisionRifle - 1.1 + 1.6 75 RS_ShotCPR 12 @@ -387,6 +426,10 @@ AimedShot + + 6 + 4 + @@ -397,14 +440,14 @@ 1.46 12.40 5.20 - 0.95 + 0.35 - 1.06 + 0.53 CombatExtended.Verb_ShootCE true Bullet_CruciblePrecisionRifleAD - 1.1 + 1.6 75 RS_ShotCPR 12 @@ -412,6 +455,10 @@ AimedShot + + 6 + 4 + @@ -423,18 +470,16 @@ 1.96 18.20 10.00 - 1.75 + 1.2 - 5 + 0.50 CombatExtended.Verb_ShootCE true Bullet_PlasmaCaster - 3.25 + 1.9 3 - 3 - 8 - 40 + 35 RS_ShotHarmonizer GunTail_Heavy 18 @@ -444,6 +489,10 @@ true + + 3 + 5 + @@ -454,18 +503,16 @@ 1.96 18.20 10.00 - 1.75 + 1.2 - 5 + 0.50 CombatExtended.Verb_ShootCE true - Bullet_PlasmaCaster - 4.25 + Bullet_PlasmaCaster_Fed + 1.9 3 - 3 - 8 - 40 + 35 RS_ShotHarmonizer GunTail_Heavy 18 @@ -475,6 +522,10 @@ true + + 3 + 5 + @@ -487,14 +538,14 @@ 1.11 8.20 4.10 - 0.85 + 0.35 - 1.38 + 0.69 CombatExtended.Verb_ShootCE true Bullet_CrucibleCarbine - 0.85 + 1.07 5 22 32 @@ -505,5 +556,9 @@ 3 FALSE + + 15 + 4 + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml index 7ec17a04fc..7b43bf52be 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml @@ -53,7 +53,6 @@ 44 0.70 - 1 @@ -63,7 +62,6 @@ 36 15 0.90 - 1 @@ -127,18 +125,32 @@ - Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/statBases + Defs/ThingDef[defName="Bion_Base"]/statBases 50 50 - 1.3 - 1.3 + 1.2 + 1.2 0.15 0.15 0.1 0 + + + Defs/ThingDef[defName="Bion_Stalker"]/statBases + + 50 + 50 + 1.45 + 1.45 + 0.20 + 0.15 + 0.1 + 0 + + Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/tools @@ -218,26 +230,12 @@ - Defs/ThingDef[@Name="BaseBion"]/damageMultipliers + Defs/PawnKindDef[@Name="BaseBionKind"]/ignoresPainShock - Defs/ThingDef[@Name="BaseBion"] + Defs/PawnKindDef[@Name="BaseBionKind"] - + true - - - Defs/ThingDef[@Name="BaseBion"]/damageMultipliers - -
  • - Blunt - 0.75 -
    • -
  • - Bomb_Secondary - 0.25 -
    • -     -     \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml index 58b6f98a8f..80b78846eb 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml @@ -9,11 +9,18 @@ + + + Defs/ThingDef[defName="Mech_Federator"]/race/baseHealthScale + + 7 + + Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Blunt - 200 + 400 @@ -21,7 +28,6 @@ Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Sharp 75 - 1 @@ -44,6 +50,7 @@ 0.3 0 0.80 + 1.5 @@ -61,13 +68,13 @@ Defs/ThingDef[defName="Mech_Federator"]/comps
  • - 1875 + 3750 true 600 5 0 26.25 - 20 + 40 0.7
    • @@ -79,15 +86,15 @@
  • - false - 0.25 + true + 28
  • SightSensor
  • - false - 0.25 + true + 28
  • SightSensor
    • @@ -118,7 +125,7 @@
  • Blunt
    •  - 35 + 40 2.67 LeftHand @@ -129,14 +136,14 @@ - 15 + 37.5
  • Stab
    • - 45 + 55 2.67 RightHand @@ -147,10 +154,20 @@ - 15 - 10 + 37.5 + 15 + + + Defs/PawnKindDef[@Name="BaseMechKind"]/ignoresPainShock + + Defs/PawnKindDef[@Name="BaseMechKind"] + + true + + + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml index a751f8b182..0f3eed9dbb 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml @@ -21,7 +21,6 @@ Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Sharp 50 - 1 @@ -37,8 +36,8 @@ 60 60 - 1.3 - 1.3 + 1.2 + 1.2 0.10 0.2 0.10 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml index 68e8cfa06d..d0d319b925 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml @@ -21,7 +21,6 @@ Defs/ThingDef[defName="Mech_Seeker"]/statBases/ArmorRating_Sharp 4 - 1 From 9dbc6f3ad1820b7059a508e99dafa03abbbd327c Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Sun, 25 Aug 2024 03:37:16 +1000 Subject: [PATCH 6/7] Defensive Structures + Counter Shelling Matched crucible cannon and harvester properties for projectiles/reload speed. Plamsa mortar now has 25 second reload, fires a spread shot as the intended projectile is kind of supposed to be in vanilla. Projectile slowed down and gravity reduced. Custom bombardment response and shelling type (due to not being able to make burst/scatter munitions, includes 3 ammo types to support) for federation faction. --- .../FederationShellingResponse.xml | 37 +++++++ .../ThingDefs_Misc/Ammo_Fed.xml | 101 +++++++++++++++++- .../Factions_Federation.xml | 17 +++ .../ThingDefs_Misc/Fed_Security.xml | 52 ++++++--- 4 files changed, 190 insertions(+), 17 deletions(-) create mode 100644 ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/FederationShellingResponse.xml create mode 100644 ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Factions_Federation.xml diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/FederationShellingResponse.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/FederationShellingResponse.xml new file mode 100644 index 0000000000..74dfa7b81c --- /dev/null +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/FederationShellingResponse.xml @@ -0,0 +1,37 @@ + + + + + CE_ShellingPreset_Federation + 0.7 + 0.05 + 1 + +
  • + Bullet_Federation_PlasmaCluster + 250 + 0.75 +
    • +
  • + Bullet_Federation_PlasmaBlast + 100 + 0.10 +
    • +     + +
  • + Settlement + 1 + 0.2 + 0.5 +
    • +
  • + Site + 0.6 + 0.05 + 1 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml index e855311e98..f5735f3bd3 100644 --- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml @@ -62,7 +62,7 @@ - + Bullet_PlasmaTurretBombard @@ -78,9 +78,98 @@ 0 true false - 25 + 30 + 2.5 + 2.5 + 10 + 10 + + 0.10 + 30 + + + + + + Bullet_Federation_PlasmaBlast + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/MFlux + Graphic_Single + TransparentPostLight + + + Plasma + 0 + true + false + 120 + 4 + 5 + + 0.005 + 50 + Things/Projectile/MFlux + + + + + + Bullet_Federation_PlasmaCluster + CombatExtended.ProjectileCE_HeightFuse + + + Things/Projectile/MFlux + Graphic_Single + TransparentPostLight + + + Smoke + Explosion_OpticBurst + 0 + 0.9 + 0 + true + false + 0 2.5 5 + 11 + + 0.005 + 50 + 0.46 + Things/Projectile/MFlux + + + +
  • + + 15 + + -90~-10 +
    • +     +     + + + Bullet_Federation_PlasmaSub + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Plasma + Graphic_Single + TransparentPostLight + + + Plasma + 3 + true + false + 30 + 2.5 + 0.01 @@ -95,8 +184,8 @@ Graphic_Single - 40 - 0.9 + 36 + 1 @@ -117,6 +206,10 @@ false 120 4 + + 0.01 + 45 + diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Factions_Federation.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Factions_Federation.xml new file mode 100644 index 0000000000..f575035487 --- /dev/null +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/Factions_Federation.xml @@ -0,0 +1,17 @@ + + + + + + Defs/FactionDef[defName="FPC"] + +
  • + CE_ShellingPreset_Federation +
    • +
  • + 0.2 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml index 8ca8f74d63..c67f99345f 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Security.xml @@ -4,11 +4,21 @@ Defs/ThingDef[ @Name="FedHarvester" or @Name="Harmonizer" - ]/thingClass + ]/thingClass CombatExtended.Building_TurretGunCE + + + Defs/ThingDef[ + defName="Turret_FedHarvester" or + defName="Turret_PB" + ]/building/turretBurstCooldownTime + + 0.4 + + @@ -20,17 +30,17 @@ 0.80 22.00 18.50 - 1.55 + 0.4 - 1.12 + 0.54 CombatExtended.Verb_ShootCE true Bullet_HarvesterCannon 1.55 - 10 - 10 - 55 + 20 + 13 + 75 RS_ShotCR GunTail_Medium 12 @@ -39,9 +49,13 @@ Mounted + + 65 + 8 + 5 - TRUE + AimedShot @@ -53,15 +67,26 @@
  • -
  • 30
    • -
  • 50
    • -
  • 70
    • -
  • 90
    • +
  • 15
    • +
  • 25
    • +
  • 35
    • +
  • 45
    • +
  • + 1 + 20 +
    • + + + Defs/ThingDef[defName = "Gun_PB"]/statBases + + 0.4 + + Defs/ThingDef[defName = "Gun_PB"]/verbs @@ -73,9 +98,9 @@ true Bullet_PlasmaTurretBombard 3.55 - 500 + 900 25 - 10 + 1 RS_ShotHarmonizer GunTail_Heavy 26 @@ -95,6 +120,7 @@
  • Artillery
  • TurretGun
    • +
  • Artillery_BaseDestroyer
    •      From b7881f7f0548ade68f3067438a8911858ab61f8a Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Sun, 25 Aug 2024 17:24:55 -0400 Subject: [PATCH 7/7] Some fixes --- .../Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml | 5 ++--- .../Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml | 6 +----- .../ThingDefs_Misc/Fed_RangedWeapons.xml | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml index f5735f3bd3..6525dfd33d 100644 --- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml @@ -127,8 +127,6 @@ Smoke Explosion_OpticBurst - 0 - 0.9 0 true false @@ -433,7 +431,7 @@ - Bullet_CrucibleCarbine + Bullet_CrucibleCarbine_CE Things/Projectile/Mlaser @@ -443,4 +441,5 @@ 10 + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml index 1f10c1069e..c15a5096bb 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml @@ -66,10 +66,6 @@ 5 AimedShot - - - 52 - 9.2 - + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml index c28c9a1116..b36f63f8a7 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml @@ -544,7 +544,7 @@ 0.69 CombatExtended.Verb_ShootCE true - Bullet_CrucibleCarbine + Bullet_CrucibleCarbine_CE 1.07 5 22