From 7e348ab18495f0e8ac15a9b46b9e817906df56e5 Mon Sep 17 00:00:00 2001 From: Killian Date: Fri, 23 May 2025 14:26:14 +0100 Subject: [PATCH 01/10] outer rim blaster charge mode POC --- .../Outer_Rim_Core_Ranged_Weapons.xml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml index bc2d392096..5d145c9457 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml @@ -278,6 +278,39 @@ + + Defs/ThingDef[defName="OuterRim_K16BryarBlaster"]/comps + +
  • + switch to standard mode + switch to overcharged shots + True + + 24 + 4 + AmmoSet_PlasmaGasCartridgeYellow_Sniper + + + 3.0 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterSniper_Yellow + 2 + 16 + OuterRim_Shot_DLT19DBlasterBolt + GunTail_Medium + 9 + 6 + + + FALSE + Snapshot + 1 + +
    • +     +     + OuterRim_IonRifle From 1bb1baa678b9be8c203eab630bf0a9243e89781d Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 25 May 2025 00:06:04 +0100 Subject: [PATCH 02/10] outer rim: ammo and charric weapon changes --- .../Defs/Outer_Rim_Chiss_Ammo.xml | 93 +++++++++++++++++++ ...er_Rim_Chiss_Ascendancy_Ranged_Weapons.xml | 26 +++--- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 62 ++++++------- 3 files changed, 137 insertions(+), 44 deletions(-) create mode 100644 ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml new file mode 100644 index 0000000000..d76e3bf79e --- /dev/null +++ b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml @@ -0,0 +1,93 @@ + + + + + + + (3,252,169) + + + + + Bullet_ChissMaser_Pistol + + + CE_Laser + 12 + 8 + 0.001 + +
  • + EMP + 3 +
    • +     + 0.2 +     +     + + + Bullet_ChissMaser_Carbine + + + CE_Laser + 18 + 14 + 0.001 + +
  • + EMP + 6 +
    • +     + 0.5 +     + 45 + 1.25 +     + + + Bullet_ChissMaser_Rifle + + + CE_Laser + 24 + 20 + 0.001 + +
  • + EMP + 9 +
    • +     + 0.8 +     + 60 + 1.5 +     + + + AmmoSet_ChissMaser_Pistol + + + Bullet_ChissMaser_Pistol + + + + + AmmoSet_ChissMaser_Rifle + + + Bullet_ChissMaser_Carbine + + + + + AmmoSet_ChissMaser_Sniper + + + Bullet_ChissMaser_Rifle + + + +     \ No newline at end of file diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml index 69609b144d..9cd57ea6b0 100644 --- a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml @@ -15,9 +15,9 @@ 3.0 CombatExtended.Verb_ShootCE true - Bullet_BlasterPistol_Yellow + Bullet_ChissMaser_Pistol 2 - 5 + 6 0.5 12 OuterRim_Shot_MaserBlasterBolt @@ -36,9 +36,9 @@
  • CE_OneHandedWeapon
    • - 24 + 21 3.7 - AmmoSet_PlasmaGasCartridgeYellow_Pistol + AmmoSet_ChissMaser_Pistol     @@ -56,10 +56,10 @@ 1.2 CombatExtended.Verb_ShootCE true - Bullet_BlasterRifle_Yellow + Bullet_ChissMaser_Carbine 0.75 35 - 4 + 7 2 OuterRim_Shot_MaserBlasterBolt GunTail_Medium @@ -73,9 +73,9 @@ AimedShot - 70 + 60 3.84 - AmmoSet_PlasmaGasCartridgeYellow_Rifle + AmmoSet_ChissMaser_Rifle @@ -93,15 +93,15 @@ 1.48 CombatExtended.Verb_ShootCE true - Bullet_BlasterRifle_Yellow + Bullet_ChissMaser_Rifle 2.0 62 - 4 + 8 2 OuterRim_Shot_MaserBlasterBolt GunTail_Medium 9 - 2 + 3 true @@ -110,9 +110,9 @@ AimedShot - 40 + 36 3.2 - AmmoSet_PlasmaGasCartridgeYellow_Rifle + AmmoSet_ChissMaser_Rifle diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index 56344fcda8..23a7d76d13 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -12,7 +12,7 @@ AmmoSet_PlasmaGasCartridgeRed_Pistol - + Bullet_BlasterPistol_Red Bullet_BlasterPistol_RedAP @@ -23,7 +23,7 @@ AmmoSet_PlasmaGasCartridgeRed_Rifle - + Bullet_BlasterRifle_Red Bullet_BlasterRifle_RedAP @@ -34,7 +34,7 @@ AmmoSet_PlasmaGasCartridgeRed_Sniper - + Bullet_BlasterSniper_Red Bullet_BlasterSniper_RedAP @@ -45,7 +45,7 @@ AmmoSet_PlasmaGasCartridgeGreen_Pistol - + Bullet_BlasterPistol_Green Bullet_BlasterPistol_GreenAP @@ -56,7 +56,7 @@ AmmoSet_PlasmaGasCartridgeGreen_Rifle - + Bullet_BlasterRifle_Green Bullet_BlasterRifle_GreenAP @@ -67,7 +67,7 @@ AmmoSet_PlasmaGasCartridgeGreen_Sniper - + Bullet_BlasterSniper_Green Bullet_BlasterSniper_GreenAP @@ -78,7 +78,7 @@ AmmoSet_PlasmaGasCartridgeBlue_Pistol - + Bullet_BlasterPistol_Blue Bullet_BlasterPistol_BlueAP @@ -89,7 +89,7 @@ AmmoSet_PlasmaGasCartridgeBlue_Rifle - + Bullet_BlasterRifle_Blue Bullet_BlasterRifle_BlueAP @@ -100,7 +100,7 @@ AmmoSet_PlasmaGasCartridgeBlue_Sniper - + Bullet_BlasterSniper_Blue Bullet_BlasterSniper_BlueAP @@ -111,7 +111,7 @@ AmmoSet_PlasmaGasCartridgeYellow_Pistol - + Bullet_BlasterPistol_Yellow Bullet_BlasterPistol_YellowAP @@ -122,7 +122,7 @@ AmmoSet_PlasmaGasCartridgeYellow_Rifle - + Bullet_BlasterRifle_Yellow Bullet_BlasterRifle_YellowAP @@ -133,7 +133,7 @@ AmmoSet_PlasmaGasCartridgeYellow_Sniper - + Bullet_BlasterSniper_Yellow Bullet_BlasterSniper_YellowAP @@ -144,7 +144,7 @@ AmmoSet_PlasmaGasCartridge_Scatter - + Bullet_BlasterBolt_Scatter @@ -152,7 +152,7 @@ AmmoSet_PlasmaGasCartridge_DualShot - + Bullet_BlasterBolt_DualShot Bullet_BlasterBolt_DualShotAP @@ -163,7 +163,7 @@ AmmoSet_PlasmaGasCartridgeIon_Pistol - + Bullet_BlasterPistol_Ion @@ -171,7 +171,7 @@ AmmoSet_PlasmaGasCartridgeIon_Rifle - + Bullet_BlasterRifle_Ion @@ -179,7 +179,7 @@ AmmoSet_PlasmaGasCartridgeIon_Sniper - + Bullet_BlasterSniper_Ion @@ -215,8 +215,8 @@ Ammo_PlasmaGasCartridge_AP - Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively. - + Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively, at the cost of slightly reduced lethality. + Things/Ammo/Charged/MediumConc Graphic_StackCount @@ -228,8 +228,8 @@ Ammo_PlasmaGasCartridge_Ion - Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets. - + Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets at the cost of reduced effectiveness against organics. + Things/Ammo/Charged/MediumIon Graphic_StackCount @@ -241,8 +241,8 @@ Ammo_PlasmaGasCartridge_Stun - Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal pulse that can disable organics, but is highly ineffective against mechanical targets. - + Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal 'wave' that can swiftly disable organics, but is highly ineffective against mechanical targets. + Things/Ammo/Charged/MediumTox Graphic_StackCount @@ -874,7 +874,7 @@ - A powerful rocket first used in the Galactic Republic's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike. + A powerful rocket first used in the Blue's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike. 150 @@ -1113,9 +1113,9 @@ MakeAmmo_PlasmaGasCartridge_AP - - Craft 500 Plasma Gas Cartridges (AP). - Making Plasma Gas Cartridges (AP). + + Craft 500 Blaster Bolts (AP). + Making Blaster Bolts (AP).
  • @@ -1160,9 +1160,9 @@ MakeAmmo_PlasmaGasCartridge_Ion - + Craft 500 PlasmaGas Cartridges (Ion). - Making Plasma Gas Cartridges (Ion). + Making Blaster Bolts (Ion).
  • @@ -1207,9 +1207,9 @@ MakeAmmo_PlasmaGasCartridge_Stun - + Craft 500 PlasmaGas Cartridges (Stun). - Making Plasma Gas Cartridges (Stun). + Making Blaster Bolts (Stun).
  • From c7d18082bc84cee2e9d4cff31473b86528132789 Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 25 May 2025 02:40:16 +0100 Subject: [PATCH 03/10] outer rim: stun mode refactor --- .../Defs/Outer_Rim_Chiss_Ammo.xml | 12 +- ...er_Rim_Chiss_Ascendancy_Ranged_Weapons.xml | 2 +- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 145 ++++++++---------- ...ter_Rim_Galactic_Empire_Ranged_Weapons.xml | 62 ++++++++ 4 files changed, 129 insertions(+), 92 deletions(-) diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml index d76e3bf79e..6dc6ace112 100644 --- a/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml +++ b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml @@ -42,8 +42,8 @@ 0.5 - 45 - 1.25 + 40 + 1.2 @@ -62,8 +62,8 @@ 0.8 - 60 - 1.5 + 50 + 1.4 @@ -75,7 +75,7 @@ - AmmoSet_ChissMaser_Rifle + AmmoSet_ChissMaser_Carbine Bullet_ChissMaser_Carbine @@ -83,7 +83,7 @@ - AmmoSet_ChissMaser_Sniper + AmmoSet_ChissMaser_Rifle Bullet_ChissMaser_Rifle diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml index 9cd57ea6b0..6231d4091f 100644 --- a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml @@ -75,7 +75,7 @@ 60 3.84 - AmmoSet_ChissMaser_Rifle + AmmoSet_ChissMaser_Carbine diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index 23a7d76d13..1436b92829 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -17,7 +17,6 @@ Bullet_BlasterPistol_Red Bullet_BlasterPistol_RedAP Bullet_BlasterPistol_Ion - Bullet_BlasterPistol_Stun @@ -28,7 +27,6 @@ Bullet_BlasterRifle_Red Bullet_BlasterRifle_RedAP Bullet_BlasterRifle_Ion - Bullet_BlasterRifle_Stun @@ -39,7 +37,6 @@ Bullet_BlasterSniper_Red Bullet_BlasterSniper_RedAP Bullet_BlasterSniper_Ion - Bullet_BlasterSniper_Stun @@ -50,7 +47,6 @@ Bullet_BlasterPistol_Green Bullet_BlasterPistol_GreenAP Bullet_BlasterPistol_Ion - Bullet_BlasterPistol_Stun @@ -61,7 +57,6 @@ Bullet_BlasterRifle_Green Bullet_BlasterRifle_GreenAP Bullet_BlasterRifle_Ion - Bullet_BlasterRifle_Stun @@ -72,7 +67,6 @@ Bullet_BlasterSniper_Green Bullet_BlasterSniper_GreenAP Bullet_BlasterSniper_Ion - Bullet_BlasterSniper_Stun @@ -83,7 +77,6 @@ Bullet_BlasterPistol_Blue Bullet_BlasterPistol_BlueAP Bullet_BlasterPistol_Ion - Bullet_BlasterPistol_Stun @@ -94,7 +87,6 @@ Bullet_BlasterRifle_Blue Bullet_BlasterRifle_BlueAP Bullet_BlasterRifle_Ion - Bullet_BlasterRifle_Stun @@ -105,7 +97,6 @@ Bullet_BlasterSniper_Blue Bullet_BlasterSniper_BlueAP Bullet_BlasterSniper_Ion - Bullet_BlasterSniper_Stun @@ -116,7 +107,6 @@ Bullet_BlasterPistol_Yellow Bullet_BlasterPistol_YellowAP Bullet_BlasterPistol_Ion - Bullet_BlasterPistol_Stun @@ -127,7 +117,6 @@ Bullet_BlasterRifle_Yellow Bullet_BlasterRifle_YellowAP Bullet_BlasterRifle_Ion - Bullet_BlasterRifle_Stun @@ -138,7 +127,6 @@ Bullet_BlasterSniper_Yellow Bullet_BlasterSniper_YellowAP Bullet_BlasterSniper_Ion - Bullet_BlasterSniper_Stun @@ -157,7 +145,6 @@ Bullet_BlasterBolt_DualShot Bullet_BlasterBolt_DualShotAP Bullet_BlasterBolt_DualShotIon - Bullet_BlasterBolt_DualShotStun @@ -185,6 +172,46 @@ + + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + Bullet_BlasterPistol_Stun + Bullet_BlasterPistol_Stun + Bullet_BlasterPistol_Stun + + + + + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + Bullet_BlasterRifle_Stun + Bullet_BlasterRifle_Stun + Bullet_BlasterRifle_Stun + + + + + AmmoSet_PlasmaGasCartridgeStun_Sniper + + + Bullet_BlasterSniper_Stun + Bullet_BlasterSniper_Stun + Bullet_BlasterSniper_Stun + + + + + AmmoSet_TL50ConcussionBlast + + + Bullet_TL50_ConcussionBlast + Bullet_TL50_ConcussionBlast + Bullet_TL50_ConcussionBlast + + + @@ -239,19 +266,6 @@ Bullet_BlasterPistol_Ion - - Ammo_PlasmaGasCartridge_Stun - Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal 'wave' that can swiftly disable organics, but is highly ineffective against mechanical targets. - - - Things/Ammo/Charged/MediumTox - Graphic_StackCount - - BlasterStun - 0 - Bullet_BlasterPistol_Stun - - @@ -624,7 +638,7 @@ Neuralizer 1 - 80 + 20 @@ -638,7 +652,7 @@ Neuralizer 1 - 90 + 25 @@ -651,8 +665,8 @@ Neuralizer - 1 - 100 + 2 + 30 @@ -725,20 +739,28 @@ - - Bullet_BlasterBolt_DualShotStun + + Bullet_TL50_ConcussionBlast - OuterRim/Projectile/Proj_StunPulse + OuterRim/Projectile/ProtonBall Graphic_Single TransparentPostLight - Neuralizer - 1 - 90 - 2 - 4 + 25 + 20 + 6 + 36 + +
  • + 31 + Bomb + 2.5 + Explosion_EMP + true +
    • +     @@ -1205,51 +1227,4 @@ OuterRim_HypertechFabrication - - MakeAmmo_PlasmaGasCartridge_Stun - - Craft 500 PlasmaGas Cartridges (Stun). - Making Blaster Bolts (Stun). - -
  • - - -
  • OuterRim_Durasteel
    • - - - 30 - -
  • - - -
  • OuterRim_Tibanna
    • - - - 60 - -
  • - - -
  • OuterRim_ComponentHypertech
    • - - - 3 - -     - - -
  • OuterRim_Durasteel
    • -
  • OuterRim_Tibanna
    • -
  • OuterRim_ComponentHypertech
    • -     -     - -
  • OuterRim_HypertechFabricator
    • -     - - 500 - - OuterRim_HypertechFabrication -     - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml index b85a58bcfc..8134dfebc5 100644 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml @@ -190,6 +190,37 @@ + + Defs/ThingDef[defName="OuterRim_E11BlasterRifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 3.7 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.25 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_E11DBlasterRifle @@ -391,6 +422,37 @@ AmmoSet_PlasmaGasCartridgeRed_Rifle + + + Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/comps + +
  • + switch to standard mode + switch to concussion blast mode + True + + 400 + 9.5 + AmmoSet_TL50ConcussionBlast + + + 7.0 + CombatExtended.Verb_ShootCE + true + Bullet_TL50_ConcussionBlast + 5 + 32 + OuterRim_Turret_ProtonTorpedo + GunTail_Heavy + 15 + 100 + + + AimedShot + +
    • +     +     From 9cc862a8f042d0d4413923856e05003e435565a2 Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 25 May 2025 04:40:19 +0100 Subject: [PATCH 04/10] outer rim: stun mode addon --- Defs/DamageDefs/Damages_LocalInjury.xml | 4 +- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 27 +- .../Outer_Rim_Core_Ranged_Weapons.xml | 33 ++- ...ter_Rim_Galactic_Empire_Ranged_Weapons.xml | 31 ++ ...r_Rim_Galactic_Republic_Ranged_Weapons.xml | 94 ++++++ .../Outer_Rim_Mandalorian_Ranged_Weapons.xml | 274 ++++++++++++++++++ .../Outer_Rim_Old_Republic_Ranged_Weapons.xml | 62 ++++ .../Outer_Rim_Rebel_Ranged_Weapons.xml | 97 ++++++- .../Outer_Rim_Seperatist_Ranged_Weapons.xml | 31 ++ 9 files changed, 647 insertions(+), 6 deletions(-) diff --git a/Defs/DamageDefs/Damages_LocalInjury.xml b/Defs/DamageDefs/Damages_LocalInjury.xml index 3fa0ebd4e6..6a639875df 100644 --- a/Defs/DamageDefs/Damages_LocalInjury.xml +++ b/Defs/DamageDefs/Damages_LocalInjury.xml @@ -135,8 +135,8 @@ false
  • - Neuralizer - 0.9 + Anesthetic + 0.15 true
    • diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index 1436b92829..f3129a52b1 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -212,6 +212,16 @@     + + AmmoSet_AmbanDisintegrator + + + Bullet_AmbanDisintegrator + Bullet_AmbanDisintegrator + Bullet_AmbanDisintegrator + + + @@ -651,7 +661,7 @@ Neuralizer - 1 + 1.5 25 @@ -763,6 +773,21 @@ + + Bullet_AmbanDisintegrator + + OuterRim/Projectile/BlasterBolt_Yellow + Graphic_Single + TransparentPostLight + + + Vaporize + 100 + 60 + 6 + + + diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml index 5d145c9457..f5a0deaa06 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml @@ -113,7 +113,7 @@ Defs/ThingDef[defName="OuterRim_BARMST12Scattergun"]/description - The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of concentrated or ionized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so. + The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of specialized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so. @@ -486,6 +486,37 @@ + + Defs/ThingDef[defName="OuterRim_BlasterCarbine"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 42 + 3.36 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_T21RepeatingBlaster diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml index 8134dfebc5..c56c3b67da 100644 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml @@ -259,6 +259,37 @@ + + Defs/ThingDef[defName="OuterRim_E11DBlasterRifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 3.7 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.44 + 23 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_E22BlasterRifle diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml index d0a9f64d85..b5d99d485e 100644 --- a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml @@ -78,6 +78,38 @@ + + Defs/ThingDef[defName="OuterRim_DC17mCarbine"]/comps + +
  • + switch to standard mode + switch to grenade launcher + + 1 + 2.2 + AmmoSet_40x46mmGrenade + + + 3.28 + CombatExtended.Verb_ShootCE + true + Bullet_40x46mmGrenade_HEDP + 1.1 + 44 + 5 + + true + + InfernoCannon_Fire + 14 + + + AimedShot + +
    • +     +     + OuterRim_DC15ACarbine @@ -115,6 +147,37 @@ + + Defs/ThingDef[defName="OuterRim_DC15ACarbine"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 42 + 3.36 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_DC15ARifle @@ -153,6 +216,37 @@ + + Defs/ThingDef[defName="OuterRim_DC15ARifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 160 + 7.5 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.16 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 2 + 28 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_DC15xSniperRifle diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml index 7257d59450..f5db96a314 100644 --- a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml @@ -39,6 +39,36 @@
  • CE_OneHandedWeapon
    •  + + + Defs/ThingDef[defName="OuterRim_WESTAR35Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 24 + 3.84 + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + 3 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterPistol_Stun + 1 + 12 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + + + AimedShot + +
    • +     +     OuterRim_WESTAR34Blaster @@ -78,6 +108,36 @@
  • CE_OneHandedWeapon
    •  + + + Defs/ThingDef[defName="OuterRim_WESTAR34Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 24 + 3.84 + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + 3 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterPistol_Stun + 1 + 12 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + + + AimedShot + +
    • +     +     OuterRim_WESTAR18Blaster @@ -117,6 +177,36 @@
  • CE_OneHandedWeapon
    •  + + + Defs/ThingDef[defName="OuterRim_WESTAR18Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 24 + 3.84 + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + 3 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterPistol_Stun + 1 + 12 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + + + AimedShot + +
    • +     +     OuterRim_IB94BlasterPistol @@ -156,6 +246,36 @@
  • CE_OneHandedWeapon
    •  + + + Defs/ThingDef[defName="OuterRim_IB94BlasterPistol"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 24 + 3.84 + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + 3 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterPistol_Stun + 1 + 12 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + + + AimedShot + +
    • +     +     OuterRim_EE13BlasterPistol @@ -193,6 +313,36 @@
  • SpacerGun
    •  + + + Defs/ThingDef[defName="OuterRim_EE13BlasterPistol"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 42 + 3.36 + AmmoSet_PlasmaGasCartridgeStun_Pistol + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterPistol_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + + + AimedShot + +
    • +     +     OuterRim_GALAAR15Blaster @@ -235,6 +385,37 @@
  • SpacerGun
    •  + + + Defs/ThingDef[defName="OuterRim_GALAAR15Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 5.6 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     OuterRim_EE13SniperRifle @@ -317,6 +498,37 @@
  • SpacerGun
    •  + + + Defs/ThingDef[defName="OuterRim_EE13BlasterRifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 120 + 4 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.45 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 2 + 28 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     OuterRim_EE3BlasterCarbine @@ -359,6 +571,37 @@
  • SpacerGun
    •  + + + Defs/ThingDef[defName="OuterRim_EE3BlasterCarbine"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 84 + 4 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     OuterRim_AmbanSniperRifle @@ -400,4 +643,35 @@ + + Defs/ThingDef[defName="OuterRim_AmbanSniperRifle"]/comps + +
  • + switch to standard mode + switch to disintegrate mode + True + + 3 + 4.5 + AmmoSet_AmbanDisintegrator + + + 12 + CombatExtended.Verb_ShootCE + true + Bullet_AmbanDisintegrator + 3.2 + 21 + OuterRim_Shot_DisintigratorBolt + GunTail_Heavy + 15 + 3 + + + AimedShot + +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml index 8c410dce54..a253cfffe5 100644 --- a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml @@ -117,6 +117,37 @@ + + Defs/ThingDef[defName="OuterRim_OldRepublicRifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 100 + 3.7 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1 + 28 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_SithRifle @@ -155,6 +186,37 @@ + + Defs/ThingDef[defName="OuterRim_SithRifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 100 + 3.7 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1 + 28 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_OldRepublicSniper diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml index b06f2b42ae..2394cc3ab5 100644 --- a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml @@ -99,6 +99,37 @@ + + Defs/ThingDef[defName="OuterRim_DH17Pistol"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 5.6 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + Defs/ThingDef[defName="OuterRim_DH17Rifle"]/description @@ -141,6 +172,37 @@ + + Defs/ThingDef[defName="OuterRim_DH17Rifle"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 40 + 3.2 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.48 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 4 + 31 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     + OuterRim_A280Blaster @@ -161,7 +223,7 @@ OuterRim_Shot_E11BlasterBolt GunTail_Medium 9 - 3 + 2 true @@ -170,11 +232,42 @@ AimedShot - 20 + 70 1.6 AmmoSet_PlasmaGasCartridgeGreen_Rifle + + + Defs/ThingDef[defName="OuterRim_A280Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 1.6 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 2 + 28 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml index 6ad1a53e37..7f4ef105e4 100644 --- a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml @@ -77,6 +77,37 @@ AmmoSet_PlasmaGasCartridgeRed_Rifle + + + Defs/ThingDef[defName="OuterRim_E5Blaster"]/comps + +
  • + switch to standard mode + switch to stun mode + True + + 70 + 5.6 + AmmoSet_PlasmaGasCartridgeStun_Rifle + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Stun + 1.5 + 22 + OuterRim_Shot_SonicBlasterBolt + GunTail_Medium + 12 + 2 + + + AimedShot + +
    • +     +     OuterRim_E5sSniperRifle From 32793051f83492967f51853f68bfa0695408a017 Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 25 May 2025 22:57:12 +0100 Subject: [PATCH 05/10] outer rim: ion guns and misc adjustments --- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 177 +++++++++--------- .../Outer_Rim_Core_Ranged_Weapons.xml | 12 +- 2 files changed, 95 insertions(+), 94 deletions(-) diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index f3129a52b1..b35f3e4828 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -172,6 +172,30 @@     + + AmmoSet_PlasmaGasCartridgeIonOnly_Pistol + + + Bullet_BlasterPistol_IonOnly + + + + + AmmoSet_PlasmaGasCartridgeIonOnly_Rifle + + + Bullet_BlasterRifle_IonOnly + + + + + AmmoSet_PlasmaGasCartridgeIonOnly_Sniper + + + Bullet_BlasterSniper_IonOnly + + + AmmoSet_PlasmaGasCartridgeStun_Pistol @@ -283,18 +307,18 @@ Things/Projectile/Charged/ChargeShot Graphic_Single + TransparentPostLight + 102 OuterRim_Blaster - 122 false - Things/Projectile/Charged/ChargeShot - Graphic_Single + 0.8 14 @@ -305,8 +329,7 @@ - Things/Projectile/Charged/ChargeShot - Graphic_Single + 0.8 11 @@ -317,10 +340,10 @@ - Things/Projectile/Charged/ChargeShot - Graphic_Single + 1 + 151 18 3 22 @@ -329,10 +352,10 @@ - Things/Projectile/Charged/ChargeShot - Graphic_Single + 1 + 151 12 4 33 @@ -341,11 +364,10 @@ - Things/Projectile/Charged/ChargeShot - Graphic_Single + 1.2 - 175 + 178 30 4 20 @@ -354,11 +376,10 @@ - Things/Projectile/Charged/ChargeShot - Graphic_Single + 1.2 - 175 + 178 20 6 36 @@ -369,8 +390,6 @@ Bullet_BlasterPistol_Red OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -378,8 +397,6 @@ Bullet_BlasterPistol_RedAP OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -387,8 +404,6 @@ Bullet_BlasterRifle_Red OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -396,8 +411,6 @@ Bullet_BlasterRifle_RedAP OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -405,8 +418,6 @@ Bullet_BlasterSniper_Red OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -414,8 +425,6 @@ Bullet_BlasterSniper_RedAP OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight @@ -423,8 +432,6 @@ Bullet_BlasterPistol_Green OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -432,8 +439,6 @@ Bullet_BlasterPistol_GreenAP OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -441,8 +446,6 @@ Bullet_BlasterRifle_Green OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -450,8 +453,6 @@ Bullet_BlasterRifle_GreenAP OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -459,8 +460,6 @@ Bullet_BlasterSniper_Green OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -468,8 +467,6 @@ Bullet_BlasterSniper_GreenAP OuterRim/Projectile/BlasterBolt_Green - Graphic_Single - TransparentPostLight @@ -477,8 +474,6 @@ Bullet_BlasterPistol_Blue OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -486,8 +481,6 @@ Bullet_BlasterPistol_BlueAP OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -495,8 +488,6 @@ Bullet_BlasterRifle_Blue OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -504,8 +495,6 @@ Bullet_BlasterRifle_BlueAP OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -513,8 +502,6 @@ Bullet_BlasterSniper_Blue OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -522,8 +509,6 @@ Bullet_BlasterSniper_BlueAP OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight @@ -531,8 +516,6 @@ Bullet_BlasterPistol_Yellow OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -540,8 +523,6 @@ Bullet_BlasterPistol_YellowAP OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -549,8 +530,6 @@ Bullet_BlasterRifle_Yellow OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -558,8 +537,6 @@ Bullet_BlasterRifle_YellowAP OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -567,8 +544,6 @@ Bullet_BlasterSniper_Yellow OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -576,8 +551,6 @@ Bullet_BlasterSniper_YellowAP OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight @@ -585,8 +558,6 @@ Bullet_BlasterPistol_Ion OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight 4 @@ -604,8 +575,6 @@ Bullet_BlasterRifle_Ion OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight 6 @@ -623,8 +592,6 @@ Bullet_BlasterSniper_Ion OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight 7 @@ -642,8 +609,7 @@ Bullet_BlasterPistol_Stun OuterRim/Projectile/Proj_StunPulse - Graphic_Single - TransparentPostLight + 0.8 Neuralizer @@ -656,8 +622,6 @@ Bullet_BlasterRifle_Stun OuterRim/Projectile/Proj_StunPulse - Graphic_Single - TransparentPostLight Neuralizer @@ -670,8 +634,7 @@ Bullet_BlasterSniper_Stun OuterRim/Projectile/Proj_StunPulse - Graphic_Single - TransparentPostLight + 1.2 Neuralizer @@ -684,8 +647,7 @@ Bullet_BlasterBolt_Scatter OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight + 0.85 8 @@ -700,8 +662,6 @@ Bullet_BlasterBolt_DualShot OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight 18 @@ -716,8 +676,6 @@ Bullet_BlasterBolt_DualShotAP OuterRim/Projectile/BlasterBolt_Red - Graphic_Single - TransparentPostLight 12 @@ -732,8 +690,6 @@ Bullet_BlasterBolt_DualShotIon OuterRim/Projectile/BlasterBolt_Blue - Graphic_Single - TransparentPostLight 7 @@ -753,8 +709,6 @@ Bullet_TL50_ConcussionBlast OuterRim/Projectile/ProtonBall - Graphic_Single - TransparentPostLight 25 @@ -766,7 +720,7 @@
  • 31 Bomb - 2.5 + 3.5 Explosion_EMP true
    • @@ -777,8 +731,7 @@ Bullet_AmbanDisintegrator OuterRim/Projectile/BlasterBolt_Yellow - Graphic_Single - TransparentPostLight + 1.5 Vaporize @@ -788,6 +741,54 @@ + + Bullet_BlasterPistol_IonOnly + + OuterRim/Projectile/ProtonBall + 0.2 + + + 15 + EMP + 1 + + + + + Bullet_BlasterRifle_IonOnly + + OuterRim/Projectile/ProtonBall + 0.35 + + + 20 + EMP + 1 + + + + + Bullet_BlasterSniper_IonOnly + + OuterRim/Projectile/ProtonBall + 0.5 + + + 15 + EMP + 1 + + +
  • + 25 + EMP + 2.5 + Explosion_EMP + true +
    • +     +     + diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml index f5a0deaa06..4607ca99b4 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml @@ -325,7 +325,7 @@ 1.45 CombatExtended.Verb_ShootCE true - Bullet_BlasterRifle_Ion + Bullet_BlasterRifle_IonOnly 1 55 OuterRim_Shot_DLT19DBlasterBolt @@ -342,7 +342,7 @@ 20 3.7 - AmmoSet_PlasmaGasCartridgeIon_Rifle + AmmoSet_PlasmaGasCartridgeIonOnly_Rifle @@ -360,7 +360,7 @@ 1.48 CombatExtended.Verb_ShootCE true - Bullet_BlasterSniper_Ion + Bullet_BlasterSniper_IonOnly 2 62 OuterRim_Shot_DLT19DBlasterBolt @@ -377,7 +377,7 @@ 15 3.7 - AmmoSet_PlasmaGasCartridgeIon_Sniper + AmmoSet_PlasmaGasCartridgeIonOnly_Sniper @@ -395,7 +395,7 @@ 1.2 CombatExtended.Verb_ShootCE true - Bullet_BlasterPistol_Ion + Bullet_BlasterPistol_IonOnly 0.75 44 OuterRim_Shot_DLT19DBlasterBolt @@ -411,7 +411,7 @@ 21 2.5 - AmmoSet_PlasmaGasCartridgeIon_Pistol + AmmoSet_PlasmaGasCartridgeIonOnly_Pistol From 63aa99214e8218142f871e417d793c17e9681aa4 Mon Sep 17 00:00:00 2001 From: Killian Date: Thu, 19 Jun 2025 11:14:57 +0100 Subject: [PATCH 06/10] outer rim: minor ammo fixes --- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index b35f3e4828..7a25767852 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -72,7 +72,7 @@ AmmoSet_PlasmaGasCartridgeBlue_Pistol - + Bullet_BlasterPistol_Blue Bullet_BlasterPistol_BlueAP @@ -277,7 +277,7 @@ Ammo_PlasmaGasCartridge_AP Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively, at the cost of slightly reduced lethality. - + Things/Ammo/Charged/MediumConc Graphic_StackCount @@ -290,7 +290,7 @@ Ammo_PlasmaGasCartridge_Ion Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets at the cost of reduced effectiveness against organics. - + Things/Ammo/Charged/MediumIon Graphic_StackCount @@ -922,7 +922,7 @@ - A powerful rocket first used in the Blue's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike. + A powerful rocket first used in the Galactic Republic's RPS-6. Old caches have been repurposed by the Rebel Alliance for use in the HH-12 launcher. The dual-purpose missile is lethal to both vehicles and infantry alike. 150 @@ -1161,9 +1161,9 @@ MakeAmmo_PlasmaGasCartridge_AP - - Craft 500 Blaster Bolts (AP). - Making Blaster Bolts (AP). + + Craft 500 Plasma Gas Cartridges (AP). + Making Plasma Gas Cartridges (AP).
  • @@ -1208,9 +1208,9 @@ MakeAmmo_PlasmaGasCartridge_Ion - - Craft 500 PlasmaGas Cartridges (Ion). - Making Blaster Bolts (Ion). + + Craft 500 Plasma Gas Cartridges (Ion). + Making Plasma Gas Cartridges (Ion).
  • From 4e57227f5a2a308065e5dd95935c6f0f92f75dfb Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 14 Dec 2025 23:15:15 +0000 Subject: [PATCH 07/10] outer rim patch folder cleanup reorganizes modpatch folders --- .../Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml | 0 .../Defs/{Outer Rim - Core => }/Outer_Rim_Core_Ammo.xml | 0 .../Defs/{Outer Rim - Core => }/Outer_Rim_Core_GrenadeRecipes.xml | 0 .../Defs/{Outer Rim - Core => }/Outer_Rim_Core_TurretAmmo.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Apparel.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Armour.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Grenades.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Jetpacks.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Materials.xml | 0 .../{Outer Rim - Core => }/Outer_Rim_Core_Melee_Weapons.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Mines.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Pawnkinds.xml | 0 .../{Outer Rim - Core => }/Outer_Rim_Core_Ranged_Weapons.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Turrets.xml | 0 .../Patches/{Outer Rim - Core => }/Outer_Rim_Core_Vambraces.xml | 0 .../{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Armour.xml | 0 .../{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Droids.xml | 0 .../{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Jetpacks.xml | 0 .../Outer_Rim_Droid_MountedWeapons.xml | 0 .../Outer_Rim_Galactic_Empire_Apparel.xml | 0 .../Outer_Rim_Galactic_Empire_Pawnkinds.xml | 0 .../Outer_Rim_Galactic_Empire_Ranged_Weapons.xml | 0 .../Outer_Rim_Galactic_Empire_Scenario.xml | 0 .../Outer_Rim_Galactic_Republic_Apparel.xml | 0 .../Outer_Rim_Galactic_Republic_Pawnkinds.xml | 0 .../Outer_Rim_Galactic_Republic_Ranged_Weapons.xml | 0 .../{Outer Rim - Mandalore => }/Outer_Rim_Mandalorian_Apparel.xml | 0 .../Outer_Rim_Mandalorian_Melee_Weapons.xml | 0 .../Outer_Rim_Mandalorian_Pawnkinds.xml | 0 .../Outer_Rim_Mandalorian_Ranged_Weapons.xml | 0 .../Outer_Rim_Old_Republic_Apparel.xml | 0 .../Outer_Rim_Old_Republic_Pawnkinds.xml | 0 .../Outer_Rim_Old_Republic_Ranged_Weapons.xml | 0 .../{Outer Rim - Rebel Alliance => }/Outer_Rim_Rebel_Apparel.xml | 0 .../Outer_Rim_Rebel_Pawnkinds.xml | 0 .../Outer_Rim_Rebel_Ranged_Weapons.xml | 0 .../Outer_Rim_Seperatist_Melee_Weapons.xml | 0 .../Outer_Rim_Seperatist_Ranged_Weapons.xml | 0 38 files changed, 0 insertions(+), 0 deletions(-) rename ModPatches/Outer Rim - Chiss Ascendancy/Patches/{Outer Rim - Chiss Ascendancy => }/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Core/Defs/{Outer Rim - Core => }/Outer_Rim_Core_Ammo.xml (100%) rename ModPatches/Outer Rim - Core/Defs/{Outer Rim - Core => }/Outer_Rim_Core_GrenadeRecipes.xml (100%) rename ModPatches/Outer Rim - Core/Defs/{Outer Rim - Core => }/Outer_Rim_Core_TurretAmmo.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Apparel.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Armour.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Grenades.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Jetpacks.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Materials.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Melee_Weapons.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Mines.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Turrets.xml (100%) rename ModPatches/Outer Rim - Core/Patches/{Outer Rim - Core => }/Outer_Rim_Core_Vambraces.xml (100%) rename ModPatches/Outer Rim - Droid Depot/Patches/{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Armour.xml (100%) rename ModPatches/Outer Rim - Droid Depot/Patches/{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Droids.xml (100%) rename ModPatches/Outer Rim - Droid Depot/Patches/{Outer Rim - Droid Depot => }/Outer_Rim_Droid_Jetpacks.xml (100%) rename ModPatches/Outer Rim - Droid Depot/Patches/{Outer Rim - Droid Depot => }/Outer_Rim_Droid_MountedWeapons.xml (100%) rename ModPatches/Outer Rim - Galactic Empire/Patches/{Outer Rim - Galactic Empire => }/Outer_Rim_Galactic_Empire_Apparel.xml (100%) rename ModPatches/Outer Rim - Galactic Empire/Patches/{Outer Rim - Galactic Empire => }/Outer_Rim_Galactic_Empire_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Galactic Empire/Patches/{Outer Rim - Galactic Empire => }/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Galactic Empire/Patches/{Outer Rim - Galactic Empire => }/Outer_Rim_Galactic_Empire_Scenario.xml (100%) rename ModPatches/Outer Rim - Galactic Republic/Patches/{Outer Rim - Galactic Republic => }/Outer_Rim_Galactic_Republic_Apparel.xml (100%) rename ModPatches/Outer Rim - Galactic Republic/Patches/{Outer Rim - Galactic Republic => }/Outer_Rim_Galactic_Republic_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Galactic Republic/Patches/{Outer Rim - Galactic Republic => }/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Mandalore/Patches/{Outer Rim - Mandalore => }/Outer_Rim_Mandalorian_Apparel.xml (100%) rename ModPatches/Outer Rim - Mandalore/Patches/{Outer Rim - Mandalore => }/Outer_Rim_Mandalorian_Melee_Weapons.xml (100%) rename ModPatches/Outer Rim - Mandalore/Patches/{Outer Rim - Mandalore => }/Outer_Rim_Mandalorian_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Mandalore/Patches/{Outer Rim - Mandalore => }/Outer_Rim_Mandalorian_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Old Republic/Patches/{Outer Rim - Old Republic => }/Outer_Rim_Old_Republic_Apparel.xml (100%) rename ModPatches/Outer Rim - Old Republic/Patches/{Outer Rim - Old Republic => }/Outer_Rim_Old_Republic_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Old Republic/Patches/{Outer Rim - Old Republic => }/Outer_Rim_Old_Republic_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Rebel Alliance/Patches/{Outer Rim - Rebel Alliance => }/Outer_Rim_Rebel_Apparel.xml (100%) rename ModPatches/Outer Rim - Rebel Alliance/Patches/{Outer Rim - Rebel Alliance => }/Outer_Rim_Rebel_Pawnkinds.xml (100%) rename ModPatches/Outer Rim - Rebel Alliance/Patches/{Outer Rim - Rebel Alliance => }/Outer_Rim_Rebel_Ranged_Weapons.xml (100%) rename ModPatches/Outer Rim - Seperatists/Patches/{Outer Rim - Seperatists => }/Outer_Rim_Seperatist_Melee_Weapons.xml (100%) rename ModPatches/Outer Rim - Seperatists/Patches/{Outer Rim - Seperatists => }/Outer_Rim_Seperatist_Ranged_Weapons.xml (100%) diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_GrenadeRecipes.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_GrenadeRecipes.xml diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_TurretAmmo.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_TurretAmmo.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Apparel.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Armour.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Armour.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Grenades.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Grenades.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Jetpacks.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Jetpacks.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Materials.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Materials.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Melee_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Melee_Weapons.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Mines.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Mines.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Turrets.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Turrets.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Vambraces.xml similarity index 100% rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Vambraces.xml diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Armour.xml similarity index 100% rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Armour.xml diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Droids.xml similarity index 100% rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Droids.xml diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Jetpacks.xml similarity index 100% rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Jetpacks.xml diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_MountedWeapons.xml similarity index 100% rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_MountedWeapons.xml diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Apparel.xml diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Scenario.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Scenario.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Scenario.xml rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Scenario.xml diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Apparel.xml diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Apparel.xml diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Melee_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Melee_Weapons.xml diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Apparel.xml diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Apparel.xml similarity index 100% rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Apparel.xml diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Pawnkinds.xml similarity index 100% rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Pawnkinds.xml diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Ranged_Weapons.xml diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Melee_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml rename to ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Melee_Weapons.xml diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Ranged_Weapons.xml similarity index 100% rename from ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml rename to ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Ranged_Weapons.xml From c5995d8a84dc22db47aac7f2c5d78c5d36fefc84 Mon Sep 17 00:00:00 2001 From: Killian Date: Mon, 15 Dec 2025 18:53:39 +0000 Subject: [PATCH 08/10] Update Outer_Rim_Core_Ammo.xml --- ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml index 7a25767852..876e0ca9bc 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml @@ -277,7 +277,7 @@ Ammo_PlasmaGasCartridge_AP Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively, at the cost of slightly reduced lethality. - + Things/Ammo/Charged/MediumConc Graphic_StackCount From 8546801c002ea4a178e63722689a5425f026b3c8 Mon Sep 17 00:00:00 2001 From: Killian Date: Tue, 16 Dec 2025 01:27:44 +0000 Subject: [PATCH 09/10] outer rim ammo tweaks --- .../AmmoCategoryDefs/AmmoCategories_Advanced.xml | 4 ++-- .../Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml index 8096f3b9b5..aae2b19842 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml @@ -184,8 +184,8 @@ BlasterAP - - conc. + + AP Energy bolts created with tibanna gas. Causes neat punctures and burns that tend to carbonize and char. Low chance of wound infection. Spun to a higher pressure to create bolts with improved penetration, at the loss of wounding potential. diff --git a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml index 876e0ca9bc..430e74fb01 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml @@ -322,8 +322,8 @@ 14 - 2 14 + 2 @@ -333,8 +333,8 @@ 11 - 3 18 + 3 @@ -345,8 +345,8 @@ 151 18 - 3 22 + 3 @@ -357,8 +357,8 @@ 151 12 + 28 4 - 33 @@ -369,8 +369,8 @@ 178 30 + 33 4 - 20 @@ -381,8 +381,8 @@ 178 20 + 40 6 - 36 From 68e0deb7faf179af95f7cd78d3f63eacd9cd5cf3 Mon Sep 17 00:00:00 2001 From: Killian Date: Sat, 27 Dec 2025 02:54:30 +0000 Subject: [PATCH 10/10] outer rim: scattergun ammo --- .../Defs/Outer_Rim_Core_Ammo.xml | 32 ++++++++++++++++--- .../Patches/Outer_Rim_Core_Ranged_Weapons.xml | 7 ---- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml index 430e74fb01..22101ff2cb 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml @@ -135,6 +135,8 @@ Bullet_BlasterBolt_Scatter + Bullet_BlasterSniper_Red + Bullet_BlasterBolt_ScatterIon @@ -651,13 +653,35 @@ 8 - 1 9 + 1 12 15 + + Bullet_BlasterBolt_ScatterIon + + OuterRim/Projectile/BlasterBolt_Red + 0.9 + + + 4 + +
  • + EMP + 12 +
    • + + 0.66 + 14 + 1 + 6 + 7.5 +     + + Bullet_BlasterBolt_DualShot @@ -665,8 +689,8 @@ 18 - 3 22 + 3 2 4 @@ -679,8 +703,8 @@ 12 - 4 33 + 4 2 4 @@ -713,8 +737,8 @@ 25 20 - 6 36 + 6
  • diff --git a/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml index 4607ca99b4..12d4867eeb 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml @@ -109,13 +109,6 @@ AimedShot - - - Defs/ThingDef[defName="OuterRim_BARMST12Scattergun"]/description - - The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of specialized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so. - - OuterRim_BARMST12Scattergun