diff --git a/planet/Material.ocg/Coal.ocm b/planet/Material.ocg/Coal.ocm index 4abc0a816..2e8c38d2c 100644 --- a/planet/Material.ocg/Coal.ocm +++ b/planet/Material.ocg/Coal.ocm @@ -5,10 +5,10 @@ Density=60 Friction=75 DigFree=1 BlastFree=1 -Blast2Object=Coal -Dig2Object=Coal -Dig2ObjectRatio=140 -Blast2ObjectRatio=200 +Blast2Object=Chunk_Coal +Dig2Object=Chunk_Coal +Dig2ObjectRatio=170 +Blast2ObjectRatio=210 MaxAirSpeed=100 MaxSlide=1 Placement=40 diff --git a/planet/Material.ocg/Gold.ocm b/planet/Material.ocg/Gold.ocm index 12809f2ce..d2a688955 100644 --- a/planet/Material.ocg/Gold.ocm +++ b/planet/Material.ocg/Gold.ocm @@ -4,7 +4,7 @@ Shape=Rough Density=70 Friction=100 BlastFree=1 -Blast2Object=Nugget +Blast2Object=Chunk_Gold Blast2ObjectRatio=150 MaxAirSpeed=100 MaxSlide=1 diff --git a/planet/Material.ocg/ORE.ocm b/planet/Material.ocg/ORE.ocm index 9fd8305f0..e45e38c11 100644 --- a/planet/Material.ocg/ORE.ocm +++ b/planet/Material.ocg/ORE.ocm @@ -4,9 +4,9 @@ Shape=Rough Density=70 Friction=100 BlastFree=1 -Blast2Object=Ore -Blast2ObjectRatio=100 +Blast2Object=Chunk_Ore +Blast2ObjectRatio=150 MaxAirSpeed=100 MaxSlide=1 Placement=50 -TextureOverlay=ore +TextureOverlay=ore \ No newline at end of file diff --git a/planet/Material.ocg/Rock.ocm b/planet/Material.ocg/Rock.ocm index 59323970e..6db141bea 100644 --- a/planet/Material.ocg/Rock.ocm +++ b/planet/Material.ocg/Rock.ocm @@ -4,9 +4,9 @@ Shape=Rough Density=70 Friction=100 BlastFree=1 -Blast2Object=Rock -Blast2ObjectRatio=75 +Blast2Object=Chunk_Rock +Blast2ObjectRatio=130 MaxAirSpeed=100 MaxSlide=250 Placement=50 -TextureOverlay=rock +TextureOverlay=rock \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/GoldNugget.skeleton b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/CoalChunk.skeleton similarity index 100% rename from planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/GoldNugget.skeleton rename to planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/CoalChunk.skeleton diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/DefCore.txt new file mode 100644 index 000000000..1ea595cc6 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Chunk_Coal +Version=4,10,0,0 +Category=C4D_Object +Width=12 +Height=12 +Offset=-6,-6 +Vertices=3 +VertexX=0,4,-4 +VertexY=3,-3,-3 +VertexFriction=40,40,40 +Value=16 +Mass=36 +Components=Coal=4 +Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Graphics.mesh b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Graphics.mesh new file mode 100644 index 000000000..c102cac3c Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Graphics.mesh differ diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Scene.material b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Scene.material new file mode 100644 index 000000000..79fb3a123 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Scene.material @@ -0,0 +1,14 @@ +material CoalChunk +{ + receive_shadows on + technique + { + pass + { + ambient 0.500000 0.500000 0.500000 1.000000 + diffuse 0.1 0.1 0.1 1.000000 + specular 0.652682 0.652682 0.652682 1.000000 18.000000 + emissive 0.01 0.01 0.01 1.000000 + } + } +} diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Script.c new file mode 100644 index 000000000..0fc2c98ac --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/Script.c @@ -0,0 +1,27 @@ +/*--- Coal Chunk ---*/ + +#include Library_CarryHeavy + +public func GetCarryMode(clonk) { return CARRY_BothHands; } +public func GetCarryPhase() { return 800; } + +protected func Hit(x, y) +{ + StonyObjectHit(x,y); + return true; +} + +public func IsFuel() { return true; } +public func GetFuelAmount() { return 400; } + +func Definition(def) { + SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def); +} + +local Name = "$Name$"; +local Description = "$Description$"; +local Rebuy = true; +local BlastIncinerate = 5; +local ContactIncinerate = 1; +local Touchable = 2; +local Plane = 460; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblDE.txt new file mode 100644 index 000000000..4582a3b0f --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblDE.txt @@ -0,0 +1,2 @@ +Name=Kohle +Description=Kohle kann dazu benutzt werden, Strom zu erzeugen oder Metall zu produzieren. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblUS.txt new file mode 100644 index 000000000..19e1b4e2b --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Coal.ocd/StringTblUS.txt @@ -0,0 +1,2 @@ +Name=Coal +Description=Fuel, can be used to produce metal or generate power. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/DefCore.txt new file mode 100644 index 000000000..43845073d --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Chunk_Gold +Version=4,10,0,0 +Category=C4D_Object +Width=12 +Height=12 +Offset=-6,-6 +Vertices=3 +VertexX=0,4,-4 +VertexY=3,-3,-3 +VertexFriction=40,40,40 +Value=12 +Mass=36 +Components=Nugget=3 +Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/GoldChunk.skeleton b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/GoldChunk.skeleton new file mode 100644 index 000000000..9b1a148aa Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/GoldChunk.skeleton differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.mesh b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Graphics.mesh similarity index 99% rename from planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.mesh rename to planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Graphics.mesh index ef871566f..b9069edfb 100644 Binary files a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.mesh and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Graphics.mesh differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Scene.material b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Scene.material similarity index 92% rename from planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Scene.material rename to planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Scene.material index 99d52cf2a..f60d1b70e 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Scene.material +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Scene.material @@ -1,4 +1,4 @@ -material GoldNugget +material GoldChunk { receive_shadows on technique diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Script.c new file mode 100644 index 000000000..cdd4e91f4 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/Script.c @@ -0,0 +1,24 @@ +/*--- Gold Chunk ---*/ + +#include Library_CarryHeavy + +public func GetCarryMode(clonk) { return CARRY_BothHands; } +public func GetCarryPhase() { return 800; } + +protected func Hit(x, y) +{ + StonyObjectHit(x,y); + return true; +} + +public func IsFoundryIngredient() { return true; } +public func IsValuable(){ return true; } + +func Definition(def) { + SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def); +} + +local Name = "$Name$"; +local Description = "$Description$"; +local Touchable = 2; +local Plane = 470; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblDE.txt new file mode 100644 index 000000000..a2e90f573 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblDE.txt @@ -0,0 +1,2 @@ +Name=Golderzbrocken +Description=Ewiges Objekt der Begierde eines jeden Bergarbeiters. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblUS.txt new file mode 100644 index 000000000..f3f633e74 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Gold.ocd/StringTblUS.txt @@ -0,0 +1,2 @@ +Name=Gold chunk +Description=A very prized find, indeed! \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/DefCore.txt new file mode 100644 index 000000000..f0ac5e744 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Chunk_Ore +Version=4,10,0,0 +Category=C4D_Object +Width=12 +Height=12 +Offset=-6,-6 +Vertices=3 +VertexX=0,4,-4 +VertexY=3,-3,-3 +VertexFriction=40,40,40 +Value=18 +Mass=36 +Components=Ore=4 +Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Graphics.mesh b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Graphics.mesh new file mode 100644 index 000000000..17d1f864c Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Graphics.mesh differ diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/OreChunk.skeleton b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/OreChunk.skeleton new file mode 100644 index 000000000..9b1a148aa Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/OreChunk.skeleton differ diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Scene.material b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Scene.material new file mode 100644 index 000000000..f188c8eee --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Scene.material @@ -0,0 +1,14 @@ +material OreChunk +{ + receive_shadows on + technique + { + pass + { + ambient 0.500000 0.500000 0.500000 1.000000 + diffuse 0.52 0.39 0.53 1.000000 + specular 0.652682 0.652682 0.652682 1.000000 18.000000 + emissive 0.52 0.39 0.053 1.000000 + } + } +} diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Script.c new file mode 100644 index 000000000..4cc4e1cd3 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/Script.c @@ -0,0 +1,24 @@ +/*--- Ore Chunk ---*/ + +#include Library_CarryHeavy + +public func GetCarryMode(clonk) { return CARRY_BothHands; } +public func GetCarryPhase() { return 800; } + +protected func Hit(x, y) +{ + StonyObjectHit(x,y); + return true; +} + +public func IsFoundryIngredient() { return true; } + +func Definition(def) { + SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def); +} + +local Name = "$Name$"; +local Description = "$Description$"; +local Rebuy = true; +local Touchable = 2; +local Plane = 460; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblDE.txt new file mode 100644 index 000000000..000479397 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblDE.txt @@ -0,0 +1,2 @@ +Name=Eisenerz +Description=Rohmaterial für Metallproduktion in der Schmelze. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblUS.txt new file mode 100644 index 000000000..c35c7485b --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Ore.ocd/StringTblUS.txt @@ -0,0 +1,2 @@ +Name=Iron Ore +Description=Raw material for metal production in the foundry. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/DefCore.txt new file mode 100644 index 000000000..25ea1176e --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Chunk_Rock +Version=4,10,0,0 +Category=C4D_Object +Width=12 +Height=12 +Offset=-6,-6 +Vertices=3 +VertexX=0,4,-4 +VertexY=3,-3,-3 +VertexFriction=40,40,40 +Value=5 +Mass=50 +Components=Rock=5 +Rotate=1 \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Graphics.mesh b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Graphics.mesh new file mode 100644 index 000000000..1e4097d6c Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Graphics.mesh differ diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/RockChunk.skeleton b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/RockChunk.skeleton new file mode 100644 index 000000000..9b1a148aa Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/RockChunk.skeleton differ diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Scene.material b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Scene.material new file mode 100644 index 000000000..509b7f768 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Scene.material @@ -0,0 +1,14 @@ +material RockChunk +{ + receive_shadows on + technique + { + pass + { + ambient 0.500000 0.500000 0.500000 1.000000 + diffuse 0.4 0.4 0.4 1.000000 + specular 0.652682 0.652682 0.652682 1.000000 18.000000 + emissive 0.2 0.2 0.2 1.000000 + } + } +} diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Script.c new file mode 100644 index 000000000..8abc1d1da --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/Script.c @@ -0,0 +1,21 @@ +/*--- Rock Chunk ---*/ + +#include Library_CarryHeavy + +public func GetCarryMode(clonk) { return CARRY_BothHands; } +public func GetCarryPhase() { return 800; } + +protected func Hit(x, y) +{ + StonyObjectHit(x,y); + return true; +} + +func Definition(def) { + SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def); +} + +local Name = "$Name$"; +local Description = "$Description$"; +local Touchable = 2; +local Plane = 450; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblDE.txt new file mode 100644 index 000000000..074242e62 --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblDE.txt @@ -0,0 +1,2 @@ +Name=Stein +Description=Wichtiges Baumaterial und Waffe. \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblUS.txt new file mode 100644 index 000000000..55fd1401c --- /dev/null +++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Rock.ocd/StringTblUS.txt @@ -0,0 +1,2 @@ +Name=Rock +Description=Basic construction material and weapon. \ 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 4c930a0ca..cbaa9ac7b 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 @@ -2,12 +2,12 @@ id=Nugget Version=4,10,0,0 Category=C4D_Object -Width=12 -Height=12 -Offset=-6,-6 +Width=8 +Height=8 +Offset=-4,-4 Vertices=3 -VertexX=0,4,-4 -VertexY=3,-3,-3 +VertexX=0,2,-2 +VertexY=1,-1,-1 VertexFriction=40,40,40 Value=5 Mass=12 diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.8.png b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.8.png new file mode 100644 index 000000000..95a42cb0a Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics.8.png differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics1.8.png b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics1.8.png new file mode 100644 index 000000000..c5cf9df16 Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics1.8.png differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics2.8.png b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics2.8.png new file mode 100644 index 000000000..25d5e5d28 Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics2.8.png differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics3.8.png b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics3.8.png new file mode 100644 index 000000000..121ac841c Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics3.8.png differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics4.8.png b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics4.8.png new file mode 100644 index 000000000..7e9875569 Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Graphics4.8.png differ diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Script.c index 3022aba26..933cc6074 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Nugget.ocd/Script.c @@ -1,9 +1,11 @@ /*--- Nugget ---*/ -#include Library_CarryHeavy - -public func GetCarryMode(clonk) { return CARRY_BothHands; } -public func GetCarryPhase() { return 800; } +protected func Construction() +{ + var graphic = Random(5); + if(graphic) + SetGraphics(Format("%d",graphic)); +} protected func Hit(x, y) { @@ -14,13 +16,7 @@ protected func Hit(x, y) public func IsFoundryIngredient() { return true; } public func IsValuable(){ return true; } -func Definition(def) { - SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def); -} +local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; -<<<<<<< HEAD -local Touchable = 2; -======= -local Plane = 470; ->>>>>>> master +local Plane = 470; \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/Script.c index 2226d25a4..364b5684b 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Rock.ocd/Script.c @@ -17,4 +17,4 @@ local Collectible = 1; local Name = "$Name$"; local Description = "$Description$"; local Rebuy = true; -local Plane = 450; +local Plane = 450; \ No newline at end of file