diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml index 06f9f8b75a..6fcc728688 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml @@ -84,4 +84,11 @@ Special round based around a low explosive element, used to destroy structures and fortifications. + + Nail + + nail + Pointy nails arranged in strips. + + \ No newline at end of file diff --git a/Defs/Ammo/Other/Ammo_Nail.xml b/Defs/Ammo/Other/Ammo_Nail.xml new file mode 100644 index 0000000000..f208c8ba62 --- /dev/null +++ b/Defs/Ammo/Other/Ammo_Nail.xml @@ -0,0 +1,124 @@ + + + + + AmmoNail + + AmmoRifles + Things/Ammo/Nail/Nail_c + + + + + + AmmoSet_Nail + + + Bullet_Nail + + + + + AmmoSet_Nail_HV + + + Bullet_Nail_HV + + + + + + + A pointed carpentry nail a few inches long. Not suitable for combat when used with conventional tools. + + 0.01 + 0.01 + + +
  • CE_AutoEnableTrade_Sellable
    • +
  • CE_AutoEnableCrafting
    • +
  • CE_AutoEnableCrafting_FueledSmithy
    • +
  • CE_AutoEnableCrafting_ElectricSmithy
    • +     + +
  • AmmoNail
    • +     +     + + + Ammo_Nail + + + Things/Ammo/Nail + Graphic_StackCount + + + 0.02 + + Nail + + + + + + + + Things/Projectile/Shotgun_Pellet + Graphic_Single + + + Bullet + false + + + + + Bullet_Nail + + 9 + 1 + 0.06 + 0.2 + + + + + Bullet_Nail_HV + + + 32 + 3 + 0.82 + 3 + + + + + + + MakeAmmo_Nail + + Craft 500 steel nails. + Making nails. + 400 + +
  • + + +
  • Steel
    • + + + 4 + +     + + +
  • Steel
    • +     +     + + 500 + +     + +     \ No newline at end of file diff --git a/Defs/Ammo/Flamethrower.xml b/Defs/Ammo/Other/Flamethrower.xml similarity index 100% rename from Defs/Ammo/Flamethrower.xml rename to Defs/Ammo/Other/Flamethrower.xml diff --git a/Defs/Ammo/Flare.xml b/Defs/Ammo/Other/Flare.xml similarity index 100% rename from Defs/Ammo/Flare.xml rename to Defs/Ammo/Other/Flare.xml diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/47x398mmR.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/47x398mmR.xml new file mode 100644 index 0000000000..9fe9f05440 --- /dev/null +++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/47x398mmR.xml @@ -0,0 +1,273 @@ + + + + + Ammo47x398mmR + + AmmoShells + UI/Icons/ThingCategories/CaliberAutocannonLarge + + + + + + AmmoSet_47x398mmR + + + Bullet_47x398mmR_AP + Bullet_47x398mmR_HE + Bullet_47x398mmR_EMP + + AmmoSet_LightCannon + + + + + + Large caliber shell used by tank guns. + +
  • Ammo47x398mmR
    • +     + 50 + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + + 2.71 + 4.87 + + 20 + MortarBomb_Explode +     + + + Ammo_47x398mmR_AP + + + Things/Ammo/Cannon/Tank/AP + Graphic_StackCount + + + 2.85 + 12 + + ArmorPiercing + Bullet_47x398mmR_AP + + + + Ammo_47x398mmR_HE + + + Things/Ammo/Cannon/Tank/HE + Graphic_StackCount + + + 26.47 + + GrenadeHE + Bullet_47x398mmR_HE + + + + Ammo_47x398mmR_EMP + + + Things/Ammo/Cannon/Tank/EMP + Graphic_StackCount + + + 31.4 + + GrenadeEMP + Bullet_47x398mmR_HE + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + + 164 + false + true + Fleck_BigShell + Filth_CannonAmmoCasings + + + + + Bullet_47x398mmR_AP + + + Things/Projectile/Cannon/AP + Graphic_Single + + + Bullet + 126 + 76 + 9279.12 + + + + + Bullet_47x398mmR_HE + + + Things/Projectile/Cannon/HE + Graphic_Single + + + Bomb + 32 + 1 + MortarBomb_Explode + true + + +
  • + + 5 + 2 + +
    • +     +     + + + Bullet_47x398mmR_EMP + + + Things/Projectile/Cannon/EMP + Graphic_Single + + + EMP + 32 + 2 + true + + + + + + + MakeAmmo_47x398mmR_AP + + Craft 5 47x398mmR (AP) shells. + Making 47x398mmR (AP) shells. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 5 + + + 4 + + 3600 +     + + + MakeAmmo_47x398mmR_HE + + Craft 5 47x398mmR (HE) cartridges. + Making 47x398mmR (HE) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 1 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 5 + + + 4 + + 4600 +     + + + MakeAmmo_47x398mmR_EMP + + Craft 5 47x398mmR (EMP) cartridges. + Making 47x398mmR (EMP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 5520 +     + +     \ No newline at end of file diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/57x280mmR.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/57x280mmR.xml new file mode 100644 index 0000000000..c071dcc2af --- /dev/null +++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/57x280mmR.xml @@ -0,0 +1,365 @@ + + + + + Ammo57x280mmR + + AmmoShells + UI/Icons/ThingCategories/CaliberAutocannonLarge + + + + + + AmmoSet_57x280mmR + + + Bullet_57x280mmR_AP + Bullet_57x280mmR_HE + Bullet_57x280mmR_HEAT + Bullet_57x280mmR_EMP + + AmmoSet_LightCannon + + + + + + Large caliber shell used by tank guns. + +
  • Ammo57x280mmR
    • +     + 50 + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + + 2.91 + 2.15 + + 20 + MortarBomb_Explode +     + + + Ammo_57x280mmR_AP + + + Things/Ammo/Cannon/Tank/AP + Graphic_StackCount + + + 3.13 + 12.8 + + ArmorPiercing + Bullet_57x280mmR_AP + + + + Ammo_57x280mmR_HE + + + Things/Ammo/Cannon/Tank/HE + Graphic_StackCount + + + 28.04 + + GrenadeHE + Bullet_57x280mmR_HE + + + + Ammo_57x280mmR_HEAT + + + Things/Ammo/Cannon/Tank/HEAT + Graphic_StackCount + + + 29.6 + + RocketHEAT + Bullet_57x280mmR_HE + + + + Ammo_57x280mmR_EMP + + + Things/Ammo/Cannon/Tank/EMP + Graphic_StackCount + + + 44.4 + + GrenadeEMP + Bullet_57x280mmR_EMP + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + + 70 + false + true + Fleck_BigShell + Filth_CannonAmmoCasings + + + + + Bullet_57x280mmR_AP + + + Things/Projectile/Cannon/AP + Graphic_Single + + + Bullet + 93 + 21 + 3142.46 + + + + + Bullet_57x280mmR_HE + + + Things/Projectile/Cannon/HE + Graphic_Single + + + Bomb + 57 + 1.5 + MortarBomb_Explode + true + + +
  • + + 8 + 5 + +
    • +     +     + + + Bullet_57x280mmR_HEAT + + + Things/Projectile/Cannon/HEAT + Graphic_Single + + + Bullet + 122 + 55 + 19.29 + MortarBomb_Explode + + +
  • + 63 + Bomb + 1 + true +
    • +
  • + + 4 + 3 + +
    • +     +     + + + Bullet_57x280mmR_EMP + + + Things/Projectile/Cannon/EMP + Graphic_Single + + + EMP + 57 + 3 + true + + + + + + + MakeAmmo_57x280mmR_AP + + Craft 5 57x280mmR (AP) shells. + Making 57x280mmR (AP) shells. + +
  • + + +
  • Steel
    • + + + 32 + +     + + +
  • Steel
    • +     +     + + 5 + + + 4 + + 3840 +     + + + MakeAmmo_57x280mmR_HE + + Craft 5 57x280mmR (HE) cartridges. + Making 57x280mmR (HE) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 2 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 5 + + + 4 + + 5000 +     + + + MakeAmmo_57x280mmR_HEAT + + Craft 5 57x280mmR (HEAT) cartridges. + Making 57x280mmR (HEAT) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 3 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 5 + + + 4 + + 5400 +     + + + MakeAmmo_57x280mmR_EMP + + Craft 5 57x280mmR (EMP) cartridges. + Making 57x280mmR (EMP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 7 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 13800 +     + +     \ No newline at end of file diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml index d650bafbd1..953a7bad6a 100644 --- a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml +++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Advanced.xml @@ -51,9 +51,18 @@ Bullet_MechPsyShot + + + AmmoSet_MechPsyRifle + + + Bullet_MechPsyRifle + + + - Multi-pellet mech shot cartridge designed for shotgun-type weapons. + Variable use mech shot cartridge designed for advanced weapons.
  • AmmoMechPsyShot
    •  @@ -80,9 +89,10 @@ Things/Projectile/MihoThunderSpear Graphic_Single + 0.75 - 3 + 9 Miho_MagicBombEMP
  • @@ -98,8 +108,37 @@ 0 0 - 5 - 8.9 + + + + + Bullet_MechPsyRifle + + + Things/Projectile/MihoThunderSpear + Graphic_Single + 0.92 + + + 150 + 10 + Miho_MagicBombEMP + +
  • + EMP + 1 + 0.09 +
    • +
  • + Stun + 2 + 0.09 +
    • +     + 0 + 0 + 3 + 0     @@ -151,130 +190,6 @@ - - - - Ammo10mmMihogrenade - - AmmoAdvanced - UI/Icons/ThingCategories/CaliberCharge - - - - AmmoSet_10mmMihogrenade - - - Bullet_10mmMihogrenade - - - - - AmmoSet_10mmMihogrenadeFlechette - - - Bullet_10mmMihogrenadeFlechette - - - - - AmmoSet_10mmMihogrenadeBarrier - - - Bullet_10mmMihogrenadeBarrier - - - - - Special purpose launcher grenades with variable properties. - -
  • Ammo10mmMihogrenade
    • -     - Ammo_10mmMihogrenade - - - Things/Ammo/Charged/ShotgunMech - Graphic_StackCount - - - 17.1 - 0.17 - 0.20 - - -
  • CE_AutoEnableTrade
    • -     - MechaniteMiho -     - - - Bullet_10mmMihogrenade - - - Things/Projectile/Bullet_Big - Graphic_Single - - - 18 - Miho_MagicBomb - 1 - - -
  • - - 20 - -
    • -     -     - - - MakeAmmo_10mmMihogrenade - - Craft 50 Mechanite Grenades. - Making Mechanite Grenades. - -
  • - - -
  • Miho_MilitaryGradeBalisticCeramics
    • - - - 20 - -
  • - - -
  • Steel
    • - - - 8 - -
  • - - -
  • ComponentIndustrial
    • - - - 20 - -     - - -
  • Miho_MilitaryGradeBalisticCeramics
    • -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 50 - - 20800 - Miho_MechHack - -
  • Miho_TableMachining
    • -     -     - Bullet_MihoPlasma @@ -402,46 +317,4 @@ 5 - - - Bullet_10mmMihogrenadeFlechette - - - Things/Projectile/MihoThunderSpear - Graphic_Single - 1.35 - - - 65 - 10 - Miho_MagicBombEMP - -
  • - EMP - 8 - 1 -
    • -     - 0 - 0 - 6 - 8.9 -     -     - - - Bullet_10mmMihogrenadeBarrier - - - Things/Projectile/Bullet_Big - Graphic_Single - - - 0 - Smoke - 0.5 - Miho_BulletShieldPsychicSmall - 1 - - \ No newline at end of file diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml index 1ca6c2c802..41ffdada65 100644 --- a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml +++ b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Industrial.xml @@ -64,8 +64,57 @@ IncendiaryMiho Bullet_132x92mmSRTuF_Miho + + + Ammo_20x42mm_Miho + + + Things/Ammo/HighCaliber/Incendiary + Graphic_StackCount + + + 1.06 + + IncendiaryMiho + Bullet_20x42mm_Miho + + + + Fragment_Large_Miho + + + Things/Projectile/Fragments/Fragment_Large + Graphic_Single + + + MihoGunshotFrag + 34 + 60 + 4.5 + 122.5 + 5 + + + + + Fragment_Small_Miho + + + Things/Projectile/Fragments/Fragment_Small + Graphic_Single + + + MihoGunshotFrag + 12 + 40 + 2 + 14.4 + 5 + + + Bullet_8x22mmNambu_Miho @@ -133,6 +182,23 @@ + + + Bullet_20x42mm_Miho + + + MihoGunshot + 20 + 12 + 105.72 + +
  • + Flame_Secondary + 12 +
    • +     +     +     @@ -270,11 +336,12 @@ 6000 - + MakeAmmo_132x92mmSRTuF_Miho Craft 200 13.2x92mmSR TuF (AP-IM) cartridges. Making 13.2x92mmSR TuF (AP-IM) cartridges. + Miho_HeavyWeapon
  • @@ -314,6 +381,51 @@ 9800 + + MakeAmmo_20x42mm_Miho + + Craft 100 20x42mm (AP-IM) cartridges. + Making 20x42mm (AP-IM) cartridges. + Miho_HeavyWeapon + +
  • + + +
  • Steel
    • + + + 34 + +
  • + + +
  • Prometheum
    • + + + 6 + +
  • + + +
  • Miho_MilitaryGradeBalisticCeramics
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • Miho_MilitaryGradeBalisticCeramics
    • +     +     + + 100 + + 5800 +     + AmmoMiho47x285mm @@ -321,110 +433,117 @@ UI/Icons/ThingCategories/CaliberAutocannonLarge - - - - AmmoSet_Miho47x285mm - - - Bullet_Miho47x285mm_HE - Bullet_Miho47x285mm_AP - - + - - Large caliber cartridge used by autocannons and anti-aircraft cannons. + + Ammo_47x398mmR_Miho + + + Things/Ammo/Cannon/Tank/APHE + Graphic_StackCount + - 1.4 - 3.98 + 2.85 + 20.88 - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoMiho47x285mm
    • -     - 25 + IncendiaryMiho + Bullet_47x398mmR_Miho     - - - Ammo_Miho47x285mm_HE - + + + Ammo_57x280mmR_Canister + - Things/Ammo/HighCaliber/Bofors/HE + Things/Ammo/Cannon/Tank/Canister Graphic_StackCount - 21.21 + 28.64 - ExplosiveAP - Bullet_Miho47x285mm_HE + BuckShot + Bullet_57x280mmR_Canister - - - Ammo_Miho47x285mm_AP - + + + Ammo_57x280mmR_Thermobaric + - Things/Ammo/HighCaliber/Bofors/AP + Things/Ammo/Cannon/Tank/APHE Graphic_StackCount - 7.57 + 62.5 - ArmorPiercing - Bullet_Miho47x285mm_AP + RocketThermobaric + Bullet_57x280mmR_Thermobaric - - + + + Bullet_47x398mmR_Miho + - Things/Projectile/Bullet_Big + Things/Projectile/Cannon/APHE Graphic_Single - Bullet - 155 - true - - - - - Bullet_Miho47x285mm_HE - - - 195 - 25 - 8555.440 + MihoGunshot + 126 + 76 + 9279.12
  • - Bomb_Secondary - 117 + Flame_Secondary + 79
    • + + + Bullet_57x280mmR_Canister + + + Things/Projectile/Shotgun_Pellet + Graphic_Single + + + MihoGunshot + 10 + 4 + 11.08 + 84 + 17.8 + + - - Bullet_Miho47x285mm_AP - + + Bullet_57x280mmR_Thermobaric + + + Things/Projectile/Cannon/APHE + Graphic_Single + - 122 - 57 - 8555.440 + MihoGunshotDemo + 206 + 4 + MortarBomb_Explode + true - + - MakeAmmo_Miho47x285mm_HE - - Craft 25 47x285mm Miho (HE) cartridges. - Making 47x285mm Miho (HE) cartridges. + MakeAmmo_47x398mmR_Miho + + Craft 5 47x398mmR (AP-IM) shells. + Making 47x398mmR (AP-IM) shells. + Miho_HeavyWeapon
  • @@ -432,34 +551,93 @@
  • Steel
    • - 108 + 30
  • -
  • FSX
    • +
  • Prometheum
    • - 33 + 4 + +
  • + + +
  • Miho_MilitaryGradeBalisticCeramics
    • + + + 2
  • Steel
    • -
  • FSX
    • +
  • Prometheum
    • +
  • Miho_MilitaryGradeBalisticCeramics
    •      - 25 + 5 - 24000 + + 4 + + 6480     - + + + MakeAmmo_57x280mmR_Canister + + Craft 5 57x280mmR (Canister) cartridges. + Making 57x280mmR (Canister) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Miho_MilitaryGradeBalisticCeramics
    • + + + 2 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Miho_MilitaryGradeBalisticCeramics
    • +     +     + + 5 + + + 4 + + 5000 +     + - MakeAmmo_Miho47x285mm_AP - - Craft 25 47x285mm Miho (APHE) cartridges. - Making 47x285mm Miho (APHE) cartridges. + MakeAmmo_57x280mmR_Thermobaric + + Craft 5 57x280mmR (Thermobaric) cartridges. + Making 57x280mmR (Thermobaric) cartridges.
  • @@ -467,18 +645,39 @@
  • Steel
    • - 108 + 30 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 24
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    •      - 25 + 5 - 10800 + + 4 + + 13800     @@ -529,9 +728,11 @@ 0.90 - 41.52 + 102.28 + 5.76 + 17.27 - GrenadeIncendiary + RocketThermobaric Bullet_Miho100mm_Incendiary     @@ -551,6 +752,31 @@ false 5 + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 15~30 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     @@ -561,24 +787,13 @@ Graphic_Single - PrometheumFlame - 0 - 0 - 0 - 5.9 + MihoGunshotDemo + 300 + 5 true - FilthPrometheum 0.15 MortarIncendiary_Explode - -
  • - 75 - MihoGunshotDemo - 1.9 - true -
    • -     @@ -588,22 +803,23 @@ Craft 5 100mm Miho Rocket cartridges. Making 100mm Miho Rocket cartridges. + 12000
  • -
  • Prometheum
    • +
  • Steel
    • - 3 + 64
  • -
  • Steel
    • +
  • FSX
    • - 10 + 8
  • @@ -611,171 +827,232 @@
  • ComponentIndustrial
    • - 6 + 4     -
  • Prometheum
  • Steel
    • +
  • FSX
  • ComponentIndustrial
    •      5 - 3730     - - - + + + - AmmoSet_Miho57x93mmGrenade - + AmmoSet_57mmMihoRocket_indirect + - Bullet_Miho57x93mmGrenade_HE - Bullet_Miho57x93mmGrenade_HEDP - Bullet_Miho57x93mmGrenade_EMP + Bullet_57mmMihoRocket_HE_indirect + Bullet_57mmMihoRocket_HEAT_indirect + Bullet_57mmMihoRocket_Thermobaric_indirect - - AmmoMiho57x93mmGrenade - - AmmoGrenades - UI/Icons/ThingCategories/CaliberGrenade - - - - - High velocity grenade fired from mounted and crew-served grenade launchers. - - 1.6 - 0.72 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoMiho57x93mmGrenade
    • -     - 150 -     - - - Ammo_Miho57x93mmGrenade_HE - + + + Bullet_57mmMihoRocket_HE_indirect + - Things/Ammo/GrenadeLauncher/HE - Graphic_StackCount + Things/Projectile/Rocket/S5/HE - - 10.13 - - GrenadeHE - Bullet_Miho57x93mmGrenade_HE + + MihoGunshotDemo + 187 + 3 + true + + +
  • + + 13 + 34 + +
    • +     - - Ammo_Miho57x93mmGrenade_HEDP - + + Bullet_57mmMihoRocket_HEAT_indirect + + CombatExtended.BulletCE - Things/Ammo/GrenadeLauncher/DP - Graphic_StackCount + Things/Projectile/Rocket/S5/HEAT - - 10.13 - - GrenadeHEDP - Bullet_Miho57x93mmGrenade_HEDP + + Bullet + 158 + 172 + 26.312 + + +
  • + 88 + MihoGunshotDemo + 1 + MortarBomb_Explode + true +
    • +
  • + + 8 + 5 + +
    • +     - - Ammo_Miho57x93mmGrenade_EMP - + + + Bullet_57mmMihoRocket_Thermobaric_indirect + - Things/Ammo/GrenadeLauncher/EMP - Graphic_StackCount + Things/Projectile/Rocket/S5/Thermobaric + + MihoGunshotDemo + 160 + 3.5 + 0 + 0 + true + true + + + + + + + AmmoMiho_MAT + + + + AmmoSet_MihoMissile + + + Bullet_MihoMMAT + Bullet_MihoMPLA + + + + + AmmoSet_MihoMissile_S + + + Bullet_MihoMMAT + + + + + Missiles designed for Miho direct fire launchers - 16.1 + 150 - GrenadeEMP - Bullet_Miho57x93mmGrenade_EMP + +
  • CE_AutoEnableTrade
    • +     + +
  • AmmoMiho_MAT
    • +     + 25 + 40 + MortarBomb_Explode     + - + - Things/Projectile/LauncherShot + Things/Projectile/Rocket_Big Graphic_Single - (0.5,0.5) + TransparentPostLight - 60 - - - - - Bullet_Miho57x93mmGrenade_HE - CombatExtended.ProjectileCE_Explosive - - - Bomb - 42 - 1.5 - true + 64 + RocketPropelledLoop_Small -
  • - - 40 - +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 15~30 + 0.8 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • +     -     - - Bullet_Miho57x93mmGrenade_HEDP - CombatExtended.BulletCE - + + Bullet_MihoMMAT + - Bullet - 96 - 76 - 12.734 + MihoGunshot + 124 + 250 + 37.075
  • - 42 - Bomb - 0.5 + 124 + MihoGunshotDemo + 2.5 + MortarBomb_Explode true
  • - 25 + 5 + 24
    • - - - Bullet_Miho57x93mmGrenade_EMP - + + + Bullet_MihoMPLA + + CombatExtended.ProjectileCE_Explosive - 2.5 - EMP - 42 + 1.5 + MihoPlasma + 400 + MortarBomb_Explode + true + - MakeAmmo_Miho57x93mmGrenade_HE - - Craft 50 57x93mm Miho (HE) Grenade. - Making 57x93mm Miho (HE) Grenade. + MakeAmmo_Miho_Missile + + Craft 5 Miho Missiles. + Making Miho Missiles. + 12000
  • @@ -783,7 +1060,7 @@
  • Steel
    • - 160 + 64
  • @@ -791,7 +1068,7 @@
  • FSX
    • - 12 + 8
  • @@ -799,7 +1076,7 @@
  • ComponentIndustrial
    • - 2 + 4     @@ -810,68 +1087,36 @@ - 100 + 5 - 22000 + Miho_HeavyWeapon + +
  • Miho_TableMachining
    • +     - + - MakeAmmo_Miho57x93mmGrenade_HEDP - - Craft 50 57x93mm Miho (HEDP) Grenade. - Making 57x93mm Miho (HEDP) Grenade. + MakeAmmo_Miho_MissilePlasma + + Craft 5 Miho Plasma Missiles. + Making Miho Plasma Missiles. + 18000
  • -
  • Steel
    • - - - 160 - -
  • - - -
  • FSX
    • - - - 12 - -
  • - - -
  • ComponentIndustrial
    • +
  • Miho_MilitaryGradeBalisticCeramics
    • - 2 + 64 -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 50 - - 17200 -     - - - MakeAmmo_Miho57x93mmGrenade_EMP - - Craft 50 57x93mm Miho (EMP) Grenade. - Making 57x93mm Miho (EMP) Grenade. -
  • -
  • Steel
    • +
  • Uranium
    • - 160 + 50
  • @@ -879,18 +1124,23 @@
  • ComponentIndustrial
    • - 15 + 10     -
  • Steel
    • +
  • Miho_MilitaryGradeBalisticCeramics
    • +
  • Uranium
  • ComponentIndustrial
    •      - 50 + 5 - 25000 + Miho_PlasmaWeapon + +
  • Miho_TableMachining
    • +     + \ No newline at end of file diff --git a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml b/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml deleted file mode 100644 index d0e01ac7bc..0000000000 --- a/ModPatches/Miho Race/Defs/Miho Race/Ammo/Ammo_Miho_Neolithic.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml b/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml index 39f1828c7e..73ea7bc2a8 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/DamageDefs/AbilityDamage.xml @@ -53,6 +53,85 @@ + + + Defs/DamageDef[defName="MihoGunshotDemo"]/armorCategory + + Blunt + + + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.04"]/statOffsets/ArmorRating_Sharp + + -2 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.04"]/statOffsets/ArmorRating_Blunt + + -1 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.2"]/statOffsets/ArmorRating_Sharp + + -3 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.2"]/statOffsets/ArmorRating_Blunt + + -2 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.40"]/statOffsets/ArmorRating_Sharp + + -4 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.40"]/statOffsets/ArmorRating_Blunt + + -3 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.60"]/statOffsets/ArmorRating_Sharp + + -5 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.60"]/statOffsets/ArmorRating_Blunt + + -4 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.95"]/statOffsets/ArmorRating_Sharp + + -7 + + + + + Defs/HediffDef[defName="Miho_Plasma_Hediff"]/stages/li[minSeverity="0.95"]/statOffsets/ArmorRating_Blunt + + -5 + + @@ -73,7 +152,7 @@ Defs/ThingDef[defName="Miho_Fireball_Adept_Proj"]/projectile/damageAmountBase - 44 + 30 diff --git a/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml b/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml index 363075cefc..d0448844d6 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/PawnKindDefs/Miho_PawnKind.xml @@ -3,51 +3,35 @@ Defs/PawnKindDef[ - defName="Miho_Soldier_Adventurer" or - defName="Miho_Soldier_Hunter" or - defName="Miho_Soldier_Militia" - ] + defName="Miho_Colonist" or + defName="Miho_Leader" or + defName="Miho_Trader" or + defName="Miho_Slave" or + defName="Miho_Refugee" + ]
  • - 2 - 5 + 0 + 2 + IncendiaryMiho
    • - Defs/PawnKindDef[ - defName="Miho_Soldier_Marksman" or - defName="Miho_Soldier_PMC_Sniper" - ] + Defs/PawnKindDef[@ParentName="MihoMilBase"]
  • - 10 - 15 + 3 + 8 + IncendiaryMiho
    • - - - Defs/PawnKindDef[ - defName="Miho_Soldier_Firepower" or - defName="Miho_Soldier_PMC_InfantryBasic" or - defName="Miho_Soldier_AssassinRanged" - ] - -
  • - - 2 - 6 - -
    • -     -     - @@ -58,15 +42,7 @@ - Defs/PawnKindDef[ - defName="Miho_Soldier_Militia" or - defName="Miho_Soldier_Hunter" or - defName="Miho_Soldier_Marksman" or - defName="Miho_Soldier_Firepower" or - defName="Miho_Soldier_PMC_Infantry" or - defName="Miho_Soldier_PMC_Sniper" or - defName="Miho_Soldier_AssassinRanged" - ]/apparelRequired + Defs/PawnKindDef[@ParentName="MihoMilBase"]/apparelRequired
  • CE_Apparel_Backpack
    •  diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml index 36e1c0aa60..668d4d5d9a 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Items/Items_Resources.xml @@ -142,4 +142,46 @@ 0.4     + + + Defs/ThingDef[defName="Miho_Missile"] + + + Miho_Missile + + + Things/Items/MihoMechLeg + Graphic_StackCount + + + 48 + 4 + 12 + + GrenadeHE + Bullet_MihoMMAT + + + + + + Defs/ThingDef[defName="Miho_MissilePlasma"] + + + Miho_MissilePlasma + + + Things/Items/MihoPlasma + Graphic_StackCount + + + 105 + 5 + 13 + + Plasma + Bullet_MihoMPLA + + + \ No newline at end of file diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml index 82cc99cdf9..7db6b02ae3 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml @@ -14,7 +14,9 @@ - Defs/ThingDef[defName="Miho_Apparel_OnSkin_Regular" or defName="Miho_Apparel_OnSkin_Hoodie"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[defName="Miho_Apparel_OnSkin_Regular" or + defName="Miho_Apparel_OnSkin_Hoodie" or + defName="Miho_Apparel_OnSkin_Maid"]/statBases/StuffEffectMultiplierArmor 1.75 2 @@ -53,6 +55,7 @@ Defs/ThingDef[ defName="Miho_Apparel_Middle_Militia" or defName="Miho_Apparel_Middle_Militia_Tan" or + defName="Miho_Apparel_Middle_MilitiaMedic" or defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor 8 @@ -424,21 +427,14 @@ 4 3 - 1 + 0 Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/ArmorRating_Sharp - 1 - - - - - Defs/ThingDef[defName="Miho_Apparel_Hat_ShooterCap"]/statBases/Mass - - 1.5 + 1.5 @@ -477,7 +473,7 @@ - Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar" or defName="Miho_Apparel_Hat_MilitiaVegi"]/statBases/StuffEffectMultiplierArmor 5 3 @@ -486,14 +482,14 @@ - Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar" or defName="Miho_Apparel_Hat_MilitiaVegi"]/statBases/ArmorRating_Sharp 0.55 - Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar"]/statBases/Mass + Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar" or defName="Miho_Apparel_Hat_MilitiaVegi"]/statBases/Mass 2.1 @@ -530,28 +526,33 @@ - Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases + Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or + defName="Miho_Apparel_OnSkin_OrnatedTwo" or + defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases 2 0 - - Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or + defName="Miho_Apparel_OnSkin_OrnatedTwo" or + defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases/ArmorRating_Sharp 2 - Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or defName="Miho_Apparel_OnSkin_OrnatedTwo"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or + defName="Miho_Apparel_OnSkin_OrnatedTwo" or + defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases/ArmorRating_Blunt 6 + @@ -561,6 +562,44 @@ 0 + + + Defs/ThingDef[defName="Miho_Apparel_Mask_Eltex"]/statBases/ArmorRating_Sharp + + 2.5 + + + + + Defs/ThingDef[defName="Miho_Apparel_Mask_Eltex"]/statBases/ArmorRating_Blunt + + 1 + + + + + + + Defs/ThingDef[defName="Miho_Apparel_Hat_EltexCaptain"]/statBases + + 1 + 0 + + + + + Defs/ThingDef[defName="Miho_Apparel_Hat_EltexCaptain"]/statBases/ArmorRating_Sharp + + 4 + + + + + Defs/ThingDef[defName="Miho_Apparel_Hat_EltexCaptain"]/statBases/ArmorRating_Blunt + + 0.4 + + @@ -593,6 +632,37 @@ + + + + Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedCaptain"]/statBases + + 8 + 6 + + + + + Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedCaptain"]/statBases/ArmorRating_Sharp + + 3.5 + + + + + Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/StuffEffectMultiplierArmor + + 0.5 + + + + + Defs/ThingDef[defName="Miho_Apparel_OnSkin_PMC"]/statBases/ArmorRating_Blunt + + 1.5 + + + diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml index 2ca81bba4a..57b54bc2ff 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel_Special.xml @@ -21,18 +21,6 @@ - - Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/MoveSpeed - - - - Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Long - - - - Defs/ThingDef[defName="Miho_Apparel_Special_Magnifier"]/equippedStatOffsets/ShootingAccuracyFactor_Medium - - @@ -53,10 +41,6 @@ - - Defs/ThingDef[defName="Miho_Apparel_Special_TacticalAssist"]/equippedStatOffsets/MoveSpeed - - diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml index 192a57babc..6cf0fc2643 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml @@ -1,5 +1,31 @@ + + + + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_47x398mmR"]/ammoTypes + + Bullet_47x398mmR_Miho + + + + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_57x280mmR"]/ammoTypes + + Bullet_57x280mmR_Canister + Bullet_57x280mmR_Thermobaric + + + + + + + Defs/ThingDef[ + defName="Miho_MechWeapon_Heavygrenade" + ]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] + + @@ -43,16 +69,17 @@ Miho_MechWeapon_Heavygun - 1.56 + 2.24 0.07 - 1.10 - 60.00 - 2.51 + 1.98 + 26.50 + 0.50 + 5.48 CombatExtended.Verb_ShootCE true - Bullet_Miho47x285mm_AP + Bullet_47x398mmR_AP 2.1 86 Miho_KineticCannon @@ -63,7 +90,7 @@ 1 4 4.5 - AmmoSet_Miho47x285mm + AmmoSet_47x398mmR AimedShot @@ -118,7 +145,7 @@ 2.5 1 - 0.4 + 1 2 40 @@ -141,13 +168,13 @@ - 12 - 14 + 8 + 12 AmmoSetMiho100mm_Incendiary FALSE - 6 + 4 AimedShot true @@ -200,37 +227,43 @@ 1.56 0.07 - 1.10 - 60.00 - 2.51 + 1.86 + 14.57 + 0.46 + 4.67 CombatExtended.Verb_ShootCE true - Bullet_Miho57x93mmGrenade_HE - 1.1 - 62 - 3 - 30 + Bullet_57x280mmR_Canister + 2.9 + 75 + 1 Miho_GrenadeLauncher GunTail_Heavy 10 - 12 - - 3.5 - AmmoSet_Miho57x93mmGrenade + 1 + 3 + 9 + AmmoSet_57x280mmR - 3 - TRUE AimedShot
  • NoSwitch
    •      + + Defs/ThingDef[defName="Miho_MechWeapon_Heavygrenade"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + CompEquippable +
    • +     +     Defs/ThingDef[ defName="Miho_MechWeapon_CluRocket" ]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] @@ -241,7 +274,7 @@ 2.5 1 - 0.4 + 1 2 40 @@ -266,7 +299,7 @@ 20 14 - AmmoSet_50mmRocket + AmmoSet_57mmMihoRocket_indirect TRUE @@ -293,4 +326,44 @@ + + + + + Miho_MechWeapon_HeavyAutoCannon + + 1.00 + 0.01 + 1.81 + 30 + 75 + 0.37 + + + 0.97 + CombatExtended.Verb_ShootCE + true + Bullet_132x92mmSRTuF_FMJ + 1.3 + 10 + 4 + 75 + Miho_SevenSevenRifle + GunTail_Medium + 9 + + + 100 + 7.8 + AmmoSet_132x92mmSRTuF + + + 5 + FALSE + AimedShot + + +
  • NoSwitch
    • +     +     \ No newline at end of file diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml index afa83516d6..dba05a8296 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml @@ -126,7 +126,7 @@ 2 1.57 - 0.4 + 0.2 1.6 Handle @@ -139,7 +139,7 @@ 1.45 1 1.296 - 2.16 + 8.68 Point
  • @@ -151,7 +151,7 @@ 1.22 1 3.6 - 1.8 + 5.4 Edge
    • @@ -175,52 +175,85 @@     - + Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/tools
  • - +
  • Poke
    • +
  • Blunt
    • 4 1.78 - 0.10 + 0.30 1.000 - Handle + +
  • + Stun + 3 + 0.15 +
    • +     +     +     +     + + + Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/statBases + + 1.24 + 8 + + + + + Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/equippedStatOffsets/MeleeDodgeChance + + 0.30 + 1.18 + 1.30 + + + + + + + Defs/ThingDef[defName="Miho_Weapon_PowerHammer"]/tools + +
  • Demolish
    • - 22 - 2.36 - 0.30 - 11.76 - Head + 5 + 0.30 + 8     - Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/statBases + Defs/ThingDef[defName="Miho_Weapon_PowerHammer"]/statBases - 0.24 - 8 + 0 + 12 - Defs/ThingDef[defName="Miho_Weapon_Sappertool"]/equippedStatOffsets/MeleeDodgeChance + Defs/ThingDef[defName="Miho_Weapon_PowerHammer"]/equippedStatOffsets/MoveSpeed - 2.30 - 0.18 - 0.30 + -0.15 + 0 + 0 + 0 diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml index 60261d584d..c2709840cd 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml @@ -1,4 +1,111 @@ - - \ No newline at end of file + + + Defs/ThingDef[ + @Name="Miho_DeployableHMG" or + @Name="Miho_DeployableMissile" + ]/thingClass + + CombatExtended.Building_TurretGunCE + + + + + Defs/ThingDef[ + defName="Miho_Turret_Machinegun" or + defName="Miho_Turret_Missile" + ]/statBases + + 0.5 + + + + + + Miho_BuildingWeapon_Machinegun + + 1.80 + 0.05 + 1.01 + 13.50 + 15 + 0.37 + + + 0.97 + CombatExtended.Verb_ShootCE + true + Bullet_77x58mmArisaka_FMJ + 1.2 + 10 + 7 + 44 + Miho_SevenSevenRifle + GunTail_Medium + 9 + + + 30 + 4.9 + AmmoSet_77x58mmArisaka + + + 5 + TRUE + AimedShot + + +
  • TurretGun
    • +     +     + + + + Defs/ThingDef[defName = "Miho_Turret_Missile"]/inspectorTabs + + + + Defs/ThingDef[ defName="Miho_Turret_Missile"]/building/turretBurstCooldownTime + + 1.5 + + + + + Miho_BuildingWeapon_Missile + + 2 + 3 + 0.0 + 0.14 + 20 + + + 1.13 + CombatExtended.Verb_ShootCE + true + Bullet_MihoMMAT + 2.5 + 86 + Miho_ATRocket + GunTail_Heavy + 12 + Mounted + + true + + + + 1 + 5 + AmmoSet_MihoMissile + + + + +
  • TurretGun
    • +     +     + + diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml index 171e98c332..8544fb5aed 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml @@ -22,6 +22,20 @@ Bullet_77x58mmArisaka_Miho + + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_132x92mmSRTuF"]/ammoTypes + + Bullet_132x92mmSRTuF_Miho + + + + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_20x42mmGrenade"]/ammoTypes + + Bullet_20x42mm_Miho + + @@ -29,7 +43,7 @@ Defs/ThingDef[ defName="Miho_Weapon_Shotgun" or defName="Miho_Weapon_ShotgunPsychic" or - defName="Miho_Weapon_HeavyPistolFlechette" + defName="Miho_Weapon_AutoShotgun" ]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] @@ -64,7 +78,7 @@ 9 - 18 + 24 4 AmmoSet_8x22mmNambu @@ -84,7 +98,7 @@ 0.09 1.22 8.15 - 4.00 + 3.60 0.37 @@ -106,7 +120,7 @@ 9 - 20 + 24 4 AmmoSet_65x50mmSRArisaka @@ -116,6 +130,84 @@ AimedShot + + + + + Miho_Weapon_RifleDefenceGrenade + + 1.00 + 0.09 + 1.32 + 9.15 + 4.00 + 0.37 + + + 60 + 10 + 7 + + + 1.86 + CombatExtended.Verb_ShootCE + true + Bullet_65x50mmSRArisaka_FMJ + 1.1 + 6 + 6 + 48 + Miho_DefenceRifle + GunTail_Medium + 9 + + + 24 + 4 + AmmoSet_65x50mmSRArisaka + + + 3 + TRUE + AimedShot + + + + + Defs/ThingDef[defName="Miho_Weapon_RifleDefenceGrenade"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + + 2 + 4 + AmmoSet_20x42mmGrenade + + + 2.51 + CombatExtended.Verb_ShootCE + true + Bullet_20x42mmGrenade_HE + 1.1 + 35 + + true + + Miho_GrenadeLauncher + GunTail_Heavy + 5 + 1 + + + FALSE + AimedShot + 1 + +
    • +
  • + CompEquippable +
    • +     +     @@ -218,7 +310,7 @@ CombatExtended.Verb_ShootCE true - Bullet_40x46mmGrenade_HE + Bullet_20x42mmGrenade_HE 1.1 46 Miho_GrenadeLauncher @@ -229,10 +321,9 @@ 9 - 1 - 3 - 2.2 - AmmoSet_40x46mmGrenade + 5 + 4 + AmmoSet_20x42mmGrenade FALSE @@ -278,97 +369,45 @@ Snapshot - - - - - Miho_Weapon_HeavyPistol - - 0.80 - 0.15 - 1.75 - 4.7 - 3 - 2.1 - - - 2.71 - CombatExtended.Verb_ShootCE - true - Bullet_10mmMihogrenade - 1.1 - 35 - Miho_Pistol - GunTail_Medium - 9 - - - AmmoSet_10mmMihogrenade - 3 - - - FALSE - Snapshot - - + + - Miho_Weapon_HeavyPistolFlechette + Miho_Weapon_AutoShotgun - 0.80 - 0.15 - 1.75 - 4.7 - 3 - 2.1 - - - 2.71 - CombatExtended.Verb_ShootCE - true - Bullet_10mmMihogrenade - 1.1 - 35 - Miho_Pistol - GunTail_Medium - 9 - - - AmmoSet_10mmMihogrenadeFlechette - 3 - - - FALSE - Snapshot - - - - - Miho_Weapon_HeavyPistolHardkill - - 0.80 - 0.15 - 1.75 - 4.7 - 3 - 2.1 + 0.70 + 0.17 + 0.77 + 11.93 + 3.6 + 0.36 + + 55 + 15 + 4 + - 2.71 + 2.88 CombatExtended.Verb_ShootCE true - Bullet_10mmMihogrenade - 1.1 - 35 - Miho_Pistol - GunTail_Medium + Bullet_12Gauge_Buck + 0.6 + 3 + 8 + 18 + Miho_Shotgun + GunTail_Heavy 9 - AmmoSet_10mmMihogrenadeBarrier - 3 + 8 + true + 0.85 + AmmoSet_12Gauge + 2 FALSE Snapshot @@ -461,31 +500,31 @@ 0.37 1.1 0.09 - 1.40 - 9.80 + 1.28 + 6.80 - 2.70 + 1.08 CombatExtended.Verb_ShootCE true Bullet_MechPsyShot 0.8 - 3 - 20 - 66 - Miho_Shotgun + 5 + 5 + 49.5 + Miho_SilencedPistol GunTail_Heavy 9 - 12 - 4.3 + 25 + 4 AmmoSet_MechPsyShot - 2 - TRUE - AimedShot + 3 + FALSE + Snapshot @@ -493,30 +532,34 @@ Miho_Weapon_Pistol 0.80 - 0.15 + 0.35 0.75 2.2 0.9 0.36 - 0.9 + 0.41 CombatExtended.Verb_ShootCE true - Bullet_8x22mmNambu_FMJ - 0.5 - 21 + Bullet_Nail_HV + 0.6 + 10 + 3 + 12 Miho_Pistol GunTail_Light 9 - 8 - 2 - AmmoSet_8x22mmNambu + 60 + 4 + AmmoSet_Nail_HV + 5 FALSE + Snapshot @@ -526,6 +569,111 @@
  • CE_OneHandedWeapon
    • + + + + + Miho_Weapon_RiflePsychic + + 0.37 + 3.00 + 0.09 + 1.40 + 11.80 + + + 0.82 + CombatExtended.Verb_ShootCE + true + Bullet_MechPsyShot + 1.2 + 75 + Miho_SilencedRifle + GunTail_Heavy + 9 + 2 + + + 16 + 4 + AmmoSet_MechPsyRifle + + + FALSE + AimedShot + + + + + + + + Defs/ThingDef[defName="Miho_Weapon_RifleRecoillessSharp"]/comps + + +
  • + CompEquippable +
    • +
  • +
  • +
  • +
  • + CompQuality +
    • +
  • + NamerArtWeaponGun + ArtDescription_WeaponGun + Excellent +
    • +     +     +     + + + Miho_Weapon_RifleRecoillessSharp + + 8.80 + 1.50 + 1.00 + 0.2 + 1.83 + 10.50 + 25500 + + + 5 + 70 + 3 + + + CombatExtended.Verb_ShootCE + true + Bullet_RPG7Grenade_HEAT + 1.9 + 48 + 3 + Miho_ATRocket + GunTail_Heavy + true + false + 15 + + true + + + + + 1 + 9.1 + AmmoSet_MihoMissile_S + + + + FALSE + AimedShot + + + @@ -538,7 +686,10 @@ defName="Miho_Weapon_Shotgun" or defName="Miho_Weapon_RiflePlasma" or defName="Miho_Weapon_ShotgunPsychic" or - defName="Miho_Weapon_SniperPlasma" + defName="Miho_Weapon_SniperPlasma" or + defName="Miho_Weapon_RiflePsychic" or + defName="Miho_Weapon_RifleRecoillessSharp" or + defName="Miho_Weapon_RifleDefenceGrenade" ]/tools diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml index f1e97430e9..7285d4bebb 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml @@ -96,47 +96,8 @@ - - Defs/ThingDef[@Name="MihoPawn"]/tools - - -
  • - - -
  • Blunt
    • - - 1 - 1.26 - LeftHand - 0.250 - -
  • - - -
  • Blunt
    • - - 1 - 1.26 - RightHand - 0.250 - -
  • - - -
  • Blunt
    • - - 2 - 4.49 - HeadAttackTool - 0.2 - 0.625 - -     -     -     - - Defs/ThingDef[@Name="MihoPawn"]/damageMultipliers + Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/damageMultipliers
  • PrometheumFlame diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml index 9bc3e269a0..da44646543 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoHediff.xml @@ -89,7 +89,7 @@ - + Defs/HediffDef[defName="Miho_Armor_HediffTwo"]/stages/li/statOffsets/ArmorRating_Sharp @@ -119,4 +119,29 @@ 2 + + + + + Defs/HediffDef[defName="Miho_Ability_HeatArmor_Hediff"]/stages/li/statOffsets/ArmorRating_Sharp + + 2.5 + + + + + Defs/HediffDef[defName="Miho_Ability_HeatArmor_Hediff"]/stages/li/statOffsets/ArmorRating_Blunt + + 2.5 + + + + + + + Defs/HediffDef[defName="Miho_Command_Charge_Hediff"]/stages/li/statFactors + + -0.5 + + \ No newline at end of file diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml index f027c4b762..6315f45abb 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml @@ -23,6 +23,19 @@ + + + Defs/PawnKindDef[defName="Miho_Mech_Sapsal"] + +
  • + + 5 + 5 + + IncendiaryMiho +
    • +     +     Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases @@ -182,6 +195,32 @@ + + + Defs/PawnKindDef[defName="Miho_Mech_Bulgasal"] + +
  • + + 5 + 5 + + IncendiaryMiho +
    • +     +     + + + Defs/PawnKindDef[defName="Miho_Mech_BulgasalGrenade"] + +
  • + + 5 + 5 + + BuckShot +
    • +     +     Defs/ThingDef[defName="Miho_Mech_BulgasalSiege"] @@ -286,30 +325,6 @@ - - Defs/ThingDef[defName="Miho_Mech_Cataphract"] - - -
  • - 5000 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 100 - 0.50 -
    • -     -     -     - Defs/ThingDef[defName="Miho_Mech_Cataphract" or defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases @@ -324,21 +339,21 @@ - Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Sharp - 32 + 10 - Defs/ThingDef[defName="Miho_Mech_Cataphract"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Blunt - 72 + 22.5 - Defs/ThingDef[defName="Miho_Mech_Cataphract"]/tools + Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/tools
  • @@ -350,6 +365,7 @@ 1.9 FrontLeftLeg 5.5 + true
  • @@ -360,39 +376,61 @@ 1.9 FrontLeftLeg 5.5 -
    • -
  • - - -
  • Demolish
    • - - 80 - 7.06 - HeadAttackTool - 37.5 - 2 true     + + + Defs/ThingDef[defName="Miho_Mech_Balbari"]/comps + +
  • + 5000 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 100 + 0.50 +
    • +     +     + + + Defs/ThingDef[defName="Miho_Mech_Balbari"]/statBases + + 0.05 + 0.15 + 0.30 + 0.80 + 1.5 + + - Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="Miho_Mech_Balbari"]/statBases/ArmorRating_Sharp - 10 + 20 - Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="Miho_Mech_Balbari"]/statBases/ArmorRating_Blunt - 22.5 + 45 - Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/tools + Defs/ThingDef[defName="Miho_Mech_Balbari"]/tools
  • @@ -400,7 +438,7 @@
  • Blunt
    • - 21 + 15 1.9 FrontLeftLeg 5.5 @@ -411,7 +449,7 @@
  • Blunt
    •  - 21 + 15 1.9 FrontLeftLeg 5.5 @@ -420,4 +458,38 @@     + + + Defs/PawnKindDef[defName="Miho_Mech_Balbari"] + +
  • + + 5 + 5 + + IncendiaryMiho +
    • +     +     + + + Defs/ThingDef[defName="Miho_MechATMissile_Proj"]/projectile/damageAmountBase + + 400 + + + + + Defs/ThingDef[defName="Miho_MechATMissile_Proj"]/projectile/armorPenetrationBase + + 133 + + + + + Defs/AbilityDef[defName="Miho_MechATMissileReloadable"]/verbProperties/range + + 86 + + \ No newline at end of file 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 335e6d24f9..d9941fbfbe 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 @@ -7,7 +7,7 @@ AmmoFeralScrap AmmoRifles - ThirdParty/Rimsenal/Nail/Nail_c + Things/Ammo/Nail/Nail_c @@ -45,7 +45,7 @@ Ammo_Feral_Scrap - ThirdParty/Rimsenal/Nail + Things/Ammo/Nail Graphic_StackCount @@ -81,7 +81,7 @@ AmmoFeralNail AmmoRifles - ThirdParty/Rimsenal/Nail/Nail_c + Things/Ammo/Nail/Nail_c @@ -122,7 +122,7 @@ Ammo_Feral_Nail - ThirdParty/Rimsenal/Nail + Things/Ammo/Nail Graphic_StackCount diff --git a/Textures/ThirdParty/Rimsenal/Nail/Nail_a.png b/Textures/Things/Ammo/Nail/Nail_a.png similarity index 100% rename from Textures/ThirdParty/Rimsenal/Nail/Nail_a.png rename to Textures/Things/Ammo/Nail/Nail_a.png diff --git a/Textures/ThirdParty/Rimsenal/Nail/Nail_b.png b/Textures/Things/Ammo/Nail/Nail_b.png similarity index 100% rename from Textures/ThirdParty/Rimsenal/Nail/Nail_b.png rename to Textures/Things/Ammo/Nail/Nail_b.png diff --git a/Textures/ThirdParty/Rimsenal/Nail/Nail_c.png b/Textures/Things/Ammo/Nail/Nail_c.png similarity index 100% rename from Textures/ThirdParty/Rimsenal/Nail/Nail_c.png rename to Textures/Things/Ammo/Nail/Nail_c.png