0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the names of two of Zhaytee's tracks...

Browse source 
...consistent with the overall naming scheme.
This commit is contained in:
Eric S. Raymond 2007-04-23 11:22:01 +00:00
parent 51009a408d
commit bea20c81e6
25 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
View file

@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "Blackwater Port"
map_data="{campaigns/Heir_To_The_Throne/maps/Blackwater_Port}"
{SCENARIO_MUSIC "wesnoth-2.ogg"}
{SCENARIO_MUSIC "loyalists.ogg"}
{TURNS 12 12 9}
{DAWN}

2
data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
View file

@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "The Valley of Death - The Princess's Revenge"
map_data="{campaigns/Heir_To_The_Throne/maps/Valley_of_Death}"
{SCENARIO_MUSIC "wesnoth-5.ogg"}
{SCENARIO_MUSIC "northerners.ogg"}
turns=12
{DAWN}

2
data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
View file

@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "The Ford of Abez"
map_data="{campaigns/Heir_To_The_Throne/maps/Ford_of_Abez}"
{SCENARIO_MUSIC "wesnoth-2.ogg"}
{SCENARIO_MUSIC "loyalists.ogg"}
{TURNS 27 24 21}
{DAWN}

4
data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
View file

@ -596,7 +596,7 @@
side=2
[/filter]
[music]
name="wesnoth-5.ogg"
name="northerners.ogg"
[/music]
[message]
description=Delfador
@ -614,7 +614,7 @@
message= _ "There they are! Charge!"
[/message]
[music]
name="wesnoth-2.ogg"
name="loyalists.ogg"
[/music]
[/event]

2
data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
View file

@ -58,7 +58,7 @@
show_title=no
[/part]
[part]
music=wesnoth-5.ogg
music=northerners.ogg
story= _ "Konrad stood on the rampart staring out towards the horizon as his men bustled below. He suddenly realized why he was uneasy: he had been staring at thin streams of black smoke, merging into the clouds far in the distance. He shouted orders to depart and was ardently obeyed."
background="maps/wesnoth-httt.jpg"
show_title=no

2
data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
View file

@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "Test of the Clan"
map_data="{campaigns/Heir_To_The_Throne/maps/Home_Clan}"
{SCENARIO_MUSIC "wesnoth-5.ogg"}
{SCENARIO_MUSIC "northerners.ogg"}
{TURNS 53 50 47}
{DAWN}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -15,7 +15,7 @@
next_scenario=A_Harrowing_Escape
[music]
name="wesnoth-5.ogg"
name="northerners.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
View file

@ -12,7 +12,7 @@
victory_when_enemies_defeated=no
[music]
name="wesnoth-2.ogg"
name="loyalists.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
View file

@ -15,7 +15,7 @@
bonus=yes
[music]
name="wesnoth-5.ogg"
name="northerners.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
View file

@ -18,7 +18,7 @@
bonus=yes
[music]
name="wesnoth-2.ogg"
name="loyalists.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
View file

@ -17,7 +17,7 @@
bonus=yes
[music]
name="wesnoth-5.ogg"
name="northerners.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}

2
data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg
View file

@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=500
append=yes
[/music]

2
data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg
View file

@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=500
append=yes
[/music]

2
data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg
View file

@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=500
append=yes
[/music]

2
data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg
View file

@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
name=wesnoth-5.ogg
name=northerners.ogg
ms_before=500
append=yes
[/music]

4
data/campaigns/The_South_Guard/utils/sg_story.cfg
View file

@ -112,7 +112,7 @@
[/part]
[part]
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=wesnoth-2.ogg
music=loyalists.ogg
[/part]
[/story]
@ -146,7 +146,7 @@
[part]
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=wesnoth-2.ogg
music=loyalists.ogg
[/part]
[/story]

2
data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
View file

@ -30,7 +30,7 @@ victory_when_enemies_defeated=no
ms_before=500
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=500
append=yes
[/music]

4
data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg
View file

@ -12,7 +12,7 @@ map_data="{campaigns/Two_Brothers/maps/4_Return_to_the_Village}"
next_scenario=null
[music]
name=wesnoth-5.ogg
name=northerners.ogg
ms_before=500
[/music]
[music]
@ -21,7 +21,7 @@ next_scenario=null
append=yes
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=500
append=yes
[/music]

2
data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
View file

@ -12,7 +12,7 @@ label= _ "Descending into Darkness"
{DESERTMAP 4OrcishFoothills9}
[music]
name=wesnoth-5.ogg
name=northerners.ogg
[/music]
next_scenario=5_Struggle

2
data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg
View file

@ -5755,7 +5755,7 @@ show=yes
# change the music playing
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
immediate=yes
[/music]

2
data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg
View file

@ -12,7 +12,7 @@ next_scenario=10_SpeakingwiththeFishes
{DESERTMAP 9Water5}
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
[/music]
#don't display snapshot of map in saved games

4
data/tools/upconvert
View file

@ -52,10 +52,12 @@ filemoves = {
("red-mage+female-attack-staff1.png", "red-mage+female-attack-staff-1.png"),
("red-mage+female-attack-staff2.png", "red-mage+female-attack-staff-2.png"),
# Timothy Pinkham supplied titles for two of his music files.
# gameplay03.ogg already had a title.
# gameplay03.ogg, wesnoth-2.ogg, and wesnoth-5.ogg already had titles.
("gameplay01.ogg", "knolls.ogg"),
("gameplay02.ogg", "wanderer.ogg"),
("gameplay03.ogg", "battle.ogg"),
("wesnoth-2.ogg", "loyalists.ogg"),
("wesnoth-5.ogg", "northerners.ogg"),
),
# An empty sentinel value at end is required.
# Always have the current version here.

6
data/utils/sound-utils.cfg
View file

@ -44,7 +44,7 @@
append=yes
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=12000
append=yes
[/music]
@ -75,7 +75,7 @@
append=yes
[/music]
[music]
name=wesnoth-2.ogg
name=loyalists.ogg
ms_before=12000
append=yes
[/music]
@ -94,7 +94,7 @@
# It also allows for the convenient use of standardized
# intra-scenario music, should we decide to use one.
[music]
name="wesnoth-2.ogg"
name="loyalists.ogg"
[/music]
[event]
name=prestart

0
music/wesnoth-2.ogg → music/loyalists.ogg
View file

0
music/wesnoth-5.ogg → music/northerners.ogg
View file