control fixes, new fliint

planet/Objects.c4d/Items.c4d/Earth.c4d/DefCore.txt

@@ -1,16 +0,0 @@
-[DefCore]
-id=ERTH
-Version=4,10,0,0
-Category=C4D_Object
-Width=6
-Height=6
-Offset=-3,-3
-Vertices=3
-VertexX=0,1,-1
-VertexY=1,-1,-1
-VertexFriction=100
-Mass=12
-Components=ILOA=1
-Collectible=1
-Fragile=1
-Rotate=1

planet/Objects.c4d/Items.c4d/Earth.c4d/DescDE.txt

@@ -1 +0,0 @@
-Um transportfähige Erdklumpen auszugraben, während des Grabens erneut einmal auf 'Graben' klicken.

planet/Objects.c4d/Items.c4d/Earth.c4d/DescUS.txt

@@ -1 +0,0 @@
-Hit 'dig' again while digging to create chunks that can be picked up.

planet/Objects.c4d/Items.c4d/Earth.c4d/Script.c

@@ -1,19 +0,0 @@
-/*--- Earth ---*/
-
-#strict 2
-
-protected func Hit()
-{
-  CastPXS("Earth", 225, 18);
-  Sound("EarthHit*");
-  RemoveObject();
-  return 1;
-}
-
-func IsAlchemContainer() { return true; }
-func AlchemProcessTime() { return 120; }
-
-func Definition(def) {
-  SetProperty("Collectible", 1, def);
-  SetProperty("Name", "$Name$", def);
-}

planet/Objects.c4d/Items.c4d/Earth.c4d/StringTblDE.txt

@@ -1 +0,0 @@
-Name=Erdklumpen

planet/Objects.c4d/Items.c4d/Earth.c4d/StringTblUS.txt

@@ -1 +0,0 @@
-Name=Chunk of Dirt

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/DefCore.txt

@@ -0,0 +1,20 @@
+[DefCore]
+id=FLNT
+Version=4,10,0,0
+Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase|C4D_SelectInEarth
+MaxUserSelect=10
+Width=8
+Height=8
+Offset=-4,-4
+Vertices=2
+VertexX=-3,3
+VertexY=1,-1
+VertexFriction=20
+Value=5
+Mass=10
+Components=SPHR=1
+Rebuy=1
+Projectile=1
+Fragile=1
+Explosive=1
+

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/DescDE.txt

@@ -0,0 +1 @@
+Explodiert durch Erschütterung.

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/DescUS.txt

@@ -0,0 +1 @@
+Explodes on contact.

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/Script.c

@@ -0,0 +1,11 @@
+/*--- Flint ---*/
+
+func Hit()
+{
+	Explode(20);
+}
+
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+  SetProperty("Name", "$Name$", def);
+}

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Feuerstein

planet/Objects.c4d/Items.c4d/Resources.c4d/Flint.c4d/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Fire stone

planet/Objects.c4d/Items.c4d/Weapons.c4d/Boompack.c4d/Script.c

@@ -20,6 +20,11 @@ protected func Construction()
 	fuel=100;
 }
 
+protected func Destruction()
+{
+	if(rider) JumpOff(rider);
+}
+
 func ControlRight()
 {	
 	SetRDir(+3);

planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c

@@ -58,7 +58,7 @@ public func SelectItem(selection, bool second)
 	var oldnum = GetSelected(second);
 	var item = inventory[oldnum];
 	
-	selection = BoundBy(0,MaxContentsCount()-1);
+	selection = BoundBy(selection,0,MaxContentsCount()-1);
 	
 	// selection didnt change
 	if (oldnum == selection) return;