diff --git a/About/About.xml b/About/About.xml index 63aa152..af02964 100644 --- a/About/About.xml +++ b/About/About.xml @@ -4,7 +4,7 @@ NoImageAvailable https://ludeon.com/forums/index.php?topic=9759.0 Alpha 13 - Version: 1.6.2 + Version: 1.6.5 An extensive overhaul of the game's combat to make it more realistic. diff --git a/Assemblies/CombatRealism.dll b/Assemblies/CombatRealism.dll index f359289..b1e87a9 100644 Binary files a/Assemblies/CombatRealism.dll and b/Assemblies/CombatRealism.dll differ diff --git a/Defs/PawnKindDefs/PawnKinds_Mercenary.xml b/Defs/PawnKindDefs/PawnKinds_Mercenary.xml index 1fcac8d..05a85ec 100644 --- a/Defs/PawnKindDefs/PawnKinds_Mercenary.xml +++ b/Defs/PawnKindDefs/PawnKinds_Mercenary.xml @@ -29,7 +29,7 @@ 0.5 300 - 750 + 1000
  • Gun
    • @@ -275,6 +275,10 @@
  • CR_MachineGun
    •  + + 1200 + 2000 + 1 1 diff --git a/Defs/StatDefs/Stats_Weapons_Melee.xml b/Defs/StatDefs/Stats_Weapons_Melee.xml new file mode 100644 index 0000000..dd1eeea --- /dev/null +++ b/Defs/StatDefs/Stats_Weapons_Melee.xml @@ -0,0 +1,40 @@ + + + + + ArmorPenetration + + Capability to penetrate armor on a strike. + Weapon + 0 + PercentTwo + false + +
  • + 0.5 + 0.675 + 0.85 + 1 + 1.1 + 1.2 + 1.3 + 1.4 + 1.5 +
    • +
  • + + +
  • (0,0.0)
    • +
  • (1,1)
    • + + + +     + 896 +     + + + + + +     \ No newline at end of file diff --git a/Defs/StatDefs/Stats_Weapons_Ranged.xml b/Defs/StatDefs/Stats_Weapons_Ranged.xml index 53536a5..a62bd3c 100644 --- a/Defs/StatDefs/Stats_Weapons_Ranged.xml +++ b/Defs/StatDefs/Stats_Weapons_Ranged.xml @@ -15,12 +15,12 @@
  • 0.7 0.8 - 0.93 + 0.9 1 - 1.05 - 1.1 - 1.2 - 1.35 + 1.1 + 1.2 + 1.3 + 1.4 1.5
  • diff --git a/Defs/StuffCategoryDefs/StuffCategories.xml b/Defs/StuffCategoryDefs/StuffCategories.xml index df951aa..48ed783 100644 --- a/Defs/StuffCategoryDefs/StuffCategories.xml +++ b/Defs/StuffCategoryDefs/StuffCategories.xml @@ -5,6 +5,11 @@ Steeled + + + Metallic_Weapon + + diff --git a/Defs/ThingDefs/Apparel_Carrying.xml b/Defs/ThingDefs/Apparel_Carrying.xml index eedbcca..0dcddda 100644 --- a/Defs/ThingDefs/Apparel_Carrying.xml +++ b/Defs/ThingDefs/Apparel_Carrying.xml @@ -3,6 +3,7 @@ Apparel + Midworld Item True 10 diff --git a/Defs/ThingDefs/Apparel_Various.xml b/Defs/ThingDefs/Apparel_Various.xml index 85a25ea..f7fec3f 100644 --- a/Defs/ThingDefs/Apparel_Various.xml +++ b/Defs/ThingDefs/Apparel_Various.xml @@ -30,6 +30,20 @@
    • + + + + TailoringSpeed + Crafting + Tailor + Recipe_Tailor + +
  • ElectricTailoringBench
    • +
  • HandTailoringBench
    • +     + UnfinishedApparel +     +     @@ -45,6 +59,81 @@ + + Apparel_Parka + + A thick parka for staying warm in even the coldest of temperatures. + + Things/Pawn/Humanlike/Apparel/Parka/Parka + Graphic_Single + + 120 + +
  • Fabric
    • +
  • Leathery
    • +     + +
  • Apparel
    • +     + + 200 + 22000 + 0.03 + 0.03 + -40 + -3 + 1 + 10 + 1 + 3 + + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +     + Things/Pawn/Humanlike/Apparel/Parka/Parka + +
  • Shell
    • +     + 1 + +
  • Outlander
    • +
  • Tribal
    • +     + +
  • Worker
    • +
  • Soldier
    • +     +     + + +
  • + 10 + RGBA(0.33,0.33,0.33,1) +
    • +
  • + 10 + RGBA(0.65,0.65,0.65,1) +
    • +
  • + 10 + RGBA(0.4,0.3,0.15,1) +
    • +
  • + 15 + RGBA(0.3,0.3,0.3,1) + RGBA(0.5,0.5,0.5,1) +
    • +
  • + 6 + RGBA(0.5,0.5,0.5,1) + RGBA(1,1,1,1) +
    • +     +     +     diff --git a/Defs/ThingDefs/Weapons_Guns.xml b/Defs/ThingDefs/Weapons_Guns.xml index 07cda62..1f51de1 100644 --- a/Defs/ThingDefs/Weapons_Guns.xml +++ b/Defs/ThingDefs/Weapons_Guns.xml @@ -523,8 +523,8 @@ InteractRifle - 22000 - 1600 + 18000 + 1200 0.50 0.08 3.42 @@ -767,7 +767,7 @@ Graphic_Single TransparentPostLight - Projectile_DoomsdayRocket + Combat_Realism.ProjectileCR_Explosive Bomb 250 @@ -845,7 +845,7 @@ Graphic_Single TransparentPostLight - Projectile_Explosive + Combat_Realism.ProjectileCR_Explosive Bomb 180 diff --git a/Defs/ThingDefs/Weapons_Melee.xml b/Defs/ThingDefs/Weapons_Melee.xml index 32666e9..dbbbe81 100644 --- a/Defs/ThingDefs/Weapons_Melee.xml +++ b/Defs/ThingDefs/Weapons_Melee.xml @@ -108,12 +108,15 @@ 50 20000 - 18 + 14 0.975 + 0.2 + 3.5 + 1 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -139,12 +142,15 @@ 120 40000 - 20 + 16 1.25 + 0.225 + 8 + 1.6 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -176,10 +182,13 @@ 6000 12 0.83 + 0.175 + 1 + 0.3     -65 -
  • Metallic
    • +
  • Metallic_Weapon
    •
  • @@ -206,13 +215,16 @@ 10 300 - 11 + 10 0.5 0.83 + 0.125 + 1 + 0.3 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
  • Stony
    • @@ -250,10 +262,13 @@ 25000 18 1.15 + 0.275 + 10 + 2.5 -25 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -277,12 +292,12 @@ 75 15000 - 20 + 16 1.05 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
    •  @@ -314,13 +329,13 @@ 40 500 - 16 + 13 0.5 1.35 -65 -
  • Metallic
    • +
  • Metallic_Weapon
  • Woody
  • Stony
    •  diff --git a/Defs/ThingDefs_Items/Items_Resource_Stuff.xml b/Defs/ThingDefs_Items/Items_Resource_Stuff.xml index a8b348a..4caf416 100644 --- a/Defs/ThingDefs_Items/Items_Resource_Stuff.xml +++ b/Defs/ThingDefs_Items/Items_Resource_Stuff.xml @@ -127,6 +127,7 @@ +
  • Metallic_Weapon
  • Metallic
  • Steeled
    •  @@ -160,9 +161,8 @@ false 27 - 0.8 - 0.3 - 1.2 + 0.8 + 0.3 1.0 @@ -170,6 +170,7 @@ +
  • Metallic_Weapon
  • Metallic
  • Steeled
    •  @@ -194,6 +195,7 @@ 0.8 1.0 1.15 + 1.3 true     @@ -219,7 +221,6 @@ 2 8 2.2 - 0.7 0.3 0.1 0.3 @@ -246,6 +247,7 @@ 1.2 0.9 0.1 + 0.3     true @@ -277,9 +279,8 @@ Metal_Drop 5 - 2.5 - 0.3 - 1.1 + 2.5 + 0.3 1.4 @@ -289,6 +290,7 @@ true +
  • Metallic_Weapon
  • Metallic
    •  (100,100,100) @@ -303,6 +305,8 @@ 0.0 0.9 1.35 + 1.4 + 2.5 true     diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml index 0f0bb05..187d236 100644 --- a/Languages/English/Keyed/Keys.xml +++ b/Languages/English/Keyed/Keys.xml @@ -47,5 +47,6 @@ Burst shot count Out of ammo Put away {0} + can't do taming job because of a full inventory. diff --git a/Source/CombatRealism/Combat_Realism/Utility.cs b/Source/CombatRealism/Combat_Realism/Utility.cs index f271ac7..eb60731 100644 --- a/Source/CombatRealism/Combat_Realism/Utility.cs +++ b/Source/CombatRealism/Combat_Realism/Utility.cs @@ -168,6 +168,21 @@ public static int GetAfterArmorDamage(Pawn pawn, int damAmountInt, BodyPartRecor { pierceAmount = projectileProps.armorPenetration; } + else if (dinfo.Instigator != null) + { + Pawn instigatorPawn = dinfo.Instigator as Pawn; + if (instigatorPawn != null) + { + if (instigatorPawn.equipment != null && instigatorPawn.equipment.Primary != null) + { + pierceAmount = instigatorPawn.equipment.Primary.GetStatValue(StatDef.Named("ArmorPenetration")); + } + else + { + pierceAmount = instigatorPawn.GetStatValue(StatDef.Named("ArmorPenetration")); + } + } + } } // Run armor calculations on all apparel diff --git a/Textures/Effects/MediumLaserRayFiringGreen.png b/Textures/Effects/MediumLaserRayFiringGreen.png deleted file mode 100644 index b54b260..0000000 Binary files a/Textures/Effects/MediumLaserRayFiringGreen.png and /dev/null differ diff --git a/Textures/Effects/MediumLaserRayFiringRed.png b/Textures/Effects/MediumLaserRayFiringRed.png deleted file mode 100644 index 10f12ca..0000000 Binary files a/Textures/Effects/MediumLaserRayFiringRed.png and /dev/null differ diff --git a/Textures/Effects/TinyLaserRayFiringRed.png b/Textures/Effects/TinyLaserRayFiringRed.png deleted file mode 100644 index b18dc6c..0000000 Binary files a/Textures/Effects/TinyLaserRayFiringRed.png and /dev/null differ