Author: zookeeper
Date: Tue Jul 3 01:43:03 2007
New Revision: 18631
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18631&view=rev
Log:
The halberdier unit id is actually "Halbardier", so changed all references to a
"Halberdier" unit accordingly. Didn't change the unit id (yet!) in order to not
break UMC.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
Tue Jul 3 01:43:03 2007
@@ -153,7 +153,7 @@
user_description= _ "Asheviere"
side=5
canrecruit=1
- recruit=Royal Guard,Heavy
Infantryman,Dragoon,Longbowman,Duelist,Halberdier
+ recruit=Royal Guard,Heavy
Infantryman,Dragoon,Longbowman,Duelist,Halbardier
{GOLD 300 400 500}
[ai]
{ATTACK_DEPTH 5 6 6}
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg Tue
Jul 3 01:43:03 2007
@@ -187,7 +187,7 @@
[store_unit]
[filter]
- type=Halberdier,Royal Guard,Master
Bowman,Pikeman,Swordsman,Longbowman,Javelineer,Spearman,Bowman,Peasant
+ type=Halbardier,Royal Guard,Master
Bowman,Pikeman,Swordsman,Longbowman,Javelineer,Spearman,Bowman,Peasant
[/filter]
[not]
description=Tallin
@@ -634,7 +634,7 @@
[/music]
[role]
- type=type=Master Bowman,Royal
Guard,Halberdier,Swordsman,Pikeman,Longbowman,Javelineer,Trapper,Bandit,Highwayman,Thug,Poacher,Spearman,Bowman,Peasant
+ type=type=Master Bowman,Royal
Guard,Halbardier,Swordsman,Pikeman,Longbowman,Javelineer,Trapper,Bandit,Highwayman,Thug,Poacher,Spearman,Bowman,Peasant
role=Messenger
[/role]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg Tue Jul
3 01:43:03 2007
@@ -2219,7 +2219,7 @@
[/filter]
[filter_second]
- type=Peasant,Woodsman,Spearman,Swordsman,Royal
Guard,Pikeman,Javelineer,Halberdier,Trapper,Wraith,Spectre
+ type=Peasant,Woodsman,Spearman,Swordsman,Royal
Guard,Pikeman,Javelineer,Halbardier,Trapper,Wraith,Spectre
[/filter_second]
[message]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg Tue Jul
3 01:43:03 2007
@@ -127,7 +127,7 @@
[or]
[variable]
name=typechange.type
- equals=Halberdier
+ equals=Halbardier
[/variable]
[/or]
[then]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg Tue Jul
3 01:43:03 2007
@@ -270,7 +270,7 @@
[or]
[variable]
name=typechange.type
- equals=Halberdier
+ equals=Halbardier
[/variable]
[/or]
[then]
@@ -351,7 +351,7 @@
name=start
[role]
- type=Halberdier, Royal Guard, Master Bowman, Pikeman, Swordsman,
Longbowman, Javelineer, Spearman, Bowman, Peasant
+ type=Halbardier, Royal Guard, Master Bowman, Pikeman, Swordsman,
Longbowman, Javelineer, Spearman, Bowman, Peasant
role=Supporter
[/role]
[recall]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg Tue Jul 3
01:43:03 2007
@@ -1042,7 +1042,7 @@
[/message]
[role]
- type=Highwayman,Royal Guard,Halberdier,Master
Bowman,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant,Woodsman
+ type=Highwayman,Royal Guard,Halbardier,Master
Bowman,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant,Woodsman
role=Supporter
[/role]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/utils/herodeaths.cfg Tue
Jul 3 01:43:03 2007
@@ -477,7 +477,7 @@
[/message]
[role]
- type=Highwayman,Huntsman,Master Bowman,Royal
Guard,Halberdier,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant
+ type=Highwayman,Huntsman,Master Bowman,Royal
Guard,Halbardier,Bandit,Trapper,Swordsman,Pikeman,Longbowman,Javelineer,Bowman,Thug,Poacher,Peasant
role=Supporter
[/role]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg?rev=18631&r1=18630&r2=18631&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/utils/utils.cfg Tue Jul 3
01:43:03 2007
@@ -40,7 +40,7 @@
#define SUPPORTER
[role]
- type=Halberdier, Royal Guard, Master Bowman, Pikeman, Swordsman,
Longbowman, Javelineer, Spearman, Bowman, Peasant
+ type=Halbardier, Royal Guard, Master Bowman, Pikeman, Swordsman,
Longbowman, Javelineer, Spearman, Bowman, Peasant
[not]
description=Tallin
[/not]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
