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

[[UtBS fixes]]

Browse source 
* Enforce female gender on female-only units across campaigns
(workarounds bug #11197); Note that this is intended mostly for
heroes; very little, if any, attention has been given to non-hero
units.

* Fix redundant/superfluous preprocessor directives on scenario 3, TSG

* Melusand is respawned with persistent canrecruit=yes on scenario 9, UtBS

* Fixed invalid "Mermaid Entangler" move-unit-fake on scenario 9, UtBS
This commit is contained in:
Ignacio R. Morelle 2008-03-17 11:08:24 +00:00
parent c3ba008154
commit 54ae7592a4
20 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -64,6 +64,7 @@
type=Frontier Baroness
description=Dela Keshar
user_description=_ "Dela Keshar"
gender=female
gold=200
income=25
canrecruit=yes

1
data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View file

@ -271,6 +271,7 @@
[/move_unit_fake]
[unit]
type=Frontier Baroness
gender=female
side=4
x,y=21,4
description=Dela Keshar

1
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View file

@ -208,6 +208,7 @@
type=Elvish Druid
description=Chantal
user_description= _ "Chantal"
gender=female
side=6
canrecruit=yes
recruit=Elvish Shaman,Elvish Archer,Elvish Fighter

1
data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
View file

@ -82,6 +82,7 @@
type=Princess
description="Li'sar"
user_description= _ "Li'sar"
gender=female
unrenamable=yes
side=2
canrecruit=yes

1
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View file

@ -53,6 +53,7 @@
type=Princess
description="Li'sar"
user_description= _ "Li'sar"
gender=female
side=2
canrecruit=yes
recruit=Cavalryman,Swordsman,Spearman,Red Mage,Ogre,Duelist

5
data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
View file

@ -703,7 +703,10 @@
[/message]
{LOYAL_UNIT 2 (Princess) 8 44 (Li'sar) ( _ "Li'sar")}
# wmllint: recognize Li'sar
[+unit]
gender=female
[/unit]
# wmllint: recognize Li'sar
{LISAR_GUARD_DOORS}
{LISAR_GUARD_DOORS}
{LISAR_GUARD_DOORS}

2
data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
View file

@ -77,6 +77,7 @@
controller=ai
type=Princess
gender=female
description="Li'sar"
user_description= _ "Li'sar"
facing=sw
@ -363,6 +364,7 @@
user_description= _ "Li'sar"
unrenamable=yes
type=$stored_Lisar.type
gender=female
experience=$stored_Lisar.experience
{IS_HERO}
random_traits=no

1
data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
View file

@ -37,6 +37,7 @@
[/side]
[side]
type=Elvish Lady
gender=female
description=Parandra
user_description= _ "Parandra"
side=3

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

@ -143,6 +143,7 @@
[side]
type=Dark Queen
gender=female
description=Asheviere
user_description= _ "Asheviere"
side=5

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

@ -1744,6 +1744,7 @@
[unit]
type=Elvish Druid
gender=female
side=1
description=Elenia
user_description= _ "Elenia"

1
data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file

@ -425,6 +425,7 @@
[unit]
type=Elvish Sorceress
gender=female
side=1
description=Anita
user_description= _ "Anita"

1
data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
View file

@ -85,6 +85,7 @@
[side]
type=Elvish Shyde
gender=female
description=Lucile
user_description= _ "Lucile"
side=2

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
View file

@ -232,6 +232,9 @@
[/move_unit_fake]
{HERO (Elvish Shyde) (Lord Dionli) ( _ "Lord Dionli") 2 28 7 ("portraits/dionli.png")}
[+unit]
gender=female
[/unit]
# wmllint: recognize Lord Dionli
[message]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_Elf_Lords.cfg
View file

@ -58,6 +58,7 @@
[side]
side=2
type=Elvish Shyde
gender=female
description=Lord Dionli
user_description= _ "Lord Dionli"
profile="portraits/dionli.png"

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/18_A_Spy_in_the_Woods.cfg
View file

@ -95,6 +95,9 @@
[/move_unit_fake]
{HERO (Outlaw Queen) (Jessica in Hiding) ( _ "Jessica in Hiding") 4 19 16 "portraits/jessica.png"}
[+unit]
gender=female
[/unit]
# wmllint: recognize Jessica in Hiding
[scroll_to_unit]

7
data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
View file

@ -286,13 +286,10 @@
[unit]
#ifdef EASY
type=Elvish Shyde
#endif
#ifdef NORMAL
type=Elvish Druid
#endif
#ifdef HARD
#else
type=Elvish Druid
#endif
gender=female
description=Ethiliel
user_description= _ "Ethiliel"
profile=portraits/ethiliel.png

6
data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
View file

@ -208,8 +208,14 @@
{SG_UNIT (Elvish Fighter) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 3 17}
{SG_UNIT (Elvish Fighter) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 7 15}
{SG_UNIT (Elvish Druid) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 6 19}
[+unit]
gender=female
[/unit]
{SG_UNIT (Elvish Ranger) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 8 15}
{SG_UNIT (Elvish Druid) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 4 22}
[+unit]
gender=female
[/unit]
{SG_UNIT (Elvish Hero) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 6 23}
{SG_UNIT (Elvish Rider) (Disciple of Mebrin) (_"Disciple of Mebrin") 2 11 13}

2
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View file

@ -79,6 +79,7 @@
[unit]
type=Nym Hunter
gender=female
description=Nym
user_description= _ "Nym"
upkeep=loyal
@ -711,6 +712,7 @@
# just a way to keep her portrait displaying.
type=Desert Druid
description=Zhul
gender=female
user_description= _ "Zhul"
profile=portraits/zhul.png
upkeep=full

2
data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
View file

@ -2018,6 +2018,7 @@
[unit]
type=Mermaid Priestess
gender=female
description=Il-tian
user_description= _ "Il-tian"
upkeep=loyal
@ -2164,6 +2165,7 @@
[unit]
type=Mermaid Enchantress
gender=female
description=We-jial
user_description= _ "We-jial"
upkeep=loyal

7
data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
View file

@ -42,6 +42,7 @@
description=Melusand
user_description= _ "Melusand"
type=Mermaid Diviner
gender=female
profile=portraits/melusand.png
side=2
canrecruit=yes
@ -442,7 +443,9 @@
[/move_unit_fake]
[unit]
canrecruit=yes
type=Mermaid Diviner
gender=female
description=Melusand
user_description= _ "Melusand"
side=2
@ -459,7 +462,7 @@
[/kill]
[move_unit_fake]
type=Mermaid Entangler
type=Merman Entangler
x=13,14,15,16,16,17,18,18,19
y=9,8,9,8,7,7,6,5,5
[/move_unit_fake]
@ -769,6 +772,8 @@
[unit]
type=Mermaid Diviner
gender=female
canrecruit=yes
description=Melusand
user_description= _ "Melusand"
profile=portraits/melusand.png