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

Addressing bug #10169.

Browse source 
Changed the unit types and and the transformations of Lady Outlaw in
TRoW.
This commit is contained in:
Dimitar Ilccov 2007-12-12 16:01:49 +00:00
parent 28a26fa609
commit f8c883d8d0
5 changed files with 174 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
View file

@ -38,7 +38,7 @@
{STARTING_VILLAGES 1 6}
[side]
type=Outlaw
type=Wesfolk Outcast
gender=female
description=Wesfolk Leader
user_description= _ "Wesfolk Leader"
@ -181,7 +181,13 @@
description=King Eldaric IV
message= _ "You may go. See to it that you trouble us no more, for the custom states that you may invoke surrender but once. If we meet again, I won't be so merciful."
[/message]
[store_unit]
variable=wesfolk_leader_store
kill=yes
[filter]
description=Wesfolk Leader
[/filter]
[/store_unit]
[endlevel]
result=victory
bonus=yes

116
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -31,14 +31,10 @@
{STARTING_VILLAGES 1 6}
[side]
type=Outlaw
gender=female
description=Wesfolk Leader
user_description= _ "Wesfolk Leader"
profile="portraits/lady_outlaw.png"
side=2
canrecruit=1
recruit=Footpad,Poacher,Thief,Thug
no_leader=yes
[ai]
recruitment_pattern=fighter,fighter,archer,scout
{NO_SCOUTS}
@ -174,6 +170,15 @@
[event]
name=start
{VARIABLE wesfolk_leader_store.x 4}
{VARIABLE wesfolk_leader_store.y 23}
[unstore_unit]
variable=wesfolk_leader_store
[/unstore_unit]
{FULL_HEAL (description=Wesfolk Leader)}
[message]
speaker=narrator
message= _ "Summer passes into fall, and King Eldaric fortifies his frontiers. It is not long before the first orcish scouts are spotted. War has come to the valley."
@ -287,27 +292,10 @@
description=Wesfolk Leader
message= _ "Let there be peace between us, our survival depends on it."
[/message]
[allow_recruit]
#Single line the list, check my bug
type=Footpad
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Poacher
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Thief
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Thug
[/allow_recruit]
side=1
type=Thief,Thug,Poacher,Footpad
[/allow_recruit]
[message]
description=Prince Haldric
message= _ "So what shall I call you?"
@ -316,15 +304,27 @@
description=Wesfolk Leader
message= _ "The Lady Outlaw will do."
[/message]
[unit]
description=Lady Outlaw
user_description= _ "Lady Outlaw"
type=Outlaw
profile="portraits/lady_outlaw.png"
gender=female
unrenamable=yes
side=1
[/unit]
[store_unit]
variable=wesfolk_leader_store
kill=yes
[filter]
description=Wesfolk Leader
[/filter]
[/store_unit]
{VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
{VARIABLE wesfolk_leader_store.user_description ( _ "Lady Outlaw")}
{VARIABLE wesfolk_leader_store.canrecruit 0}
{VARIABLE wesfolk_leader_store.side 1}
[unstore_unit]
variable=wesfolk_leader_store
[/unstore_unit]
{MAKE_HERO (Lady Outlaw)}
{FULL_HEAL (description=Lady Outlaw)}
[set_variable]
name=have_lady
value=1
@ -340,6 +340,40 @@
message= _ "Arrogant fools! (Reaches into pocket) POOF!"
[/message]
[store_unit]
variable=wesfolk_leader_store
kill=yes
[filter]
description=Wesfolk Leader
[/filter]
[/store_unit]
{VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
{VARIABLE wesfolk_leader_store.user_description ( _ "Lady Outlaw")}
{VARIABLE wesfolk_leader_store.canrecruit 0}
{VARIABLE wesfolk_leader_store.side 1}
[unstore_unit]
variable=wesfolk_leader_store
[/unstore_unit]
{MAKE_HERO (Lady Outlaw)}
{FULL_HEAL (description=Lady Outlaw)}
[store_unit]
variable=lady_store
kill=yes
[filter]
description=Lady Outlaw
[/filter]
[/store_unit]
[set_variable]
name=have_lady
value=0
[/set_variable]
[message]
description=King Eldaric IV
message= _ "Argh, she's gone. Next time, more sword, less chat."
@ -350,20 +384,16 @@
message= _ "She's clever! Maybe I made the wrong choice. Well, at least she left some of her gold behind..."
[/message]
[set_variable]
name=have_lady
value=0
[/set_variable]
#ifdef EASY
{LOOT 75 1}
{LOOT 100 1}
#endif
#ifdef NORMAL
{LOOT 50 1}
{LOOT 75 1}
#endif
#ifdef HARD
{LOOT 25 1}
{LOOT 50 1}
#endif
[/command]
[/option]
@ -377,7 +407,6 @@
message= _ "But, Father!"
[/message]
[message]
id=msgT1_16
description=King Eldaric IV
message= _ "It's the only way. Go now, and don't look back! Luck be with you!"
[/message]
@ -438,5 +467,8 @@
[kill]
description=King Eldaric IV
[/kill]
{CLEAR_VARIABLE wesfolk_leader_store}
[/event]
[/scenario]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
View file

@ -483,7 +483,7 @@ Enter at Your Own Risk!"
[event]
name=time over
[message]
description=King Eldaric IV
description=Prince Haldric
message= _ "We have run out of time... We'll be trapped in this swamp when winter arrives!"
[/message]
[/event]

12
data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
View file

@ -123,18 +123,6 @@
[/objectives]
[/event]
# [event]
# name=moveto
# [filter]
# side=1
# x=13
# y=19
# [/filter]
#
# [removeitem]
# [/removeitem]
# [/event]
[event]
name=start

169
data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
View file

@ -96,21 +96,6 @@
[recall]
description=Minister Edmond
[/recall]
[unstore_unit]
variable=lady_store
find_vacant=no
[/unstore_unit]
{FULL_HEAL description="Lady Outlaw"}
[store_unit]
[filter]
description=Lady Outlaw
[/filter]
variable=lady_store
kill=yes
[/store_unit]
[/event]
[event]
@ -143,11 +128,11 @@
[if]
[variable]
name=lady_store.type
equals=Fugitive
equals=Wesfolk Outcast
[/variable]
[then]
[move_unit_fake]
type=Fugitive
type=Wesfolk Outcast
side=1
gender=female
x=8,8,8,8,8,7,7,6,6
@ -155,43 +140,41 @@
[/move_unit_fake]
[/then]
[else]
[move_unit_fake]
type=Outlaw
side=1
gender=female
x=8,8,8,8,8,7,7,6,6
y=30,29,28,27,26,26,25,24,23,22
[/move_unit_fake]
[/else]
[if]
[variable]
name=lady_store.type
equals=Wesfolk Lady
[/variable]
[then]
[move_unit_fake]
type=Wesfolk Lady
side=1
gender=female
x=8,8,8,8,8,7,7,6,6
y=30,29,28,27,26,26,25,24,23,22
[/move_unit_fake]
[/then]
[else]
[move_unit_fake]
type=Wesfolk Leader
side=1
gender=female
x=8,8,8,8,8,7,7,6,6
y=30,29,28,27,26,26,25,24,23,22
[/move_unit_fake]
[/else]
[/if]
[/else]
[/if]
{VARIABLE lady_store.x 6}
{VARIABLE lady_store.y 22}
[if]
[variable]
name=lady_store.description
equals="Lady Outlaw"
[/variable]
[then]
[unstore_unit]
variable=lady_store
[/unstore_unit]
[/then]
[else]
[unit]
type=Outlaw
gender=female
description=Lady Outlaw
user_description= _ "Lady Outlaw"
profile="portraits/lady_outlaw.png"
unrenamable=yes
side=1
x=6
y=22
[/unit]
[/else]
[/if]
[unstore_unit]
variable=lady_store
[/unstore_unit]
{FULL_HEAL description="Lady Outlaw"}
[if]
[variable]
@ -282,23 +265,7 @@
message= _ "Why should I trust you, or your information? I don't even know your name, and you have this nasty habit of mysteriously vanishing!"
[/message]
[allow_recruit]
#Single line the list, check my bug
type=Footpad
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Poacher
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Thief
[/allow_recruit]
[allow_recruit]
#Single line the list, check my bug
type=Thug
type=Footpad,Poacher,Thief,Thug
[/allow_recruit]
[/else]
[/if]
@ -306,19 +273,65 @@
description=Lady Outlaw
message= _ "Bah, have it your way!"
[/message]
[kill]
description=Lady Outlaw
[/kill]
#
# Note to players:
#
# Storing Lady Outlaw and restoring her here with the proper XP
# has been considered and rejected for gameplay reasons.
#
# We want you to have to go through the effort to level her up again.
#
{HERO (Outlaw Princess) (Lady Jessica) ( _ "Lady Jessica") 1 6 22 "portraits/jessica.png"}
[store_unit]
[filter]
description=Lady Outlaw
[/filter]
variable=lady_store
kill=yes
[/store_unit]
[if]
[variable]
name=lady_store.type
equals=Wesfolk Outcast
[/variable]
[then]
{VARIABLE lady_store.experience 0}
{VARIABLE lady_store.type (Outlaw Princess)}
[/then]
[/if]
[if]
[variable]
name=lady_store.type
equals=Wesfolk Lady
[/variable]
[then]
{VARIABLE lady_store.type (Outlaw Princess)}
[/then]
[/if]
[if]
[variable]
name=lady_store.type
equals=Wesfolk Leader
[/variable]
[then]
{VARIABLE lady_store.type (Outlaw Queen)}
[/then]
[/if]
{VARIABLE lady_store.description (Lady Jessica)}
{VARIABLE lady_store.user_description (_ "Lady Jessica")}
[unstore_unit]
variable=lady_store
[/unstore_unit]
{FULL_HEAL description="Lady Jessica"}
{CLEAR_VARIBLE lady_store}
[scroll_to_unit]
description=Lady Jessica