Author: esr
Date: Wed Oct 22 06:49:19 2008
New Revision: 30303
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30303&view=rev
Log:
Customized per-scenario music lists for Liberty.
Modified:
trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
Modified: trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/01_The_Raid.cfg Wed Oct 22 06:49:19
2008
@@ -6,8 +6,13 @@
{TURNS 24 18 14}
next_scenario=civil_disobedience
- {SCENARIO_MUSIC "northerners.ogg"}
victory_when_enemies_defeated=no
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "northerners.ogg"}
+ {EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
+ {EXTRA_SCENARIO_MUSIC "frantic.ogg"}
+
[label]
x,y=9,1
Modified: trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg Wed Oct 22
06:49:19 2008
@@ -2,13 +2,21 @@
[scenario]
id=civil_disobedience
name= _ "Civil Disobedience"
+ next_scenario=a_strategy_of_hope
+ victory_when_enemies_defeated=no
map_data="{campaigns/Liberty/maps/civil_disobedience.map}"
{TURNS 14 13 12}
-
- next_scenario=a_strategy_of_hope
- {SCENARIO_MUSIC loyalists.ogg}
- {EXTRA_SCENARIO_MUSIC battle.ogg}
- victory_when_enemies_defeated=no
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC "traveling_minstrels.ogg" "loyalists.ogg"}
+ {EXTRA_SCENARIO_MUSIC "battle.ogg"}
+ {EXTRA_SCENARIO_MUSIC "loyalists.ogg"}
[story]
[part]
@@ -16,13 +24,6 @@
{TO_CIVIL_DISOBEDIENCE}
[/part]
[/story]
-
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
- {MORNING}
[side]
type=Bandit_Peasant
Modified: trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg Wed Oct 22
06:49:19 2008
@@ -2,14 +2,16 @@
[scenario]
id=a_strategy_of_hope
name= _ "A Strategy of Hope"
+ next_scenario=unlawful_orders
+ victory_when_enemies_defeated=yes
map_data="{campaigns/Liberty/maps/strategy_of_hope.map}"
{TURNS 35 30 25}
-
- next_scenario=unlawful_orders
-
- # the music will change in the end of the opening dialogue
- {SCENARIO_MUSIC traveling_minstrels.ogg}
- victory_when_enemies_defeated=yes
+ {DEFAULT_SCHEDULE}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC elvish-theme.ogg traveling_minstrels.ogg}
+ {EXTRA_SCENARIO_MUSIC "wanderer.ogg"}
+ {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
[story]
[part]
@@ -17,8 +19,6 @@
{TO_A_STRATEGY_OF_HOPE}
[/part]
[/story]
-
- {DEFAULT_SCHEDULE}
[side]
type=Bandit
@@ -200,15 +200,7 @@
message= _ "I think they are, old friend. And that rank smell on
the wind tells another tale; saurians approach. To arms!"
[/message]
- [music]
- name=the_city_falls.ogg
- immediate=yes
- append=no
- [/music]
- [music]
- name=wanderer.ogg
- append=yes
- [/music]
+ {INCIDENTAL_MUSIC the_city_falls.ogg}
{MOVE_UNIT (id=Urk Delek) 42 29}
[message]
Modified: trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg Wed Oct 22
06:49:19 2008
@@ -2,12 +2,16 @@
[scenario]
id=unlawful_orders
name= _ "Unlawful Orders"
+ next_scenario=hide_and_seek
+ victory_when_enemies_defeated=yes
map_data="{campaigns/Liberty/maps/unlawful_orders.map}"
{TURNS 30 22 16}
-
- next_scenario=hide_and_seek
- {SCENARIO_MUSIC "knolls.ogg"}
- victory_when_enemies_defeated=yes
+ {DEFAULT_SCHEDULE}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "the_city_falls.ogg"}
+ {EXTRA_SCENARIO_MUSIC "the_dangerous_symphony.ogg"}
+ {EXTRA_SCENARIO_MUSIC "legends_of_the_north.ogg"}
[label]
x,y=16,15
@@ -26,8 +30,6 @@
{TO_UNLAWFUL_ORDERS}
[/part]
[/story]
-
- {DEFAULT_SCHEDULE}
[side]
type=Bandit
@@ -322,6 +324,13 @@
side=3
type=Skeleton,Skeleton Rider,Skeleton Rider2,Dark Adept,Skeleton
Archer
[/allow_recruit]
+
+ # Yes, we want this appended at each nightfall. If it ensa up crowsing
+ # out the other music, in this case that's not a problem
+ [music]
+ name=underground.ogg
+ append=yes
+ [/music]
[/event]
#enddef
Modified: trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg Wed Oct 22
06:49:19 2008
@@ -1,15 +1,24 @@
#textdomain wesnoth-l
[scenario]
id=hide_and_seek
+ next_scenario=the_gray_woods
+ victory_when_enemies_defeated=no
name= _ "Hide and Seek"
map_data="{campaigns/Liberty/maps/hide_and_seek.map}"
{TURNS 34 30 26}
- next_scenario=the_gray_woods
-
+ [time]
+ id=midnight
+ name= _ "Midnight"
+ image=schedule-midnight.png
+ lawful_bonus=-25
+ [/time]
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC wanderer.ogg underground.ogg}
+ {EXTRA_SCENARIO_MUSIC revelation.ogg}
+ {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
# the music will change if the guards see you
- {SCENARIO_MUSIC underground.ogg}
- victory_when_enemies_defeated=no
[story]
[part]
@@ -17,13 +26,6 @@
{TO_HIDE_AND_SEEK}
[/part]
[/story]
-
- [time]
- id=midnight
- name= _ "Midnight"
- image=schedule-midnight.png
- lawful_bonus=-25
- [/time]
[side]
type=Bandit
Modified: trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg Wed Oct 22
06:49:19 2008
@@ -2,12 +2,21 @@
[scenario]
id=the_gray_woods
name= _ "The Gray Woods"
+ next_scenario=the_hunters
+ victory_when_enemies_defeated=yes
map_data="{campaigns/Liberty/maps/gray_woods.map}"
{TURNS 50 44 42}
-
- next_scenario=the_hunters
- {SCENARIO_MUSIC "underground.ogg"}
- victory_when_enemies_defeated=yes
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC "underground.ogg" "the_deep_path.ogg"}
+ {EXTRA_SCENARIO_MUSIC "elvish-theme.ogg"}
+ {EXTRA_SCENARIO_MUSIC "revelation.ogg"}
[story]
[part]
@@ -16,12 +25,6 @@
[/part]
[/story]
- {SECOND_WATCH}
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
[side]
type=Bandit
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=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg Wed Oct 22
06:49:19 2008
@@ -2,39 +2,40 @@
[scenario]
id=the_hunters
name= _ "The Hunters"
+ next_scenario=glory
map_data="{campaigns/Liberty/maps/the_hunters.map}"
+ victory_when_enemies_defeated=no
{TURNS 36 31 26}
-
- next_scenario=glory
- {SCENARIO_MUSIC breaking_the_chains.ogg}
- {EXTRA_SCENARIO_MUSIC battle.ogg}
- victory_when_enemies_defeated=no
-
- [story]
- [part]
- story= _ "Baldras and his men quickly left the Gray Woods, not
entirely convinced of their safety even after eradicating the lich."
- [/part]
- [part]
- story= _ "As they marched, many men and women from the small
hamlets peppering the area around Carcyn and the Gray Woods approached the
group, asking to join them. The ascent of the Queen had cast an uneasy pall
over the citizens of Wesnoth, and some of them were willing to resist it."
- [/part]
- [part]
- story= _ "Knowing they too would be labeled criminals, he
reluctantly accepted their help. (Baldras is now able to recruit outlaws.)"
- [/part]
- [part]
- story= _ "Camped at the edge of the forest, they quietly observed
substantial troop movements coming from the direction of Aldril, a nearby city,
and marching to the northwest. Unsure what to make of it, they debated their
next course of action..."
- [/part]
- [part]
- show_title=yes
- {TO_THE_HUNTERS}
- [/part]
- [/story]
-
{DUSK}
{FIRST_WATCH}
{SECOND_WATCH}
{DAWN}
{MORNING}
{AFTERNOON}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
+ {EXTRA_SCENARIO_MUSIC battle.ogg}
+ {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
+
+ [story]
+ [part]
+ story= _ "Baldras and his men quickly left the Gray Woods, not
entirely convinced of their safety even after eradicating the lich."
+ [/part]
+ [part]
+ story= _ "As they marched, many men and women from the small
hamlets peppering the area around Carcyn and the Gray Woods approached the
group, asking to join them. The ascent of the Queen had cast an uneasy pall
over the citizens of Wesnoth, and some of them were willing to resist it."
+ [/part]
+ [part]
+ story= _ "Knowing they too would be labeled criminals, he
reluctantly accepted their help. (Baldras is now able to recruit outlaws.)"
+ [/part]
+ [part]
+ story= _ "Camped at the edge of the forest, they quietly observed
substantial troop movements coming from the direction of Aldril, a nearby city,
and marching to the northwest. Unsure what to make of it, they debated their
next course of action..."
+ [/part]
+ [part]
+ show_title=yes
+ {TO_THE_HUNTERS}
+ [/part]
+ [/story]
[side]
side=1
Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Wed Oct 22 06:49:19 2008
@@ -2,14 +2,23 @@
[scenario]
id=glory
name= _ "Glory"
+ next_scenario=epilog
+ victory_when_enemies_defeated=no
map_data="{campaigns/Liberty/maps/glory.map}"
{TURNS 48 45 40}
-
- next_scenario=epilog
- {SCENARIO_MUSIC battle.ogg}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+
+ {VICTORY_AND_DEFEAT_MUSIC}
+ {INTRO_AND_SCENARIO_MUSIC heroes_rite.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
- victory_when_enemies_defeated=no
+ {EXTRA_SCENARIO_MUSIC battle.ogg}
+ {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
[story]
[part]
@@ -37,13 +46,6 @@
{TO_GLORY}
[/part]
[/story]
-
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
- {MORNING}
[side]
side=1
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
