Skip to content

Commit

Permalink
Merge pull request #19 from NoImageAvailable/Development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@NoImageAvailable
NoImageAvailable committed May 8, 2016
2 parents 2b830b2 + eabe77a commit 7c14250
Show file tree
Hide file tree
Showing 16 changed files with 204 additions and 30 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<author>NoImageAvailable</author>
<url>https://ludeon.com/forums/index.php?topic=9759.0</url>
<targetVersion>Alpha 13</targetVersion>
<description>Version: 1.6.2
<description>Version: 1.6.5

An extensive overhaul of the game's combat to make it more realistic.
</description>
Expand Down
Binary file modified Assemblies/CombatRealism.dll
View file
Binary file not shown.
6 changes: 5 additions & 1 deletion Defs/PawnKindDefs/PawnKinds_Mercenary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<apparelAllowHeadwearChance>0.5</apparelAllowHeadwearChance>
<weaponMoney>
<min>300</min>
<max>750</max>
<max>1000</max>
</weaponMoney>
<weaponTags>
<li>Gun</li>
Expand Down Expand Up @@ -275,6 +275,10 @@
<weaponTags>
<li>CR_MachineGun</li>
</weaponTags>
<weaponMoney>
<min>1200</min>
<max>2000</max>
</weaponMoney>
<fixedInventory>
<LoadoutGen_MercAmmoPrimaryDouble>1</LoadoutGen_MercAmmoPrimaryDouble>
<LoadoutGen_MercSidearmMelee>1</LoadoutGen_MercSidearmMelee>
Expand Down
40 changes: 40 additions & 0 deletions Defs/StatDefs/Stats_Weapons_Melee.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<StatDef>
<defName>ArmorPenetration</defName>
<label>armor penetration</label>
<description>Capability to penetrate armor on a strike.</description>
<category>Weapon</category>
<defaultBaseValue>0</defaultBaseValue>
<toStringStyle>PercentTwo</toStringStyle>
<showIfUndefined>false</showIfUndefined>
<parts>
<li Class="StatPart_Quality">
<factorAwful>0.5</factorAwful>
<factorShoddy>0.675</factorShoddy>
<factorPoor>0.85</factorPoor>
<factorNormal>1</factorNormal>
<factorGood>1.1</factorGood>
<factorSuperior>1.2</factorSuperior>
<factorExcellent>1.3</factorExcellent>
<factorMasterwork>1.4</factorMasterwork>
<factorLegendary>1.5</factorLegendary>
</li>
<li Class="StatPart_Health">
<curve>
<points>
<li>(0,0.0)</li>
<li>(1,1)</li>
</points>
</curve>
</li>
</parts>
<displayPriorityInCategory>896</displayPriorityInCategory>
</StatDef>





</Defs>
10 changes: 5 additions & 5 deletions Defs/StatDefs/Stats_Weapons_Ranged.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<li Class="StatPart_Quality">
<factorAwful>0.7</factorAwful>
<factorShoddy>0.8</factorShoddy>
<factorPoor>0.93</factorPoor>
<factorPoor>0.9</factorPoor>
<factorNormal>1</factorNormal>
<factorGood>1.05</factorGood>
<factorSuperior>1.1</factorSuperior>
<factorExcellent>1.2</factorExcellent>
<factorMasterwork>1.35</factorMasterwork>
<factorGood>1.1</factorGood>
<factorSuperior>1.2</factorSuperior>
<factorExcellent>1.3</factorExcellent>
<factorMasterwork>1.4</factorMasterwork>
<factorLegendary>1.5</factorLegendary>
</li>
<li Class="StatPart_Health">
Expand Down
5 changes: 5 additions & 0 deletions Defs/StuffCategoryDefs/StuffCategories.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<defName>Steeled</defName>
<label>steeled</label>
</StuffCategoryDef>

<StuffCategoryDef>
<defName>Metallic_Weapon</defName>
<label>metallic</label>
</StuffCategoryDef>



Expand Down
1 change: 1 addition & 0 deletions Defs/ThingDefs/Apparel_Carrying.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<ThingDef Name="ApparelCarryGearBase" Abstract="True">
<thingClass>Apparel</thingClass>
<techLevel>Midworld</techLevel>
<category>Item</category>
<selectable>True</selectable>
<pathCost>10</pathCost>
Expand Down
89 changes: 89 additions & 0 deletions Defs/ThingDefs/Apparel_Various.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@
</li>
</comps>
</ThingDef>

<ThingDef Name="ApparelMakeableBase" ParentName="ApparelBase" Abstract="True">
<recipeMaker>
<workSpeedStat>TailoringSpeed</workSpeedStat>
<workSkill>Crafting</workSkill>
<effectWorking>Tailor</effectWorking>
<soundWorking>Recipe_Tailor</soundWorking>
<recipeUsers>
<li>ElectricTailoringBench</li>
<li>HandTailoringBench</li>
</recipeUsers>
<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
</recipeMaker>
</ThingDef>

<ThingDef Name="ArmorMakeableBase" ParentName="ApparelBase" Abstract="True">
<recipeMaker>
Expand All @@ -45,6 +59,81 @@
</ThingDef>


<ThingDef ParentName="ApparelMakeableBase">
<defName>Apparel_Parka</defName>
<label>parka</label>
<description>A thick parka for staying warm in even the coldest of temperatures.</description>
<graphicData>
<texPath>Things/Pawn/Humanlike/Apparel/Parka/Parka</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<costStuffCount>120</costStuffCount>
<stuffCategories>
<li>Fabric</li>
<li>Leathery</li>
</stuffCategories>
<thingCategories>
<li>Apparel</li>
</thingCategories>
<statBases>
<MaxHitPoints>200</MaxHitPoints>
<WorkToMake>22000</WorkToMake>
<ArmorRating_Sharp>0.03</ArmorRating_Sharp>
<ArmorRating_Heat>0.03</ArmorRating_Heat>
<Insulation_Cold>-40</Insulation_Cold>
<Insulation_Heat>-3</Insulation_Heat>
<Weight>1</Weight>
<Bulk>10</Bulk>
<WornWeight>1</WornWeight>
<WornBulk>3</WornBulk>
</statBases>
<apparel>
<bodyPartGroups>
<li>Torso</li>
<li>Shoulders</li>
<li>Arms</li>
</bodyPartGroups>
<worngraphicPath>Things/Pawn/Humanlike/Apparel/Parka/Parka</worngraphicPath>
<layers>
<li>Shell</li>
</layers>
<commonality>1</commonality>
<tags>
<li>Outlander</li>
<li>Tribal</li>
</tags>
<defaultOutfitTags>
<li>Worker</li>
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<colorGenerator Class="ColorGenerator_Options">
<options>
<li>
<weight>10</weight>
<only>RGBA(0.33,0.33,0.33,1)</only>
</li>
<li>
<weight>10</weight>
<only>RGBA(0.65,0.65,0.65,1)</only>
</li>
<li>
<weight>10</weight>
<only>RGBA(0.4,0.3,0.15,1)</only>
</li>
<li>
<weight>15</weight>
<min>RGBA(0.3,0.3,0.3,1)</min>
<max>RGBA(0.5,0.5,0.5,1)</max>
</li>
<li>
<weight>6</weight>
<min>RGBA(0.5,0.5,0.5,1)</min>
<max>RGBA(1,1,1,1)</max>
</li>
</options>
</colorGenerator>
</ThingDef>

<!-- ============= Stuff-less apparel =================-->

Expand Down
8 changes: 4 additions & 4 deletions Defs/ThingDefs/Weapons_Guns.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@
</graphicData>
<soundInteract>InteractRifle</soundInteract>
<statBases>
<WorkToMake>22000</WorkToMake>
<MarketValue>1600</MarketValue>
<WorkToMake>18000</WorkToMake>
<MarketValue>1200</MarketValue>
<AimEfficiency>0.50</AimEfficiency>
<ShotSpread>0.08</ShotSpread>
<SwayFactor>3.42</SwayFactor>
Expand Down Expand Up @@ -767,7 +767,7 @@
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<thingClass>Projectile_DoomsdayRocket</thingClass>
<thingClass>Combat_Realism.ProjectileCR_Explosive</thingClass>
<projectile>
<damageDef>Bomb</damageDef>
<damageAmountBase>250</damageAmountBase>
Expand Down Expand Up @@ -845,7 +845,7 @@
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<thingClass>Projectile_Explosive</thingClass>
<thingClass>Combat_Realism.ProjectileCR_Explosive</thingClass>
<projectile>
<damageDef>Bomb</damageDef>
<damageAmountBase>180</damageAmountBase>
Expand Down
39 changes: 27 additions & 12 deletions Defs/ThingDefs/Weapons_Melee.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,15 @@
<costStuffCount>50</costStuffCount>
<statBases>
<WorkToMake>20000</WorkToMake>
<MeleeWeapon_DamageAmount>18</MeleeWeapon_DamageAmount>
<MeleeWeapon_DamageAmount>14</MeleeWeapon_DamageAmount>
<MeleeWeapon_Cooldown>0.975</MeleeWeapon_Cooldown>
<ArmorPenetration>0.2</ArmorPenetration>
<Bulk>3.5</Bulk>
<Weight>1</Weight>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
</stuffCategories>
<verbs>
Expand All @@ -139,12 +142,15 @@
<costStuffCount>120</costStuffCount>
<statBases>
<WorkToMake>40000</WorkToMake>
<MeleeWeapon_DamageAmount>20</MeleeWeapon_DamageAmount>
<MeleeWeapon_DamageAmount>16</MeleeWeapon_DamageAmount>
<MeleeWeapon_Cooldown>1.25</MeleeWeapon_Cooldown>
<ArmorPenetration>0.225</ArmorPenetration>
<Bulk>8</Bulk>
<Weight>1.6</Weight>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
</stuffCategories>
<verbs>
Expand Down Expand Up @@ -176,10 +182,13 @@
<WorkToMake>6000</WorkToMake>
<MeleeWeapon_DamageAmount>12</MeleeWeapon_DamageAmount>
<MeleeWeapon_Cooldown>0.83</MeleeWeapon_Cooldown>
<ArmorPenetration>0.175</ArmorPenetration>
<Bulk>1</Bulk>
<Weight>0.3</Weight>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
</stuffCategories>
<verbs>
<li>
Expand All @@ -206,13 +215,16 @@
<costStuffCount>10</costStuffCount>
<statBases>
<WorkToMake>300</WorkToMake>
<MeleeWeapon_DamageAmount>11</MeleeWeapon_DamageAmount>
<MeleeWeapon_DamageAmount>10</MeleeWeapon_DamageAmount>
<DeteriorationRate>0.5</DeteriorationRate>
<MeleeWeapon_Cooldown>0.83</MeleeWeapon_Cooldown>
<ArmorPenetration>0.125</ArmorPenetration>
<Bulk>1</Bulk>
<Weight>0.3</Weight>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
<li>Stony</li>
</stuffCategories>
Expand Down Expand Up @@ -250,10 +262,13 @@
<WorkToMake>25000</WorkToMake>
<MeleeWeapon_DamageAmount>18</MeleeWeapon_DamageAmount>
<MeleeWeapon_Cooldown>1.15</MeleeWeapon_Cooldown>
<ArmorPenetration>0.275</ArmorPenetration>
<Bulk>10</Bulk>
<Weight>2.5</Weight>
</statBases>
<equippedAngleOffset>-25</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
</stuffCategories>
<verbs>
Expand All @@ -277,12 +292,12 @@
<costStuffCount>75</costStuffCount>
<statBases>
<WorkToMake>15000</WorkToMake>
<MeleeWeapon_DamageAmount>20</MeleeWeapon_DamageAmount>
<MeleeWeapon_DamageAmount>16</MeleeWeapon_DamageAmount>
<MeleeWeapon_Cooldown>1.05</MeleeWeapon_Cooldown>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
</stuffCategories>
<verbs>
Expand Down Expand Up @@ -314,13 +329,13 @@
<costStuffCount>40</costStuffCount>
<statBases>
<WorkToMake>500</WorkToMake>
<MeleeWeapon_DamageAmount>16</MeleeWeapon_DamageAmount>
<MeleeWeapon_DamageAmount>13</MeleeWeapon_DamageAmount>
<DeteriorationRate>0.5</DeteriorationRate>
<MeleeWeapon_Cooldown>1.35</MeleeWeapon_Cooldown>
</statBases>
<equippedAngleOffset>-65</equippedAngleOffset>
<stuffCategories>
<li>Metallic</li>
<li>Metallic_Weapon</li>
<li>Woody</li>
<li>Stony</li>
</stuffCategories>
Expand Down
Loading

0 comments on commit 7c14250

Please sign in to comment.