From 59ee596d35cb2c0d7e4ac48c34cc8b582b4aa84e Mon Sep 17 00:00:00 2001 From: Clonkonaut Date: Thu, 3 Apr 2014 18:16:57 +0200 Subject: [PATCH] Added planks- Get some them from the sawmill. Reworked quite a lot of production costs to either planks or chunk_wood. Haven't done a thourough search. I expact that soon Chunk_Wood is renamed into Wood anyway, so any errors will solve themselves. --- .../Chunks.ocd/Planks.ocd/DefCore.txt | 17 ++++++ .../Chunks.ocd/Planks.ocd/Graphics.8.png | Bin 0 -> 3204 bytes .../Items.ocd/Chunks.ocd/Planks.ocd/Script.c | 24 ++++++++ .../Chunks.ocd/Planks.ocd/StringTblDE.txt | 2 + .../Chunks.ocd/Planks.ocd/StringTblUS.txt | 2 + .../Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt | 2 +- .../Items.ocd/Chunks.ocd/Wood.ocd/Script.c | 2 +- .../Items.ocd/Resources.ocd/Wood.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt | 2 +- .../Tools.ocd/Barrel.ocd/DefCore.txt | 2 +- .../Tools.ocd/Boompack.ocd/DefCore.txt | 2 +- .../Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt | 2 +- .../Tools.ocd/DynamiteBox.ocd/DefCore.txt | 2 +- .../Tools.ocd/GrappleBow.ocd/DefCore.txt | 2 +- .../Tools.ocd/Hammer.ocd/DefCore.txt | 2 +- .../Tools.ocd/Pickaxe.ocd/DefCore.txt | 2 +- .../Tools.ocd/Ropebridge.ocd/DefCore.txt | 2 +- .../Tools.ocd/Ropeladder.ocd/DefCore.txt | 2 +- .../Tools.ocd/Shovel.ocd/DefCore.txt | 2 +- .../Tools.ocd/Sickle.ocd/DefCore.txt | 2 +- .../Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Club.ocd/DefCore.txt | 2 +- .../GrenadeLauncher.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Javelin.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Musket.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Shield.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Sword.ocd/DefCore.txt | 2 +- .../Structures.ocd/Armory.ocd/DefCore.txt | 2 +- .../ChemicalLab.ocd/DefCore.txt | 2 +- .../Structures.ocd/Chest.ocd/DefCore.txt | 2 +- .../Structures.ocd/Elevator.ocd/DefCore.txt | 2 +- .../InventorsLab.ocd/DefCore.txt | 2 +- .../Structures.ocd/Kitchen.ocd/DefCore.txt | 2 +- .../Structures.ocd/Loom.ocd/DefCore.txt | 2 +- .../Structures.ocd/Pump.ocd/DefCore.txt | 2 +- .../Structures.ocd/Sawmill.ocd/Script.c | 54 ++++-------------- .../Structures.ocd/Shipyard.ocd/DefCore.txt | 2 +- .../Structures.ocd/Windmill.ocd/DefCore.txt | 2 +- .../WoodenCabin.ocd/DefCore.txt | 2 +- .../Vehicles.ocd/Airplane.ocd/DefCore.txt | 2 +- .../Vehicles.ocd/Airship.ocd/DefCore.txt | 2 +- .../Vehicles.ocd/Cannon.ocd/DefCore.txt | 2 +- .../Vehicles.ocd/Catapult.ocd/DefCore.txt | 2 +- .../Vehicles.ocd/Lorry.ocd/DefCore.txt | 2 +- 44 files changed, 94 insertions(+), 81 deletions(-) create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt new file mode 100644 index 000000000..8ec7a0d70 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt @@ -0,0 +1,17 @@ +[DefCore] +id=Planks +Version=4,10,0,0 +Category=C4D_Object +Width=12 +Height=12 +Offset=-6,-6 +Vertices=3 +VertexX=0,4,-4 +VertexY=3,-3,-3 +VertexFriction=40,40,40 +Value=6 +Mass=16 +Components=Chunk_Wood=1 +Rotate=1 +Float=1 +StretchGrowth=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png new file mode 100644 index 0000000000000000000000000000000000000000..6602dd9268dfb52cd02bd965ea63cd209bd3a15c GIT binary patch literal 3204 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 bfX5Sn^<0~pFk3-_D++WqjWjA@_F?}4@cPz1 literal 0 HcmV?d00001 diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c new file mode 100644 index 000000000..c7c5ae9f2 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c @@ -0,0 +1,24 @@ +/*--- Planks ---*/ + +#include Library_CarryHeavy + +public func GetCarryMode(clonk) { return CARRY_BothHands; } +public func GetCarryPhase() { return 800; } + +protected func Hit() +{ + Sound("WoodHit?"); +} + +public func IsFuel() { return true; } +public func GetFuelAmount() { return 150; } +public func IsChunk() { return true; } +public func IsSawmillProduct() { return true; } + +local Name = "$Name$"; +local Description = "$Description$"; +local Rebuy = true; +local BlastIncinerate = 5; +local ContactIncinerate = 1; +local Touchable = 2; +local Plane = 470; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt new file mode 100644 index 000000000..ad07a8e9d --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt @@ -0,0 +1,2 @@ +Name=Holz +Description=Geeignet als Bau- oder Brennmaterial. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt new file mode 100644 index 000000000..3768fd152 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt @@ -0,0 +1,2 @@ +Name=Log +Description=Needed for construction or as fuel. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt index 9548f01a2..665026f5f 100644 --- a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=3,-3,-3 VertexFriction=40,40,40 Value=6 Mass=16 -Components=Wood=3 +Components=Chunk_Wood=1 Rotate=1 Float=1 StretchGrowth=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c index 6a2454bde..18707eb2e 100644 --- a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c @@ -20,7 +20,7 @@ protected func Hit() public func IsFuel() { return true; } public func GetFuelAmount() { return 150; } public func IsChunk() { return true; } -public func IsSawmillProduct() { return true; } +public func IsSawmillIngredient() { return true; } local Name = "$Name$"; local Description = "$Description$"; diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c index 90d4883c0..9a092a767 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c @@ -13,7 +13,7 @@ func Incineration() public func IsFuel() { return true; } public func GetFuelAmount() { return 50; } -public func IsSawmillProduct() { return true; } +//public func IsSawmillProduct() { return true; } local Collectible = 1; local Name = "$Name$"; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt index 616a87a0e..ffbcc41f6 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=0,3,-3 VertexFriction=50,50,50 Value=15 Mass=12 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt index 201aa92e8..eb7b3175b 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-6,-6,6,6,0,0 VertexFriction=60,60,60,60,60,60 Value=12 Mass=20 -Components=Wood=2;Metal=1; +Components=Chunk_Wood=2;Metal=1; Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt index ec65b2b6e..897203d65 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=3,-6,10,10 VertexFriction=80,60,60 Value=12 Mass=20 -Components=PowderKeg=1;Firestone=1;Wood=1; +Components=PowderKeg=1;Firestone=1;Planks=1; Rotate=1 ColorByOwner=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt index dca86bff1..34c331f5c 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt @@ -10,7 +10,7 @@ VertexX=-4,-4,5,5 VertexY=-2,5,-2,5 VertexCNAT=5,9,6,10 VertexFriction=25,25,25,25 -Components=Wood=3; +Components=Chunk_Wood=3; Construction=1 Value=6 Mass=12 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt index b8fb29923..cc44c257f 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt @@ -12,5 +12,5 @@ VertexFriction=50,50,50,50 Picture=0,0,64,64 Value=16 Mass=30 -Components=Wood=1;Coal=2;Firestone=2 +Components=Planks=1;Coal=2;Firestone=2 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt index b7cef8452..df5518d15 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=0,0 VertexFriction=80,80 Value=12 Mass=10 -Components=Wood=2;Metal=1;Rope=1; +Components=Planks=2;Metal=1;Rope=1; Rotate=1 Float=2 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt index 0f87b9b52..4246d1f41 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=1,5,-2,-2 VertexFriction=80,80,80,80 Value=3 Mass=15 -Components=Wood=1;Rock=1; +Components=Chunk_Wood=1;Rock=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt index 771b94744..31a2ca9e7 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-6,-5,-5,4 VertexFriction=50,100,100,40 Value=10 Mass=20 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt index c871cccfe..d46382fc2 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=4,-3,-3 VertexFriction=100,100,100 Value=8 Mass=10 -Components=Wood=2;Rope=2; +Components=Chunk_Wood=2;Rope=2; Rotate=1 NoStabilize=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt index 1fdd10f9d..fa812c3cb 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=4,-3,-3 VertexFriction=100,100,100 Value=8 Mass=10 -Components=Wood=2;Rope=1; +Components=Chunk_Wood=2;Rope=1; Rotate=1 NoStabilize=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt index 485c0620d..558fe1e12 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt @@ -11,5 +11,5 @@ VertexY=-7,9,0 VertexFriction=50,50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt index 8a55b9630..2272558c9 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt @@ -11,5 +11,5 @@ VertexY=0,0,0 VertexFriction=50,50,100 Value=10 Mass=10 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt index 8b360e064..b9bf52835 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-10,-10,10,10 VertexFriction=100,100,100,100,100 Value=8 Mass=10 -Components=Wood=3; +Components=Chunk_Wood=3; Rotate=1 Float=2 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt index 425344d79..8f294f804 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-7,7 VertexFriction=50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt index 6a85912da..58ee5e3ac 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt @@ -11,5 +11,5 @@ VertexY=0,0,2,0 VertexFriction=50,50,70 Value=25 Mass=15 -Components=Metal=3;Wood=1; +Components=Metal=3;Planks=1; Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt index 19a78a65c..e960fb510 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-12,13 VertexFriction=100,50 Value=12 Mass=9 -Components=Wood=2;Metal=1; +Components=Chunk_Wood=2;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt index 023157a5b..c8ec346d9 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt @@ -11,5 +11,5 @@ VertexY=0,0,2,0 VertexFriction=50,50,70 Value=18 Mass=15 -Components=Metal=2;Wood=1; +Components=Metal=2;Chunk_Wood=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt index 93f4830af..81ccca5ac 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt @@ -11,5 +11,5 @@ VertexY=-4,5,-2,-2 VertexFriction=50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt index ffec21760..cc1e1ff9c 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt @@ -11,6 +11,6 @@ VertexY=-7,7 VertexFriction=50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; +Components=Chunk_Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt index 0ab579d26..c6eb4c219 100644 --- a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-13,-15,-14,24,24,24 VertexFriction=50,50,50,100,100,100 Value=200 Mass=4500 -Components=Wood=3;Metal=2;Loam=2 +Components=Planks=3;Metal=2;Loam=2 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt index e8c592352..86b8c2970 100644 --- a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-17,-25,-14,25,25,25 VertexFriction=50,50,50,100,100,100 Value=200 Mass=4500 -Components=Wood=3;Metal=3 +Components=Chunk_Wood=3;Metal=3 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt index bc06f465e..76a0a294c 100644 --- a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt @@ -10,7 +10,7 @@ VertexX=-8,-8,8,8 VertexY=-2,11,-2,11 VertexCNAT=5,9,6,10 VertexFriction=50,50,100,100 -Components=Wood=3; +Components=Chunk_Wood=3; Construction=1 Value=15 Mass=10 diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt index 9397424e0..3d8f294a2 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-27,-27,32,32,32 VertexFriction=50,50,100,100,100 Value=50 Mass=1500 -Components=Wood=3;Metal=1 +Components=Planks=3;Metal=1 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt index 44c3f3e91..1fa3b9bf3 100644 --- a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=41,-41, 41,41,41,11,2 VertexFriction=100,10,100,100,100,10,10 Value=200 Mass=4500 -Components=Wood=3;Metal=3 +Components=Planks=3;Metal=3 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt index 191a5aaab..c980203c9 100644 --- a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-17,-25,-14,25,25,25 VertexFriction=50,50,50,100,100,100 Value=200 Mass=4500 -Components=Wood=3;Chunk_Rock=1;Metal=1 +Components=Planks=3;Chunk_Rock=1;Metal=1 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt index 763689d22..d3a793f59 100644 --- a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-4,-3,14,14 VertexFriction=50,50,100,100 Value=100 Mass=1000 -Components=Wood=3;Metal=1;Chunk_Rock=1 +Components=Planks=3;Metal=1;Chunk_Rock=1 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt index 593c0e1fe..e84e66753 100644 --- a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-3,15,15 VertexFriction=50,100,100 Value=40 Mass=400 -Components=Wood=1;Metal=3; +Components=Planks=1;Metal=3; Picture=3360,0,112,128,0,0 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c index d7334dd83..17ab53384 100644 --- a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c @@ -2,7 +2,7 @@ Sawmill Authors: Ringwaul, Clonkonaut - Cuts trees or other objects into wood. Accepts only objects purely made from wood. + Cuts trees or other objects into planks. Accepts only objects purely made from planks. --*/ #include Library_Structure @@ -19,31 +19,14 @@ public func Construction(object creator) public func Initialize() { this.SpinAnimation = PlayAnimation("work", 10, Anim_Const(0), Anim_Const(1000)); - AddTimer("CollectionZone", 1); return _inherited(...); } /*-- Interaction --*/ -// Sawmill can't be accessed as a container. -public func IsContainer() { return false; } - -// Sawmill can't be interacted with. -public func IsInteractable() { return false; } - -// Automatically search for trees in front of sawmill -// Temporary solution? -protected func FindTrees() -{ - var tree = FindObject(Find_AtPoint(), Find_Func("IsTree"), Find_Not(Find_Func("IsStanding")), Find_Func("GetComponent", Wood)); - if (!tree) return; - - Saw(tree); -} - private func CheckWoodObject(object target) { - if (target->GetComponent(nil, 0) != Wood) return false; + if (target->GetComponent(nil, 0) != Planks) return false; if (target->GetComponent(nil, 1)) return false; return true; } @@ -52,20 +35,11 @@ private func CheckWoodObject(object target) private func IgnoreKnowledge() { return true; } -public func Saw(object target) -{ - target->Enter(this); - var output = target->GetComponent(Wood); - target->Split2Components(); - AddToQueue(Wood, output); - return true; -} - private func IsProduct(id product_id) { return product_id->~IsSawmillProduct(); } -private func ProductionTime(id toProduce) { return 100; } +private func ProductionTime(id toProduce) { return 400; } private func PowerNeed() { return 50; } public func NeedRawMaterial(id rawmat_id) @@ -108,23 +82,17 @@ public func OnProductionFinish(id product) } } -// Timer, check for objects to collect in the designated collection zone -func CollectionZone() -{ - if (GetCon() < 100) return; - - // Only take one tree at a time - if (!(FrameCounter() % 35)) - if (GetLength(queue) == 0) - FindTrees(); -} - -protected func Collection() +func Collection() { Sound("Clonk"); return _inherited(...); } +func Collection2() +{ + if (!GetQueue()[0]) AddToQueue(Planks, 1); +} + public func FxSawingTimer(object target, proplist effect, int time) { var dir = GetCalcDir(); @@ -145,8 +113,8 @@ public func OnProductEjection(object product) protected func RejectCollect(id id_def, object collect) { - // Don't collect wood - if (id_def == Wood) + // Don't collect planks + if (id_def == Planks) return true; if (collect->~IsSawmillIngredient() || CheckWoodObject(collect)) return false; diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt index 33d13c576..da54ace8f 100644 --- a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=53,53,53, 3, 3,-17 VertexFriction=100,100,100,50,50,50 Value=200 Mass=4500 -Components=Wood=12;Metal=6 +Components=Planks=12;Metal=6 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt index 941a71def..388c4a08e 100644 --- a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-10,-20,47,47,-20 VertexFriction=50,50,100,100,50 Value=150 Mass=2500 -Components=Chunk_Rock=1;Wood=2; +Components=Chunk_Rock=1;Planks=2; Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt index 8d844eb61..e83689354 100644 --- a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-7,-6,19,19,4,19,-4,19 VertexFriction=50,50,100,100 Value=200 Mass=4000 -Components=Wood=5;Chunk_Rock=1 +Components=Chunk_Wood=5;Chunk_Rock=1 Entrance=-12,0,13,20 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt index 936e0c3b8..9005d09a8 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt @@ -13,7 +13,7 @@ VertexFriction=50,50,50,15,5,5,15,5,5 Value=60 Mass=300 ColorByOwner=1 -Components=Metal=6;Wood=4; +Components=Metal=6;Planks=4; Rotate=1 Entrance=-12,-12,24,24 Exclusive=1 diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt index 515b54038..bcee663f6 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt @@ -12,7 +12,7 @@ VertexCNAT=0,4,5,6,1,2,1,2,9,10,8 VertexFriction=0,20,20,20,20,20,20,20,80,80,80 Value=50 Mass=5000 -Components=Metal=4;Wood=4;Rope=2; +Components=Metal=4;Planks=4;Rope=2; Float=-27; SolidMask=0,0,36,4,11,49 Picture=128,0,128,128,0,0 diff --git a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt index a2c0d2a68..11565dd26 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt @@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=50 Mass=125 -Components=Metal=4;Wood=2; +Components=Metal=4;Planks=2; GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=30 UprightAttach=8 diff --git a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt index ce1dabe84..4d3b1657d 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt @@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=50 Mass=125 -Components=Metal=1;Wood=6; +Components=Metal=1;Chunk_Wood=6; Entrance=-12,-12,24,24 RotatedEntrance=1 GrabPutGet=C4D_GrabGet|C4D_GrabPut diff --git a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt index 4db4d0064..17a48ce8f 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt @@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=20 Mass=75 -Components=Metal=2;Wood=1; +Components=Metal=2;Chunk_Wood=1; Collection=-12,-8,24,10 GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=30