some resources added; musket fixes

planet/Objects.c4d/Items.c4d/Alchemy.c4d/BlackPowder.c4d/DefCore.txt

@@ -0,0 +1,19 @@
+[DefCore]
+id=BPDR
+Version=4,9,10,10
+Category=C4D_Material|C4D_Object
+MaxUserSelect=50
+Width=8
+Height=8
+Offset=-4,-4
+Picture=8,0,16,16
+Vertices=2
+VertexX=0,0
+VertexY=3,-3
+VertexFriction=50,50
+Components=SLFR=1;COAL=1;
+Value=10
+Mass=12
+Rotate=1
+ContactIncinerate=1
+BlastIncinerate=5

planet/Objects.c4d/Items.c4d/Alchemy.c4d/BlackPowder.c4d/Script.c

@@ -0,0 +1,16 @@
+/*-- Black Powder --*/
+
+#strict 2
+
+protected func Incineration()
+{
+	Schedule("Explode(20)", 90);
+}
+
+func IsAlchemyProduct() { return 1; }
+func AlchemyProcessTime() { return 100; }
+
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+  SetProperty("Name", "$Name$", def);
+}

planet/Objects.c4d/Items.c4d/Alchemy.c4d/BlackPowder.c4d/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Schießpulver

planet/Objects.c4d/Items.c4d/Alchemy.c4d/BlackPowder.c4d/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Black Powder

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

@@ -1,20 +0,0 @@
-[DefCore]
-id=GOLD
-Version=4,10,0,0
-Category=C4D_Object|C4D_SelectMaterial
-MaxUserSelect=100
-Width=6
-Height=6
-Offset=-3,-3
-Vertices=3
-VertexX=0,1,-1
-VertexY=1,-1,-1
-VertexFriction=40,40,40
-Value=25
-Mass=12
-Components=GOLD=1
-Rebuy=0
-Collectible=1
-Rotate=1
-StretchGrowth=1
-Oversize=1

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

@@ -0,0 +1,19 @@
+[DefCore]
+id=COAL
+Version=4,9,10,10
+Category=C4D_Material|C4D_Object
+MaxUserSelect=50
+Width=8
+Height=8
+Offset=-4,-4
+Picture=0,0,8,8
+Vertices=2
+VertexX=0,0
+VertexY=3,-3
+VertexFriction=75,75
+Components=WOOD=2;
+Value=4
+Mass=9
+Rotate=1
+ContactIncinerate=1
+BlastIncinerate=5

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

@@ -0,0 +1,6 @@
+#strict 2
+
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+  SetProperty("Name", "Coal", def);
+}

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

@@ -0,0 +1,19 @@
+[DefCore]
+id=GOLD
+Version=4,10,0,0
+Category=C4D_Object|C4D_SelectMaterial
+MaxUserSelect=100
+Width=6
+Height=6
+Offset=-3,-3
+Vertices=3
+VertexX=0,1,-1
+VertexY=1,-1,-1
+VertexFriction=40,40,40
+Value=25
+Mass=12
+Components=GOLD=1
+Rebuy=0
+Rotate=1
+StretchGrowth=1
+Oversize=1

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

@@ -11,3 +11,6 @@ protected func Hit()
   func Definition(def) {
   SetProperty("Name", "$Name$", def);
 }
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+}

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

@@ -0,0 +1,17 @@
+[DefCore]
+id=ORE1
+Version=4,9,10,10
+Category=C4D_Material|C4D_Object
+MaxUserSelect=50
+Width=8
+Height=8
+Offset=-4,-4
+Picture=0,0,8,8
+Vertices=2
+VertexX=0,0
+VertexY=3,-3
+VertexFriction=80,80
+Components=ROCK=3;
+Value=5
+Mass=9
+Rotate=1

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

@@ -0,0 +1,6 @@
+#strict 2
+
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+  SetProperty("Name", "$Name$", def);
+}

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

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

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

@@ -0,0 +1 @@
+Name=Iron Ore

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

@@ -0,0 +1,17 @@
+[DefCore]
+id=ROCK
+Version=4,10,0,0
+Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase|C4D_SelectInEarth
+MaxUserSelect=10
+Width=6
+Height=6
+Offset=-3,-3
+Vertices=1
+VertexY=1
+VertexFriction=20
+Value=1
+Mass=10
+Components=IROC=3
+Rebuy=1
+Projectile=1
+

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

@@ -0,0 +1,17 @@
+[DefCore]
+id=SPHR
+Version=4,9,10,10
+Category=C4D_Material|C4D_Object
+MaxUserSelect=50
+Width=8
+Height=8
+Offset=-4,-4
+Picture=0,0,8,8
+Vertices=2
+VertexX=0,0
+VertexY=3,-3
+VertexFriction=40,40
+Components=SPHR=1;
+Value=5
+Mass=10
+Rotate=1

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

@@ -0,0 +1,6 @@
+#strict 2
+
+func Definition(def) {
+  SetProperty("Collectible", 1, def);
+  SetProperty("Name", "$Name$", def);
+}

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

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

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

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

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

@@ -0,0 +1,23 @@
+[DefCore]
+id=WOOD
+Version=4,10,0,0
+Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase
+MaxUserSelect=25
+Width=12
+Height=12
+Offset=-7,-6
+Vertices=3
+VertexX=4,-5
+VertexY=-1,2
+VertexCNAT=1,2
+VertexFriction=30,30
+Value=2
+Mass=6
+Components=WOOD=1
+ContactIncinerate=1
+BlastIncinerate=5
+Rebuy=1
+Rotate=1
+Float=1
+StretchGrowth=1
+

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

@@ -17,5 +17,6 @@ public func IsFuel() { return 1; }
 public func GetFuelAmount() { return 30; }
 
 func Definition(def) {
+  SetProperty("Collectible", 1, def);
   SetProperty("Name", "$Name$", def);
 }

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletPouch.c4d/DefCore.txt

@@ -12,9 +12,9 @@ VertexY=4,4,-4
 VertexCNAT=9,10,4
 VertexFriction=40,40,50
 Picture=6,0,21,21
-Value=10
+Value=25
 Mass=10
 Collectible=1
-Components=METL=1;
+Components=METL=1;BPDR=1;
 Rebuy=1
 Rotate=1

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletPouch.c4d/MusketBall.c4d/StringTblDE.txt

@@ -1 +1 @@
-Name=Musket Ball
+Name=Musketenkugel

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletPouch.c4d/Script.c

@@ -6,7 +6,7 @@ local iAmmo;
 
 protected func Initialize()
 {
-	iAmmo=5;
+	iAmmo=8;
 }
 
 public func TakeAmmo()

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletPouch.c4d/StringTblDE.txt

@@ -1 +1 @@
-Name=Musket Ball
+Name=Kugelbeutel

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletPouch.c4d/StringTblUS.txt

@@ -1 +1 @@
-Name=Musket Ball
+Name=Bullet Pouch

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/MuzzleFlash.c4d/DefCore.txt

@@ -3,8 +3,9 @@ id=FLSH
 Version=4,9,10,10
 Width=16
 Height=16
-Offset=-8,-8
+Offset=-8,-16
 Vertices=1
-VertexY=1
+VertexX=0
+VertexY=0
 Mass=1
 Rotate=1

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

@@ -21,6 +21,8 @@ protected func ControlUse(object clonk, ix, iy)
 
 protected func ControlUseStop(object pClonk, ix, iy)
 {
+	if(CheckCanUse(pClonk)==1) {
+
 	// Reload from Empty
 	if(MagazineType() && Ammo==0) {
 	while(MagazineType()->AmmoCount()!=0 && Ammo<MagazineSize()) 
@@ -37,20 +39,27 @@ protected func ControlUseStop(object pClonk, ix, iy)
 
 	// Fire
 	if(Ammo>=1) {
-	FindContents(ProjectileType())->LaunchProjectile(Angle(0,0,ix,iy)+RandomX(-(Accuracy()), Accuracy()), BarrelLength(), MuzzleVelocity());
-//	MuzzleFlash(pClonk,ix,iy); //Disabled due to action bug. Re-enable when working.
-	Sound("Blast3"); 
-	Message("Bang!", pClonk);
+	FireWeapon(pClonk, ix, iy);
 	Ammo=Ammo-1;
 	if(Ammo==0) IsLoaded=0;
-	return 1;
+	return 1; }
 	}
 return 1;
 }
 
-private func MuzzleFlash(object pClonk, int iX, int iY)
+public func CheckCanUse(object pClonk)
 {
-	pClonk->CreateContents(FLSH)->LaunchProjectile(Angle(0,0,iX,iY), BarrelLength());
+	if(pClonk->GetOCF() & OCF_NotContained) return 1;
+}
+
+private func FireWeapon(object pClonk, int iX, int iY)
+{
+	FindContents(ProjectileType())->LaunchProjectile(Angle(0,0,iX,iY)+RandomX(-(Accuracy()), Accuracy()), BarrelLength(), MuzzleVelocity());
+	Sound("Blast3");
+	Message("Bang!", pClonk);
+
+	//Muzzle Flash
+	pClonk->CreateContents(FLSH)->LaunchProjectile(Angle(0,0,iX,iY), BarrelLength(),0,0,13);
 }
 
 public func IsToolProduct() { return 1; }

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/StringTblDE.txt

@@ -1 +1 @@
-Name=Musket
+Name=Muskete

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

@@ -1,24 +0,0 @@
-[DefCore]
-id=WOOD
-Version=4,10,0,0
-Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase
-MaxUserSelect=25
-Width=12
-Height=12
-Offset=-7,-6
-Vertices=3
-VertexX=4,-5
-VertexY=-1,2
-VertexCNAT=1,2
-VertexFriction=30,30
-Value=2
-Mass=6
-Components=WOOD=1
-ContactIncinerate=1
-BlastIncinerate=5
-Rebuy=1
-Collectible=1
-Rotate=1
-Float=1
-StretchGrowth=1
-

planet/Objects.c4d/Rock.c4d/DefCore.txt

@@ -1,17 +0,0 @@
-[DefCore]
-id=ROCK
-Version=4,10,0,0
-Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase|C4D_SelectInEarth
-MaxUserSelect=10
-Width=6
-Height=6
-Offset=-3,-3
-Vertices=1
-VertexY=1
-VertexFriction=20
-Value=1
-Mass=10
-Components=IROC=3
-Rebuy=1
-Projectile=1
-