Skip to content
This repository was archived by the owner on Apr 14, 2020. It is now read-only.

Commit f0637e0

Browse files
NoImageAvailableNoImageAvailable
authored
Merge pull request #870 from NoImageAvailable/Development
Development
2 parents 31549eb + efd29cb commit f0637e0

File tree

13 files changed

+60
-34
lines changed

13 files changed

+60
-34
lines changed

‎About/About.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<li>1.0</li>
77
</supportedVersions>
88
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
9-
<description>Version: 1.0.1.6\n\nExtends combat mechanics to make them deeper and more tactical.</description>
9+
<description>Version: 1.0.1.6a\n\nExtends combat mechanics to make them deeper and more tactical.</description>
1010
</ModMetaData>

‎About/Manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Manifest>
33
<identifier>CombatExtended</identifier>
4-
<version>1.0.1.6</version>
4+
<version>1.0.1.6a</version>
55
<dependencies>
66
</dependencies>
77
<incompatibleWith>

‎About/ModSync.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ModSyncNinjaData>
33
<ID>32418f60-269c-4a70-ae6e-a51d7a34cb2f</ID>
44
<ModName>Combat Extended</ModName>
5-
<Version>1.0.1.6</Version>
5+
<Version>1.0.1.6a</Version>
66
<SaveBreaking>False</SaveBreaking>
77
<Host name="Github">
88
<Owner>NoImageAvailable</Owner>

‎Assemblies/CombatExtended.dll‎

512 Bytes
Binary file not shown.

‎Defs/Ammo/Neolithic/Arrows.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<armorPenetrationSharp>0.5</armorPenetrationSharp>
193193
<armorPenetrationBlunt>1.920</armorPenetrationBlunt>
194194
<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
195-
<preExplosionSpawnThingDef>Ammo_GreatArrow_Stone</preExplosionSpawnThingDef>
195+
<preExplosionSpawnThingDef>Ammo_Arrow_Stone</preExplosionSpawnThingDef>
196196
</projectile>
197197
</ThingDef>
198198

@@ -209,7 +209,7 @@
209209
<armorPenetrationSharp>1.0</armorPenetrationSharp>
210210
<armorPenetrationBlunt>2.960</armorPenetrationBlunt>
211211
<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
212-
<preExplosionSpawnThingDef>Ammo_GreatArrow_Steel</preExplosionSpawnThingDef>
212+
<preExplosionSpawnThingDef>Ammo_Arrow_Steel</preExplosionSpawnThingDef>
213213
</projectile>
214214
</ThingDef>
215215

@@ -226,7 +226,7 @@
226226
<armorPenetrationSharp>1.5</armorPenetrationSharp>
227227
<armorPenetrationBlunt>3.260</armorPenetrationBlunt>
228228
<preExplosionSpawnChance>0.75</preExplosionSpawnChance>
229-
<preExplosionSpawnThingDef>Ammo_GreatArrow_Plasteel</preExplosionSpawnThingDef>
229+
<preExplosionSpawnThingDef>Ammo_Arrow_Plasteel</preExplosionSpawnThingDef>
230230
</projectile>
231231
</ThingDef>
232232

‎Defs/Ammo/Rifle/545x39mmSoviet.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</graphicData>
135135
<projectile Class="CombatExtended.ProjectilePropertiesCE">
136136
<damageDef>Bullet</damageDef>
137-
<speed>184</speed>
137+
<speed>176</speed>
138138
<dropsCasings>true</dropsCasings>
139139
</projectile>
140140
</ThingDef>

‎Defs/Ammo/Rifle/556x45mmNATO.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</graphicData>
135135
<projectile Class="CombatExtended.ProjectilePropertiesCE">
136136
<damageDef>Bullet</damageDef>
137-
<speed>184</speed>
137+
<speed>185</speed>
138138
<dropsCasings>true</dropsCasings>
139139
</projectile>
140140
</ThingDef>
@@ -144,8 +144,8 @@
144144
<label>5.56mm NATO bullet (FMJ)</label>
145145
<projectile Class="CombatExtended.ProjectilePropertiesCE">
146146
<damageAmountBase>14</damageAmountBase>
147-
<armorPenetrationSharp>4</armorPenetrationSharp>
148-
<armorPenetrationBlunt>34.180</armorPenetrationBlunt>
147+
<armorPenetrationSharp>5</armorPenetrationSharp>
148+
<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
149149
</projectile>
150150
</ThingDef>
151151

@@ -154,8 +154,8 @@
154154
<label>5.56mm NATO bullet (AP)</label>
155155
<projectile Class="CombatExtended.ProjectilePropertiesCE">
156156
<damageAmountBase>9</damageAmountBase>
157-
<armorPenetrationSharp>8</armorPenetrationSharp>
158-
<armorPenetrationBlunt>34.180</armorPenetrationBlunt>
157+
<armorPenetrationSharp>10</armorPenetrationSharp>
158+
<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
159159
</projectile>
160160
</ThingDef>
161161

@@ -164,8 +164,8 @@
164164
<label>5.56mm NATO bullet (HP)</label>
165165
<projectile Class="CombatExtended.ProjectilePropertiesCE">
166166
<damageAmountBase>18</damageAmountBase>
167-
<armorPenetrationSharp>2</armorPenetrationSharp>
168-
<armorPenetrationBlunt>34.180</armorPenetrationBlunt>
167+
<armorPenetrationSharp>3</armorPenetrationSharp>
168+
<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
169169
</projectile>
170170
</ThingDef>
171171

@@ -174,8 +174,8 @@
174174
<label>5.56mm NATO bullet (AP-I)</label>
175175
<projectile Class="CombatExtended.ProjectilePropertiesCE">
176176
<damageAmountBase>9</damageAmountBase>
177-
<armorPenetrationSharp>8</armorPenetrationSharp>
178-
<armorPenetrationBlunt>34.180</armorPenetrationBlunt>
177+
<armorPenetrationSharp>10</armorPenetrationSharp>
178+
<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
179179
<secondaryDamage>
180180
<li>
181181
<def>Flame_Secondary</def>
@@ -190,8 +190,8 @@
190190
<label>5.56mm NATO bullet (HE)</label>
191191
<projectile Class="CombatExtended.ProjectilePropertiesCE">
192192
<damageAmountBase>14</damageAmountBase>
193-
<armorPenetrationSharp>4</armorPenetrationSharp>
194-
<armorPenetrationBlunt>34.180</armorPenetrationBlunt>
193+
<armorPenetrationSharp>5</armorPenetrationSharp>
194+
<armorPenetrationBlunt>34.18</armorPenetrationBlunt>
195195
<secondaryDamage>
196196
<li>
197197
<def>Bomb_Secondary</def>
@@ -206,8 +206,8 @@
206206
<label>5.56mm NATO bullet (Sabot)</label>
207207
<projectile Class="CombatExtended.ProjectilePropertiesCE">
208208
<damageAmountBase>7</damageAmountBase>
209-
<armorPenetrationSharp>14</armorPenetrationSharp>
210-
<armorPenetrationBlunt>44.180</armorPenetrationBlunt>
209+
<armorPenetrationSharp>18</armorPenetrationSharp>
210+
<armorPenetrationBlunt>44.18</armorPenetrationBlunt>
211211
<speed>277</speed>
212212
</projectile>
213213
</ThingDef>

‎Defs/Ammo/Rifle/762x39mmSoviet.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@
219219
<projectile Class="CombatExtended.ProjectilePropertiesCE">
220220
<damageAmountBase>8</damageAmountBase>
221221
<armorPenetrationSharp>25</armorPenetrationSharp>
222-
<armorPenetrationBlunt>53.360</armorPenetrationBlunt>
223-
<speed>215</speed>
222+
<armorPenetrationBlunt>53.36</armorPenetrationBlunt>
223+
<speed>216</speed>
224224
</projectile>
225225
</ThingDef>
226226

‎Defs/Ammo/Rifle/762x51mmNATO.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<projectile Class="CombatExtended.ProjectilePropertiesCE">
145145
<damageAmountBase>20</damageAmountBase>
146146
<armorPenetrationSharp>6</armorPenetrationSharp>
147-
<armorPenetrationBlunt>66.720</armorPenetrationBlunt>
147+
<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
148148
</projectile>
149149
</ThingDef>
150150

@@ -154,7 +154,7 @@
154154
<projectile Class="CombatExtended.ProjectilePropertiesCE">
155155
<damageAmountBase>12</damageAmountBase>
156156
<armorPenetrationSharp>12</armorPenetrationSharp>
157-
<armorPenetrationBlunt>66.720</armorPenetrationBlunt>
157+
<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
158158
</projectile>
159159
</ThingDef>
160160

@@ -164,7 +164,7 @@
164164
<projectile Class="CombatExtended.ProjectilePropertiesCE">
165165
<damageAmountBase>25</damageAmountBase>
166166
<armorPenetrationSharp>3</armorPenetrationSharp>
167-
<armorPenetrationBlunt>66.720</armorPenetrationBlunt>
167+
<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
168168
</projectile>
169169
</ThingDef>
170170

@@ -173,8 +173,8 @@
173173
<label>7.62mm NATO bullet (AP-I)</label>
174174
<projectile Class="CombatExtended.ProjectilePropertiesCE">
175175
<damageAmountBase>12</damageAmountBase>
176-
<armorPenetrationSharp>14</armorPenetrationSharp>
177-
<armorPenetrationBlunt>66.720</armorPenetrationBlunt>
176+
<armorPenetrationSharp>12</armorPenetrationSharp>
177+
<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
178178
<secondaryDamage>
179179
<li>
180180
<def>Flame_Secondary</def>
@@ -190,7 +190,7 @@
190190
<projectile Class="CombatExtended.ProjectilePropertiesCE">
191191
<damageAmountBase>20</damageAmountBase>
192192
<armorPenetrationSharp>6</armorPenetrationSharp>
193-
<armorPenetrationBlunt>66.720</armorPenetrationBlunt>
193+
<armorPenetrationBlunt>66.72</armorPenetrationBlunt>
194194
<secondaryDamage>
195195
<li>
196196
<def>Bomb_Secondary</def>
@@ -206,8 +206,8 @@
206206
<projectile Class="CombatExtended.ProjectilePropertiesCE">
207207
<damageAmountBase>10</damageAmountBase>
208208
<armorPenetrationSharp>21</armorPenetrationSharp>
209-
<armorPenetrationBlunt>86.280</armorPenetrationBlunt>
210-
<speed>251</speed>
209+
<armorPenetrationBlunt>86.28</armorPenetrationBlunt>
210+
<speed>252</speed>
211211
</projectile>
212212
</ThingDef>
213213

‎Defs/ThingDefs_Misc/Apparel_Headgear.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<techLevel>Industrial</techLevel>
6666
<generateAllowChance>0.2</generateAllowChance>
6767
<recipeMaker>
68-
<unfinishedThingDef>UnfinishedMetallicTechArmor</unfinishedThingDef>
68+
<unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
6969
<skillRequirements>
7070
<Crafting>8</Crafting>
7171
</skillRequirements>

0 commit comments

Comments
 (0)