Author: wintermute
Date: Sun May 8 06:03:23 2011
New Revision: 49418
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49418&view=rev
Log:
fixed several minor Khalifate issues: added sound for Naffat attack, fixed
several attack icons and unit description errors.
Added:
trunk/data/core/sounds/melee-fire.ogg (with props)
Modified:
trunk/data/core/units/khalifate/Arif.cfg
trunk/data/core/units/khalifate/Hakim.cfg
trunk/data/core/units/khalifate/Jawal.cfg
trunk/data/core/units/khalifate/Khaiyal.cfg
trunk/data/core/units/khalifate/Mighwar.cfg
trunk/data/core/units/khalifate/Monawish.cfg
trunk/data/core/units/khalifate/Naffat.cfg
trunk/data/core/units/khalifate/Qatif-al-nar.cfg
trunk/data/core/units/khalifate/Rami.cfg
trunk/data/core/units/khalifate/Saree.cfg
trunk/data/core/units/khalifate/Tineen.cfg
Added: trunk/data/core/sounds/melee-fire.ogg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/sounds/melee-fire.ogg?rev=49418&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/sounds/melee-fire.ogg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/data/core/units/khalifate/Arif.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Arif.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Arif.cfg (original)
+++ trunk/data/core/units/khalifate/Arif.cfg Sun May 8 06:03:23 2011
@@ -14,7 +14,7 @@
cost=18
usage=fighter
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "The Amir form the backbone of any Khalifate foot advance.
They are often sent against fortified enemy positions where their valor and
skill with a sword allows them to assault seemingly inpenetrable
defenses."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
+ description= _ "The Arif form the backbone of any Khalifate foot advance.
They are often sent against fortified enemy positions where their valor and
skill with a sword allows them to assault seemingly inpenetrable
defenses."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
get_hit_sound={SOUND_LIST:HUMAN_HIT}
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
Modified: trunk/data/core/units/khalifate/Hakim.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Hakim.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Hakim.cfg (original)
+++ trunk/data/core/units/khalifate/Hakim.cfg Sun May 8 06:03:23 2011
@@ -21,7 +21,7 @@
cost=18
usage=healer
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "Ekim use their knowledge of ancient medicine and herbal
concoctions to quickly bring the Khalifate soldiers back to the front
lines."+{SPECIAL_NOTES}+{SPECIAL_NOTES_HEALS}
+ description= _ "Hakim use their knowledge of ancient medicine and herbal
concoctions to quickly bring the Khalifate soldiers back to the front
lines."+{SPECIAL_NOTES}+{SPECIAL_NOTES_HEALS}
get_hit_sound={SOUND_LIST:HUMAN_HIT}
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
Modified: trunk/data/core/units/khalifate/Jawal.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Jawal.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Jawal.cfg (original)
+++ trunk/data/core/units/khalifate/Jawal.cfg Sun May 8 06:03:23 2011
@@ -15,7 +15,7 @@
usage=archer
undead_variation=mounted
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "Karadis are excellent horsemen and few can shoot as well
from horseback as they. They love to circle and harass enemies from afar while
using their superior speed to avoid heavy counter attack.."
+ description= _ "Jawal are excellent horsemen and few can shoot as well
from horseback as they. They love to circle and harass enemies from afar while
using their superior speed to avoid heavy counter attack.."
get_hit_sound={SOUND_LIST:HORSE_HIT}
die_sound=horse-die.ogg
[attack]
Modified: trunk/data/core/units/khalifate/Khaiyal.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Khaiyal.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Khaiyal.cfg (original)
+++ trunk/data/core/units/khalifate/Khaiyal.cfg Sun May 8 06:03:23 2011
@@ -15,7 +15,7 @@
usage=fighter
undead_variation=mounted
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "The Ghulam wear truly heavy armor, and thus close with a
single high impact lance charge in order to save their poor horsesâ stamina
before switching over to their trusty maces."
+ description= _ "The Khaiyal wear truly heavy armor, and thus close with a
single high impact lance charge in order to save their poor horsesâ stamina
before switching over to their trusty maces."
get_hit_sound={SOUND_LIST:HORSE_HIT}
die_sound=horse-die.ogg
[attack]
Modified: trunk/data/core/units/khalifate/Mighwar.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Mighwar.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Mighwar.cfg (original)
+++ trunk/data/core/units/khalifate/Mighwar.cfg Sun May 8 06:03:23 2011
@@ -21,8 +21,9 @@
get_hit_sound={SOUND_LIST:HUMAN_HIT}
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
- name=axe
- description= _ "axe"
+ name=long sword
+ description= _ "long sword"
+ icon=attacks/sword-human.png
type=blade
range=melee
damage=7
@@ -31,14 +32,14 @@
[attack_anim]
[filter_attack]
- name=axe
+ name=long sword
[/filter_attack]
[if]
hits=yes
[frame]
begin=-100
end=0
- sound=axe.ogg
+ sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
@@ -55,5 +56,3 @@
[/frame]
[/attack_anim]
[/unit_type]
-
-# NOT DONE YET
Modified: trunk/data/core/units/khalifate/Monawish.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Monawish.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Monawish.cfg (original)
+++ trunk/data/core/units/khalifate/Monawish.cfg Sun May 8 06:03:23 2011
@@ -21,8 +21,9 @@
get_hit_sound={SOUND_LIST:HUMAN_HIT}
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
- name=axe
- description= _ "axe"
+ name=long sword
+ description= _ "long sword"
+ icon=attacks/sword-human.png
type=blade
range=melee
damage=6
@@ -31,14 +32,14 @@
[attack_anim]
[filter_attack]
- name=axe
+ name=long sword
[/filter_attack]
[if]
hits=yes
[frame]
begin=-100
end=0
- sound=axe.ogg
+ sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
Modified: trunk/data/core/units/khalifate/Naffat.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Naffat.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Naffat.cfg (original)
+++ trunk/data/core/units/khalifate/Naffat.cfg Sun May 8 06:03:23 2011
@@ -14,14 +14,12 @@
cost=17
usage=archer
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "Rami frequently use burning arrows to set fire to enemy
fortifications and generally sow terror amongst the enemy. Such tactics may
also have other uses in a land of many strange wonders..."
+ description= _ "Naffat frequently use burning arrows to set fire to enemy
fortifications and generally sow terror amongst the enemy. Such tactics may
also have other uses in a land of many strange wonders..."
get_hit_sound={SOUND_LIST:HUMAN_HIT}
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
name=naptha attack
- # name=torch
description= _ "naptha attack"
- # sound="sounds/melee-fire.ogg"
icon=attacks/torch.png
type=fire
range=melee
@@ -47,7 +45,7 @@
[frame]
begin=-200
end=-100
- sound=torch.ogg
+ sound=melee-fire.ogg
[/frame]
[/if]
[else]
Modified: trunk/data/core/units/khalifate/Qatif-al-nar.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Qatif-al-nar.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Qatif-al-nar.cfg (original)
+++ trunk/data/core/units/khalifate/Qatif-al-nar.cfg Sun May 8 06:03:23 2011
@@ -45,7 +45,7 @@
[frame]
begin=-200
end=-100
- sound=torch.ogg
+ sound=melee-fire.ogg
[/frame]
[/if]
[else]
Modified: trunk/data/core/units/khalifate/Rami.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Rami.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Rami.cfg (original)
+++ trunk/data/core/units/khalifate/Rami.cfg Sun May 8 06:03:23 2011
@@ -15,7 +15,7 @@
usage=archer
undead_variation=mounted
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "Karadis are excellent horsemen and few can shoot as well
from horseback as they. They love to circle and harass enemies from afar while
using their superior speed to avoid heavy counter attack.."
+ description= _ "Rami are excellent horsemen and few can shoot as well from
horseback as they. They love to circle and harass enemies from afar while using
their superior speed to avoid heavy counter attack.."
get_hit_sound={SOUND_LIST:HORSE_HIT}
die_sound=horse-die.ogg
[attack]
Modified: trunk/data/core/units/khalifate/Saree.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Saree.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Saree.cfg (original)
+++ trunk/data/core/units/khalifate/Saree.cfg Sun May 8 06:03:23 2011
@@ -15,7 +15,7 @@
usage=archer
undead_variation=mounted
{MAGENTA_IS_THE_TEAM_COLOR}
- description= _ "Karadis are excellent horsemen and few can shoot as well
from horseback as they. They love to circle and harass enemies from afar while
using their superior speed to avoid heavy counter attack.."
+ description= _ "Saree are excellent horsemen and few can shoot as well
from horseback as they. They love to circle and harass enemies from afar while
using their superior speed to avoid heavy counter attack.."
get_hit_sound={SOUND_LIST:HORSE_HIT}
die_sound=horse-die.ogg
[attack]
Modified: trunk/data/core/units/khalifate/Tineen.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/khalifate/Tineen.cfg?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/data/core/units/khalifate/Tineen.cfg (original)
+++ trunk/data/core/units/khalifate/Tineen.cfg Sun May 8 06:03:23 2011
@@ -45,7 +45,7 @@
[frame]
begin=-200
end=-100
- sound=torch.ogg
+ sound=melee-fire.ogg
[/frame]
[/if]
[else]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
