Skip to content

Commit 8224df2

Browse files
SkullywagSkullywag
authored
Merge pull request #23 from DoctorVanGogh/master
Releaseable version
2 parents 8158b46 + 970cd2f commit 8224df2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1477
-542
lines changed

‎.gitattributes

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# These files are text and should be normalized (Convert crlf => lf)
2+
*.cs text
3+
*.sln text
4+
*.crproj text
5+
*.xml text
6+
*.html text
7+
8+
# These files are binary and should be left untouched
9+
# (binary is a macro for -text -diff)
10+
*.png binary
11+
*.jpg binary
12+
*.jpeg binary
13+
*.gif binary
14+
*.ico binary
15+
*.mov binary
16+
*.mp4 binary
17+
*.mp3 binary
18+
*.flv binary
19+
*.fla binary
20+
*.swf binary
21+
*.gz binary
22+
*.zip binary
23+
*.7z binary
24+
*.ttf binary
25+
26+
# Auto detect text files and perform LF normalization
27+
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
28+
* text=auto
29+
30+
# diff hints
31+
32+
# Documents
33+
*.doc diff=astextplain
34+
*.DOC diff=astextplain
35+
*.docx diff=astextplain
36+
*.DOCX diff=astextplain
37+
*.dot diff=astextplain
38+
*.DOT diff=astextplain
39+
*.pdf diff=astextplain
40+
*.PDF diff=astextplain
41+
*.rtf diff=astextplain
42+
*.RTF diff=astextplain
43+
44+
*.cs diff=csharp

‎Assemblies/ExtendedStorage.dll

10.5 KB
Binary file not shown.

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Version 2.5(???)
2+
3+
_Upgrading to this version in an existing savegame is fully supported._
4+
5+
- Items are no longer stored as one giant stack on the output cell, but as multiple regular sized stacks. Allows multiple pawns picking up/queueing items from the same storage building at once. Also prevents (a mostly rare) issue on save/load where giant stacks might get truncated to regular stack sizes on load.
6+
- Storage buildings now show a cumulative item count on the output slot (or the lowest quality for Clothing racks).
7+
- Stored items now correctly use single/some/max stacksize icons for stored items.
8+
- Storage buildings can be renamed.
9+
- Changed capacity limits for storage buildings. Buildings no longer have a hard number of items they can store, but a multiplier relative to a regular stack's size. This change leads to - at worst - unchanged capacity (for normal items), a slightly better capacity for small size items, or significantly better capacity for 'odd' stack size items like Chemfuel, Hay or Pills.
10+
11+
Building | New capacity
12+
--- | ---:
13+
Basket | 667 %
14+
Fabric Hemper | 533 %
15+
HazMat Container | 250 %
16+
Clothing rack | 1000 %
17+
Med. Cabinet | 400 %
18+
Skip | 1200 %
19+
Tray rack | 1000 %
20+
Pallet | 800 %
21+
22+
- Stored items are now ejected on storage building minification/exclusion by filter
23+
- Items stored in clothing rack can now all be selected for force wear in right click popup menu.
24+
- Changed internal workings so mods like [StorageSearch](http://steamcommunity.com/sharedfiles/filedetails/?id=726479594) can filter Extended Storage buildings

‎Defs/Injectors/injector.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Defs/ModHelperDefs/Injector.xml.bak

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Defs/StatDefs/StatCategories.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Defs>
3+
<StatCategoryDef>
4+
<defName>ExtendedStorage</defName>
5+
<label>Extended Storage</label>
6+
<displayOrder>50</displayOrder>
7+
<displayAllByDefault>true</displayAllByDefault>
8+
</StatCategoryDef>
9+
</Defs>

‎Defs/StatDefs/Stats_Storage.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Defs>
3+
4+
<StatDef>
5+
<defName>ES.StorageFactor</defName>
6+
<label>storage capacity</label>
7+
<description>The total amount of items this building can store compared to a regular stack's size.</description>
8+
<category>ExtendedStorage</category>
9+
<defaultBaseValue>1</defaultBaseValue>
10+
<minValue>1</minValue>
11+
<toStringStyle>PercentZero</toStringStyle>
12+
<showIfUndefined>false</showIfUndefined>
13+
<displayPriorityInCategory>0</displayPriorityInCategory>
14+
</StatDef>
15+
16+
</Defs>

‎Defs/ThingDefs/Storage/Storage_Basket.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
<repairEffect>Repair</repairEffect>
1313
<leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
1414
<filthLeaving>BuildingRubble</filthLeaving>
15+
<drawGUIOverlay>true</drawGUIOverlay>
1516
</ThingDef>
1617

1718
<!--============================== Storage ===========================-->
1819

19-
<ExtendedStorage.ESdef ParentName="BuildingBase">
20+
<ThingDef ParentName="BuildingBase">
2021
<defName>Storage_Basket</defName>
2122
<label>Food Basket</label>
2223
<thingClass>ExtendedStorage.Building_ExtendedStorage</thingClass>
@@ -25,7 +26,6 @@
2526
<graphicClass>Graphic_Multi</graphicClass>
2627
<drawSize>(4,3)</drawSize>
2728
</graphicData>
28-
<maxStorage>500</maxStorage>
2929
<altitudeLayer>Building</altitudeLayer>
3030
<passability>PassThroughOnly</passability>
3131
<castEdgeShadows>true</castEdgeShadows>
@@ -34,6 +34,7 @@
3434
<WorkToBuild>580</WorkToBuild>
3535
<Flammability>1.0</Flammability>
3636
<Beauty>8</Beauty>
37+
<ES.StorageFactor>6.67</ES.StorageFactor>
3738
</statBases>
3839
<description>Haulers carry raw food and plant matter here for storage.</description>
3940
<size>(2,1)</size>
@@ -75,6 +76,6 @@
7576
<tradeTags>
7677
<li>Furniture</li>
7778
</tradeTags>
78-
</ExtendedStorage.ESdef>
79+
</ThingDef>
7980

8081
</Buildings>

‎Defs/ThingDefs/Storage/Storage_FabricHamper.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<!--============================== Storage ===========================-->
55

6-
<ExtendedStorage.ESdef ParentName="BuildingBase">
6+
<ThingDef ParentName="BuildingBase">
77
<defName>Storage_FabricHamper</defName>
88
<label>Fabric Hamper</label>
99
<thingClass>ExtendedStorage.Building_ExtendedStorage</thingClass>
@@ -13,7 +13,6 @@
1313
<drawSize>(4,2)</drawSize>
1414
<shaderType>CutoutComplex</shaderType>
1515
</graphicData>
16-
<maxStorage>400</maxStorage>
1716
<altitudeLayer>Building</altitudeLayer>
1817
<passability>PassThroughOnly</passability>
1918
<castEdgeShadows>true</castEdgeShadows>
@@ -22,6 +21,7 @@
2221
<WorkToBuild>580</WorkToBuild>
2322
<Flammability>1.0</Flammability>
2423
<Beauty>4</Beauty>
24+
<ES.StorageFactor>5.33</ES.StorageFactor>
2525
</statBases>
2626
<description>Haulers carry textiles here for storage.</description>
2727
<size>(2,1)</size>
@@ -55,6 +55,6 @@
5555
<tradeTags>
5656
<li>Furniture</li>
5757
</tradeTags>
58-
</ExtendedStorage.ESdef>
58+
</ThingDef>
5959

6060
</Buildings>

‎Defs/ThingDefs/Storage/Storage_HazMatContainer.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<!--============================== Storage ===========================-->
55

6-
<ExtendedStorage.ESdef ParentName="BuildingBase">
6+
<ThingDef ParentName="BuildingBase">
77
<defName>Storage_HazMatContainer</defName>
88
<label>HazMat Container</label>
99
<thingClass>ExtendedStorage.Building_ExtendedStorage</thingClass>
@@ -12,7 +12,6 @@
1212
<graphicClass>Graphic_Multi</graphicClass>
1313
<drawSize>(4,3)</drawSize>
1414
</graphicData>
15-
<maxStorage>600</maxStorage>
1615
<altitudeLayer>Building</altitudeLayer>
1716
<passability>PassThroughOnly</passability>
1817
<castEdgeShadows>true</castEdgeShadows>
@@ -21,6 +20,7 @@
2120
<WorkToBuild>580</WorkToBuild>
2221
<Flammability>1.0</Flammability>
2322
<Beauty>-2</Beauty>
23+
<ES.StorageFactor>2.5</ES.StorageFactor>
2424
</statBases>
2525
<description>Haulers carry radioactive materials here for storage.</description>
2626
<size>(2,1)</size>
@@ -53,6 +53,6 @@
5353
<tradeTags>
5454
<li>Furniture</li>
5555
</tradeTags>
56-
</ExtendedStorage.ESdef>
56+
</ThingDef>
5757

5858
</Buildings>

0 commit comments

Comments
 (0)