Author: esr
Date: Mon Apr 23 21:01:26 2007
New Revision: 17009
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17009&view=rev
Log:
Complete the title change for what used to be wesnoth-1.ogg.
Added:
trunk/music/revelation.ogg
- copied unchanged from r17008, trunk/music/wesnoth-1.ogg
Removed:
trunk/music/wesnoth-1.ogg
Modified:
trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/27_Epilogue.cfg
trunk/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg
trunk/data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg
trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg
trunk/data/campaigns/The_South_Guard/scenarios/8a.Vengeance.cfg
trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg
trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg
trunk/data/tools/upconvert
trunk/data/utils/sound-utils.cfg
Modified: trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/utils/intro.cfg Mon Apr 23 21:01:26
2007
@@ -2,7 +2,7 @@
[story]
#textdomain wesnoth-ei
[part]
- music=wesnoth-1.ogg
+ music=revelation.ogg
story= _ "It was the thirtieth year of Konrad II's reign, and there
were strange occurrences on the eastern border of Wesnoth."
[/part]
[part]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
Mon Apr 23 21:01:26 2007
@@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "Muff Malal's Peninsula"
map_data="{campaigns/Heir_To_The_Throne/maps/Muff_Malal_Peninsula}"
- {SCENARIO_MUSIC "wesnoth-1.ogg"}
+ {SCENARIO_MUSIC "revelation.ogg"}
{TURNS 27 24 21}
{DAWN}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
Mon Apr 23 21:01:26 2007
@@ -4,7 +4,7 @@
next_scenario=06_The_Siege_of_Elensefar
name= _ "Isle of the Damned"
map_data="{campaigns/Heir_To_The_Throne/maps/Isle_of_the_Damned}"
- {SCENARIO_MUSIC "wesnoth-1.ogg"}
+ {SCENARIO_MUSIC "revelation.ogg"}
{TURNS 27 24 21}
{DAWN}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
Mon Apr 23 21:01:26 2007
@@ -3,7 +3,7 @@
#textdomain wesnoth-httt
name= _ "Home of the North Elves"
map_data="{campaigns/Heir_To_The_Throne/maps/Home_North_Elves}"
- {SCENARIO_MUSIC "wesnoth-1.ogg"}
+ {SCENARIO_MUSIC "revelation.ogg"}
{TURNS 21 18 15}
{DAWN}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
Mon Apr 23 21:01:26 2007
@@ -164,7 +164,7 @@
[event]
name=prestart
[music]
- name="wesnoth-1.ogg"
+ name="revelation.ogg"
[/music]
[if]
[variable]
Modified: trunk/data/campaigns/Heir_To_The_Throne/scenarios/27_Epilogue.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/27_Epilogue.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/27_Epilogue.cfg (original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/27_Epilogue.cfg Mon Apr
23 21:01:26 2007
@@ -8,7 +8,7 @@
[story]
[part]
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
[/music]
story= _ "And so the Dark Queen's reign was ended. Li'sar,
daughter of Garard II and Heir to the Throne of Wesnoth, was crowned Queen and
Bearer of the Scepter of Fire, which she would pass on to all her successors."
background=maps/wesnoth.png
Modified: trunk/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/utils/intro.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/utils/intro.cfg (original)
+++ trunk/data/campaigns/Heir_To_The_Throne/utils/intro.cfg Mon Apr 23 21:01:26
2007
@@ -1,7 +1,7 @@
[story]
#textdomain wesnoth-httt
[part]
- music=wesnoth-1.ogg
+ music=revelation.ogg
story= _ "In the twenty-seventh year of the reign of Garard II, king of
Wesnoth, the kingdom was plunged into a bitter war with the Peoples of the
North."
background=maps/wesnoth.png
[/part]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
Mon Apr 23 21:01:26 2007
@@ -125,7 +125,7 @@
[event]
name=side turn
[music]
- name="wesnoth-1.ogg"
+ name="revelation.ogg"
[/music]
[/event]
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg Mon
Apr 23 21:01:26 2007
@@ -16,7 +16,7 @@
bonus=yes
[music]
- name="wesnoth-1.ogg"
+ name="revelation.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg Mon
Apr 23 21:01:26 2007
@@ -17,7 +17,7 @@
bonus=yes
[music]
- name="wesnoth-1.ogg"
+ name="revelation.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}
Modified:
trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg Mon
Apr 23 21:01:26 2007
@@ -5,7 +5,7 @@
name= _ "A Desperate Errand"
next_scenario=4_Vale_of_Tears
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=500
[/music]
[music]
Modified: trunk/data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg Mon Apr
23 21:01:26 2007
@@ -5,7 +5,7 @@
name= _ "Vale of Tears"
next_scenario=5_Choice_In_The_Fog
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=500
[/music]
[music]
Modified: trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg Mon
Apr 23 21:01:26 2007
@@ -5,7 +5,7 @@
name= _ "The Long March"
next_scenario=7b_Pebbles_In_The_Flood
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=500
[/music]
[music]
Modified: trunk/data/campaigns/The_South_Guard/scenarios/8a.Vengeance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/8a.Vengeance.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/8a.Vengeance.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/8a.Vengeance.cfg Mon Apr 23
21:01:26 2007
@@ -230,7 +230,7 @@
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=wesnoth-1.ogg
+ name=revelation.ogg
[/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=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg (original)
+++ trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg Mon Apr 23 21:01:26
2007
@@ -99,7 +99,7 @@
[story]
[part]
story= _ "Finally the sun broke the horizon and its rays
breathed new life into the weary defenders of Westin. A great cry echoed
through the valley as the men of the South Guard pressed their elven foes back
from the walls. Suddenly the field was covered in a great fog..."
- music=wesnoth-1.ogg
+ music=revelation.ogg
[/part]
[part]
story= _ "When the fog broke, Ethiliel stood alone, facing the
wall of spears. Bathed in light, she spoke to the men of Wesnoth, saying,
'Stop! Enough blood has been spilled before the walls of this city! The
injury you menfolk have done to the elves is great, but your service also was
worthy.'"
@@ -122,7 +122,7 @@
[story]
[part]
story= _ "With bitter spears and grim expression, the men of
Wesnoth launched the last assault on the undead. As they cut through lifeless
flesh and shattered chill bones a ray of sunlight pierced the clouds. The
winds died and the men were filled with new life. A great cry they let out as
they stormed the encampment of Mal M'brin himself, and threw down the mighty
wizard."
- music=wesnoth-1.ogg
+ music=revelation.ogg
[/part]
[part]
Modified: trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg (original)
+++ trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg Mon Apr 23
21:01:26 2007
@@ -26,7 +26,7 @@
victory_when_enemies_defeated=no
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=500
[/music]
[music]
Modified: trunk/data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg Mon Apr
23 21:01:26 2007
@@ -10,7 +10,7 @@
{DESERTMAP 10Fish2}
[music]
-name=wesnoth-1.ogg
+name=revelation.ogg
[/music]
next_scenario=11_BattleforNemsothIsle
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg
Mon Apr 23 21:01:26 2007
@@ -43,7 +43,7 @@
{LONGDARK4}
[music]
-name=wesnoth-1.ogg
+name=revelation.ogg
[/music]
[story]
Modified: trunk/data/tools/upconvert
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/upconvert?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/tools/upconvert (original)
+++ trunk/data/tools/upconvert Mon Apr 23 21:01:26 2007
@@ -52,10 +52,12 @@
("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, wesnoth-2.ogg, and wesnoth-5.ogg already had titles.
+ # Zhaytee supplied a title for wesnoth-1.ogg
+ # gameplay03.ogg, and and wesnoth-[25].ogg already had titles.
("gameplay01.ogg", "knolls.ogg"),
("gameplay02.ogg", "wanderer.ogg"),
("gameplay03.ogg", "battle.ogg"),
+ ("wesnoth-1.ogg", "revelation.ogg"),
("wesnoth-2.ogg", "loyalists.ogg"),
("wesnoth-5.ogg", "northerners.ogg"),
),
@@ -111,7 +113,7 @@
lambda arg, dir, names: datafiles.extend(map(lambda x:
os.path.normpath(os.path.join(dir, x)), names)),
None)
datafiles = filter(lambda x: ".svn" not in x, datafiles)
- datafiles = filter(lambda x: x.endswith(".cfg") or 'maps' in x, datafiles)
+ datafiles = filter(lambda x: x.endswith(".cfg") or ('maps' in x and
os.path.isfile(x)), datafiles)
return datafiles
def help():
Modified: trunk/data/utils/sound-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/sound-utils.cfg?rev=17009&r1=17008&r2=17009&view=diff
==============================================================================
--- trunk/data/utils/sound-utils.cfg (original)
+++ trunk/data/utils/sound-utils.cfg Mon Apr 23 21:01:26 2007
@@ -39,7 +39,7 @@
append=yes
[/music]
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=12000
append=yes
[/music]
@@ -70,7 +70,7 @@
append=yes
[/music]
[music]
- name=wesnoth-1.ogg
+ name=revelation.ogg
ms_before=12000
append=yes
[/music]
Removed: trunk/music/wesnoth-1.ogg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/music/wesnoth-1.ogg?rev=17008&view=auto
==============================================================================
Binary file - no diff available.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
