diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/DefCore.txt b/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/DefCore.txt deleted file mode 100644 index 880f61d58..000000000 --- a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/DefCore.txt +++ /dev/null @@ -1,4 +0,0 @@ -[DefCore] -id=Skin_Alchemist -Version=5,2,0,1 -Category=C4D_StaticBack \ No newline at end of file diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton b/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton deleted file mode 100644 index ab161f77c..000000000 Binary files a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton and /dev/null differ diff --git a/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton b/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton index ab161f77c..0142ec67b 100644 Binary files a/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton and b/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton differ diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/DefCore.txt b/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/DefCore.txt deleted file mode 100644 index 40c018bb2..000000000 --- a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/DefCore.txt +++ /dev/null @@ -1,4 +0,0 @@ -[DefCore] -id=Skin_Farmer -Version=5,2,0,1 -Category=C4D_StaticBack \ No newline at end of file diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmer.skeleton b/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmer.skeleton deleted file mode 100644 index ab161f77c..000000000 Binary files a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmer.skeleton and /dev/null differ diff --git a/planet/Objects.ocd/Clonk.ocd/Graphics.mesh b/planet/Objects.ocd/Clonk.ocd/Graphics.mesh index 9df31ca52..f93cce1a3 100644 Binary files a/planet/Objects.ocd/Clonk.ocd/Graphics.mesh and b/planet/Objects.ocd/Clonk.ocd/Graphics.mesh differ diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/Graphics.mesh b/planet/Objects.ocd/Clonk.ocd/GraphicsAlchemist.mesh similarity index 99% rename from planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/Graphics.mesh rename to planet/Objects.ocd/Clonk.ocd/GraphicsAlchemist.mesh index e31f85cdf..6a813e89a 100644 Binary files a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/Graphics.mesh and b/planet/Objects.ocd/Clonk.ocd/GraphicsAlchemist.mesh differ diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/Graphics.mesh b/planet/Objects.ocd/Clonk.ocd/GraphicsFarmer.mesh similarity index 81% rename from planet/Objects.ocd/Clonk.ocd/Farmer.ocd/Graphics.mesh rename to planet/Objects.ocd/Clonk.ocd/GraphicsFarmer.mesh index c548ef6d2..053556a1b 100644 Binary files a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/Graphics.mesh and b/planet/Objects.ocd/Clonk.ocd/GraphicsFarmer.mesh differ diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Graphics.mesh b/planet/Objects.ocd/Clonk.ocd/GraphicsSteampunk.mesh similarity index 99% rename from planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Graphics.mesh rename to planet/Objects.ocd/Clonk.ocd/GraphicsSteampunk.mesh index 620fb0cd5..253ddfe83 100644 Binary files a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Graphics.mesh and b/planet/Objects.ocd/Clonk.ocd/GraphicsSteampunk.mesh differ diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/Scene.material b/planet/Objects.ocd/Clonk.ocd/SceneAlchemist.material similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/Scene.material rename to planet/Objects.ocd/Clonk.ocd/SceneAlchemist.material diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/Scene.material b/planet/Objects.ocd/Clonk.ocd/SceneFarmer.material similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Farmer.ocd/Scene.material rename to planet/Objects.ocd/Clonk.ocd/SceneFarmer.material diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Scene.material b/planet/Objects.ocd/Clonk.ocd/SceneSteampunk.material similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Scene.material rename to planet/Objects.ocd/Clonk.ocd/SceneSteampunk.material diff --git a/planet/Objects.ocd/Clonk.ocd/Script.c b/planet/Objects.ocd/Clonk.ocd/Script.c index b95353b3c..306c3c3c7 100644 --- a/planet/Objects.ocd/Clonk.ocd/Script.c +++ b/planet/Objects.ocd/Clonk.ocd/Script.c @@ -535,17 +535,17 @@ func SetSkin(int skin) //Steampunk if(skin == 1) - { SetGraphics(nil, Skin_Steampunk); + { SetGraphics("Steampunk"); gender = 1; } //Alchemist if(skin == 2) - { SetGraphics(nil, Skin_Alchemist); + { SetGraphics("Alchemist"); gender = 0; } //Farmer if(skin == 3) - { SetGraphics(nil, Skin_Farmer); + { SetGraphics("Farmer"); gender = 1; } RemoveBackpack(); //add a backpack diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/DefCore.txt b/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/DefCore.txt deleted file mode 100644 index 76ee5a878..000000000 --- a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/DefCore.txt +++ /dev/null @@ -1,4 +0,0 @@ -[DefCore] -id=Skin_Steampunk -Version=5,2,0,1 -Category=C4D_StaticBack \ No newline at end of file diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunk.skeleton b/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunk.skeleton deleted file mode 100644 index ab161f77c..000000000 Binary files a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunk.skeleton and /dev/null differ diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.png b/planet/Objects.ocd/Clonk.ocd/clonkAlchemist.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.png rename to planet/Objects.ocd/Clonk.ocd/clonkAlchemist.png diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemistOverlay.png b/planet/Objects.ocd/Clonk.ocd/clonkAlchemistOverlay.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemistOverlay.png rename to planet/Objects.ocd/Clonk.ocd/clonkAlchemistOverlay.png diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmer.png b/planet/Objects.ocd/Clonk.ocd/clonkFarmer.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmer.png rename to planet/Objects.ocd/Clonk.ocd/clonkFarmer.png diff --git a/planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmerOverlay.png b/planet/Objects.ocd/Clonk.ocd/clonkFarmerOverlay.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Farmer.ocd/clonkFarmerOverlay.png rename to planet/Objects.ocd/Clonk.ocd/clonkFarmerOverlay.png diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunk.png b/planet/Objects.ocd/Clonk.ocd/clonkSteampunk.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunk.png rename to planet/Objects.ocd/Clonk.ocd/clonkSteampunk.png diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunkOverlay.png b/planet/Objects.ocd/Clonk.ocd/clonkSteampunkOverlay.png similarity index 100% rename from planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/clonkSteampunkOverlay.png rename to planet/Objects.ocd/Clonk.ocd/clonkSteampunkOverlay.png 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 022478b51..4555e7bba 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 @@ -45,7 +45,7 @@ func ControlUseStart(object clonk, int ix, int iy) return true; using = 1; // Create an offset, so that the hit matches with the animation - swingtime = Pickaxe_SwingTime*4/38; + swingtime = Pickaxe_SwingTime*1/38; clonk->SetTurnType(1); clonk->UpdateAttach(); clonk->PlayAnimation("StrikePickaxe", 10, Anim_Linear(0, 0, clonk->GetAnimationLength("StrikePickaxe"), Pickaxe_SwingTime, ANIM_Loop), Anim_Const(1000)); @@ -88,7 +88,8 @@ protected func DoSwing(object clonk, int ix, int iy) { ++iDist; } - + + //Point of contact, where the pick strikes the landscape var x2 = Sin(180-angle,iDist); var y2 = Cos(180-angle,iDist); var is_solid = GBackSolid(x2,y2); @@ -99,28 +100,30 @@ protected func DoSwing(object clonk, int ix, int iy) // notify the object that it has been hit if(target_obj) target_obj->~OnHitByPickaxe(this, clonk); - - BlastFree(GetX()+x2,GetY()+y2,5,GetController()); // special effects only ifhit something if(is_solid || target_obj) - { - + { var mat = GetMaterial(x2,y2); var tex = GetTexture(x2,y2); - + //Is the material struck made of a diggable material? if(is_solid && GetMaterialVal("DigFree","Material",mat)) { var clr = GetAverageTextureColor(tex); var a = 80; CreateParticle("Dust",x2,y2,RandomX(-3,3),RandomX(-3,3),RandomX(10,250),DoRGBaValue(clr,-255+a,0)); + Sound("Dig?"); } + //It's solid, but not diggable. So it is a hard mineral. else { CastParticles("Spark",RandomX(3,9),35,x2*9/10,y2*9/10,10,30,RGB(255,255,150),RGB(255,255,200)); Sound("Clang?"); - } + } + + //Do blastfree after landscape checks are made. Otherwise, mat always returns as "tunnel" + BlastFree(GetX()+x2,GetY()+y2,5,GetController()); } }