Author: esr
Date: Fri Apr 24 13:19:32 2009
New Revision: 35159
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35159&view=rev
Log:
Wire in new music in appropriate places, note a TODO item.
Modified:
trunk/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
trunk/data/campaigns/Under_the_Burning_Suns/TODO
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
Modified: trunk/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg (original)
+++ trunk/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg Fri Apr
24 13:19:32 2009
@@ -13,7 +13,7 @@
{DEFAULT_SCHEDULE}
{SCENARIO_MUSIC the_city_falls.ogg}
- {EXTRA_SCENARIO_MUSIC vengeful.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
[story]
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
Fri Apr 24 13:19:32 2009
@@ -23,7 +23,7 @@
{SCENARIO_MUSIC underground.ogg} # No story part, so no intro music
{EXTRA_SCENARIO_MUSIC frantic.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
- {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
[story]
[part]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
Fri Apr 24 13:19:32 2009
@@ -10,7 +10,7 @@
{SCENARIO_MUSIC loyalists.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
- {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
# no story -- this occurs immediately after the previous scenario
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg Fri
Apr 24 13:19:32 2009
@@ -9,7 +9,7 @@
{DEFAULT_SCHEDULE}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg the_dangerous_symphony.ogg}
- {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{campaigns/Eastern_Invasion/utils/deaths.cfg}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
Fri Apr 24 13:19:32 2009
@@ -3,7 +3,7 @@
id=18_A_Choice_Must_Be_Made
name= _ "A Choice Must Be Made"
map_data="{campaigns/Heir_To_The_Throne/maps/18_A_Choice_Must_Be_Made.map}"
- {SCENARIO_MUSIC "nunc_dimittis.ogg"}
+ {SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
{EXTRA_SCENARIO_MUSIC "knolls.ogg"}
{TURNS 33 30 27}
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg (original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg Fri Apr 24
13:19:32 2009
@@ -22,7 +22,7 @@
{TURNS 35 30 25}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
- {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
{EXTRA_SCENARIO_MUSIC suspense.ogg}
Modified: trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg Fri Apr 24
13:19:32 2009
@@ -15,7 +15,7 @@
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
- {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
Fri Apr 24 13:19:32 2009
@@ -10,7 +10,7 @@
{INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "frantic.ogg"}
{EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
- {EXTRA_SCENARIO_MUSIC "the_city_falls.ogg"}
+ {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
# Story, in places with portraits again
# wmllint: local spelling geez
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg Fri
Apr 24 13:19:32 2009
@@ -12,6 +12,7 @@
{SCENARIO_MUSIC "northerners.ogg"}
{EXTRA_SCENARIO_MUSIC "knolls.ogg"}
+ {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
[event]
name=prestart
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
Fri Apr 24 13:19:32 2009
@@ -12,6 +12,7 @@
{SCENARIO_MUSIC "loyalists.ogg"}
{EXTRA_SCENARIO_MUSIC "battle.ogg"}
+ {EXTRA_SCENARIO_MUSIC "heroes_rite.ogg"}
[event]
name=prestart
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
Fri Apr 24 13:19:32 2009
@@ -19,6 +19,7 @@
{SCENARIO_MUSIC "knolls.ogg"}
{EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
+ {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
[event]
name=prestart
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
Fri Apr 24 13:19:32 2009
@@ -5,8 +5,9 @@
map_data="{campaigns/Son_Of_The_Black_Eye/maps/To_The_Harbour_Of_Tirigaz.map}"
{TURNS 36 30 24}
- {SCENARIO_MUSIC "knalgan_theme.ogg"}
+ {SCENARIO_MUSIC "underground.ogg"}
{EXTRA_SCENARIO_MUSIC "suspense.ogg"}
+ {EXTRA_SCENARIO_MUSIC "the_deep_path.ogg"}
#ifdef EASY
{FIRST_WATCH}
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg Fri
Apr 24 13:19:32 2009
@@ -33,6 +33,7 @@
{SCENARIO_MUSIC "the_city_falls.ogg"}
{EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
+ {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
[event]
name=prestart
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
Fri Apr 24 13:19:32 2009
@@ -10,6 +10,7 @@
next_scenario="Silent_Forest"
{SCENARIO_MUSIC "wanderer.ogg"}
+ {EXTRA_SCENARIO_MUSIC "the_dangerous_symphony.ogg"}
[event]
name=prestart
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg Fri Apr
24 13:19:32 2009
@@ -8,7 +8,7 @@
victory_when_enemies_defeated="yes"
- {SCENARIO_MUSIC "battle.ogg"}
+ {SCENARIO_MUSIC "vengeful.ogg"}
{EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
{MORNING}
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
---
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
(original)
+++
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
Fri Apr 24 13:19:32 2009
@@ -449,7 +449,7 @@
{REPLACE_SCENARIO_MUSIC "vengeful.ogg"}
{APPEND_MUSIC "underground.ogg"}
{APPEND_MUSIC "breaking_the_chains.ogg"}
- {APPEND_MUSIC "the_city_falls.ogg"}
+ {APPEND_MUSIC "siege_of_laurelmor.ogg"}
{APPEND_MUSIC "battle.ogg"}
{APPEND_MUSIC "vengeful.ogg"}
{APPEND_MUSIC "the_deep_path.ogg"}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg Fri
Apr 24 13:19:32 2009
@@ -12,7 +12,7 @@
{SCENARIO_MUSIC loyalists.ogg}
{EXTRA_SCENARIO_MUSIC northerners.ogg}
{EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
- {EXTRA_SCENARIO_MUSIC knolls.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
# No story
{THE_VANGUARD_BIGMAP}
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=35159&r1=35158&r2=35159&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 Fri
Apr 24 13:19:32 2009
@@ -7,7 +7,7 @@
{SCENARIO_MUSIC knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
- {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+ {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
map_data="{campaigns/The_South_Guard/maps/8b_The_Tides_of_War.map}"
Modified: trunk/data/campaigns/Under_the_Burning_Suns/TODO
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/TODO?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/TODO (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/TODO Fri Apr 24 13:19:32 2009
@@ -1,4 +1,6 @@
- The character sprites for Kaleh and Nym are old ones based on 1.0 and
not TCed; they look slightly wrong next to the recolored 2.0 sprites.
--Possibly give the "Emerald Wand of Poison" a better name, and possibly make
the item accessible to units other than the Desert Shyde and the Desert Star.
+-Possibly give the "Emerald Wand of Poison" a better name, and possibly make
the item accessible to units other than the Desert Shyde and the Desert Star.
+
+-Give some textual clue about the locations of the coldsword and wand.
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg?rev=35159&r1=35158&r2=35159&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
Fri Apr 24 13:19:32 2009
@@ -25,6 +25,7 @@
{INTRO_AND_SCENARIO_MUSIC "transience.ogg" "the_deep_path.ogg"}
{EXTRA_SCENARIO_MUSIC "frantic.ogg"}
{EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
+ {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
{STORY_STIRRING_IN_THE_NIGHT}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
