diff --git a/1.4/Assemblies/TinyWorkbenches.dll b/1.4/Assemblies/TinyWorkbenches.dll index 4f5e8f3..b63b62c 100644 Binary files a/1.4/Assemblies/TinyWorkbenches.dll and b/1.4/Assemblies/TinyWorkbenches.dll differ diff --git a/1.4/Patches/VanillaExpanded.VFEProduction.xml b/1.4/Patches/VanillaExpanded.VFEProduction.xml new file mode 100644 index 0000000..ae01225 --- /dev/null +++ b/1.4/Patches/VanillaExpanded.VFEProduction.xml @@ -0,0 +1,188 @@ + + + + /Defs/ThingDef[defName="VFE_TableButcherElectric"] + Always + + Defs + + + TWB_VFE_TableButcherElectricMini + + Building_WorkTable + A tiny motorized table with a rotating saw blade for butchering dead creatures quicker into precise slices of raw meat. Consumes some power. + + Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini + + +
  • Metallic
    • +
  • Woody
    • +     + 40 + + 15 + 2 + + + -15 + 1.1 + + +
  • + CompPowerTrader + 250 + true +
    • +
  • +
  • + +
  • ToolCabinet
    • + + +
  • + + +
  • PlaceWorker_ShowFacilitiesConnections
    • + + 5 + +
  • Electricity
    • +     +     + + TWB_VFE_TableDrugLabElectricMini + + Building_WorkTable + An tiny advanced work bench equipped with containers, heaters, and measurement devices for producing various drugs with more efficiency. Consumes some power. + + Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini + CutoutComplex + + +
  • Metallic
    • +
  • Woody
    • +     + 60 + + 95 + 6 + + + 1.1 + + +
  • + CompPowerTrader + 275 + true +
    • +
  • +
  • + +
  • ToolCabinet
    • + + +
  • + + +
  • PlaceWorker_ShowFacilitiesConnections
    • + + 5 + +
  • Electricity
    • +
  • DrugProduction
    • +     +     + + TWB_VFE_FueledSmelterMini + + Building_WorkTable_HeatPush + A tiny wood-fueled station for smelting. Extracts usable metal from slag chunks and other mixed metal items. + + Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini + + + 120 + + 3 + +
  • ExtractMetalFromSlag
    • +
  • SmeltWeapon
    • +
  • DestroyWeapon
    • +     + +
  • + 140.0 + 40.0 + + +
  • WoodLog
    • + + + true + +
  • + CompHeatPusherPowered + 7 +
    • +     + + BillsTab + 0.75 + + +
  • Smithing
    • +     +     + + TWB_VFE_TableStonecutterElectricMini + + Building_WorkTable_HeatPush + An tiny advanced work table with electrical saws and holders for cutting stone chunks into usable blocks in shorter duration of time on an assembly line. Consumes some power. + + Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini + CutoutComplex + + +
  • Metallic
    • +
  • Woody
    • +     + 90 + + 45 + 3 + + + 1.1 + + +
  • + CompPowerTrader + 150 + true +
    • +
  • +
  • + +
  • ToolCabinet
    • + + +
  • + + +
  • PlaceWorker_ShowFacilitiesConnections
    • + + + BillsTab + true + + 5 + +
  • Stonecutting
    • +
  • Electricity
    • +     +     +     +     +     +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 1218e91..2605316 100644 --- a/About/About.xml +++ b/About/About.xml @@ -26,7 +26,7 @@ https://steamcommunity.com/sharedfiles/filedetails/?id=1546657623 [table] [tr] - [td][url=https://invite.gg/Mlie][img]https://i.imgur.com/zdzzBrc.png[/img][/url][/td] + [td][url=https://dsc.gg/mlie][img]https://i.imgur.com/zdzzBrc.png[/img][/url][/td] [td][url=https://github.com/emipa606/TinyWorkbenchs][img]https://i.imgur.com/kTkpTOE.png[/img][/url][/td] [/tr] [tr] @@ -66,5 +66,6 @@ These textures aren't up to 1.0 quality, and I'm a lazy person who made them all [*] If you have the solution for a problem, please post it to the GitHub repository. [/list] - + +[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423]Last updated 2023-03-28[/url] \ No newline at end of file diff --git a/About/Changelog.txt b/About/Changelog.txt index 5e26e26..e7ffaaa 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,5 +1,8 @@ # Changelog for TinyWorkbenchs +1.4.2 - Added tiny workbenches of [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1880253632]Vanilla Furniture Expanded - Production[/url] if loaded + + 1.4.1 - Mod updated for 1.4 and passed autotests diff --git a/About/Manifest.xml b/About/Manifest.xml index 0603720..2033b33 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ TinyWorkbenchs - 1.4.1 + 1.4.2 diff --git a/About/ModSync.xml b/About/ModSync.xml index 00b6f22..dab8747 100644 --- a/About/ModSync.xml +++ b/About/ModSync.xml @@ -2,7 +2,7 @@ 3b55fe60-bf16-410e-b0fa-91f9da742a9d Tiny Workbenchs (Continued) - 1.4.1 + 1.4.2 False emipa606 diff --git a/README.md b/README.md index 2b2a873..86933d5 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,5 @@ These textures aren't up to 1.0 quality, and I'm a lazy person who made them all - + +https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423]Last updated 2023-03-28 diff --git a/Source/TinyWorkbenches/TinyWorkbenches.cs b/Source/TinyWorkbenches/TinyWorkbenches.cs index 8e19188..69b39a4 100644 --- a/Source/TinyWorkbenches/TinyWorkbenches.cs +++ b/Source/TinyWorkbenches/TinyWorkbenches.cs @@ -13,8 +13,6 @@ static TinyWorkbenches() foreach (var bench in DefDatabase.AllDefsListForReading.Where(def => def.defName.StartsWith("TWB_"))) { var originalBench = ThingDef.Named(bench.defName.Replace("TWB_", "").Replace("Mini", "")); - Log.Message( - $"[TinyWorkbenches]: Cloning {originalBench.AllRecipes.Count} recipes from {originalBench.LabelCap} to {bench.LabelCap}"); foreach (var recipeDef in originalBench.AllRecipes) { if (bench.recipes == null) @@ -35,6 +33,26 @@ static TinyWorkbenches() workGiverDef.fixedBillGiverDefs.Add(bench); } } + + var affectionComp = bench.GetCompProperties(); + if (affectionComp == null) + { + continue; + } + + var originalComp = originalBench.GetCompProperties(); + if (originalComp == null) + { + continue; + } + + affectionComp.linkableFacilities = originalComp.linkableFacilities; + } + + foreach (var facility in DefDatabase.AllDefsListForReading.Where(def => + def.HasComp(typeof(CompFacility)))) + { + facility.GetCompProperties().ResolveReferences(facility); } } } \ No newline at end of file diff --git a/Source/TinyWorkbenches/TinyWorkbenches.csproj b/Source/TinyWorkbenches/TinyWorkbenches.csproj index 3a1bed5..8b267f9 100644 --- a/Source/TinyWorkbenches/TinyWorkbenches.csproj +++ b/Source/TinyWorkbenches/TinyWorkbenches.csproj @@ -6,11 +6,11 @@ false None latest - 1.4.1 + 1.4.2 - 1.4.3510-beta + * runtime compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_east.png b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_east.png new file mode 100644 index 0000000..b08e72e Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_east.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_north.png b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_north.png new file mode 100644 index 0000000..22d73eb Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_north.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_south.png b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_south.png new file mode 100644 index 0000000..dc9006d Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_FueledSmelterMini/TWB_VFE_FueledSmelterMini_south.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_east.png b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_east.png new file mode 100644 index 0000000..f7636c0 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_east.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_north.png b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_north.png new file mode 100644 index 0000000..629ac25 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_north.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_south.png b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_south.png new file mode 100644 index 0000000..3a7df09 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableButcherElectricMini/TWB_VFE_TableButcherElectricMini_south.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_east.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_east.png new file mode 100644 index 0000000..fb2183a Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_east.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_eastm.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_eastm.png new file mode 100644 index 0000000..fee5f73 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_eastm.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_north.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_north.png new file mode 100644 index 0000000..df98e14 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_north.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_northm.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_northm.png new file mode 100644 index 0000000..28137c8 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_northm.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_south.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_south.png new file mode 100644 index 0000000..b53fdfd Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_south.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_southm.png b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_southm.png new file mode 100644 index 0000000..da761cb Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableDrugLabElectricMini/TWB_VFE_TableDrugLabElectricMini_southm.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_east.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_east.png new file mode 100644 index 0000000..ccc5427 Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_east.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_eastm.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_eastm.png new file mode 100644 index 0000000..89c053a Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_eastm.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_north.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_north.png new file mode 100644 index 0000000..005b4ba Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_north.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_northm.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_northm.png new file mode 100644 index 0000000..02a7f2f Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_northm.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_south.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_south.png new file mode 100644 index 0000000..126042c Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_south.png differ diff --git a/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_southm.png b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_southm.png new file mode 100644 index 0000000..760a03a Binary files /dev/null and b/Textures/Things/Buildings/TWB_VFE_TableStonecutterElectricMini/TWB_VFE_TableStonecutterElectricMini_southm.png differ