Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/development' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
@masakitenchi
masakitenchi committed Jul 27, 2024
2 parents 384d2bb + 8a5c160 commit 8fea2a1
Show file tree
Hide file tree
Showing 25 changed files with 403 additions and 148 deletions.
120 changes: 0 additions & 120 deletions Config/Mod_Performance Fish_PerformanceFishMod.xml
View file

This file was deleted.

Binary file modified Mods/Core_SK/Assemblies/Core_SK.dll
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1583,11 +1583,16 @@
<defNames>
<li>CopperTile</li>
<li>TinTile</li>
<li>AluminiumTile</li>
<li>CupronickelTile</li>
<li>SteinTile</li>
<li>SilverTile</li>
<li>GoldTile</li>
<li>GoldSolid</li>
<!-- <li>FloorAmber</li>
<li>FloorJade</li>-->
<li>TitaniumTile</li>
<li>BetaPolyTile</li>
</defNames>
<designationCategory>OutsideFloors</designationCategory>
<debug>false</debug>
Expand Down
4 changes: 2 additions & 2 deletions Mods/Core_SK/Defs/Drugs/Drugs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<li>
<minSeverity>0.1</minSeverity>
<label>feeling better</label>
<painFactor>0.3</painFactor>
<painFactor>0.35</painFactor>
<capMods>
<li>
<capacity>Consciousness</capacity>
Expand Down Expand Up @@ -170,7 +170,7 @@
<li>
<minSeverity>0.01</minSeverity>
<label>Berserk herb high</label>
<painFactor>0.67</painFactor>
<painFactor>0.72</painFactor>
<statOffsets>
<Suppressability>-0.25</Suppressability>
</statOffsets>
Expand Down
12 changes: 6 additions & 6 deletions Mods/Core_SK/Defs/HediffDefs/HediffDefs_ResistPain.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<description>Don't know what pain is</description>
<stages>
<li>
<painFactor>0.1</painFactor>
<painFactor>0.15</painFactor>
</li>
</stages>
</HediffDef>
Expand All @@ -35,7 +35,7 @@
<description>Can only go forward.</description>
<stages>
<li>
<painFactor>0.25</painFactor>
<painFactor>0.3</painFactor>
</li>
</stages>
</HediffDef>
Expand All @@ -46,7 +46,7 @@
<description>Don't stand in his way</description>
<stages>
<li>
<painFactor>0.4</painFactor>
<painFactor>0.45</painFactor>
</li>
</stages>
</HediffDef>
Expand All @@ -57,7 +57,7 @@
<description>Real berserker</description>
<stages>
<li>
<painFactor>0.75</painFactor>
<painFactor>0.8</painFactor>
</li>
</stages>
</HediffDef>
Expand All @@ -68,7 +68,7 @@
<description>It's hard to break this skin</description>
<stages>
<li>
<painFactor>0.6</painFactor>
<painFactor>0.65</painFactor>
</li>
</stages>
</HediffDef>
Expand All @@ -79,7 +79,7 @@
<description>This skin softens any bumps.</description>
<stages>
<li>
<painFactor>0.7</painFactor>
<painFactor>0.75</painFactor>
</li>
</stages>
</HediffDef>
Expand Down
41 changes: 41 additions & 0 deletions Mods/Core_SK/Defs/RecipeDefs/Recipes_Production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,47 @@
<workSkillLearnFactor>0.8</workSkillLearnFactor>
<researchPrerequisite>Metals_C1</researchPrerequisite>
</RecipeDef>


<RecipeDef>
<defName>MakeSilicon_Set</defName>
<label>extract silicon (x20)</label>
<description>Melts down sand to extract the silicon from it. Quite fast. Produces 20.</description>
<jobString>Extracting silicon from sand.</jobString>
<workAmount>1800</workAmount>
<workSpeedStat>SmeltingSpeed</workSpeedStat>
<effectWorking>Smelt</effectWorking>
<soundWorking>Recipe_Smelt</soundWorking>
<recipeUsers>
<li>EAF</li>
</recipeUsers>
<targetCountAdjustment>1</targetCountAdjustment>
<ingredients>
<li>
<filter>
<thingDefs>
<li>SandResource</li>
</thingDefs>
</filter>
<count>200</count>
</li>
</ingredients>
<products>
<Silicon>20</Silicon>
</products>
<fixedIngredientFilter>
<thingDefs>
<li>SandResource</li>
</thingDefs>
</fixedIngredientFilter>
<skillRequirements>
<Crafting>5</Crafting>
</skillRequirements>
<workSkill>Crafting</workSkill>
<workSkillLearnFactor>0.8</workSkillLearnFactor>
<researchPrerequisite>Metals_C1</researchPrerequisite>
</RecipeDef>


<RecipeDef>
<defName>make_dirt</defName>
Expand Down
122 changes: 122 additions & 0 deletions Mods/Core_SK/Defs/TerrainDefs/Terrain_FloorMetallic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,128 @@
</researchPrerequisites>
</TerrainDef>

<!-- ============ Aluminium Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
<defName>AluminiumTile</defName>
<label>simple aluminium tile</label>
<renderPrecedence>240</renderPrecedence>
<description>Simple aluminium square tiles.</description>
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(190,205,190)</color>
<statBases>
<WorkToBuild>816</WorkToBuild>
<Beauty>3</Beauty>
<Cleanliness>0.3</Cleanliness>
<CleaningTimeFactor>0.55</CleaningTimeFactor>
<FilthMultiplier>0.9</FilthMultiplier>
</statBases>
<costList>
<AluminiumBar>4</AluminiumBar>
</costList>
<researchPrerequisites>
<li>Metal_floor_C1</li>
</researchPrerequisites>
<terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
</TerrainDef>

<!-- ============ Cupronickel (melchior) Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
<defName>CupronickelTile</defName>
<label>simple melchior tile</label>
<renderPrecedence>240</renderPrecedence>
<description>Simple melchior square tiles.</description>
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(168,157,125)</color>
<statBases>
<WorkToBuild>2040</WorkToBuild>
<Beauty>4</Beauty>
<Cleanliness>0.3</Cleanliness>
<CleaningTimeFactor>0.55</CleaningTimeFactor>
<FilthMultiplier>0.9</FilthMultiplier>
</statBases>
<costList>
<CupronickelAlloy>4</CupronickelAlloy>
</costList>
<researchPrerequisites>
<li>Metal_floor_C1</li>
</researchPrerequisites>
</TerrainDef>

<!-- ============ Stein Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
<defName>SteinTile</defName>
<label>simple stein tile</label>
<renderPrecedence>240</renderPrecedence>
<description>Simple stein square tiles.</description>
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(130,157,141)</color>
<statBases>
<WorkToBuild>3060</WorkToBuild>
<Beauty>5</Beauty>
<Cleanliness>0.3</Cleanliness>
<CleaningTimeFactor>0.55</CleaningTimeFactor>
<FilthMultiplier>0.9</FilthMultiplier>
</statBases>
<costList>
<SteelBar>4</SteelBar>
</costList>
<researchPrerequisites>
<li>Metal_floor_C1</li>
</researchPrerequisites>
</TerrainDef>

<!-- ============ Titanium Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
<defName>TitaniumTile</defName>
<label>simple titanium tile</label>
<renderPrecedence>240</renderPrecedence>
<description>Simple titanium square tiles.</description>
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(160,178,181)</color>
<statBases>
<WorkToBuild>4080</WorkToBuild>
<Beauty>8</Beauty>
<Cleanliness>0.4</Cleanliness>
<CleaningTimeFactor>0.5</CleaningTimeFactor>
<FilthMultiplier>0.8</FilthMultiplier>
</statBases>
<costList>
<Titanium>4</Titanium>
</costList>
<researchPrerequisites>
<li>Metal_floor_D1</li>
</researchPrerequisites>
</TerrainDef>

<!-- ============ Beta Poly Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
<defName>BetaPolyTile</defName>
<label>simple beta poly tile</label>
<renderPrecedence>240</renderPrecedence>
<description>Simple beta poly square tiles.</description>
<texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
<color>(100,60,60)</color>
<statBases>
<WorkToBuild>5090</WorkToBuild>
<Beauty>11</Beauty>
<Cleanliness>0.55</Cleanliness>
<CleaningTimeFactor>0.4</CleaningTimeFactor>
<FilthMultiplier>0.6</FilthMultiplier>
</statBases>
<costList>
<BetaPoly>4</BetaPoly>
</costList>
<researchPrerequisites>
<li>Metal_floor_D1</li>
</researchPrerequisites>
<terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
</TerrainDef>

<!-- ============ Gold Tile ============ -->

<TerrainDef ParentName="MetalTileBase">
Expand Down
4 changes: 2 additions & 2 deletions ...Languages/Russian/DefInjected/ArchitectSense.DesignationSubCategoryDefs/SubCategories.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@
<SubCategory_MetalTiles.label>металл</SubCategory_MetalTiles.label>
<SubCategory_MetalTiles.description>Металлические поверхности.\n\nПривлекательность: 3</SubCategory_MetalTiles.description>

<SubCategory_PlateMetalTiles.label>металлическая плитка</SubCategory_PlateMetalTiles.label>
<SubCategory_PlateMetalTiles.description>Металлическая плитка.\n\nПривлекательность: 2</SubCategory_PlateMetalTiles.description>
<SubCategory_PlateMetalTiles.label>металлические пластины</SubCategory_PlateMetalTiles.label>
<SubCategory_PlateMetalTiles.description>Металлические пластины.\n\nПривлекательность: 2</SubCategory_PlateMetalTiles.description>

<SubCategory_PreciousMetalTiles.label>металлические плиты</SubCategory_PreciousMetalTiles.label>
<SubCategory_PreciousMetalTiles.description>Металлические плиты.\n\nПривлекательность: 3-10</SubCategory_PreciousMetalTiles.description>
Expand Down
Loading

0 comments on commit 8fea2a1

Please sign in to comment.