From a67a1e8a784162f38a7e1048f4d40a1ddf49fec7 Mon Sep 17 00:00:00 2001 From: Mlie Date: Sun, 9 Oct 2022 22:00:41 +0200 Subject: [PATCH] Mod updated for 1.4 and passed autotests --- 1.4/Assemblies/TinyWorkbenches.dll | Bin 0 -> 5632 bytes .../ResearchProjectDefs/ResearchProjects.xml | 15 + 1.4/Defs/ThingsDefs/Buildings.xml | 527 ++++++++++++++++++ 1.4/Patches/owlchemist.simplefxsmoke.xml | 29 + About/About.xml | 1 + About/Changelog.txt | 3 + About/Manifest.xml | 2 +- About/ModSync.xml | 2 +- .../TinyWorkbenches.csproj.oldversioncscproj | 4 +- Source/TinyWorkbenches/TinyWorkbenches.csproj | 8 +- 10 files changed, 583 insertions(+), 8 deletions(-) create mode 100644 1.4/Assemblies/TinyWorkbenches.dll create mode 100644 1.4/Defs/ResearchProjectDefs/ResearchProjects.xml create mode 100644 1.4/Defs/ThingsDefs/Buildings.xml create mode 100644 1.4/Patches/owlchemist.simplefxsmoke.xml diff --git a/1.4/Assemblies/TinyWorkbenches.dll b/1.4/Assemblies/TinyWorkbenches.dll new file mode 100644 index 0000000000000000000000000000000000000000..4f5e8f339720e03bb8fb8afe1005b53915ca6c46 GIT binary patch literal 5632 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 literal 0 HcmV?d00001 diff --git a/1.4/Defs/ResearchProjectDefs/ResearchProjects.xml b/1.4/Defs/ResearchProjectDefs/ResearchProjects.xml new file mode 100644 index 0000000..d54ef5f --- /dev/null +++ b/1.4/Defs/ResearchProjectDefs/ResearchProjects.xml @@ -0,0 +1,15 @@ + + + + TWB_TinyWorkBenchs + + Allows for tiny workbenchs. The small size makes them cheap, but fragile and slow. + 500 + Medieval + +
  • ComplexFurniture
    • +     + 2.00 + 4.05 +     +     \ No newline at end of file diff --git a/1.4/Defs/ThingsDefs/Buildings.xml b/1.4/Defs/ThingsDefs/Buildings.xml new file mode 100644 index 0000000..36402b3 --- /dev/null +++ b/1.4/Defs/ThingsDefs/Buildings.xml @@ -0,0 +1,527 @@ + + + + + +
  • TWB_TinyWorkBenchs
    • +     + true + + Graphic_Multi + (1.5,1.5) + + Damage/Corner + Damage/Corner + Damage/Corner + Damage/Corner + + + + (1,1) + Production + PassThroughOnly + 70 + True + (0,0,-1) + Item + Building + 0.5 + True + 0.7 + Light + + 4000 + 50 + 1.0 + 0.70 + 8 + + +
  • ITab_Bills
    • +     + + BillsTab + +     + + + TWB_TableSculptingMini + + Building_WorkTable + A tiny workbench equipped for creating art. + + Things/Buildings/TWB_TableSculptingMini/TWB_TableSculptingMini + CutoutComplex + + +
  • Metallic
    • +
  • Woody
    • +     + 50 + + 30 + + + -5 + + +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + Misc2 +     + + TWB_TableButcherMini + + Building_WorkTable + A tiny table for butchering dead creatures into pieces of raw meat. + + Things/Buildings/TWB_TableButcherMini/TWB_TableButcherMini + + 40 + + 10 + + +
  • Metallic
    • +
  • Woody
    • +     + + -15 + + +
  • ButcherCorpseFlesh
    • +
  • Make_Kibble
    • +     + +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + Misc3 +     + + TWB_HandTailoringBenchMini + + Building_WorkTable + A tiny workbench with a sewing machine for rapid tailoring of clothes. + + Things/Buildings/TWB_HandTailoringBenchMini/TWB_HandTailoringBenchMini + CutoutComplex + + 50 + + 30 + + +
  • Metallic
    • +
  • Woody
    • +     + + 0.3 + + +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + +
  • ComplexClothing
    • +     +     + + TWB_ElectricTailoringBenchMini + + Building_WorkTable + A tiny workbench with a sewing machine for rapid tailoring of clothes. + + Things/Buildings/TWB_ElectricTailoringBenchMini/TWB_ElectricTailoringBenchMini + CutoutComplex + + 50 + + 30 + 1 + + +
  • Metallic
    • +
  • Woody
    • +     + + 0.3 + + +
  • + CompPowerTrader + true + 120 +
    • +
  • +
  • + +
  • ToolCabinet
    • + + +
  • + + +
  • PlaceWorker_ShowFacilitiesConnections
    • + + +
  • ComplexClothing
    • +
  • Electricity
    • +     +     + + TWB_FueledSmithyMini + + Building_WorkTable + A tiny wood-fueled station for smithing non-mechanical weapons and tools. + + Things/Buildings/TWB_FueledSmithyMini/TWB_FueledSmithyMini + + + 50 + + ConstructWood + + -3 + + +
  • + 80.0 + 50.0 + + +
  • WoodLog
    • + + + true + +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + +
  • Smithing
    • +     +     + + TWB_ElectricSmithyMini + + Building_WorkTable + A tiny electric-powered station equipped for smithing non-mechanical weapons and tools. + + Things/Buildings/TWB_ElectricSmithyMini/TWB_ElectricSmithyMini + + + 50 + 1 + + ConstructWood + + -3 + + +
  • + CompPowerTrader + true + 210 +
    • +
  • +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + +
  • Smithing
    • +
  • Electricity
    • +     +     + + TWB_TableMachiningMini + + Building_WorkTable + A tiny work station for assembling and disassembling machinery such as guns or mechanoid corpses. + + Things/Buildings/TWB_TableMachiningMini/TWB_TableMachiningMini + + + 90 + 3 + + + -2 + + +
  • ButcherCorpseMechanoid
    • +     + +
  • + CompPowerTrader + true + 350 +
    • +
  • +
  • + 5 + (73,123,138,0) +
    • +
  • + +
  • ToolCabinet
    • + + +
  • + + +
  • PlaceWorker_ShowFacilitiesConnections
    • + + ConstructMetal + +
  • Machining
    • +     + Misc7 +     + + TWB_FueledStoveMini + + Building_WorkTable_HeatPush + A tiny wood-fueled stove with an attached countertop for preparing meals. + + Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini + CutoutComplex + + ConstructMetal + + 30 + 1 + + +
  • CookMealSimple
    • +
  • CookMealFine
    • +
  • CookMealLavish
    • +
  • CookMealSurvival
    • +
  • Make_Pemmican
    • +     + +
  • + 160.0 + 50.0 + + +
  • WoodLog
    • + + + true + +
  • + CompHeatPusherPowered + 4 +
    • +     + + true + 0.10 + +     + + TWB_ElectricStoveMini + + Building_WorkTable_HeatPush + A tiny electrically-powered stove with an attached countertop for preparing meals. + + Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini + CutoutComplex + + ConstructMetal + + 30 + 1 + + +
  • CookMealSimple
    • +
  • CookMealFine
    • +
  • CookMealLavish
    • +
  • CookMealSurvival
    • +
  • Make_Pemmican
    • +     + +
  • + CompPowerTrader + true + 350 +
    • +
  • +
  • + + + true + 0.10 + + +
  • Electricity
    • + + Misc8 +     + + TWB_TableStonecutterMini + + Building_WorkTable_HeatPush + A tiny work table equipped to cut rough stone into usable blocks. + + Things/Buildings/TWB_TableStonecutterMini/TWB_TableStonecutterMini + CutoutComplex + + 50 + + 15 + + +
  • Metallic
    • +
  • Woody
    • +     + + -5 + + +
  • + +
  • ToolCabinet
    • + + +     + +
  • Stonecutting
    • +     + Misc9 + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     +     + + TWB_BreweryMini + + Building_WorkTable + A tiny work station with all the equipment needed to mix wort for beer production. Wort must be fermented to finally become beer. + + Things/Buildings/TWB_BreweryMini/TWB_BreweryMini + + + 70 + 16 + + +
  • Make_Wort
    • +     + +
  • Brewing
    • +     + +
  • PlaceWorker_PreventInteractionSpotOverlap
    • +     +     + + TWB_DrugLabMini + + Building_WorkTable + A tiny work bench equipped with various containers, heaters, and measurement equipment for producing a variety of drugs. + + Things/Buildings/TWB_DrugLabMini/TWB_DrugLabMini + CutoutComplex + + 30 + +
  • Metallic
    • +
  • Woody
    • +     + + 40 + 4 + + +
  • + +
  • ToolCabinet
    • + + +     + +
  • PlaceWorker_ShowFacilitiesConnections
    • +     + +
  • DrugProduction
    • +     +     + + TWB_ElectricSmelterMini + + Building_WorkTable_HeatPush + Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power. + + Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini + + ConstructMetal + + 115 + 1 + + +
  • ExtractMetalFromSlag
    • +
  • SmeltWeapon
    • +
  • SmeltApparel
    • +
  • DestroyWeapon
    • +
  • DestroyApparel
    • +     + +
  • + CompPowerTrader + 700 + true +
    • +
  • +
  • + 6 + (217,112,33,0) +
    • +
  • + CompHeatPusherPowered + 12 +
    • +
  • + + + 0.32 + + +
  • Electricity
    • + + Misc10 +     +     \ No newline at end of file diff --git a/1.4/Patches/owlchemist.simplefxsmoke.xml b/1.4/Patches/owlchemist.simplefxsmoke.xml new file mode 100644 index 0000000..eef9908 --- /dev/null +++ b/1.4/Patches/owlchemist.simplefxsmoke.xml @@ -0,0 +1,29 @@ + + + + /Defs/FleckDef[defName="Owl_Vapor"] + Always + + +
  • + Defs/ThingDef[defName="TWB_FueledStoveMini" or defName="TWB_ElectricStoveMini"]/comps + +
  • + Owl_Vapor + true + 0.66 +
    • + + +
  • + Defs/ThingDef[defName="TWB_ElectricSmelterMini"]/comps + +
  • + true +
    • + + +     +     +     +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 0b9ea26..1218e91 100644 --- a/About/About.xml +++ b/About/About.xml @@ -9,6 +9,7 @@
  • 1.1
  • 1.2
  • 1.3
    • +
  • 1.4
    • diff --git a/About/Changelog.txt b/About/Changelog.txt index 2eb31fd..5e26e26 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,5 +1,8 @@ # Changelog for TinyWorkbenchs +1.4.1 - Mod updated for 1.4 and passed autotests + + 1.3.2 - Fixed the missing workgivers-add for the new clone of recipes. diff --git a/About/Manifest.xml b/About/Manifest.xml index 3acd45e..0603720 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ TinyWorkbenchs - 1.3.2 + 1.4.1 diff --git a/About/ModSync.xml b/About/ModSync.xml index 86e34b4..00b6f22 100644 --- a/About/ModSync.xml +++ b/About/ModSync.xml @@ -2,7 +2,7 @@ 3b55fe60-bf16-410e-b0fa-91f9da742a9d Tiny Workbenchs (Continued) - 1.3.2 + 1.4.1 False emipa606 diff --git a/Source/TinyWorkbenches.csproj.oldversioncscproj b/Source/TinyWorkbenches.csproj.oldversioncscproj index d24bccd..a3604c6 100644 --- a/Source/TinyWorkbenches.csproj.oldversioncscproj +++ b/Source/TinyWorkbenches.csproj.oldversioncscproj @@ -1,12 +1,12 @@ - + ..\..\1.3\Assemblies net472 - false false false None latest + 1.3.2 diff --git a/Source/TinyWorkbenches/TinyWorkbenches.csproj b/Source/TinyWorkbenches/TinyWorkbenches.csproj index a3604c6..3a1bed5 100644 --- a/Source/TinyWorkbenches/TinyWorkbenches.csproj +++ b/Source/TinyWorkbenches/TinyWorkbenches.csproj @@ -1,16 +1,16 @@ - ..\..\1.3\Assemblies - net472 + ..\..\1.4\Assemblies + net48 false false None latest - 1.3.2 + 1.4.1 - * + 1.4.3510-beta runtime compile; build; native; contentfiles; analyzers; buildtransitive