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

weapon name changes

Browse source 
units using flails, maces or morningstars use the correct name and icon for it
many khalifate units use swords instead of longswords
shield is now called shield bash
This commit is contained in:
Severin Glöckner 2017-02-19 23:00:47 +01:00 • committed by Lari Nieminen
parent 0d03f9b4d4
commit fe6c5ef2a8
18 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg
View file

@ -29,8 +29,8 @@
number=4
[/attack]
[attack]
name=morning star
description= _"morning star"
name=flail
description= _"flail"
#textdomain wesnoth-ei
type=impact
range=melee
@ -43,7 +43,7 @@
[/attack]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
start_time=-300
[frame]

6
data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg
View file

@ -28,8 +28,8 @@
number=3
[/attack]
[attack]
name=morning star
description= _"morning star"
name=flail
description= _"flail"
#textdomain wesnoth-ei
type=impact
range=melee
@ -39,7 +39,7 @@
[/attack]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
start_time=-300
[frame]

6
data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg
View file

@ -28,8 +28,8 @@
number=4
[/attack]
[attack]
name=morning star
description= _"morning star"
name=flail
description= _"flail"
#textdomain wesnoth-ei
type=impact
range=melee
@ -42,7 +42,7 @@
[/attack]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
start_time=-300
[frame]

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

@ -36,7 +36,9 @@
[/attack]
[attack]
name=shield
description= _"shield"
#textdomain wesnoth-units
description= _"shield bash"
#textdomain wesnoth-tsg
type=impact
range=melee
damage=10

6
data/core/units/humans/Loyalist_Iron_Mauler.cfg
View file

@ -23,8 +23,8 @@ Though staggering in melee combat, there are many drawbacks to being outfitted i
{DEFENSE_ANIM "units/human-loyalists/siegetrooper-defend-1.png" "units/human-loyalists/siegetrooper-defend-2.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=mace
description=_"mace"
icon=attacks/mace-spiked.png
description=_"flail"
icon=attacks/morning-star.png
type=impact
range=melee
damage=25
@ -38,6 +38,6 @@ Though staggering in melee combat, there are many drawbacks to being outfitted i
[frame]
image="units/human-loyalists/siegetrooper-attack-[1~6].png:[85,100,125,50*3]"
[/frame]
{SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
{SOUND:HIT_AND_MISS flail.ogg flail-miss.ogg -260}
[/attack_anim]
[/unit_type]

4
data/core/units/humans/Loyalist_Shock_Trooper.cfg
View file

@ -19,7 +19,7 @@
usage=fighter
{DEFENSE_ANIM "units/human-loyalists/shocktrooper-defend-1.png" "units/human-loyalists/shocktrooper-defend-2.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=morning star
name=flail
description=_"flail"
icon=attacks/morning-star.png
type=impact
@ -29,7 +29,7 @@
[/attack]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
start_time=-260
{SOUND:HIT_AND_MISS flail.ogg flail-miss.ogg -260}

8
data/core/units/humans/Mage_of_Light.cfg
View file

@ -43,8 +43,8 @@ Following a strict code of piety and honor, these men and women work tirelessly
[/frame]
[/healing_anim]
[attack]
name=morning star
description=_"morning star"
name=flail
description=_"flail"
type=impact
range=melee
damage=7
@ -83,7 +83,7 @@ Following a strict code of piety and honor, these men and women work tirelessly
[/attack_anim]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
start_time=-250
@ -130,7 +130,7 @@ Following a strict code of piety and honor, these men and women work tirelessly
[/attack_anim]
[attack_anim]
[filter_attack]
name=morning star
name=flail
[/filter_attack]
[frame]
image="units/human-magi/white-cleric+female-magic-3.png:100"

2
data/core/units/humans/Outlaw.cfg
View file

@ -20,7 +20,7 @@
{DEFENSE_ANIM "units/human-outlaws/outlaw-defend.png" "units/human-outlaws/outlaw.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=mace-spiked
description=_"mace"
description=_"morning star"
type=impact
range=melee
damage=8

2
data/core/units/humans/Outlaw_Bandit.cfg
View file

@ -19,7 +19,7 @@
{DEFENSE_ANIM "units/human-outlaws/bandit-defend-2.png" "units/human-outlaws/bandit-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=mace-spiked
description=_"mace"
description=_"morning star"
type=impact
range=melee
damage=8

3
data/core/units/humans/Outlaw_Fugitive.cfg
View file

@ -25,12 +25,11 @@
[/abilities]
[attack]
name=mace-spiked
description= _ "mace"
description= _ "morning star"
type=impact
range=melee
damage=11
number=2
icon=attacks/mace.png
[/attack]
[attack]
name=sling

3
data/core/units/humans/Outlaw_Highwayman.cfg
View file

@ -21,8 +21,7 @@
{DEFENSE_ANIM "units/human-outlaws/highwayman-defend-2.png" "units/human-outlaws/highwayman-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=mace-spiked
description= _ "mace"
icon=attacks/mace.png
description= _ "morning star"
type=impact
range=melee
damage=11

2
data/core/units/humans/Royal_Warrior.cfg
View file

@ -30,7 +30,7 @@
die_sound={SOUND_LIST:HUMAN_DIE}
[attack]
name=mace
description= _"mace"
description= _"morning star"
icon=attacks/mace-spiked.png
type=impact
range=melee

6
data/core/units/khalifate/Arif.cfg
View file

@ -17,8 +17,8 @@
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/khalifate/arif.png" "units/khalifate/arif.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=sword
description= _ "sword"
icon=attacks/sword-human.png
type=blade
range=melee
@ -31,7 +31,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=sword
[/filter_attack]
start_time=-200

6
data/core/units/khalifate/Ghazi.cfg
View file

@ -17,8 +17,8 @@
die_sound={SOUND_LIST:ELF_HIT}
{DEFENSE_ANIM "units/khalifate/ghazi.png" "units/khalifate/ghazi.png" {SOUND_LIST:ELF_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=sword
description= _ "sword"
icon=attacks/longsword.png
type=blade
range=melee
@ -43,7 +43,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=sword
[/filter_attack]
start_time=-200

6
data/core/units/khalifate/Khalid.cfg
View file

@ -24,8 +24,8 @@
die_sound={SOUND_LIST:ELF_HIT}
{DEFENSE_ANIM "units/khalifate/khalid.png" "units/khalifate/khalid.png" {SOUND_LIST:ELF_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=sword
description= _ "sword"
icon=attacks/longsword.png
type=blade
range=melee
@ -50,7 +50,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=sword
[/filter_attack]
start_time=-200

6
data/core/units/khalifate/Mighwar.cfg
View file

@ -21,8 +21,8 @@
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/khalifate/mighwar.png" "units/khalifate/mighwar.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=longsword
description= _ "longsword"
icon=attacks/longsword.png
type=blade
range=melee
@ -32,7 +32,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=longsword
[/filter_attack]
start_time=-200

6
data/core/units/khalifate/Monawish.cfg
View file

@ -20,8 +20,8 @@
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/khalifate/monawish.png" "units/khalifate/monawish.png" {SOUND_LIST:HUMAN_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=longsword
description= _ "longsword"
icon=attacks/longsword.png
type=blade
range=melee
@ -31,7 +31,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=longsword
[/filter_attack]
start_time=-200

6
data/core/units/khalifate/Shuja.cfg
View file

@ -18,8 +18,8 @@
die_sound={SOUND_LIST:ELF_HIT}
{DEFENSE_ANIM "units/khalifate/shuja.png" "units/khalifate/shuja.png" {SOUND_LIST:ELF_HIT} }
[attack]
name=long sword
description= _ "long sword"
name=sword
description= _ "sword"
icon=attacks/longsword.png
type=blade
range=melee
@ -44,7 +44,7 @@
[attack_anim]
[filter_attack]
name=long sword
name=sword
[/filter_attack]
start_time=-200