From 39dca5442426b35239d2d26aa46e3f9cfbcd8736 Mon Sep 17 00:00:00 2001 From: leukill Date: Mon, 6 Nov 2023 19:48:44 -0300 Subject: [PATCH 1/5] Det's Energy Weapons patch --- .../EnergyBoltAmmoSet.XML | 110 +++++++ Patches/Det's Energy Weapons/Guns_Defs.XML | 287 ++++++++++++++++++ 2 files changed, 397 insertions(+) create mode 100644 Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML create mode 100644 Patches/Det's Energy Weapons/Guns_Defs.XML diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML new file mode 100644 index 0000000000..104b1d7f9d --- /dev/null +++ b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML @@ -0,0 +1,110 @@ + + + + +
  • Det's Energy Weapons
    • +     + + Defs + + + + AmmoEnergyBolt + + AmmoRifles + UI/Icons/ThingCategories/CaliberRifle + + + + + + AmmoSet_EnergyBolt + + + Bullet_EnergyBolt + + AmmoSet_Rifle + + + + + + EnergyBoltBase. + + 0.02 + 0.02 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • EnergyBolt
    • +     +     + + + Ammo_EnergyBolt + + + Things/Ammo/LaserPack + Graphic_StackCount + + + 0.11 + + FullMetalJacket + Bullet_762x51mmNATO_FMJ + + + + + + Things/Projectile/Bullet_Small + Graphic_Single + + + Bullet + 156 + true + + + + Bullet_EnergyBolt + + + 20 + 7 + 66.72 + + + + + MakeAmmo_EnergyBolt + + Craft 500 Energy Bolt cartridges. + Making Energy Bolt cartridges. + +
  • + + +
  • Steel
    • + + + 26 + +     + + +
  • Steel
    • +     +     + + 500 + + 2600 +     +     +     +     +     \ No newline at end of file diff --git a/Patches/Det's Energy Weapons/Guns_Defs.XML b/Patches/Det's Energy Weapons/Guns_Defs.XML new file mode 100644 index 0000000000..dd7d7c44c4 --- /dev/null +++ b/Patches/Det's Energy Weapons/Guns_Defs.XML @@ -0,0 +1,287 @@ + + + + + +
  • Det's Energy Weapons
    • +     + + + +
  • + Energy_Rifle + + 4.0 + 9.0 + 1.30 + 0.07 + 1.10 + 1.3 + + + 2.09 + CombatExtended.Verb_ShootCE + True + EnergyBolt + 1.2 + 35 + 3 + 12 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 15 + 4 + AmmoSet_EnergyBolt + + + AimedShot + True + 3 + +
    • + +
  • + Energy_Gattler + + 7 + 15.0 + 2.0 + 0.3 + 1.10 + 3 + + + 2.09 + CombatExtended.Verb_ShootCE + True + EnergyBolt + 2 + 32 + 20 + 7 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 60 + 6 + AmmoSet_EnergyBolt + + + AimedShot + True + 20 + +
    • + +
  • + Energy_Revolver + + 2 + 3.0 + 1.0 + 0.1 + 1.10 + 0.5 + + + 0 + CombatExtended.Verb_ShootCE + True + EnergyBolt + 0.6 + 14 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 9 + 1.50 + AmmoSet_EnergyBolt + + + AimedShot + FALSE + +
    • + +
  • + Energy_PrecisionRifle + + 10 + 13.0 + 1.70 + 0.04 + 2.10 + 0.50 + + + 0 + CombatExtended.Verb_ShootCE + True + EnergyBolt + 1.4 + 70 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 12 + 3 + AmmoSet_EnergyBolt + + + AimedShot + FALSE + +
    • + + + +
  • + Defs/ThingDef[defName = "Energy_Rifle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Gattler"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Revolver"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + + + + + +
  • + Defs/ThingDef[defName = "Energy_PrecisionRifle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + + +     +     +     +     \ No newline at end of file From 165821731959ed5079e50f91d76427ab7c167a86 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 13 Nov 2023 00:28:58 -0500 Subject: [PATCH 2/5] Add to mod list --- SupportedThirdPartyMods.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 4cd5c53bf2..10b299d3a7 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -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 | From edfdad962519644f38997c42638d2765f5cfa329 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 13 Nov 2023 00:29:21 -0500 Subject: [PATCH 3/5] Consoldate ammo item --- Defs/Ammo/Advanced/LaserChargePack.xml | 2 +- .../AmmoCategories_Advanced.xml | 6 + .../EnergyBoltAmmoSet.XML | 130 +++++------------- 3 files changed, 41 insertions(+), 97 deletions(-) diff --git a/Defs/Ammo/Advanced/LaserChargePack.xml b/Defs/Ammo/Advanced/LaserChargePack.xml index 528f89b0d7..6440bc8093 100644 --- a/Defs/Ammo/Advanced/LaserChargePack.xml +++ b/Defs/Ammo/Advanced/LaserChargePack.xml @@ -39,7 +39,7 @@ 0.69 - Charged + Laser diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml index 4368ec77cd..0d4431e327 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml @@ -21,6 +21,12 @@ Designed to combat mechanoids, the round creates an electrical current on impact, disrupting electronic systems temporarily. + + Laser + + A concentrated beam or bolt of radiation, imparting disruptive energy into the target. + + IncendiaryFuel diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML index 104b1d7f9d..7940b26b52 100644 --- a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML +++ b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML @@ -7,103 +7,41 @@ Defs + + - - AmmoEnergyBolt - - AmmoRifles - UI/Icons/ThingCategories/CaliberRifle - - - - - - AmmoSet_EnergyBolt - - - Bullet_EnergyBolt - - AmmoSet_Rifle - - - - - - EnergyBoltBase. - - 0.02 - 0.02 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting
    • -     - -
  • EnergyBolt
    • -     -     - - - Ammo_EnergyBolt - - - Things/Ammo/LaserPack - Graphic_StackCount - - - 0.11 - - FullMetalJacket - Bullet_762x51mmNATO_FMJ - - - - - - Things/Projectile/Bullet_Small - Graphic_Single - - - Bullet - 156 - true - - - - Bullet_EnergyBolt - - - 20 - 7 - 66.72 - - - - - MakeAmmo_EnergyBolt - - Craft 500 Energy Bolt cartridges. - Making Energy Bolt cartridges. - -
  • - - -
  • Steel
    • - - - 26 - -     - - -
  • Steel
    • -     -     - - 500 - - 2600 -     + + AmmoSet_EnergyBolt + + + Bullet_EnergyBolt + + AmmoSet_Rifle + + + + + + Things/Projectile/Bullet_Small + Graphic_Single + + + Bullet + 156 + true + + + + + Bullet_EnergyBolt + + + 20 + 7 + 66.72 + + +     From dc55ee647369d693a5ac0642ecdaa43ddab4406c Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 13 Nov 2023 01:46:17 -0500 Subject: [PATCH 4/5] Ammo and balance pass --- .../EnergyBoltAmmoSet.XML | 55 +- Patches/Det's Energy Weapons/Guns_Defs.XML | 502 ++++++++---------- 2 files changed, 275 insertions(+), 282 deletions(-) diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML index 7940b26b52..2d52c3ba13 100644 --- a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML +++ b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML @@ -9,36 +9,69 @@ - + + + AmmoSet_LaserBoltPistol + + + Bullet_Bolt_LaserPistol + + + + + AmmoSet_LaserBoltRifle + + + Bullet_Bolt_LaserRifle + + + - AmmoSet_EnergyBolt - + AmmoSet_LaserBoltSniperRifle + - Bullet_EnergyBolt + Bullet_Bolt_LaserSniperRifle - AmmoSet_Rifle + - Things/Projectile/Bullet_Small + Things/EnergyBolt Graphic_Single Bullet 156 - true + false + + + + + Bullet_Bolt_LaserPistol + + 10 + 17.5 + 4 + + + + + Bullet_Bolt_LaserRifle + + 18 + 17.5 + 4 - Bullet_EnergyBolt - + Bullet_Bolt_LaserSniperRifle 20 - 7 - 66.72 + 20.25 + 4 diff --git a/Patches/Det's Energy Weapons/Guns_Defs.XML b/Patches/Det's Energy Weapons/Guns_Defs.XML index dd7d7c44c4..0ed150cbbc 100644 --- a/Patches/Det's Energy Weapons/Guns_Defs.XML +++ b/Patches/Det's Energy Weapons/Guns_Defs.XML @@ -8,279 +8,239 @@ -
  • - Energy_Rifle - - 4.0 - 9.0 - 1.30 - 0.07 - 1.10 - 1.3 - - - 2.09 - CombatExtended.Verb_ShootCE - True - EnergyBolt - 1.2 - 35 - 3 - 12 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 15 - 4 - AmmoSet_EnergyBolt - - - AimedShot - True - 3 - -
    • - -
  • - Energy_Gattler - - 7 - 15.0 - 2.0 - 0.3 - 1.10 - 3 - - - 2.09 - CombatExtended.Verb_ShootCE - True - EnergyBolt - 2 - 32 - 20 - 7 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 60 - 6 - AmmoSet_EnergyBolt - - - AimedShot - True - 20 - -
    • - -
  • - Energy_Revolver - - 2 - 3.0 - 1.0 - 0.1 - 1.10 - 0.5 - - - 0 - CombatExtended.Verb_ShootCE - True - EnergyBolt - 0.6 - 14 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 9 - 1.50 - AmmoSet_EnergyBolt - - - AimedShot - FALSE - -
    • - -
  • - Energy_PrecisionRifle - - 10 - 13.0 - 1.70 - 0.04 - 2.10 - 0.50 - - - 0 - CombatExtended.Verb_ShootCE - True - EnergyBolt - 1.4 - 70 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 12 - 3 - AmmoSet_EnergyBolt - - - AimedShot - FALSE - -
    • - - - -
  • - Defs/ThingDef[defName = "Energy_Rifle"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - -     - - -
  • - Defs/ThingDef[defName = "Energy_Gattler"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - - - - -
  • - Defs/ThingDef[defName = "Energy_Revolver"]/tools - - -
  • - - + +
  • + Energy_Rifle + + 6 + 9 + 1.30 + 0.07 + 1.10 + 1.3 + + + 1.24 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserRifle + 1.2 + 52 + 3 + 12 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 20 + 4 + AmmoSet_LaserBoltRifle + + + AimedShot + True + 3 + +
    • + +
  • + Energy_Gattler + + 10 + 15.0 + 2.0 + 0.3 + 1.10 + 3 + + + 2.09 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserRifle + 2 + 48 + 20 + 7 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 80 + 6 + AmmoSet_LaserBoltRifle + + + AimedShot + True + 10 + +
    • + +
  • + Energy_Revolver + + 1.8 + 3.0 + 1.0 + 0.1 + 1.10 + 0.5 + + + 1.6 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserPistol + 0.6 + 12 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 9 + 3.50 + AmmoSet_LaserBoltPistol + + + AimedShot + FALSE + +
    • + +
  • + Energy_PrecisionRifle + + 8 + 13.0 + 1.70 + 0.04 + 2.10 + 0.50 + + + 1.4 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserSniperRifle + 1.4 + 70 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 12 + 4 + AmmoSet_LaserBoltSniperRifle + + + AimedShot + FALSE + +
    • + + +
  • + Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/tools + + +
  • + +
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - - - - - -
  • - Defs/ThingDef[defName = "Energy_PrecisionRifle"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Gattler"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Revolver"]/tools + +
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - - - - - + + +
  • Blunt
    • +     + 2 + 1.54 + 1.5 + 0.555 + Grip + + + + + From 0c7e484e09ca7d94f16fc6c575283652b17e6798 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 13 Nov 2023 18:45:54 -0500 Subject: [PATCH 5/5] Fix Energy damageDef to go through armor --- Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML | 6 +++--- Patches/Det's Energy Weapons/Guns_Defs.XML | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML index 2d52c3ba13..4676cb10a3 100644 --- a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML +++ b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML @@ -53,7 +53,7 @@ 10 17.5 - 4 + 1 @@ -62,7 +62,7 @@ 18 17.5 - 4 + 1 @@ -71,7 +71,7 @@ 20 20.25 - 4 + 1 diff --git a/Patches/Det's Energy Weapons/Guns_Defs.XML b/Patches/Det's Energy Weapons/Guns_Defs.XML index 0ed150cbbc..a3dd908bb3 100644 --- a/Patches/Det's Energy Weapons/Guns_Defs.XML +++ b/Patches/Det's Energy Weapons/Guns_Defs.XML @@ -8,6 +8,13 @@ + +
  • + Defs/DamageDef[defName="EnergyDamage"] + ParentName + Flame +
    • +
  • Energy_Rifle