Author: esr
Date: Tue Oct 21 06:41:48 2008
New Revision: 30294
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30294&view=rev
Log:
Descent Into Darkness gets a music update.
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
Tue Oct 21 06:41:48 2008
@@ -6,10 +6,13 @@
name=_ "Saving Parthyn"
map_data="{campaigns/Descent_Into_Darkness/maps/Saving_Parthyn.map}"
turns=15
-
- {SCENARIO_MUSIC northerners.ogg}
-
victory_when_enemies_defeated=no
+ {DEFAULT_SCHEDULE}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg northerners.ogg}
+ {EXTRA_SCENARIO_MUSIC loyalists.ogg}
+ {EXTRA_SCENARIO_MUSIC battle.ogg}
[story]
[part]
@@ -42,8 +45,6 @@
{TO_SAVING_PARTHYN}
[/part]
[/story]
-
- {DEFAULT_SCHEDULE}
[side]
side=1
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
Tue Oct 21 06:41:48 2008
@@ -5,12 +5,19 @@
name=_ "Peaceful Valley"
map_data="{campaigns/Descent_Into_Darkness/maps/Peaceful_valley.map}"
+ victory_when_enemies_defeated=no
{TURNS 29 26 23}
-
- {SCENARIO_MUSIC wanderer.ogg}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC wanderer.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
-
- victory_when_enemies_defeated=no
+ {EXTRA_SCENARIO_MUSIC revelation.ogg}
[story]
[part]
@@ -24,13 +31,6 @@
{TO_PEACEFUL_VALLEY}
[/part]
[/story]
-
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
[side]
side=1
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
Tue Oct 21 06:41:48 2008
@@ -5,12 +5,14 @@
name=_ "A Haunting in Winter"
map_data="{campaigns/Descent_Into_Darkness/maps/A_haunting_in_winter.map}"
+ victory_when_enemies_defeated=yes
{TURNS 36 34 32}
-
- {SCENARIO_MUSIC knalgan_theme.ogg}
+ {UNDERGROUND}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC the_deep_path.ogg knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC underground.ogg}
-
- victory_when_enemies_defeated=yes
+ {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
[story]
[part]
@@ -21,8 +23,6 @@
{TO_A_HAUNTING_IN_WINTER}
[/part]
[/story]
-
- {UNDERGROUND}
[time_area]
x=12-24,12-21,12-20,14-18,16-18
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
Tue Oct 21 06:41:48 2008
@@ -6,11 +6,19 @@
name=_ "Beginning of the Revenge"
map_data="{campaigns/Descent_Into_Darkness/maps/Revenge.map}"
turns=36
-
- {SCENARIO_MUSIC wanderer.ogg}
- {EXTRA_SCENARIO_MUSIC elvish-theme.ogg}
-
victory_when_enemies_defeated=yes
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC revelation.ogg vengeful.ogg}
+ {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
+ {EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
+ {EXTRA_SCENARIO_MUSIC northerners.ogg}
[story]
[part]
@@ -24,13 +32,6 @@
{TO_BEGINNING_OF_THE_REVENGE}
[/part]
[/story]
-
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
- {MORNING}
- {AFTERNOON}
[side]
side=1
Modified: trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg Tue Oct
21 06:41:48 2008
@@ -5,12 +5,19 @@
name=_ "Orc War"
map_data="{campaigns/Descent_Into_Darkness/maps/Orc_war.map}"
+ victory_when_enemies_defeated=yes
turns=30
-
- {SCENARIO_MUSIC battle.ogg}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC northerners.ogg battle.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
-
- victory_when_enemies_defeated=yes
+ {EXTRA_SCENARIO_MUSIC the_dangerous_symphony.ogg}
[story]
[part]
@@ -28,12 +35,6 @@
[/part]
[/story]
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
{SET_LABEL 8 12 (_"River Longlier")}
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Tue Oct 21 06:41:48 2008
@@ -6,12 +6,13 @@
name=_ "Return to Parthyn"
map_data="{campaigns/Descent_Into_Darkness/maps/Return_to_Parthyn.map}"
turns=-1
-
- {SCENARIO_MUSIC breaking_the_chains.ogg}
+ victory_when_enemies_defeated=no
+ {DEFAULT_SCHEDULE}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC elvish-theme.ogg}
-
- victory_when_enemies_defeated=no
[story]
[part]
@@ -25,8 +26,6 @@
{TO_RETURN_TO_PARTHYN}
[/part]
[/story]
-
- {DEFAULT_SCHEDULE}
[side]
side=1
@@ -314,11 +313,7 @@
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
- [music]
- name=loyalists.ogg
- append=no
- immediate=yes
- [/music]
+ {INCIDENTAL_MUSIC loyalists.ogg}
[event]
name=moveto
[filter]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
Tue Oct 21 06:41:48 2008
@@ -6,11 +6,13 @@
name=_ "A Small Favor"
map_data="{campaigns/Descent_Into_Darkness/maps/A_small_favor.map}"
{TURNS 28 26 22}
-
- {SCENARIO_MUSIC underground.ogg}
+ victory_when_enemies_defeated=no
+ {FIRST_WATCH}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC underground.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
-
- victory_when_enemies_defeated=no
+ {EXTRA_SCENARIO_MUSIC elf-land.ogg}
[story]
[part]
@@ -30,8 +32,6 @@
{TO_A_SMALL_FAVOR}
[/part]
[/story]
-
- {FIRST_WATCH}
[side]
side=1
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=30294&r1=30293&r2=30294&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
Tue Oct 21 06:41:48 2008
@@ -6,10 +6,12 @@
name=_ "A Small Favor - Part 2"
map_data="{campaigns/Descent_Into_Darkness/maps/A_small_favor2.map}"
{TURNS 30 27 25}
-
+ victory_when_enemies_defeated=no
+
+ {VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC loyalists.ogg}
-
- victory_when_enemies_defeated=no
+ {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
+ {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
# no story -- this occurs immediately after the previous scenario
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
Tue Oct 21 06:41:48 2008
@@ -6,15 +6,15 @@
name=_ "A Small Favor - Part 3"
map_data="{campaigns/Descent_Into_Darkness/maps/A_small_favor3.map}"
{TURNS 30 27 25}
-
+ victory_when_enemies_defeated=no
+ {UNDERGROUND}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC underground.ogg}
{EXTRA_SCENARIO_MUSIC loyalists.ogg}
-
- victory_when_enemies_defeated=no
+ {EXTRA_SCENARIO_MUSIC wanderer.ogg}
# no story -- this occurs immediately after the previous scenario
-
- {UNDERGROUND}
[side]
side=1
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
Tue Oct 21 06:41:48 2008
@@ -6,13 +6,18 @@
name=_ "Alone at Last"
map_data="{campaigns/Descent_Into_Darkness/maps/Alone_at_last.map}"
turns=-1
-
+ victory_when_enemies_defeated=no
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
- {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
-
- victory_when_enemies_defeated=no
[story]
[part]
@@ -27,12 +32,6 @@
[/part]
[/story]
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
- {MORNING}
- {AFTERNOON}
[side]
side=1
@@ -349,7 +348,10 @@
numerical_equals=5
[/variable]
[then]
- # Fake move the paladin in, set up a camp, have some dialog,
and give him another paladin and a mage of light
+ # Fake move the paladin in, set up a camp, have some
+ # dialog, and give him another paladin and a mage of
+ # light
+ {INCIDENTAL_MUSIC loyalists.ogg}
[move_unit_fake]
type=Paladin
x=34,32
@@ -406,7 +408,9 @@
numerical_equals=10
[/variable]
[then]
- # Fake move Dela in, set up camp, have some dialog. She
doesn't bring anyone with her.
+ # Fake move Dela in, set up camp, have some
+ # dialog. She doesn't bring anyone with her.
+ {INCIDENTAL_MUSIC legends_of_the_north.ogg}
[move_unit_fake]
type=Frontier Baroness
x=27,21
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
Tue Oct 21 06:41:48 2008
@@ -7,7 +7,10 @@
map_data="{campaigns/Descent_Into_Darkness/maps/Descent_into_darkness.map}"
turns=-1
- {SCENARIO_MUSIC silence.ogg}
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg the_deep_path.ogg}
+ {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
+ {EXTRA_SCENARIO_MUSIC revelation.ogg}
victory_when_enemies_defeated=no
@@ -392,7 +395,7 @@
[redraw]
[/redraw]
- # He's not necessariliy totally happy about this
+ # He's not necessarilly totally happy about this
[message]
speaker=Mal Keshar
message=_ "AAAAAAAAAAaaaaaaaiiiiiiiiiggggggggghhhhhh!!!!!!!"
@@ -409,19 +412,11 @@
{DELAY 500}
- [music]
- name=the_dangerous_symphony.ogg
- immediate=yes
- append=no
- [/music]
- [music]
- name=knalgan_theme.ogg
- append=yes
- [/music]
- [music]
- name=heroes_rite.ogg
- append=yes
- [/music]
+ {INCIDENTAL_MUSIC the_dangerous_symphony.ogg}
+ {INCIDENTAL_MUSIC knalgan_theme.ogg}
+ {INCIDENTAL_MUSIC heroes_rite.ogg}
+
+ {DELAY 500}
[sound]
name=lich-hit-1.ogg
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg?rev=30294&r1=30293&r2=30294&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
Tue Oct 21 06:41:48 2008
@@ -128,11 +128,7 @@
[/unit]
{ALLOW_RECRUIT
(Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantryman,Shock
Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer)}
- [music]
- name=loyalists.ogg
- immediate=yes
- append=no
- [/music]
+ {INCIDENTAL_MUSIC loyalists.ogg}
[music]
name=the_city_falls.ogg
append=yes
@@ -154,11 +150,7 @@
canrecruit=yes
[/unit]
{ALLOW_RECRUIT
(Thug,Bandit,Footpad,Outlaw,Poacher,Trapper,Thief,Rogue)}
-
- [music]
- name=battle.ogg
- append=no
- [/music]
+ {INCIDENTAL_MUSIC battle.ogg}
[/then]
[/if]
[if]
@@ -177,13 +169,9 @@
[/unit]
{ALLOW_RECRUIT (Elvish Fighter,Elvish Hero,Elvish
Captain,Elvish Archer,Elvish Ranger,Elvish Marksman,Elvish Shaman,Elvish
Sorceress,Elvish Druid,Elvish Scout,Elvish Rider,Wose)}
- [music]
- name=knolls.ogg
- immediate=yes
- append=no
- [/music]
- [music]
- name=the_city_falls.ogg
+ {INCIDENTAL_MUSIC knolls.ogg}
+ [music]
+ name=elf-land.ogg
append=yes
[/music]
[/then]
@@ -204,13 +192,9 @@
[/unit]
{ALLOW_RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish
Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish
Ulfserker,Dwarvish Berserker,Gryphon Rider,Gryphon Master)}
- [music]
- name=battle.ogg
- immediate=yes
- append=no
- [/music]
- [music]
- name=underground.ogg
+ {INCIDENTAL_MUSIC knalgan_theme.ogg}
+ [music]
+ name=legends_of_the_north.ogg
append=yes
[/music]
[/then]
@@ -260,11 +244,7 @@
greater_than=4
[/variable]
[then]
- [music]
- name=the_king_is_dead.ogg
- immediate=yes
- append=no
- [/music]
+ {INCIDENTAL_MUSIC the_king_is_dead.ogg}
[music]
name=elvish-theme.ogg
append=yes
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
