From 2ac4f2aa97ddab02dd2c6aa3e0b5f438212d0f70 Mon Sep 17 00:00:00 2001
From: Maikel de Vries <mdt.maikel@gmail.com>
Date: Tue, 3 Jan 2017 18:09:42 +0100
Subject: [PATCH] move windmill defense sounds to general folder

So that other rounds can use them as well.
---
 planet/Defense.ocf/Windmill.ocs/Script.c            |   2 +-
 .../Defense.ocf/Windmill.ocs/Sound.ocg/authors.txt  |   5 -----
 .../Defense.ocf/Windmill.ocs/System.ocg/Airship.c   |   2 +-
 .../Clonk.ocg/Action.ocg/GroupAttack.ogg}           | Bin
 .../Sound.ocg => Sound.ocg/UI.ocg}/NextWave.ogg     | Bin
 planet/Sound.ocg/authors.txt                        |   3 +++
 6 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 planet/Defense.ocf/Windmill.ocs/Sound.ocg/authors.txt
 rename planet/{Defense.ocf/Windmill.ocs/Sound.ocg/Attack.ogg => Sound.ocg/Clonk.ocg/Action.ocg/GroupAttack.ogg} (100%)
 rename planet/{Defense.ocf/Windmill.ocs/Sound.ocg => Sound.ocg/UI.ocg}/NextWave.ogg (100%)

diff --git a/planet/Defense.ocf/Windmill.ocs/Script.c b/planet/Defense.ocf/Windmill.ocs/Script.c
index d39d73d7e..292fc6dd8 100644
--- a/planet/Defense.ocf/Windmill.ocs/Script.c
+++ b/planet/Defense.ocf/Windmill.ocs/Script.c
@@ -383,7 +383,7 @@ func OnWaveCleared(int wave)
 		DoWealthForAll(bounty);
 	}
 	CustomMessage(Format("$MsgWaveCleared$%s|                                                             ", wave, bounty_msg));
-	Sound("NextWave");
+	Sound("UI::NextWave");
 	// Fade out stuff
 	Airship->AllStop();
 	if (g_object_fade)
diff --git a/planet/Defense.ocf/Windmill.ocs/Sound.ocg/authors.txt b/planet/Defense.ocf/Windmill.ocs/Sound.ocg/authors.txt
deleted file mode 100644
index f22c0eaa2..000000000
--- a/planet/Defense.ocf/Windmill.ocs/Sound.ocg/authors.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-NextWave.ogg by daveincamas (http://www.freesound.org/people/daveincamas/sounds/27082/)
-	CC-BY 3.0
-
-Attack.ogg by Erdie (http://www.freesound.org/people/Erdie/sounds/165614/)
-	CC-BY 3.0
\ No newline at end of file
diff --git a/planet/Defense.ocf/Windmill.ocs/System.ocg/Airship.c b/planet/Defense.ocf/Windmill.ocs/System.ocg/Airship.c
index 0dcae544b..a0ed142c0 100644
--- a/planet/Defense.ocf/Windmill.ocs/System.ocg/Airship.c
+++ b/planet/Defense.ocf/Windmill.ocs/System.ocg/Airship.c
@@ -53,7 +53,7 @@ public func PrepareToBoard(object cpt)
 	}
 	// Suitable crew
 	if (count >= 5)
-		Sound("Attack");
+		Sound("Clonk::Action::GroupAttack");
 	// Let the captain yell something
 	if (!Random(3) && cpt)
 		cpt->Message(Translate(Format("MsgAttack%d", Random(4))));
diff --git a/planet/Defense.ocf/Windmill.ocs/Sound.ocg/Attack.ogg b/planet/Sound.ocg/Clonk.ocg/Action.ocg/GroupAttack.ogg
similarity index 100%
rename from planet/Defense.ocf/Windmill.ocs/Sound.ocg/Attack.ogg
rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/GroupAttack.ogg
diff --git a/planet/Defense.ocf/Windmill.ocs/Sound.ocg/NextWave.ogg b/planet/Sound.ocg/UI.ocg/NextWave.ogg
similarity index 100%
rename from planet/Defense.ocf/Windmill.ocs/Sound.ocg/NextWave.ogg
rename to planet/Sound.ocg/UI.ocg/NextWave.ogg
diff --git a/planet/Sound.ocg/authors.txt b/planet/Sound.ocg/authors.txt
index ef6395b41..9990ae9a7 100644
--- a/planet/Sound.ocg/authors.txt
+++ b/planet/Sound.ocg/authors.txt
@@ -86,6 +86,9 @@ jrosin          - Environemnt/Lightning/Thunder4 (https://www.freesound.org/peop
 shaka9          - Environemnt/Lightning/Thunder5 (https://www.freesound.org/people/shaka9/sounds/160514/ adapted by Maikel)
 Harbour11       - UI::Error, UI::Trumpet (both adapted by Sven2; used sound from http://freesound.org/people/Harbour11/sounds/194624/)
 CosmicEmbers    - Objects::LineSnap (cropped/pitch adjusted by Sven2; original from http://freesound.org/people/CosmicEmbers/sounds/161650/)
+daveincamas     - UI::NextWave (http://www.freesound.org/people/daveincamas/sounds/27082/)
+Erdie           - Clonk::Action::GroupAttack.ogg (http://www.freesound.org/people/Erdie/sounds/165614/)
+
 
 The following sounds use two sources: