Skip to content

Commit

Permalink
Merge pull request #2163 from skyarkhangel/development
Browse files Browse the repository at this point in the history 
Push dev to master
  • Loading branch information
@skyarkhangel
skyarkhangel authored May 24, 2020
2 parents 8a08384 + 851f46d commit c5f70f3
Show file tree
Hide file tree
Showing 104 changed files with 4,337 additions and 4,091 deletions.
4 changes: 2 additions & 2 deletions Mods/Androids/Defs/ThingDefs/Buildings_AndroidPrinter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<fillPercent>0.5</fillPercent>
<useHitPoints>True</useHitPoints>
<statBases>
<WorkToBuild>13000</WorkToBuild>
<WorkToBuild>6540</WorkToBuild>
<MaxHitPoints>300</MaxHitPoints>
<Flammability>0.1</Flammability>
<Cleanliness>15</Cleanliness>
Expand Down Expand Up @@ -96,4 +96,4 @@
</li>
</modExtensions>
</ThingDef>
</Defs>
</Defs>
4 changes: 2 additions & 2 deletions Mods/Androids/Defs/ThingDefs/Buildings_DroidCrafter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<fillPercent>0.5</fillPercent>
<useHitPoints>True</useHitPoints>
<statBases>
<WorkToBuild>9000</WorkToBuild>
<WorkToBuild>4500</WorkToBuild>
<MaxHitPoints>200</MaxHitPoints>
<Flammability>0.1</Flammability>
<Cleanliness>-2</Cleanliness>
Expand Down Expand Up @@ -91,4 +91,4 @@
</li>
</modExtensions>
</ThingDef>
</Defs>
</Defs>
4 changes: 2 additions & 2 deletions Mods/Androids/Defs/ThingDefs/Buildings_Hibernation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<altitudeLayer>FloorEmplacement</altitudeLayer>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<WorkToBuild>1200</WorkToBuild>
<WorkToBuild>660</WorkToBuild>
<Flammability>1.0</Flammability>
<Beauty>1</Beauty>
<Mass>10</Mass>
Expand Down Expand Up @@ -56,4 +56,4 @@
<designationHotKey>Misc11</designationHotKey>
<constructionSkillPrerequisite>12</constructionSkillPrerequisite>
</ThingDef>
</Defs>
</Defs>
70 changes: 53 additions & 17 deletions Mods/CombatExtended/Defs/HediffDefs/Hediffs_CE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
<hediffClass>HediffWithComps</hediffClass>
<defaultLabelColor>(0.7, 1.0, 0.7)</defaultLabelColor>
<label>venom buildup</label>
<description>Venom building up</description>
<lethalSeverity>1</lethalSeverity>
<makesSickThought>true</makesSickThought>
<scenarioCanAdd>true</scenarioCanAdd>
Expand All @@ -157,60 +158,95 @@
<becomeVisible>false</becomeVisible>
</li>
<li>
<label>minor</label>
<minSeverity>0.04</minSeverity>
<label>initial</label>
<minSeverity>0.05</minSeverity>
<capMods>
<li>
<capacity>Consciousness</capacity>
<offset>-0.1</offset>
<offset>-0.05</offset>
</li>
<li>
<capacity>Breathing</capacity>
<offset>-0.05</offset>
</li>
<li>
<capacity>BloodPumping</capacity>
<offset>-0.05</offset>
</li>
</capMods>
</li>
<li>
<label>moderate</label>
<label>minor</label>
<minSeverity>0.2</minSeverity>
<capMods>
<li>
<capacity>Consciousness</capacity>
<offset>-0.25</offset>
<offset>-0.05</offset>
</li>
<li>
<capacity>Breathing</capacity>
<offset>-0.15</offset>
</li>
<li>
<capacity>BloodPumping</capacity>
<offset>-0.15</offset>
</li>
</capMods>
</li>
<li>
<label>sufficient</label>
<minSeverity>0.40</minSeverity>
<label>moderate</label>
<minSeverity>0.4</minSeverity>
<vomitMtbDays>2</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<offset>-0.5</offset>
<offset>-0.05</offset>
</li>
<li>
<li>
<capacity>Breathing</capacity>
<offset>-0.3</offset>
</li>
<li>
<capacity>BloodPumping</capacity>
<offset>-0.25</offset>
<offset>-0.3</offset>
</li>
</capMods>
</li>
<li>
<label>overdose</label>
<minSeverity>0.70</minSeverity>
<label>serious</label>
<minSeverity>0.6</minSeverity>
<vomitMtbDays>1</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<setMax>0.10</setMax>
<offset>-0.05</offset>
</li>
<li>
<capacity>Breathing</capacity>
<offset>-0.6</offset>
</li>
<li>
<capacity>BloodPumping</capacity>
<offset>-0.75</offset>
<offset>-0.6</offset>
</li>
</capMods>
</li>
<li>
<label>extreme overdose</label>
<minSeverity>1</minSeverity>
<label>extreme</label>
<minSeverity>0.8</minSeverity>
<vomitMtbDays>0.5</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<setMax>0</setMax>
<offset>-0.05</offset>
</li>
<li>
<capacity>Breathing</capacity>
<setMax>0.1</setMax>
</li>
<li>
<capacity>BloodPumping</capacity>
<setMax>0.1</setMax>
</li>
</capMods>
</li>
Expand Down
4 changes: 2 additions & 2 deletions Mods/CombatExtended/Defs/ThingDefs_Buildings/Buildings_Production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<fillPercent>0.5</fillPercent>
<useHitPoints>True</useHitPoints>
<statBases>
<WorkToBuild>3000</WorkToBuild>
<WorkToBuild>1500</WorkToBuild>
<MaxHitPoints>180</MaxHitPoints>
<Flammability>1.0</Flammability>
<Cleanliness>-2</Cleanliness>
Expand Down Expand Up @@ -88,4 +88,4 @@
</placeWorkers>
</ThingDef>

</Defs>
</Defs>
16 changes: 8 additions & 8 deletions Mods/Core/Defs/TerrainDefs/Terrain_Floors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<renderPrecedence>70</renderPrecedence>
<statBases>
<Beauty>-1</Beauty>
<WorkToBuild>100</WorkToBuild>
<WorkToBuild>60</WorkToBuild>
</statBases>
<costList>
<Steel>1</Steel>
Expand All @@ -44,7 +44,7 @@
<description>Concrete tiles. Cheap and quick to move around on, but neutral in terms of looks and slow to build.</description>
<texturePath>Terrain/Surfaces/PavedTile</texturePath>
<statBases>
<WorkToBuild>300</WorkToBuild>
<WorkToBuild>180</WorkToBuild>
</statBases>
<costList>
<Steel>2</Steel>
Expand All @@ -64,7 +64,7 @@
<burnedDef>BurnedWoodPlankFloor</burnedDef>
<color>(108,78,55)</color>
<statBases>
<WorkToBuild>85</WorkToBuild>
<WorkToBuild>60</WorkToBuild>
<Flammability>0.22</Flammability>
</statBases>
<costList>
Expand All @@ -84,7 +84,7 @@
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(0.369, 0.369, 0.369)</color>
<statBases>
<WorkToBuild>800</WorkToBuild>
<WorkToBuild>420</WorkToBuild>
<Beauty>1</Beauty>
<Cleanliness>0.2</Cleanliness>
</statBases>
Expand All @@ -108,7 +108,7 @@
<color>(0.45, 0.45, 0.45)</color>
<statBases>
<Beauty>5</Beauty>
<WorkToBuild>800</WorkToBuild>
<WorkToBuild>420</WorkToBuild>
<Cleanliness>0.2</Cleanliness>
</statBases>
<costList>
Expand All @@ -131,7 +131,7 @@
<color>(0.65, 0.65, 0.35)</color>
<statBases>
<Beauty>12</Beauty>
<WorkToBuild>800</WorkToBuild>
<WorkToBuild>420</WorkToBuild>
<Cleanliness>0.2</Cleanliness>
</statBases>
<costList>
Expand All @@ -153,7 +153,7 @@
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(0.71, 0.71, 0.71)</color>
<statBases>
<WorkToBuild>1600</WorkToBuild>
<WorkToBuild>840</WorkToBuild>
<Cleanliness>0.6</Cleanliness>
</statBases>
<costList>
Expand Down Expand Up @@ -181,7 +181,7 @@
<statBases>
<Beauty>2</Beauty>
<Flammability>0.32</Flammability>
<WorkToBuild>800</WorkToBuild>
<WorkToBuild>420</WorkToBuild>
</statBases>
</TerrainDef>

Expand Down
4 changes: 2 additions & 2 deletions Mods/Core/Defs/TerrainDefs/Terrain_Floors_StoneTile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<description>Carefully-cut and fit stone tiles for a castle feeling. They are pretty to look at, but they take a long time to lay.</description>
<texturePath>Terrain/Surfaces/TileStone</texturePath>
<statBases>
<WorkToBuild>1100</WorkToBuild>
<WorkToBuild>600</WorkToBuild>
<Beauty>1</Beauty>
</statBases>
<designatorDropdown>Floor_Tile</designatorDropdown>
Expand Down Expand Up @@ -67,7 +67,7 @@
<texturePath>Terrain/Surfaces/Flagstone</texturePath>
<resourcesFractionWhenDeconstructed>0</resourcesFractionWhenDeconstructed>
<statBases>
<WorkToBuild>500</WorkToBuild>
<WorkToBuild>300</WorkToBuild>
<Beauty>0</Beauty>
</statBases>
<designatorDropdown>Floor_Flagstone</designatorDropdown>
Expand Down
2 changes: 1 addition & 1 deletion Mods/Core/Defs/TerrainDefs/Terrain_Special.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<edgeType>Hard</edgeType>
<renderPrecedence>400</renderPrecedence>
<statBases>
<WorkToBuild>1500</WorkToBuild>
<WorkToBuild>780</WorkToBuild>
<Flammability>0.8</Flammability>
</statBases>
<costList>
Expand Down
Loading

0 comments on commit c5f70f3

Please sign in to comment.