diff --git a/About/About.xml b/About/About.xml index bc5013ade2..2669b71fe8 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,8 +2,9 @@ Combat Extended CE Team - https://github.com/CombatExtendedRWMod/CombatExtended + https://ludeon.com/forums/index.php?topic=33461.0 +
  • 1.0
  • 1.1
    •  CETeam.CombatExtended diff --git a/Assemblies/CombatExtended.dll b/Assemblies/CombatExtended.dll index 83ae3f6147..0632d2eb31 100644 Binary files a/Assemblies/CombatExtended.dll and b/Assemblies/CombatExtended.dll differ diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml index 7b7fbabcc6..3402e86e4c 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml @@ -49,7 +49,7 @@ TranqNonLethal - A non-lethal round designed filled with fast-acting sedatives and tipped with a hypodermic needle. + Special round designed for non-lethal engagements of targets. Filled with fast-acting sedatives and tipped with a hypodermic needle. \ No newline at end of file diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Medieval.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Medieval.xml index 5331aa5c62..53dc967fcc 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Medieval.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Medieval.xml @@ -17,35 +17,4 @@ Fitted with a streamlined and hardened steel tip to punch through armored targets. - - - StoneCrossbowBolt - - stone - A sharpened stone is attached to a wooden shaft. Cuts exposed tissue fairly well but isn't very effective against armor. - - - - SteelCrossbowBolt - - steel - The head of the crossbow bolt is made from steel to enhance armor penetration. - true - - - - PlasteelCrossbowBolt - - plasteel - The head of the crossbow bolt is made from plasteel to maximize armor penetration. - true - - - - MusketBall - - lead ball - A smooth projectile made of soft metal, usually fired from a smoothbore weapon. - - \ No newline at end of file diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Missiles.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Missiles.xml index 6767df1e46..a7505ce53c 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Missiles.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Missiles.xml @@ -1,7 +1,7 @@  - + TomahawkLAM diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Neolithic.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Neolithic.xml index 10d7ae7d0a..72caad4775 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Neolithic.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Neolithic.xml @@ -3,20 +3,20 @@ Javelin - A heavy steel tip attached to a long wooden pole, packing a very strong punch against armored targets. + A heavy steel tip attached to a long wooden pole, packing a very strong punch against scarcely armored targets. Kunai - Originally a farming instrument, similar in use to a hand-shovel, the kunai is a multi-purpose tool useful in both ranged and melee combat. + Originally a Japanese farming instrument, similar in use to a hand-shovel, the kunai is a multi-purpose tool useful in both ranged and melee combat. StoneArrow stone - A sharpened stone fasioned into an arrow head and lashed to a wooden shaft. Cuts exposed tissue fairly well but is ineffective against any kind of armor. + A sharpened stone is attached as an arrow head. Cuts exposed tissue fairly well but is ineffective against any kind of armor. @@ -60,13 +60,36 @@ true + + StoneCrossbowBolt + + stone + A sharpened stone is attached to a wooden shaft. Cuts exposed tissue fairly well but isn't very effective against armor. + + + + SteelCrossbowBolt + + steel + The head of the crossbow bolt is made from steel to enhance armor penetration. + true + + + + PlasteelCrossbowBolt + + plasteel + The head of the crossbow bolt is made from plasteel to maximize armor penetration. + true + + VenomArrow venom - A steel arrow head coated in a potent toxin. + The arrow head is made from steel and coated in toxin. true @@ -74,7 +97,7 @@ FlameArrow flame - A steel arrowhead constructed like a cage to hold incendiary components for setting targets alight. + Steel open cage arrowhead containing incendiary components for setting targets alight. true diff --git a/Defs/Ammo/Medieval/MusketBall.xml b/Defs/Ammo/Medieval/MusketBall.xml index cb96f7e49f..e86a1b994a 100644 --- a/Defs/Ammo/Medieval/MusketBall.xml +++ b/Defs/Ammo/Medieval/MusketBall.xml @@ -1,129 +1,129 @@ - - - - - AmmoMusketBall - - AmmoRifles - UI/Icons/ThingCategories/CaliberRifle - - - - - - - AmmoSet_FastMusketBall - - - Bullet_FastMusketBall - - - - - - AmmoSet_SlowMusketBall - - - Bullet_SlowMusketBall - - - - - - - A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms. - - 0.12 - 0.14 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_FueledSmithy
    • -
  • CE_AutoEnableCrafting_ElectricSmithy
    • -     - -
  • AmmoMusketBall
    • -     -     - - - Ammo_MusketBall - - - Things/Ammo/Neolithic/SlingBullet/Steel - Graphic_StackCount - - - 0.5 - - FullMetalJacket - - - - - - - Things/Projectile/Bullet_big - Graphic_Single - - - Bullet - false - - - - - - - Bullet_FastMusketBall - - - 60 - 20 - 6.7 - 28.8 - - - - - - - Bullet_SlowMusketBall - - - 80 - 17 - 5.3 - 20 - - - - - - - MakeAmmo_MusketBall - - Craft 500 lead balls. - Making lead balls. - 6800 - -
  • - - -
  • Steel
    • - - - 68 - -     - - -
  • Steel
    • -     -     - - 500 - -     - + + + + + AmmoMusketBall + + AmmoRifles + UI/Icons/ThingCategories/CaliberRifle + + + + + + + AmmoSet_FastMusketBall + + + Bullet_FastMusketBall + + + + + + AmmoSet_SlowMusketBall + + + Bullet_SlowMusketBall + + + + + + + A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms. + + 0.12 + 0.14 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FueledSmithy
    • +
  • CE_AutoEnableCrafting_ElectricSmithy
    • +     + +
  • AmmoMusketBall
    • +     +     + + + Ammo_MusketBall + + + Things/Ammo/Neolithic/SlingBullet/Steel + Graphic_StackCount + + + 0.5 + + FullMetalJacket + + + + + + + Things/Projectile/Bullet_big + Graphic_Single + + + Bullet + false + + + + + + + Bullet_FastMusketBall + + + 60 + 20 + 6.7 + 28.8 + + + + + + + Bullet_SlowMusketBall + + + 80 + 17 + 5.3 + 20 + + + + + + + MakeAmmo_MusketBall + + Craft 500 lead balls. + Making lead balls. + 6800 + +
  • + + +
  • Steel
    • + + + 68 + +     + + +
  • Steel
    • +     +     + + 500 + +     +     \ No newline at end of file diff --git a/Defs/Ammo/Recipes_HandGrenades.xml b/Defs/Ammo/Recipes_HandGrenades.xml index c9b83620e1..a47c9fbd7d 100644 --- a/Defs/Ammo/Recipes_HandGrenades.xml +++ b/Defs/Ammo/Recipes_HandGrenades.xml @@ -262,7 +262,6 @@ Craft 10 firefoam grenades. Making firefoam grenades. - Firefoam 5000
  • diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml index 5eb91222d7..f911772919 100644 --- a/Defs/Ammo/Shell/60mmMortar.xml +++ b/Defs/Ammo/Shell/60mmMortar.xml @@ -373,8 +373,6 @@ Craft 5 60mm firefoam mortar shells. Making 60mm firefoam mortar shells. - Firefoam - 4600
  • @@ -413,6 +411,6 @@ 5 + 4600 - diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index ae4ce0503c..6ca49abfd7 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -478,8 +478,6 @@ Craft 5 81mm firefoam mortar shells. Making 81mm firefoam mortar shells. - Firefoam - 8800
  • @@ -518,6 +516,6 @@ 5 - + 8800 diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml new file mode 100644 index 0000000000..8f3096bd48 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml @@ -0,0 +1,112 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + + Defs/ThingDef[ + defName="ACPBison" or + defName="ACPBlackRhinoceros" or + defName="ACPBlackwolf" or + defName="ACPDirewolf" or + defName="ACPGiraffe" or + defName="ACPHippopotamus" or + defName="ACPHorse" or + defName="ACPLlama" or + defName="ACPMajoreraGoat" or + defName="ACPPeccary" or + defName="ACPSpiritwolf" or + defName="ACPSpiritwolfFF" or + defName="ACPTapir" or + defName="ACPWildDog" or + defName="ACPWoolyHorse" or + defName="ACPWoolyRhino" + ] + + +
  • + Quadruped +
    • + + +
  • + + Defs/ThingDef[ + defName="ACPAcidAnt" or + defName="ACPAngoraRabbit" or + defName="ACPChipmunk" or + defName="ACPDuckBilledPlatypus" or + defName="ACPDomesticRabbit" or + defName="ACPErmine" or + defName="ACPFerret" or + defName="ACPFishercat" or + defName="ACPGuineaPig" or + defName="ACPHaulerAnt" or + defName="ACPHedgehog" or + defName="ACPHoneyBadger" or + defName="ACPJackalope" or + defName="ACPKomodo" or + defName="ACPMegabadger" or + defName="ACPMegaFerret" or + defName="ACPMegascorpion" or + defName="ACPMunchkinCat" or + defName="ACPOtter" or + defName="ACPPorcupine" or + defName="ACPRedPanda" or + defName="ACPSilkspider" or + defName="ACPSpottedSeal" or + defName="ACPThornyDevil" or + defName="ACPWalrus" or + defName="ACPXenguana" or + defName="ACPXGecko" + ] + + +
  • + QuadrupedLow +
    • + + +
  • + + Defs/ThingDef[ + @Name="GooseThingBase" or + defName="ACPDuck" or + defName="ACPFlamingo" or + defName="ACPGreatBustard" or + defName="ACPKiwi" or + defName="ACPPenguin" or + defName="ACPPtarmigan" or + defName="ACPSilkieChicken" or + defName="ACPValleyQuail" + ] + + +
  • + Birdlike +
    • + + + + + + + + + + + + + + + + + + + diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml new file mode 100644 index 0000000000..147866dbbc --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Damages.xml @@ -0,0 +1,47 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/DamageDef[defName="PlatypusSting"] + + PlatypusVenom + +
    • + +
  • + Defs/DamageDef[defName="PlatypusSting"]/additionalHediffs/li[hediff="PlatypusVenom"] +
    • + +
  • + Defs/DamageDef[defName="ScorpionSting"] + + ScorpionVenom + +
    • + +
  • + Defs/DamageDef[defName="ScorpionSting"]/additionalHediffs/li[hediff="ScorpionVenom"] +
    • + +
  • + Defs/DamageDef[ + defName="PlatypusSting" or + defName="ScorpionSting" + ] + +
  • + true +
    • + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml new file mode 100644 index 0000000000..2af72bc360 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Hediffs.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/HediffDef[defName="PlatypusVenom"] + + + PlatypusVenom + + the venom from a platypus' spur + +
  • + + 0.00000335 + 10000 + 15000 +
    • + + + + + +
  • + Defs/HediffDef[defName="ScorpionVenom"] + + + ScorpionVenom + + scorpion venom + +
  • + + 0.00000335 + 10000 + 45000 +
    • + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml new file mode 100644 index 0000000000..b99f00884b --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Angora.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPAngoraRabbit"]/statBases + + 0.24 + 0.02 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPAngoraRabbit"]/tools + + +
  • + +
  • Bite
    • + + 3 + 1.26 + Teeth + 0.01 + 0.250 + +
  • + + +
  • Blunt
    • + + 1 + 1.26 + HeadAttackTool + 0.2 + 0.250 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml new file mode 100644 index 0000000000..523793860c --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_BRhino.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPBlackRhinoceros"]/statBases + Always + + 0.1 + 0.52 + 0.27 + 8 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="ACPBlackRhinoceros"]/tools + + +
  • + + +
  • Poke
    • + + 24 + 3.17 + HornAttackTool + 10 + +
  • + + +
  • Blunt
    • + + 24 + 3.17 + HornAttackTool_2 + 10 + +
  • + +
  • Bite
    • + + 10 + 2.44 + Teeth + 0.04 + 3.5 + +
  • + + +
  • Blunt
    • + + 19 + 2.95 + HeadAttackTool + 0.2 + 7.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml new file mode 100644 index 0000000000..3a412ede37 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Bison.xml @@ -0,0 +1,49 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPBison"]/statBases + + 0.11 + 0.37 + 0.22 + +
    • + +
  • + Defs/ThingDef[defName="ACPBison"]/statBases/MoveSpeed + + 5.6 + +
    • + +
  • + Defs/ThingDef[defName="ACPBison"]/tools + + +
  • + + +
  • Stab
    • + + 20 + 3.09 + HeadAttackTool + 0.2 + 0.12 + 9 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml new file mode 100644 index 0000000000..a73470ea9a --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Blackbear.xml @@ -0,0 +1,97 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPBlackbear"]/statBases + + 0.15 + 0.19 + 0.11 + +
    • + +
  • + Defs/ThingDef[defName="ACPBlackbear"] + + +
  • + + +
  • Scratch
    • + + 21 + 1.41 + FrontLeftPaw + + +
  • + Stun + 21 +
    • +     +     + 0.15 + 4.5 + +
  • + + +
  • Scratch
    • + + 21 + 1.41 + FrontRightPaw + + +
  • + Stun + 21 +
    • +     +     + 0.15 + 4.5 + +
  • + +
  • Bite
    • + + 31 + 2.05 + Teeth + + +
  • + Stun + 21 +
    • +     +     + 0.85 + 8.450 + +
  • + + +
  • Blunt
    • + + 12 + 2.22 + HeadAttackTool + 0.2 + 4.235 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml new file mode 100644 index 0000000000..e9591e3cb2 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Cats.xml @@ -0,0 +1,324 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + + + +
  • + Defs/ThingDef[defName="ACPLion"]/tools + + +
  • + + +
  • Scratch
    • + + 7 + 0.97 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.135 + 0.6345 + +
  • + + +
  • Scratch
    • + + 7 + 0.97 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.135 + 0.6345 + +
  • + +
  • Bite
    • + + 14 + 1.35 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.375 + 2.025 + +
  • + + +
  • Blunt
    • + + 2 + 0.97 + HeadAttackTool + 0.2 + 0.530 + + + + + + + +
  • + Defs/ThingDef[defName="ACPTiger"]/tools + + +
  • + + +
  • Scratch
    • + + 16 + 0.97 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.135 + 0.6345 + +
  • + + +
  • Scratch
    • + + 16 + 0.97 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.135 + 0.6345 + +
  • + +
  • Bite
    • + + 14 + 1.35 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.375 + 2.025 + +
  • + + +
  • Blunt
    • + + 2 + 0.97 + HeadAttackTool + 0.2 + 0.530 + + + + + + + +
  • + Defs/ThingDef[defName="ACPCheetah"]/tools + + +
  • + + +
  • Scratch
    • + + 12 + 0.92 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.07 + 0.338 + +
  • + + +
  • Scratch
    • + + 12 + 0.92 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.07 + 0.338 + +
  • + +
  • Bite
    • + + 12 + 1.37 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.09 + 1.690 + +
  • + + +
  • Blunt
    • + + 2 + 0.97 + HeadAttackTool + 0.2 + 0.423 + + + + + + + +
  • + Defs/ThingDef[ + defName="ACPAmurLeopard" or + defName="ACPSnowLeopard" + ]/tools + + +
  • + + +
  • Scratch
    • + + 14 + 0.92 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.07 + 0.338 + +
  • + + +
  • Scratch
    • + + 14 + 0.92 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.07 + 0.338 + +
  • + +
  • Bite
    • + + 12 + 1.37 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.09 + 1.690 + +
  • + + +
  • Blunt
    • + + 2 + 0.97 + HeadAttackTool + 0.2 + 0.423 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml new file mode 100644 index 0000000000..c2b478639b --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Chipmunk.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPChipmunk"]/statBases + + 0.18 + 0.0 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPChipmunk"]/tools + + +
  • + + +
  • Scratch
    • + + 1 + 1.67 + FrontLeftPaw + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 1 + 1.67 + FrontRightPaw + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 2 + 0.88 + Teeth + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 1 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml new file mode 100644 index 0000000000..571613d5d0 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticCats.xml @@ -0,0 +1,97 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPMunchkinCat"]/statBases + + 0.23 + 0.02 + 0.06 + +
    • + +
  • + Defs/ThingDef[defName="ACPMunchkinCat"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + +
  • Bite
    • + + 5 + 0.85 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.254 + 0.03 + +
  • + + +
  • Blunt
    • + + 1 + 0.55 + HeadAttackTool + 0.2 + 0.042 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml new file mode 100644 index 0000000000..8a9549a1de --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DomesticRabbit.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPDomesticRabbit"]/statBases + + 0.24 + 0.02 + 0.06 + +
    • + +
  • + Defs/ThingDef[defName="ACPDomesticRabbit"]/tools + + +
  • + +
  • Bite
    • + + 3 + 1.26 + Teeth + 0.01 + 0.250 + +
  • + + +
  • Blunt
    • + + 1 + 1.26 + HeadAttackTool + 0.2 + 0.250 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml new file mode 100644 index 0000000000..54286712e0 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Duck.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPDuck"]/statBases + + 0.14 + 0.0 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPDuck"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.33 + Feet + 0.04 + 0.162 + +
  • + +
  • Bite
    • + + 2 + 1.33 + Beak + 0.162 + 0.01 + +
  • + + +
  • Blunt
    • + + 1 + 1.52 + HeadAttackTool + 0.2 + 0.284 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml new file mode 100644 index 0000000000..959c0ae033 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_DuckBilledPlatypus.xml @@ -0,0 +1,63 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/statBases + + 0.07 + 0.11 + 0.02 + +
    • + +
  • + Defs/ThingDef[defName="ACPDuckBilledPlatypus"]/tools + + +
  • + + +
  • PlatypusSting
    • + + 7 + 1.9 + Spurs + 0.06 + 0.33 + +
  • + + +
  • Scratch
    • + + 6 + 1.5 + FrontLeftPaw + 0.04 + 0.162 + +
  • + + +
  • Scratch
    • + + 6 + 1.5 + FrontRightPaw + 0.04 + 0.162 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml new file mode 100644 index 0000000000..01631515e3 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ferret.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPFerret"]/statBases + + 0.27 + 0.15 + 0.02 + +
    • + +
  • + Defs/ThingDef[defName="ACPFerret"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 1.67 + FrontLeftPaw + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 2 + 1.67 + FrontRightPaw + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 4 + 0.88 + Teeth + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 1 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml new file mode 100644 index 0000000000..952f32f1ce --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Flamingo.xml @@ -0,0 +1,70 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPFlamingo"]/statBases + + 0.22 + 0.11 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPFlamingo"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 1.65 + Feet + + +
  • + Stun + 20 +
    • +     +     + 0.1 + 0.480 + +
  • + +
  • Bite
    • + + 4 + 2.08 + Beak + 0.01 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml new file mode 100644 index 0000000000..47e852ba47 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Giraffe.xml @@ -0,0 +1,91 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPGiraffe"]/statBases + + 0.08 + 0.61 + 0.37 + +
    • + +
  • + Defs/ThingDef[defName="ACPGiraffe"]/tools + + +
  • + + +
  • Blunt
    • + + 15 + 1.8 + FrontLeftLeg + 1.125 + +
  • + + +
  • Poke
    • + + 15 + 1.8 + FrontLeftLeg_2 + 1.125 + +
  • + + +
  • Blunt
    • + + 15 + 1.8 + FrontRightLeg + 1.125 + +
  • + + +
  • Poke
    • + + 15 + 1.8 + FrontRightLeg_2 + 1.125 + +
  • + +
  • BiteBlunt
    • + + 6 + 1.66 + Teeth + 0.750 + +
  • + + +
  • Blunt
    • + + 20 + 1.97 + Female + HeadAttackTool + 0.2 + 1.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml new file mode 100644 index 0000000000..9afea04725 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goat.xml @@ -0,0 +1,90 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPMajoreraGoat"]/statBases + + 0.17 + 0.1 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPMajoreraGoat"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 1 + FrontLeftLeg + 1.125 + +
  • + + +
  • Poke
    • + + 5 + 1 + FrontLeftLeg_2 + 1.125 + +
  • + + +
  • Blunt
    • + + 5 + 1 + FrontRightLeg + 1.125 + +
  • + + +
  • Poke
    • + + 5 + 1 + FrontRightLeg_2 + 1.125 + +
  • + +
  • Bite
    • + + 4 + 1.5 + Teeth + 0.4 + +
  • + + +
  • Blunt
    • + + 6 + 2.12 + HeadAttackTool + 0.2 + 2 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml new file mode 100644 index 0000000000..67c8128485 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Goose.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[@Name="GooseThingBase"]/statBases + + 0.12 + 0.01 + 0.02 + +
    • + +
  • + Defs/ThingDef[@Name="GooseThingBase"]/tools + + +
  • + + +
  • Scratch
    • + + 6 + 1.92 + Feet + 0.08 + 0.352 + +
  • + +
  • Bite
    • + + 3 + 1.58 + Beak + 0.16 + 0.01 + +
  • + + +
  • Blunt
    • + + 2 + 1.92 + HeadAttackTool + 0.2 + 0.352 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml new file mode 100644 index 0000000000..f9d8004f9c --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GreatBustard.xml @@ -0,0 +1,70 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPGreatBustard"]/statBases + + 0.22 + 0.25 + 0.13 + +
    • + +
  • + Defs/ThingDef[defName="ACPGreatBustard"]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 1.25 + Feet + + +
  • + Stun + 20 +
    • +     +     + 0.1 + 0.480 + +
  • + +
  • Bite
    • + + 3 + 2.08 + Beak + 0.01 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml new file mode 100644 index 0000000000..f6f5d45096 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_GuineaPig.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPGuineaPig"]/statBases + + 0.14 + 0.00 + 0.00 + +
    • + +
  • + Defs/ThingDef[defName="ACPGuineaPig"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 2.01 + FrontLeftPaw + 0.025 + 0.01 + +
  • + + +
  • Scratch
    • + + 2 + 2.01 + FrontRightPaw + 0.025 + 0.01 + +
  • + +
  • Bite
    • + + 4 + 0.84 + Teeth + 0.144 + 0.02 + +
  • + + +
  • Blunt
    • + + 1 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml new file mode 100644 index 0000000000..87df16e973 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hedgehog.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPHedgehog"]/statBases + + 0.17 + 0.05 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPHedgehog"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 1.4 + Quills + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 3 + 0.95 + Teeth + 0.9 + 0.09 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml new file mode 100644 index 0000000000..6585d61ad7 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Hippo.xml @@ -0,0 +1,60 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPHippopotamus"]/statBases + + 0.08 + 0.64 + 0.45 + +
    • + +
  • + Defs/ThingDef[defName="ACPHippopotamus"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 1.25 + FrontLeftLeg + 6.75 + +
  • + + +
  • Blunt
    • + + 14 + 1.25 + FrontRightLeg + 6.75 + +
  • + +
  • Bite
    • + + 12 + 1.65 + Teeth + 0.04 + 3.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml new file mode 100644 index 0000000000..37f2890bc6 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_HoneyBadger.xml @@ -0,0 +1,98 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPHoneyBadger"]/statBases + + 0.21 + 0.31 + 0.08 + +
    • + +
  • + Defs/ThingDef[defName="ACPHoneyBadger"]/tools + + +
  • + + +
  • Scratch
    • + + 11 + 1.5 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 11 + 1.5 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 14 + 1.65 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 3 + 1.65 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml new file mode 100644 index 0000000000..51c5f84eec --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Horse.xml @@ -0,0 +1,106 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[ + defName="ACPHorse" or + defName="ACPWoolyHorse" + ]/statBases + + 0.11 + 0.30 + 0.19 + +
    • + +
  • + Defs/ThingDef[ + defName="ACPHorse" or + defName="ACPWoolyHorse" + ]/statBases/MoveSpeed + + 5 + +
    • + +
  • + Defs/ThingDef[ + defName="ACPHorse" or + defName="ACPWoolyHorse" + ]/tools + + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontLeftLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontLeftLeg_2 + 3.938 + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontRightLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontRightLeg_2 + 3.938 + +
  • + +
  • BiteBlunt
    • + + 5 + 1.97 + Teeth + 1.5 + +
  • + + +
  • Blunt
    • + + 6 + 2.12 + HeadAttackTool + 0.2 + 2 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml new file mode 100644 index 0000000000..83baa0cf55 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Insects.xml @@ -0,0 +1,135 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + + + +
  • + Defs/ThingDef[defName="ACPSilkspider"]/statBases + + 0.2 + 0.05 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPSilkspider"]/tools + + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.04 + 0.02 + +
  • + +
  • Bite
    • + + 1 + 2.5 + Mouth + 0.02 + 0.01 + + + + + + + +
  • + Defs/ThingDef[defName="ACPHaulerAnt"]/statBases + Always + + 0.08 + 0.34 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="ACPHaulerAnt"]/tools + + +
  • + + +
  • Blunt
    • + + 12 + 1.65 + HeadAttackTool + 0.1 + 0.3 + +
  • + +
  • Bite
    • + + 6 + 2.5 + Mouth + 0.05 + 0.02 + + + + + + + +
  • + Defs/ThingDef[defName="ACPAcidAnt"]/statBases + Always + + 0.24 + 0.08 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPAcidAnt"]/tools + + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.04 + 0.02 + +
  • + +
  • AcidBite
    • + + 4 + 1.6 + Mouth + 0.02 + 0.01 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml new file mode 100644 index 0000000000..6d40d60309 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Jackalope.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPJackalope"]/statBases + + 0.25 + 0.05 + 0.01 + +
    • + +
  • + Defs/ThingDef[defName="ACPJackalope"]/tools + + +
  • + + +
  • Scratch
    • + + 7 + 1.65 + Antlers + 0.03 + 0.750 + +
  • + +
  • Bite
    • + + 3 + 1.26 + Teeth + 0.01 + 0.250 + +
  • + + +
  • Blunt
    • + + 1 + 1.26 + HeadAttackTool + 0.2 + 0.250 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml new file mode 100644 index 0000000000..3e84d4342c --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Kiwi.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPKiwi"]/statBases + + 0.28 + 0.02 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPKiwi"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 1.39 + Feet + 0.01 + 0.096 + +
  • + +
  • Bite
    • + + 2 + 1.39 + Beak + 0.096 + 0.01 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml new file mode 100644 index 0000000000..9e403f85a0 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Komodo.xml @@ -0,0 +1,61 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPKomodo"]/statBases + + 0.08 + 0.4 + 0.2 + +
    • + +
  • + Defs/ThingDef[defName="ACPKomodo"]/tools + + +
  • + + +
  • Scratch
    • + + 7 + 1.5 + FrontLeftClaws + 0.19 + 0.5 + +
  • + + +
  • Scratch
    • + + 7 + 1.5 + FrontRightClaws + 0.19 + 0.5 + +
  • + +
  • ToxicBite
    • + + 15 + 1.65 + Teeth + 1.375 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml new file mode 100644 index 0000000000..bcc34653d5 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Lizard.xml @@ -0,0 +1,120 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPXenguana"]/statBases + + 0.16 + 0.18 + 0.03 + +
    • + +
  • + Defs/ThingDef[defName="ACPXenguana"]/tools + + +
  • + + +
  • Scratch
    • + + 8 + 1.5 + FrontLeftClaws + 0.06 + 1 + +
  • + + +
  • Scratch
    • + + 8 + 1.5 + FrontRightClaws + 0.06 + 1 + +
  • + +
  • Bite
    • + + 10 + 1.89 + Teeth + 2.50 + +
  • + + +
  • Blunt
    • + + 5 + 4.24 + HeadAttackTool + 0.2 + 0.75 + + + + + +
  • + Defs/ThingDef[defName="ACPXGecko"]/statBases + + 0.22 + 0.2 + 0.04 + +
    • + +
  • + Defs/ThingDef[defName="ACPXGecko"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.5 + FrontLeftClaws + 0.03 + 0.5 + +
  • + + +
  • Scratch
    • + + 3 + 1.5 + FrontRightClaws + 0.03 + 0.5 + +
  • + +
  • Bite
    • + + 4 + 1.89 + Teeth + 1.250 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml new file mode 100644 index 0000000000..5ce698d61a --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Llama.xml @@ -0,0 +1,90 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPLlama"]/statBases + + 0.14 + 0.06 + 0.07 + +
    • + +
  • + Defs/ThingDef[defName="ACPLlama"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.19 + 2.250 + FrontLeftLeg + +
  • + + +
  • Poke
    • + + 7 + 1.19 + 2.250 + FrontLeftLeg_2 + +
  • + + +
  • Blunt
    • + + 7 + 1.19 + 2.250 + FrontRightLeg + +
  • + + +
  • Poke
    • + + 7 + 1.19 + 2.250 + FrontRightLeg_2 + +
  • + +
  • BiteBlunt
    • + + 1 + 0.84 + Teeth + 0.05 + +
  • + + +
  • Blunt
    • + + 5 + 1.97 + HeadAttackTool + 0.2 + 1.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml new file mode 100644 index 0000000000..72d7b72ee1 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Martens.xml @@ -0,0 +1,80 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[ + defName="ACPFishercat" or + defName="ACPErmine" + ]/statBases + + 0.24 + 0.11 + 0.05 + +
    • + +
  • + Defs/ThingDef[ + defName="ACPFishercat" or + defName="ACPErmine" + ]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 1.67 + FrontLeftPaw + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 4 + 1.67 + FrontRightPaw + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 5 + 0.88 + Teeth + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 2 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml new file mode 100644 index 0000000000..75c73c9cab --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaBadger.xml @@ -0,0 +1,100 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPMegabadger"]/statBases + + 0.11 + 0.43 + 0.27 + 8 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="ACPMegabadger"]/tools + + +
  • + + +
  • Scratch
    • + + 15 + 1.5 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.18 + 0.05 + +
  • + + +
  • Scratch
    • + + 15 + 1.5 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.18 + 0.05 + +
  • + +
  • Bite
    • + + 17 + 1.65 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 3.375 + 0.35 + +
  • + + +
  • Blunt
    • + + 4 + 1.65 + HeadAttackTool + 0.2 + 0.625 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml new file mode 100644 index 0000000000..8b46525880 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_MegaFerret.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPMegaFerret"]/statBases + + 0.18 + 0.41 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="ACPMegaFerret"]/tools + + +
  • + + +
  • Scratch
    • + + 6 + 1.67 + FrontLeftPaw + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 6 + 1.67 + FrontRightPaw + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 9 + 0.88 + Teeth + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 2 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml new file mode 100644 index 0000000000..66803450ed --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Otter.xml @@ -0,0 +1,74 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPOtter"]/statBases + + 0.15 + 0.20 + 0.08 + +
    • + +
  • + Defs/ThingDef[defName="ACPOtter"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 1.67 + FrontLeftPaw + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 5 + 1.67 + FrontRightPaw + 0.036 + 0.01 + +
  • + +
  • Bite
    • + + 9 + 0.88 + Teeth + 0.675 + 0.07 + +
  • + + +
  • Blunt
    • + + 2 + 3.00 + HeadAttackTool + 0.2 + 0.125 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml new file mode 100644 index 0000000000..012803ad74 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Panda.xml @@ -0,0 +1,99 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPPanda"] + + + 0.18 + 0.17 + 0.11 + + +
    • + +
  • + Defs/ThingDef[defName="ACPPanda"] + + +
  • + + +
  • Scratch
    • + + 17 + 1.41 + FrontLeftPaw + + +
  • + Stun + 21 +
    • +     +     + 0.15 + 4.5 + +
  • + + +
  • Scratch
    • + + 17 + 1.41 + FrontRightPaw + + +
  • + Stun + 21 +
    • +     +     + 0.15 + 4.5 + +
  • + +
  • Bite
    • + + 15 + 2.05 + Teeth + + +
  • + Stun + 21 +
    • +     +     + 0.85 + 8.450 + +
  • + + +
  • Blunt
    • + + 5 + 2.22 + HeadAttackTool + 0.2 + 4.235 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml new file mode 100644 index 0000000000..e5c482c4c2 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Peccary.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPPeccary"]/statBases + + 0.12 + 0.08 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPPeccary"]/tools + + +
  • + +
  • Bite
    • + + 6 + 1.5 + Teeth + 0.01 + 0.5 + +
  • + + +
  • Blunt
    • + + 6 + 2.12 + HeadAttackTool + 0.2 + 2 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml new file mode 100644 index 0000000000..37e26dd9a5 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Penguin.xml @@ -0,0 +1,78 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPPenguin"]/statBases + + 0.15 + 0.08 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPPenguin"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.33 + Feet + + +
  • + Stun + 4 +
    • +     +     + 0.04 + 0.162 + +
  • + +
  • Bite
    • + + 5 + 1.85 + Beak + + +
  • + Stun + 6 +
    • +     +     + 0.162 + 0.01 + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.2 + 0.284 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml new file mode 100644 index 0000000000..7e41aa8c52 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Porcupine.xml @@ -0,0 +1,93 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPPorcupine"]/statBases + + 0.12 + 0.55 + 0.01 + +
    • + +
  • + Defs/ThingDef[defName="ACPPorcupine"]/tools + + +
  • + + +
  • Scratch
    • + + 6 + 1.5 + Quills + 0.036 + 0.01 + +
  • + + +
  • Scratch
    • + + 6 + 1.8 + FrontLeftPaw + 0.250 + 0.05 + +
  • + + +
  • Scratch
    • + + 6 + 1.8 + FrontRightPaw + 0.250 + 0.05 + +
  • + +
  • Bite
    • + + 8 + 2.0 + Teeth + + +
  • + Stun + 15 +
    • +     +     + 1.5 + 0.04 + +
  • + + +
  • Blunt
    • + + 3 + 1.65 + HeadAttackTool + 0.2 + 0.423 + 0 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml new file mode 100644 index 0000000000..d1a7c14315 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Ptarmigan.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPPtarmigan"]/statBases + + 0.22 + 0.05 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPPtarmigan"]/tools + + +
  • + +
  • Bite
    • + + 4 + 1.85 + Beak + 0.096 + 0.01 + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.2 + 0.480 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml new file mode 100644 index 0000000000..4319a6c568 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Quail.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPValleyQuail"]/statBases + + 0.24 + 0.03 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPValleyQuail"]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 1.65 + Feet + 0.01 + 0.096 + +
  • + +
  • Bite
    • + + 8 + 1.85 + Beak + 0.096 + 0.01 + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.2 + 0.480 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml new file mode 100644 index 0000000000..a356da9102 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_RedPanda.xml @@ -0,0 +1,97 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPRedPanda"]/statBases + + 0.16 + 0.03 + 0.02 + +
    • + +
  • + Defs/ThingDef[defName="ACPRedPanda"]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 0.55 + FrontLeftPaw + + +
  • + Stun + 7 +
    • +     +     + 0.042 + 0.01 + +
  • + + +
  • Scratch
    • + + 4 + 0.55 + FrontRightPaw + + +
  • + Stun + 7 +
    • +     +     + 0.042 + 0.01 + +
  • + +
  • Bite
    • + + 5 + 0.85 + Teeth + + +
  • + Stun + 8 +
    • +     +     + 0.254 + 0.03 + +
  • + + +
  • Blunt
    • + + 2 + 0.55 + HeadAttackTool + 0.2 + 0.042 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml new file mode 100644 index 0000000000..e755408704 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Scorpions.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPMegascorpion"]/statBases + + 0.12 + 0.33 + 0.17 + +
    • + +
  • + Defs/ThingDef[defName="ACPMegascorpion"]/tools + + +
  • + + +
  • ScorpionSting
    • + + 7 + 1.55 + StingerAttackTool + 0.4 + 2.535 + +
  • + + +
  • Blunt
    • + + 9 + 1.9 + PincerAttackTool + 0.05 + 0.4 + +
  • + + +
  • Blunt
    • + + 2 + 2 + HeadAttackTool + 0.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml new file mode 100644 index 0000000000..51c2177216 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Seal.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPSpottedSeal"]/statBases + + 0.09 + 0.05 + 0.03 + +
    • + +
  • + Defs/ThingDef[defName="ACPSpottedSeal"]/tools + + +
  • + +
  • Bite
    • + + 7 + 1.85 + Teeth + 0.25 + 1.35 + +
  • + + +
  • Blunt
    • + + 2 + 1.65 + HeadAttackTool + 0.2 + 0.423 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml new file mode 100644 index 0000000000..2ee96e5795 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Silkie.xml @@ -0,0 +1,62 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPSilkieChicken"]/statBases + + 0.15 + 0 + 0 + +
    • + +
  • + Defs/ThingDef[defName="ACPSilkieChicken"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.39 + Feet + 0.01 + 0.096 + +
  • + +
  • Bite
    • + + 2 + 1.39 + Beak + 0.096 + 0.01 + +
  • + + +
  • Blunt
    • + + 1 + 1.65 + HeadAttackTool + 0.2 + 0.192 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml new file mode 100644 index 0000000000..256f2dfcec --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Tapir.xml @@ -0,0 +1,51 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPTapir"]/statBases + + 0.13 + 0.07 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPTapir"]/tools + + +
  • + +
  • Bite
    • + + 4 + 1.5 + Teeth + 0.01 + 0.5 + +
  • + + +
  • Blunt
    • + + 5 + 2.12 + HeadAttackTool + 0.2 + 2 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml new file mode 100644 index 0000000000..8324bfd176 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_ThornyDevil.xml @@ -0,0 +1,61 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPThornyDevil"]/statBases + + 0.13 + 0.18 + 0.01 + +
    • + +
  • + Defs/ThingDef[defName="ACPThornyDevil"]/tools + + +
  • + + +
  • Scratch
    • + + 7 + 1.5 + FrontLeftClaws + 0.03 + 0.5 + +
  • + + +
  • Scratch
    • + + 7 + 1.5 + FrontRightClaws + 0.03 + 0.5 + +
  • + +
  • Bite
    • + + 5 + 1.89 + Teeth + 1.250 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml new file mode 100644 index 0000000000..c2caa60864 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Walrus.xml @@ -0,0 +1,64 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPWalrus"]/statBases + + 0.06 + 0.1 + 0.08 + +
    • + +
  • + Defs/ThingDef[defName="ACPWalrus"]/tools + + +
  • + + +
  • Cut
    • + + 18 + 1.89 + TuskAttackTool + 0.01 + 1.250 + +
  • + + +
  • Stab
    • + + 18 + 1.41 + 0.65 + TuskAttackTool_2 + 0.1 + 2.940 + +
  • + + +
  • Blunt
    • + + 10 + 1.65 + HeadAttackTool + 0.2 + 0.423 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml new file mode 100644 index 0000000000..749ec00057 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_WildDog.xml @@ -0,0 +1,86 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPWildDog"]/statBases + + 0.26 + 0.09 + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="ACPWildDog"]/tools + + +
  • + + +
  • Scratch
    • + + 8 + 1.5 + FrontLeftPaw + + +
  • + Stun + 15 +
    • +     +     + 0.450 + 0.05 + +
  • + + +
  • Scratch
    • + + 8 + 1.5 + FrontRightPaw + + +
  • + Stun + 15 +
    • +     +     + 0.450 + 0.05 + +
  • + +
  • Bite
    • + + 10 + 2.0 + Teeth + + +
  • + Stun + 17 +
    • +     +     + 0.12 + 3.380 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml new file mode 100644 index 0000000000..f03166a362 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Wolves.xml @@ -0,0 +1,250 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + + + +
  • + Defs/ThingDef[defName="ACPDirewolf"]/statBases + + 0.23 + 0.30 + 0.09 + 3.5 + 5 + +
    • + +
  • + Defs/ThingDef[defName="ACPDirewolf"]/tools + + +
  • + + +
  • Scratch
    • + + 16 + 1.5 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.900 + 0.075 + +
  • + + +
  • Scratch
    • + + 16 + 1.5 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.900 + 0.075 + +
  • + +
  • Bite
    • + + 22 + 2.0 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.65 + 4.225 + + + + + + + +
  • + Defs/ThingDef[defName="ACPBlackwolf"]/statBases + + 0.26 + 0.25 + 0.05 + 3.5 + 5 + +
    • + +
  • + Defs/ThingDef[defName="ACPBlackwolf"]/tools + + +
  • + + +
  • Scratch
    • + + 19 + 1.5 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.900 + 0.075 + +
  • + + +
  • Scratch
    • + + 19 + 1.5 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.900 + 0.075 + +
  • + +
  • Bite
    • + + 25 + 2.0 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.65 + 4.225 + + + + + + + +
  • + Defs/ThingDef[ + defName="ACPSpiritwolf" or + defName="ACPSpiritwolfFF" + ]/statBases + + 0.24 + 0.30 + 0.06 + 14 + 21 + +
    • + +
  • + Defs/ThingDef[ + defName="ACPSpiritwolf" or + defName="ACPSpiritwolfFF" + ]/tools + + +
  • + + +
  • Scratch
    • + + 21 + 1.5 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 1.80 + 0.2 + +
  • + + +
  • Scratch
    • + + 21 + 1.5 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 1.80 + 0.2 + +
  • + +
  • Bite
    • + + 28 + 2.0 + Teeth + + +
  • + Stun + 24 +
    • +     +     + 0.86 + 4.225 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml new file mode 100644 index 0000000000..059d918029 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_Races_Animal_Woolyrhino.xml @@ -0,0 +1,72 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + +
  • + Defs/ThingDef[defName="ACPWoolyRhino"]/statBases + + 0.10 + 0.50 + 0.30 + 8 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="ACPWoolyRhino"]/tools + + +
  • + + +
  • Poke
    • + + 15 + 1.65 + HornAttackTool + 10 + +
  • + + +
  • Blunt
    • + + 17 + 1.65 + HornAttackTool + 10 + +
  • + +
  • Bite
    • + + 12 + 1.65 + Teeth + 0.04 + 3.5 + +
  • + + +
  • Blunt
    • + + 9 + 1.65 + HeadAttackTool + 7.5 + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml new file mode 100644 index 0000000000..0937b9a409 --- /dev/null +++ b/Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_StuffRebalance.xml @@ -0,0 +1,82 @@ + + + + Always + + +
  • + AnimalCollabProj +
    • + + +
  • + Defs/ThingDef[ + defName="Leather_ACP" or + defName="ACPFerretSilk" or + defName="ACPBDireWolfWool" or + defName="ACPSpidersilk" or + defName="ACPLlamaWool" or + @Name="ACPWoolBase" + ]/statBases/StuffPower_Armor_Sharp | + Defs/ThingDef[ + defName="Leather_ACP" or + defName="ACPFerretSilk" or + defName="ACPBDireWolfWool" or + defName="ACPSpidersilk" or + defName="ACPLlamaWool" or + @Name="ACPWoolBase" + ]/statBases/StuffPower_Armor_Blunt + Always +
    • + +
  • + Defs/ThingDef[defName="Leather_ACP"]/statBases + + 0.33 + 0.165 + +
    • + +
  • + Defs/ThingDef[defName="ACPFerretSilk"]/statBases + + 0.25 + 0.12 + +
    • + +
  • + Defs/ThingDef[defName="ACPBDireWolfWool"]/statBases + + 0.35 + 0.17 + +
    • + +
  • + Defs/ThingDef[defName="ACPSpidersilk"]/statBases + + 0.30 + 0.14 + +
    • + +
  • + Defs/ThingDef[defName="ACPLlamaWool"]/statBases + + 0.20 + 0.1 + +
    • + +
  • + Defs/ThingDef[@Name="ACPWoolBase"]/statBases + + 0.2 + 0.1 + +
    • + +     +     +     \ No newline at end of file diff --git a/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml b/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml index e1e351de9d..d06dc692a0 100644 --- a/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml +++ b/Patches/Core/ThingDefs_Misc/Apparel_Belts.xml @@ -1,7 +1,7 @@ - + Defs/ThingDef[defName="Apparel_ShieldBelt"]/statBases diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml index 146df5a73d..59fecac86c 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml +++ b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml @@ -568,8 +568,8 @@ Defs/ThingDef[defName="Gun_HeavySMG"]
  • - 1,1 - -0.10, 0.10 + 0.85,0.85 + 0.00,-0.03
    • diff --git a/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml index d3c0754ba5..d9d4015cbe 100644 --- a/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml +++ b/Patches/Dragonian Race/ThingDefs_Items/Items_Resource_Stuff.xml @@ -14,6 +14,7 @@ 0.3 0.3 + 0.10 diff --git a/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml b/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml index 348b11cbb2..b480b035f9 100644 --- a/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml +++ b/Patches/Dragonian Race/ThingDefs_Misc/DR_Apparel.xml @@ -18,7 +18,7 @@ - +
  • Defs/ThingDef[defName="DR_GreekDress" or @@ -65,6 +65,68 @@
    • + + +
  • + Defs/ThingDef[defName="DR_BattleDress" + ]/statBases/StuffEffectMultiplierArmor + + 2 + 15 + 7.5 + +
    • + +
  • + Defs/ThingDef[defName="DR_BattleDress" + ]/statBases/ArmorRating_Sharp + + 4.05 + +
    • + +
  • + Defs/ThingDef[defName="DR_BattleDress" + ]/statBases/ArmorRating_Blunt + + 5.1 + +
    • + +
  • + Defs/ThingDef[defName="DR_BattleDress"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +
  • + Defs/ThingDef[defName="DR_BattleHelm" + ]/statBases/StuffEffectMultiplierArmor + + 4 + 3 + 1 + +
    • + +
  • + Defs/ThingDef[defName="DR_BattleHelm" + ]/statBases/ArmorRating_Sharp + + 1 + +
    • + +
  • + Defs/ThingDef[defName="DR_BattleHelm" + ]/statBases/ArmorRating_Blunt + + 1.5 + +
    • + diff --git a/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml b/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml new file mode 100644 index 0000000000..2365a1fc6c --- /dev/null +++ b/Patches/Dragonian Race/ThingDefs_Misc/DR_Weapon.xml @@ -0,0 +1,94 @@ + + + + +
  • + +
  • Dragonian Race
    • + + + + + + +
  • + Defs/ThingDef[defName="DR_BattleHammer"]/tools + + +
  • + + +
  • Poke
    • + + 5 + +
  • + EMP + 5 +
    • +     + 1.37 + 0.10 + 8.688 + Handle + +
  • + + +
  • Blunt
    • + + 32 + +
  • + EMP + 15 +
    • +     + 2.57 + 118.25 + Head + 0.30 + + + + + +
  • + Defs/ThingDef[defName="DR_BattleHammer"]/statBases + + 8 + 0.40 + +
    • + +
  • + Always + +
  • + Defs/ThingDef[defName="DR_BattleHammer"]/equippedStatOffsets + Invert +
    • +
  • + Defs/ThingDef[defName="DR_BattleHammer"] + + + +
    • +     + + +
  • + Defs/ThingDef[defName="DR_BattleHammer"]/equippedStatOffsets + + 1.50 + 0.30 + 0.30 + +
    • + +     + + + +     +     diff --git a/Patches/O21 Elves/Elves_Scenarios.xml b/Patches/O21 Elves/Elves_Scenarios.xml index 3ab9dd0d29..7bff88f86b 100644 --- a/Patches/O21 Elves/Elves_Scenarios.xml +++ b/Patches/O21 Elves/Elves_Scenarios.xml @@ -21,6 +21,16 @@ + +
  • + Defs/ScenarioDef[defName="O21_MedivalWoodElves" or + defName="O21_MedivalSunElves" or + defName="O21_MedivalMoonElves" or + defName="O21_MedivalDarkElves"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • diff --git a/Patches/O21 Elves/Race_ElfBase.xml b/Patches/O21 Elves/Race_ElfBase.xml index 2b9a694f0f..a7d4eeadf8 100644 --- a/Patches/O21 Elves/Race_ElfBase.xml +++ b/Patches/O21 Elves/Race_ElfBase.xml @@ -49,6 +49,8 @@ 1.1 0.8 0.85 + 35 + 20 diff --git a/Patches/O21 Gith/Gith_Scenarios.xml b/Patches/O21 Gith/Gith_Scenarios.xml new file mode 100644 index 0000000000..8a5ed3154a --- /dev/null +++ b/Patches/O21 Gith/Gith_Scenarios.xml @@ -0,0 +1,59 @@ + + + + + +
  • [O21] Gith
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedGith"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedGith"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedGith"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedGith"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • +
  • + Defs/ScenarioDef[defName="O21_LostTribeGith"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeGith"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Gith/Race_Gith.xml b/Patches/O21 Gith/Race_Gith.xml new file mode 100644 index 0000000000..3bcc645225 --- /dev/null +++ b/Patches/O21 Gith/Race_Gith.xml @@ -0,0 +1,96 @@ + + + + +
  • [O21] Gith
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"] + + + +
    • +     + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"]/statBases + + 1 + 1 + 1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"]/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/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Gith"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Goblins/Goblins_Scenarios.xml b/Patches/O21 Goblins/Goblins_Scenarios.xml index 0e4925b05c..813369024f 100644 --- a/Patches/O21 Goblins/Goblins_Scenarios.xml +++ b/Patches/O21 Goblins/Goblins_Scenarios.xml @@ -35,7 +35,24 @@
  • Defs/ScenarioDef[defName="O21_CrashlandedGoblins"]/scenario/parts/li[thingDef="Apparel_FlakPants"]
    • - + +
  • + Defs/ScenarioDef[defName="O21_LostTribeGoblin"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeGoblin"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • diff --git a/Patches/O21 Goblins/Race_Goblin.xml b/Patches/O21 Goblins/Race_Goblin.xml index a27292ce54..f558273855 100644 --- a/Patches/O21 Goblins/Race_Goblin.xml +++ b/Patches/O21 Goblins/Race_Goblin.xml @@ -61,6 +61,8 @@ 1 0.6 0.8 + 20 + 15 diff --git a/Patches/O21 Half-Orcs/HalfOrcs_Scenarios.xml b/Patches/O21 Half-Orcs/HalfOrcs_Scenarios.xml new file mode 100644 index 0000000000..50f345b006 --- /dev/null +++ b/Patches/O21 Half-Orcs/HalfOrcs_Scenarios.xml @@ -0,0 +1,60 @@ + + + + + +
  • [O21] Half-Orcs
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHalfOrc"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHalfOrc"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHalfOrc"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHalfOrc"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_LostTribeHalfOrc"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeHalfOrc"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Half-Orcs/Race_HalfOrcs.xml b/Patches/O21 Half-Orcs/Race_HalfOrcs.xml new file mode 100644 index 0000000000..8812581e8e --- /dev/null +++ b/Patches/O21 Half-Orcs/Race_HalfOrcs.xml @@ -0,0 +1,127 @@ + + + + +
  • [O21] Half-Orcs
    • +     + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"] + + + +
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/race/baseBodySize + + 1.1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/statBases/MoveSpeed + + 4.35 + +
    • + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/statBases + + 0.95 + 1.05 + 1 + 0.90 + 41 + 22 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.42 + LeftHand + 0.4 + +
  • + + +
  • Blunt
    • + + 2 + 1.42 + RightHand + 0.4 + +
  • + + +
  • Blunt
    • + + 3 + 4.88 + HeadAttackTool + 0.2 + 0.875 + +
  • + +
  • Bite
    • + + 5 + 1.57 + 0.33 + Teeth + 0.02 + 0.6 + + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_HalfOrc"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Hobgoblins/Hobgoblins_Scenarios.xml b/Patches/O21 Hobgoblins/Hobgoblins_Scenarios.xml new file mode 100644 index 0000000000..eae0d0c75e --- /dev/null +++ b/Patches/O21 Hobgoblins/Hobgoblins_Scenarios.xml @@ -0,0 +1,60 @@ + + + + + +
  • [O21] Hobgoblins
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHobgoblins"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHobgoblins"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHobgoblins"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedHobgoblins"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_LostTribeHobgoblin"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeHobgoblin"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Hobgoblins/Race_Hobgoblins.xml b/Patches/O21 Hobgoblins/Race_Hobgoblins.xml new file mode 100644 index 0000000000..24c1e048bf --- /dev/null +++ b/Patches/O21 Hobgoblins/Race_Hobgoblins.xml @@ -0,0 +1,144 @@ + + + + +
  • [O21] Hobgoblins
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"] + + + +
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/alienRace/generalSettings/forcedRaceTraitEntries + +
  • + Beauty + -1 + 20 +
    • +
  • + Greedy + 10 +
    • +
  • + Xenophobia + -1 + 10 +
    • + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/race/baseBodySize + + 1.15 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/statBases/MoveSpeed + + 4.3 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/statBases + + 0.90 + 1.1 + 1 + 1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + LeftHand + 0.5 + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + RightHand + 0.5 + +
  • + + +
  • Blunt
    • + + 3 + 4.96 + HeadAttackTool + 0.2 + 0.938 + +
  • + +
  • Bite
    • + + 5 + 1.57 + 0.33 + Teeth + 0.03 + 0.6 + + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Hobgoblin"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Illithids/Illithids_Scenarios.xml b/Patches/O21 Illithids/Illithids_Scenarios.xml new file mode 100644 index 0000000000..23fce1dc35 --- /dev/null +++ b/Patches/O21 Illithids/Illithids_Scenarios.xml @@ -0,0 +1,32 @@ + + + + + +
  • [O21] Illithids
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_MedivalIllithids"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_MedivalIllithids"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Illithids/Race_Illlithids.xml b/Patches/O21 Illithids/Race_Illlithids.xml new file mode 100644 index 0000000000..bb588bf258 --- /dev/null +++ b/Patches/O21 Illithids/Race_Illlithids.xml @@ -0,0 +1,116 @@ + + + + +
  • [O21] Illithids
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"] + + + +
    • +     + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"]/race/baseBodySize + + 1 + +
    • + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"]/statBases + + 1 + 1 + 1 + 1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + LeftHand + 0.5 + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + RightHand + 0.5 + +
  • + + +
  • Blunt
    • + + 3 + 4.96 + HeadAttackTool + 0.2 + 0.938 + +
  • + +
  • Bite
    • + + 3 + 1.57 + 0.33 + Teeth + 0.03 + 0.6 + + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Illithid"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Kobolds/Kobolds_Scenarios.xml b/Patches/O21 Kobolds/Kobolds_Scenarios.xml index 55d0f2215e..7b9aeb20d9 100644 --- a/Patches/O21 Kobolds/Kobolds_Scenarios.xml +++ b/Patches/O21 Kobolds/Kobolds_Scenarios.xml @@ -35,16 +35,24 @@
  • Defs/ScenarioDef[defName="O21_CrashlandedKobolds"]/scenario/parts/li[thingDef="Apparel_FlakPants"]
    • -
  • - Defs/ScenarioDef[defName="O21_CrashlandedKobolds"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_Arrow_Stone - 100 -
    • - - + +
  • + Defs/ScenarioDef[defName="O21_LostTribeKobold"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeKobold"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • diff --git a/Patches/O21 Kobolds/Race_Kobold.xml b/Patches/O21 Kobolds/Race_Kobold.xml index b312c9bf7f..37d36ceb6e 100644 --- a/Patches/O21 Kobolds/Race_Kobold.xml +++ b/Patches/O21 Kobolds/Race_Kobold.xml @@ -44,12 +44,19 @@ + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Kobold"]/race/baseBodySize + + 0.6 + +
  • /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Kobold"]/statBases - 28 - 35 + 18 + 15 1.1 0.4 0.5 @@ -77,17 +84,9 @@
  • Scratch
    • 4 - 1.5 + 1.57 LeftHand - - -
  • - Stun - 14 -
    • -     -     - 0.03 + 0.04 0.5
  • @@ -95,18 +94,10 @@
  • Scratch
    • - 1 - 1.5 + 4 + 1.57 RightHand - - -
  • - Stun - 14 -
    • -     -     - 0.03 + 0.04 0.5
  • @@ -114,11 +105,11 @@
  • Blunt
    • - 4 + 2 1.85 HeadAttackTool 0.2 - 0.075 + 0.46 diff --git a/Patches/O21 Orcs Faction/Orc_PawnKinds.xml b/Patches/O21 Orcs Faction/Orc_PawnKinds.xml new file mode 100644 index 0000000000..04e6a63c8e --- /dev/null +++ b/Patches/O21 Orcs Faction/Orc_PawnKinds.xml @@ -0,0 +1,48 @@ + + + + + +
  • [O21] Orcs - Faction Addon
    • +     + + + + +
  • + /Defs/PawnKindDef[defName="O21_OrcTribes_Bowman"] + +
  • + + 14 + 26 + + + + 150 + 350 + + +
  • NeolithicMeleeBasic
    • +
  • MedievalMeleeDecent
    • + + + + + + + +
  • + /Defs/PawnKindDef[defName="O21_OrcTribes_Fighter"]/weaponMoney + + + 120 + 200 + + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Orcs/Orcs_Scenarios.xml b/Patches/O21 Orcs/Orcs_Scenarios.xml new file mode 100644 index 0000000000..cb131772e2 --- /dev/null +++ b/Patches/O21 Orcs/Orcs_Scenarios.xml @@ -0,0 +1,60 @@ + + + + + +
  • [O21] Orcs
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedOrc"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedOrc"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedOrc"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedOrc"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_LostTribeOrc"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeOrc"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Orcs/Race_Orcs.xml b/Patches/O21 Orcs/Race_Orcs.xml new file mode 100644 index 0000000000..386e0ad4b6 --- /dev/null +++ b/Patches/O21 Orcs/Race_Orcs.xml @@ -0,0 +1,124 @@ + + + + +
  • [O21] Orcs
    • +     + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"] + + + +
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/race/baseBodySize + + 1.3 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/alienRace/generalSettings/disallowedTraits/li[text()="Undergrounder"] +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/statBases + + 0.70 + 1.10 + 1 + 0.80 + 50 + 30 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/tools + + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + LeftHand + 0.75 + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + RightHand + 0.75 + +
  • + + +
  • Blunt
    • + + 4 + 5.05 + HeadAttackTool + 0.2 + 1 + +
  • + +
  • Bite
    • + + 8 + 1.57 + 0.33 + Teeth + 0.08 + 0.6 + + + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Orc"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Tieflings Faction/Tiefling_PawnKinds.xml b/Patches/O21 Tieflings Faction/Tiefling_PawnKinds.xml new file mode 100644 index 0000000000..6cc3761509 --- /dev/null +++ b/Patches/O21 Tieflings Faction/Tiefling_PawnKinds.xml @@ -0,0 +1,48 @@ + + + + + +
  • [O21] Tieflings - Faction Addon
    • +     + + + + +
  • + /Defs/PawnKindDef[defName="O21_TieflingTribes_Bowman"] + +
  • + + 14 + 26 + + + + 150 + 350 + + +
  • NeolithicMeleeBasic
    • +
  • MedievalMeleeDecent
    • + + + + + + + +
  • + /Defs/PawnKindDef[defName="O21_TieflingTribes_Fighter"]/weaponMoney + + + 120 + 200 + + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Tieflings/Race_Tieflings.xml b/Patches/O21 Tieflings/Race_Tieflings.xml new file mode 100644 index 0000000000..30269fd4ab --- /dev/null +++ b/Patches/O21 Tieflings/Race_Tieflings.xml @@ -0,0 +1,115 @@ + + + + +
  • [O21] Tieflings
    • +     + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"] + + + +
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"]/alienRace/generalSettings/forcedRaceTraitEntries + +
  • + Beauty + 1 + 10 +
    • +
  • + Bloodlust + 20 +
    • + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"]/statBases + + 1.1 + 1 + 1 + 0.20 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"]/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/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Tiefling"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Tieflings/Tieflings_Scenarios.xml b/Patches/O21 Tieflings/Tieflings_Scenarios.xml new file mode 100644 index 0000000000..22a7a31f11 --- /dev/null +++ b/Patches/O21 Tieflings/Tieflings_Scenarios.xml @@ -0,0 +1,60 @@ + + + + + +
  • [O21] Tieflings
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedTieflings"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedTieflings"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedTieflings"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedTieflings"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_LostTribeTiefling"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeTiefling"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Warforged Factions/Warforged_PawnKinds.xml b/Patches/O21 Warforged Factions/Warforged_PawnKinds.xml new file mode 100644 index 0000000000..5602ede63c --- /dev/null +++ b/Patches/O21 Warforged Factions/Warforged_PawnKinds.xml @@ -0,0 +1,48 @@ + + + + + +
  • [O21] Warforged - Faction Addon
    • +     + + + + +
  • + /Defs/PawnKindDef[defName="O21_WarforgedTribes_Bowman"] + +
  • + + 14 + 26 + + + + 150 + 350 + + +
  • NeolithicMeleeBasic
    • +
  • MedievalMeleeDecent
    • + + + + + + + +
  • + /Defs/PawnKindDef[defName="O21_WarforgedTribes_Fighter"]/weaponMoney + + + 120 + 200 + + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/O21 Warforged/Race_Warforged.xml b/Patches/O21 Warforged/Race_Warforged.xml new file mode 100644 index 0000000000..107b56c219 --- /dev/null +++ b/Patches/O21 Warforged/Race_Warforged.xml @@ -0,0 +1,127 @@ + + + + +
  • [O21] Warforged
    • +     + + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"] + +
  • + Humanoid +
    • + + + +
  • + Always + +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/comps + Invert +
    • +
  • + Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"] + + + +
    • +     + + + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/race/baseBodySize + + 1.1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/statBases + + 0.9 + 1 + 1 + 0.00 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/statBases/ArmorRating_Sharp + + 1 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/statBases/ArmorRating_Blunt + + 4 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/statBases/MoveSpeed + + 4.4 + +
    • + +
  • + /Defs/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/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/AlienRace.ThingDef_AlienRace[defName="O21_Alien_Warforged"]/comps + +
  • + CombatExtended.CompPawnGizmo +
    • +
  • + +
    • + + +     +     +     \ No newline at end of file diff --git a/Patches/O21 Warforged/Warforged_Scenarios.xml b/Patches/O21 Warforged/Warforged_Scenarios.xml new file mode 100644 index 0000000000..02da0cf02a --- /dev/null +++ b/Patches/O21 Warforged/Warforged_Scenarios.xml @@ -0,0 +1,60 @@ + + + + + +
  • [O21] Warforged
    • +     + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedWarforgeds"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_303British_FMJ + 100 +
    • +
  • + StartingThing_Defined + Ammo_44Magnum_FMJ + 60 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedWarforgeds"]/scenario/parts/li[thingDef="Apparel_AdvancedHelmet"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedWarforgeds"]/scenario/parts/li[thingDef="Apparel_FlakVest"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_CrashlandedWarforgeds"]/scenario/parts/li[thingDef="Apparel_FlakPants"] +
    • + +
  • + Defs/ScenarioDef[defName="O21_LostTribeWarforged"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +
  • + Defs/ScenarioDef[defName="O21_LostTribeWarforged"]/scenario/parts/li[thingDef="Pila" and @Class="ScenPart_StartingThing_Defined"] + + 10 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml b/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml new file mode 100644 index 0000000000..a9b2f2f09e --- /dev/null +++ b/Patches/Rim Contractors Arsenal/PawnKindDefs/PawnKinds_Contractor.xml @@ -0,0 +1,75 @@ + + + + + +
  • +
  • Contractors Arsenal
    • + + + +
  • + Defs/PawnKindDef[ + defName="Contractor_Rifleman" or + defName="Contractor_Medic" or + defName="Contractor_Marksman" or + defName="Contractor_Assault" or + defName="Contractor_Gunner" or + defName="Contractor_Officer" or + defName="Contract_Militia" + ] + +
  • + + 4 + 6 + + +
  • + 0.25 + + 500 + 800 + + +
  • ContractorMisc
    • + + + + + + + +
  • + Defs/PawnKindDef[ + defName="Contractor_Explosives" + ] + +
  • + + 3 + 6 + + + + 550 + 1750 + + +
  • ContractorMisc
    • + + + 2 + 5 + + + + + + +     +     + +     +     +     diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml new file mode 100644 index 0000000000..33b593f0b8 --- /dev/null +++ b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelBodyArmour.xml @@ -0,0 +1,53 @@ + + + + +
  • + + +
  • Contractors Arsenal
    • +
  • Contractors Arsenal (Factionless)
    • + + + + + +
  • + Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Sharp + + 20.50 + 100 + 15 + +
    • + +
  • + Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/statBases/ArmorRating_Blunt + + 38 + +
    • + +
  • + Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/equippedStatOffsets + + 0.10 + 60 + 20 + +
    • + +
  • + Defs/ThingDef[defName="Apparel_ContractorBodyArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +     +     + +     +     +     \ No newline at end of file diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml index 998ac96ac0..615af41f54 100644 --- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml +++ b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/ApparelHeadgear.xml @@ -4,7 +4,10 @@
  • -
  • Rim Contractors Arsenal
    • + +
  • Contractors Arsenal
    • +
  • Contractors Arsenal (Factionless)
    • +     diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml new file mode 100644 index 0000000000..7592a902ae --- /dev/null +++ b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/MeleeContractors.xml @@ -0,0 +1,80 @@ + + + + +
  • + + +
  • Contractors Arsenal
    • +
  • Contractors Arsenal (Factionless)
    • + + + + + +
  • + Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/tools + + +
  • + + +
  • Poke
    • + + 1 + 1.26 + 0.250 + Handle + +
  • + + +
  • Cut
    • + + 10 + 1.18 + 0.36 + 7.32 + Blade + +
  • + + +
  • Stab
    • + + 11 + 1.26 + 1.33 + 0.25 + 7.42 + Point + + + + + +
  • + Defs/ThingDef[defName="Melee_ContractorsCombatKnife"]/statBases + + 1 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="Melee_ContractorsCombatKnife"] + + + 0.5 + 0.15 + 0.05 + + +
    • + +     +     + +     +     +     \ No newline at end of file diff --git a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml index fcac9d3fc3..33dabc834d 100644 --- a/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml +++ b/Patches/Rim Contractors Arsenal/ThingDefs_Misc/RangedContractors.xml @@ -4,7 +4,10 @@
  • -
  • Rim Contractors Arsenal
    • + +
  • Contractors Arsenal
    • +
  • Contractors Arsenal (Factionless)
    • +     @@ -15,7 +18,14 @@ defName="Gun_M34A" or defName="Gun_M168B" or defName="Gun_M340V" or - defName="Gun_MS700G" + defName="Gun_MS700G" or + defName="Gun_SLZ556S" or + defName="Gun_SCR" or + defName="Gun_AUGS" or + defName="Gun_HKCAS42A" or + defName="Gun_FAL450A" or + defName="Gun_M870C" or + defName="Gun_ML237S" ]/tools @@ -55,7 +65,28 @@
  • - Defs/ThingDef[defName="Gun_L45E"]/tools + Defs/ThingDef[defName="Gun_AT45A"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +     +     + + +
  • + Defs/ThingDef[ + defName="Gun_L45E" or + defName="Gun_RHSC120P" + ]/tools
  • @@ -91,7 +122,7 @@ 6.35 3.29 0.36 - 2.09 + 1.40 1.23 0.1 51500 @@ -107,11 +138,11 @@ CombatExtended.Verb_ShootCE true Bullet_6x24mmCharged - 1.175 + 1.25 55 6 4 - Shot_LNF35L + Shot_LightRifleContractors GunTail_Medium 11 @@ -152,7 +183,7 @@ Bullet_12GaugeCharged 0.5 29 - Shot_B3500A + Shot_ShotgunPumpContractors GunTail_Medium 11 @@ -192,7 +223,7 @@ Bullet_6x18mmCharged 0.6 16 - Shot_L45E + Shot_PistolContractors GunTail_Medium 11 @@ -234,7 +265,7 @@ Bullet_8x35mmCharged 1.9 75 - Shot_M34A + Shot_SniperBoltContractors GunTail_Medium 9 @@ -256,7 +287,7 @@ 8.89 5.1 0.36 - 2.11 + 1.56 1.42 0.08 51500 @@ -272,11 +303,11 @@ CombatExtended.Verb_ShootCE true Bullet_8x35mmCharged - 1.2 + 1.3 65 6 5 - Shot_M168B + Shot_HeavyRifleContractors GunTail_Medium 11 @@ -300,7 +331,7 @@ 13.60 12.50 0.55 - 2.11 + 1.20 1.77 0.04 57000 @@ -320,7 +351,7 @@ 55 10 5 - Shot_M340V + Shot_GPMGContractors GunTail_Medium 11 @@ -364,7 +395,7 @@ 31 6 4 - Shot_MS700G + Shot_SMGContractors GunTail_Medium 11 @@ -380,9 +411,435 @@
    • + + +
  • + Gun_RHSC120P + + 3.57 + 2.20 + 0.37 + 0.7 + 0.58 + 0.15 + 14000 + + + 5 + 30 + 20 + 6 + + + CombatExtended.Verb_ShootCE + true + Bullet_8x35mmCharged + 0.6 + 20 + Shot_PistolContractors + GunTail_Medium + 11 + + + 5 + 3.5 + AmmoSet_8x35mmCharged + + + Snapshot + + +
  • CE_OneHandedWeapon
    • + + + + + +
  • + Gun_SLZ556S + + 8.60 + 3.70 + 0.36 + 1.10 + 1.35 + 0.09 + 51000 + + + 10 + 45 + 25 + 10 + + + 1.36 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmCharged + 1 + 55 + 6 + 4 + Shot_LightRifleContractors + GunTail_Medium + 11 + + + 30 + 4 + AmmoSet_6x24mmCharged + + + 3 + TRUE + AimedShot + +
    • + + + +
  • + Gun_AUGS + + 7.90 + 3.60 + 0.36 + 1.10 + 1.15 + 0.07 + 60000 + + + 10 + 45 + 25 + 11 + + + 1.43 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmCharged + 1 + 55 + 6 + 3 + Shot_LightRifleContractors + GunTail_Medium + 11 + + + 30 + 4.5 + AmmoSet_6x24mmCharged + + + 3 + TRUE + AimedShot + +
    • + + + +
  • + Gun_FAL450A + + 11.90 + 4.75 + 0.56 + 1.56 + 1.12 + 0.06 + 53000 + + + 15 + 55 + 30 + 10 + + + 1.43 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmCharged + 1.5 + 62 + 6 + 4 + Shot_HeavyRifleContractors + GunTail_Medium + 11 + + + 30 + 4 + AmmoSet_8x35mmCharged + + + 3 + TRUE + AimedShot + +
    • + + + +
  • + Gun_ML237S + + 12 + 13.50 + 0.37 + 3.51 + 2.67 + 0.06 + 59000 + + + 20 + 80 + 40 + 11 + + + CombatExtended.Verb_ShootCE + true + Bullet_12x64mmCharged + 3.35 + 86 + Shot_HeavySniperContractors + GunTail_Medium + 12 + + + 5 + 4 + AmmoSet_12x64mmCharged + + + AimedShot + +
    • + + + +
  • + Gun_HKCAS42A + + 7.62 + 3.70 + 0.39 + 1.10 + 1.13 + 0.08 + 48000 + + + 10 + 45 + 25 + 10 + + + 2.88 + CombatExtended.Verb_ShootCE + true + Bullet_12GaugeCharged + 0.5 + 25 + 3 + 14 + Shot_LNF35L + GunTail_Medium + 11 + + + 10 + 4.5 + AmmoSet_12GaugeCharged + + + 2 + FALSE + Snapshot + +
    • + + + +
  • + Gun_SCR + + 11.55 + 7.26 + 1.16 + 1.10 + 1.88 + 0.04 + 51500 + + + 15 + 65 + 30 + 6 + 1 + + + 1.43 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmCharged + 1.5 + 55 + 3 + 21 + Shot_HeavyRifleContractors + GunTail_Medium + 11 + + + 2 + FALSE + AimedShot + +
    • + + + +
  • + Gun_M870C + + 3.50 + 1.50 + 0.69 + 1 + 0.65 + 0.18 + 33500 + + + 5 + 25 + 20 + 7 + + + CombatExtended.Verb_ShootCE + true + Bullet_30x64mmFuel_Incendiary + 1 + 25 + Shot_GrenadeLauncherContractors + GunTail_Heavy + 11 + + true + + + + 1 + 1.6 + AmmoSet_30x64mmFuel + + + Snapshot + +
    • + + + +
  • + Gun_AT45A + + 14.50 + 13.45 + 1.50 + 1.10 + 1.69 + 0.05 + 43500 + + + 55 + 30 + 8 + 2 + 5 + + + CombatExtended.Verb_ShootCEOneUse + true + Bullet_ContractorATRocket + 1.8 + 40 + 1 + Shot_RPGContractors + GunTail_Heavy + true + + true + + 14 + + + AimedShot + +
    • + +
  • + Defs/ThingDef[defName="Bullet_ContractorATRocket"]/thingClass + + CombatExtended.BulletCE + +
    • + +
  • + Defs/ThingDef[defName="Bullet_ContractorATRocket"]/projectile + + + Bullet + 350 + 600 + 50 + 65 + + +
    • + +
  • + Always + +
  • + Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps + Invert +
    • +
  • + Defs/ThingDef[defName="Bullet_ContractorATRocket"] + + + +
    • +     + + +
  • + Defs/ThingDef[defName="Bullet_ContractorATRocket"]/comps + +
  • + 160 + EMP + 2.5 +
    • + + +     -     \ No newline at end of file + diff --git a/Patches/Vanilla Animals Expanded - Vehicles/Bodies/Bodies_Car.xml b/Patches/Vanilla Animals Expanded - Vehicles/Bodies/Bodies_Car.xml new file mode 100644 index 0000000000..1d5af7cf82 --- /dev/null +++ b/Patches/Vanilla Animals Expanded - Vehicles/Bodies/Bodies_Car.xml @@ -0,0 +1,52 @@ + + + + + + + +
  • +
  • Vanilla Vehicles Expanded
    • + + + +
  • + /Defs/BodyDef[defName="VAEAF_CarBody"]/corePart + + +
  • CoveredByNaturalArmor
    • + + + + +
  • + /Defs/BodyDef[defName="VAEAF_CarBody"]/corePart/parts/li[def="VAEAF_FrontGrille"]/groups + +
  • CoveredByNaturalArmor
    • + + + +
  • + /Defs/BodyDef[defName="VAEAF_CarBody"]/corePart/parts/li[def="VAEAF_ChassisCentral"] + + +
  • CoveredByNaturalArmor
    • + + + + +
  • + /Defs/BodyDef[defName="VAEAF_CarBody"]/corePart/parts/li[def="VAEAF_ChassisCentral"]/parts/li[def="VAEAF_ChassisRear"] + + +
  • CoveredByNaturalArmor
    • + + + + +     +     + +     +     +     \ No newline at end of file diff --git a/Patches/Vanilla Animals Expanded - Vehicles/ThingDefs_Races/Races_AFVehicles.xml b/Patches/Vanilla Animals Expanded - Vehicles/ThingDefs_Races/Races_AFVehicles.xml new file mode 100644 index 0000000000..b84c7c44d1 --- /dev/null +++ b/Patches/Vanilla Animals Expanded - Vehicles/ThingDefs_Races/Races_AFVehicles.xml @@ -0,0 +1,201 @@ + + + + +
  • + +
  • Vanilla Vehicles Expanded
    • + + + +
  • + /Defs/ThingDef[ + defName="VAEAF_CarFamily" or + defName="VAEAF_CarDelivery" or + defName="VAEAF_CarVintage" or + defName="VAEAF_CarPickup" or + defName="VAEAF_CarForklift" + ] + +
  • + Vehicle +
    • + + + + + + + +
  • + /Defs/ThingDef[defName="VAEAF_CarFamily"]/statBases + + 0.10 + 0.20 + 0.3 + 0.05 + 2 + 3 + +
    • + +
  • + /Defs/ThingDef[defName="VAEAF_CarFamily"]/tools + + +
  • + + +
  • Blunt
    • + + 24 + 3.17 + VAEAF_FrontGrilleGroup + 10 + + + + + + + +
  • + /Defs/ThingDef[defName="VAEAF_CarDelivery"]/statBases + + 0.10 + 0.20 + 0.3 + 0.05 + 2 + 3 + +
    • + +
  • + /Defs/ThingDef[defName="VAEAF_CarDelivery"]/tools + + +
  • + + +
  • Blunt
    • + + 34 + 5.96 + VAEAF_FrontGrilleGroup + 14.7 + + + + + + + +
  • + /Defs/ThingDef[defName="VAEAF_CarVintage"]/statBases + + 0.15 + 0.25 + 0.35 + 0.05 + 4 + 6 + +
    • + +
  • + /Defs/ThingDef[defName="VAEAF_CarVintage"]/tools + + +
  • + + +
  • Blunt
    • + + 36 + 2.54 + VAEAF_FrontGrilleGroup + 15.625 + + + + + + + +
  • + /Defs/ThingDef[defName="VAEAF_CarPickup"]/statBases + + 0.15 + 0.20 + 0.40 + 0.05 + 4 + 6 + +
    • + +
  • + /Defs/ThingDef[defName="VAEAF_CarPickup"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 3.51 + VAEAF_FrontGrilleGroup + 15 + + + + + + + +
  • + /Defs/ThingDef[defName="VAEAF_CarForklift"]/statBases + + 0.20 + 0.15 + 0.25 + 0.05 + 1 + 1.5 + +
    • + +
  • + /Defs/ThingDef[defName="VAEAF_CarForklift"]/tools + + +
  • + + +
  • Blunt
    • + + 22 + 6.65 + VAEAF_FrontGrilleGroup + 9 + + + + + +
  • + /Defs/ThingDef[defName="VAEAP_Leather_Car"]/statBases/StuffPower_Armor_Sharp + + 0.05 + +
    • + +     +     + + +     +     +     diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml index 61cbf627cc..1bd0f43ea5 100644 --- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml +++ b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml @@ -3,7 +3,7 @@ -
  • Vanilla Weapons Expanded
    • +
  • Vanilla Factions Expanded - Medieval
    •  diff --git a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml b/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml index cad3cd8a58..cffa599714 100644 --- a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml +++ b/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml @@ -60,17 +60,19 @@ RocketPropelledLoop_Small -
  • - 50 - VWE_Shock - 4.5 - MortarBomb_Explode - - 5 - 50 - - true -
    • +
  • + 50 + VWE_Shock + 4.5 + MortarBomb_Explode + true +
    • +
  • + + 5 + 50 + +
    • diff --git a/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt b/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt deleted file mode 100644 index e8d06fd9b5..0000000000 --- a/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt +++ /dev/null @@ -1,15 +0,0 @@ - - - - - -
  • Vanilla Weapons Expanded
    • -     > - - - - - -     - -     \ No newline at end of file diff --git a/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml b/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml deleted file mode 100644 index 0d6821e170..0000000000 --- a/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - -
  • Vanilla Weapons Expanded
    • -     - - - - - -
  • - Defs - - - - LeadBall - - A loose fitting metal ball. Fairly innacurate due to poor aerodynamics, but inflicts large wounds due to the hitting power and large diameter of the projectile. - - - - AmmoVWELeadBall - - AmmoNeolithic - UI/Icons/ThingCategories/CaliberRifle - - - - AmmoSet_VWE_LeadBall - - - Bullet_VWE_LeadBall - - - -
    • - - -
  • - Defs - - - - Ammo_VWE_LeadBall - - Projectile traditionally fired from smooth-bore muskets and flintlock pistols. - LeadBall - - Things/Ammo/Neolithic/SlingBullet/Steel - Graphic_StackCount - - - 0.03 - 0.06 - - -
  • AmmoVWELeadBall
    • - - 1000 - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_FueledSmithy
    • -
  • CE_AutoEnableCrafting_ElectricSmithy
    • -
  • CE_AutoEnableCrafting_CraftingSpot
    • -     - - - - - -
  • - Defs - - - - Bullet_VWE_LeadBall - - - Things/Projectile/Bullet_Musket - Graphic_Single - - - Bullet - 72 - 20 - 7.2 - 37.8 - false - - - -
    • - - -
  • - Defs - - - - MakeAmmo_VWE_LeadBall - - Craft 100 lead balls. - Making lead balls. - -
  • - - -
  • Steel
    • - - - 20 - -     - - -
  • Steel
    • -     -     - - 500 - - 2000 - -
  • FueledSmithy
    • -
  • ElectricSmithy
    • -     - - - - - - - - - \ No newline at end of file diff --git a/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml b/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml index dc34016137..4cc443622c 100644 --- a/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml +++ b/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml @@ -8,70 +8,21 @@ - - -
  • - Defs - - - - AmmoSet_VWE_Whip - - - Projectile_VWE_Whip - - - -
    • - - -
  • - Defs - - - - . - - - 0.01 - 0.02 - - - - - Ammo_VWE_Whip - - - - Things/Ammo/Neolithic/SlingBullet/Steel - Graphic_StackCount - - - -
    • -
  • Defs - + + Bullet_VWE_Whip + CombatExtended.BulletCE + Things/Projectile/WhipSlash Graphic_Single - - RangedStab 80 - - - - - Projectile_VWE_Whip - - - RangedStab 14 diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml b/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml index d06000dc06..83b7cac4b4 100644 --- a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml +++ b/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml @@ -10,7 +10,7 @@ Vanilla Weapons Expanded
    • - +
  • /Defs/ThingDef[ diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml b/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml index 205f395263..f212714b5c 100644 --- a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml +++ b/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml @@ -239,6 +239,54 @@
    • + + +
  • + VWE_SawedOffShotgun + + + 1.85 + 0.93 + 0.17 + 2.20 + 4.75 + 0.7 + 9500 + + + + 30 + 3 + + + + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 14 + Shot_Shotgun + GunTail_Heavy + 9 + + + + 2 + true + 1.7 + AmmoSet_12Gauge + + + + Snapshot + + + +
  • Gun
    • + + Gunsmithing + +
  • VWE_Gun_HandCannon diff --git a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml b/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml index dd2dd34ec5..5ddeb19aed 100644 --- a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml +++ b/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml @@ -175,7 +175,7 @@ CombatExtended.Verb_ShootCE True - Bullet_VWE_LeadBall + Bullet_SlowMusketBall 1.66 12 VWE_Shot_Musket @@ -186,7 +186,7 @@ 1 6.5 - AmmoSet_VWE_LeadBall + AmmoSet_SlowMusketBall @@ -201,7 +201,7 @@
  • @@ -234,7 +234,7 @@ CombatExtended.Verb_ShootCE True - Bullet_VWE_LeadBall + Bullet_FastMusketBall 2.5 45 VWE_Shot_Musket @@ -245,7 +245,7 @@ 1 10 - AmmoSet_VWE_LeadBall + AmmoSet_FastMusketBall @@ -277,18 +277,43 @@
    • +
  • + /Defs/ThingDef[defName="VWE_Throwing_Knives"] + ParentName + BaseWeapon +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Knives"]/recipeMaker +
    • + +
  • + Defs/ThingDef[defName="VWE_Throwing_Knives"]/costStuffCount +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Knives"]/stuffCategories +
    • +
  • - Defs/ThingDef[defName="VWE_Throwing_Knives"] + /Defs/ThingDef[defName="VWE_Throwing_Knives"]/graphicData + + (105,105,105) + +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Knives"] CombatExtended.AmmoThing - 50 + 75 First
  • - Defs/ThingDef[defName="VWE_Throwing_Knives"] + /Defs/ThingDef[defName="VWE_Throwing_Knives"] Class CombatExtended.AmmoDef @@ -298,10 +323,9 @@ VWE_Throwing_Knives - 4600 - 0.7 - 1 - 1 + 1 + 0.35 + 0.15 0.38 @@ -311,8 +335,9 @@ True VWE_FlyingBlade 1 - 15 + 10 ThrowGrenade + false
    • @@ -390,7 +415,7 @@ CombatExtended.Verb_ShootCE True - Projectile_VWE_Whip + Bullet_VWE_Whip 1 15 VWE_Shot_Whip diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.txt b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml new file mode 100644 index 0000000000..10449acae2 --- /dev/null +++ b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml @@ -0,0 +1,73 @@ + + + + + +
  • Vanilla Weapons Expanded
    • +     + + + + + + +
  • + Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.59 + 0.10 + 0.625 + Handle + +
  • + + +
  • Cut
    • + + 17 + 3.52 + 0.30 + 2.025 + 0.68 + Edge + + + + + +
  • + Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/statBases + + 4 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/equippedStatOffsets + + 0.10 + 0.15 + 0.20 + +
    • + +
  • + Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/weaponTags + +
  • CE_OneHandedWeapon
    • + + + +     +     +     + +     \ No newline at end of file diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.txt b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml new file mode 100644 index 0000000000..79c2d92826 --- /dev/null +++ b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml @@ -0,0 +1,229 @@ + + + + + +
  • Vanilla Weapons Expanded
    • +     + + + + + +
  • + VWE_Bow_Long + + 0.7 + 1 + 2 + 5.50 + 1 + + + 65 + + + CombatExtended.Verb_ShootCE + true + Projectile_GreatArrow_Stone + 1.5 + 37 + Bow_Large + + + AmmoSet_GreatArrow + + + +
  • NeolithicRangedBasic
    • +
  • NeolithicRangedHeavy
    • +
  • CE_Bow
    • + + VWE_Longbow + false + + +
  • + Defs/ThingDef[defName="VWE_Bow_Long"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.6 + 0.65 + + + + + + + + +
  • + /Defs/ThingDef[defName="VWE_Rock"]/projectile + + + + Blunt + 15 + 3.12 + false + false + + +
    • + + + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"] + ParentName + BaseWeapon +
    • + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"]/recipeMaker +
    • + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"]/destroyOnDrop +
    • + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"]/costStuffCount +
    • + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"]/stuffCategories +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Rocks"] + + + CombatExtended.AmmoThing + 75 + First + +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Rocks"]/graphicData + + (158,153,135) + +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Rocks"] + + Class + CombatExtended.AmmoDef +
    • + +
  • + Always + + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Rocks"]/comps + Invert +
    • + +
  • + /Defs/ThingDef[defName="VWE_Throwing_Rocks"] + + + +
    • +     + + +
  • + VWE_Throwing_Rocks + + + 0.5 + 0.25 + 0.09 + 1 + 1 + + + + + CombatExtended.Verb_ShootCEOneUse + true + VWE_Rock + 10 + 1.8 + ThrowGrenade + 4 + false + + + +
  • CE_OneHandedWeapon
    • + + + +
  • + Defs/ThingDef[defName="VWE_Throwing_Rocks"]/tools + + +
  • + +
  • Blunt
    • + + 2 + 1.5 + 0.5 + + + + + +
  • + Defs + + + + MakeThrowingRocks + + Craft 10 throwing rocks. + Making throwing rocks. + 1200 + +
  • + + +
  • Stony
    • + + + 1 + + + + +
  • Stony
    • +     +     + +
  • CraftingSpot
    • +     + + 10 + + + + + + +     +     + + + \ No newline at end of file diff --git a/Source/CombatExtended/CombatExtended/GenClosestAmmo.cs b/Source/CombatExtended/CombatExtended/GenClosestAmmo.cs index a2e5e440bd..dbb8b1604f 100644 --- a/Source/CombatExtended/CombatExtended/GenClosestAmmo.cs +++ b/Source/CombatExtended/CombatExtended/GenClosestAmmo.cs @@ -13,7 +13,7 @@ namespace CombatExtended public static class GenClosestAmmo { public const int pawnsPerTurret = 10; - public const float ammoSearchRadius = 40f; + public const float ammoSearchRadius = 100f; public static Dictionary latestAmmoUpdate = new Dictionary(); //Check for any AmmoThing having SPAWNED (not for AmmoThing having been destroyed, as this cannot resolve issues) diff --git a/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs b/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs index 112213464f..96595ae671 100644 --- a/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs +++ b/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs @@ -662,32 +662,37 @@ private void InitGun() public Thing nearestViableAmmo; public void UpdateNearbyAmmo(bool forceCheck = false) { - if (lastSurroundingAmmoCheck + TicksBetweenAmmoChecks >= Find.TickManager.TicksGame) - return; + try + { + if (lastSurroundingAmmoCheck + TicksBetweenAmmoChecks >= Find.TickManager.TicksGame) + return; - if (!CompAmmo.Props.ammoSet.ammoTypes.Any(x => GenClosestAmmo.latestAmmoUpdate[x.ammo] > lastSurroundingAmmoCheck)) - return; + if (!CompAmmo.Props.ammoSet.ammoTypes.Any(x => GenClosestAmmo.latestAmmoUpdate[x.ammo] > lastSurroundingAmmoCheck)) + return; - //If ammo remained viable, don't bother unless forced - if (nearestViableAmmo != null - && !forceCheck - && nearestViableAmmo.Spawned - && !nearestViableAmmo.IsForbidden(Faction) - && nearestViableAmmo.ParentHolder == null - && !Map.physicalInteractionReservationManager.IsReserved(nearestViableAmmo)) - return; + //If ammo remained viable, don't bother unless forced + if (nearestViableAmmo != null + && !forceCheck + && nearestViableAmmo.Spawned + && !nearestViableAmmo.IsForbidden(Faction) + && nearestViableAmmo.ParentHolder == null + && !Map.physicalInteractionReservationManager.IsReserved(nearestViableAmmo)) + return; - //var prevIsSlow = isSlow; - var prevViableAmmo = nearestViableAmmo; - nearestViableAmmo = GenClosestAmmo.ClosestAmmoReachable(Position, Map, CompAmmo, - TraverseParms.For(TraverseMode.NoPassClosedDoors, Danger.Deadly), PathEndMode.ClosestTouch, GenClosestAmmo.ammoSearchRadius, - x => !x.IsForbidden(Faction) && !Map.physicalInteractionReservationManager.IsReserved(x)); + //var prevIsSlow = isSlow; + var prevViableAmmo = nearestViableAmmo; + nearestViableAmmo = GenClosestAmmo.ClosestAmmoReachable(Position, Map, CompAmmo, + TraverseParms.For(TraverseMode.NoPassClosedDoors, Danger.Deadly), PathEndMode.ClosestTouch, GenClosestAmmo.ammoSearchRadius, + x => !x.IsForbidden(Faction) && !Map.physicalInteractionReservationManager.IsReserved(x)); - isSlow = (nearestViableAmmo == null || nearestViableAmmo == prevViableAmmo); + isSlow = (nearestViableAmmo == null || nearestViableAmmo == prevViableAmmo); - //Log.Message("Updated " + ThingID + " (slow = "+prevIsSlow+" -> "+isSlow+") to " + nearestViableAmmo?.ThingID); - - lastSurroundingAmmoCheck = Find.TickManager.TicksGame; + //Log.Message("Updated " + ThingID + " (slow = "+prevIsSlow+" -> "+isSlow+") to " + nearestViableAmmo?.ThingID); + } + finally + { + lastSurroundingAmmoCheck = Find.TickManager.TicksGame; + } } public void TryForceReload() diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index f6d05cee8d..aba725af49 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -34,7 +34,6 @@ A Dog Said... | Android Tiers | Android Tiers++ | Androids | -AnimalCollabProj | Apparello 2 | Arachne Race | Area Rugs | @@ -56,7 +55,7 @@ Fallout Traits | FashionRIMsta | Fate Grand Order - Styles Apparel Pack | Ferrex Race | -Forsakens | +Flak Dusters | Gas Traps And Shells | Girls' Frontline Apparel Pack | Girls' Frontline Styles - 404 Team | @@ -66,7 +65,7 @@ GouRIMet | Hand 'n' Footwear | High Caliber | Jernfalk's Standalone Horses | -K.L.K - Styles Apparel Pack || +K.L.K - Styles Apparel Pack | Kijin Race 2.0 | Kill la Kill Styles Pack | Kurin, The Three Tailed Fox | @@ -95,7 +94,7 @@ Rimefeller | RimEffect - Asari of the Rims | Rimfire | Save Our Ship 2 | -Sergals, Gnolls and Lions | +Sergals, Gnolls, Lions and Frogs | Simply More Melee | Soviet Armory | Spartan Foundry | @@ -108,6 +107,7 @@ Vanilla Armour Expanded | Vanilla Bionics Expansion | Vanilla Factions Expanded - Medieval | Vanilla Weapons Expanded Quickdraw | +Vanilla-Friendly Animal Surgery | Vanilla-Friendly Weapon Expansion | Vulpine Race Pack | Weapons+ |