diff --git a/planet/Arena.ocf/MeltingCastle.ocs/IceWallKit.ocd/DefCore.txt b/planet/Arena.ocf/MeltingCastle.ocs/IceWallKit.ocd/DefCore.txt index 5f5516c70..0b6d098b0 100644 --- a/planet/Arena.ocf/MeltingCastle.ocs/IceWallKit.ocd/DefCore.txt +++ b/planet/Arena.ocf/MeltingCastle.ocs/IceWallKit.ocd/DefCore.txt @@ -12,6 +12,5 @@ VertexCNAT=1,2,16 VertexFriction=30,30,30 Value=8 Mass=12 -Components=Ice=2 Rotate=1 Picture=0,20,64,64 diff --git a/planet/Decoration.ocd/Misc.ocd/LotsOfCoins.ocd/DefCore.txt b/planet/Decoration.ocd/Misc.ocd/LotsOfCoins.ocd/DefCore.txt index 38d8e78e9..a693d133e 100644 --- a/planet/Decoration.ocd/Misc.ocd/LotsOfCoins.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Misc.ocd/LotsOfCoins.ocd/DefCore.txt @@ -5,5 +5,4 @@ Category=C4D_StaticBack Width=55 Height=17 Offset=-27,-8 -Mass=1000 -Components=GoldBar=20 +Mass=1000 \ No newline at end of file diff --git a/planet/Decoration.ocd/Relics.ocd/Bone.ocd/DefCore.txt b/planet/Decoration.ocd/Relics.ocd/Bone.ocd/DefCore.txt index 7b4c4f798..321217e9c 100644 --- a/planet/Decoration.ocd/Relics.ocd/Bone.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Relics.ocd/Bone.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=-3,3 VertexFriction=50,50 Value=1 Mass=2 -Components=Wood=1 Rotate=1 StretchGrowth=1 diff --git a/planet/Decoration.ocd/Relics.ocd/Skull.ocd/DefCore.txt b/planet/Decoration.ocd/Relics.ocd/Skull.ocd/DefCore.txt index d93f178a2..a32013bca 100644 --- a/planet/Decoration.ocd/Relics.ocd/Skull.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Relics.ocd/Skull.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=-5,-4,-5,5,5 VertexFriction=50,50,50,50,50 Value=2 Mass=6 -Components=Wood=1 Rotate=1 StretchGrowth=1 diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/DefCore.txt b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/DefCore.txt index 5c5948413..854ba7298 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0,0 VertexY=40,38,30,20,10,0,-10,-20,-30,-35 VertexCNAT=8,16,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,25,50,50,50 -Components=Wood=5 Mass=120 StretchGrowth=1 Oversize=1 diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/DefCore.txt b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/DefCore.txt index b761c142f..a86d82aa4 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0,0 VertexY=40,38,30,20,10,0,-10,-20,-30,-35 VertexCNAT=8,16,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,25,50,50,50 -Components=Wood=5 Mass=150 StretchGrowth=1 Oversize=1 diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Script.c b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Script.c index 905c31283..0afc284b2 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Script.c +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Script.c @@ -18,4 +18,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/DefCore.txt b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/DefCore.txt index b1b874ca4..ab7dd1bbb 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0 VertexY=20,10,0,-10,-20 VertexCNAT=8,16,16,16,4 VertexFriction=50,25,25,25,50 -Components=Wood=5 Mass=150 StretchGrowth=1 Oversize=1 diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/DefCore.txt b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/DefCore.txt index a005d099f..5b4cd7683 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0 VertexY=20,10,0,-10,-20 VertexCNAT=8,16,16,16,4 VertexFriction=50,25,25,25,50 -Components=Wood=4 Mass=110 StretchGrowth=1 Oversize=1 diff --git a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Script.c b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Script.c index 2ae27b19f..c5f8d94f4 100644 --- a/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Script.c +++ b/planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Script.c @@ -18,4 +18,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 4]]; \ No newline at end of file diff --git a/planet/Decoration.ocd/Village.ocd/ManaAltar.ocd/DefCore.txt b/planet/Decoration.ocd/Village.ocd/ManaAltar.ocd/DefCore.txt index 40a03376e..692029c42 100644 --- a/planet/Decoration.ocd/Village.ocd/ManaAltar.ocd/DefCore.txt +++ b/planet/Decoration.ocd/Village.ocd/ManaAltar.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=1,-1,-1 VertexFriction=20 Value=1 Mass=10 -Components=EnvPack_ManaAltar=1 Projectile=1 Rotate=1 diff --git a/planet/Experimental.ocd/Hatch.ocd/DefCore.txt b/planet/Experimental.ocd/Hatch.ocd/DefCore.txt index a3a02cc91..a6a473a55 100644 --- a/planet/Experimental.ocd/Hatch.ocd/DefCore.txt +++ b/planet/Experimental.ocd/Hatch.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=0,0,0,6,6 VertexFriction=100,100,100,100,100 VertexCNAT=64,1,2,1,2 SolidMask=0,0,20,20,0,0 -Components=Wood=4; Construction=1 Mass=10 diff --git a/planet/Experimental.ocd/LiftTower.ocd/DefCore.txt b/planet/Experimental.ocd/LiftTower.ocd/DefCore.txt index 6439b13ee..7e492a26f 100644 --- a/planet/Experimental.ocd/LiftTower.ocd/DefCore.txt +++ b/planet/Experimental.ocd/LiftTower.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-11,11,-11,11 VertexY=-10,-10,58,58 VertexFriction=50,50,100,100 Mass=4500 -Components=Metal=2;Wood=4; Exclusive=1 Construction=1 \ No newline at end of file diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Items.ocd/CableReel.ocd/DefCore.txt b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Items.ocd/CableReel.ocd/DefCore.txt index 2640f4229..b0f2d4955 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Items.ocd/CableReel.ocd/DefCore.txt +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Items.ocd/CableReel.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=1,-1,-1 VertexFriction=50,50,50 Value=10 Mass=15 -Components=Metal=1 Picture=0,6,64,64 diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/DefCore.txt b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/DefCore.txt index 12a112a05..951733229 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/DefCore.txt +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=-9,0,12,12,12 VertexFriction=50,50,100,100,100 Value=40 Mass=5 -#Components=Metal=1 Exclusive=1 Construction=1 \ No newline at end of file diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Hoist.ocd/DefCore.txt b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Hoist.ocd/DefCore.txt index 75a76bd8a..328bd5e7c 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Hoist.ocd/DefCore.txt +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Hoist.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=-6,-5,-5,7,7 VertexCNAT=5,6,9,10 VertexFriction=50,80,80,30,30 Value=20 -Mass=150 -Components=Metal=1 \ No newline at end of file +Mass=150 \ No newline at end of file diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt index cab6ea59a..1b7006160 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=20 Mass=75 -Components=Metal=2;Wood=1; Collection=-12,-8,24,10 GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=30 diff --git a/planet/Experimental.ocf/Raiders.ocs/Watch.ocd/DefCore.txt b/planet/Experimental.ocf/Raiders.ocs/Watch.ocd/DefCore.txt index df9b34ec8..298f60653 100644 --- a/planet/Experimental.ocf/Raiders.ocs/Watch.ocd/DefCore.txt +++ b/planet/Experimental.ocf/Raiders.ocs/Watch.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=-2,2 VertexFriction=25,25 Timer=1 TimerCall=WatchUpdate -Components=Metal=1; Value=6 Mass=3 diff --git a/planet/Missions.ocf/AcidDrilling.ocs/PowerCrystals.ocd/DefCore.txt b/planet/Missions.ocf/AcidDrilling.ocs/PowerCrystals.ocd/DefCore.txt index 8bb574d0b..fcc9389d0 100644 --- a/planet/Missions.ocf/AcidDrilling.ocs/PowerCrystals.ocd/DefCore.txt +++ b/planet/Missions.ocf/AcidDrilling.ocs/PowerCrystals.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=0 VertexFriction=100 Value=50 Mass=50 -Components=Metal=2 Picture=0,0,32,32 Exclusive=1 Construction=1 diff --git a/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/DefCore.txt b/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/DefCore.txt index e4c517735..93380a1c1 100644 --- a/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/DefCore.txt +++ b/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-5,12 VertexY=32,32 VertexFriction=100,100 Mass=300 -Components=Rock=10;Metal=5; Rotate=0 diff --git a/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/Head.ocd/DefCore.txt b/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/Head.ocd/DefCore.txt index 89c6c1050..8d9b0427d 100644 --- a/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/Head.ocd/DefCore.txt +++ b/planet/Missions.ocf/DeadlyGrotto.ocs/MinersStatue.ocd/Head.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexX=-6,-4,0,6,8,2,-2 VertexY=0,-7,-8,-8,0,8,6 VertexFriction=50,50,50,50,50,50,50 Mass=150 -Components=Rock=3;Metal=1; Rotate=1 diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/DefCore.txt b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/DefCore.txt index befb6df74..8237cb24a 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/DefCore.txt +++ b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-40,40 VertexY=34,34 VertexFriction=100,100 Mass=300 -Components=Ruby=6;Amethyst=6;Metal=6; Rotate=0 Construction=1 diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c index 18f1ed32b..5a2644dd6 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c @@ -18,7 +18,7 @@ public func SetConstructionSiteOverlay(object site, int dir, object stick, objec // Play component-specific sound for adding stuff to the site if (component_obj && !component_obj->GetDefFragile()) component_obj->~Hit(); // Construction site graphics by provided metal - var metal_completion = site->ContentsCount(Metal) * 3 / Max(GetComponent(Metal, nil, nil, this), 1); + var metal_completion = site->ContentsCount(Metal) * 3 / Max(GetComponent(Metal, nil), 1); site->SetGraphics(["Site0", "Site1", "Site2", nil][metal_completion], CrystalCommunicator, 1, GFXOV_MODE_Base); site->SetGraphics(nil, nil, 2); // Add graphics of contained gems @@ -355,3 +355,4 @@ local Name = "$Name$"; local Description = "$Description$"; local Touchable = 0; local Plane = 280; +local Components = [[Ruby, 6], [Amethyst, 6], [Metal, 6]]; diff --git a/planet/Missions.ocf/Raid.ocs/Key.ocd/DefCore.txt b/planet/Missions.ocf/Raid.ocs/Key.ocd/DefCore.txt index 40323ec92..91c4b92af 100644 --- a/planet/Missions.ocf/Raid.ocs/Key.ocd/DefCore.txt +++ b/planet/Missions.ocf/Raid.ocs/Key.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexX=-2,3,2,-3 VertexY=-2,1,2,-1 Value=15 Mass=4 -Components=Metal=1 Rotate=1 diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/DefCore.txt index 26f56aae7..987f9b1f1 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexX=-22,-22,0,0,20,20 VertexY=7,-7,7,-7,-8,1 VertexFriction=30,60,30,60,60,30 Mass=100 -Components=Wood=3;Metal=2; Rotate=1 Float=1 diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/DefCore.txt index f01b28e56..fc78090b4 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=14,14 VertexFriction=100,100 Value=200 Mass=4000 -Components=Airplane_Propeller=1;Airplane_Chassis=1;Airplane_Skids=1;Airplane_Engine=1;Airplane_Wings=1; Construction=0 Rotate=0 diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/DefCore.txt index cbb8f9714..09481b4d4 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-3,-3,5,5 VertexY=-3,3,-3,3 VertexFriction=60,60,60,60 Mass=20 -Components=Metal=10; Rotate=1 Float=1 diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c index 9f7914bfd..bf3f06eb7 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c @@ -24,3 +24,4 @@ local Collectible = true; local Name = "$Name$"; local Description = "$Description$"; local HitPoints = 20; +local Components = [[Metal, 10]]; diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/DefCore.txt index a9f76fb15..e4001c8d2 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-4,3,3 VertexY=0,-4,4 VertexFriction=60,60,60 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 Float=1 diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/DefCore.txt index e7de07df6..3929f05f6 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=1,1,7,7 VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Mass=20 -Components=Metal=2; Rotate=1 Float=0 UprightAttach=8 \ No newline at end of file diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/DefCore.txt index 46c1073ca..5f3acde0c 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=-16,-16,16,16 VertexCNAT=5,6,9,10 VertexFriction=60,60,60,60 Mass=50 -Components=Wood=2;Metal=1; Rotate=1 Float=0 UprightAttach=8 diff --git a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/DefCore.txt index b65766ee9..5f8bf23b9 100644 --- a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-15,15,-15,15 VertexY=-15,-15,15,15 VertexFriction=50,50,100,100 Mass=1000 -Components=Wood=1 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c index 70e8468db..297146b73 100644 --- a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c @@ -243,3 +243,4 @@ local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 30; local Plane = 120; +local Components = [[Wood, 1]]; diff --git a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Wall.ocd/DefCore.txt b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Wall.ocd/DefCore.txt index 399380b76..4e1c06c65 100644 --- a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Wall.ocd/DefCore.txt +++ b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Wall.ocd/DefCore.txt @@ -7,4 +7,3 @@ Height=32 Offset=0,0 Vertices=1 Mass=100 -Components=Wood=1 diff --git a/planet/Missions.ocf/TreasureHunt.ocs/GemOfPower.ocd/DefCore.txt b/planet/Missions.ocf/TreasureHunt.ocs/GemOfPower.ocd/DefCore.txt index 7a97e215d..4179fa0c2 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/GemOfPower.ocd/DefCore.txt +++ b/planet/Missions.ocf/TreasureHunt.ocs/GemOfPower.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=0,-4,0,4 VertexFriction=70,70,70,70 Value=250 Mass=16 -Components=Ruby=3;Amethyst=3 Rotate=1 diff --git a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/DefCore.txt b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/DefCore.txt index 57e76b541..a7c3dd6ce 100644 --- a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/DefCore.txt +++ b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexFriction=20, 20, 20, 20 VertexCNAT=0, 15, 15, 15 Value=1 Mass=10 -Components=Chippie_Egg=1 Projectile=1 Rotate=1 IncompleteActivity=1 diff --git a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt index a7c9b7104..2f153f8d9 100644 --- a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt +++ b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt @@ -7,4 +7,3 @@ Height=8 Offset=-20,-4 SolidMask=0,0,40,8,0,0 Mass=10 -Components=Rock=2; diff --git a/planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt index e29210a35..77db405b0 100644 --- a/planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt +++ b/planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt @@ -6,6 +6,5 @@ Width=512 Height=350 Offset=-256,-175 Picture=0,0,220,110 -Components=Cloud=1 Oversize=1 StretchGrowth=1 diff --git a/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt index 83ca10f0f..5afc8fd8f 100644 --- a/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt +++ b/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0 VertexY=0 VertexFriction=50 Mass=90 -Components=Rock=7; Construction=1 Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c index 87d846d2f..da8bae78c 100644 --- a/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c @@ -37,3 +37,4 @@ protected func Damage() } local Name = "$Name$"; local Plane = 200; +local Components = [[Rock, 7]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Environment.ocd/WalkableTrunk.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/WalkableTrunk.ocd/DefCore.txt index 7ba0cf4c0..5f17291e9 100644 --- a/planet/Objects.ocd/Environment.ocd/WalkableTrunk.ocd/DefCore.txt +++ b/planet/Objects.ocd/Environment.ocd/WalkableTrunk.ocd/DefCore.txt @@ -9,6 +9,5 @@ Vertices=1 VertexX=0 VertexY=0 VertexFriction=100 -Components=Wood=30 Mass=150 SolidMask=0,0,264,73,0,0 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/DefCore.txt index a50b6ab40..09afbbc9d 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=0,1,1 VertexFriction=50,100,100 Value=10 Mass=2 -Components=Flour=1;Water=50; Picture=32,0,64,64 diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c index a6ec596da..31989cf8e 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c @@ -19,4 +19,5 @@ public func GetFuelNeed() { return 50; } local Name = "$Name$"; local Description = "$Description$"; -local Collectible = 1; \ No newline at end of file +local Collectible = 1; +local Components = [[Flour, 1], [Water, 50]]; diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/DefCore.txt index efd1a4514..f796d43c8 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexX=0,0 VertexY=1,4 VertexCNAT=16,8 VertexFriction=10,100 -Components=Mushroom=1 Mass=6 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c index 07c9e0f98..1154a4d0b 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c @@ -26,4 +26,5 @@ public func GetFuelNeed() { return 50; } local Name = "$Name$"; local Description = "$Description$"; -local Collectible = true; \ No newline at end of file +local Collectible = true; +local Components = [[Mushroom, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/DefCore.txt index d586d98ba..c7ad51628 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexX=0,3,-3 VertexY=0,3,3 VertexFriction=50,100,100 Value=5 -Mass=2 -Components=Seeds=1 \ No newline at end of file +Mass=2 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c index 71a66aa32..0edd04281 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c @@ -9,4 +9,5 @@ public func IsWindmillProduct() { return true; } local Name = "$Name$"; local Description = "$Description$"; -local Collectible = 1; \ No newline at end of file +local Collectible = 1; +local Components = [[Seeds, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/DefCore.txt index c5a51394f..008737f55 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=4,-4,4,-4 VertexFriction=100,100,100,100 Value=10 Mass=1 -Components=CottonSeed=1 Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c index 72bc88a27..9226989bd 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c @@ -25,4 +25,5 @@ private func Definition(def) local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; -local Plane = 470; \ No newline at end of file +local Plane = 470; +local Components = [[CottonSeed, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Coal.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Coal.ocd/DefCore.txt index 648c80a88..958e8b296 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Coal.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Coal.ocd/DefCore.txt @@ -12,5 +12,4 @@ VertexY=1,-1,-1 VertexFriction=75,75 Value=4 Mass=9 -Components=Coal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/DefCore.txt index 070be62d9..23fa9a851 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=0,3,-3 VertexY=3,-2,-2 VertexFriction=100 Mass=12 -Components=Earth=1 Fragile=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/DefCore.txt index 2cba24540..11aba1c67 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/DefCore.txt @@ -13,5 +13,4 @@ VertexFriction=30,30,30 Value=25 Mass=16 Picture=0,20,64,64 -Components=Nugget=3 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c index fb22027d0..ba5f20d3d 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c @@ -14,4 +14,5 @@ public func QueryRebuy(){ return true; } local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; -local Plane = 480; \ No newline at end of file +local Plane = 480; +local Components = [[Nugget, 3]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/DefCore.txt index 35a1892a4..070910e0d 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexX=0,2,-2 VertexY=1,-1,-1 VertexFriction=40,40 Mass=14 -Components=Ice=1; StretchGrowth=1 Float=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/DefCore.txt index 1011f065d..850c356bd 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/DefCore.txt @@ -10,7 +10,6 @@ Vertices=2 VertexX=0,0 VertexY=3,-3 VertexFriction=40,40 -Components=Earth=2;Water=60; Value=5 Mass=10 Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c index 3894f1f4a..2f0a1c55f 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c @@ -253,4 +253,5 @@ local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; local BridgeLength = 37; // bridge length in pixels -local Plane = 470; \ No newline at end of file +local Plane = 470; +local Components = [[Earth, 2], [Water, 60]]; diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/DefCore.txt index be93eabcd..9ced1bee2 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/DefCore.txt @@ -12,6 +12,5 @@ VertexCNAT=1,2,16 VertexFriction=30,30,30 Value=8 Mass=12 -Components=Ore=1 Rotate=1 Picture=0,20,64,64 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c index 783600693..b0a078a80 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c @@ -18,4 +18,5 @@ public func GetFuelNeed() { return 100; } local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; -local Plane = 470; \ No newline at end of file +local Plane = 470; +local Components = [[Ore, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Moss.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Moss.ocd/DefCore.txt index 050215574..072814300 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Moss.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Moss.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=1,-1,-1 VertexFriction=75,75,75 Value=1 Mass=1 -Components=Moss=1 Rotate=1 Float=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/DefCore.txt index fcff622e4..61018dd7c 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=1,-1,-1 VertexFriction=40,40,40 Value=5 Mass=12 -Components=Nugget=1 Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/DefCore.txt index 666d0455c..d8eb5c21e 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=1,-1,-1 VertexFriction=40,40,40 Value=2 Mass=10 -Components=Rock=1 Projectile=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Snow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Snow.ocd/DefCore.txt index 5fec454b0..f53c38b10 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Snow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Snow.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexX=0,2,-2 VertexY=1,-1,-1 VertexFriction=40,40 Mass=6 -Components=Snow=1; StretchGrowth=1 Float=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/DefCore.txt index a4fc0429e..e58e8742c 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=1,2 VertexFriction=50,50 Value=2 Mass=6 -Components=Wood=1 Picture=0,24,60,60 Rotate=1 Float=1 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 2db67dfbb..fd345e4ec 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,5 @@ VertexY=0,3,-3 VertexFriction=50,50,50 Value=10 Mass=12 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c index 19592c8a6..fca2db9b3 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c @@ -403,3 +403,4 @@ local Description = "$Description$"; local ChopStrength = 10; // Damage dealt to living beings when hit with an axe. local WeaponStrength = 6; +local Components = [[Wood, 1], [Metal, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/DefCore.txt index bb2160ecf..9f0de9210 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=3,-3,-3,3 VertexFriction=50,50,50,50 Value=20 Mass=1 -Components=Cloth=2 Float=1 Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c index 798cd7be9..1e14d0707 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c @@ -55,3 +55,4 @@ public func IsInventorProduct() { return true; } local Collectible = true; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Cloth, 2]]; 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 edb06203e..2e7882782 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,5 @@ VertexY=-6,-6,6,6,0,0 VertexFriction=60,60,60,60,60,60 Value=12 Mass=20 -Components=Wood=2;Metal=1; Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt index d9405c5fe..21e7de2ec 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=-6,-6,6,6,0,0 VertexFriction=60,60,60,60,60,60 Value=16 Mass=50 -Components=Metal=2; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c index 0c9e973f3..0c73219fe 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c @@ -33,4 +33,5 @@ local LiquidNames = { local Name = "$Name$"; local Description = "$Description$"; -local ContactIncinerate = 0; \ No newline at end of file +local ContactIncinerate = 0; +local Components = [[Metal, 2]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c index 33a812651..9608d8e5f 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c @@ -297,3 +297,4 @@ local Name = "$Name$"; local Description = "$Description$"; local ContactIncinerate = 2; local BarrelIntakeY = 3; +local Components = [[Wood, 2], [Metal, 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 7fdfb8187..10c255847 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,7 +11,6 @@ VertexY=3,-6,10,10 VertexFriction=80,60,60 Value=20 Mass=20 -Components=PowderKeg=1;Firestone=1;Wood=1; Rotate=1 ColorByOwner=1 NoStabilize=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c index fc44e302f..0f328f68f 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c @@ -298,3 +298,4 @@ local Name = "$Name$"; local Description = "$Description$"; local BlastIncinerate = 1; local ContactIncinerate = 1; +local Components = [[Wood, 1], [Firestone, 1], [PowderKeg, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/DefCore.txt index 38e619edf..d7d58a01d 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexX=0,2,-2 VertexY=3,-3,-3 VertexFriction=75,100,100 Value=12 -Mass=5 -Components=Metal=1;Wood=1; \ No newline at end of file +Mass=5 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c index b412798e2..81c33bc13 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c @@ -153,4 +153,5 @@ protected func Definition(def) local Name = "$Name$"; local Description = "$Description$"; local Collectible = true; -local ForceFreeHands = true; \ No newline at end of file +local ForceFreeHands = true; +local Components = [[Wood, 1], [Metal, 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 ebfc35fbd..dc47e6d81 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,6 @@ VertexX=-4,-4,5,5 VertexY=-2,5,-2,5 VertexCNAT=5,9,6,10 VertexFriction=25,25,25,25 -Components=Wood=3; Construction=1 Value=6 Mass=12 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c index b4d1b9ade..b0c5036ba 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c @@ -70,3 +70,4 @@ local Name = "$Name$"; local Description = "$Description$"; local Collectible = true; local ContainBlast = true; +local Components = [[Wood, 3]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/DefCore.txt index 22c116d6b..1287e21f8 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/DefCore.txt @@ -13,4 +13,3 @@ VertexFriction=90,90,90 Value=6 Mass=6 Rotate=1 -Components=Coal=1;Firestone=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c index 035c346f6..4efb31f3f 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c @@ -181,7 +181,6 @@ public func IsDroppedOnDeath(object clonk) } - /*-- Properties --*/ local ActMap = { @@ -212,3 +211,4 @@ local Collectible = 1; local BlastIncinerate = 1; local ContactIncinerate = 1; +local Components = [[Coal, 1], [Firestone, 1]]; \ No newline at end of file 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 4cf47dc0d..1ae666344 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,4 @@ VertexFriction=50,50,50,50 Picture=0,0,64,64 Value=20 Mass=30 -Components=Wood=1;Coal=2;Firestone=2 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c index bd32f8f32..fc76b4c82 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c @@ -216,3 +216,4 @@ local Name = "$Name$"; local Description = "$Description$"; local BlastIncinerate = 1; local ContactIncinerate = 2; +local Components = [[Wood, 1], [Coal, 2], [Firestone, 2]]; 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 6417df215..2940955cf 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,5 @@ VertexY=0,0 VertexFriction=80,80 Value=16 Mass=10 -Components=Wood=2;Metal=1;Rope=1; Rotate=1 Float=2 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c index 854fc67d1..31465e5bb 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c @@ -268,4 +268,5 @@ local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; local BlastIncinerate = 30; -local ContactIncinerate = 0; \ No newline at end of file +local ContactIncinerate = 0; +local Components = [[Wood, 2], [Metal, 1]/*, [Rope, 1]*/]; \ No newline at end of file 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 20f827445..e67b5a396 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,5 @@ VertexY=1,5,-2,-2 VertexFriction=80,80,80,80 Value=8 Mass=15 -Components=Wood=1;Rock=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/Script.c index 671b9c614..20b3d8355 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/Script.c @@ -26,3 +26,4 @@ func Definition(def) local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Wood, 1], [Rock, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/DefCore.txt index 578470fa4..d560adef8 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=3,-3 VertexFriction=75,100 Value=20 Mass=4 -Rotate=1 -Components=Firestone=1;Coal=1;Metal=1; \ No newline at end of file +Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c index 5e11bee55..14d79f625 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c @@ -75,3 +75,4 @@ public func IsToolProduct() { return true; } local Name = "$Name$"; local Description = "$Description$"; local Collectible = true; +local Components = [[Firestone, 1], [Metal, 1], [Coal, 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 0d12e7417..60bbfd648 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,5 @@ VertexY=-6,-5,-5,4 VertexFriction=50,100,100,40 Value=10 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c index e9f96677c..ecf6926d6 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c @@ -228,3 +228,4 @@ local Name = "$Name$"; local Description = "$Description$"; local MaxPickDensity = 70; // can't pick granite local ForceFreeHands = true; +local Components = [[Wood, 1], [Metal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/DefCore.txt index 6343b09ea..cdafa0f80 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=3,0 VertexFriction=50,50 Value=10 Mass=15 -Components=Metal=1 Picture=64,0,64,64 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c index b741e7431..5bea770a6 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c @@ -325,3 +325,4 @@ local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; local PipeState = nil; +local Components = [[Metal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/DefCore.txt index 7f020ed0a..ff966c25b 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexY=-6,-6,6,6,0,0 VertexFriction=60,60,60,60,60,60 Value=20 Mass=20 -Components=Barrel=1;Coal=1; NoMassFromContents=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c index 07379cf19..ef8ee02c6 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c @@ -149,3 +149,4 @@ local Description = "$Description$"; local BlastIncinerate = 1; local NoBurnDecay = 1; local ContactIncinerate = 2; +local Components = [[Barrel, 1], [Coal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/DefCore.txt index 6d0c1e5bb..ab1d7c98a 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/DefCore.txt @@ -10,9 +10,7 @@ VertexX=-1,1,0,0 VertexY=0,0,-2,2 VertexCNAT=1,2 VertexFriction=30,30 -Value=0 Mass=6 -Components=Wood=1 Rotate=1 Float=1 StretchGrowth=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 d15ac010f..b02aba025 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,5 @@ VertexY=4,-3,-3 VertexFriction=100,100,100 Value=25 Mass=10 -Components=Wood=2;Rope=2; Rotate=1 NoStabilize=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c index fbf67d3e7..5a1d1cd62 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c @@ -380,3 +380,4 @@ local ActMap = { local Name = "$Name$"; local Description = "$Description$"; local Collectible = true; +local Components = [[Wood, 2]/*, [Rope, 2]*/]; 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 302e05bce..2020aadfa 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,5 @@ VertexY=4,-3,-3 VertexFriction=100,100,100 Value=20 Mass=10 -Components=Wood=2;Rope=1; Rotate=1 NoStabilize=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c index 9a1cc19ca..40ecbbe78 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c @@ -501,3 +501,4 @@ local ActMap = { local Name = "$Name$"; local Description = "$Description$"; local Collectible = true; +local Components = [[Wood, 2]/*, [Rope, 1]*/]; \ No newline at end of file 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 83f1f9921..27614df83 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,4 @@ VertexY=-7,9,0 VertexFriction=50,50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c index 9bbda3115..6a4f3dd31 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c @@ -231,3 +231,4 @@ public func Definition(proplist def) local Collectible = true; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Wood, 1], [Metal, 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 b53838996..26da6a6ea 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,4 @@ VertexY=0,0,0 VertexFriction=50,50,100 Value=10 Mass=10 -Components=Wood=1;Metal=1; Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c index e92e6191b..12e4d3888 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c @@ -58,3 +58,4 @@ func Definition(def) { local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Wood, 1], [Metal, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/DefCore.txt index a4f11997e..ed6d31d28 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=-3,2,2 VertexFriction=40,40,40 Value=25 Mass=7 -Components=Metal=2; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c index 84a4620a5..a359bced0 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c @@ -281,3 +281,4 @@ func Definition(def) { local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; +local Components = [[Metal, 2]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/DefCore.txt index efb2d5575..2965eb5cd 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=-7,7 VertexFriction=50,50 Value=10 Mass=20 -Components=Wood=1;Coal=1 Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c index 155541d06..b1a72feb1 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c @@ -222,4 +222,4 @@ protected func Definition(def) local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; - +local Components = [[Wood, 1], [Coal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/DefCore.txt index 7d7ad1c5a..c11178049 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/DefCore.txt @@ -12,6 +12,5 @@ VertexCNAT=1,2,16 VertexFriction=30,30,30 Value=20 Mass=12 -Components=Metal=2 Rotate=1 Picture=0,20,64,64 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c index 33e6073fe..b2812292b 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c @@ -146,3 +146,4 @@ local Description = "$Description$"; local BridgeLength = 20; local BridgeThickness = 5; local BridgeMaterial = "Granite-granite"; +local Components = [[Metal, 2]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/DefCore.txt index 983206d23..505b46ac3 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/DefCore.txt @@ -10,5 +10,4 @@ VertexY=-1,-3,4 VertexFriction=50,50,50 Value=35 Mass=12 -Components=Cloth=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c index 0e2edbb41..a84626b37 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c @@ -247,3 +247,4 @@ local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; local MaxIntake = 30; +local Components = [[Cloth, 1], [Metal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/DefCore.txt index 05c50776a..667d55dee 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexY=-6,6,0 VertexFriction=120,120,120 Value=15 Mass=6 -Components=Wood=3 Picture=12,0,64,64 Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/HelpArrow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/HelpArrow.ocd/DefCore.txt index 59fbf72ae..8c06969ad 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/HelpArrow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/HelpArrow.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexY=-6,6,0 VertexFriction=120,120,120 Value=15 Mass=15 -Components=Wood=5 Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c index 3e66d5e5e..374269f64 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c @@ -166,3 +166,4 @@ public func IsArmoryProduct() { return true; } local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; +local Components = [[Wood, 3]]; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/DefCore.txt index a882607a1..ab9318812 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexY=-6,6,0 VertexFriction=120,120,120 Value=35 Mass=12 -Components=Wood=3;Metal=1;Firestone=2; Picture=12,0,64,64 Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/Script.c index 62f1bd3f3..926774dfc 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/BombArrow.ocd/Script.c @@ -39,3 +39,4 @@ public func HasExplosionOnImpact() { return !!GetEffect("InFlight", this); } local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; +local Components = [[Wood, 3], [Metal, 1], [Firestone, 2]]; \ 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 42afe2bd5..6a1da827b 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,5 @@ VertexY=-10,-10,10,10 VertexFriction=100,100,100,100,100 Value=12 Mass=10 -Components=Wood=3; Rotate=1 Float=2 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/DefCore.txt index f1be614d8..0c424cf47 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexY=-6,6,0 VertexFriction=120,120,120 Value=25 Mass=8 -Components=Wood=3;Firestone=1;Coal=1; Picture=12,0,64,64 Rotate=1 Float=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/Script.c index d20486ceb..8e7cbc54a 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/FireArrow.ocd/Script.c @@ -108,4 +108,4 @@ public func ArrowStrength() { return 3; } local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; - +local Components = [[Wood, 3], [Firestone, 1], [Coal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c index 76b7a82b9..601f121a7 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c @@ -234,3 +234,4 @@ local Collectible = 1; local BlastIncinerate = 30; local ContactIncinerate = 5; local ForceFreeHands = true; +local Components = [[Wood, 3]]; 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 0f3f388ee..61ba682b9 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,5 @@ VertexY=-7,7 VertexFriction=50,50 Value=12 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c index 51ee1f4b1..b618bbb8a 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c @@ -251,3 +251,4 @@ local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; local ForceFreeHands = true; +local Components = [[Wood, 1], [Metal, 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 36fcabeb1..f086083a9 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,4 @@ VertexY=0,0,2,0 VertexFriction=50,50,70 Value=25 Mass=15 -Components=Metal=3;Wood=1; Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c index 5ddbb9d9b..816ef4b87 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c @@ -226,4 +226,5 @@ func Definition(def) local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; -local ForceFreeHands = true; \ No newline at end of file +local ForceFreeHands = true; +local Components = [[Wood, 1], [Metal, 3]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/DefCore.txt index d746a8cc9..50d4ef94d 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/DefCore.txt @@ -12,5 +12,4 @@ VertexY=-2,2,2 VertexFriction=20,20,20 Value=20 Mass=8 -Components=Metal=1;Firestone=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c index 97439fd88..79910bb7b 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c @@ -124,3 +124,4 @@ local Description = "$Description$"; local Collectible = true; local BlastIncinerate = 1; local ContactIncinerate = 1; +local Components = [[Firestone, 1], [Metal, 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 a60ec4f12..c675ab13f 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,5 @@ VertexY=-12,13 VertexFriction=100,50 Value=12 Mass=9 -Components=Wood=2;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c index 8f9e86c80..87ba9729d 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c @@ -230,3 +230,4 @@ local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; local ForceFreeHands = true; +local Components = [[Wood, 2], [Metal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/DefCore.txt index 0aa85d7cf..5cfa793a4 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/DefCore.txt @@ -12,4 +12,3 @@ VertexFriction=50 Picture=64,0,64,64 Value=12 Mass=5 -Components=Metal=1;Blackpowder=1; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c index fc2581479..d7b844b72 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c @@ -130,4 +130,5 @@ local ActMap = { }; local Name = "$Name$"; local Description = "$Description$"; -local Collectible = 1; \ No newline at end of file +local Collectible = 1; +local Components = [[Metal, 1]]; \ No newline at end of file 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 b1cc3aaeb..5f0e538cb 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,4 @@ VertexY=0,0,2,0 VertexFriction=50,50,70 Value=18 Mass=15 -Components=Metal=2;Wood=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c index afc3bdfb9..bb5e4ce80 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c @@ -210,3 +210,4 @@ local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; local ForceFreeHands = true; +local Components = [[Wood, 1], [Metal, 2]]; \ No newline at end of file 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 e829c66a4..0b44c309d 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,4 @@ VertexY=-4,5,-2,-2 VertexFriction=50,50 Value=10 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c index 3ede8b334..173a9750a 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c @@ -290,3 +290,4 @@ func Definition(def) { local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; +local Components = [[Wood, 1], [Metal, 1]]; diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/DefCore.txt index 90452ad55..1c2624146 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/DefCore.txt +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/DefCore.txt @@ -12,5 +12,4 @@ VertexY=-3,-3,4 VertexFriction=20,20,20 Value=20 Mass=12 -Components=Firestone=1;Coal=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c index 2f1344acc..0dfd45176 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c @@ -116,4 +116,5 @@ public func IsArmoryProduct() { return true; } local Collectible = 1; local Name = "$Name$"; -local Description = "$Description$"; \ No newline at end of file +local Description = "$Description$"; +local Components = [[Firestone, 1], [Coal, 1], [Metal, 1]]; \ No newline at end of file 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 963546171..90a222fcf 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,5 @@ VertexY=-7,7 VertexFriction=50,50 Value=15 Mass=20 -Components=Wood=1;Metal=1; Rotate=1 diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c index 102a7f3b7..a4346ad1a 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c @@ -345,3 +345,4 @@ func Definition(def) { local Name = "$Name$"; local Description = "$Description$"; local Collectible = 1; +local Components = [[Wood, 1], [Metal, 1]]; diff --git a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c index 08bb82890..d13a19682 100644 --- a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c @@ -180,7 +180,7 @@ func SaveScenarioObject(props) // only allow collection if needed public func RejectCollect(id def, object obj) { - var max = GetComponent(def, nil, nil, definition); + var max = definition->GetComponent(def); // not a component? if(max == 0) @@ -248,10 +248,10 @@ private func GetMissingComponents() // check for material var comp, index = 0; var missing_material = CreateArray(); - while (comp = GetComponent(nil, index, nil, definition)) + while (comp = definition->GetComponent(nil, index)) { // find material - var max_amount = GetComponent(comp, nil, nil, definition); + var max_amount = definition->GetComponent(comp); var c = ContentsCount(comp); var dif = max_amount-c; @@ -363,10 +363,10 @@ func TakeConstructionMaterials(object from_clonk) var w = definition->GetDefWidth() + 10; var h = definition->GetDefHeight() + 10; - while (comp = GetComponent(nil, index, nil, definition)) + while (comp = definition->GetComponent(nil, index)) { // find material - var count_needed = GetComponent(comp, nil, nil, definition); + var count_needed = definition->GetComponent(comp); index++; mat = CreateArray(); diff --git a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c index 3d00991a6..9396049d0 100644 --- a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c @@ -28,7 +28,7 @@ private func ShowConstructionMaterial(object clonk, object structure) while (comp = structure->GetComponent(nil, index)) { var current_amount = structure->GetComponent(comp); - var max_amount = GetComponent(comp, nil, nil, structure_id); + var max_amount = structure_id->GetComponent(comp); mat_msg = Format("%s %dx{{%i}}", mat_msg, Max(0, max_amount - current_amount), comp); index++; } @@ -361,8 +361,8 @@ private func GetStructureMaterialsString(id structure) { var comp, index = 0; var components = []; - while (comp = GetComponent(nil, index++, nil, structure)) - components[GetLength(components)] = [comp, GetComponent(comp, nil, nil, structure)]; + while (comp = structure->GetComponent(nil, index++)) + components[GetLength(components)] = [comp, structure->GetComponent(comp)]; var materials_string = "Costs: "; for (comp in components) diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c index 88799e8bc..ed0470932 100644 --- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c @@ -300,11 +300,11 @@ public func ProductionCosts(id item_id) { /* NOTE: This may be overloaded by the producer */ var comp_list = []; - var component_id, index = 0; - while (component_id = GetComponent(nil, index, nil, item_id)) + var comp_id, index = 0; + while (comp_id = item_id->GetComponent(nil, index)) { - var amount = GetComponent(component_id, index, nil, item_id); - comp_list[index] = [component_id, amount]; + var amount = item_id->GetComponent(comp_id); + comp_list[index] = [comp_id, amount]; index++; } return comp_list; @@ -803,11 +803,10 @@ public func IsCollectionAllowed(object item) for (var product in products) { var i = 0, component_id; - while (component_id = GetComponent(nil, i, nil, product)) + while (component_id = product->GetComponent(nil, i)) { if (component_id == item_id) return true; - i++; } } diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c index dbea9e84b..731ce2d89 100644 --- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c @@ -150,10 +150,10 @@ public func CalcDefValue() { var value = 0; var comp, index = 0; - while (comp = GetComponent(nil, index++, nil, this)) + while (comp = this->GetComponent(nil, index++)) { var comp_value = comp->GetValue(); - var comp_amount = GetComponent(comp, nil, nil, this); + var comp_amount = this->GetComponent(comp); value += comp_value * comp_amount; } return value; diff --git a/planet/Objects.ocd/Rules.ocd/Gravestones.ocd/Gravestone.ocd/DefCore.txt b/planet/Objects.ocd/Rules.ocd/Gravestones.ocd/Gravestone.ocd/DefCore.txt index 73d13345d..799737ba2 100644 --- a/planet/Objects.ocd/Rules.ocd/Gravestones.ocd/Gravestone.ocd/DefCore.txt +++ b/planet/Objects.ocd/Rules.ocd/Gravestones.ocd/Gravestone.ocd/DefCore.txt @@ -9,5 +9,4 @@ Vertices=2 VertexX=0,0 VertexY=-5,5 VertexFriction=40,100 -Mass=10 -Components=Rock=1 \ No newline at end of file +Mass=10 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt index d7921fc91..a055bd3fc 100644 --- a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-1,20,30,43,20,0,-20,-43 VertexY=-13,-15,-14,24,24,24,24,24 VertexFriction=50,50,50,100,100,100,100,100 Mass=4500 -Components=Wood=3;Metal=2;Loam=2 Exclusive=1 Construction=1 IncompleteActivity=1 diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Armory.ocd/Script.c index 83eb737a6..786dd5554 100644 --- a/planet/Objects.ocd/Structures.ocd/Armory.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Armory.ocd/Script.c @@ -87,3 +87,4 @@ local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; +local Components = [[Wood, 3], [Metal, 2], [Loam, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/Basement.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Basement.ocd/DefCore.txt index 7ca50be0d..e2c8ae5c9 100644 --- a/planet/Objects.ocd/Structures.ocd/Basement.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Basement.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=0,-20,-20,20,20 VertexY=0,-4,4,-4,4 VertexFriction=100,100,100,100,100 Mass=2000 -Components=Rock=2 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Basement.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Basement.ocd/Script.c index c71090f89..aed36cbe3 100644 --- a/planet/Objects.ocd/Structures.ocd/Basement.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Basement.ocd/Script.c @@ -139,3 +139,4 @@ local Name = "$Name$"; local Description ="$Description$"; local HitPoints = 80; local Plane = 190; +local Components = [[Rock, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt index c08954e38..74709c47e 100644 --- a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-1,10,20,23,10,-10,-23 VertexY=-17,-25,-14,25,25,25,25 VertexFriction=50,50,50,100,100,100,100 Mass=4500 -Components=Wood=3;Metal=2 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c index b2e6528fd..8deedbc13 100644 --- a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c @@ -81,3 +81,4 @@ local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; +local Components = [[Wood, 3], [Metal, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt index 32bd948c7..76bcd9c2e 100644 --- a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt @@ -10,6 +10,5 @@ VertexX=-8,-8,8,8 VertexY=-2,11,-2,11 VertexCNAT=5,9,6,10 VertexFriction=50,50,100,100 -Components=Wood=2; Construction=1 Mass=10 diff --git a/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c index b954d3b40..5d43f9761 100644 --- a/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c @@ -73,3 +73,4 @@ local Name = "$Name$"; local Description = "$Description$"; local ContainBlast = true; local HitPoints = 50; +local Components = [[Wood, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/BurningBattery.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/BurningBattery.ocd/DefCore.txt index 50d937275..1836300dc 100644 --- a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/BurningBattery.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/BurningBattery.ocd/DefCore.txt @@ -9,7 +9,6 @@ Vertices=1 VertexX=0 VertexFriction=20 Mass=20 -Components=Compensatory_BurningBattery=1 Projectile=1 Rotate=1 NoStabilize=1 diff --git a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt index 4a891d1c4..7c3da9d86 100644 --- a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,-12,12,-15,15,0 VertexY=0,-4,-4,10,10,10 VertexFriction=50, 50,50,100,100 Mass=100 -Components=Coal=1;Metal=1 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/Script.c index 174c81d83..7d330d829 100644 --- a/planet/Objects.ocd/Structures.ocd/Compensator.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Compensator.ocd/Script.c @@ -118,3 +118,4 @@ local Description = "$Description$"; local BlastIncinerate = 1; local HitPoints = 25; local ContactIncinerate = 1; +local Components = [[Coal, 1], [Metal, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/DefCore.txt index fd133ad79..336cdf4fc 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/DefCore.txt @@ -13,7 +13,6 @@ VertexY=-10,-10,9,9, -10,-10,9,9 VertexCNAT=5,6,9,10, 5,6,9,10 VertexFriction=100,100,100,100, 100,100,100,100 Mass=30 -Components=Wood=1 SolidMask=0,0,24,3,0,23 Picture=24,0,128,128 HorizontalFix=1 diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c index 6a87d9e14..c27e72e6b 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c @@ -775,3 +775,4 @@ local HitPoints = 50; local Plane = 250; local BorderBound = C4D_Border_Top | C4D_Border_Bottom; local ContactCalls = true; +local Components = [[Wood, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt index 630c0dfd5..fb3169f2f 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-25,25,-5,-25,28 VertexY=-27,-27,32,32,32 VertexFriction=50,50,100,100,100 Mass=1500 -Components=Wood=3;Metal=1 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c index 98941fe7a..fe66f50e3 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c @@ -327,3 +327,4 @@ local Description = "$Description$"; local BlastIncinerate = 100; local HitPoints = 70; local Plane = 249; +local Components = [[Wood, 3], [Metal, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt index 9fcee37cb..c9ba5cf91 100644 --- a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,-10,11,-4,5 VertexY=0,-34,-29,-29,34,34 VertexFriction=50,50,50,50,100,100 Mass=100 -Components=Wood=3;Metal=1 Picture=30,0,80,94 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c index 1f359da35..62e5c8776 100644 --- a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c @@ -107,11 +107,10 @@ public func SaveScenarioObject(props) return true; } - - /*-- Properties --*/ local Name = "$Name$"; local Description = "$Description$"; local HitPoints = 60; local neutral = false; +local Components = [[Wood, 3], [Metal, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt index 4d7e2dfcd..c197a3449 100644 --- a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-1,10,20,-23,23,0 VertexY=-17,-25,-14,25,25,25 VertexFriction=50,50,50,100,100,100 Mass=4500 -Components=Rock=4;Wood=2; Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c index 23d432c70..6d06bc2a8 100644 --- a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c @@ -135,3 +135,4 @@ local Description = "$Description$"; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 100; +local Components = [[Rock, 4], [Wood, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/Idol.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Idol.ocd/DefCore.txt index 63a95c3c5..4a817d439 100644 --- a/planet/Objects.ocd/Structures.ocd/Idol.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Idol.ocd/DefCore.txt @@ -9,7 +9,6 @@ Vertices=4 VertexX=-7,-7,7,7 VertexY=-10,15,-10,15 VertexFriction=50,100,50,100 -Components=GoldBar=3; Construction=1 Value=100 Mass=200 diff --git a/planet/Objects.ocd/Structures.ocd/Idol.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Idol.ocd/Script.c index 2276374f5..a3f69f98a 100644 --- a/planet/Objects.ocd/Structures.ocd/Idol.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Idol.ocd/Script.c @@ -4,5 +4,6 @@ local Name = "$Name$"; local Description = "$Description$"; local Touchable = 1; +local Components = [[GoldBar, 3]]; public func NoConstructionFlip() { return true; } \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt index 79b00538d..6fde175a0 100644 --- a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX= 1, 1,-24,17,35, 32,-28 VertexY=41,-41, 41,41,41,11,2 VertexFriction=100,10,100,100,100,10,10 Mass=4500 -Components=Wood=4;Metal=3 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/Script.c index 75e69a0d1..255b3cab5 100644 --- a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/Script.c @@ -76,4 +76,5 @@ local Name = "$Name$"; local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; -local HitPoints = 70; \ No newline at end of file +local HitPoints = 70; +local Components = [[Wood, 4], [Metal, 3]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt index 8e6a4e3eb..c3a4849e8 100644 --- a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-20,-5,20,20,-20,-10,10 VertexY=-15,-19,-13,25,25,25,25 VertexFriction=50,50,50,100,100,100,100 Mass=4500 -Components=Wood=3;Rock=2;Metal=1 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/Script.c index 7f745a2ff..36eb2d904 100644 --- a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/Script.c @@ -79,4 +79,5 @@ local Name = "$Name$"; local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; -local HitPoints = 70; \ No newline at end of file +local HitPoints = 70; +local Components = [[Wood, 3], [Rock, 2], [Metal, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt index 3aea17f9c..021dbf2a8 100644 --- a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-23,-10,10,23,-23,0,23 VertexY=19,19,19,19,-3,-18,-3 VertexFriction=100,100,100,100,50,50,50 Mass=1000 -Components=Wood=3;Metal=1;Rock=1 Exclusive=1 Construction=1 IncompleteActivity=1 diff --git a/planet/Objects.ocd/Structures.ocd/Loom.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Loom.ocd/Script.c index 276449329..83f033b38 100644 --- a/planet/Objects.ocd/Structures.ocd/Loom.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Loom.ocd/Script.c @@ -99,4 +99,5 @@ local Name = "$Name$"; local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; -local HitPoints = 70; \ No newline at end of file +local HitPoints = 70; +local Components = [[Wood, 3], [Metal, 1], [Rock, 1]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt index c9e8146cf..5c0e29758 100644 --- a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-1,-14,8,0 VertexY=-3,15,15,15 VertexFriction=50,100,100,100 Mass=400 -Components=Wood=1;Metal=3; Picture=3360,0,112,128,0,0 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c index 4c7c7f5a6..6d0dd99cc 100644 --- a/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c @@ -662,3 +662,4 @@ local Name = "$Name$"; local Description = "$Description$"; local BlastIncinerate = 50; local HitPoints = 70; +local Components = [[Wood, 1], [Metal, 3]]; diff --git a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/DefCore.txt index 1293994a2..b15050d0b 100644 --- a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,20,25,-20,-25,-5,5 VertexY=-14,-13,14,-13,14,14,14 VertexFriction=50,50,100,50,100,100,100 Mass=1500 -Components=Rock=4;Wood=1; Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c index 33359a1c6..5a9a1af05 100644 --- a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c @@ -127,7 +127,6 @@ public func Saw(object target) { if (target->Contained() != this) target->Enter(this); - var output = target->GetComponent(Wood); target->Split2Components(); AddEffect("WoodProduction", this, 100, 3, this); // Refresh interaction menus to show the wood count. @@ -309,3 +308,4 @@ local SpinStep = 30; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; +local Components = [[Rock, 4], [Wood, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt index e4c13902f..d7ca80676 100644 --- a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,-48,-24,24,48,-40,46,0 VertexY=36,36,36,36,36,3,3,-17 VertexFriction=100,100,100,100,100,50,50,50 Mass=4500 -Components=Wood=4;Metal=3 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/Script.c index 001982502..bc5255687 100644 --- a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/Script.c @@ -103,3 +103,4 @@ local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; +local Components = [[Wood, 4], [Metal, 3]]; diff --git a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt index 8c29206f4..4aaeabeef 100644 --- a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-16,18,-19,19,-10,10 VertexY=-4,-4,24,24,24,24 VertexFriction=50,50,100,100,100,100 Mass=4000 -Components=Rock=6;Metal=3 Collection=-33,7,12,12 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c index 9bd91ad5c..1559eb48a 100644 --- a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c @@ -264,3 +264,4 @@ local BlastIncinerate = 130; local HitPoints = 100; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Rock, 6], [Metal, 3]]; diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt index 13177d037..01d4e22f7 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt @@ -11,5 +11,4 @@ VertexY=-19,19 VertexCNAT=4,8 SolidMask=0,0,8,40,0,0 Mass=1000 -Components=Rock=10; HorizontalFix=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c index 6d3d9744f..9cd95ebfc 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c @@ -178,3 +178,4 @@ local ActMap = { local Name = "$Name$"; local EditCursorCommands = ["OpenDoor()", "CloseDoor()"]; local Plane = 200; +local Components = [[Rock, 6]]; diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt index 18abf0b94..147d83212 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt @@ -10,4 +10,3 @@ VertexX=-4,4,0 VertexY=8,8,0 VertexFriction=100,100,100 Mass=1000 -Components=Wood=3;Metal=1; diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c index dec662942..c5e4cae29 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c @@ -95,6 +95,7 @@ local Name = "$Name$"; local Touchable = 2; local EditCursorCommands = ["ControlUp()", "ControlDown()", "ConnectNearestDoor()"]; local Plane = 200; +local Components = [[Wood, 3], [Metal, 1]]; func Definition(def) { diff --git a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt index a4bf5bc52..97830cf79 100644 --- a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-26,26,-22,23,-10,10 VertexY=-4,-3,19,19,19,19 VertexFriction=50,50,100,100,100,100 Mass=4500 -Components=Wood=3;Metal=2 Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/Script.c index 4995658cf..a186f84b2 100644 --- a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/Script.c @@ -101,3 +101,4 @@ local Description ="$Description$"; local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; +local Components = [[Wood, 3], [Metal, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt index edffa7a5f..8554df29c 100644 --- a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,-9,9,-9,9 VertexY=-27,-25,-25,34,34 VertexFriction=50,50,50,100,100 Mass=900 -Components=Wood=3;Metal=1 Exclusive=1 Construction=1 Rotate=1 diff --git a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c index 51f826878..a31337e67 100644 --- a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c @@ -176,3 +176,4 @@ local Description = "$Description$"; local BlastIncinerate = 60; local ContactIncinerate = 5; local HitPoints = 50; +local Components = [[Wood, 3], [Metal, 1]]; diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt index bcbe99715..41c941a98 100644 --- a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,25,15,-15,-25,-5,5 VertexY=-10,-20,47,47,-20,47,47 VertexFriction=50,50,100,100,50,100,100 Mass=2500 -Components=Rock=6;Wood=2; Exclusive=1 Construction=1 IncompleteActivity=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c index 709615405..b0224f855 100644 --- a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c @@ -209,3 +209,4 @@ local BlastIncinerate = 100; local HitPoints = 70; local Name = "$Name$"; local Description = "$Description$"; +local Components = [[Rock, 6], [Wood, 2]]; diff --git a/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/DefCore.txt index 7f1d6a045..de6e0db6f 100644 --- a/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/DefCore.txt @@ -11,6 +11,5 @@ VertexX=-36,36,-36,36 VertexY=-6,6,6,-6 VertexFriction=50,50,50,50 Mass=100 -Components=Wood=3 Exclusive=1 Construction=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/Script.c index 80ea72c51..1d30babe8 100644 --- a/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/WoodenBridge.ocd/Script.c @@ -130,3 +130,4 @@ local BlastIncinerate = 2; local ContactIncinerate = 8; local NoBurnDecay = true; local HitPoints = 80; +local Components = [[Wood, 3]]; diff --git a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt index 6a9b10753..1eb27782f 100644 --- a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt +++ b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=-26,26,-15,15,-38,-38,43,40 VertexY=-7,-6,19,19,4,19,-4,19 VertexFriction=50,50,100,100,50,100,50,100 Mass=4000 -Components=Wood=5;Rock=4 Entrance=-12,0,13,20 Exclusive=1 Construction=1 diff --git a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/Script.c index 15359b7b6..46945e9de 100644 --- a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/Script.c @@ -72,4 +72,5 @@ local ContainBlast = true; local BlastIncinerate = 100; local HitPoints = 70; local Name = "$Name$"; -local Description = "$Description$"; \ No newline at end of file +local Description = "$Description$"; +local Components = [[Wood, 5], [Rock, 4]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/DefCore.txt index 83170a308..6e84fc523 100644 --- a/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=30,15,5,2,0,-2,-5,-15,-25 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=4 Mass=100 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/Script.c index 51a1ff424..31ee86a1c 100644 --- a/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/LargeCaveMushroom.ocd/Script.c @@ -206,4 +206,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 4]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/DefCore.txt index 165eb34d8..6dcfb6c1b 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/DefCore.txt @@ -9,5 +9,4 @@ Vertices=2 VertexX=0,0 VertexY=7,12 VertexFriction=50,100 -VertexCNAT=16,8 -Components=Moss=4 \ No newline at end of file +VertexCNAT=16,8 \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/Script.c index e4fdcbac6..996f42a4d 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Lichen.ocd/Script.c @@ -69,6 +69,8 @@ local Name = "$Name$"; local Description = "$Description$"; local BlastIncinerate = 1; local ContactIncinerate = 3; +local Components = [[Moss, 4]]; + local ActMap = { Grow = { Prototype = Action, diff --git a/planet/Objects.ocd/Vegetation.ocd/SproutBerryBush.ocd/Sprout.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/SproutBerryBush.ocd/Sprout.ocd/DefCore.txt index 23589be21..b6c7454d8 100644 --- a/planet/Objects.ocd/Vegetation.ocd/SproutBerryBush.ocd/Sprout.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/SproutBerryBush.ocd/Sprout.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0 VertexY=0 VertexFriction=20 Mass=50 -Components=Wood=1 Rotate=1 NoStabilize=1 StretchGrowth=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/CoconutSeed.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/CoconutSeed.ocd/DefCore.txt index 7cfbb22de..b1c5ee1b9 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/CoconutSeed.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/CoconutSeed.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexFriction=20,20,20 VertexCNAT=4,2,1 Value=4 Mass=4 -Components=Coconut=1 Projectile=1 Float=1 Rotate=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/DefCore.txt index 7145f14b8..e7e23cae2 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0 VertexY=40,20,0,-20,-40 VertexCNAT=8,16,16,16,4 VertexFriction=50,25,25,25,50 -Components=Wood=4 Mass=110 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/Script.c index 9d1e68320..5611ca281 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coconut.ocd/Script.c @@ -58,4 +58,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 1; local ContactIncinerate = 3; -local MaxCoconuts = 3; \ No newline at end of file +local MaxCoconuts = 3; +local Components = [[Wood, 4]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/DefCore.txt index 977418073..62bfb5fdc 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=45,30,20,10,0,-10,-20,-30,-45 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=120 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/Script.c index 427bc927c..e16441670 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/ConiferousBurned.ocd/Script.c @@ -11,4 +11,5 @@ public func IsBurnedTree() local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 1; -local ContactIncinerate = 3; \ No newline at end of file +local ContactIncinerate = 3; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/DefCore.txt index 3721d9bd0..f04600a49 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=45,30,20,10,0,-10,-20,-30,-45 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=150 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/Script.c index e1338e207..e81afa59f 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous.ocd/Script.c @@ -23,4 +23,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/DefCore.txt index aec089d30..8828cbe83 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=53,30,20,10,0,-10,-20,-30,-49 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=120 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/Script.c index d69b1c4b1..a425b5de0 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Coniferous2Burned.ocd/Script.c @@ -11,4 +11,5 @@ public func IsBurnedTree() local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 1; -local ContactIncinerate = 3; \ No newline at end of file +local ContactIncinerate = 3; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/DefCore.txt index d46125881..45e955010 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=53,30,20,10,0,-10,-20,-30,-49 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=150 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Script.c index 6602e8179..af1e165c4 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous2.ocd/Script.c @@ -23,4 +23,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/DefCore.txt index 938eaa3ef..6bc49d72b 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=53,30,20,10,0,-10,-20,-30,-49 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=80 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/Script.c index 7660e015b..7b69e841e 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Coniferous3Burned.ocd/Script.c @@ -11,4 +11,5 @@ public func IsBurnedTree() local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 1; -local ContactIncinerate = 3; \ No newline at end of file +local ContactIncinerate = 3; +local Components = [[Wood, 3]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/DefCore.txt index aa0d7fd7a..fe118a5b4 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=40,25,20,10,0,-10,-20,-25,-36 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=3 Mass=100 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Script.c index 36410576e..f8b16e66c 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Coniferous3.ocd/Script.c @@ -23,4 +23,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 3]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/DefCore.txt index 36539da4d..252d515dc 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=35,28,20,10,0,-10,-20,-25,-30 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=80 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/Script.c index 2f7e64622..a09230d3a 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/Script.c @@ -11,4 +11,5 @@ public func IsBurnedTree() local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 1; -local ContactIncinerate = 3; \ No newline at end of file +local ContactIncinerate = 3; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DefCore.txt index 6cdbc6977..c75b01603 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0 VertexY=35,28,20,10,0,-10,-20,-25,-30 VertexCNAT=8,16,16,16,16,16,16,16,4 VertexFriction=50,50,25,25,25,25,50,50,50 -Components=Wood=5 Mass=150 StretchGrowth=1 Oversize=1 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Script.c index 17425c24b..86656d42b 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Script.c @@ -18,4 +18,5 @@ local Name = "$Name$"; local Touchable = 0; local BlastIncinerate = 2; local ContactIncinerate = 6; -local NoBurnDecay = 1; \ No newline at end of file +local NoBurnDecay = 1; +local Components = [[Wood, 5]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/DefCore.txt index 78d62a0ec..0e254369e 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/DefCore.txt @@ -14,4 +14,3 @@ StretchGrowth=1 Oversize=1 Float=1 Rotate=1 -Components=Wood=3 diff --git a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c index b3160ec21..62d8a84db 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c @@ -185,3 +185,4 @@ local Name = "$Name$"; local BlastIncinerate = 1; local ContactIncinerate = 3; local Placement = 4; +local Components = [[Wood, 3]]; diff --git a/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/DefCore.txt b/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/DefCore.txt index b54386dd2..fd68b5140 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=0,0 VertexY=4,2 VertexCNAT=8,16 VertexFriction=100,10 -Components=Seeds=2 Mass=6 StretchGrowth=4 Oversize=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/Script.c index bd68d51d7..4434fead3 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Wheat.ocd/Script.c @@ -56,4 +56,5 @@ local Name = "$Name$"; local Description = "$Description$"; local growth = 3; local degrowth = -6; -local fastgrowth = 9; \ No newline at end of file +local fastgrowth = 9; +local Components = [[Seeds, 2]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt index 76a789e2a..9e5a6dc7f 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt @@ -13,7 +13,6 @@ VertexFriction=50,50,50,15,5,5,15,5,5 Value=60 Mass=300 ColorByOwner=1 -Components=Metal=6;Wood=4; Rotate=1 Entrance=-12,-12,24,24 RotatedEntrance=1 diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c index 3edcbfd37..4c8215348 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c @@ -523,4 +523,4 @@ local Name="$Name$"; local Description="$Description$"; local BorderBound = C4D_Border_Sides | C4D_Border_Top | C4D_Border_Bottom; local HitPoints = 50; - +local Components = [[Metal, 6], [Wood, 4]]; diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/AirshipBurnt.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/AirshipBurnt.ocd/DefCore.txt index 8a870a34a..667d44c5a 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/AirshipBurnt.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/AirshipBurnt.ocd/DefCore.txt @@ -11,4 +11,3 @@ VertexY=0,-30,-30,-30,-15,-15,-5,-5,+26,+26,+26 VertexFriction=20,20,20,20,20,20,20,80,80,80 VertexCNAT=6 Mass=60 -Components=Metal=4;Wood=1; diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt index 7bbe5899e..39c126422 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt @@ -12,7 +12,6 @@ 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;Cloth=2; Float=-27; SolidMask=0,0,36,4,11,49 Picture=128,0,128,128,0,0 \ No newline at end of file diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c index 1cff71745..c40c9fc0b 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c @@ -358,3 +358,4 @@ local Plane = 500; local SolidMaskPlane = 275; local BorderBound = C4D_Border_Sides | C4D_Border_Top | C4D_Border_Bottom; local HitPoints = 30; +local Components = [[Metal, 4], [Wood, 4], [Cloth, 2]]; diff --git a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt index 14e767322..67f5660ac 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=50 Mass=125 -Components=Metal=4;Wood=2; GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=30 UprightAttach=8 diff --git a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c index 76db0010d..35325ba57 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c @@ -298,4 +298,5 @@ local Name = "$Name$"; local Description = "$Description$"; local Touchable = 1; local BorderBound = C4D_Border_Sides; -local ContactCalls = true; \ No newline at end of file +local ContactCalls = true; +local Components = [[Metal, 4], [Wood, 2]]; \ No newline at end of file diff --git a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt index 790733997..5e42d9392 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,10,10 Value=50 Mass=125 -Components=Metal=1;Wood=6; Entrance=-12,-12,24,24 RotatedEntrance=1 GrabPutGet=C4D_GrabGet|C4D_GrabPut diff --git a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c index d14f20bfe..2984d8ca9 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c @@ -326,6 +326,7 @@ local Description = "$Description$"; local Touchable = 1; local BorderBound = C4D_Border_Sides; local ContactCalls = true; +local Components = [[Metal, 1], [Wood, 6]]; local ActMap = { Roll = { diff --git a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt index 03669e52b..9dc9ed57c 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt +++ b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=5,6,9,8,10,9,10,1,2 VertexFriction=80,80,10,10,10,20,20,60,60 Value=20 Mass=75 -Components=Metal=2;Wood=1; Collection=-12,-8,24,10 GrabPutGet=C4D_GrabGet|C4D_GrabPut Rotate=55 diff --git a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c index 6714e276e..c14bd6a8c 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c @@ -313,3 +313,4 @@ local Description = "$Description$"; local Touchable = 1; local BorderBound = C4D_Border_Sides; local ContactCalls = true; +local Components = [[Metal, 2], [Wood, 1]]; diff --git a/planet/Parkour.ocf/Maze.ocs/Signpost.ocd/DefCore.txt b/planet/Parkour.ocf/Maze.ocs/Signpost.ocd/DefCore.txt index f15e0cc63..b81d1af69 100644 --- a/planet/Parkour.ocf/Maze.ocs/Signpost.ocd/DefCore.txt +++ b/planet/Parkour.ocf/Maze.ocs/Signpost.ocd/DefCore.txt @@ -10,7 +10,6 @@ VertexX=4 VertexY=15 VertexCNAT=8 VertexFriction=100 -Components=Wood=1; Construction=1 Mass=5 Rotate=1 \ No newline at end of file diff --git a/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/DefCore.txt b/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/DefCore.txt index 9dccfaa31..4ca9e7a7a 100644 --- a/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/DefCore.txt +++ b/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/DefCore.txt @@ -12,7 +12,6 @@ VertexCNAT=5,6,9,10 VertexFriction=80,80,50,50 Value=20 Mass=500 -Components=Metal=4;Wood=1; Rotate=15 UprightAttach=8 Entrance=-8,-10,16,20 diff --git a/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/Script.c b/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/Script.c index 458f06ad1..df0aee47b 100644 --- a/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/Script.c +++ b/planet/Worlds.ocf/Clonkomotive.ocs/Locomotive.ocd/Script.c @@ -208,3 +208,4 @@ local Name = "$Name$"; local Description = "$Description$"; local BorderBound = C4D_Border_Sides; local ContactCalls = true; +local Components = [[Wood, 1], [Metal, 4]]; diff --git a/planet/Worlds.ocf/Clonkomotive.ocs/RockFragment.ocd/DefCore.txt b/planet/Worlds.ocf/Clonkomotive.ocs/RockFragment.ocd/DefCore.txt index 633741de4..5a2870a18 100644 --- a/planet/Worlds.ocf/Clonkomotive.ocs/RockFragment.ocd/DefCore.txt +++ b/planet/Worlds.ocf/Clonkomotive.ocs/RockFragment.ocd/DefCore.txt @@ -11,7 +11,6 @@ VertexY=5,-5,-5 VertexFriction=20 Value=1 Mass=80 -Components=RockFragment=1 StretchGrowth=1 Projectile=1 Rotate=1