Skip to content

Commit 3bd0134

Browse files
jecrelljecrell
committed
Readded CE support from mlie's branch
1 parent 4152092 commit 3bd0134

23 files changed

+1395
-10
lines changed

‎About/About.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<li>jecrell.jecstools</li>
2929
<li>CETeam.CombatExtended</li>
3030
</loadAfter>
31-
<description>1.3.0.0 (07-24-2021)
31+
<description>1.3.0.1 (07-25-2021)
3232

3333
*Add Lovecraftian monsters to your RimWorld experience!* There is a lingering fear that strokes the hairs on the back of the necks of your colonists. Something terrible is coming, and there is little time to prepare. Cosmic horrors are already upon us.
3434

@@ -107,6 +107,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon
107107
========================
108108
Changelog
109109
========================
110+
1.3.0.1 (07-25-2021)
111+
========================
112+
Added Combat Extended support from mlie's build. Added a short warning message when first having sanity hediff.
113+
110114
1.3.0.0 (07-24-2021)
111115
========================
112116
Added RimWorld 1.3 support

‎About/Changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.3.0.1 (07-25-2021)
2+
========================
3+
Added Combat Extended support from mlie's build. Added a short warning message when first having sanity hediff.
4+
15
1.3.0.0 (07-24-2021)
26
========================
37
Added RimWorld 1.3 support

‎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>CallofCthulhuCosmicHorrors</identifier>
4-
<version>1.3.0.0</version>
4+
<version>1.3.0.1</version>
55
<dependencies />
66
<incompatibleWith />
77
<loadBefore />

‎About/Version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0.0
1+
1.3.0.1

‎CE/1.3/Defs/Ammo/Advanced/ROM_Bullet_MiGoCastingWeapon.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Defs>
3+
<ThingCategoryDef>
4+
<defName>AmmoMiGoCastingWeapon</defName>
5+
<label>MiGo Casting Weapon</label>
6+
<parent>AmmoAdvanced</parent>
7+
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
8+
</ThingCategoryDef>
9+
<!-- ==================== AmmoSet ========================== -->
10+
<CombatExtended.AmmoSetDef>
11+
<defName>AmmoSet_MiGoCastingWeapon</defName>
12+
<label>MiGo Casting Weapon ammo</label>
13+
<ammoTypes>
14+
<Ammo_MiGoCastingWeapon>Bullet_MiGoCastingWeapon</Ammo_MiGoCastingWeapon>
15+
</ammoTypes>
16+
</CombatExtended.AmmoSetDef>
17+
<!-- ==================== Ammo ========================== -->
18+
<ThingDef Class="CombatExtended.AmmoDef" Name="MiGoCastingWeaponBase" ParentName="AmmoBase" Abstract="True">
19+
<description>MiGo Casting Weapon ammo</description>
20+
<statBases>
21+
<Mass>0.01</Mass>
22+
<Bulk>0.02</Bulk>
23+
</statBases>
24+
<tradeTags>
25+
<li>CE_AutoEnableTrade_Sellable</li>
26+
</tradeTags>
27+
<thingCategories>
28+
<li>AmmoMiGoCastingWeapon</li>
29+
</thingCategories>
30+
</ThingDef>
31+
<ThingDef Class="CombatExtended.AmmoDef" ParentName="MiGoCastingWeaponBase">
32+
<defName>Ammo_MiGoCastingWeapon</defName>
33+
<label>MiGo Casting Weapon cartridge</label>
34+
<graphicData>
35+
<texPath>Item/Weapon/MiGoCasterWeapon</texPath>
36+
<graphicClass>Graphic_StackCount</graphicClass>
37+
</graphicData>
38+
<statBases>
39+
<MarketValue>0.95</MarketValue>
40+
</statBases>
41+
<ammoClass>FullMetalJacket</ammoClass>
42+
</ThingDef>
43+
<!-- ================== Projectiles ================== -->
44+
<ThingDef Class="CombatExtended.AmmoDef" Name="BaseMiGoCastingWeapon" ParentName="BaseBullet" Abstract="true">
45+
<graphicData>
46+
<texPath>Things/Projectile/Charge_Small</texPath>
47+
<graphicClass>Graphic_Single</graphicClass>
48+
<shaderType>TransparentPostLight</shaderType>
49+
<drawSize>(10,10)</drawSize>
50+
</graphicData>
51+
<projectile Class="CombatExtended.ProjectilePropertiesCE">
52+
<damageDef>Bullet</damageDef>
53+
<speed>120</speed>
54+
</projectile>
55+
</ThingDef>
56+
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseMiGoCastingWeapon">
57+
<defName>Bullet_MiGoCastingWeapon</defName>
58+
<label>Rhombohedral Energy blast</label>
59+
<thingClass>CombatExtended.BulletCE</thingClass>
60+
<projectile Class="CombatExtended.ProjectilePropertiesCE">
61+
<damageAmountBase>27</damageAmountBase>
62+
<armorPenetrationSharp>15</armorPenetrationSharp>
63+
<armorPenetrationBlunt>30.6</armorPenetrationBlunt>
64+
<damageDef>Bullet</damageDef>
65+
<speed>120</speed>
66+
</projectile>
67+
</ThingDef>
68+
<RecipeDef ParentName="ChargeAmmoRecipeBase">
69+
<defName>MakeAmmo_MiGoCastingWeapon</defName>
70+
<label>make MiGo Casting Weapon cartridge x50</label>
71+
<description>Craft 50 MiGo Casting Weapon cartridges.</description>
72+
<jobString>Making MiGo Casting Weapon cartridge.</jobString>
73+
<ingredients>
74+
<li>
75+
<filter>
76+
<thingDefs>
77+
<li>Plasteel</li>
78+
</thingDefs>
79+
</filter>
80+
<count>1</count>
81+
</li>
82+
<li>
83+
<filter>
84+
<thingDefs>
85+
<li>Steel</li>
86+
</thingDefs>
87+
</filter>
88+
<count>2</count>
89+
</li>
90+
<li>
91+
<filter>
92+
<thingDefs>
93+
<li>ComponentIndustrial</li>
94+
</thingDefs>
95+
</filter>
96+
<count>1</count>
97+
</li>
98+
</ingredients>
99+
<fixedIngredientFilter>
100+
<thingDefs>
101+
<li>Plasteel</li>
102+
<li>Steel</li>
103+
<li>ComponentIndustrial</li>
104+
</thingDefs>
105+
</fixedIngredientFilter>
106+
<products>
107+
<Ammo_MiGoCastingWeapon>50</Ammo_MiGoCastingWeapon>
108+
</products>
109+
<workAmount>2600</workAmount>
110+
</RecipeDef>
111+
</Defs>

‎CE/1.3/Patches/BodyDefs_CosmicHorrors/Bodies_BlackTree.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Patch>
3+
<Operation Class="PatchOperationFindMod">
4+
<mods>
5+
<li>Combat Extended</li>
6+
</mods>
7+
<match Class="PatchOperationSequence">
8+
<operations>
9+
<!-- Natural Armor -->
10+
<li Class="PatchOperationAdd">
11+
<xpath>
12+
/Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
13+
def="Body"]
14+
</xpath>
15+
<value>
16+
<groups />
17+
</value>
18+
</li>
19+
<li Class="PatchOperationAdd">
20+
<xpath>
21+
/Defs/BodyDef[defName="ROM_DarkYoungBody"]//*[
22+
def="Body" or
23+
def="ROM_TentacleFirst" or
24+
def="ROM_TentacleSecond" or
25+
def="ROM_TentacleThird" or
26+
def="ROM_TentacleFourth" or
27+
def="ROM_TentacleFifth" or
28+
def="ROM_TentacleSixth" or
29+
def="ROM_TentacleSeventh" or
30+
def="ROM_LegFirst" or
31+
def="ROM_LegSecond" or
32+
def="ROM_LegThird"]/groups
33+
</xpath>
34+
<value>
35+
<li>CoveredByNaturalArmor</li>
36+
</value>
37+
</li>
38+
</operations>
39+
</match>
40+
</Operation>
41+
</Patch>

‎CE/1.3/Patches/BodyDefs_CosmicHorrors/Bodies_Fishboy.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Patch>
3+
<Operation Class="PatchOperationAdd">
4+
<xpath>
5+
/Defs/BodyDef[defName="ROM_DeepOneBody"]//*[
6+
def="Torso" or
7+
def="Head" or
8+
def="Shoulder" or
9+
def="Neck" or
10+
def="Arm" or
11+
def="Leg"]/groups
12+
</xpath>
13+
<value>
14+
<li>CoveredByNaturalArmor</li>
15+
</value>
16+
</Operation>
17+
</Patch>

‎CE/1.3/Patches/BodyDefs_CosmicHorrors/Bodies_Migo.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Patch>
3+
<Operation Class="PatchOperationFindMod">
4+
<mods>
5+
<li>Combat Extended</li>
6+
</mods>
7+
<match Class="PatchOperationSequence">
8+
<operations>
9+
<!-- Natural Armor -->
10+
<li Class="PatchOperationAdd">
11+
<xpath>
12+
/Defs/BodyDef[defName="ROM_MiGoBody"]//*[
13+
def="Body" or
14+
def="Pronotum" or
15+
def="ROM_SporeHead"]
16+
</xpath>
17+
<value>
18+
<groups />
19+
</value>
20+
</li>
21+
<li Class="PatchOperationAdd">
22+
<xpath>
23+
/Defs/BodyDef[defName="ROM_MiGoBody"]//*[
24+
def="Body" or
25+
def="Pronotum" or
26+
def="ROM_SporeHead" or
27+
def="InsectLeg"]/groups
28+
</xpath>
29+
<value>
30+
<li>CoveredByNaturalArmor</li>
31+
</value>
32+
</li>
33+
</operations>
34+
</match>
35+
</Operation>
36+
</Patch>

‎CE/1.3/Patches/BodyDefs_CosmicHorrors/Bodies_Shoggoth.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Patch>
3+
<Operation Class="PatchOperationFindMod">
4+
<mods>
5+
<li>Combat Extended</li>
6+
</mods>
7+
<match Class="PatchOperationSequence">
8+
<operations>
9+
<!-- Natural Armor -->
10+
<li Class="PatchOperationAdd">
11+
<xpath>
12+
/Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
13+
def="Body" or
14+
def="Leg"]
15+
</xpath>
16+
<value>
17+
<groups />
18+
</value>
19+
</li>
20+
<li Class="PatchOperationAdd">
21+
<xpath>
22+
/Defs/BodyDef[defName="ROM_ShoggothBody"]//*[
23+
def="Body" or
24+
def="ROM_Tentacle" or
25+
def="Shoulder" or
26+
def="Arm" or
27+
def="Hand" or
28+
def="Paws" or
29+
def="Leg"]/groups
30+
</xpath>
31+
<value>
32+
<li>CoveredByNaturalArmor</li>
33+
</value>
34+
</li>
35+
</operations>
36+
</match>
37+
</Operation>
38+
</Patch>

‎CE/1.3/Patches/BodyDefs_CosmicHorrors/Bodies_Squidward.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Patch>
3+
<Operation Class="PatchOperationAdd">
4+
<xpath>
5+
/Defs/BodyDef[defName="ROM_CthulhidBody"]//*[
6+
def="Torso" or
7+
def="Neck" or
8+
def="Shoulder" or
9+
def="Arm" or
10+
def="Hand" or
11+
def="ROM_RightWing" or
12+
def="ROM_LeftWing" or
13+
def="Leg"]/groups
14+
</xpath>
15+
<value>
16+
<li>CoveredByNaturalArmor</li>
17+
</value>
18+
</Operation>
19+
</Patch>

0 commit comments

Comments
 (0)