Merge branch 'Develop'

Epicguru · Oct 6, 2022 · 4d3692d · 4d3692d
2 parents d467bcf + 2893147
commit 4d3692d
Show file tree

Hide file tree

Showing 80 changed files with 309 additions and 206 deletions.
diff --git a/1.2/Defs/Sounds/Explosions.xml b/1.2/Defs/Sounds/Explosions.xml
diff --git a/1.2/Defs/Sounds/Lasers.xml b/1.2/Defs/Sounds/Lasers.xml
diff --git a/1.3/Defs/Factions/Ultratech.xml b/1.3/Defs/Factions/Ultratech.xml
@@ -9,7 +9,9 @@
             <li>(0.878, 0, 0.854)</li>
             <li>(0.454, 0.039, 0.643)</li>
         </colorSpectrum>
-
+
+        <earliestRaidDays>10</earliestRaidDays>
+        <maxConfigurableAtWorldCreation>3</maxConfigurableAtWorldCreation>
         <permanentEnemy>true</permanentEnemy>
         <leaderForceGenerateNewPawn>true</leaderForceGenerateNewPawn>
 

diff --git a/1.2/Defs/Armor/VoidArmor.xml → 1.4/Defs/Armor/VoidArmor.xml b/1.2/Defs/Armor/VoidArmor.xml → 1.4/Defs/Armor/VoidArmor.xml
@@ -82,7 +82,7 @@
             <li>RewardStandardHighFreq</li>
         </thingSetMakerTags>
         <comps>
-            <li Class="CompProperties_BiocodableApparel"/>
+            <li Class="CompProperties_Biocodable"/>
         </comps>
     </ThingDef>
 

diff --git a/1.2/Defs/Armor/VoidHelmet.xml → 1.4/Defs/Armor/VoidHelmet.xml b/1.2/Defs/Armor/VoidHelmet.xml → 1.4/Defs/Armor/VoidHelmet.xml
@@ -75,7 +75,7 @@
             <li>RewardStandardHighFreq</li>
         </thingSetMakerTags>
         <comps>
-            <li Class="CompProperties_BiocodableApparel"/>
+            <li Class="CompProperties_Biocodable"/>
         </comps>
     </ThingDef>
 

diff --git a/1.2/Defs/Buildings/Buildings.xml → 1.4/Defs/Buildings/Buildings.xml b/1.2/Defs/Buildings/Buildings.xml → 1.4/Defs/Buildings/Buildings.xml
@@ -49,6 +49,7 @@
         <rotatable>false</rotatable>
         <canOverlapZones>false</canOverlapZones>
         <castEdgeShadows>false</castEdgeShadows>
+        <drawerType>MapMeshAndRealTime</drawerType>
 
     </ThingDef>
 

diff --git a/1.2/Defs/Buildings/Floors/Floors.xml → 1.4/Defs/Buildings/Floors/Floors.xml b/1.2/Defs/Buildings/Floors/Floors.xml → 1.4/Defs/Buildings/Floors/Floors.xml
diff --git a/1.2/Defs/Buildings/Mines/N2 Mine.xml → 1.4/Defs/Buildings/Mines/N2 Mine.xml b/1.2/Defs/Buildings/Mines/N2 Mine.xml → 1.4/Defs/Buildings/Mines/N2 Mine.xml
diff --git a/...ildings/Production/AlloyFusionMachine.xml → ...ildings/Production/AlloyFusionMachine.xml b/...ildings/Production/AlloyFusionMachine.xml → ...ildings/Production/AlloyFusionMachine.xml
diff --git a/...Buildings/Production/CompositeRefiner.xml → ...Buildings/Production/CompositeRefiner.xml b/...Buildings/Production/CompositeRefiner.xml → ...Buildings/Production/CompositeRefiner.xml
diff --git a/1.2/Defs/Buildings/Production/InputTray.xml → 1.4/Defs/Buildings/Production/InputTray.xml b/1.2/Defs/Buildings/Production/InputTray.xml → 1.4/Defs/Buildings/Production/InputTray.xml
diff --git a/1.2/Defs/Buildings/Special/M3G_UMIN.xml → 1.4/Defs/Buildings/Special/M3G_UMIN.xml b/1.2/Defs/Buildings/Special/M3G_UMIN.xml → 1.4/Defs/Buildings/Special/M3G_UMIN.xml
diff --git a/1.2/Defs/Buildings/Turrets/MBD.xml → 1.4/Defs/Buildings/Turrets/MBD.xml b/1.2/Defs/Buildings/Turrets/MBD.xml → 1.4/Defs/Buildings/Turrets/MBD.xml
diff --git a/1.2/Defs/Buildings/Turrets/Railgun.xml → 1.4/Defs/Buildings/Turrets/Railgun.xml b/1.2/Defs/Buildings/Turrets/Railgun.xml → 1.4/Defs/Buildings/Turrets/Railgun.xml
diff --git a/1.2/Defs/Buildings/Turrets/ThunderGun.xml → 1.4/Defs/Buildings/Turrets/ThunderGun.xml b/1.2/Defs/Buildings/Turrets/ThunderGun.xml → 1.4/Defs/Buildings/Turrets/ThunderGun.xml
diff --git a/1.2/Defs/Damage/Damage.xml → 1.4/Defs/Damage/Damage.xml b/1.2/Defs/Damage/Damage.xml → 1.4/Defs/Damage/Damage.xml
@@ -158,7 +158,7 @@ Does not bleed as the flesh is forcefully cauterized. Causes intense pain.</desc
     <plantDamageFactor>7</plantDamageFactor>
     <explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
     <explosionHeatEnergyPerCell>20</explosionHeatEnergyPerCell>
-    <explosionCellMote>Mote_BlastDry</explosionCellMote>
+    <explosionCellFleck>BlastDry</explosionCellFleck>
     <explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
     <explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
     <soundExplosion>Explosion_Antimatter_AA</soundExplosion>

diff --git a/1.4/Defs/Factions/Culture.xml b/1.4/Defs/Factions/Culture.xml
@@ -0,0 +1,56 @@
+<Defs>
+  <CultureDef>
+    <defName>AA_Culture</defName>
+    <label>divisionist</label>
+    <description>The Division have a strong yet simple culture, unified by their never ending persuit of new technology and disdain for all other groups.</description>
+    <ideoNameMaker MayRequire="Ludeon.RimWorld.Ideology">NamerIdeoKriminul</ideoNameMaker>
+    <deityNameMaker MayRequire="Ludeon.RimWorld.Ideology">NamerDeityKriminul</deityNameMaker>
+    <deityTypeMaker MayRequire="Ludeon.RimWorld.Ideology">DeityTypeMakerKriminul</deityTypeMaker>
+    <leaderTitleMaker MayRequire="Ludeon.RimWorld.Ideology">LeaderTitleMaker_Kriminul</leaderTitleMaker>
+    <festivalNameMaker MayRequire="Ludeon.RimWorld.Ideology">NamerFestivalKriminul</festivalNameMaker>
+    <allowedPlaceTags>
+      <li>OriginSpacer</li>
+    </allowedPlaceTags>
+    <iconPath>World/WorldObjects/Expanding/PirateOutpost</iconPath>
+    <iconColor>(0.8, 0.8, 0.8)</iconColor>
+    <thingStyleCategories>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <category>Spikecore</category>
+        <priority>2</priority>
+      </li>
+    </thingStyleCategories>
+    <styleItemTags>
+      <li>
+        <tag>Punk</tag>
+        <baseWeight>1</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+      <li>
+        <tag>NoBeard</tag>
+        <baseWeight>10</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+      <li>
+        <tag>BeardPunk</tag>
+        <baseWeight>0.1</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+      <li>
+        <tag>NoTattoo</tag>
+        <baseWeight>1</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+      <li>
+        <tag>TattooFacePunk</tag>
+        <baseWeight>0.4</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+      <li>
+        <tag>TattooBodyPunk</tag>
+        <baseWeight>0.4</baseWeight>
+        <weightFactor>1</weightFactor>
+      </li>
+
+    </styleItemTags>
+  </CultureDef>
+</Defs>
diff --git a/1.2/Defs/Factions/Namer.xml → 1.4/Defs/Factions/Namer.xml b/1.2/Defs/Factions/Namer.xml → 1.4/Defs/Factions/Namer.xml
diff --git a/...fs/Factions/Pawn Kinds/UltratechPawns.xml → ...fs/Factions/Pawn Kinds/UltratechPawns.xml b/...fs/Factions/Pawn Kinds/UltratechPawns.xml → ...fs/Factions/Pawn Kinds/UltratechPawns.xml
@@ -22,6 +22,8 @@
                 </li>
             </subOptionsTakeAll>
         </inventoryOptions>
+        <initialWillRange>2~4</initialWillRange>
+        <initialResistanceRange>30~50</initialResistanceRange>
     </PawnKindDef>
 
     <!-- Soldiers have good chances to have expensive or powerful implants. -->

diff --git a/1.2/Defs/Factions/Ultratech.xml → 1.4/Defs/Factions/Ultratech.xml b/1.2/Defs/Factions/Ultratech.xml → 1.4/Defs/Factions/Ultratech.xml
@@ -1,18 +1,34 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<FactionDef>
+	<FactionDef ParentName="FactionBase">
 		<defName>UltratechEnemy_AA</defName>
 		<label>ultratech division</label>
 		<description>One of the divisions of the Ultratech conglomerate, a mysterious and powerful technological empire that spans various solar systems.\n\nThey are one of the few groups of humans that understand the secrets of antimatter production and manipulation, and will jealously guard this secret at all costs.\n\nUltratech considers themselves to be above all regular life forms, and will refuse to interact peacefully.\nUltratech outposts exist to conduct research and development, as well as a reminder of who has the real control of this rimworld.</description>
 		<colorSpectrum>
             <li>(0.878, 0, 0.854)</li>
             <li>(0.454, 0.039, 0.643)</li>
         </colorSpectrum>
-
+
+        <earliestRaidDays>10</earliestRaidDays>
+        <maxConfigurableAtWorldCreation>3</maxConfigurableAtWorldCreation>
         <permanentEnemy>true</permanentEnemy>
         <leaderForceGenerateNewPawn>true</leaderForceGenerateNewPawn>
 
+        <allowedMemes>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Supremacist</li>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Raider</li>
+          </allowedMemes>
+        <requiredMemes>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Supremacist</li>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
+            <li MayRequire="Ludeon.RimWorld.Ideology">Raider</li>
+          </requiredMemes>
+          <structureMemeWeights>
+            <Structure_Ideological MayRequire="Ludeon.RimWorld.Ideology">1</Structure_Ideological>
+          </structureMemeWeights>
+
 		<factionIconPath>AntimatterAnnihilation/UI/FactionBaseIcon</factionIconPath>
 		<pawnsPlural>ultratech members</pawnsPlural>
 		<settlementGenerationWeight>0.8</settlementGenerationWeight>
@@ -37,11 +53,11 @@
                 <commonality>0.70</commonality>
             </li>
         </backstoryFilters>
-        <geneticVariance>0.8</geneticVariance>
-		<hairTags>
+		<!-- <hairTags>
             <li>Punk</li>
             <li>Urban</li>
-        </hairTags>
+        </hairTags> -->
+        <allowedCultures><li>AA_Culture</li></allowedCultures>
 		<canSiege>true</canSiege>
         <allowedArrivalTemperatureRange>-60~60</allowedArrivalTemperatureRange>
 

diff --git a/...Defs/Items/Grenades/AntimatterGrenade.xml → ...Defs/Items/Grenades/AntimatterGrenade.xml b/...Defs/Items/Grenades/AntimatterGrenade.xml → ...Defs/Items/Grenades/AntimatterGrenade.xml
diff --git a/1.2/Defs/Items/Guns/Antimatter Bullet.xml → 1.4/Defs/Items/Guns/Antimatter Bullet.xml b/1.2/Defs/Items/Guns/Antimatter Bullet.xml → 1.4/Defs/Items/Guns/Antimatter Bullet.xml
diff --git a/1.2/Defs/Items/Guns/Antimatter Gun Base.xml → 1.4/Defs/Items/Guns/Antimatter Gun Base.xml b/1.2/Defs/Items/Guns/Antimatter Gun Base.xml → 1.4/Defs/Items/Guns/Antimatter Gun Base.xml
@@ -23,13 +23,13 @@
             <li>UltraGun</li>
         </weaponTags>
         <comps>
-            <li Class="CompProperties_BiocodableWeapon"/>
+            <li Class="CompProperties_Biocodable"/>
         </comps>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
         </thingSetMakerTags>
-
+        <smeltable>false</smeltable>
     </ThingDef>
 
 </Defs>
diff --git a/1.2/Defs/Items/Guns/AntimatterBlaster.xml → 1.4/Defs/Items/Guns/AntimatterBlaster.xml b/1.2/Defs/Items/Guns/AntimatterBlaster.xml → 1.4/Defs/Items/Guns/AntimatterBlaster.xml
diff --git a/.../Items/Guns/AntimatterGrenadeLauncher.xml → .../Items/Guns/AntimatterGrenadeLauncher.xml b/.../Items/Guns/AntimatterGrenadeLauncher.xml → .../Items/Guns/AntimatterGrenadeLauncher.xml
diff --git a/1.2/Defs/Items/Guns/AntimatterRifle.xml → 1.4/Defs/Items/Guns/AntimatterRifle.xml b/1.2/Defs/Items/Guns/AntimatterRifle.xml → 1.4/Defs/Items/Guns/AntimatterRifle.xml
diff --git a/1.2/Defs/Items/Guns/AntimatterSMG.xml → 1.4/Defs/Items/Guns/AntimatterSMG.xml b/1.2/Defs/Items/Guns/AntimatterSMG.xml → 1.4/Defs/Items/Guns/AntimatterSMG.xml
diff --git a/...Defs/Items/Guns/AntimatterSniperRifle.xml → ...Defs/Items/Guns/AntimatterSniperRifle.xml b/...Defs/Items/Guns/AntimatterSniperRifle.xml → ...Defs/Items/Guns/AntimatterSniperRifle.xml
diff --git a/1.2/Defs/Items/Guns/DevastatorLMG.xml → 1.4/Defs/Items/Guns/DevastatorLMG.xml b/1.2/Defs/Items/Guns/DevastatorLMG.xml → 1.4/Defs/Items/Guns/DevastatorLMG.xml
diff --git a/1.2/Defs/Items/Guns/DevastatorSmartGun.xml → 1.4/Defs/Items/Guns/DevastatorSmartGun.xml b/1.2/Defs/Items/Guns/DevastatorSmartGun.xml → 1.4/Defs/Items/Guns/DevastatorSmartGun.xml
diff --git a/...Defs/Items/Guns/DevastatorSniperRifle.xml → ...Defs/Items/Guns/DevastatorSniperRifle.xml b/...Defs/Items/Guns/DevastatorSniperRifle.xml → ...Defs/Items/Guns/DevastatorSniperRifle.xml
diff --git a/...fs/Items/Guns/Light Antimatter Bullet.xml → ...fs/Items/Guns/Light Antimatter Bullet.xml b/...fs/Items/Guns/Light Antimatter Bullet.xml → ...fs/Items/Guns/Light Antimatter Bullet.xml
diff --git a/1.2/Defs/Items/Melee/Galvaknuckles.xml → 1.4/Defs/Items/Melee/Galvaknuckles.xml b/1.2/Defs/Items/Melee/Galvaknuckles.xml → 1.4/Defs/Items/Melee/Galvaknuckles.xml
diff --git a/1.2/Defs/Items/Melee/Karambit.xml → 1.4/Defs/Items/Melee/Karambit.xml b/1.2/Defs/Items/Melee/Karambit.xml → 1.4/Defs/Items/Melee/Karambit.xml
diff --git a/1.2/Defs/Items/Melee/ResonatingBlade.xml → 1.4/Defs/Items/Melee/ResonatingBlade.xml b/1.2/Defs/Items/Melee/ResonatingBlade.xml → 1.4/Defs/Items/Melee/ResonatingBlade.xml
diff --git a/1.2/Defs/Items/Melee/ScissorBlade.xml → 1.4/Defs/Items/Melee/ScissorBlade.xml b/1.2/Defs/Items/Melee/ScissorBlade.xml → 1.4/Defs/Items/Melee/ScissorBlade.xml
diff --git a/1.2/Defs/Items/Melee/SecretSword.xml → 1.4/Defs/Items/Melee/SecretSword.xml b/1.2/Defs/Items/Melee/SecretSword.xml → 1.4/Defs/Items/Melee/SecretSword.xml
diff --git a/...s/Items/Resources/Antimatter Canister.xml → ...s/Items/Resources/Antimatter Canister.xml b/...s/Items/Resources/Antimatter Canister.xml → ...s/Items/Resources/Antimatter Canister.xml
diff --git a/...s/Items/Resources/AntimatterComposite.xml → ...s/Items/Resources/AntimatterComposite.xml b/...s/Items/Resources/AntimatterComposite.xml → ...s/Items/Resources/AntimatterComposite.xml
diff --git a/1.2/Defs/Items/Resources/Hyper Component.xml → 1.4/Defs/Items/Resources/Hyper Component.xml b/1.2/Defs/Items/Resources/Hyper Component.xml → 1.4/Defs/Items/Resources/Hyper Component.xml
diff --git a/1.2/Defs/Items/Resources/HyperAlloy.xml → 1.4/Defs/Items/Resources/HyperAlloy.xml b/1.2/Defs/Items/Resources/HyperAlloy.xml → 1.4/Defs/Items/Resources/HyperAlloy.xml
diff --git a/...ool Capacities/Custom Tool Capacities.xml → ...ool Capacities/Custom Tool Capacities.xml b/...ool Capacities/Custom Tool Capacities.xml → ...ool Capacities/Custom Tool Capacities.xml
diff --git a/1.2/Defs/Motes/MuzzleFlashMote.xml → 1.4/Defs/Motes/MuzzleFlashMote.xml b/1.2/Defs/Motes/MuzzleFlashMote.xml → 1.4/Defs/Motes/MuzzleFlashMote.xml
diff --git a/1.2/Defs/Recipies/AntigrainWarhead.xml → 1.4/Defs/Recipies/AntigrainWarhead.xml b/1.2/Defs/Recipies/AntigrainWarhead.xml → 1.4/Defs/Recipies/AntigrainWarhead.xml
diff --git a/1.2/Defs/Research/AT Fields Research.xml → 1.4/Defs/Research/AT Fields Research.xml b/1.2/Defs/Research/AT Fields Research.xml → 1.4/Defs/Research/AT Fields Research.xml
diff --git a/...esearch/Antimatter Composite Research.xml → ...esearch/Antimatter Composite Research.xml b/...esearch/Antimatter Composite Research.xml → ...esearch/Antimatter Composite Research.xml
diff --git a/...search/Antimatter Explosives Research.xml → ...search/Antimatter Explosives Research.xml b/...search/Antimatter Explosives Research.xml → ...search/Antimatter Explosives Research.xml
diff --git a/...earch/Antimatter Long Ranged Research.xml → ...earch/Antimatter Long Ranged Research.xml b/...earch/Antimatter Long Ranged Research.xml → ...earch/Antimatter Long Ranged Research.xml
diff --git a/...rch/Antimatter Medium Ranged Research.xml → ...rch/Antimatter Medium Ranged Research.xml b/...rch/Antimatter Medium Ranged Research.xml → ...rch/Antimatter Medium Ranged Research.xml
diff --git a/1.2/Defs/Research/Entry Research.xml → 1.4/Defs/Research/Entry Research.xml b/1.2/Defs/Research/Entry Research.xml → 1.4/Defs/Research/Entry Research.xml
diff --git a/1.2/Defs/Research/Hyper Alloy Research.xml → 1.4/Defs/Research/Hyper Alloy Research.xml b/1.2/Defs/Research/Hyper Alloy Research.xml → 1.4/Defs/Research/Hyper Alloy Research.xml
diff --git a/...fs/Research/Hyper Components Research.xml → ...fs/Research/Hyper Components Research.xml b/...fs/Research/Hyper Components Research.xml → ...fs/Research/Hyper Components Research.xml
diff --git a/1.2/Defs/Research/Instant Flick Research.xml → 1.4/Defs/Research/Instant Flick Research.xml b/1.2/Defs/Research/Instant Flick Research.xml → 1.4/Defs/Research/Instant Flick Research.xml
diff --git a/1.2/Defs/Research/MBD Research.xml → 1.4/Defs/Research/MBD Research.xml b/1.2/Defs/Research/MBD Research.xml → 1.4/Defs/Research/MBD Research.xml
diff --git a/1.2/Defs/Research/Megumin Research.xml → 1.4/Defs/Research/Megumin Research.xml b/1.2/Defs/Research/Megumin Research.xml → 1.4/Defs/Research/Megumin Research.xml
diff --git a/...ch/Melee Industrial Advanced Research.xml → ...ch/Melee Industrial Advanced Research.xml b/...ch/Melee Industrial Advanced Research.xml → ...ch/Melee Industrial Advanced Research.xml
diff --git a/...search/Melee Spacer Advanced Research.xml → ...search/Melee Spacer Advanced Research.xml b/...search/Melee Spacer Advanced Research.xml → ...search/Melee Spacer Advanced Research.xml
diff --git a/...search/Particle Accelerators Research.xml → ...search/Particle Accelerators Research.xml b/...search/Particle Accelerators Research.xml → ...search/Particle Accelerators Research.xml
diff --git a/1.2/Defs/Research/Railgun Research.xml → 1.4/Defs/Research/Railgun Research.xml b/1.2/Defs/Research/Railgun Research.xml → 1.4/Defs/Research/Railgun Research.xml
diff --git a/...fs/Research/Reactor Injector Research.xml → ...fs/Research/Reactor Injector Research.xml b/...fs/Research/Reactor Injector Research.xml → ...fs/Research/Reactor Injector Research.xml
diff --git a/1.2/Defs/Research/Reactor Research.xml → 1.4/Defs/Research/Reactor Research.xml b/1.2/Defs/Research/Reactor Research.xml → 1.4/Defs/Research/Reactor Research.xml
diff --git a/1.2/Defs/Research/Tab.xml → 1.4/Defs/Research/Tab.xml b/1.2/Defs/Research/Tab.xml → 1.4/Defs/Research/Tab.xml
diff --git a/1.2/Defs/Research/Thunder Gun Research.xml → 1.4/Defs/Research/Thunder Gun Research.xml b/1.2/Defs/Research/Thunder Gun Research.xml → 1.4/Defs/Research/Thunder Gun Research.xml
diff --git a/1.2/Defs/Research/Turrets Research.xml → 1.4/Defs/Research/Turrets Research.xml b/1.2/Defs/Research/Turrets Research.xml → 1.4/Defs/Research/Turrets Research.xml
diff --git a/1.2/Defs/Research/Void Armor Research.xml → 1.4/Defs/Research/Void Armor Research.xml b/1.2/Defs/Research/Void Armor Research.xml → 1.4/Defs/Research/Void Armor Research.xml