From 98cfe13bf925b91f9f7b8c9af03bbfa0e1037686 Mon Sep 17 00:00:00 2001 From: Clonkonaut Date: Mon, 7 Apr 2014 23:15:40 +0200 Subject: [PATCH] Added metal chunk. --- .../Chunks.ocd/Metal.ocd/DefCore.txt | 15 +++++++++++ .../Chunks.ocd/Metal.ocd/Graphics.8.png | Bin 0 -> 3104 bytes .../Items.ocd/Chunks.ocd/Metal.ocd/Script.c | 25 ++++++++++++++++++ .../Chunks.ocd/Metal.ocd/StringTblDE.txt | 2 ++ .../Chunks.ocd/Metal.ocd/StringTblUS.txt | 2 ++ .../Items.ocd/Chunks.ocd/Ore.ocd/Script.c | 6 +---- .../Resources.ocd/Metal.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt | 2 +- .../Tools.ocd/Barrel.ocd/DefCore.txt | 2 +- .../Tools.ocd/Bucket.ocd/DefCore.txt | 2 +- .../Tools.ocd/Dynamite.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 +- .../Items.ocd/Tools.ocd/Pipe.ocd/DefCore.txt | 2 +- .../Tools.ocd/PowderKeg.ocd/DefCore.txt | 2 +- .../Tools.ocd/Shovel.ocd/DefCore.txt | 2 +- .../Tools.ocd/Sickle.ocd/DefCore.txt | 2 +- .../Tools.ocd/TeleGlove.ocd/DefCore.txt | 2 +- .../Tools.ocd/WallKit.ocd/DefCore.txt | 2 +- .../Tools.ocd/WindBag.ocd/DefCore.txt | 2 +- .../Weapons.ocd/Club.ocd/DefCore.txt | 2 +- .../GrenadeLauncher.ocd/DefCore.txt | 2 +- .../Weapons.ocd/IronBomb.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 +- .../Libraries.ocd/Producer.ocd/Script.c | 9 ------- .../Structures.ocd/Armory.ocd/DefCore.txt | 2 +- .../ChemicalLab.ocd/DefCore.txt | 2 +- .../Compensator.ocd/DefCore.txt | 2 +- .../Structures.ocd/Elevator.ocd/DefCore.txt | 2 +- .../Structures.ocd/Flagpole.ocd/DefCore.txt | 2 +- .../Structures.ocd/Foundry.ocd/Script.c | 3 +-- .../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/Shipyard.ocd/DefCore.txt | 2 +- .../SteamEngine.ocd/DefCore.txt | 2 +- .../ToolsWorkshop.ocd/DefCore.txt | 2 +- .../WindGenerator.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 +- 49 files changed, 87 insertions(+), 57 deletions(-) create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/DefCore.txt create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/Graphics.8.png create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/Script.c create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/StringTblDE.txt create mode 100644 planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/StringTblUS.txt diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/DefCore.txt new file mode 100644 index 000000000..83433ea96 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Chunk_Metal +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=15 +Mass=25 +Components=Chunk_Ore=1 +Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/Graphics.8.png b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Metal.ocd/Graphics.8.png new file mode 100644 index 0000000000000000000000000000000000000000..5eccebe9e44d554f09ae9a98ce676b68a9c77154 GIT binary patch literal 3104 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 - obj->Split2Components(); - // 1 frame delay, so the chunk can trigger the appriopriate carry heavy ending calls - // i.e. FxIntCarryHeavyStop -} - protected func RejectCollect(id item, object obj) { // Just return RejectEntrance for this object. diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt index c6eb4c219..63d41d446 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=Planks=3;Metal=2;Loam=2 +Components=Planks=3;Chunk_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 86b8c2970..bc111c53c 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=Chunk_Wood=3;Metal=3 +Components=Chunk_Wood=3;Chunk_Metal=3 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt index 700e84054..edd297004 100644 --- a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=0,-4,-4,10,10,10 VertexFriction=50, 50,50,100,100 Value=20 Mass=100 -Components=Coal=1;Metal=1 +Components=Chunk_Coal=1;Chunk_Metal=1 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt index 3d8f294a2..f14a749e4 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=Planks=3;Metal=1 +Components=Planks=3;Chunk_Metal=1 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt index cb7f98448..8e9a0a38b 100644 --- a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-34,-29,-29,34,34 VertexFriction=50,50,50,100,100 Value=200 Mass=100 -Components=Chunk_Wood=3;Metal=1 +Components=Chunk_Wood=3;Chunk_Metal=1 Picture=30,0,80,94 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c index df05ca6fe..693bdd104 100644 --- a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c @@ -14,7 +14,6 @@ func PowerNeed() { return 0; } public func Construction(object creator) { - //SetProperty("MeshTransformation",Trans_Rotate(RandomX(-40,20),0,1,0)); SetAction("Default"); AddTimer("CollectionZone", 1); @@ -33,7 +32,7 @@ private func ProductionTime(id toProduce) { return 290; } public func NeedRawMaterial(id rawmat_id) { - if (rawmat_id->~IsFuel() || rawmat_id == Ore || rawmat_id == Nugget) + if (rawmat_id->~IsFuel() || rawmat_id == Chunk_Ore || rawmat_id == Chunk_Gold) return true; return false; } diff --git a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt index 1fa3b9bf3..f2def34bd 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=Planks=3;Metal=3 +Components=Planks=3;Chunk_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 c980203c9..3513f11e6 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=Planks=3;Chunk_Rock=1;Metal=1 +Components=Planks=3;Chunk_Rock=1;Chunk_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 d3a793f59..69137c2d6 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=Planks=3;Metal=1;Chunk_Rock=1 +Components=Planks=3;Chunk_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 e84e66753..fdedc75fc 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=Planks=1;Metal=3; +Components=Planks=1;Chunk_Metal=3; Picture=3360,0,112,128,0,0 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt index da54ace8f..ffd15d5f3 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=Planks=12;Metal=6 +Components=Planks=12;Chunk_Metal=6 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt index da9c2d8a6..c3f1887be 100644 --- a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-4,-4,24,24,24 VertexFriction=50,50,100,100 Value=180 Mass=4000 -Components=Chunk_Rock=2;Metal=3 +Components=Chunk_Rock=2;Chunk_Metal=3 Collection=-33,7,12,12 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt index b2210cee5..3abcd4bd2 100644 --- a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-4,-3,19,19 VertexFriction=50,50,100,100 Value=200 Mass=4500 -Components=Chunk_Wood=6;Metal=3 +Components=Chunk_Wood=6;Chunk_Metal=3 Exclusive=1 Construction=1 ContainBlast=1 diff --git a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt index f00c1a65b..29173e3e4 100644 --- a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt @@ -11,7 +11,7 @@ VertexY=-27,-25,-25,34,34 VertexFriction=50,50,50,100,100 Value=45 Mass=900 -Components=Chunk_Wood=3;Metal=1 +Components=Chunk_Wood=3;Chunk_Metal=1 Exclusive=1 Construction=1 Rotate=1 diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt index 9005d09a8..d4ce6050d 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;Planks=4; +Components=Chunk_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 bcee663f6..ad0efa35d 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;Planks=4;Rope=2; +Components=Chunk_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 11565dd26..bd3dfdc78 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;Planks=2; +Components=Chunk_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 4d3b1657d..2ef2be563 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;Chunk_Wood=6; +Components=Chunk_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 17a48ce8f..254228156 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;Chunk_Wood=1; +Components=Chunk_Metal=2;Chunk_Wood=1; Collection=-12,-8,24,10 GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=30