Skip to content

Commit

Permalink
Merge pull request #17 from NoImageAvailable/Development
Browse files Browse the repository at this point in the history 
1.6.4 Release
  • Loading branch information
@NoImageAvailable
NoImageAvailable committed May 6, 2016
2 parents 7029687 + 4a0fdc6 commit 2b830b2
Show file tree
Hide file tree
Showing 134 changed files with 3,843 additions and 1,101 deletions.
Binary file modified Assemblies/CombatRealism.dll
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions Defs/AmmoCategoryDefs/AmmoCategories_Grenades.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,12 @@
<description>Creates an electro-magnetic burst on impact, temporarily disrupting electronic systems and Mechanoids.</description>
<advanced>true</advanced>
</AmmoCategoryDef>

<AmmoCategoryDef>
<defName>GrenadeIncendiary</defName>
<label>Incendiary</label>
<description>Filled with incendiary agent. The agent is dispersed on impact, covering the area in flames.</description>
<advanced>true</advanced>
</AmmoCategoryDef>

</Defs>
14 changes: 14 additions & 0 deletions Defs/AmmoCategoryDefs/AmmoCategories_Neolithic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,19 @@
<label>stone arrow</label>
<description>A sharpened stone is attached as an arrow head. Cuts exposed tissue fairly well but is ineffective against any kind of armor.</description>
</AmmoCategoryDef>

<AmmoCategoryDef>
<defName>SteelArrow</defName>
<label>steel arrow</label>
<description>The arrow head is made from steel to enhance armor penetration.</description>
<advanced>true</advanced>
</AmmoCategoryDef>

<AmmoCategoryDef>
<defName>PlasteelArrow</defName>
<label>plasteel arrow</label>
<description>Fitted with a plasteel head to maximize armor penetration.</description>
<advanced>true</advanced>
</AmmoCategoryDef>

</Defs>
12 changes: 12 additions & 0 deletions Defs/AmmoSetDefs/AmmoSets_HighCaliber.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@
</ammoTypes>
</AmmoSetDef>

<!-- ==================== 14.5x114mm ========================== -->

<AmmoSetDef>
<defName>AmmoSet_145x114mm</defName>
<label>14.5x114mm</label>
<ammoTypes>
<li>Ammo_145x114mm_FMJ</li>
<li>Ammo_145x114mm_HE</li>
<li>Ammo_145x114mm_Incendiary</li>
</ammoTypes>
</AmmoSetDef>

</Defs>
16 changes: 10 additions & 6 deletions Defs/AmmoSetDefs/AmmoSets_Neolithic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@
<AmmoSetDef>
<defName>AmmoSet_Arrow</defName>
<label>arrows</label>
<ammoTypes>
<li>Ammo_Arrow</li>
</ammoTypes>
<ammoTypes>
<li>Ammo_Arrow_Stone</li>
<li>Ammo_Arrow_Steel</li>
<li>Ammo_Arrow_Plasteel</li>
</ammoTypes>
</AmmoSetDef>

<!-- ==================== Great arrows ========================== -->

<AmmoSetDef>
<defName>AmmoSet_GreatArrow</defName>
<label>great arrows</label>
<ammoTypes>
<li>Ammo_GreatArrow</li>
</ammoTypes>
<ammoTypes>
<li>Ammo_GreatArrow_Stone</li>
<li>Ammo_GreatArrow_Steel</li>
<li>Ammo_GreatArrow_Plasteel</li>
</ammoTypes>
</AmmoSetDef>

</Defs>
28 changes: 28 additions & 0 deletions Defs/AmmoSetDefs/AmmoSets_Shells.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<!-- ==================== 81mm mortar shells ========================== -->

<AmmoSetDef>
<defName>AmmoSet_81mmMortarShell</defName>
<label>81mm mortar shells</label>
<ammoTypes>
<li>ArtilleryShell</li>
<li>Ammo_81mmMortarShell_Incendiary</li>
<li>Ammo_81mmMortarShell_EMP</li>
</ammoTypes>
</AmmoSetDef>

<!-- ==================== 90mm cannon shells ========================== -->

<AmmoSetDef>
<defName>AmmoSet_90mmCannonShell</defName>
<label>90mm cannon shells</label>
<ammoTypes>
<li>Ammo_90mmCannonShell_HEAT</li>
<li>Ammo_90mmCannonShell_HE</li>
<li>Ammo_90mmCannonShell_EMP</li>
</ammoTypes>
</AmmoSetDef>

</Defs>
13 changes: 13 additions & 0 deletions Defs/BodyPartDefs/BodyParts_Humanoid.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<BodyPartDef>
<defName>Torso</defName>
<label>torso</label>
<hitPoints>50</hitPoints>
<oldInjuryBaseChance>0.08</oldInjuryBaseChance>
<skinCovered>true</skinCovered>
<dontSuggestAmputation>true</dontSuggestAmputation>
</BodyPartDef>

</Defs>
10 changes: 10 additions & 0 deletions Defs/BodyPartDefs/BodyParts_Mechanoid.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<BodyPartDef>
<defName>MechanicalThorax</defName>
<label>thorax</label>
<hitPoints>50</hitPoints>
<oldInjuryBaseChance>0</oldInjuryBaseChance>
<skinCovered>false</skinCovered>
<isSolid>true</isSolid>
<isAlive>false</isAlive>
</BodyPartDef>

<BodyPartDef>
<defName>LeftBlade</defName>
<label>left blade</label>
Expand Down
29 changes: 15 additions & 14 deletions Defs/DamageDefs/Damages_LocalInjury.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Slice</impactSoundType>
<armorCategory>Sharp</armorCategory>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="LocalInjuryBase">
Expand All @@ -30,7 +30,7 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Blunt</impactSoundType>
<armorCategory>Blunt</armorCategory>
<deflectable>true</deflectable>
<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
</DamageDef>

<DamageDef Name="Blunt" ParentName="LocalInjuryBase">
Expand All @@ -46,7 +46,7 @@
<hasChanceToAdditionallyDamageInnerSolidParts>true</hasChanceToAdditionallyDamageInnerSolidParts>
<impactSoundType>Blunt</impactSoundType>
<armorCategory>Blunt</armorCategory>
<deflectable>true</deflectable>
<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
</DamageDef>

<DamageDef ParentName="Blunt">
Expand All @@ -56,11 +56,10 @@
<additionalHediffs>
<li>
<hediff>MuscleSpasms</hediff>
<severityPerDamageDealt>0.035</severityPerDamageDealt>
<severityPerDamageDealt>0.07</severityPerDamageDealt>
</li>
</additionalHediffs>
<armorCategory>Blunt</armorCategory>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="LocalInjuryBase">
Expand All @@ -74,7 +73,7 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Slice</impactSoundType>
<armorCategory>Sharp</armorCategory>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef Name="DamageBulletBase" ParentName="LocalInjuryBase">
Expand All @@ -87,7 +86,7 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Bullet</impactSoundType>
<armorCategory>Sharp</armorCategory>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="DamageBulletBase">
Expand Down Expand Up @@ -124,8 +123,9 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Slice</impactSoundType>
<armorCategory>Sharp</armorCategory>
<deflectable>true</deflectable>
<absorbable>true</absorbable>
<deflectable>true</deflectable>
<absorbable>true</absorbable>
<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
</DamageDef>

<DamageDef Name="Bite" ParentName="LocalInjuryBase">
Expand All @@ -139,7 +139,7 @@
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<impactSoundType>Slice</impactSoundType>
<armorCategory>Sharp</armorCategory>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="Bite">
Expand All @@ -151,8 +151,8 @@
<severityPerDamageDealt>0.001</severityPerDamageDealt>
</li>
</additionalHediffs>
<deflectable>true</deflectable>
<absorbable>true</absorbable>
<deflectable>true</deflectable>
<absorbable>true</absorbable>
</DamageDef>

<DamageDef Name="DamageBombBase" ParentName="LocalInjuryBase">
Expand Down Expand Up @@ -180,7 +180,7 @@
<defName>Bomb_Secondary</defName>
<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
<spreadOut>false</spreadOut>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="DamageBombBase">
Expand All @@ -206,13 +206,14 @@
<explosionHeatEnergyPerCell>15</explosionHeatEnergyPerCell>
<explosionCellMote>Mote_BlastFlame</explosionCellMote>
<soundExplosion>Explosion_Flame</soundExplosion>
<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
</DamageDef>

<DamageDef ParentName="Flame">
<defName>Flame_Secondary</defName>
<harmAllLayersUntilOutside>false</harmAllLayersUntilOutside>
<spreadOut>false</spreadOut>
<deflectable>true</deflectable>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="LocalInjuryBase">
Expand Down
85 changes: 84 additions & 1 deletion Defs/FactionDefs/Factions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,89 @@
<FactionDefs>

<!-- Normal humanlike factions -->

<FactionDef>
<defName>Tribe</defName>
<label>tribe</label>
<description>These people have been here a very long time. Maybe their ancestors crashed here a thousand years ago. Maybe they survived some cataclysm that destroyed a technological civilization here. In any case, the tribals are mostly nomadic people who live off the land using primitive tools and weapons.\n\nSome tribes are more aggressive than others; many are open to trade and alliances, even with strange peoples like yourselves. Close cooperation or recruitment will be very difficult because of the vast sociotechnological and linguistic gap between the tribals and yourselves.\n\nDespite their apparent technological weakness, the tribals can be dangerous enemies and valuable friends because of their skill with low-tech warfare, their numbers, and their hardiness.</description>
<pawnsPlural>tribespeople</pawnsPlural>
<requiredCountAtGameStart>1</requiredCountAtGameStart>
<canMakeRandomly>true</canMakeRandomly>
<raidCommonality>100</raidCommonality>
<canStageAttacks>true</canStageAttacks>
<startingGoodwill>
<min>-50</min>
<max>30</max>
</startingGoodwill>
<mustStartOneEnemy>true</mustStartOneEnemy>
<factionNameMaker>NamerFactionTribal</factionNameMaker>
<pawnNameMaker>NamerPersonTribal</pawnNameMaker>
<techLevel>Neolithic</techLevel>
<backstoryCategory>Tribal</backstoryCategory>
<leaderTitle>Chief</leaderTitle>
<hairTags>
<li>Tribal</li>
</hairTags>
<naturalColonyGoodwill>
<min>-100</min>
<max>10</max>
</naturalColonyGoodwill>
<caravanTraderKinds>
<li>Caravan_Neolithic_BulkGoods</li>
<li>Caravan_Neolithic_CombatSupplier</li>
<li>Caravan_Neolithic_SlavesMerchant</li>
</caravanTraderKinds>
<!--
<visitorTraderKinds>
<li>Visitor_Neolithic_Standard</li>
</visitorTraderKinds>
-->
<pawnGroupMakers>
<li Class="PawnGroupMaker_Normal">
<options>
<li>
<selectionWeight>60</selectionWeight>
<kind>TribalWarrior</kind>
</li>
<li>
<selectionWeight>100</selectionWeight>
<kind>TribalArcher</kind>
</li>
<li>
<selectionWeight>70</selectionWeight>
<kind>TribalChief</kind>
</li>
</options>
</li>
<li Class="PawnGroupMaker_Trader">
<traders>
<li>
<selectionWeight>1</selectionWeight>
<kind>TribalTrader</kind>
</li>
</traders>
<carriers>
<li>
<selectionWeight>1</selectionWeight>
<kind>PackMuffalo</kind>
</li>
</carriers>
<guards>
<li>
<selectionWeight>60</selectionWeight>
<kind>TribalWarrior</kind>
</li>
<li>
<selectionWeight>100</selectionWeight>
<kind>TribalArcher</kind>
</li>
</guards>
</li>
</pawnGroupMakers>
<homeIconPath>World/FactionHomes/DefaultHome</homeIconPath>
<homeIconColor>(50,200,50)</homeIconColor>
</FactionDef>

<FactionDef>
<defName>Outlander</defName>
<label>outlander town</label>
Expand Down Expand Up @@ -206,7 +289,7 @@
<hidden>true</hidden>
<canFlee>false</canFlee>
<techLevel>Ultra</techLevel>
<earliestRaidDays>45</earliestRaidDays>
<earliestRaidDays>60</earliestRaidDays>
<startingGoodwill>
<min>-100</min>
<max>-100</max>
Expand Down
10 changes: 10 additions & 0 deletions Defs/HediffDefs/Hediffs_GlobalMisc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
<HediffDef>
<defName>MuscleSpasms</defName>
<label>muscle spasms</label>
<hediffClass>HediffWithComps</hediffClass>
<comps>
<li>
<compClass>HediffComp_Disappears</compClass>
<disappearsAfterTicks>
<min>1200</min>
<max>1800</max>
</disappearsAfterTicks>
</li>
</comps>
<stages>
<li>
<label>trivial</label>
Expand Down
Loading

0 comments on commit 2b830b2

Please sign in to comment.