Author: esr
Date: Mon Apr 23 13:22:01 2007
New Revision: 17000
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17000&view=rev
Log:
Make the names of two of Zhaytee's tracks consistent with the overall
naming scheme.
Added:
trunk/music/loyalists.ogg
- copied unchanged from r16998, trunk/music/wesnoth-2.ogg
trunk/music/northerners.ogg
- copied unchanged from r16998, trunk/music/wesnoth-5.ogg
Removed:
trunk/music/wesnoth-2.ogg
trunk/music/wesnoth-5.ogg
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
trunk/data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg
trunk/data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg
trunk/data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg
trunk/data/campaigns/The_South_Guard/scenarios/6b.The_Long_March.cfg
trunk/data/campaigns/The_South_Guard/utils/sg_story.cfg
trunk/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
trunk/data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg
trunk/data/tools/upconvert
trunk/data/utils/sound-utils.cfg
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
Mon Apr 23 13:22:01 2007
@@ -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}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
Mon Apr 23 13:22:01 2007
@@ -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}
Modified: trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg Mon
Apr 23 13:22:01 2007
@@ -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}
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=17000&r1=16999&r2=17000&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 13:22:01 2007
@@ -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]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
Mon Apr 23 13:22:01 2007
@@ -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
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
Mon Apr 23 13:22:01 2007
@@ -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}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg Mon Apr
23 13:22:01 2007
@@ -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}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg Mon Apr 23
13:22:01 2007
@@ -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}
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
Mon Apr 23 13:22:01 2007
@@ -15,7 +15,7 @@
bonus=yes
[music]
- name="wesnoth-5.ogg"
+ name="northerners.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}
Modified:
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
---
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
(original)
+++
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
Mon Apr 23 13:22:01 2007
@@ -18,7 +18,7 @@
bonus=yes
[music]
- name="wesnoth-2.ogg"
+ name="loyalists.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg Mon
Apr 23 13:22:01 2007
@@ -17,7 +17,7 @@
bonus=yes
[music]
- name="wesnoth-5.ogg"
+ name="northerners.ogg"
[/music]
{campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg}
Modified:
trunk/data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg
Mon Apr 23 13:22:01 2007
@@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
- name=wesnoth-2.ogg
+ name=loyalists.ogg
ms_before=500
append=yes
[/music]
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=17000&r1=16999&r2=17000&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 13:22:01 2007
@@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
- name=wesnoth-2.ogg
+ name=loyalists.ogg
ms_before=500
append=yes
[/music]
Modified:
trunk/data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg
Mon Apr 23 13:22:01 2007
@@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
- name=wesnoth-2.ogg
+ name=loyalists.ogg
ms_before=500
append=yes
[/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=17000&r1=16999&r2=17000&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 13:22:01 2007
@@ -9,7 +9,7 @@
ms_before=500
[/music]
[music]
- name=wesnoth-5.ogg
+ name=northerners.ogg
ms_before=500
append=yes
[/music]
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=17000&r1=16999&r2=17000&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 13:22:01
2007
@@ -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]
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=17000&r1=16999&r2=17000&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
13:22:01 2007
@@ -30,7 +30,7 @@
ms_before=500
[/music]
[music]
- name=wesnoth-2.ogg
+ name=loyalists.ogg
ms_before=500
append=yes
[/music]
Modified:
trunk/data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg
(original)
+++ trunk/data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg Mon
Apr 23 13:22:01 2007
@@ -12,7 +12,7 @@
next_scenario=null
[music]
- name=wesnoth-5.ogg
+ name=northerners.ogg
ms_before=500
[/music]
[music]
@@ -21,7 +21,7 @@
append=yes
[/music]
[music]
- name=wesnoth-2.ogg
+ name=loyalists.ogg
ms_before=500
append=yes
[/music]
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
Mon Apr 23 13:22:01 2007
@@ -12,7 +12,7 @@
{DESERTMAP 4OrcishFoothills9}
[music]
-name=wesnoth-5.ogg
+name=northerners.ogg
[/music]
next_scenario=5_Struggle
Modified: trunk/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg Mon
Apr 23 13:22:01 2007
@@ -5755,7 +5755,7 @@
# change the music playing
[music]
-name=wesnoth-2.ogg
+name=loyalists.ogg
immediate=yes
[/music]
Modified: trunk/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg Mon Apr
23 13:22:01 2007
@@ -12,7 +12,7 @@
{DESERTMAP 9Water5}
[music]
-name=wesnoth-2.ogg
+name=loyalists.ogg
[/music]
#don't display snapshot of map in saved games
Modified: trunk/data/tools/upconvert
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/upconvert?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/tools/upconvert (original)
+++ trunk/data/tools/upconvert Mon Apr 23 13:22:01 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 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.
Modified: trunk/data/utils/sound-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/sound-utils.cfg?rev=17000&r1=16999&r2=17000&view=diff
==============================================================================
--- trunk/data/utils/sound-utils.cfg (original)
+++ trunk/data/utils/sound-utils.cfg Mon Apr 23 13:22:01 2007
@@ -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
Removed: trunk/music/wesnoth-2.ogg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/music/wesnoth-2.ogg?rev=16999&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/music/wesnoth-5.ogg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/music/wesnoth-5.ogg?rev=16999&view=auto
==============================================================================
Binary file - no diff available.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
