marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Barrels accept oil

liquid_container
Mark 2016-02-07 16:03:51 +01:00
parent 3e85cdce92
commit 46fceea0e0
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/StringTblDE.txt
View File

@ -4,4 +4,5 @@ MaterialLava=Lava
MaterialDuroLava=Lava
MaterialWater=Wasser
MaterialFirefluid=Feuerdings
MaterialAcid=Säure
MaterialAcid=Säure
MaterialOil=Öl

3
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/StringTblUS.txt
View File

@ -4,4 +4,5 @@ MaterialLava=lava
MaterialDuroLava=lava
MaterialWater=water
MaterialFirefluid=fire stuff
MaterialAcid=acid
MaterialAcid=acid
MaterialOil=oil

2
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c
View File

@ -196,7 +196,7 @@ public func IsBarrel()
public func IsLiquidContainerForMaterial(string sznMaterial)
{
return WildcardMatch("Water",sznMaterial);
return WildcardMatch("Water", sznMaterial) || WildcardMatch("Oil", sznMaterial);
}
public func CanBeStackedWith(object other)

3
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/StringTblDE.txt
View File

@ -1,4 +1,5 @@
Name=Holzfass
Description=Behälter zum Transport von Flüssigkeiten.
NameWith=mit
MaterialWater=Wasser
MaterialWater=Wasser
MaterialOil=Öl

3
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/StringTblUS.txt
View File

@ -1,4 +1,5 @@
Name=Wooden Barrel
Description=Container for transporting liquids.
NameWith=with
MaterialWater=water
MaterialWater=water
MaterialOil=oil