fix playing mooq sounds and move sounds to Sound.ocg

planet/Objects.ocd/Animals.ocd/Mooq.ocd/Authors.txt

@@ -1,14 +1,3 @@
 Model by pluto
 --------------
 Model, texture and animations.
-
-Sounds by ala
--------------
-CC Attribution 3.0 license (http://creativecommons.org/licenses/by/3.0/).
-
-MooqSnort1-3
-MooqSnorting1-2
-MooqDie1-5/Fat
-MooqHurt1-2
-MooqMunch1-4
-MooqSpit1-2

planet/Objects.ocd/Animals.ocd/Mooq.ocd/Script.c

@@ -72,12 +72,12 @@ func Death()
 	RemoveTimer("UpdateFood");
 	RemoveEffect("IntActivity", this);
 
-	Sound("MooqDie*");
+	Sound("Animals::Mooq::Die*");
 }
 
 func CatchBlow(int damage, object from)
 {
-	Schedule(this, "Sound(\"MooqHurt*\")", RandomX(5, 20));
+	Schedule(this, "Sound(\"Animals::Mooq::Hurt*\")", RandomX(5, 20));
 }
 
 /* Action Callbacks */
@@ -130,7 +130,7 @@ func SpitPhase()
 		if (!GetDir()) iXDir = -iXDir;
 		iYDir = -300;
 
-		Sound("MooqSpit*");
+		Sound("Animals::Mooq::Spit*");
 
 		var obj = CreateContents(Mooq_Firebomb);
 		obj->Exit(iX, iY);
@@ -158,7 +158,7 @@ func EatPhase()
 	{
 		if (!food) return;
 
-		Sound("MooqMunch*");
+		Sound("Animals::Mooq::Munch*");
 		DoEnergy(food->GetMass());
 		food->RemoveObject();
 	}
@@ -283,7 +283,7 @@ func FxIntActivityDamage(target, effect, dmg)
 
 func TaskIdle()
 {
-	Sound("MooqSnorting*");
+	Sound("Animals::Mooq::Snorting*");
 
 	if (!Random(3)) return SetAction("IdleSit");
 	if (!Random(2)) return SetAction("IdleStand");
@@ -466,13 +466,13 @@ func DoJump(bool swimming)
 		if (!GetDir()) iXDir = -iXDir;
 		iYDir = -200;
 
-		if (Random(2)) Sound("MooqSnort*");
+		if (Random(2)) Sound("Animals::Mooq::Snort*");
 
 		SetSpeed(iXDir + GetXDir(100), iYDir + GetYDir(100), 100);
 		return true;
 	}
 
-	if (Random(2)) Sound("MooqSnort*");
+	if (Random(2)) Sound("Animals::Mooq::Snort*");
 	return Jump();
 }
 

planet/Sound.ocg/authors.txt

@@ -16,7 +16,9 @@ ala             - Fire/Spark1&2&3, Objects/Weapons/Musket/Click1&2&3, Clonk/Acti
                   Clonk/Skin/Steampunk:
                      Confirm1&2&3&4, Decline1&2&4, Die1&2&3, Doubt1&2&3&4&5, Hurt1&2&3&4&5&6, Laughter1&2&3, Scream1, Shock1&2&4, Singing1&2
                   Animals/Bat:
-                     Chirp, Flutter1&2&3, Noise1&2&3   
+                     Chirp, Flutter1&2&3, Noise1&2&3
+                  Animals/Mooq:
+                     Die1-5, DieFat, Hurt1-2, Munch1-4, Snort1-3, Snorting1-2, Spit1-2
 K-Pone          - Objects/Pickaxe/ClangHard1
 Ringwaul        - Monster/Growl1-3, Monster/Die, Wipf/Snuff1-2, Wipf/Aroof, Wipf/Whine, Chest/Open, Chest/Close
                   Winbag/Charge, Winbag/ChargeStop, Winbag/Gust, Pickaxe/Clang1-3