From b47da6a4cac62fdebe1982eaadd79a26453a762c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A4r=20Halberkamp?= <fledaway@gmail.com>
Date: Wed, 18 Mar 2015 15:02:42 +0100
Subject: [PATCH] EI: added sound sources to S1 and S4a

---
 .../Eastern_Invasion/maps/01_The_Outpost.map  |  5 +--
 .../scenarios/01_The_Outpost.cfg              |  2 ++
 .../scenarios/04a_An_Elven_Alliance.cfg       |  5 +++
 .../Eastern_Invasion/utils/sound_sources.cfg  | 34 +++++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 data/campaigns/Eastern_Invasion/utils/sound_sources.cfg

diff --git a/data/campaigns/Eastern_Invasion/maps/01_The_Outpost.map b/data/campaigns/Eastern_Invasion/maps/01_The_Outpost.map
index fbc5fe30ccee..c250ad039c46 100644
--- a/data/campaigns/Eastern_Invasion/maps/01_The_Outpost.map
+++ b/data/campaigns/Eastern_Invasion/maps/01_The_Outpost.map
@@ -1,6 +1,3 @@
-border_size=1
-usage=map
-
 Gs^Fds, Gs^Fds, Gll^Fms, Gs^Fds, Gll^Fds, Gg, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gs^Fds, Gll^Fds, Gll^Fms, Gll^Fds, Gll^Fds, Gll^Fds, Gs^Fds, Hh^Fds, Hh^Fds, Hh^Fds, Hh, Hh, Hh, Mm, Ww, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Hh, Hh, Gg, Mm, Mm, Mm
 Gs^Fds, Gll^Fms, Gs^Fms, Gll^Fds, Gll^Fds, Gg^Vh, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fms, Gs^Fms, Gs^Fms, Gs^Fds, Gs^Fds, Gll^Fds, Gs^Fds, Gll^Fds, Hh^Fds, Hh^Fds, Hh^Fds, Hh, Hh, Hh, Mm, Ww, Mm^Vhh, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Hh, Hh, Gg, Mm, Mm, Mm
 Gs^Fds, Gs^Fms, Gs^Fp, Gs^Fp, Gs^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gg^Vl, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Vh, Gll^Fds, Gll^Fds, Gll, Gg, Gg^Vl, Hh, Hh, Ww, Mm, Mm, Hh, Mm, Mm, Mm, Hh, Hh, Hh, Mm, Mm, Hh, Mm, Mm^Vhh, Mm, Mm, Mm
@@ -14,7 +11,7 @@ Gll^Fds, Gs^Fms, Gs^Fms, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gs, Gs, Gl
 Gll^Fds, Gll^Fms, Gs^Fds, Gs^Fds, Gll^Fds, Gll^Em, Gg, Gs, Gs, Gll, Ww, Ww, Ww, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gll^Fms, Gll, Gg, Gg, Hh, Mm, Mm, Hh, Hh, Hh, Mm, Mm, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm
 Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Re^Gvs, Gs, Ww, Ww, Gg, Ww, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gll^Fds, Gs^Fms, Gg, Gg, Gg^Vh, Hh, Hh, Gd^Es, Gg, Gg, Hh, Gg, Hh, Gs, Hh, Hh, Mm, Mm, Mm, Mm
 Gll^Fds, Gll^Fds, Gll^Fds, Gll^Fds, Re^Gvs, Re^Gvs, Gg, Gs^Fds, Ww, Hh, Re^Gvs, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gll, Gll^Fms, Gll^Fms, Gg, Hh, Hh, Gg, Gs, Gs, Ce, Gg^Vl, Gg, Gs, Hh, Gs, Gd, Hh, Hh, Mm, Mm
-Gg, Gll^Em, Re^Gvs, Re^Gvs, Re^Vl, Re^Gvs, Gg, Ww, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Rr, Gs, Gg, Gg, Gll, Gll, Gg, Hh, Hh, Gs, Gs, Ce, 3 Ke, Ce, Gg, Gs, Hh, Gd, Hh, Hh, Gs, Hh, Hh
+Gg, Gll^Em, Re^Gvs, Re^Gvs, Re^Vl, Re^Gvs, Gg, Ww, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Rr, Gs, Gg, Gg, Gll, Gll, Gg, Hh, Hh, Gs, Gs, Ce, 3 Ke, Ce, Gg, Gs^Ecf, Hh, Gd, Hh, Hh, Gs, Hh, Hh
 Rr, Rr, Rr, Rr, Rr, Re^Gvs, Rr, Ww, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Rr, Gg, Rr, Gll, Gg, Gg^Vh, Rr, Rr, Hh, Gg, Gg, Gg, Ce, Ce, Ce, Gd, Gs, Re, Gs, Hh, Hh, Hh, Gd, Gs
 Gll, Gg, Re^Gvs, Re^Gvs, Gll^Fds, Rr, Gll^Fds, Ww^Bw\, Rr, Re^Gvs, Ch, Ch, Ch, Gg, Rr, Rr, Gg^Vh, Gg, Re^Gvs, Gg, Gs^Fds, Gll^Fms, Gll, Gg, Gg, Gg, Hh, Rr, Re, Gg, Gs, Gg, Re, Gd, Gg^Vhh, Re, Gs^Es, Re, Re, Re, Re
 Gll^Fds, Gll^Fds, Gll^Fds, Re^Gvs, Gll^Fds, Gll^Fds, Gs^Fds, Ww, Gg, Rr, Ch, 1 Kh, Ch, Gs, Rr, Gg, Re^Gvs, Re^Gvs, Gll^Fds, Gg, Gll^Fds, Gs^Fms, Gll^Fms, Gll^Fms, Gll^Fms, Gg, Hh, Hh, Hh, Hh, Gs, Re, Gg, Hh, Hh, Hh, Gs, Hh, Hh, Hh, Hh
diff --git a/data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg
index 84bbc641a130..c0987f124216 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg
@@ -7,6 +7,8 @@
     turns=16
     {DEFAULT_SCHEDULE}
 
+    {SETUP_CAMPFIRES}
+
     {INTRO_AND_SCENARIO_MUSIC knolls.ogg loyalists.ogg}
     {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
 
diff --git a/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg b/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
index d08a1296bf0b..f4ffd91178ee 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
@@ -12,6 +12,11 @@
     {EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
     {EXTRA_SCENARIO_MUSIC elvish-theme.ogg}
 
+    {AMBIENT_BIRDS 12 21}
+    {AMBIENT_BIRDS 5  14}
+    {AMBIENT_BIRDS 33 17}
+    {AMBIENT_BIRDS 29 7 }
+
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
     [story]
diff --git a/data/campaigns/Eastern_Invasion/utils/sound_sources.cfg b/data/campaigns/Eastern_Invasion/utils/sound_sources.cfg
new file mode 100644
index 000000000000..335a4d735d88
--- /dev/null
+++ b/data/campaigns/Eastern_Invasion/utils/sound_sources.cfg
@@ -0,0 +1,34 @@
+#textdomain wesnoth-ei
+
+#define AMBIENT_BIRDS X Y
+    [sound_source]
+        id=birds{X}{Y}
+        x,y={X},{Y}
+        sounds=ambient/birds1.ogg,ambient/birds2.ogg,ambient/birds3.ogg
+        delay=6000
+        chance=100
+        full_range=1
+        fade_range=10
+    [/sound_source]
+#enddef
+
+#define SETUP_CAMPFIRES
+    [event]
+        name=prestart
+        [store_locations]
+            terrain=*^Ecf
+            variable=campfires
+        [/store_locations]
+        {FOREACH campfires i}
+            [sound_source]
+                id=campfire$i
+                x,y=$campfires[$i].x,$campfires[$i].y
+                sounds=ambient/campfire.ogg
+                delay=0
+                chance=100
+                full_range=1
+                fade_range=6
+            [/sound_source]
+        {NEXT i}
+    [/event]
+#enddef