mail[Wesnoth-commits] r24376 - in /trunk/data/campaigns/The_South_Guard: scenarios/ utils/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by lari . nieminen on March 06, 2008 - 20:09:
Author: zookeeper
Date: Thu Mar  6 20:09:09 2008
New Revision: 24376

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24376&view=rev
Log:
Revamp the music in TSG rather completely.

Modified:
    trunk/data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
    
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
    trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/01_Born_To_The_Banner.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,20 +4,8 @@
 
     name= _ "Born to the Banner"
     next_scenario=2_Proven_By_The_Sword
-    [music]
-        name=knolls.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=wanderer.ogg
-        ms_before=500
-        append=yes
-    [/music]
-    [music]
-        name=battle.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC knolls.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/1_Born_To_The_Banner.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/02_Proven_By_The_Sword.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,15 +4,9 @@
 
     name= _ "Proven By The Sword"
     next_scenario=3_A_Desperate_Errand
-    [music]
-        name=battle.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=loyalists.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC battle.ogg}
+    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/2_Proven_By_The_Sword.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,20 +4,9 @@
 
     name= _ "A Desperate Errand"
     next_scenario=4_Vale_of_Tears
-    [music]
-        name=revelation.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=loyalists.ogg
-        ms_before=500
-        append=yes
-    [/music]
-    [music]
-        name=wanderer.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC wanderer.ogg}
+    {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/3_A_Desperate_Errand.map}"
 

Modified: trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg Thu 
Mar  6 20:09:09 2008
@@ -4,20 +4,9 @@
 
     name= _ "Vale of Tears"
     next_scenario=5_Choice_In_The_Fog
-    [music]
-        name=revelation.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=knolls.ogg
-        ms_before=500
-        append=yes
-    [/music]
-    [music]
-        name=elf-land.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC knolls.ogg}
+    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/4_Vale_of_Tears.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,10 +4,10 @@
 
     name= _ "Choice in the Fog"
     next_scenario=6a_Tidings_Good_And_Ill
-    [music]
-        name=underground.ogg
-        ms_before=500
-    [/music]
+    
+    {SCENARIO_MUSIC underground.ogg}
+    {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
+    
     # music changes when bandits are encountered
 
     map_data="{campaigns/The_South_Guard/maps/5_Choice_In_The_Fog.map}"
@@ -432,6 +432,16 @@
                 id=accept_bandits
                 message= _ "Very well. All men must unite against the 
undead."
                 [command]
+                    [music]
+                        name=breaking_the_chains.ogg
+                        immediate=no
+                        append=no
+                    [/music]
+                    [music]
+                        name=the_city_falls.ogg
+                        append=yes
+                    [/music]
+                
                     {MODIFY_UNIT side=2 side 1}
 
                     [store_unit]
@@ -559,6 +569,16 @@
                 id=reject_bandits
                 message= _ "Your crimes are too great. You will fall with 
the rest of the foul undead!"
                 [command]
+                    [music]
+                        name=knolls.ogg
+                        immediate=no
+                        append=no
+                    [/music]
+                    [music]
+                        name=nunc_dimittis.ogg
+                        append=yes
+                    [/music]
+                    
                     [message]
                         description=Urza Afalas
                         message= _ "Then this parlay is over! You may have 
sounded the doom of all of us!"

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,15 +4,9 @@
 
     name= _ "Tidings, Good and Ill"
     next_scenario=7a_Into_The_Depths
-    [music]
-        name=battle.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=loyalists.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC loyalists.ogg}
+    {EXTRA_SCENARIO_MUSIC wanderer.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/6a_Tidings_Good_And_Ill.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg Thu 
Mar  6 20:09:09 2008
@@ -4,15 +4,9 @@
 
     name= _ "The Long March"
     next_scenario=7b_Pebbles_In_The_Flood
-    [music]
-        name=revelation.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=northerners.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC nunc_dimittis.ogg}
+    {EXTRA_SCENARIO_MUSIC knolls.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/6b_The_Long_March.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,15 +4,9 @@
 
     name= _ "Into The Depths"
     next_scenario=8a_Return_To_Kerlath
-    [music]
-        name=underground.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=knolls.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC knalgan_theme.ogg}
+    {EXTRA_SCENARIO_MUSIC underground.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/7a_Into_The_Depths.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,10 +4,10 @@
 
     name= _ "Pebbles in the Flood"
     next_scenario=8b_The_Tides_of_War
-    [music]
-        name=main_menu.ogg
-        ms_before=500
-    [/music]
+    
+    {SCENARIO_MUSIC elvish-theme.ogg}
+    {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
+    {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map}"
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg 
Thu Mar  6 20:09:09 2008
@@ -15,20 +15,8 @@
 #endif
     victory_when_enemies_defeated=no
 
-    [music]
-        name=elf-land.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=knolls.ogg
-        ms_before=500
-        append=yes
-    [/music]
-    [music]
-        name=wanderer.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    {SCENARIO_MUSIC wanderer.ogg}
+    {EXTRA_SCENARIO_MUSIC knolls.ogg}
 
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
 

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg 
Thu Mar  6 20:09:09 2008
@@ -4,15 +4,10 @@
 
     name= _ "The Tides of War"
     next_scenario=9b_Bandit_Epilogue
-    [music]
-        name=main_menu_new.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=battle.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC knalgan_theme.ogg}
+    {EXTRA_SCENARIO_MUSIC battle.ogg}
+    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/8b_The_Tides_of_War.map}"
 

Modified: trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg Thu Mar  
6 20:09:09 2008
@@ -4,15 +4,8 @@
 
     name= _ "Vengeance"
     next_scenario=10a_Elf_Epilogue
-    [music]
-        name=main_menu.ogg
-        ms_before=500
-    [/music]
-    [music]
-        name=knolls.ogg
-        ms_before=500
-        append=yes
-    [/music]
+    
+    {SCENARIO_MUSIC nunc_dimittis.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/9a_Vengeance.map}"
 
@@ -199,8 +192,19 @@
             speaker=Ithelden
             message= _ "You too, Ethiliel? All these menfolk are the same! 
They fell trees to till the earth; now they have felled our leader! We cannot 
brook such deeds! You will die with them!"
         [/message]
+        
         [music]
-            name=revelation.ogg
+            name=vengeful.ogg
+            immediate=yes
+            append=no
+        [/music]
+        [music]
+            name=the_city_falls.ogg
+            append=yes
+        [/music]
+        [music]
+            name=battle.ogg
+            append=yes
         [/music]
 
         {SG_UNIT (Elvish Fighter) (Disciple of Mebrin) (_"Disciple of 
Mebrin") 2 3 17}

Modified: trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg?rev=24376&r1=24375&r2=24376&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg Thu Mar  6 
20:09:09 2008
@@ -18,21 +18,22 @@
         [part]
             background=story/summer.jpg
             story= _ "During the reign of Haldric VII, the land of Wesnoth 
was peaceful. Konrad I had driven off the orcs in the north. The eastern 
forts were quiet and almost deserted. The elves in the western forest kept to 
their own affairs. In the prosperous south men built new towns and farms."
+            music=revelation.ogg
         [/part]
         [part]
-            background=story/summer.jpg
+            background=story/fall.jpg
             story= _ "For eight years the South Guard had defended the farms 
and homes surrounding the city of Westin, the capital of Wesnoth's frontier 
province of Kerlath in the furthermost south. The fiercest foe they had faced 
was the occasional bandit. The orcs were far to the north. In the Aethenwood 
to the west dreamed the elves, not foes of humankind but keeping aloof from 
men. Only scattered few outlaws lived in the wildlands south of Kerlath, a 
bastion of the ancient heart forest of the Great Continent so dense and 
gloomy that even elves forbore from dwelling there."
         [/part]
         [part]
-            background=story/summer.jpg
+            background=story/winter.jpg
             story= _ "Then, in the spring of the ninth year the reports from 
the South Guard, under the command of Sir Loris, suddenly ceased. King 
Haldric decided to send someone to investigate."
         [/part]
         [part]
-            background=story/summer.jpg
+            background=story/fall.jpg
             story= _ "King Haldric summoned a young, undistinguished but 
promising cavalry officer named Deoran. Deoran was the son of Haldiel, who 
had fought with distinction alongside Konrad I in the wars against the orcs. 
The king had a mission for Haldiel's son."
         [/part]
         [part]
-            background=story/summer.jpg
+            background=story/winter.jpg
             story= _ "King Haldric knighted young Deoran, and when he rose 
tasked him to ride to Westin, to demand an accounting from Sir Loris, the 
commander of the South Guard..."
         [/part]
         [part]
@@ -55,6 +56,7 @@
         [part]
             background=story/summer.jpg
             story= _ "Having defeated Urza Mathin, Deoran immediately sent 
scouts out into the whole countryside. His men reported bandits roaming 
freely over the border, terrorizing the peasants and villagers. Nowhere did 
they find soldiers of the South Guard."
+            music=revelation.ogg
         [/part]
         [part]
             background=story/summer.jpg
@@ -84,6 +86,7 @@
         [part]
             background=story/fall.jpg
             story= _ "Ethiliel led the men of the South Guard into the 
southern forest. Shadows soon covered their paths day and night, and a thick 
fog filled the air."
+            music=revelation.ogg
         [/part]
 
         [part]
@@ -103,6 +106,7 @@
         [part]
             background=story/fall.jpg
             story= _ "After Mal M'Brin's defeat, Deoran's troops and their 
elvish allies turned north for home. As they re-crossed the Black River, fall 
was fading into winter."
+            music=revelation.ogg
         [/part]
 
         [part]
@@ -117,6 +121,7 @@
         [part]
             background=story/winter.jpg
             story= _ "Snow fell as Deoran, Sir Gerrick and Urza Afalas 
emerged from the great southern forest. An oppressive silence hung over the 
land, and an ominous gloom followed close behind the men of the South Guard."
+            music=revelation.ogg
         [/part]
 
         [part]
@@ -148,7 +153,7 @@
         [part]
             background=story/winter.jpg
             story= _ "Sir Deoran, Knight of Wesnoth, was summoned to Weldyn 
for a council with King Haldric himself. Storm clouds were brewing throughout 
the realm, and every commander would be needed to weather the storm..."
-            music=loyalists.ogg
+            music=traveling_minstrels.ogg
         [/part]
     [/story]
 #enddef
@@ -188,7 +193,7 @@
         [part]
             background=story/winter.jpg
             story= _ "Sir Deoran, Knight of Wesnoth, was summoned to Weldyn 
for a council with King Haldric himself. Storm clouds were brewing throughout 
the realm, and every commander would be needed to weather the onslaught..."
-            music=loyalists.ogg
+            music=traveling_minstrels.ogg
         [/part]
     [/story]
 #enddef




Related Messages


Powered by MHonArc, Updated Thu Mar 06 21:01:48 2008