Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge main upstream to my fork to update my main branch after resizing again #7

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

merge main upstream to my fork to update my main branch after resizing again #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f9cbe4
Merge pull request #3 from Chunnyluny-RimWorld-Modding/main
emipa606 Feb 16, 2024
886e354
Reverting to e17a02f
emipa606 Feb 16, 2024
176076f
[ImgBot] Optimize images
ImgBotApp Feb 19, 2024
d426724
Merge pull request #5 from emipa606/imgbot
emipa606 Feb 19, 2024
c7c2854
Some new textures, thanks to Chunnyluny! Also added a tiny paste-disp…
emipa606 Mar 7, 2024
2662910
[ImgBot] Optimize images
ImgBotApp Mar 9, 2024
6b5cbc4
Merge pull request #6 from emipa606/imgbot
emipa606 Mar 9, 2024
060d202
Mod updated for 1.5 and passed autotests
emipa606 Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 1.2/Defs/ThingsDefs/Buildings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -352,6 +353,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -483,6 +485,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
Expand Down
3 changes: 3 additions & 0 deletions 1.3/Defs/ThingsDefs/Buildings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -357,6 +358,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -485,6 +487,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
Expand Down
66 changes: 66 additions & 0 deletions 1.4/Defs/ThingsDefs/Buildings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -358,6 +359,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
Expand Down Expand Up @@ -486,6 +488,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
Expand Down Expand Up @@ -548,4 +551,67 @@
</statBases>
<inspectorTabs Inherit="False" />
</ThingDef>
<ThingDef ParentName="BuildingBase">
<defName>TWB_NutrientPasteDispenser</defName>
<label>tiny nutrient paste dispenser</label>
<description>A tiny machine that synthesizes edible nutrient paste from organic feedstocks placed in adjacent hoppers. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste. Accepts raw food, but not rough plant matter like hay.</description>
<thingClass>Building_NutrientPasteDispenser</thingClass>
<graphicData>
<texPath>Things/Buildings/TWB_NutrientDispenserMini/TWB_NutrientDispenserMini</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<color>(232,255,191)</color>
<shaderType>CutoutComplex</shaderType>
<drawSize>(1.1,1.1)</drawSize>
</graphicData>
<altitudeLayer>Building</altitudeLayer>
<passability>Impassable</passability>
<blockWind>true</blockWind>
<fillPercent>1</fillPercent>
<uiIconScale>0.7</uiIconScale>
<statBases>
<WorkToBuild>2700</WorkToBuild>
<MaxHitPoints>75</MaxHitPoints>
<Flammability>0.5</Flammability>
</statBases>
<building>
<isMealSource>true</isMealSource>
<wantsHopperAdjacent>true</wantsHopperAdjacent>
<nutritionCostPerDispense>0.4</nutritionCostPerDispense>
<soundDispense>DispensePaste</soundDispense>
<forceShowRoomStats>true</forceShowRoomStats>
<buildingTags>
<li>Production</li>
</buildingTags>
<destroySound>BuildingDestroyed_Metal_Small</destroySound>
</building>
<comps>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>75</basePowerConsumption>
</li>
<li Class="CompProperties_Flickable" />
<li Class="CompProperties_Breakdownable" />
</comps>
<size>(1,1)</size>
<costList>
<Steel>75</Steel>
<ComponentIndustrial>1</ComponentIndustrial>
</costList>
<placeWorkers>
<li>PlaceWorker_PreventInteractionSpotOverlap</li>
</placeWorkers>
<socialPropernessMatters>true</socialPropernessMatters>
<interactionCellOffset>(0,0,-1)</interactionCellOffset>
<hasInteractionCell>true</hasInteractionCell>
<terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
<designationCategory>Production</designationCategory>
<uiOrder>2130</uiOrder>
<constructEffect>ConstructMetal</constructEffect>
<canOverlapZones>false</canOverlapZones>
<constructionSkillPrerequisite>5</constructionSkillPrerequisite>
<researchPrerequisites>
<li>NutrientPaste</li>
<li>TWB_TinyWorkBenchs</li>
</researchPrerequisites>
</ThingDef>
</Defs>
Binary file added 1.5/Assemblies/TinyWorkbenches.dll
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions 1.5/Defs/ResearchProjectDefs/ResearchProjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<ResearchProjectDef>
<defName>TWB_TinyWorkBenchs</defName>
<label>Tiny Workbenchs</label>
<description>Allows for tiny workbenchs. The small size makes them cheap, but fragile and slow.</description>
<baseCost>500</baseCost>
<techLevel>Medieval</techLevel>
<prerequisites>
<li>ComplexFurniture</li>
</prerequisites>
<researchViewX>2.00</researchViewX>
<researchViewY>4.05</researchViewY>
</ResearchProjectDef>
</Defs>
Loading