From df3e78812e8bb533d61761bf9e8791f81a45eaa9 Mon Sep 17 00:00:00 2001 From: MADxingjin <25790044+MADxingjin@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:18:44 +0800 Subject: [PATCH] Did a lot of changes --- About/About.xml | 7 +- Defs/RecipeDefs/BulkCooking.xml | 48 +++ Defs/RecipeDefs/Enlarged_CoreSK.xml | 98 ------ Defs/RecipeDefs/Recipes_Enlarged_CoreSK.xml | 312 ++++++++++++++++++ .../ResearchProjectDefs/ResearchDefs_Bulk.xml | 16 + .../Buildings_EnlargedConvertion.xml | 8 +- .../Buildings_MechanicalWoodCutter.xml | 69 ++++ .../ResearchProjectDef/ResearchDefs.xml | 14 - .../ThingDef/Buildings_Refining.xml | 20 -- .../PEnlargedCoreSK.xml | 0 Patches/PEnlargedCoreSK.xml | 28 ++ Patches/PIdlePowerdrawCompForDeepDrill.xml | 26 ++ Patches/PMoreToolsCompatSurvivalTools.xml | 110 ++++++ Patches/{Rimfeller.xml => PRimfeller.xml} | 0 Patches/PSawmill.xml | 14 + Patches/PSlagOutputsMore.xml | 20 ++ isekaiob.HSKGrinder.code-workspace | 13 + isekaiob.SKOilAutomation.code-workspace | 7 - 18 files changed, 663 insertions(+), 147 deletions(-) create mode 100644 Defs/RecipeDefs/BulkCooking.xml delete mode 100644 Defs/RecipeDefs/Enlarged_CoreSK.xml create mode 100644 Defs/RecipeDefs/Recipes_Enlarged_CoreSK.xml create mode 100644 Defs/ResearchProjectDefs/ResearchDefs_Bulk.xml create mode 100644 Defs/ThingDefs_Buildings/Buildings_MechanicalWoodCutter.xml delete mode 100644 Languages/ChineseSimplified/DefInjected/ResearchProjectDef/ResearchDefs.xml delete mode 100644 Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Refining.xml rename Patches/EnlargedCoreSK.xml => ObsoleteXmls/PEnlargedCoreSK.xml (100%) create mode 100644 Patches/PEnlargedCoreSK.xml create mode 100644 Patches/PIdlePowerdrawCompForDeepDrill.xml create mode 100644 Patches/PMoreToolsCompatSurvivalTools.xml rename Patches/{Rimfeller.xml => PRimfeller.xml} (100%) create mode 100644 Patches/PSawmill.xml create mode 100644 Patches/PSlagOutputsMore.xml create mode 100644 isekaiob.HSKGrinder.code-workspace delete mode 100644 isekaiob.SKOilAutomation.code-workspace diff --git a/About/About.xml b/About/About.xml index a068101..6841310 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,15 +1,14 @@ - [IKOB]HSK Oil Automation + [IKOB]Hardcore SK Grinder isekaiob -
  • 1.3
  • 1.4
    •  isekaiob.HSKGrinder - Multiple Buildings and Recipes to help Automating HSK Products which i found grinding for my pawns to fill their day with :D. - Includes: * Automated Oil factory production for HSK Version of Rimfeller \n* Automated Metal Smeltry \n* Automated Composter \n* Enlarged Drying Racks \n* Automated Electronic Chips Making(WIP) \n + Multiple Buildings and Recipes to help Reducting process of materials which i found grinding for my pawns to fill their day and also clutter cpu. + Includes: * Automated HSK Oil byproduct production for Rimfeller \n* Automated Metal Smeltry \n* Enlarged Industrial Drying Racks \n* Larger Ferment Barrel \n* Automated Electronic Chips Making(WIP) \n* MechanicalSawmill before Electric one \n Along with their respective research requirements to enable. diff --git a/Defs/RecipeDefs/BulkCooking.xml b/Defs/RecipeDefs/BulkCooking.xml new file mode 100644 index 0000000..d2c62f0 --- /dev/null +++ b/Defs/RecipeDefs/BulkCooking.xml @@ -0,0 +1,48 @@ + + + + BulkFlour + + Grind wheat, corn, rice or oats into flour. Produces 100. + Grinding flour. + CookSpeed + Cook + 2800 + Recipe_CookMeal + true + +
  • + + +
  • Rawwheat
    • +
  • RawCorn
    • +
  • RawRice
    • + + + 200 + +     + + +
  • Rawwheat
    • +
  • RawCorn
    • +
  • RawRice
    • +     + +
  • AllowRotten
    • +     +     + + 100 + + + 5 + + Cooking + Bulk_Bakery + +
  • MillElectric
    • +
  • GrindStone
    • +     +     +     \ No newline at end of file diff --git a/Defs/RecipeDefs/Enlarged_CoreSK.xml b/Defs/RecipeDefs/Enlarged_CoreSK.xml deleted file mode 100644 index a161baa..0000000 --- a/Defs/RecipeDefs/Enlarged_CoreSK.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - Make_Tobacco_75 - - Make dried tobacco 75. Takes 3 days to make, only available for Large Industrial Drying Rack,Space Effecient! - -
  • - - -
  • RawTobacco
    • - - - 75 - -     - - 75 - - -
  • EnlargedDryingRack
    • -     - - 10 -     - - - Make_Smokeleaf_75 - - Make dried smokeleaf 75. Takes 4 days to make,only available for Large Industrial Drying Rack,Space Effecient!. - -
  • - - -
  • SmokeleafLeaves
    • - - - 75 - -     - - 75 - - -
  • EnlargedDryingRack
    • -     - - 10 -     - - - Make_DriedFruit_75 - - Make dried fruit 75. Takes 2 days to make,only available for Large Industrial Drying Rack,Space Effecient! - -
  • - - -
  • FruitFoodRaw
    • - - - 75 - -     - - 75 - - -
  • EnlargedDryingRack
    • -     - - 10 -     - - - Make_Fertilizer_25 - - Make fertilizer 25. Takes 2.8 days to make,only available for Large Industrial Compost Barrel. - -
  • - - -
  • Compost
    • - - - 25 - -     - - 25 - - -
  • EnlargedCompostBarrel
    • -     - - 25 -     -     \ No newline at end of file diff --git a/Defs/RecipeDefs/Recipes_Enlarged_CoreSK.xml b/Defs/RecipeDefs/Recipes_Enlarged_CoreSK.xml new file mode 100644 index 0000000..2f23870 --- /dev/null +++ b/Defs/RecipeDefs/Recipes_Enlarged_CoreSK.xml @@ -0,0 +1,312 @@ + + + + + +
  • EnlargedDryingRack
    • +     + + + 1 + + 0 + 65 + + + 30 + 50 + + 3 + 0.05 + 0.8 + + 0.75 + 1.2 + + + 1 + 0 + + + 1 + 0 + + + 1 + 1.2 + + _tobacco +     + + + Bulk_25_Tobacco + + Make 25 dried tobacco. Takes 3 days to make, only available for Large Industrial Drying Rack,Space Effecient! + +
  • + + +
  • RawTobacco
    • + + + 25 + +     + + 25 + + + 1 +     + + + Bulk_75_Tobacco + + Make 75 dried tobacco. Takes 3 days to make, only available for Large Industrial Drying Rack,Space Effecient! + +
  • + + +
  • RawTobacco
    • + + + 75 + +     + + 75 + + + 3 +     + + + +
  • EnlargedDryingRack
    • +     + + + 1 + + 0 + 65 + + + 30 + 50 + + 4 + 0.05 + 0.8 + + 0.75 + 1.2 + + + 1 + 0 + + + 1 + 0 + + + 1 + 1.2 + + _smokeleaf +     + + + Bulk_25_Smokeleaf + + Make 25 dried smokeleaf . Takes 4 days to make,only available for Large Industrial Drying Rack,Space Effecient!. + +
  • + + +
  • SmokeleafLeaves
    • + + + 25 + +     + + 25 + + +
  • EnlargedDryingRack
    • +     + + 1 +     + + + + Bulk_75_Smokeleaf + + Make dried smokeleaf 75. Takes 4 days to make,only available for Large Industrial Drying Rack,Space Effecient!. + +
  • + + +
  • SmokeleafLeaves
    • + + + 75 + +     + + 75 + + +
  • EnlargedDryingRack
    • +     + + 3 +     + + + + +
  • FruitFoodRaw
    • +     +     + +
  • EnlargedDryingRack
    • +     + + + + 5 + 80 + + + 18 + 50 + + 2 + 0.05 + 0.8 + + 0.75 + 1.2 + + + 1 + 0 + + + 1 + 0 + + + 1 + 1.2 + + _smokeleaf +     + + + + Bulk_25_DriedFruit + + Make 25 dried fruit. Takes 2 days to make,only available for Large Industrial Drying Rack,Space Effecient! + +
  • + + +
  • FruitFoodRaw
    • + + + 25 + +     + + 25 + + + 1 +     + + + Bulk_75_DriedFruit + + Make dried fruit 75. Takes 2 days to make,only available for Large Industrial Drying Rack,Space Effecient! + +
  • + + +
  • FruitFoodRaw
    • + + + 75 + +     + + 75 + + + 3 +     + + + +
  • EnlargedCompostBarrel
    • +     + + + + -1 + 49 + + + 10 + 30 + + 2.8 + 0.5 + 1 +     + + Bulk_10_Fertilizer + + Make fertilizer 10. Takes 2.8 days to make,only available for Large Industrial Compost Barrel. + +
  • + + +
  • Compost
    • + + + 10 + +     + + 10 + + + 1 +     + + Bulk_25_Fertilizer + + Make fertilizer 25. Takes 2.8 days to make,only available for Large Industrial Compost Barrel,Space Effecient! + +
  • + + +
  • Compost
    • + + + 25 + +     + + 25 + + + 2 +     +     \ No newline at end of file diff --git a/Defs/ResearchProjectDefs/ResearchDefs_Bulk.xml b/Defs/ResearchProjectDefs/ResearchDefs_Bulk.xml new file mode 100644 index 0000000..81ffac0 --- /dev/null +++ b/Defs/ResearchProjectDefs/ResearchDefs_Bulk.xml @@ -0,0 +1,16 @@ + + + + Bulk_Bakery + + Researching Bulk producing bakery resources. + 1500 + Industrial + +
  • Bakery_B2
    • +
  • Food_C1
    • +     + 5.00 + 47.00 +     +     \ No newline at end of file diff --git a/Defs/ThingDefs_Buildings/Buildings_EnlargedConvertion.xml b/Defs/ThingDefs_Buildings/Buildings_EnlargedConvertion.xml index 9a9fd3c..1f694f8 100644 --- a/Defs/ThingDefs_Buildings/Buildings_EnlargedConvertion.xml +++ b/Defs/ThingDefs_Buildings/Buildings_EnlargedConvertion.xml @@ -25,8 +25,8 @@ 1700 - 10 - 100 + 59 + 430 0.75 -16 @@ -57,7 +57,7 @@ (0.0, 0.25) (1.0, 1.0) - 75 + 10 @@ -116,6 +116,6 @@ true (0.0, 0.25) (1.0, 1.0) - 50 + 10 \ No newline at end of file diff --git a/Defs/ThingDefs_Buildings/Buildings_MechanicalWoodCutter.xml b/Defs/ThingDefs_Buildings/Buildings_MechanicalWoodCutter.xml new file mode 100644 index 0000000..aaf00cf --- /dev/null +++ b/Defs/ThingDefs_Buildings/Buildings_MechanicalWoodCutter.xml @@ -0,0 +1,69 @@ + + + + MechanicalSawmill + + A medium sized mechanical saw,powered by a wheel running under operators foot for cutting logs into planks,however due to inability to control the speed,this saw cannot make components. + + Things/Building/Production/TableSawmillHand + Graphic_Multi + (3,1) + CutoutComplex + + (0.75, 0.2, 0.75) + (0,0,0) + + + +
  • StrongMetallic
    • +
  • WoodLogs
    • +     + 130 + + 5 + + MinifiedThing + +
  • BuildingsProduction
    • +     + + 1200 + 180 + 1.0 + -19 + 500 + + (3,1) + Production + (0,0,-1) + + 1250 + + +
  • MakeWoodPlanks_Hand
    • +
  • MakeRedWoodPlanks_Hand
    • +
  • MakeBambooPlanks_Hand
    • +
  • MakeKindling_Hand
    • +     + +
  • + +
  • Small_ToolCabinet
    • +
  • PodChair
    • + + +
  • +
  • + CompReportWorkSpeed +
    • +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +
  • PlaceWorker_ReportWorkSpeedPenalties
    • +     + +
  • Stonecutting
    • +     + 6 +     +     \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ResearchProjectDef/ResearchDefs.xml b/Languages/ChineseSimplified/DefInjected/ResearchProjectDef/ResearchDefs.xml deleted file mode 100644 index 8689bfa..0000000 --- a/Languages/ChineseSimplified/DefInjected/ResearchProjectDef/ResearchDefs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - Oil Automation 01 - Research to burn plastic and rubber autocrafting instruction into electronics. - - Oil Automation 02 - Research to download synthetic fiber and compaste autocrafting programs into chips. - - Oil Automation 03 - Research to compile Kelvar autocrafting system image into CPUS. - - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Refining.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Refining.xml deleted file mode 100644 index 392835c..0000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Refining.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 塑料精炼厂 - 将化合燃料处理成塑料 - - 橡胶精炼厂 - 将化合燃料处理成橡胶 - - 人造纤维精炼厂 - 将化合燃料处理成人造纤维 - - 复合粘剂精炼厂 - 将化合燃料处理成复合粘剂 - - 凯夫拉精炼厂 - 将化合燃料处理成凯夫拉 - - - \ No newline at end of file diff --git a/Patches/EnlargedCoreSK.xml b/ObsoleteXmls/PEnlargedCoreSK.xml similarity index 100% rename from Patches/EnlargedCoreSK.xml rename to ObsoleteXmls/PEnlargedCoreSK.xml diff --git a/Patches/PEnlargedCoreSK.xml b/Patches/PEnlargedCoreSK.xml new file mode 100644 index 0000000..e4bbd8c --- /dev/null +++ b/Patches/PEnlargedCoreSK.xml @@ -0,0 +1,28 @@ + + + + + +
  • Core SK
    • +     + + + + +
  • + Defs/ArchitectSense.DesignationSubCategoryDef[defName="SubCategory_DryingRack"]/defNames + +
  • EnlargedDryingRack
    • + + +
  • + Defs/ArchitectSense.DesignationSubCategoryDef[defName="SubCategory_Composters"]/defNames + +
  • EnlargedCompostBarrel
    • + + +     +     +     + +     \ No newline at end of file diff --git a/Patches/PIdlePowerdrawCompForDeepDrill.xml b/Patches/PIdlePowerdrawCompForDeepDrill.xml new file mode 100644 index 0000000..a9a99a0 --- /dev/null +++ b/Patches/PIdlePowerdrawCompForDeepDrill.xml @@ -0,0 +1,26 @@ + + + + +
  • Core SK
    • +     + + +
  • + Defs/ThingDef[defName="DeepDrill"]/comps + +
  • + SK.CompPowerLowIdleDraw + 0.1 +
    • + + +
  • + Defs/ThingDef[defName="DeepDrill"]/comps/li[@Class="CompProperties_CreatesInfestations"] +
    • +     + + +     +     +     \ No newline at end of file diff --git a/Patches/PMoreToolsCompatSurvivalTools.xml b/Patches/PMoreToolsCompatSurvivalTools.xml new file mode 100644 index 0000000..7adb302 --- /dev/null +++ b/Patches/PMoreToolsCompatSurvivalTools.xml @@ -0,0 +1,110 @@ + + + + +
  • Core SK
    • +
  • SurvivalToolsLite
    • +     + + Always + + + + +
  • + Defs/ThingDef[defName="Dll_Tool_Jackhammer"] + + SurvivalToolsLite.SurvivalTool + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Jackhammer"]/statBases + + 1.5 + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Jackhammer"]/equippedStatOffsets/MiningSpeed +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Jackhammer"] + +
  • + + 1.3 + 1 + 1.1 + + +
  • Miner
    • + + + + + + + +
  • + Defs/ThingDef[defName="Dll_Tool_Chainsaw"] + + SurvivalToolsLite.SurvivalTool + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Chainsaw"]/statBases + + 1.3 + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Chainsaw"]/equippedStatOffsets/PlantWorkSpeed +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_Chainsaw"] + +
  • + + 1.5 + 0.5 + + +
  • PlantWorker
    • + + + + + + + +
  • + Defs/ThingDef[defName="Dll_Tool_LeafBlower"] + + SurvivalToolsLite.SurvivalTool + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_LeafBlower"]/statBases + + 1.3 + +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_LeafBlower"]/equippedStatOffsets/CleaningSpeed +
    • +
  • + Defs/ThingDef[defName="Dll_Tool_LeafBlower"] + +
  • + + 1.2 + + +
  • Cleaning
    • + + + + +     +     +     +     diff --git a/Patches/Rimfeller.xml b/Patches/PRimfeller.xml similarity index 100% rename from Patches/Rimfeller.xml rename to Patches/PRimfeller.xml diff --git a/Patches/PSawmill.xml b/Patches/PSawmill.xml new file mode 100644 index 0000000..0ebfea2 --- /dev/null +++ b/Patches/PSawmill.xml @@ -0,0 +1,14 @@ + + + + +
  • Core SK
    • +     + + Defs/WorkGiverDef[defName="DoBillsMakeWoodPlanks"]/fixedBillGiverDefs + +
  • MechanicalSawmill
    • +     +     +     +     \ No newline at end of file diff --git a/Patches/PSlagOutputsMore.xml b/Patches/PSlagOutputsMore.xml new file mode 100644 index 0000000..1205b3d --- /dev/null +++ b/Patches/PSlagOutputsMore.xml @@ -0,0 +1,20 @@ + + + + +
  • Core SK
    • +     + + Defs/ThingDef[defName="ChunkSlagSteel"]/smeltProducts + + + 15 + 10 + 6 + 2 + 1 + + + +     +     \ No newline at end of file diff --git a/isekaiob.HSKGrinder.code-workspace b/isekaiob.HSKGrinder.code-workspace new file mode 100644 index 0000000..f8d5414 --- /dev/null +++ b/isekaiob.HSKGrinder.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "rwxml.paths.rimWorld": "G:\\HSKWorld_v1_4\\RimWorld\\", + "rwxml.paths.rimWorldData": "G:\\HSKWorld_v1_4\\RimWorld\\Data", + "rwxml.paths.rimWorldManaged": "G:\\HSKWorld_v1_4\\RimWorld\\RimWorldWin64_Data\\Managed", + "rwxml.paths.localMods": "G:\\HSKWorld_v1_4\\RimWorld\\Mods" + } +} \ No newline at end of file diff --git a/isekaiob.SKOilAutomation.code-workspace b/isekaiob.SKOilAutomation.code-workspace deleted file mode 100644 index 362d7c2..0000000 --- a/isekaiob.SKOilAutomation.code-workspace +++ /dev/null @@ -1,7 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ] -} \ No newline at end of file