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

Unit id change : Halbardier -> Halberdier

Browse source 
Also mentionned the Soul Shooter -> Banebow in the changelog

wmllint will need to be updated to include those 2 changes for 1.3.6 -> 1.3.7
This commit is contained in:
Benoît Timbert 2007-08-04 09:47:27 +00:00
parent 32251b76a6
commit d2ef8d7c95
19 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -21,6 +21,8 @@ Version 1.3.6+svn:
default is used (bug #9532)
* "Default Era" is now renamed to "Era of Turmoil" (bug #4210) in
accordance with the master history.
* Changed the Id of the Halberdier from "Halbardier" to "Halberdier"
* New name for the "Soul Shooter" : "Banebow"
* multiplayer lobby: highlight the names of the players which have joined
the selected game (bug #7471)
* multiplayer lobby: tab completion works for all player names now,

2
data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
View file

@ -90,7 +90,7 @@
{GEN_GUARDIAN (Pikeman) (Guard) (_ "Guard") 2 7 14}
{GEN_GUARDIAN (Swordsman) (Guard) (_ "Guard") 2 19 10}
{GEN_GUARDIAN (Heavy Infantryman) (Guard) (_ "Guard") 2 15 10}
{GEN_GUARDIAN (Halbardier) (Guard) (_ "Guard") 2 2 2}
{GEN_GUARDIAN (Halberdier) (Guard) (_ "Guard") 2 2 2}
# Place mages in rooms
{GEN_UNIT Mage 2 4 17}

2
data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg
View file

@ -248,7 +248,7 @@
[/recall]
#getting the sidekicks
{ROLE (Red Mage,Longbowman,Master Bowman,Arch Mage,Silver Mage,Great Mage) SIDE1 27 10}
{ROLE (Swordsman,Pikeman,Royal Guard,Halbardier) SIDE2 29 10}
{ROLE (Swordsman,Pikeman,Royal Guard,Halberdier) SIDE2 29 10}
##################
#huge intro scene#

6
data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
View file

@ -180,9 +180,9 @@
message= _ "These intruders are stronger than we expected. Call in the reinforcements!"
[/message]
{UNIT (Halbardier) (Dacayan) ( _ "Dacayan") 4 33 37}
{UNIT (Halbardier) (Ceomyr) ( _ "Ceomyr") 4 32 37}
{UNIT (Halbardier) (Gwellyn) ( _ "Gwellyn") 4 34 37}
{UNIT (Halberdier) (Dacayan) ( _ "Dacayan") 4 33 37}
{UNIT (Halberdier) (Ceomyr) ( _ "Ceomyr") 4 32 37}
{UNIT (Halberdier) (Gwellyn) ( _ "Gwellyn") 4 34 37}
#a little attempt at comic relief
[message]

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

@ -153,7 +153,7 @@
user_description= _ "Asheviere"
side=5
canrecruit=1
recruit=Royal Guard,Heavy Infantryman,Dragoon,Longbowman,Duelist,Halbardier
recruit=Royal Guard,Heavy Infantryman,Dragoon,Longbowman,Duelist,Halberdier
{GOLD 300 400 500}
[ai]
{ATTACK_DEPTH 5 6 6}

4
data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
View file

@ -155,14 +155,14 @@
#enddef
#guarding the woods
{SEEKER 5 13 Halbardier}
{SEEKER 5 13 Halberdier}
{SEEKER 7 12 (Shock Trooper)}
{SEEKER 7 14 (Shock Trooper)}
{SEEKER 1 12 (Shock Trooper)}
#main gate
{SEEKER 8 25 (Shock Trooper)}
{SEEKER 12 25 Halbardier}
{SEEKER 12 25 Halberdier}
{SEEKER 9 30 (Shock Trooper)}
{SEEKER 10 30 (Iron Mauler)}
{SEEKER 11 30 (Shock Trooper)}

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

@ -201,17 +201,17 @@
#endif
#ifdef HARD
{MK_GUARD 15 13 2 (Master Bowman) ( )}
{MK_GUARD 16 14 2 (Halbardier) ( )}
{MK_GUARD 17 13 2 (Halbardier) ( )}
{MK_GUARD 16 14 2 (Halberdier) ( )}
{MK_GUARD 17 13 2 (Halberdier) ( )}
{MK_GUARD 25 13 2 (Master Bowman) ( )}
{MK_GUARD 23 13 2 (Halbardier) ( )}
{MK_GUARD 24 14 2 (Halbardier) ( )}
{MK_GUARD 23 13 2 (Halberdier) ( )}
{MK_GUARD 24 14 2 (Halberdier) ( )}
{MK_GUARD 15 20 2 (Master Bowman) ( )}
{MK_GUARD 16 18 2 (Halbardier) ( )}
{MK_GUARD 17 20 2 (Halbardier) ( )}
{MK_GUARD 16 18 2 (Halberdier) ( )}
{MK_GUARD 17 20 2 (Halberdier) ( )}
{MK_GUARD 25 20 2 (Master Bowman) ( )}
{MK_GUARD 23 20 2 (Halbardier) ( )}
{MK_GUARD 24 18 2 (Halbardier) ( )}
{MK_GUARD 23 20 2 (Halberdier) ( )}
{MK_GUARD 24 18 2 (Halberdier) ( )}
#endif
#We need to store the Paladin for later and erase his castle
@ -486,7 +486,7 @@
[redraw]
[/redraw]
[move_unit_fake]
type=Halbardier
type=Halberdier
x=36,35,34,33,32
y=18,18,17,17,17
[/move_unit_fake]

4
data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
View file

@ -193,7 +193,7 @@ Defeat:
[store_unit]
[filter]
type=Halbardier,Royal Guard,Master Bowman,Pikeman,Swordsman,Longbowman,Javelineer,Spearman,Bowman,Peasant
type=Halberdier,Royal Guard,Master Bowman,Pikeman,Swordsman,Longbowman,Javelineer,Spearman,Bowman,Peasant
[/filter]
[not]
description=Tallin
@ -639,7 +639,7 @@ Defeat:
[/music]
[role]
type=type=Master Bowman,Royal Guard,Halbardier,Swordsman,Pikeman,Longbowman,Javelineer,Trapper,Bandit,Highwayman,Thug,Poacher,Spearman,Bowman,Peasant
type=type=Master Bowman,Royal Guard,Halberdier,Swordsman,Pikeman,Longbowman,Javelineer,Trapper,Bandit,Highwayman,Thug,Poacher,Spearman,Bowman,Peasant
role=Messenger
[/role]

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

@ -2242,7 +2242,7 @@
[/filter]
[filter_second]
type=Peasant,Woodsman,Spearman,Swordsman,Royal Guard,Pikeman,Javelineer,Halbardier,Trapper,Wraith,Spectre
type=Peasant,Woodsman,Spearman,Swordsman,Royal Guard,Pikeman,Javelineer,Halberdier,Trapper,Wraith,Spectre
[/filter_second]
[message]

2
data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
View file

@ -127,7 +127,7 @@
[or]
[variable]
name=typechange.type
equals=Halbardier
equals=Halberdier
[/variable]
[/or]
[then]

2
data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
View file

@ -355,7 +355,7 @@
name=start
[role]
type=Halbardier, Royal Guard, Master Bowman, Pikeman, Swordsman, Longbowman, Javelineer, Spearman, Bowman, Peasant
type=Halberdier, Royal Guard, Master Bowman, Pikeman, Swordsman, Longbowman, Javelineer, Spearman, Bowman, Peasant
role=Supporter
[/role]
[recall]

2
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -1060,7 +1060,7 @@
[/message]
[role]
type=Highwayman,Royal Guard,Halbardier,Master Bowman,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant,Woodsman
type=Highwayman,Royal Guard,Halberdier,Master Bowman,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant,Woodsman
role=Supporter
[/role]

2
data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg
View file

@ -482,7 +482,7 @@
[/message]
[role]
type=Highwayman,Huntsman,Master Bowman,Royal Guard,Halbardier,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant
type=Highwayman,Huntsman,Master Bowman,Royal Guard,Halberdier,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant
role=Supporter
[/role]

4
data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg
View file

@ -40,7 +40,7 @@
#define SUPPORTER
[role]
type=Halbardier, Royal Guard, Master Bowman, Pikeman, Swordsman, Longbowman, Javelineer, Spearman, Bowman, Peasant
type=Halberdier, Royal Guard, Master Bowman, Pikeman, Swordsman, Longbowman, Javelineer, Spearman, Bowman, Peasant
[not]
description=Tallin
[/not]
@ -392,4 +392,4 @@ Showing signs of ancient elvish manufacture, whomever wears this amulet on their
y={Y}
side=2
[/unit]
#enddef
#enddef

2
data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
View file

@ -233,7 +233,7 @@
name=attack
[filter]
side=1
type=Spearman, Pikeman, Halbardier, Bowman, Longbowman, Master Bowman, Horseman Commander, Lance Commander
type=Spearman, Pikeman, Halberdier, Bowman, Longbowman, Master Bowman, Horseman Commander, Lance Commander
[/filter]
[filter_second]
type=Skeleton, Revenant, Deathblade, Draug, Skeleton Archer, Bone Shooter, Banebow

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

@ -1,6 +1,6 @@
#textdomain wesnoth-units
[unit]
id=Halbardier
id=Halberdier
name= _ "Halberdier"
race=human
image="units/human-loyalists/halberdier.png"

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

@ -12,7 +12,7 @@
experience=65
level=2
alignment=lawful
advanceto=Halbardier
advanceto=Halberdier
cost=25
usage=fighter
unit_description= _ "Promising spearmen in the armies of Wesnoth are often graduated to wielding pikes, and are outfitted with something far superior to the motley collection of leather armor they wore as recruits. A pike is a much longer weapon than a spear, and thus facilitates different combat tactics. A wall of pikemen is the bane of any cavalry charge, and with proper discipline and tactics, pikemen can also hold most other infantry at bay.

4
data/multiplayer/factions/loyalists-aoh.cfg
View file

@ -3,8 +3,8 @@
id=Loyalists
name={MENU_IMG_TXT "human-loyalists/general.png~RC(magenta>red)" _"Loyalists"}
type=General
leader=General,Royal Guard,Halbardier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage,Javelineer
random_leader=General,Royal Guard,Halbardier,Master Bowman,Arch Mage,Silver Mage
leader=General,Royal Guard,Halberdier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage,Javelineer
random_leader=General,Royal Guard,Halberdier,Master Bowman,Arch Mage,Silver Mage
recruit=Cavalryman,Dragoon,Horseman,Lancer,Knight,Spearman,Swordsman,Pikeman,Javelineer,Fencer,Duelist,Heavy Infantryman,Shock Trooper,Bowman,Longbowman,Mage,Red Mage,White Mage,Merman Fighter,Merman Warrior,Ogre,Lieutenant
terrain_liked=Gg, Ww, Wo
[ai]

2
data/multiplayer/scenarios/2p_Wesbowl.cfg
View file

@ -65,7 +65,7 @@ Defeat:
{WESBOWL_SIDE (Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer,Orcish Warlord,Troll Warrior,Orcish Slurbow) {SIDE} {FACING} {X} (Naga Fighter) (Orcish Grunt) (Orcish Grunt) (Orcish Archer) (Orcish Archer) (Goblin Spearman) (Goblin Spearman) (Troll Whelp) (Troll Whelp) (Wolf Rider) (Wolf Rider)}
{WESBOWL_SIDE (Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage,Lich,Necromancer,Draug,Banebow) {SIDE} {FACING} {X} (Vampire Bat) Skeleton Skeleton (Skeleton Archer) (Skeleton Archer) Skeleton Skeleton (Dark Adept) (Dark Adept) Ghost Ghost}
{WESBOWL_SIDE (Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Bandit,Trapper,Dwarvish Lord,Dwarvish Dragonguard,Dwarvish Sentinel,Assassin) {SIDE} {FACING} {X} Poacher (Dwarvish Fighter) (Dwarvish Fighter) (Dwarvish Thunderer) (Dwarvish Thunderer) Footpad Footpad Thief Thief (Gryphon Rider) (Gryphon Rider)}
{WESBOWL_SIDE (Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage,General,Royal Guard,Halbardier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage) {SIDE} {FACING} {X} (Naga Fighter) Spearman Spearman Fencer Fencer Horseman Horseman (Heavy Infantryman) (Heavy Infantryman) Cavalryman Cavalryman}
{WESBOWL_SIDE (Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage,General,Royal Guard,Halberdier,Iron Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage) {SIDE} {FACING} {X} (Naga Fighter) Spearman Spearman Fencer Fencer Horseman Horseman (Heavy Infantryman) (Heavy Infantryman) Cavalryman Cavalryman}
{WESBOWL_SIDE (Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake Warrior,Saurian Oracle,Saurian Soothsayer,Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Drake Blademaster) {SIDE} {FACING} {X} (Saurian Augur) (Drake Fighter) (Drake Fighter) (Drake Burner) (Drake Burner) (Saurian Skirmisher) (Saurian Skirmisher) (Drake Clasher) (Drake Clasher) (Drake Glider) (Drake Glider)}
#enddef