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

Address bug #11317.

Browse source 
Zookeeper pointed out that if wwe're not going to turn the peasants
chaotic, there's not much point in having them change unit types.
This commit is contained in:
Eric S. Raymond 2008-03-20 21:05:35 +00:00
parent a82b592ae5
commit 810b84452e
3 changed files with 52 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
View file

@ -264,15 +264,15 @@
message= _ "Today we may no longer be citizens of Wesnoth. I wish it could be otherwise, but we are now outlaws."
[/message]
{CHG_TYPE type=Footpad_Peasant Footpad}
{CHG_TYPE type=Outlaw_Peasant Outlaw}
{CHG_TYPE type=Fugitive_Peasant Fugitive}
{CHG_TYPE type=Thug_Peasant Thug}
{CHG_TYPE type=Bandit_Peasant Bandit}
{CHG_TYPE type=Highwayman_Peasant Highwayman}
{CHG_TYPE type=Poacher_Peasant Poacher}
{CHG_TYPE type=Trapper_Peasant Trapper}
{CHG_TYPE type=Huntsman_Peasant Huntsman}
{CHG_TYPE type=Footpad_Peasant Footpad chaotic}
{CHG_TYPE type=Outlaw_Peasant Outlaw chaotic}
{CHG_TYPE type=Fugitive_Peasant Fugitive chaotic}
{CHG_TYPE type=Thug_Peasant Thug chaotic}
{CHG_TYPE type=Bandit_Peasant Bandit chaotic}
{CHG_TYPE type=Highwayman_Peasant Highwayman chaotic}
{CHG_TYPE type=Poacher_Peasant Poacher chaotic}
{CHG_TYPE type=Trapper_Peasant Trapper chaotic}
{CHG_TYPE type=Huntsman_Peasant Huntsman chaotic}
# Changing the unit type clobbers its portrait pointer if the new
# type has a unit portrait. Make sure Baldras and Harper keep theirs.

76
data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
View file

@ -260,25 +260,25 @@
[/unstore_unit]
{NEXT i}
{CHG_TYPE side,type=3,Spearman Skeleton}
{CHG_TYPE side,type=3,Swordsman Deathblade}
{CHG_TYPE side,type=3,Pikeman Revenant}
{CHG_TYPE side,type=3,Bowman (Skeleton Archer)}
{CHG_TYPE side,type=3,Longbowman (Bone Shooter)}
{CHG_TYPE (side,type=3,Heavy Infantryman) Ghoul}
{CHG_TYPE (side,type=3,Shock Trooper) Necrophage}
{CHG_TYPE side,type=3,Mage (Dark Adept)}
{CHG_TYPE (side,type=3,White Mage) (Dark Sorcerer)}
{CHG_TYPE (side,type=3,Red Mage) (Dark Sorcerer2)}
{CHG_TYPE (side,type=3,Arch Mage) Lich}
{CHG_TYPE (side,type=3,Mage of Light) Necromancer}
{CHG_TYPE side,type=3,Cavalryman (Skeleton Rider)}
{CHG_TYPE side,type=3,Dragoon (Bone Knight)}
{CHG_TYPE side,type=3,Horseman (Skeleton Rider2)}
{CHG_TYPE side,type=3,Lancer (Bone Knight2)}
{CHG_TYPE side,type=3,Knight (Bone Knight3)}
{CHG_TYPE side,type=3,Lieutenant (Death Squire)}
{CHG_TYPE side,type=3,General (Death Knight)}
{CHG_TYPE side,type=3,Spearman Skeleton chaotic}
{CHG_TYPE side,type=3,Swordsman Deathblade chaotic}
{CHG_TYPE side,type=3,Pikeman Revenant chaotic}
{CHG_TYPE side,type=3,Bowman (Skeleton Archer) chaotic}
{CHG_TYPE side,type=3,Longbowman (Bone Shooter) chaotic}
{CHG_TYPE (side,type=3,Heavy Infantryman) Ghoul chaotic}
{CHG_TYPE (side,type=3,Shock Trooper) Necrophage chaotic}
{CHG_TYPE side,type=3,Mage (Dark Adept) chaotic}
{CHG_TYPE (side,type=3,White Mage) (Dark Sorcerer) chaotic}
{CHG_TYPE (side,type=3,Red Mage) (Dark Sorcerer2) chaotic}
{CHG_TYPE (side,type=3,Arch Mage) Lich chaotic}
{CHG_TYPE (side,type=3,Mage of Light) Necromancer chaotic}
{CHG_TYPE side,type=3,Cavalryman (Skeleton Rider) chaotic}
{CHG_TYPE side,type=3,Dragoon (Bone Knight) chaotic}
{CHG_TYPE side,type=3,Horseman (Skeleton Rider2) chaotic}
{CHG_TYPE side,type=3,Lancer (Bone Knight2) chaotic}
{CHG_TYPE side,type=3,Knight (Bone Knight3) chaotic}
{CHG_TYPE side,type=3,Lieutenant (Death Squire) chaotic}
{CHG_TYPE side,type=3,General (Death Knight) chaotic}
[store_unit]
[filter]
@ -347,25 +347,25 @@
[/unstore_unit]
{NEXT i}
{CHG_TYPE side,type=3,Skeleton Spearman}
{CHG_TYPE side,type=3,Deathblade Swordsman}
{CHG_TYPE side,type=3,Revenant Pikeman}
{CHG_TYPE (side,type=3,Skeleton Archer) Bowman}
{CHG_TYPE (side,type=3,Bone Shooter) Longbowman}
{CHG_TYPE side,type=3,Ghoul (Heavy Infantryman)}
{CHG_TYPE side,type=3,Necrophage (Shock Trooper)}
{CHG_TYPE (side,type=3,Dark Adept) Mage}
{CHG_TYPE (side,type=3,Dark Sorcerer) (White Mage)}
{CHG_TYPE (side,type=3,Dark Sorcerer2) (Red Mage)}
{CHG_TYPE side,type=3,Lich (Arch Mage)}
{CHG_TYPE side,type=3,Necromancer (Mage of Light)}
{CHG_TYPE (side,type=3,Skeleton Rider) Cavalryman}
{CHG_TYPE (side,type=3,Bone Knight) Dragoon}
{CHG_TYPE (side,type=3,Skeleton Rider2) Horseman}
{CHG_TYPE (side,type=3,Bone Knight2) Lancer}
{CHG_TYPE (side,type=3,Bone Knight3) Knight}
{CHG_TYPE (side,type=3,Death Squire) Lieutenant}
{CHG_TYPE (side,type=3,Death Knight) General}
{CHG_TYPE side,type=3,Skeleton Spearman lawful}
{CHG_TYPE side,type=3,Deathblade Swordsman lawful}
{CHG_TYPE side,type=3,Revenant Pikeman lawful}
{CHG_TYPE (side,type=3,Skeleton Archer) Bowman lawful}
{CHG_TYPE (side,type=3,Bone Shooter) Longbowman lawful}
{CHG_TYPE side,type=3,Ghoul (Heavy Infantryman) lawful}
{CHG_TYPE side,type=3,Necrophage (Shock Trooper) lawful}
{CHG_TYPE (side,type=3,Dark Adept) Mage lawful}
{CHG_TYPE (side,type=3,Dark Sorcerer) (White Mage) lawful}
{CHG_TYPE (side,type=3,Dark Sorcerer2) (Red Mage) lawful}
{CHG_TYPE side,type=3,Lich (Arch Mage) lawful}
{CHG_TYPE side,type=3,Necromancer (Mage of Light) lawful}
{CHG_TYPE (side,type=3,Skeleton Rider) Cavalryman lawful}
{CHG_TYPE (side,type=3,Bone Knight) Dragoon lawful}
{CHG_TYPE (side,type=3,Skeleton Rider2) Horseman lawful}
{CHG_TYPE (side,type=3,Bone Knight2) Lancer lawful}
{CHG_TYPE (side,type=3,Bone Knight3) Knight lawful}
{CHG_TYPE (side,type=3,Death Squire) Lieutenant lawful}
{CHG_TYPE (side,type=3,Death Knight) General lawful}
[store_unit]
[filter]

6
data/campaigns/Liberty/utils/utils.cfg
View file

@ -12,7 +12,7 @@
# This one changes a unit from one type to another
#
#define CHG_TYPE FILTER VALUE
#define CHG_TYPE FILTER VALUE ALIGN
[store_unit]
[filter]
{FILTER}
@ -27,6 +27,10 @@
name=chgtype_store[$i].type
value={VALUE}
[/set_variable]
[set_variable]
name=chgtype_store[$i].alignment
value={ALIGN}
[/set_variable]
[unstore_unit]
variable=chgtype_store[$i]