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

merge 2008-03-06T16:21:48Z!lari.nieminen@iki.fi, 2008-03-07T11:52:23Z!lari.nieminen@iki.fi and 2008-03-08T11:23:45Z!lari.nieminen@iki.fi from trunk

Browse source
This commit is contained in:
Gunter Labes 2008-03-08 15:35:45 +00:00
parent a76d4f2e3e
commit 9775869479
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
View file

@ -44,7 +44,7 @@
[story]
[part]
music =main_menu.ogg
music=main_menu.ogg
story= _ "Here we overlook the city of Weldyn. The great city. The ancient city. The city of evil. The city of good. The city of men."
background=story/arrival_of_the_heir.png
[/part]
@ -164,7 +164,7 @@
# {SCATTER_IMAGE (terrain=Gg) 12 scenery/oak-leaning.png}
[music]
name="revelation.ogg"
name="battle.ogg"
[/music]
[if]
[variable]

1
data/campaigns/Sceptre_of_Fire/_main.cfg
View file

@ -5,6 +5,7 @@
# wmlscope: set export=no
[campaign]
id=sceptre_of_fire
icon="items/sceptre-of-fire.png"
name= _ "The Sceptre of Fire"
abbrev= _ "SoF"

4
data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
View file

@ -74,7 +74,7 @@
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound={SOUND_LIST:MISS}
sound=spear-miss.ogg
[/frame]
[/if]
[else]
@ -83,7 +83,7 @@
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound=spear.wav
sound=spear.ogg
[/frame]
[/else]
[frame]

4
data/campaigns/The_South_Guard/units/Junior_Commander.cfg
View file

@ -63,7 +63,7 @@
begin=-100
end=100
image=deoran/junior-commander-attack.png
sound={SOUND_LIST:MISS}
sound=spear-miss.ogg
[/frame]
[/if]
[else]
@ -72,7 +72,7 @@
begin=-100
end=100
image=deoran/junior-commander-attack.png
sound=spear.wav
sound=spear.ogg
[/frame]
[/else]
[frame]

4
data/campaigns/The_South_Guard/units/Mounted_General.cfg
View file

@ -68,7 +68,7 @@
begin=-100
end=100
image=deoran/mounted-general-lance-2.png
sound={SOUND_LIST:MISS}
sound=spear-miss.ogg
[/frame]
[/if]
[else]
@ -77,7 +77,7 @@
begin=-100
end=100
image=deoran/mounted-general-lance-2.png
sound=spear.wav
sound=spear.ogg
[/frame]
[/else]
[frame]