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

The {dragon,thunder}stick hit and miss sounds were too much alike.

Browse source 
The old miss sound (with slight ricochet effect) is now an alternate
hit sound; the new miss sound is a pure ricochet effect. Somewhat
cartoonish, but that's OK.
This commit is contained in:
Eric S. Raymond 2007-06-19 09:42:12 +00:00
parent fa74853a85
commit 3df00746b2
10 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
data/core/sounds/dragonstick.ogg → data/core/sounds/dragonstick-hit-1.ogg
View file

0
data/core/sounds/dragonstick-miss.ogg → data/core/sounds/dragonstick-hit-2.ogg
View file

BIN
data/core/sounds/dragonstick-miss.wav Normal file
View file

Binary file not shown.

0
data/core/sounds/thunderstick.ogg → data/core/sounds/thunderstick-hit-1.ogg
View file

0
data/core/sounds/thunderstick-miss.ogg → data/core/sounds/thunderstick-hit-2.ogg
View file

BIN
data/core/sounds/thunderstick-miss.wav Normal file
View file

Binary file not shown.

16
data/core/units/dwarves/Dragonguard.cfg
View file

@ -83,7 +83,7 @@
begin=-150
end=600
image="units/dwarves/dragonguard-attack-ranged-s.png"
sound=dragonstick.ogg
sound=dragonstick-hit-1.ogg,dragonstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -92,7 +92,7 @@
begin=-150
end=600
image="units/dwarves/dragonguard-attack-ranged-s.png"
sound=dragonstick-miss.ogg
sound=dragonstick-miss.wav
[/frame]
[/else]
[/animation]
@ -115,7 +115,7 @@
begin=-150
end=600
image="units/dwarves/dragonguard-attack-ranged-n.png"
sound=dragonstick.ogg
sound=dragonstick-hit-1.ogg,dragonstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -124,7 +124,7 @@
begin=-150
end=600
image="units/dwarves/dragonguard-attack-ranged-n.png"
sound=dragonstick-miss.ogg
sound=dragonstick-miss.wav
[/frame]
[/else]
[/animation]
@ -147,7 +147,7 @@
begin=-300
end=0
image="units/dwarves/dragonguard-attack-ranged-ne.png"
sound=dragonstick.ogg
sound=dragonstick-hit-1.ogg,dragonstick-hit-2,ogg
[/frame]
[/if]
[else]
@ -156,7 +156,7 @@
begin=-300
end=0
image="units/dwarves/dragonguard-attack-ranged-ne.png"
sound=dragonstick-miss.ogg
sound=dragonstick-miss.wav
[/frame]
[/else]
[frame]
@ -184,7 +184,7 @@
begin=-300
end=0
image="units/dwarves/dragonguard-attack-ranged-se.png"
sound=dragonstick.ogg
sound=dragonstick-hit-1.ogg,dragonstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -193,7 +193,7 @@
begin=-300
end=0
image="units/dwarves/dragonguard-attack-ranged-se.png"
sound=dragonstick-miss.ogg
sound=dragonstick-miss.wav
[/frame]
[/else]
[frame]

16
data/core/units/dwarves/Thunderer.cfg
View file

@ -108,7 +108,7 @@
begin=-450
end=-300
image="units/dwarves/thunderer-defend.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -117,7 +117,7 @@
begin=-450
end=-300
image="units/dwarves/thunderer-defend.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[frame]
@ -155,7 +155,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-n.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -164,7 +164,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-n.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[/animation]
@ -187,7 +187,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-ne.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -196,7 +196,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-ne.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[/animation]
@ -219,7 +219,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-s.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -228,7 +228,7 @@
begin=-150
end=600
image="units/dwarves/thunderer-attack-s.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[/animation]

16
data/core/units/dwarves/Thunderguard.cfg
View file

@ -93,7 +93,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-150
end=600
image="units/dwarves/thunderguard-attack-ranged-s.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -102,7 +102,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-150
end=600
image="units/dwarves/thunderguard-attack-ranged-s.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[/animation]
@ -125,7 +125,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-150
end=600
image="units/dwarves/thunderguard-attack-ranged-n.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -134,7 +134,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-150
end=600
image="units/dwarves/thunderguard-attack-ranged-n.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[/animation]
@ -157,7 +157,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-300
end=0
image="units/dwarves/thunderguard-attack-ranged-ne.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -166,7 +166,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-300
end=0
image="units/dwarves/thunderguard-attack-ranged-ne.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[frame]
@ -194,7 +194,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-300
end=0
image="units/dwarves/thunderguard-attack-ranged-se.png"
sound=thunderstick.ogg
sound=thunderstick-hit-1.ogg,thunderstick-hit-2.ogg
[/frame]
[/if]
[else]
@ -203,7 +203,7 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
begin=-300
end=0
image="units/dwarves/thunderguard-attack-ranged-se.png"
sound=thunderstick-miss.ogg
sound=thunderstick-miss.wav
[/frame]
[/else]
[frame]

6
data/tools/wmllint
View file

@ -219,9 +219,13 @@ filemoves = {
("misc/item-holywater.png", "items/holywater.png"),
("orc-small-hit.wav", "orc-small-hit-1.ogg"),
),
"1.3.3" : (
("sounds/dragonstick-hit.ogg", "sounds/dragonstick-hit-1.ogg"),
("sounds/dragonstick-miss.ogg", "sounds/dragonstick-miss.wav"),
),
# An empty sentinel value at end is required.
# Always have the current version here.
"1.3.3" : ()
"1.3.4" : ()
}
# Turn all the filemove string substition pairs into nearly equivalent