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

Use the new cave-in.ogg where appropriate.

Browse source 
Now that we have both rumble.ogg and cave-in.ogg as sound effects,
deprecate TREMOR and instead use a new QUAKE macro that is explicit
about the sound effect requested.
This commit is contained in:
Eric S. Raymond 2008-11-30 13:41:29 +00:00
parent 25f3c0758f
commit 011576c478
8 changed files with 73 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
View file

@ -443,7 +443,7 @@
x=6,10
y=31,31
[/move_unit_fake]
{TREMOR}
{QUAKE "cave-in.ogg"}
[terrain]
x,y=10,31
terrain=Uh

10
data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
View file

@ -356,7 +356,7 @@
y=24-25
side=1
[/filter]
{TREMOR}
{QUAKE "cave-in.ogg"}
[message]
speaker=unit
message= _ "The rocks are moving!"
@ -507,10 +507,10 @@
[event]
name=turn 20
{TREMOR}
{TREMOR}
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=narrator
image="wesnoth-icon.png"

8
data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
View file

@ -135,8 +135,8 @@
speaker=Delfador
message= _ "Yes, I feel it is near here! We must search for it carefully."
[/message]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker="Li'sar"
message= _ "An earthquake! We'll be trapped!"
@ -153,7 +153,7 @@
speaker=Delfador
message= _ "The Scepter... the earth... the molten lava... the fire... the air around us... everything. It calls out to the heir - I can barely hold it back in my mind. It was forged here, not far north of where we now stand. The sheer power of it!"
[/message]
{TREMOR}
{QUAKE "rumble.ogg"}
[message]
speaker=Konrad
message= _ "Where? Where is it?"
@ -239,7 +239,7 @@
numerical_equals=1
[/variable]
[then]
{TREMOR}
{QUAKE "rumble.ogg"}
{VARIABLE_OP lava_count add 1}
{EXPAND_LAVA}

16
data/campaigns/Liberty/scenarios/08_Glory.cfg
View file

@ -687,13 +687,13 @@
[sound]
name=fire.wav
[/sound]
{TREMOR}
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[sound]
name=fire.wav
[/sound]
{TREMOR}
{QUAKE "rumble.ogg"}
[message]
speaker=narrator
message= _ "The stronghold of Halstead began to shake..."
@ -729,7 +729,7 @@
[scroll_to]
x,y=20,16
[/scroll_to]
{TREMOR}
{QUAKE "rumble.ogg"}
[message]
speaker=Baldras
message= _ "I think it's working! Everybody get clear NOW!"
@ -753,7 +753,7 @@
[sound]
name=fire.wav
[/sound]
{TREMOR}
{QUAKE "cave-in.ogg"}
[message]
speaker=narrator
message= _ "With a thunderous earthquake and a vast billowing of dust, thousands of tons of stone and wood crashed in on itself. Some of it tumbled down the steep sides, while the remainder came to rest several hundred feet below ground, in the bowels of the hollowed-out mountain."
@ -765,8 +765,8 @@
image="wesnoth-icon.png"
[/message]
{TREMOR}
{TREMOR}
{QUAKE "cave-in.ogg"}
{QUAKE "cave-in.ogg"}
[kill]
fire_event=yes

10
data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
View file

@ -1474,7 +1474,7 @@
message= _ "So this is the Great Chamber eh? Doesn't look like there is much to see here."
[/message]
# This macro should shake the screen
{TREMOR}
{QUAKE "rumble.ogg"}
[message]
speaker=narrator
message= _ " *rumble*"
@ -1484,8 +1484,8 @@
speaker=unit
message= _ "Perhaps I spoke too soon..."
[/message]
{TREMOR}
{TREMOR}
{QUAKE "cave-in.ogg"}
{QUAKE "cave-in.ogg"}
[message]
speaker=narrator
message= _ " *CRASH*"
@ -1530,8 +1530,8 @@
#endif
#endif
#endif
{TREMOR}
{TREMOR}
{QUAKE "cave-in.ogg"}
{QUAKE "cave-in.ogg"}
[message]
speaker=narrator
message= _ " *CRASH*"

40
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
View file

@ -512,8 +512,8 @@
x,y=18,23
side=1
[/filter]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Thursagan
message= _ "That's it! The volcano will erupt soon now that you've triggered it."
@ -523,8 +523,8 @@
y=4-5,4-5
terrain=Uu
[/terrain]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Rugnur
message= _ "Look, it has knocked down some of the walls! Those orcs have a way out now!"
@ -532,32 +532,32 @@
[scroll_to]
x,y=14,1
[/scroll_to]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Baglur
message= _ "Well, we've succeeded in stopping the elves from getting the sceptre, I would say. But what do we do now?!"
[/message]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Thursagan
message= _ "Now, we must fight the orcs until we die, it's our only option."
[/message]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Rugnur
message= _ "We cannot let any of the elves or their mercenaries escape; they would tell where the sceptre is. Make sure they all die!"
[/message]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
speaker=Thursagan
message= _ "We have to kill them quickly, before they realize what is happening. And remember, the lava spreads quickly, suddenly, and dangerously. The only place safe from it is the area near the glyph."
[/message]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[set_variable]
name=overlayturn
value=0
@ -582,8 +582,8 @@
side=2
type=Elvish Marshal,Elvish Avenger,Elvish Champion,Elvish Outrider,Dwarvish Lord,Dwarvish Dragonguard
[/role]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[message]
role=smartelf
message= _ "Wait, what's going on? The volcano is going to erupt! Everyone, try to get out of these caves!"
@ -618,8 +618,8 @@
[/then]
[/if]
#the lava is spreading and killing things every turn
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
{CHANGE_MAP 1}
{CHANGE_MAP 2}
{CHANGE_MAP 3}
@ -657,8 +657,8 @@
numerical_equals=7
[/variable]
[then]
{TREMOR}
{TREMOR}
{QUAKE "rumble.ogg"}
{QUAKE "rumble.ogg"}
[role]
role=dumbelf
side=2

28
data/core/macros/deprecated-utils.cfg
View file

@ -111,3 +111,31 @@
centered=yes
[/image]
#enddef
#define TREMOR
# Replaced by QUAKE, which has the sound as explicit argument.
{DEPRECATE TREMOR 1.5.6}
[sound]
name="rumble.ogg"
[/sound]
[scroll]
x=5
y=0
[/scroll]
[scroll]
x=-10
y=0
[/scroll]
[scroll]
x=5
y=5
[/scroll]
[scroll]
x=0
y=-10
[/scroll]
[scroll]
x=0
y=5
[/scroll]
#enddef

4
data/core/macros/interface-utils.cfg
View file

@ -350,10 +350,10 @@
[/scroll_to]
#enddef
#define TREMOR
#define QUAKE SOUND
# Visuals and sound for an earth tremor.
[sound]
name="rumble.ogg"
name={SOUND}
[/sound]
[scroll]
x=5