Merge pull request #3931 from AndreiAvinov/development

Early game misc changes

Mods/Core_SK/Defs/ScenarioDefs/Scenarios_A_Classic.xml

@@ -54,7 +54,8 @@
 				</li>
 				<li Class="ScenPart_StartingThing_Defined">
 					<def>StartingThing_Defined</def>
-					<thingDef>Gun_BoltActionRifle</thingDef>
+					<thingDef>RF_Gun_VektorCP</thingDef>
+					<count>2</count>
 				</li>
 				<li Class="ScenPart_StartingThing_Defined">
 					<def>StartingThing_Defined</def>
@@ -66,24 +67,15 @@
 					<thingDef>DeployableTentMedium</thingDef>
 					<stuff>Cloth</stuff>
 				</li>
-				<li Class="ScenPart_StartingThing_Defined">
-					<def>StartingThing_Defined</def>
-					<thingDef>Gun_Revolver</thingDef>
-				</li>
 				<li Class="ScenPart_StartingThing_Defined">
 					<def>StartingThing_Defined</def>
 					<thingDef>MeleeWeapon_Knife</thingDef>
 					<stuff>Plasteel</stuff>
 				</li>
 				<li Class="ScenPart_StartingThing_Defined">
 					<def>StartingThing_Defined</def>
-					<thingDef>Ammo_45ACP_FMJ</thingDef>
-					<count>150</count>
-				</li>
-				<li Class="ScenPart_StartingThing_Defined">
-					<def>StartingThing_Defined</def>
-					<thingDef>Ammo_303British_FMJ</thingDef>
-					<count>200</count>
+					<thingDef>Ammo_9x19mmPara_FMJ</thingDef>
+					<count>400</count>
 				</li>
 
 				<li Class="ScenPart_StartingAnimal">
@@ -107,19 +99,6 @@
 					<count>11</count>
 					<allowRoofed>false</allowRoofed>
 				</li>
-				<li Class="ScenPart_ScatterThingsAnywhere">
-					<def>ScatterThingsAnywhere</def>
-					<visible>false</visible>
-					<thingDef>WoodPlank</thingDef>
-					<count>20</count>
-				</li>
-				<li Class="ScenPart_ScatterThingsAnywhere">
-					<def>ScatterThingsAnywhere</def>
-					<visible>false</visible>
-					<thingDef>BlocksSandstone</thingDef>
-					<count>30</count>
-				</li>
-
 				<!-- Game start dialog -->
 				<li Class="ScenPart_GameStartDialog">
 					<def>GameStartDialog</def>

Mods/Core_SK/Defs/ThingDefs_Buildings/Buildings_Production.xml

@@ -190,7 +190,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>60</costStuffCount>
+		<costStuffCount>40</costStuffCount>
 		<costList>
 			<ComponentMedieval>8</ComponentMedieval>
 		</costList>
@@ -444,7 +444,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>170</costStuffCount>
+		<costStuffCount>120</costStuffCount>
 		<costList>
 			<ComponentMedieval>5</ComponentMedieval>
 		</costList>
@@ -1078,7 +1078,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>120</costStuffCount>
+		<costStuffCount>80</costStuffCount>
 		<costList>
 			<WoodLog>50</WoodLog>
 		</costList>
@@ -1946,7 +1946,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>230</costStuffCount>
+		<costStuffCount>180</costStuffCount>
 		<statBases>
 			<WorkToBuild>3000</WorkToBuild>
 			<MaxHitPoints>270</MaxHitPoints>
@@ -2141,7 +2141,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>110</costStuffCount>
+		<costStuffCount>80</costStuffCount>
 		<minifiedDef>MinifiedThing</minifiedDef>
 		<thingCategories>
 			<li>BuildingsProduction</li>
@@ -2768,7 +2768,7 @@
 			<li>Bricks</li>
 			<li>WoodLogs</li>
 		</stuffCategories>
-		<costStuffCount>160</costStuffCount>
+		<costStuffCount>60</costStuffCount>
 		<minifiedDef>MinifiedThing</minifiedDef>
 		<thingCategories>
 			<li>BuildingsProduction</li>
@@ -3099,7 +3099,7 @@
 			<li>Stony</li>
 			<li>Bricks</li>
 		</stuffCategories>
-		<costStuffCount>120</costStuffCount>
+		<costStuffCount>80</costStuffCount>
 		<size>(3,1)</size>
 		<designationCategory>Production</designationCategory>
 		<passability>Standable</passability>
@@ -3383,7 +3383,7 @@
 			<li>Bricks</li>
 			<li>Woody</li>
 		</stuffCategories>
-		<costStuffCount>130</costStuffCount>
+		<costStuffCount>80</costStuffCount>
 		<minifiedDef>MinifiedThing</minifiedDef>
 		<thingCategories>
 			<li>BuildingsProduction</li>

Mods/Core_SK/Defs/ThingDefs_Buildings/Buildings_Tent.xml

@@ -108,7 +108,7 @@
 		<tickerType>Never</tickerType>
 		<rotatable>false</rotatable>
 		<neverMultiSelect>true</neverMultiSelect>
-		<terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+		<terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
 		<holdsRoof>true</holdsRoof>
 		<!-- <menuHidden>True</menuHidden> -->
 		<staticSunShadowHeight>1.0</staticSunShadowHeight>

Mods/Core_SK/Defs/ThingDefs_Items/Items_Tools.xml

@@ -519,4 +519,84 @@
 		</modExtensions>
 	</ThingDef>
 
+	<ThingDef ParentName="BaseTool">
+		<defName>TFJ_Tool_Paxe</defName>
+		<label>Paxe</label>
+		<description>A joke that somehow made it into reality. Can cut trees, mine stones and even has a flat side to be used as a hammer.</description>
+		<graphicData>
+			<texPath>Things/Item/Equipment/WeaponMelee/Paxe</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<techLevel>Medieval</techLevel>
+		<statBases>
+			<WorkToMake>9000</WorkToMake>
+			<Mass>3.5</Mass>
+			<Bulk>6</Bulk>
+		</statBases>
+		<equippedAngleOffset>25</equippedAngleOffset>
+		<weaponTags>
+			<li>Handaxe</li>
+			<li>Pickaxe</li>
+		</weaponTags>
+		<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>4</power>
+				<cooldownTime>2</cooldownTime>
+				<chanceFactor>0.33</chanceFactor>
+				<armorPenetrationBlunt>3</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>edge</label>
+				<capacities>
+					<li>Cut</li>
+				</capacities>
+				<power>16</power>
+				<cooldownTime>2.8</cooldownTime>
+				<chanceFactor>1.33</chanceFactor>
+				<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				<armorPenetrationSharp>2</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+			</li>
+			<li Class="CombatExtended.ToolCE">
+				<label>head</label>
+				<capacities>
+					<li>Stab</li>
+				</capacities>
+				<power>14</power>
+				<cooldownTime>3.2</cooldownTime>
+				<chanceFactor>1.33</chanceFactor>
+				<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				<armorPenetrationSharp>4</armorPenetrationSharp>
+				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+			</li>
+		</tools>
+		<equippedStatOffsets>
+			<PlantWorkSpeed>0.2</PlantWorkSpeed>
+			<PruningSpeed MayRequire="ludeon.rimworld.ideology">0.2</PruningSpeed>
+			<MiningSpeed>0.2</MiningSpeed>
+		</equippedStatOffsets>
+		<thingCategories>
+			<li>SurvivalToolsNeolithic</li>
+		</thingCategories>
+		<recipeMaker>
+			<recipeUsers>
+				<li>CraftingSpot</li>
+				<li>ElectricSmithy</li>
+				<li>FueledSmithy</li>
+			</recipeUsers>
+			<researchPrerequisite>Craft_0</researchPrerequisite>
+		</recipeMaker>
+		<stuffCategories>
+			<li>Woody</li>
+			<li>Stony</li>
+			<li>RuggedMetallic</li>
+		</stuffCategories>
+		<costStuffCount>50</costStuffCount>
+	</ThingDef>
+
 </Defs>

Mods/Core_SK/Defs/ThingDefs_Weapons/Weapons_Pistols.xml

@@ -145,7 +145,7 @@
 		</graphicData>
 		<soundInteract>Interact_Revolver</soundInteract>
 		<statBases>
-			<MarketValue>630</MarketValue>
+			<MarketValue>430</MarketValue>
 			<SightsEfficiency>0.9</SightsEfficiency>
 			<ShotSpread>0.15</ShotSpread>
 			<SwayFactor>1.2</SwayFactor>
@@ -285,7 +285,7 @@
 			<li>Pistols</li>
 		</thingCategories>
 		<statBases>
-			<MarketValue>460</MarketValue>
+			<MarketValue>360</MarketValue>
 			<SightsEfficiency>0.9</SightsEfficiency>
 			<ShotSpread>0.15</ShotSpread>
 			<SwayFactor>1.2</SwayFactor>

Mods/Core_SK/Languages/Russian/DefInjected/StuffCategoryDef/StuffCategories.xml

@@ -2,41 +2,60 @@
 <LanguageData>
 
 	<Matty.label>матовое</Matty.label>
+	<Matty.noun>матовое</Matty.noun>
 
 	<Precious.label>драгоценное</Precious.label>
+	<Precious.noun>драгоценное</Precious.noun>
 
 	<RareMetallic.label>редкий металл</RareMetallic.label>
+	<RareMetallic.noun>редкий металл</RareMetallic.noun>
 
 	<SolidMetallic.label>твёрдый металл</SolidMetallic.label>
+	<SolidMetallic.noun>твёрдый металл</SolidMetallic.noun>
 
 	<StrongMetallic.label>крепкий металл</StrongMetallic.label>
+	<StrongMetallic.noun>крепкий металл</StrongMetallic.noun>
 
 	<RuggedMetallic.label>прочный металл</RuggedMetallic.label>
+	<RuggedMetallic.noun>прочный металл</RuggedMetallic.noun>
 
 	<Bricks.label>кирпичное</Bricks.label>
+	<Bricks.noun>кирпичное</Bricks.noun>
 
 	<HF.label>высокотехнологичная ткань</HF.label>
+	<HF.noun>высокотехнологичная ткань</HF.noun>
 
 	<Plastic.label>пластиковое</Plastic.label>
+	<Plastic.noun>пластиковое</Plastic.noun>
 
 	<Ceramic.label>керамическое</Ceramic.label>
+	<Ceramic.noun>керамическое</Ceramic.noun>
 
 	<Glass.label>стеклянное</Glass.label>
+	<Glass.noun>стеклянное</Glass.noun>
 
 	<Parts.label>части</Parts.label>
+	<Parts.noun>части</Parts.noun>
 
-	<WoodLogs.label>деревянные брёвна</WoodLogs.label>
+	<WoodLogs.label>брёвна</WoodLogs.label>
+	<WoodLogs.noun>брёвна</WoodLogs.noun>
 
 	<Kindlingstuff.label>горючее</Kindlingstuff.label>
+	<Kindlingstuff.noun>горючее</Kindlingstuff.noun>
 
 	<Foods.label>еда</Foods.label>
+	<Foods.noun>еда</Foods.noun>
 
 	<Stuff.label>материал</Stuff.label>
+	<Stuff.noun>материал</Stuff.noun>
 
 	<Chemical.label>химическое</Chemical.label>
+	<Chemical.noun>химическое</Chemical.noun>
 
 	<Hydrocarbons.label>углеводороды</Hydrocarbons.label>
+	<Hydrocarbons.noun>углеводороды</Hydrocarbons.noun>
 
 	<Paint.label>краска</Paint.label>
+	<Paint.noun>краска</Paint.noun>
 
 </LanguageData>

Mods/Core_SK/Languages/Russian/DefInjected/ThingDef/Items_Tools.xml

@@ -23,5 +23,8 @@
 	<TFJ_Tool_Multitool.label>Мультитул</TFJ_Tool_Multitool.label>
 	<TFJ_Tool_Multitool.description>Высокотехнологичный набор инструментов, позволяет проводить горные работы, сооружать конструкции, собирать урожай и многое другое.</TFJ_Tool_Multitool.description>
 
+	<TFJ_Tool_Paxe.label>Кирка-топор</TFJ_Tool_Paxe.label>
+	<TFJ_Tool_Paxe.description>Универсальный инструмент, который плох во всём. Им можно даже забивать гвозди.</TFJ_Tool_Paxe.description>
+
 
 </LanguageData>

Mods/SurvivalToolsLite/Patches/Core/Stats/Stats_Pawns_WorkGeneral.xml

@@ -517,16 +517,12 @@
 								<ButcheryFleshSpeed>1.2</ButcheryFleshSpeed>
 								<ButcheryFleshEfficiency>1.1</ButcheryFleshEfficiency>
 								<PlantHarvestingSpeed>1.0</PlantHarvestingSpeed>
-								<ConstructionSpeed>1.0</ConstructionSpeed>
-								<SmithingSpeed>1.0</SmithingSpeed>
 								<MedicalOperationSpeed>0.9</MedicalOperationSpeed>
 								<MedicalSurgerySuccessChance>0.95</MedicalSurgerySuccessChance>
 							</baseWorkStatFactors>
 							<defaultSurvivalToolAssignmentTags>
 								<li>Cook</li>
 								<li>PlantWorker</li>
-								<li>Constructor</li>
-								<li>Crafter</li>
 								<li>Tend</li>
 							</defaultSurvivalToolAssignmentTags>
 						</li>

Mods/SurvivalToolsLite/Patches/Core_SK/ScenarioDefs/ScenariosPatch.xml

@@ -7,18 +7,9 @@
 
             <li Class="ScenPart_StartingThing_Defined">
                 <def>StartingThing_Defined</def>
-                <thingDef>TFJ_Tool_Woodcutting_Handaxe</thingDef>
-                <stuff>Plasteel</stuff>
-            </li>
-            <li Class="ScenPart_StartingThing_Defined">
-                <def>StartingThing_Defined</def>
-                <thingDef>TFJ_Tool_Building_Hammer</thingDef>
-                <stuff>Plasteel</stuff>
-            </li>
-            <li Class="ScenPart_StartingThing_Defined">
-                <def>StartingThing_Defined</def>
-                <thingDef>TFJ_Tool_Mining_Pickaxe</thingDef>
+                <thingDef>TFJ_Tool_Paxe</thingDef>
                 <stuff>Plasteel</stuff>
+                <count>2</count>
             </li>
         </value>
     </Operation>
@@ -210,7 +201,7 @@
             <li Class="ScenPart_StartingThing_Defined">
                 <def>StartingThing_Defined</def>
                 <thingDef>TFJ_Tool_Multitool</thingDef>
-		  <stuff>SteelBar</stuff>
+		        <stuff>SteelBar</stuff>
             </li>
         </value>
     </Operation>