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

(bugfix) Fix bug where turrets cannot be loaded #1209

Draft
MadaraUchiha wants to merge 53 commits into
base: Development
Choose a base branch
from
Draft

(bugfix) Fix bug where turrets cannot be loaded #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0c41378
Add AnimalCollabProj patches
Mar 27, 2020
51f311b
Update AnimalCollabProj Bison to vanilla stats and melee tool values
Mar 28, 2020
8fa8468
Reduce AnimalCollabProj Platypus spur attack sharp AP
Mar 28, 2020
ed9e97d
Update AnimalCollabProj Goose to vanilla stats and melee tool values
Mar 28, 2020
087aad7
Update AnimalCollabProj Horse to vanilla stats and melee tool values
Mar 28, 2020
46adb9e
Update AnimalCollabProj Silkie Chicken with missing claw scratch attack
Mar 28, 2020
2c9cfff
Fix AnimalCollabProj Bison and Horse MoveSpeed
Mar 28, 2020
10286c5
Add files via upload
Tostov Apr 1, 2020
2895923
Quick adjustment to Explosives Contractor
Tostov Apr 1, 2020
0b8f015
Adjusted Weapon Stats
Tostov Apr 1, 2020
028eb01
Minor Tweaks to weapon stats.
Tostov Apr 1, 2020
5f4bf05
Add ACPGuineaPig to AnimalCollabProj patch
Apr 1, 2020
ad992d5
Add files via upload
Tostov Apr 1, 2020
7501228
VWE fix def.
N7Huntsman Apr 2, 2020
c0b0917
VWE fix rocket frag
N7Huntsman Apr 2, 2020
4a88b69
Fix VFE - Med, fix stuff, VWE to core musket ammo
N7Huntsman Apr 3, 2020
5236709
Patch venom hediffs for AnimalCollabProj patch
Apr 3, 2020
2f32887
Patch sawed off, longbow, throwing rocks.
N7Huntsman Apr 3, 2020
5665602
Remove VWE specific musket ammo.
N7Huntsman Apr 3, 2020
66b55e2
Merge branch 'master' into Compat-Patches
N7Huntsman Apr 3, 2020
36b01ec
Remove stuff meant for 'master'
N7Huntsman Apr 3, 2020
c8bbcef
Merge branch 'Compat-Patches' of https://github.com/N7Huntsman/Combat…
N7Huntsman Apr 3, 2020
a92b479
More.
N7Huntsman Apr 3, 2020
99e1edc
Stuff.
N7Huntsman Apr 3, 2020
2f455f3
Patch axe.
N7Huntsman Apr 3, 2020
eb0f067
Tweak.
N7Huntsman Apr 3, 2020
27874fd
Rebalance AnimalCollabProj Megabadger armor and attack AP
Apr 4, 2020
cbf44e8
Buff AnimalCollabProj Xenguana attack AP stats
Apr 4, 2020
4aad5bd
Fixed bodyshape extension
Tostov Apr 4, 2020
f227c77
Buff AnimalCollabProj Dire and Spirit Wolf armor and attack AP stats
Apr 4, 2020
1c1aefd
Buff AnimalCollabProj Lions and Tiger attack AP stats
Apr 4, 2020
ce42413
Add files via upload
Tostov Apr 4, 2020
0c36a88
Various Fixes
Tostov Apr 5, 2020
a7777c9
Add CE core musket ammo.
N7Huntsman Apr 5, 2020
7404196
Merge pull request #1151 from sumghai/FastTrackPatch_AnimalCollabProj
Apr 5, 2020
fba40c7
Fixed Throwing Knives and Whip
j14i Apr 5, 2020
84191f8
Merge pull request #5 from onigamii/Compat-Patches
N7Huntsman Apr 5, 2020
7a3f280
Gith, Half-Orcs, Hobgoblins, Illithids
N7Huntsman Apr 6, 2020
a971b11
Patch in Pila, Patch Tieflings and Warforged
N7Huntsman Apr 6, 2020
321f52e
O21 Races. Minor fixes and stat tweaks.
N7Huntsman Apr 6, 2020
9a445c6
Update Races_AFVehicles.xml
Tostov Apr 6, 2020
c830daf
Merge pull request #1183 from N7Huntsman/Compat-Patches
N7Huntsman Apr 6, 2020
5bc3ba3
Revert "Adjust HeavySMG scale and offset."
N7Huntsman Apr 6, 2020
eb78344
Revert "Add firefoam prereq." Commmit.
N7Huntsman Apr 6, 2020
d0ee461
Revert "Tweak ammo desc. and add musket balls"
N7Huntsman Apr 6, 2020
a716243
Minor fixes.
N7Huntsman Apr 6, 2020
ce55200
Merge pull request #1171 from Tostov/VAEAprilFools
Apr 7, 2020
6e616bf
Merge pull request #1169 from Tostov/RContractors1.1Patch
zhrocks11 Apr 8, 2020
b9dc9a4
Merge pull request #1186 from Tostov/DragonianRacePatch1.1
Apr 8, 2020
d3f2aef
Merge pull request #1196 from N7Huntsman/Outpost21-Races
Apr 8, 2020
7823f8f
Update Apparel_Belts.xml
MadaraUchiha Apr 8, 2020
3d797aa
Merge pull request #1203 from MadaraUchiha/patch-1
Apr 8, 2020
d545c1b
(bugfix) Fix bug where turrets cannot be loaded
MadaraUchiha Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion About/About.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<ModMetaData>
<name>Combat Extended</name>
<author>CE Team</author>
<url>https://github.com/CombatExtendedRWMod/CombatExtended</url>
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
<supportedVersions>
<li>1.0</li>
<li>1.1</li>
</supportedVersions>
<packageId>CETeam.CombatExtended</packageId>
Expand Down
Binary file modified Assemblies/CombatExtended.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<CombatExtended.AmmoCategoryDef>
<defName>TranqNonLethal</defName>
<label>tranquilizer</label>
<description>A non-lethal round designed filled with fast-acting sedatives and tipped with a hypodermic needle.</description>
<description>Special round designed for non-lethal engagements of targets. Filled with fast-acting sedatives and tipped with a hypodermic needle.</description>
</CombatExtended.AmmoCategoryDef>

</Defs>
31 changes: 0 additions & 31 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Medieval.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,4 @@
<label>Armor-Piercing Ballista Bolt</label>
<description>Fitted with a streamlined and hardened steel tip to punch through armored targets.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>StoneCrossbowBolt</defName>
<label>stone crossbow bolt</label>
<labelShort>stone</labelShort>
<description>A sharpened stone is attached to a wooden shaft. Cuts exposed tissue fairly well but isn't very effective against armor.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>SteelCrossbowBolt</defName>
<label>steel crossbow bolt</label>
<labelShort>steel</labelShort>
<description>The head of the crossbow bolt is made from steel to enhance armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>PlasteelCrossbowBolt</defName>
<label>plasteel crossbow bolt</label>
<labelShort>plasteel</labelShort>
<description>The head of the crossbow bolt is made from plasteel to maximize armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>MusketBall</defName>
<label>lead ball</label>
<labelShort>lead ball</labelShort>
<description>A smooth projectile made of soft metal, usually fired from a smoothbore weapon.</description>
</CombatExtended.AmmoCategoryDef>

</Defs>
2 changes: 1 addition & 1 deletion Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Missiles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<!-- Tomahawk LAM missile has only one type of warhead for CE, no subcategory for variants required -->
<!-- Tomahawk LAM missile has only one type of warhead for CE:FT, no subcategory for variants required -->

<CombatExtended.AmmoCategoryDef>
<defName>TomahawkLAM</defName>
Expand Down
33 changes: 28 additions & 5 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Neolithic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<CombatExtended.AmmoCategoryDef>
<defName>Javelin</defName>
<label>javelin</label>
<description>A heavy steel tip attached to a long wooden pole, packing a very strong punch against armored targets.</description>
<description>A heavy steel tip attached to a long wooden pole, packing a very strong punch against scarcely armored targets.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>Kunai</defName>
<label>kunai</label>
<description>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.</description>
<description>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.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>StoneArrow</defName>
<label>stone arrow</label>
<labelShort>stone</labelShort>
<description>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.</description>
<description>A sharpened stone is attached as an arrow head. Cuts exposed tissue fairly well but is ineffective against any kind of armor.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
Expand Down Expand Up @@ -60,21 +60,44 @@
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>StoneCrossbowBolt</defName>
<label>stone crossbow bolt</label>
<labelShort>stone</labelShort>
<description>A sharpened stone is attached to a wooden shaft. Cuts exposed tissue fairly well but isn't very effective against armor.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>SteelCrossbowBolt</defName>
<label>steel crossbow bolt</label>
<labelShort>steel</labelShort>
<description>The head of the crossbow bolt is made from steel to enhance armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>PlasteelCrossbowBolt</defName>
<label>plasteel crossbow bolt</label>
<labelShort>plasteel</labelShort>
<description>The head of the crossbow bolt is made from plasteel to maximize armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<!-- ========== Irregular Arrows ========== -->

<CombatExtended.AmmoCategoryDef>
<defName>VenomArrow</defName>
<label>venom arrow</label>
<labelShort>venom</labelShort>
<description>A steel arrow head coated in a potent toxin.</description>
<description>The arrow head is made from steel and coated in toxin.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>FlameArrow</defName>
<label>flame arrow</label>
<labelShort>flame</labelShort>
<description>A steel arrowhead constructed like a cage to hold incendiary components for setting targets alight.</description>
<description>Steel open cage arrowhead containing incendiary components for setting targets alight.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

Expand Down
256 changes: 128 additions & 128 deletions Defs/Ammo/Medieval/MusketBall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,129 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>AmmoMusketBall</defName>
<label>Musket ball</label>
<parent>AmmoRifles</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<!-- High Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_FastMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_FastMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- Low Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SlowMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_SlowMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="MusketBallBase" ParentName="SmallAmmoBase" Abstract="True">
<description>A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms.</description>
<statBases>
<Mass>0.12</Mass>
<Bulk>0.14</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_FueledSmithy</li>
<li>CE_AutoEnableCrafting_ElectricSmithy</li>
</tradeTags>
<thingCategories>
<li>AmmoMusketBall</li>
</thingCategories>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="MusketBallBase">
<defName>Ammo_MusketBall</defName>
<label>Musket ball</label>
<graphicData>
<texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>0.5</MarketValue>
</statBases>
<ammoClass>FullMetalJacket</ammoClass>
</ThingDef>

<!-- ================== Projectile Base ================== -->

<ThingDef Name="MusketBallBullet" ParentName="BaseBullet" Abstract="true">
<graphicData>
<texPath>Things/Projectile/Bullet_big</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile>
<damageDef>Bullet</damageDef>
<dropsCasings>false</dropsCasings>
</projectile>
</ThingDef>

<!-- ================== Projectiles (High Velocity) ================== -->

<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_FastMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>60</speed>
<damageAmountBase>20</damageAmountBase>
<armorPenetrationSharp>6.7</armorPenetrationSharp>
<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
</projectile>
</ThingDef>

<!-- ================== Projectiles (Low Velocity) ================== -->

<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_SlowMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>80</speed>
<damageAmountBase>17</damageAmountBase>
<armorPenetrationSharp>5.3</armorPenetrationSharp>
<armorPenetrationBlunt>20</armorPenetrationBlunt>
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_MusketBall</defName>
<label>make lead ball x500</label>
<description>Craft 500 lead balls.</description>
<jobString>Making lead balls.</jobString>
<workAmount>6800</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>68</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_MusketBall>500</Ammo_MusketBall>
</products>
</RecipeDef>

<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingCategoryDef>
<defName>AmmoMusketBall</defName>
<label>Musket ball</label>
<parent>AmmoRifles</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
</ThingCategoryDef>
<!-- ==================== AmmoSet ========================== -->
<!-- High Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_FastMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_FastMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- Low Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SlowMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_SlowMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- ==================== Ammo ========================== -->
<ThingDef Class="CombatExtended.AmmoDef" Name="MusketBallBase" ParentName="SmallAmmoBase" Abstract="True">
<description>A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms.</description>
<statBases>
<Mass>0.12</Mass>
<Bulk>0.14</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_FueledSmithy</li>
<li>CE_AutoEnableCrafting_ElectricSmithy</li>
</tradeTags>
<thingCategories>
<li>AmmoMusketBall</li>
</thingCategories>
</ThingDef>
<ThingDef Class="CombatExtended.AmmoDef" ParentName="MusketBallBase">
<defName>Ammo_MusketBall</defName>
<label>Musket ball</label>
<graphicData>
<texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>0.5</MarketValue>
</statBases>
<ammoClass>FullMetalJacket</ammoClass>
</ThingDef>
<!-- ================== Projectile Base ================== -->
<ThingDef Name="MusketBallBullet" ParentName="BaseBullet" Abstract="true">
<graphicData>
<texPath>Things/Projectile/Bullet_big</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile>
<damageDef>Bullet</damageDef>
<dropsCasings>false</dropsCasings>
</projectile>
</ThingDef>
<!-- ================== Projectiles (High Velocity) ================== -->
<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_FastMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>60</speed>
<damageAmountBase>20</damageAmountBase>
<armorPenetrationSharp>6.7</armorPenetrationSharp>
<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
</projectile>
</ThingDef>
<!-- ================== Projectiles (Low Velocity) ================== -->
<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_SlowMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>80</speed>
<damageAmountBase>17</damageAmountBase>
<armorPenetrationSharp>5.3</armorPenetrationSharp>
<armorPenetrationBlunt>20</armorPenetrationBlunt>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->
<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_MusketBall</defName>
<label>make lead ball x500</label>
<description>Craft 500 lead balls.</description>
<jobString>Making lead balls.</jobString>
<workAmount>6800</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>68</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_MusketBall>500</Ammo_MusketBall>
</products>
</RecipeDef>
</Defs>
Loading