Skip to content

Commit

Permalink
Merge pull request #15 from NoImageAvailable/Development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@NoImageAvailable
NoImageAvailable committed Apr 28, 2016
2 parents f732954 + 91dab28 commit 7029687
Show file tree
Hide file tree
Showing 29 changed files with 415 additions and 183 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.1
<description>Version: 1.6.2

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: 6 additions & 0 deletions Defs/DamageDefs/Damages_LocalInjury.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@
<spreadOut>false</spreadOut>
<deflectable>true</deflectable>
</DamageDef>

<DamageDef ParentName="DamageBombBase">
<defName>Thermobaric</defName>
<label>thermobaric</label>
<workerClass>Combat_Realism.DamageWorker_FlameCR</workerClass>
</DamageDef>

<DamageDef Name="Flame" ParentName="LocalInjuryBase">
<defName>Flame</defName>
Expand Down
255 changes: 149 additions & 106 deletions Defs/ModHelperDefs/ModHelper.xml
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,165 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ModHelperDef>
<defName>CombatRealism</defName>
<ModName>CombatRealism</ModName>
<minCCLversion>0.13.0</minCCLversion>
<ModHelperDef>
<defName>CombatRealism</defName>
<ModName>CombatRealism</ModName>
<minCCLversion>0.13.0</minCCLversion>
<SpecialInjectors>
<li>Combat_Realism.Detours.DetourInjector</li>
<li>Combat_Realism.ITabInjector</li>
<li>Combat_Realism.AmmoInjector</li>
<li>Combat_Realism.ITabInjector</li>
<li>Combat_Realism.AmmoInjector</li>
</SpecialInjectors>
<ThingComps>
<li>
<compProps>
<compClass>CommunityCoreLibrary.CompPawnGizmo</compClass>
</compProps>
<targetDefs>
<li>Human</li>
</targetDefs>
</li>
<li>
<compProps>
<compClass>Combat_Realism.CompSuppressable</compClass>
</compProps>
<targetDefs>
<li>Human</li>
</targetDefs>
</li>
<li>
<compProps>
<compClass>Combat_Realism.CompInventory</compClass>
</compProps>
<targetDefs>
<li>Human</li>
<li>Mechanoid_Centipede</li>
<li>Mechanoid_Scyther</li>
</targetDefs>
</li>
<li>
<compProps Class="CommunityCoreLibrary.CompProperties_MilkableRenameable">
<compClass>CommunityCoreLibrary.CompMilkableRenameable</compClass>
<growthLabel>Chemical fullness</growthLabel>
<milkIntervalDays>5</milkIntervalDays>
<milkAmount>5</milkAmount>
<milkDef>FSX</milkDef>
<milkFemaleOnly>false</milkFemaleOnly>
</compProps>
<targetDefs>
<li>Boomalope</li>
</targetDefs>
</li>
</ThingComps>
<TraderKinds>
<li>
<targetDef>Orbital_Misc_PirateMerchant</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>500</min>
<max>1000</max>
</countRange>
<thingDefCountRange>
<ThingComps>
<li>
<compProps>
<compClass>CommunityCoreLibrary.CompPawnGizmo</compClass>
</compProps>
<targetDefs>
<li>Human</li>
</targetDefs>
</li>
<li>
<compProps>
<compClass>Combat_Realism.CompSuppressable</compClass>
</compProps>
<targetDefs>
<li>Human</li>
</targetDefs>
</li>
<li>
<compProps>
<compClass>Combat_Realism.CompInventory</compClass>
</compProps>
<targetDefs>
<li>Human</li>
<li>Mechanoid_Centipede</li>
<li>Mechanoid_Scyther</li>
</targetDefs>
</li>
<li>
<compProps Class="CommunityCoreLibrary.CompProperties_ShearableRenameable">
<compClass>CommunityCoreLibrary.CompShearableRenameable</compClass>
<growthLabel>Chemical fullness</growthLabel>
<shearIntervalDays>5</shearIntervalDays>
<woolAmount>5</woolAmount>
<woolDef>FSX</woolDef>
</compProps>
<targetDefs>
<li>Boomalope</li>
</targetDefs>
</li>
</ThingComps>
<TraderKinds>
<li>
<targetDef>Orbital_Misc_PirateMerchant</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>500</min>
<max>1000</max>
</countRange>
<thingDefCountRange>
<min>-1</min>
<max>4</max>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Caravan_Outlander_PirateMerchant</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>100</min>
<max>200</max>
</countRange>
<thingDefCountRange>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Caravan_Outlander_PirateMerchant</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>100</min>
<max>200</max>
</countRange>
<thingDefCountRange>
<min>-1</min>
<max>2</max>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Orbital_Misc_CombatSupplier</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>2000</min>
<max>5000</max>
</countRange>
<thingDefCountRange>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Orbital_Misc_CombatSupplier</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>2000</min>
<max>5000</max>
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>3</min>
<max>9</max>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Caravan_Outlander_CombatSupplier</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>500</min>
<max>2000</max>
</countRange>
<thingDefCountRange>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Caravan_Outlander_CombatSupplier</targetDef>
<stockGenerators>
<li Class="StockGenerator_Tag">
<tradeTag>CR_Ammo</tradeTag>
<countRange>
<min>500</min>
<max>2000</max>
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>2</min>
<max>5</max>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
</TraderKinds>
</ModHelperDef>
</thingDefCountRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Caravan_Outlander_BulkGoods</targetDef>
<stockGenerators>
<li Class="StockGenerator_SingleDef">
<thingDef>FSX</thingDef>
<price>Normal</price>
<countRange>
<min>-120</min>
<max>70</max>
</countRange>
</li>
<li Class="StockGenerator_SingleDef">
<thingDef>Prometheum</thingDef>
<price>Normal</price>
<countRange>
<min>-120</min>
<max>70</max>
</countRange>
</li>
</stockGenerators>
</li>
<li>
<targetDef>Orbital_Misc_BulkGoods</targetDef>
<stockGenerators>
<li Class="StockGenerator_SingleDef">
<thingDef>FSX</thingDef>
<price>Normal</price>
<countRange>
<min>-300</min>
<max>300</max>
</countRange>
</li>
<li Class="StockGenerator_SingleDef">
<thingDef>Prometheum</thingDef>
<price>Normal</price>
<countRange>
<min>-300</min>
<max>300</max>
</countRange>
</li>
</stockGenerators>
</li>
</TraderKinds>
</ModHelperDef>

</Defs>
2 changes: 1 addition & 1 deletion Defs/ThingDefs/Weapons_Guns.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
</verbs>
<comps>
<li Class="Combat_Realism.CompProperties_AmmoUser">
<magazineSize>1</magazineSize>
<magazineSize>0</magazineSize>
<ammoSet>AmmoSet_80x256mmFuel</ammoSet>
</li>
<li Class="Combat_Realism.CompProperties_FireModes">
Expand Down
6 changes: 0 additions & 6 deletions Defs/ThingDefs/Weapons_RangedNeolithic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,6 @@
<!--<soundCast>Interact_BeatFire</soundCast>-->
</li>
</verbs>
<comps>
<li Class="Combat_Realism.CompProperties_FireModes">
<aiUseBurstMode>false</aiUseBurstMode>
<aiUseAimMode>false</aiUseAimMode>
</li>
</comps>
</ThingDef>


Expand Down
7 changes: 6 additions & 1 deletion Defs/ThingDefs/Weapons_Spotting.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</projectile>
</ThingDef>

<ThingDef ParentName="BaseHumanGun">
<ThingDef ParentName="BaseMakeableGun">
<defName>Gun_BinocularsRadio</defName>
<label>binoculars</label>
<description>A pair of binoculars and a portable radio. Useful to coordinate artillery strikes.\n\nUsing this on a target will mark it, removing the indirect fire penalty from any artillery pieces targeting it. Additionally, any directed fire will use the aiming accuracy and efficiency of the spotter, rather than the artillery operator to determine final accuracy.</description>
Expand All @@ -27,10 +27,15 @@
<canBeSpawningInventory>false</canBeSpawningInventory>
<soundInteract>InteractRifle</soundInteract>
<statBases>
<WorkToMake>10500</WorkToMake>
<MarketValue>650</MarketValue>
<AimEfficiency>1.25</AimEfficiency>
<RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
</statBases>
<costList>
<Steel>100</Steel>
<Components>4</Components>
</costList>
<verbs>
<li Class="Combat_Realism.VerbPropertiesCR">
<verbClass>Combat_Realism.Verb_MarkForArtilleryCR</verbClass>
Expand Down
2 changes: 1 addition & 1 deletion Defs/ThingDefs_Ammo/Ammo_Advanced.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<canBeSpawningInventory>false</canBeSpawningInventory>
</ThingDef>

<!-- ==================== 80x128mm Fuel Cell ========================== -->
<!-- ==================== 80x256mm Fuel Cell ========================== -->

<ThingDef Class="Combat_Realism.AmmoDef" Name="80x256mmFuelBase" ParentName="AmmoBase" Abstract="True">
<description>Large fuel container for incendiary shot cannons.</description>
Expand Down
Loading

0 comments on commit 7029687

Please sign in to comment.