Update, Research, Comps, Yayo's Combat 3 Animation support, perfomanc…

…e tweaks Reworked Research, added Subtabs for each faction. Updates to functionality of CompOversized, CompActivateableEffect to increase perfomance in general and support Yayo's Combat animations. CompFloater, CompSlotLoadable performance tweaks Tweaks for several Skitarii armour textures
Ogliss · Jun 9, 2021 · e1e78ef · e1e78ef
1 parent 215fda5
commit e1e78ef
Show file tree

Hide file tree

Showing 139 changed files with 2,805 additions and 599 deletions.
diff --git a/1.1/Assemblies/1AnimatedProjectile.dll b/1.1/Assemblies/1AnimatedProjectile.dll
diff --git a/1.1/Assemblies/1AnimatedProjectile.pdb b/1.1/Assemblies/1AnimatedProjectile.pdb
diff --git a/1.1/Assemblies/1CompActivatableEffect.dll b/1.1/Assemblies/1CompActivatableEffect.dll
diff --git a/1.1/Assemblies/1CompOversizedWeapon.dll b/1.1/Assemblies/1CompOversizedWeapon.dll
diff --git a/1.1/Assemblies/1CompSlotLoadable.dll b/1.1/Assemblies/1CompSlotLoadable.dll
diff --git a/1.1/Assemblies/1CompToggleDef.dll b/1.1/Assemblies/1CompToggleDef.dll
diff --git a/1.1/Assemblies/AbilitiesExtended.dll b/1.1/Assemblies/AbilitiesExtended.dll
diff --git a/1.1/Assemblies/AdeptusMechanicusArmoury.dll b/1.1/Assemblies/AdeptusMechanicusArmoury.dll
diff --git a/1.1/Assemblies/AdeptusMechanicusArmoury.pdb b/1.1/Assemblies/AdeptusMechanicusArmoury.pdb
diff --git a/1.1/Assemblies/AdvancedGraphics.dll b/1.1/Assemblies/AdvancedGraphics.dll
diff --git a/1.1/Assemblies/CompApparelVerbGiver.dll b/1.1/Assemblies/CompApparelVerbGiver.dll
diff --git a/1.1/Assemblies/CompToggleFireMode.dll b/1.1/Assemblies/CompToggleFireMode.dll
diff --git a/1.1/Assemblies/CompToggleFireMode.pdb b/1.1/Assemblies/CompToggleFireMode.pdb
diff --git a/1.1/Assemblies/CompTurret.dll b/1.1/Assemblies/CompTurret.dll
diff --git a/1.1/Assemblies/CompTurret.pdb b/1.1/Assemblies/CompTurret.pdb
diff --git a/1.1/Assemblies/CrashedShipsExtension.dll b/1.1/Assemblies/CrashedShipsExtension.dll
diff --git a/1.1/Assemblies/RecruitShips.dll b/1.1/Assemblies/RecruitShips.dll
diff --git a/1.1/Defs/ThingDefs/OG_AMA_CompSlotLoadable_Slots.xml b/1.1/Defs/ThingDefs/OG_AMA_CompSlotLoadable_Slots.xml
@@ -70,72 +70,55 @@
  </tradeTags>
  </ThingDef> 
 
- <!-- ================ Imperial Hellfire Bolt ================ -->
- <ThingDef ParentName="OG_BoltBase">
- <defName>OGI_Bolt_Hellfire</defName>
- <label>hellfire bolts</label>
- <description>Hellfire bolts were created as one of the Imperium's desperate measures to stem the predations of Tyranid assaults within the galaxy. Each bolt is tipped with thousands of needles and a vial of mutagenic acid capable of dissolving its way through citin and carapace with equal ease.\n\nWhen the round enters the target's body, the vial shatters and the needles pierce the victim's flesh, pumping the acid into the target. Such is the success of the Hellfire bolt that it has found a use against a variety of foes, its acid just as effective at killing other foul xenos.</description>
- <graphicData>
- <texPath>Things/Item/ImpMissileFrag</texPath>
- <graphicClass>Graphic_Single</graphicClass>
- <drawSize>(1,1)</drawSize>
- <color>(124,196,243)</color>
- </graphicData>
- <comps>
- <li Class="OgsCompSlotLoadable.CompProperties_SlottedBonus">
- <!--
- <additionalProjectiles>
- <li>OGI_Bullet_BoltHellfire</li>
- </additionalProjectiles>
- -->
+ <!-- ================ Imperial Hellfire Bolt ================ -->
+ <ThingDef ParentName="OG_BoltBase">
+ <defName>OGI_Bolt_Hellfire</defName>
+ <label>hellfire bolts</label>
+ <description>Hellfire bolts were created as one of the Imperium's desperate measures to stem the predations of Tyranid assaults within the galaxy. Each bolt is tipped with thousands of needles and a vial of mutagenic acid capable of dissolving its way through citin and carapace with equal ease.\n\nWhen the round enters the target's body, the vial shatters and the needles pierce the victim's flesh, pumping the acid into the target. Such is the success of the Hellfire bolt that it has found a use against a variety of foes, its acid just as effective at killing other foul xenos.</description>
+ <graphicData>
+ <texPath>Things/Item/ImpMissileFrag</texPath>
+ <graphicClass>Graphic_Single</graphicClass>
+ <drawSize>(1,1)</drawSize>
+ <color>(124,196,243)</color>
+ </graphicData>
+ <modExtensions>
+ <li Class="OgsCompSlotLoadable.SlottedBonusExtension">
  <projectileReplacer>OGI_Bullet_BoltHellfire</projectileReplacer>
-
  </li>
-  </comps>
+  </modExtensions>
  </ThingDef> 
 
- <!-- ================ Imperial Dragonfire Bolt ================ -->
- <ThingDef ParentName="OG_BoltBase">
- <defName>OGI_Bolt_Dragonfire</defName>
- <label>fragonfire bolts</label>
- <description>Dragonfire Bolts are hollow-shelled bolts that are issued fo use by Sternguard Veterans, and explode with a gout of superheated gas that can eliminate the value of cover for enemy troops. Any targets struck receive full damage even when partially protected by cover.</description>
- <graphicData>
- <texPath>Things/Item/ImpMissileFrag</texPath>
- <graphicClass>Graphic_Single</graphicClass>
- <drawSize>(1,1)</drawSize>
- <color>(124,196,243)</color>
- </graphicData>
- <comps>
- <li Class="OgsCompSlotLoadable.CompProperties_SlottedBonus">
- <!--
- <additionalProjectiles>
- <li>OGI_Bullet_BoltDragonfire</li>
- </additionalProjectiles>
- -->
+ <!-- ================ Imperial Dragonfire Bolt ================ -->
+ <ThingDef ParentName="OG_BoltBase">
+ <defName>OGI_Bolt_Dragonfire</defName>
+ <label>fragonfire bolts</label>
+ <description>Dragonfire Bolts are hollow-shelled bolts that are issued fo use by Sternguard Veterans, and explode with a gout of superheated gas that can eliminate the value of cover for enemy troops. Any targets struck receive full damage even when partially protected by cover.</description>
+ <graphicData>
+ <texPath>Things/Item/ImpMissileFrag</texPath>
+ <graphicClass>Graphic_Single</graphicClass>
+ <drawSize>(1,1)</drawSize>
+ <color>(124,196,243)</color>
+ </graphicData>
+ <modExtensions>
+ <li Class="OgsCompSlotLoadable.SlottedBonusExtension">
  <projectileReplacer>OGI_Bullet_BoltDragonfire</projectileReplacer>
-
  </li>
-  </comps>
- </ThingDef> 
+  </modExtensions>
+ </ThingDef> 
 
- <!-- ================ Imperial Kraken Bolt ================ -->
+ <!-- ================ Imperial Kraken Bolt ================ -->
  <ThingDef ParentName="OG_BoltBase">
- <defName>OGI_Bolt_Kraken</defName>
- <label>kraken bolts</label>
- <description>Kraken Bolts are specialised Bolter shells with an enhanced adamantium core and improved propellant, and were utilised by Seeker Squads during the Great Crusade and Horus Heresy eras of the late 30th and early 31st Millennia, as well as Sternguard Veterans in modern times. They possessed superior armour-piercing properties and increased range compared to standard bolts, but the expense and resources required to create them kept them in limited issue.</description>
- <graphicData>
- <texPath>Things/Item/ImpMissileKrak</texPath>
- <graphicClass>Graphic_Single</graphicClass>
- <drawSize>(1,1)</drawSize>
- <color>(240,241,241)</color>
- </graphicData>
- <comps>
- <li Class="OgsCompSlotLoadable.CompProperties_SlottedBonus">
- <!--
- <additionalProjectiles>
- <li>OGI_Bullet_BoltKraken</li>
- </additionalProjectiles>
- -->
+ <defName>OGI_Bolt_Kraken</defName>
+ <label>kraken bolts</label>
+ <description>Kraken Bolts are specialised Bolter shells with an enhanced adamantium core and improved propellant, and were utilised by Seeker Squads during the Great Crusade and Horus Heresy eras of the late 30th and early 31st Millennia, as well as Sternguard Veterans in modern times. They possessed superior armour-piercing properties and increased range compared to standard bolts, but the expense and resources required to create them kept them in limited issue.</description>
+ <graphicData>
+ <texPath>Things/Item/ImpMissileKrak</texPath>
+ <graphicClass>Graphic_Single</graphicClass>
+ <drawSize>(1,1)</drawSize>
+ <color>(240,241,241)</color>
+ </graphicData>
+ <modExtensions>
+ <li Class="OgsCompSlotLoadable.SlottedBonusExtension">
  <verbReplacer>
  <verbClass>Verb_Shoot</verbClass>
  <label>Kraken Bolts</label>
@@ -153,27 +136,22 @@
  </targetParams>
  </verbReplacer>
  </li>
-  </comps>
- </ThingDef> 
+  </modExtensions>
+ </ThingDef> 
 
- <!-- ================ Imperial Vengeance Bolt ================ -->
+ <!-- ================ Imperial Vengeance Bolt ================ -->
  <ThingDef ParentName="OG_BoltBase">
- <defName>OGI_Bolt_Vengeance</defName>
- <label>Vengeance bolts</label>
- <description>Vengeance Round bolts are designed for use against heavy infantry and armoured targets. Each bolt has a volatile core utilising unstable flux core technology that makes them hazardous to use, but extremely potent at penetrating through heavily armoured targets. They are especially effective at punching clean through even the Ceramite plates of Power Armour. As their name implies, these bolts were developed by the Imperium specifically to target the Chaos Space Marines of the Traitor Legions.</description>
- <graphicData>
- <texPath>Things/Item/ImpMissileKrak</texPath>
- <graphicClass>Graphic_Single</graphicClass>
- <drawSize>(1,1)</drawSize>
- <color>(240,241,241)</color>
- </graphicData>
- <comps>
- <li Class="OgsCompSlotLoadable.CompProperties_SlottedBonus">
- <!--
- <additionalProjectiles>
- <li>OGI_Bullet_BoltVengeance</li>
- </additionalProjectiles>
- -->
+ <defName>OGI_Bolt_Vengeance</defName>
+ <label>Vengeance bolts</label>
+ <description>Vengeance Round bolts are designed for use against heavy infantry and armoured targets. Each bolt has a volatile core utilising unstable flux core technology that makes them hazardous to use, but extremely potent at penetrating through heavily armoured targets. They are especially effective at punching clean through even the Ceramite plates of Power Armour. As their name implies, these bolts were developed by the Imperium specifically to target the Chaos Space Marines of the Traitor Legions.</description>
+ <graphicData>
+ <texPath>Things/Item/ImpMissileKrak</texPath>
+ <graphicClass>Graphic_Single</graphicClass>
+ <drawSize>(1,1)</drawSize>
+ <color>(240,241,241)</color>
+ </graphicData>
+ <modExtensions>
+ <li Class="OgsCompSlotLoadable.SlottedBonusExtension">
  <verbReplacer>
  <verbClass>Verb_Shoot</verbClass>
  <label>Vengeance Bolts</label>
@@ -191,28 +169,23 @@
  </targetParams>
  </verbReplacer>
  </li>
- </comps>
- </ThingDef> 
+   </modExtensions>
+ </ThingDef> 
 
 
- <!-- ================ Imperial Heavy Hellfire Bolt ================ -->
- <ThingDef ParentName="OG_BoltBase">
- <defName>OGI_HeavyBolt_Hellfire</defName>
- <label>heavy hellfire bolts</label>
- <description>Hellfire bolts were created as one of the Imperium's desperate measures to stem the predations of Tyranid assaults within the galaxy. Each bolt is tipped with thousands of needles and a vial of mutagenic acid capable of dissolving its way through citin and carapace with equal ease.\n\nWhen the round enters the target's body, the vial shatters and the needles pierce the victim's flesh, pumping the acid into the target. Such is the success of the Hellfire bolt that it has found a use against a variety of foes, its acid just as effective at killing other foul xenos.</description>
- <graphicData>
- <texPath>Things/Item/ImpMissileFrag</texPath>
- <graphicClass>Graphic_Single</graphicClass>
- <drawSize>(1,1)</drawSize>
- <color>(124,196,243)</color>
- </graphicData>
- <comps>
- <li Class="OgsCompSlotLoadable.CompProperties_SlottedBonus">
- <!--
- <additionalProjectiles>
- <li>OGI_Bullet_BoltHellfire</li>
- </additionalProjectiles>
- -->
+ <!-- ================ Imperial Heavy Hellfire Bolt ================ -->
+ <ThingDef ParentName="OG_BoltBase">
+ <defName>OGI_HeavyBolt_Hellfire</defName>
+ <label>heavy hellfire bolts</label>
+ <description>Hellfire bolts were created as one of the Imperium's desperate measures to stem the predations of Tyranid assaults within the galaxy. Each bolt is tipped with thousands of needles and a vial of mutagenic acid capable of dissolving its way through citin and carapace with equal ease.\n\nWhen the round enters the target's body, the vial shatters and the needles pierce the victim's flesh, pumping the acid into the target. Such is the success of the Hellfire bolt that it has found a use against a variety of foes, its acid just as effective at killing other foul xenos.</description>
+ <graphicData>
+ <texPath>Things/Item/ImpMissileFrag</texPath>
+ <graphicClass>Graphic_Single</graphicClass>
+ <drawSize>(1,1)</drawSize>
+ <color>(124,196,243)</color>
+ </graphicData>
+ <modExtensions>
+ <li Class="OgsCompSlotLoadable.SlottedBonusExtension">
  <verbReplacer>
  <verbClass>Verb_Shoot</verbClass>
  <label>Heavy Hellfire Bolts</label>
@@ -229,9 +202,8 @@
  <canTargetLocations>true</canTargetLocations>
  </targetParams>
  </verbReplacer>
-
  </li>
-  </comps>
- </ThingDef> 
+  </modExtensions>
+ </ThingDef> 
 
 </Defs>
diff --git a/1.1/Defs/ThingDefs_Buildings/OG_AMA_Buildings_Security_Turrets.xml b/1.1/Defs/ThingDefs_Buildings/OG_AMA_Buildings_Security_Turrets.xml
@@ -188,7 +188,7 @@
  <ThingDef ParentName="OGI_Turret">
  <defName>OGI_Turret_StormBolter_Manual</defName>
  <label>pintle-mounted storm bolter</label>
- <description>A mounted storm bolter turret. Requires a gunner.</description>
+ <description>A mounted storm bolter turret. Requires a gunner. Can be placed on top of barricades and sandbags.</description>
  <graphicData>
  <texPath>Things/Building/Imperial/Security/PintleMount_Base</texPath>
  <graphicClass>Graphic_Single</graphicClass>
@@ -201,6 +201,7 @@
  <offset>(0,0,0)</offset>
  </shadowData>
  </graphicData>
+ <altitudeLayer>BuildingOnTop</altitudeLayer>
  <uiIconPath>Things/Building/Imperial/Security/PintleMount_StormBolter_Menu</uiIconPath>
  <hasInteractionCell>True</hasInteractionCell>
  <interactionCellOffset>(0,0,-1)</interactionCellOffset>
@@ -259,6 +260,9 @@
  <placeWorkers>
  <li>AdeptusMechanicus.PlaceWorker_OnTopOfLowWalls</li>
  </placeWorkers>
+ <tradeTags>
+ <li>OG_Mounted_Weapon</li>
+ </tradeTags>
  </ThingDef>
 
  <ThingDef ParentName="BaseWeaponTurret">
@@ -281,19 +285,19 @@
  </statBases>
  <verbs>
  <li>
- <verbClass>Verb_Shoot</verbClass>
- <hasStandardCommand>true</hasStandardCommand>
- <defaultProjectile>OGI_Bullet_BoltStd</defaultProjectile>
- <warmupTime>0.00</warmupTime>
- <range>31</range>
- <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
- <burstShotCount>6</burstShotCount>
- <soundCast>OG_Bolt_Gun_Sound</soundCast>
- <soundCastTail>GunTail_Heavy</soundCastTail>
- <muzzleFlashScale>14</muzzleFlashScale>
- <targetParams>
- <canTargetLocations>true</canTargetLocations>
- </targetParams>
+  <verbClass>Verb_Shoot</verbClass>
+  <hasStandardCommand>true</hasStandardCommand>
+  <defaultProjectile>OGI_Bullet_BoltStd</defaultProjectile>
+  <warmupTime>0.00</warmupTime>
+  <range>31</range>
+  <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+  <burstShotCount>6</burstShotCount>
+  <soundCast>OG_Bolt_Gun_Sound</soundCast>
+  <soundCastTail>GunTail_Heavy</soundCastTail>
+  <muzzleFlashScale>14</muzzleFlashScale>
+  <targetParams>
+  <canTargetLocations>true</canTargetLocations>
+  </targetParams>
  </li>
  </verbs>
  </ThingDef>
@@ -302,7 +306,7 @@
  <ThingDef ParentName="OGI_Turret">
  <defName>OGI_Turret_HeavyBolter_Manual</defName>
  <label>pintle-mounted heavy bolter</label>
- <description>A mounted heavy bolter turret. Requires a gunner.</description>
+ <description>A mounted heavy bolter turret. Requires a gunner. Can be placed on top of barricades and sandbags.</description>
  <graphicData>
  <texPath>Things/Building/Imperial/Security/PintleMount_Base</texPath>
  <graphicClass>Graphic_Single</graphicClass>
@@ -315,6 +319,7 @@
  <offset>(0,0,0)</offset>
  </shadowData>
  </graphicData>
+ <altitudeLayer>BuildingOnTop</altitudeLayer>
  <uiIconPath>Things/Building/Imperial/Security/PintleMount_HeavyBolter_Menu</uiIconPath>
  <hasInteractionCell>True</hasInteractionCell>
  <interactionCellOffset>(0,0,-1)</interactionCellOffset>
@@ -368,6 +373,9 @@
  <placeWorkers>
  <li>AdeptusMechanicus.PlaceWorker_OnTopOfLowWalls</li>
  </placeWorkers>
+ <tradeTags>
+ <li>OG_Mounted_Weapon</li>
+ </tradeTags>
  </ThingDef>
 
  <ThingDef ParentName="BaseWeaponTurret">
@@ -390,19 +398,19 @@
  </statBases>
  <verbs>
  <li>
- <verbClass>Verb_Shoot</verbClass>
- <hasStandardCommand>true</hasStandardCommand>
- <defaultProjectile>OGI_Bullet_HeavyBoltStd</defaultProjectile>
- <warmupTime>0.00</warmupTime>
- <range>38</range>
- <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
- <burstShotCount>6</burstShotCount>
- <soundCast>OG_Bolt_Gun_Sound</soundCast>
- <soundCastTail>GunTail_Heavy</soundCastTail>
- <muzzleFlashScale>14</muzzleFlashScale>
- <targetParams>
- <canTargetLocations>true</canTargetLocations>
- </targetParams>
+  <verbClass>Verb_Shoot</verbClass>
+  <hasStandardCommand>true</hasStandardCommand>
+  <defaultProjectile>OGI_Bullet_HeavyBoltStd</defaultProjectile>
+  <warmupTime>0.00</warmupTime>
+  <range>38</range>
+  <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+  <burstShotCount>6</burstShotCount>
+  <soundCast>OG_Bolt_Gun_Sound</soundCast>
+  <soundCastTail>GunTail_Heavy</soundCastTail>
+  <muzzleFlashScale>14</muzzleFlashScale>
+  <targetParams>
+  <canTargetLocations>true</canTargetLocations>
+  </targetParams>
  </li>
  </verbs>
  </ThingDef>

diff --git a/...deptusMechanicusMain/Defs/AbilityAIDef.cs → ...ptusMechanicusMain/AI/AbilityAIDef.cs.bak b/...deptusMechanicusMain/Defs/AbilityAIDef.cs → ...ptusMechanicusMain/AI/AbilityAIDef.cs.bak
@@ -1,4 +1,5 @@
-using System;
+using RimWorld;
+using System;
 using System.Collections.Generic;
 
 using Verse;

diff --git a/...nicusMain/Defs/AbilityUserAIProfileDef.cs → ...cusMain/AI/AbilityUserAIProfileDef.cs.bak b/...nicusMain/Defs/AbilityUserAIProfileDef.cs → ...cusMain/AI/AbilityUserAIProfileDef.cs.bak