Skip to content

1.6.1 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
databobek merged 2 commits into from
Sep 13, 2025
Merged

1.6.1 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf19996
many, many fixes
Sep 13, 2025
4cf449d
Vacuum Resistance
Sep 13, 2025
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
1 change: 1 addition & 0 deletions 1.5/Common/Defs/ThingDefs_Items/Tier3/Drugs/Pax.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<li>Carcinoma</li>
<li>Dementia</li>
<li>Alzheimers</li>
<li>OrganDecay</li>
</makeImmuneTo>
</li>
</stages>
Expand Down
1 change: 1 addition & 0 deletions 1.6/Common/Defs/ThingDefs_Items/Tier1/Armor/apparel_armor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
<equippedStatOffsets>
<ToxicEnvironmentResistance>0.6</ToxicEnvironmentResistance><MoveSpeed>-0.3</MoveSpeed>
<SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.3</SlaveSuppressionOffset>
<VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0.35</VacuumResistance>
</equippedStatOffsets>
<thingCategories>
<li>BOR_Armor_I</li>
Expand Down
3 changes: 2 additions & 1 deletion 1.6/Common/Defs/ThingDefs_Items/Tier1/Armor/apparel_headgear.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
<equippedStatOffsets>
<ToxicEnvironmentResistance>0.6</ToxicEnvironmentResistance>
<SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.1</SlaveSuppressionOffset>
</equippedStatOffsets>
<VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0.65</VacuumResistance>
</equippedStatOffsets>
<costList>
<ComponentSpacer>1</ComponentSpacer>
<BOR_Sunsteel>40</BOR_Sunsteel>
Expand Down
9 changes: 9 additions & 0 deletions 1.6/Common/Defs/ThingDefs_Items/Tier1/Drugs/Sunlite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,14 @@
</li>
</stages>
</ThoughtDef>
<NeedDef ParentName="DrugAddictionNeedBase">
<defName>BOR_Chemical_Sunweave</defName>
<needClass>Need_Chemical</needClass>
<label>sunlite</label>
<description>Because of a sunweave chemical addiction, this person needs to regularly consume the drug to avoid withdrawal symptoms.</description>
<fallPerDay>0.2775</fallPerDay>
<listPriority>45</listPriority>
</NeedDef>
<!-- Sunweave-based Chemicals addiction -->
<ChemicalDef>
<defName>BOR_Chemical_Sunweave</defName>
Expand Down Expand Up @@ -200,6 +208,7 @@
<label>sunweave-based chemicals addiction</label>
<description>A chemical addiction to Sunweavium . Long-term presence of Sunweave-based Chemicals has caused neurological adaptations at the cellular level, so the brain can no longer function properly without the drug. \nWithout regular doses of Sunweave-based Chemicals from drugs like flake or yayo, withdrawal symptoms will begin. However, extended abstinence will force the brain to adapt back to its normal state, resolving the addiction.</description>
<hediffClass>Hediff_Addiction</hediffClass>
<chemicalNeed>BOR_Chemical_Sunweave</chemicalNeed>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.04995</severityPerDay>
Expand Down
1 change: 1 addition & 0 deletions 1.6/Common/Defs/ThingDefs_Items/Tier1/Drugs/Trot.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
<label>sunsteel chemical addiction</label>
<description>A chemical addiction to sunsteel-derived drugs. Long-term presence of trot has caused neurological adaptations at the cellular level, so the brain can no longer function properly without the drug. \nWithout regular doses of trot, withdrawal symptoms will begin. However, extended abstinence will force the brain to adapt back to its normal state, resolving the addiction.</description>
<hediffClass>Hediff_Addiction</hediffClass>
<chemicalNeed>BOR_Sunsteel_Chemical</chemicalNeed>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.0675</severityPerDay>
Expand Down
1 change: 1 addition & 0 deletions 1.6/Common/Defs/ThingDefs_Items/Tier1/Resources/sunsteel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<appearance>Metal</appearance>
<commonality>0.04</commonality>
<constructEffect>ConstructMetal</constructEffect>
<isAirtight>true</isAirtight>
<color>(182, 209, 209)</color>
<soundImpactBullet>BulletImpact_Metal</soundImpactBullet>
<soundMeleeHitSharp>MeleeHit_Metal_Sharp</soundMeleeHitSharp>
Expand Down
3 changes: 2 additions & 1 deletion 1.6/Common/Defs/ThingDefs_Items/Tier2/Armor/apparel_armor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance><MoveSpeed>-0.06</MoveSpeed>
</equippedStatOffsets>
<VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0.35</VacuumResistance>
</equippedStatOffsets>
<thingCategories>
<li>BOR_Armor_II</li>
</thingCategories>
Expand Down
26 changes: 15 additions & 11 deletions 1.6/Common/Defs/ThingDefs_Items/Tier2/Armor/apparel_headgear.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<li>HiTechArmor</li>
<li>BOR_HiTechArmor_II</li>
<li>BOR_Armor_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<generateCommonality>1.25</generateCommonality>
<statBases>
Expand All @@ -41,17 +41,20 @@
<Insulation_Cold>9</Insulation_Cold>
<Insulation_Heat>4.5</Insulation_Heat>
<EquipDelay>4</EquipDelay>

<RoyalFavorValue>3</RoyalFavorValue></statBases>

<RoyalFavorValue>3</RoyalFavorValue>
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance><SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.1</SlaveSuppressionOffset>
<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
<SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.1</SlaveSuppressionOffset>
<VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0.65</VacuumResistance>
</equippedStatOffsets>
<costList>
<BOR_ComponentII>1</BOR_ComponentII>
<BOR_QuasarAlloy>40</BOR_QuasarAlloy>
</costList>
<apparel>
<immuneToToxGasExposure>true</immuneToToxGasExposure>
<immuneToToxGasExposure>true</immuneToToxGasExposure>
<bodyPartGroups>
<li>FullHead</li>
</bodyPartGroups>
Expand Down Expand Up @@ -91,7 +94,7 @@
</apparel>
<tradeTags>
<li>BOR_Armor_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<recipeMaker>
<displayPriority>100</displayPriority>
Expand Down Expand Up @@ -121,7 +124,7 @@
</graphicData>
<tradeTags>
<li>HiTechArmor</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<generateCommonality>1.0</generateCommonality>
<statBases>
Expand All @@ -135,14 +138,15 @@
<Insulation_Cold>6</Insulation_Cold>
<Insulation_Heat>3</Insulation_Heat>
<EquipDelay>2</EquipDelay>

<RoyalFavorValue>3</RoyalFavorValue></statBases>

<RoyalFavorValue>3</RoyalFavorValue>
</statBases>
<costList>
<BOR_ComponentII>1</BOR_ComponentII>
<BOR_QuasarAlloy>30</BOR_QuasarAlloy>
</costList>
<apparel>
<immuneToToxGasExposure>true</immuneToToxGasExposure>
<immuneToToxGasExposure>true</immuneToToxGasExposure>
<bodyPartGroups>
<li>FullHead</li>
</bodyPartGroups>
Expand Down Expand Up @@ -179,7 +183,7 @@
</apparel>
<tradeTags>
<li>BOR_Armor_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<recipeMaker>
<displayPriority>110</displayPriority>
Expand Down
8 changes: 5 additions & 3 deletions 1.6/Common/Defs/ThingDefs_Items/Tier2/Drugs/Castra.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<possessionCount>3</possessionCount>
<tradeTags Inherit="False">
<li>BOR_Drugs_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<thingCategories>
<li>BOR_Drugs_II</li>
Expand All @@ -27,8 +27,9 @@
<MarketValue>40</MarketValue>
<Mass>0.00034</Mass>
<Flammability>0.485</Flammability>

<RoyalFavorValue>0.1</RoyalFavorValue></statBases>

<RoyalFavorValue>0.1</RoyalFavorValue>
</statBases>
<techLevel>Ultra</techLevel>
<ingestible>
<drugCategory>Medical</drugCategory>
Expand Down Expand Up @@ -89,6 +90,7 @@
<li>ToxicBuildup</li>
<li>WoundInfection</li>
<li>Carcinoma</li>
<li>OrganDecay</li>
</makeImmuneTo>
</li>
</stages>
Expand Down
37 changes: 20 additions & 17 deletions 1.6/Common/Defs/ThingDefs_Items/Tier2/Resources/quasaralloy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
<StuffPower_Insulation_Heat>0.00</StuffPower_Insulation_Heat>
<SharpDamageMultiplier>2.48</SharpDamageMultiplier>
<BluntDamageMultiplier>2.02</BluntDamageMultiplier>

<RoyalFavorValue>0.0025</RoyalFavorValue></statBases>

<RoyalFavorValue>0.0025</RoyalFavorValue>
</statBases>
<thingCategories>
<li>BOR_Materials</li>
</thingCategories>
Expand All @@ -37,6 +38,7 @@
<appearance>Metal</appearance>
<commonality>0.04</commonality>
<constructEffect>ConstructMetal</constructEffect>
<isAirtight>true</isAirtight>
<color>(161, 163, 145)</color>
<soundImpactBullet>BulletImpact_Metal</soundImpactBullet>
<soundMeleeHitSharp>MeleeHit_Metal_Sharp</soundMeleeHitSharp>
Expand All @@ -49,25 +51,25 @@
<WorkToBuild>4.95</WorkToBuild>
<MeleeWeapon_CooldownMultiplier>0.56</MeleeWeapon_CooldownMultiplier>
<!-- my ass based -->
<WorkTableWorkSpeedFactor>2.25</WorkTableWorkSpeedFactor>
<Comfort>2.25</Comfort>
<BedRestEffectiveness>2.25</BedRestEffectiveness>
<ImmunityGainSpeedFactor>2.25</ImmunityGainSpeedFactor>
<ResearchSpeedFactor>2.25</ResearchSpeedFactor>
<DoorOpenSpeed>2.25</DoorOpenSpeed>
<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
<ArmorRating_Heat>1.95</ArmorRating_Heat>
<Insulation_Cold>8</Insulation_Cold>
<Insulation_Heat>8</Insulation_Heat>
<WorkTableWorkSpeedFactor>2.25</WorkTableWorkSpeedFactor>
<Comfort>2.25</Comfort>
<BedRestEffectiveness>2.25</BedRestEffectiveness>
<ImmunityGainSpeedFactor>2.25</ImmunityGainSpeedFactor>
<ResearchSpeedFactor>2.25</ResearchSpeedFactor>
<DoorOpenSpeed>2.25</DoorOpenSpeed>
<ArmorRating_Blunt>1.65</ArmorRating_Blunt>
<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
<ArmorRating_Heat>1.95</ArmorRating_Heat>
<Insulation_Cold>8</Insulation_Cold>
<Insulation_Heat>8</Insulation_Heat>
</statFactors>
</stuffProps>
<terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
<allowedArchonexusCount>65</allowedArchonexusCount>
<tradeTags>
<li>ExoticMisc</li>
<li>BOR_Materials_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
</ThingDef>

Expand All @@ -90,16 +92,17 @@
<Mass>0.5</Mass>
<Flammability>0.5</Flammability>
<DeteriorationRate>1.666</DeteriorationRate>

<RoyalFavorValue>0.0025</RoyalFavorValue></statBases>

<RoyalFavorValue>0.0025</RoyalFavorValue>
</statBases>
<intricate>true</intricate>
<thingCategories>
<li>BOR_Complex</li>
</thingCategories>
<tradeTags>
<li>ExoticMisc</li>
<li>BOR_Complex_II</li>
<li>BOR_Tech_II</li>
<li>BOR_Tech_II</li>
</tradeTags>
<thingSetMakerTags>
<li>RewardStandardCore</li>
Expand Down
48 changes: 29 additions & 19 deletions 1.6/Common/Defs/ThingDefs_Items/Tier3/Armor/apparel_armor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@
<ArmorRating_Heat>0.945</ArmorRating_Heat>
<Insulation_Cold>4.5</Insulation_Cold>
<EquipDelay>3</EquipDelay>

<RoyalFavorValue>6</RoyalFavorValue></statBases>

<RoyalFavorValue>6</RoyalFavorValue>
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance><MoveSpeed>-0.04</MoveSpeed>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
<MoveSpeed>-0.04</MoveSpeed>
<VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">0.35</VacuumResistance>
</equippedStatOffsets>
<thingCategories>
<li>BOR_Armor_III</li>
Expand Down Expand Up @@ -70,7 +73,7 @@
</apparel>
<tradeTags>
<li>BOR_Armor_III</li>
<li>BOR_Tech_III</li>
<li>BOR_Tech_III</li>
</tradeTags>
</ThingDef>

Expand Down Expand Up @@ -112,10 +115,12 @@
<Insulation_Cold>7.87</Insulation_Cold>
<Insulation_Heat>2.25</Insulation_Heat>
<EquipDelay>3</EquipDelay>

<RoyalFavorValue>6</RoyalFavorValue></statBases>

<RoyalFavorValue>6</RoyalFavorValue>
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance><MoveSpeed>-0.06</MoveSpeed>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
<MoveSpeed>-0.06</MoveSpeed>
</equippedStatOffsets>
<thingCategories>
<li>BOR_Armor_III</li>
Expand Down Expand Up @@ -143,7 +148,7 @@
<tradeTags>
<li>BOR_Clothing_III</li>
<li>BOR_Armor_III</li>
<li>BOR_Tech_III</li>
<li>BOR_Tech_III</li>
</tradeTags>
</ThingDef>

Expand Down Expand Up @@ -193,10 +198,12 @@
<Insulation_Cold>45</Insulation_Cold>
<Insulation_Heat>10</Insulation_Heat>
<EquipDelay>2</EquipDelay>

<RoyalFavorValue>6</RoyalFavorValue></statBases>

<RoyalFavorValue>6</RoyalFavorValue>
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance><MoveSpeed>-0.04</MoveSpeed>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
<MoveSpeed>-0.04</MoveSpeed>
</equippedStatOffsets>
<apparel>
<bodyPartGroups>
Expand All @@ -219,7 +226,7 @@
<tradeTags>
<li>BOR_Clothing_III</li>
<li>BOR_Armor_III</li>
<li>BOR_Tech_III</li>
<li>BOR_Tech_III</li>
</tradeTags>
</ThingDef>

Expand Down Expand Up @@ -256,18 +263,20 @@
<Insulation_Cold>115.5</Insulation_Cold>
<Insulation_Heat>33.75</Insulation_Heat>
<EquipDelay>8</EquipDelay>

<RoyalFavorValue>6</RoyalFavorValue></statBases>

<RoyalFavorValue>6</RoyalFavorValue>
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance><MoveSpeed>-0.1</MoveSpeed>
<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
<MoveSpeed>-0.1</MoveSpeed>
<SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.3</SlaveSuppressionOffset>
</equippedStatOffsets>
<thingCategories>
<li>BOR_Armor_III</li>
</thingCategories>
<tradeTags>
<li>BOR_HiTechArmor_III</li>
<li>BOR_Tech_III</li>
<li>BOR_Tech_III</li>
</tradeTags>
<costList>
<BOR_ComponentIII>4</BOR_ComponentIII>
Expand Down Expand Up @@ -341,7 +350,7 @@
<tradeTags>
<li>BOR_HiTechArmor_III</li>
<li>BOR_Armor_III</li>
<li>BOR_Tech_III</li>
<li>BOR_Tech_III</li>
</tradeTags>
<statBases>
<WorkToMake>151875</WorkToMake>
Expand All @@ -354,8 +363,9 @@
<Insulation_Cold>96</Insulation_Cold>
<Insulation_Heat>30.5</Insulation_Heat>
<EquipDelay>6</EquipDelay>

<RoyalFavorValue>6</RoyalFavorValue></statBases>

<RoyalFavorValue>6</RoyalFavorValue>
</statBases>
<thingCategories>
<li>BOR_Armor_III</li>
</thingCategories>
Expand Down
Loading