Moved Quarry outside Core SK + Fixes

-Fixed GetMondWarnings Patch
- Added MayRequire for Viles defs

Mods/Core_SK/About/About.xml

@@ -87,7 +87,6 @@
 		<li>jamaicancastle.RF.fertilefields</li>
 		<li>notfood.MendAndRecycle</li>
 		<li>wit.expandedroofing</li>
-		<li>Ogliss.TheWhiteCrayon.Quarry</li>
 	</loadAfter>
 	<incompatibleWith>
 		<li>Aant.OnlineCity</li>

Mods/Core_SK/Defs/DesignationSubCategoryDefs/SubCategories.xml

@@ -945,6 +945,7 @@
 		<description>Accessories for mineral product mining.</description>
 		<defNames>
 			<li MayRequire="ogliss.thewhitecrayon.quarry">QRY_Quarry</li>
+			<li MayRequire="ogliss.thewhitecrayon.quarry">QRY_MediQuarry</li>
 			<li MayRequire="ogliss.thewhitecrayon.quarry">QRY_MiniQuarry</li>
 			<li MayRequire="ogliss.thewhitecrayon.quarry">QRY_Platform</li>
 			<li>DeepDrill</li>

Mods/Core_SK/Defs/WorkGiverDefs/WorkGivers_SK.xml

@@ -94,7 +94,7 @@
 		<defName>CollectSand</defName>
 		<label>collect sand</label>
 		<giverClass>SK.WorkGiver_CollectSand</giverClass>
-		<workType>QuarryMining</workType>
+		<workType>Mining</workType>
 		<scanThings>false</scanThings>
 		<scanCells>true</scanCells>
 		<verb>collect</verb>
@@ -107,7 +107,7 @@
 		<defName>CollectClay</defName>
 		<label>collect clay</label>
 		<giverClass>SK.WorkGiver_CollectClay</giverClass>
-		<workType>QuarryMining</workType>
+		<workType>Mining</workType>
 		<scanThings>false</scanThings>
 		<scanCells>true</scanCells>
 		<verb>collect</verb>
@@ -120,7 +120,7 @@
 		<defName>CollectPeat</defName>
 		<label>collect peat</label>
 		<giverClass>SK.WorkGiver_CollectPeat</giverClass>
-		<workType>QuarryMining</workType>
+		<workType>Mining</workType>
 		<scanThings>false</scanThings>
 		<scanCells>true</scanCells>
 		<verb>collect</verb>
@@ -133,7 +133,7 @@
 		<defName>CollectCrushedstone</defName>
 		<label>collect crushed stone</label>
 		<giverClass>SK.WorkGiver_CollectCrushedstone</giverClass>
-		<workType>QuarryMining</workType>
+		<workType>Mining</workType>
 		<scanThings>false</scanThings>
 		<scanCells>true</scanCells>
 		<verb>collect</verb>

Mods/HMC Vile's Pre-Industrial/Defs/Scenarios.xml

@@ -151,7 +151,7 @@
 					<thingDef>Seedwheat</thingDef>
 					<count>50</count>
 				</li>
-				<li Class="ScenPart_StartingThing_Defined">
+				<li Class="ScenPart_StartingThing_Defined" MayRequire="vitech.tweaks">
 					<def>StartingThing_Defined</def>
 					<thingDef>TruePilum</thingDef>
 					<stuff>Plasteel</stuff>
@@ -268,7 +268,7 @@
 					<def>StartingResearch</def>
 					<project>Apparel_A2</project>
 				</li>
-				<li Class="ScenPart_StartingResearch">
+				<li Class="ScenPart_StartingResearch" MayRequire="vitech.metallurgy">
 					<def>StartingResearch</def>
 					<project>Ceramics_B1</project>
 				</li>

Mods/Quarry/1.5/Biotech/Patches/Patches_Human_lifeStageWorkSettings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation  Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Human"]/race/lifeStageWorkSettings</xpath>
+		<value>
+			<QuarryMining>7</QuarryMining>
+		</value>
+		<order>Append</order>
+	</Operation>
+</Patch>

Mods/Quarry/1.5/Biotech/Patches/Patches_Mech_Tunneler.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Mech_Tunneler"]/race/mechEnabledWorkTypes</xpath>
+		<value>
+			<li>QuarryMining</li>
+		</value>
+		<order>Append</order>
+	</Operation>
+</Patch>

Mods/Core_SK/Defs/ThingDefs_Buildings/Buildings_QRY.xml → Mods/Quarry/1.5/Defs/ThingDefs_Buildings/Buildings_QRY.xml

@@ -64,6 +64,32 @@
 		<constructionSkillPrerequisite>8</constructionSkillPrerequisite>
 	</ThingDef>
 
+	<ThingDef ParentName="QRY_QuarryBase">
+		<defName>QRY_MediQuarry</defName>
+		<thingClass>Quarry.Building_MediQuarry</thingClass>
+		<label>med quarry</label>
+		<description>A medium pit for digging up long buried resources.</description>
+		<graphicData>
+			<texPath>Cupro/Object/MiniQuarry</texPath>
+			<drawSize>(9,9)</drawSize>
+		</graphicData>
+		<statBases>
+			<WorkToBuild>20000</WorkToBuild>
+			<Beauty>-17</Beauty>
+		</statBases>
+		<size>(9,9)</size>
+		<stuffCategories>
+			<li>Woody</li>
+		</stuffCategories>
+		<costStuffCount>170</costStuffCount>
+		<comps>
+			<li Class="CompProperties_AssignableToPawn">
+				<drawAssignmentOverlay>true</drawAssignmentOverlay>
+				<!-- <compClass>CompAssignableToPawn_Bed</compClass> -->
+			</li>
+		</comps>
+	</ThingDef>
+
 	<ThingDef ParentName="QRY_QuarryBase">
 		<defName>QRY_MiniQuarry</defName>
 		<thingClass>Quarry.Building_MiniQuarry</thingClass>
@@ -85,7 +111,7 @@
 		<constructionSkillPrerequisite>6</constructionSkillPrerequisite>
 	</ThingDef>
 
-	<ThingDef ParentName="SK_BuildingBase">
+	<ThingDef ParentName="BuildingBase">
 		<defName>QRY_Platform</defName>
 		<thingClass>Quarry.Building_Platform</thingClass>
 		<label>quarry platform</label>
@@ -115,34 +141,40 @@
 		<canOverlapZones>false</canOverlapZones>
 		<stuffCategories>
 			<li>Woody</li>
+			<li>Stony</li>
+			<li>Metallic</li>
 		</stuffCategories>
 		<costStuffCount>50</costStuffCount>
+		<leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
 		<staticSunShadowHeight>0</staticSunShadowHeight>
 		<surfaceType>Item</surfaceType>
 		<statBases>
 			<MaxHitPoints>150</MaxHitPoints>
-			<WorkToBuild>150</WorkToBuild>
+			<WorkToBuild>300</WorkToBuild>
 			<Mass>5</Mass>
 			<Flammability>1.0</Flammability>
 			<Beauty>1</Beauty>
 		</statBases>
 		<size>(3,3)</size>
 		<rotatable>false</rotatable>
 		<building>
-			<preventDeteriorationOnTop>false</preventDeteriorationOnTop>
-			<ignoreStoredThingsBeauty>true</ignoreStoredThingsBeauty>
-			<defaultStorageSettings>
-				<priority>Low</priority>
-				<filter>
-					<categories>
-						<li>ResourcesRaw</li>
-						<li>Items</li>
-					</categories>
-					<thingDefs>
-						<li>ComponentIndustrial</li>
-					</thingDefs>
-				</filter>
-			</defaultStorageSettings>
+		<preventDeteriorationOnTop>false</preventDeteriorationOnTop>
+		<ignoreStoredThingsBeauty>true</ignoreStoredThingsBeauty>
+		<defaultStorageSettings>
+			<priority>Low</priority>
+			<filter>
+				<categories>
+					<li>ResourcesRaw</li>
+					<li>Items</li>
+				</categories>
+				<thingDefs>
+					<li>ComponentIndustrial</li>
+				</thingDefs>
+				<disallowedThingDefs>
+					<li MayRequire="Biotech">Wastepack</li>
+				</disallowedThingDefs>
+			</filter>
+		</defaultStorageSettings>
 		</building>
 		<comps>
 			<li Class="CompProperties_Facility">
@@ -156,10 +188,6 @@
 		<placeWorkers>
 			<li>PlaceWorker_ShowFacilitiesConnections</li>
 		</placeWorkers>
-		<researchPrerequisites>
-			<li>Mining_B1</li>
-		</researchPrerequisites>
-		<constructionSkillPrerequisite>5</constructionSkillPrerequisite>
 	</ThingDef>
 
 </Defs>

Mods/Core_SK/Defs/Tutor/QRY_Concepts.xml → Mods/Quarry/1.5/Defs/Tutor/Concepts.xml

@@ -8,11 +8,11 @@
     <label>Reclaim soil</label>
     <priority>50</priority>
     <needsOpportunity>True</needsOpportunity>
-    <helpText>Once the quarry has been deconstructed, you can use the Smooth Floor tool to designate colonists to cover the old ground with soil in order to get a usable terrain where the quarry once was.</helpText>
+    <helpText>Once the quarry has been deconstructed, you can use the Reclaim Soil tool to designate colonists to cover the old ground with soil in order to get a usable terrain where the quarry once was.</helpText>
     <highlightTags>
       <li>MainTab-Architect-Closed</li>
       <li>DesignationCategoryButton-Floors-Closed</li>
-      <li>Designator-DesignatorSmoothFloor</li>
+      <li>Designator-QRY_Designator_ReclaimSoil</li>
     </highlightTags>
   </ConceptDef>
 

Mods/Quarry/1.5/Defs/WorkGiverDefs/WorkGivers.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <WorkGiverDef>
+    <defName>QRY_MineQuarry</defName>
+    <label>mine a quarry for resources</label>
+    <giverClass>Quarry.WorkGiver_MineQuarry</giverClass>
+    <workType>QuarryMining</workType>
+    <priorityInType>100</priorityInType>
+    <verb>quarry at</verb>
+    <gerund>quarrying at</gerund>
+	<tagToGive>Fieldwork</tagToGive>
+	<requiredCapacities>
+      <li>Manipulation</li>
+    </requiredCapacities>
+  </WorkGiverDef>
+
+
+</Defs>

Mods/Quarry/1.5/Defs/WorkTypeDefs/WorkTypes.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+    <WorkTypeDef>
+    <defName>QuarryMining</defName>
+    <labelShort>Quarry</labelShort>
+    <pawnLabel>Miner</pawnLabel>
+    <gerundLabel>quarrying</gerundLabel>
+    <description>Digging and drilling in a quarry.</description>
+    <verb>Mine Quarry</verb>
+    <naturalPriority>550</naturalPriority>
+    <requireCapableColonist>true</requireCapableColonist>
+    <relevantSkills>
+      <li>Mining</li>
+    </relevantSkills>
+    <workTags>
+      <li>ManualSkilled</li>
+      <li>Mining</li>
+      <li>Commoner</li>
+      <li>AllWork</li>
+    </workTags>
+  </WorkTypeDef>
+</Defs>

Mods/Quarry/1.5/MiniMechMiner/Patches/Patches_Mech_MiniMiner.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/ThingDef[defName="Mech_MiniMiner"]/race/mechEnabledWorkTypes</xpath>
+		<value>
+			<li>QuarryMining</li>
+		</value>
+		<order>Append</order>
+	</Operation>
+</Patch>