Merge branch 'Develop'

Epicguru · Sep 24, 2020 · 887d8ef · 887d8ef
2 parents e25bd80 + 5fb2c6c
commit 887d8ef
Show file tree

Hide file tree

Showing 172 changed files with 3,041 additions and 439 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -5,6 +5,7 @@
   <author>Epicguru (James B)</author>
   <supportedVersions>
     <li>1.1</li>
+    <li>1.2</li>
   </supportedVersions>
   <url>https://github.com/Epicguru/AntimatterAnnihilation</url>
   <description>
@@ -14,9 +15,11 @@ Adds many items, weapons, defences, utility buildings, and a new powerful factio
 This is a mod that is intended to expand the end-game, adding new goals that are challenging but rewarding, and also to increase the difficulty of late game by sending harder raiders.
 This mod also features a fully developed in-game wiki that serves as a guide and also a little extra lore and pretty pictures.
 
-Should be loaded far down as possible, and always after Harmony, In-Game wiki and Core.
+Should be loaded far down as possible, and always after Harmony, In-Game wiki (optional) and Core.
 
-This is a WIP mod. There may be bugs and things may break. Please report bugs on the steam page or on Github, providing as much detail as possible, thanks.
+To access the in-game wiki, you must also install the In-Game Wiki mod from steam. It should be loaded before this mod.
+
+Please report any bugs on the steam page or on Github, providing as much detail as possible, thanks.
 See the store page for all plans, and don't hesitate to suggest new features or changes.
   </description>
   <modDependencies>
@@ -26,12 +29,6 @@ See the store page for all plans, and don't hesitate to suggest new features or
       <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
-    <li>
-      <packageId>co.uk.epicguru.ingamewiki</packageId>
-      <displayName>In-game wiki</displayName>
-      <steamWorkshopUrl>steam://url/CommunityFilePage/2113685739</steamWorkshopUrl>
-      <downloadUrl>https://github.com/Epicguru/InGameWiki/releases/latest</downloadUrl>
-    </li>
   </modDependencies>
   <loadAfter>
     <li>co.uk.epicguru.ingamewiki</li> <!-- Which has to go after Harmony, so that is sorted. -->

diff --git a/Defs/Buildings/Production/AlloyFusionMachine.xml b/Defs/Buildings/Production/AlloyFusionMachine.xml
@@ -31,7 +31,7 @@ See the in-game wiki for more information and how to use.</description>
             <li Class="CompProperties_Flickable"/>
             <li Class="CompProperties_Power">
                 <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>300</basePowerConsumption>
+                <basePowerConsumption>-100</basePowerConsumption>
                 <transmitsPower>false</transmitsPower>
             </li>
             <li Class="CompProperties_Glower"> <!-- A Harmony patch ensures that this only glows when required. -->
@@ -41,9 +41,12 @@ See the in-game wiki for more information and how to use.</description>
 
             <li Class="AntimatterAnnihilation.ThingComps.CompProperties_RefuelableMulti">
                 <id>1</id>
-                <fuelConsumptionRate>0</fuelConsumptionRate>
                 <fuelPriority>0</fuelPriority>
                 <fuelCapacity>40</fuelCapacity>
+
+                <fuelConsumptionRate>0</fuelConsumptionRate>
+                <autoRefuelPercent>1</autoRefuelPercent>
+
                 <fuelFilter>
                     <thingDefs>
                         <li>Gold</li>
@@ -54,9 +57,12 @@ See the in-game wiki for more information and how to use.</description>
 
             <li Class="AntimatterAnnihilation.ThingComps.CompProperties_RefuelableMulti">
                 <id>2</id>
-                <fuelConsumptionRate>0</fuelConsumptionRate>
                 <fuelPriority>1</fuelPriority>
                 <fuelCapacity>30</fuelCapacity>
+
+                <fuelConsumptionRate>0</fuelConsumptionRate>
+                <autoRefuelPercent>1</autoRefuelPercent>
+
                 <fuelFilter>
                     <thingDefs>
                         <li>AntimatterComposite_AA</li>
@@ -67,9 +73,12 @@ See the in-game wiki for more information and how to use.</description>
 
             <li Class="AntimatterAnnihilation.ThingComps.CompProperties_RefuelableMulti">
                 <id>3</id>
-                <fuelConsumptionRate>0</fuelConsumptionRate>
                 <fuelPriority>2</fuelPriority>
                 <fuelCapacity>20</fuelCapacity>
+
+                <fuelConsumptionRate>0</fuelConsumptionRate>
+                <autoRefuelPercent>1</autoRefuelPercent>
+
                 <fuelFilter>
                     <thingDefs>
                         <li>Uranium</li>

diff --git a/Defs/Buildings/Production/CompositeRefiner.xml b/Defs/Buildings/Production/CompositeRefiner.xml
@@ -44,9 +44,12 @@ See the in-game wiki for more information and how to use.</description>
 
             <li Class="AntimatterAnnihilation.ThingComps.CompProperties_RefuelableMulti">
                 <id>1</id>
-                <fuelConsumptionRate>0</fuelConsumptionRate>
                 <fuelPriority>0</fuelPriority>
                 <fuelCapacity>60</fuelCapacity>
+
+                <fuelConsumptionRate>0</fuelConsumptionRate>
+                <autoRefuelPercent>1</autoRefuelPercent>
+
                 <fuelFilter>
                     <thingDefs>
                         <li>Plasteel</li>
@@ -57,9 +60,12 @@ See the in-game wiki for more information and how to use.</description>
 
             <li Class="AntimatterAnnihilation.ThingComps.CompProperties_RefuelableMulti">
                 <id>2</id>
-                <fuelConsumptionRate>0</fuelConsumptionRate>
                 <fuelPriority>1</fuelPriority>
                 <fuelCapacity>1</fuelCapacity>
+
+                <fuelConsumptionRate>0</fuelConsumptionRate>
+                <autoRefuelPercent>1</autoRefuelPercent>
+
                 <fuelFilter>
                     <thingDefs>
                         <li>AntimatterCanister_AA</li>

diff --git a/Defs/Buildings/Turrets/MBD.xml b/Defs/Buildings/Turrets/MBD.xml
@@ -20,6 +20,10 @@
             <Mass>220</Mass>
             <Beauty>-20</Beauty>
         </statBases>
+        <minifiedDef>MinifiedThing</minifiedDef>
+        <thingCategories>
+            <li>BuildingsSecurity</li>
+        </thingCategories>
         <tickerType>Normal</tickerType>
         <passability>PassThroughOnly</passability>
         <pathCost>120</pathCost>
@@ -49,7 +53,7 @@
 It's multi-barrel destruction.</description>
         <uiIconPath>AntimatterAnnihilation/UI/MBDIcon</uiIconPath>
         <statBases>
-            <ShootingAccuracyTurret>1.4</ShootingAccuracyTurret>
+            <ShootingAccuracyTurret>0.985</ShootingAccuracyTurret>
         </statBases>
         <costList>
             <Steel>250</Steel>
@@ -73,9 +77,10 @@ It's multi-barrel destruction.</description>
                 <fuelFilter><thingDefs><li>AntimatterCanister_AA</li></thingDefs></fuelFilter>
                 <fuelCapacity>2</fuelCapacity>
                 <initialFuelPercent>0</initialFuelPercent>
-                <autoRefuelPercent>0.5</autoRefuelPercent>
+                <autoRefuelPercent>0.8</autoRefuelPercent>
                 <showFuelGizmo>true</showFuelGizmo>
                 <minimumFueledThreshold>0.1</minimumFueledThreshold>
+                <fuelMultiplier>1</fuelMultiplier>
                 <factorByDifficulty>false</factorByDifficulty>
                 <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
                 <fuelIconPath>AntimatterAnnihilation/Items/AntimatterCanister</fuelIconPath>
@@ -100,16 +105,11 @@ It's multi-barrel destruction.</description>
             <texPath>Things/Projectile/Bullet_Big</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingClass>Projectile_Explosive</thingClass>
         <projectile>
-            <damageDef>AnnihilationExplosionMBD_AA</damageDef>
-            <speed>120</speed> <!-- Speedy boy. -->
-            <explosionRadius>1.5</explosionRadius>
-            <flyOverhead>true</flyOverhead>
-            <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-            <soundExplode>MortarBomb_Explode</soundExplode>
-            <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-            <soundAmbient>MortarRound_Ambient</soundAmbient>
+            <damageDef>Annihilate_AA</damageDef>
+            <damageAmountBase>8</damageAmountBase>
+            <speed>200</speed> <!-- Speedy boy. -->
+            <armorPenetrationBase>1.5</armorPenetrationBase>
         </projectile>
     </ThingDef>
 
@@ -123,33 +123,28 @@ It's multi-barrel destruction.</description>
             <drawSize>(2,2)</drawSize>
         </graphicData>
         <statBases>
-            <AccuracyTouch>0.5</AccuracyTouch>
-            <AccuracyShort>0.75</AccuracyShort>
-            <AccuracyMedium>0.85</AccuracyMedium>
-            <AccuracyLong>0.6</AccuracyLong>
+            <AccuracyTouch>0.45</AccuracyTouch>
+            <AccuracyShort>0.65</AccuracyShort>
+            <AccuracyMedium>0.8</AccuracyMedium>
+            <AccuracyLong>0.75</AccuracyLong>
             <DeteriorationRate>0</DeteriorationRate>
             <Mass>200</Mass>
             <Flammability>0</Flammability>
         </statBases>
         <verbs>
             <li>
                 <verbClass>AntimatterAnnihilation.Verbs.Verb_Railgun</verbClass>
-                <forcedMissRadius>2</forcedMissRadius>
                 <defaultProjectile>Bullet_MBD_AA</defaultProjectile>
                 <isPrimary>true</isPrimary>
                 <warmupTime>0</warmupTime>
                 <minRange>4</minRange>
                 <range>55</range>
-                <ai_AvoidFriendlyFireRadius>9.5</ai_AvoidFriendlyFireRadius>
-                <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-                <burstShotCount>12</burstShotCount>
+                <ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+                <burstShotCount>16</burstShotCount>
                 <soundCast>Shot_Autocannon</soundCast>
                 <soundCastTail>GunTail_Heavy</soundCastTail>
                 <muzzleFlashScale>40</muzzleFlashScale>
-                <consumeFuelPerShot>0.02</consumeFuelPerShot>
-                <targetParams>
-                    <canTargetLocations>true</canTargetLocations>
-                </targetParams>
+                <consumeFuelPerShot>0.00390625</consumeFuelPerShot> <!-- 16 bursts of 16 bullets. -->
             </li>
         </verbs>
     </ThingDef>

diff --git a/Defs/Buildings/Turrets/Railgun.xml b/Defs/Buildings/Turrets/Railgun.xml
@@ -70,9 +70,9 @@
                 <fuelFilter><thingDefs><li>AntimatterCanister_AA</li></thingDefs></fuelFilter>
                 <fuelCapacity>2</fuelCapacity>       <!-- 4 shots at 0.5 each -->
                 <initialFuelPercent>0</initialFuelPercent>
-                <autoRefuelPercent>0.5</autoRefuelPercent>
+                <autoRefuelPercent>0.7499</autoRefuelPercent>
                 <showFuelGizmo>true</showFuelGizmo>
-                <minimumFueledThreshold>0.1</minimumFueledThreshold>
+                <minimumFueledThreshold>0.499</minimumFueledThreshold>
                 <factorByDifficulty>false</factorByDifficulty>
                 <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
                 <fuelIconPath>AntimatterAnnihilation/Items/AntimatterCanister</fuelIconPath>

diff --git a/Defs/Buildings/Turrets/ThunderGun.xml b/Defs/Buildings/Turrets/ThunderGun.xml
@@ -20,6 +20,10 @@
             <Mass>200</Mass>
             <Beauty>-25</Beauty>
         </statBases>
+        <minifiedDef>MinifiedThing</minifiedDef>
+        <thingCategories>
+            <li>BuildingsSecurity</li>
+        </thingCategories>
         <tickerType>Normal</tickerType>
         <passability>PassThroughOnly</passability>
         <pathCost>120</pathCost>
@@ -48,7 +52,7 @@
         <description>A kinetic weapon firing huge uranum slugs using convetional methods. A dual barrel self-loading system offers excellent rate of fire and large damage.</description>
         <uiIconPath>AntimatterAnnihilation/UI/ThunderGunIcon</uiIconPath>
         <statBases>
-            <ShootingAccuracyTurret>1.4</ShootingAccuracyTurret>
+            <ShootingAccuracyTurret>0.995</ShootingAccuracyTurret>
         </statBases>
         <costList>
             <Steel>350</Steel>
@@ -69,13 +73,13 @@
                 <fuelGizmoLabel>Uranium thunder gun slugs</fuelGizmoLabel>
                 <outOfFuelMessage>Cannot shoot: No slugs</outOfFuelMessage>
                 <fuelFilter><thingDefs><li>Uranium</li></thingDefs></fuelFilter>
-                <fuelCapacity>50</fuelCapacity>
-                <fuelMultiplier>0.25</fuelMultiplier>
+                <fuelCapacity>80</fuelCapacity>
+                <fuelMultiplier>0.5</fuelMultiplier>
                 <initialFuelPercent>1</initialFuelPercent>
-                <autoRefuelPercent>0.5</autoRefuelPercent>
+                <autoRefuelPercent>0.8</autoRefuelPercent>
                 <showFuelGizmo>true</showFuelGizmo>
                 <minimumFueledThreshold>1</minimumFueledThreshold>
-                <factorByDifficulty>true</factorByDifficulty>
+                <factorByDifficulty>false</factorByDifficulty>
                 <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
                 <fuelIconPath>UI/Overlays/Barrel</fuelIconPath>
             </li>
@@ -103,6 +107,7 @@
             <damageDef>Bullet</damageDef>
             <damageAmountBase>25</damageAmountBase>
             <speed>140</speed>
+            <armorPenetrationBase>0.65</armorPenetrationBase>
         </projectile>
     </ThingDef>
 

diff --git a/Defs/Factions/Ultratech.xml b/Defs/Factions/Ultratech.xml
@@ -10,6 +10,7 @@
         <requiredCountAtGameStart>1</requiredCountAtGameStart>
         <canMakeRandomly>true</canMakeRandomly>
         <canSiege>false</canSiege>
+        <permanentEnemy>true</permanentEnemy>
         <canStageAttacks>true</canStageAttacks>
         <leaderTitle>division leader</leaderTitle>
         <factionIconPath>AntimatterAnnihilation/UI/FactionIcon</factionIconPath>
@@ -35,18 +36,6 @@
             <li>Punk</li>
             <li>Urban</li>
         </hairTags>
-        <!-- <caravanTraderKinds>
-            <li>Caravan_Outlander_BulkGoods</li>
-            <li>Caravan_Outlander_CombatSupplier</li>
-            <li>Caravan_Outlander_Exotic</li>
-            <li>Caravan_Outlander_PirateMerchant</li>
-        </caravanTraderKinds> -->
-        <!-- <visitorTraderKinds>
-            <li>Visitor_Outlander_Standard</li>
-        </visitorTraderKinds>
-        <baseTraderKinds>
-            <li>Base_Outlander_Standard</li>
-        </baseTraderKinds> -->
         <allowedArrivalTemperatureRange>-60~60</allowedArrivalTemperatureRange>
         <maxPawnCostPerTotalPointsCurve>
             <points> <!-- TODO Understand and adjust -->
@@ -97,9 +86,9 @@
             <li>(0.878, 0, 0.854)</li>
             <li>(0.454, 0.039, 0.643)</li>
         </colorSpectrum>
+        <goodwillDailyFall>0</goodwillDailyFall>
+        <goodwillDailyGain>0</goodwillDailyGain>
         <factionIconPath>AntimatterAnnihilation/UI/FactionBaseIcon</factionIconPath>
-        <startingGoodwill>-90</startingGoodwill>
-        <naturalColonyGoodwill>-100~-90</naturalColonyGoodwill>
     </FactionDef>
 
 </Defs>
diff --git a/Defs/Items/Guns/DevastatorLMG.xml b/Defs/Items/Guns/DevastatorLMG.xml
@@ -12,10 +12,10 @@ This weapon incorporates archotech technology. Even with a good understanding of
         </graphicData>
         <statBases>
             <Mass>4.8</Mass>
-            <AccuracyTouch>0.40</AccuracyTouch>
-            <AccuracyShort>0.45</AccuracyShort>
-            <AccuracyMedium>0.4</AccuracyMedium>
-            <AccuracyLong>0.2</AccuracyLong>
+            <AccuracyTouch>0.45</AccuracyTouch>
+            <AccuracyShort>0.55</AccuracyShort>
+            <AccuracyMedium>0.65</AccuracyMedium>
+            <AccuracyLong>0.3</AccuracyLong>
             <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
             <MarketValue>3800</MarketValue>
         </statBases>

diff --git a/Defs/Items/Resources/AntimatterComposite.xml b/Defs/Items/Resources/AntimatterComposite.xml
@@ -40,7 +40,7 @@ This material has the ability to cause microscopic annihilation reactions when t
         </categories>
         <commonality>0</commonality>
         <constructEffect>ConstructMetal</constructEffect>
-        <color>(159,159,243)</color>
+        <color>(113,52,122)</color>
         <soundImpactStuff>BulletImpact_Metal</soundImpactStuff>
         <soundMeleeHitSharp>MeleeHit_Metal_Sharp</soundMeleeHitSharp>
         <soundMeleeHitBlunt>MeleeHit_Metal_Blunt</soundMeleeHitBlunt>

diff --git a/Defs/Items/Resources/Hyper Component.xml b/Defs/Items/Resources/Hyper Component.xml
@@ -15,7 +15,7 @@ It can be used to construct and craft things that were previously only theoretic
         <healthAffectsPrice>false</healthAffectsPrice>
         <stackLimit>16</stackLimit>
         <statBases>
-            <MarketValue>140</MarketValue>
+            <MarketValue>350</MarketValue>
             <Mass>0.8</Mass>
             <Beauty>3</Beauty>
         </statBases>

diff --git a/Defs/Research/Entry Research.xml b/Defs/Research/Entry Research.xml
@@ -5,7 +5,7 @@
         <defName>Entry_AA</defName>
         <label>hack Ultratech database</label>
         <description>Using your multi-analyzer and long range comms equipment, attempt to gain access to the Ultratech faction's database.</description>
-        <baseCost>500</baseCost>
+        <baseCost>2500</baseCost>
         <techLevel>Industrial</techLevel>
         <tab>Antimatter</tab>
         <discoveredLetterTitle>Antimatter technology unlocked!</discoveredLetterTitle>

diff --git a/Defs/Research/Instant Flick Research.xml b/Defs/Research/Instant Flick Research.xml
@@ -5,7 +5,7 @@
         <defName>InstantFlick_AA</defName>
         <label>instant flick</label>
         <description>Using the PowerNet Console, send a signal directly through the power lines to instantly turn machines on or off.</description>
-        <baseCost>400</baseCost>
+        <baseCost>600</baseCost>
         <techLevel>Industrial</techLevel>
         <tab>Antimatter</tab>
         <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>

diff --git a/Defs/Research/Melee Spacer Advanced Research.xml b/Defs/Research/Melee Spacer Advanced Research.xml
@@ -5,7 +5,7 @@
         <defName>MeleeSpacerAdvanced_AA</defName>
         <label>spacer melee weapons</label>
         <description>Using antimatter technology and materials allows you to craft even more powerful melee weapons that have special properties.</description>
-        <baseCost>2500</baseCost>
+        <baseCost>2600</baseCost>
         <techLevel>Spacer</techLevel>
         <tab>Antimatter</tab>
         <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>

diff --git a/Defs/Research/Thunder Gun Research.xml b/Defs/Research/Thunder Gun Research.xml
@@ -6,7 +6,7 @@
         <label>thunder gun</label>
         <description>This turret design is stolen straight from the Ultratech faction.
 The turret does not require very advanced materials to construct it, but requires Uranium slugs to be replaced after firing.</description>
-        <baseCost>1400</baseCost>
+        <baseCost>1800</baseCost>
         <techLevel>Spacer</techLevel>
         <tab>Antimatter</tab>
         <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>

diff --git a/Defs/Research/Turrets Research.xml b/Defs/Research/Turrets Research.xml
@@ -5,7 +5,7 @@
         <defName>R_Turrets_AA</defName>
         <label>turrets</label>
         <description>Begin researching how antimatter technology can be used to create stationary defences.</description>
-        <baseCost>300</baseCost>
+        <baseCost>500</baseCost>
         <techLevel>Spacer</techLevel>
         <tab>Antimatter</tab>
         <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>