HttT S04 Use best of Merfolk

Use a macro since this appears three times.

Order the type list to select the highest-level merfolk, and include all possible merfolk.
This commit is contained in:
Gregory A Lundberg 2016-08-06 13:00:00 -05:00
parent 1c9ef479dd
commit 051ce00bd8

View file

@ -670,14 +670,21 @@
{KONRAD_VARIATION_ELF glad}
message= _ "At last, we have freed the mermen. Go back to the ocean and live in peace."
[/message]
[role]
type=Merman Fighter,Merman Warrior,Merman Triton,Merman Hoplite
role=ThankfulMerman
[/role]
[message]
role=ThankfulMerman
message= _ "My lord! You may need the help of some of us who have skill in the sea in future. We would like to come with you and offer you help."
[/message]
#define MERMAN_SPEAKS
[role]
role=ThankfulMerman
search_recall_list=no
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[/role]
[message]
role=ThankfulMerman
message= _ "My lord! You may need the help of some of us who have skill in the sea in future. We would like to come with you and offer you help."
[/message]
#enddef
{MERMAN_SPEAKS}
[message]
speaker=narrator
image="wesnoth-icon.png"
@ -876,14 +883,7 @@
[kill]
id=Delfador
[/kill]
[role]
type=Merman Fighter,Merman Warrior,Merman Triton,Merman Hoplite
role=ThankfulMerman
[/role]
[message]
role=ThankfulMerman
message= _ "My lord! You may need the help of some of us who have skill in the sea in future. We would like to come with you and offer you help."
[/message]
{MERMAN_SPEAKS}
[message]
speaker=narrator
image="wesnoth-icon.png"
@ -908,14 +908,7 @@
[kill]
id=Delfador
[/kill]
[role]
type=Merman Fighter,Merman Warrior,Merman Triton,Merman Hoplite
role=ThankfulMerman
[/role]
[message]
role=ThankfulMerman
message= _ "My lord! You may need the help of some of us who have skill in the sea in future. We would like to come with you and offer you help."
[/message]
{MERMAN_SPEAKS}
[message]
speaker=narrator
image="wesnoth-icon.png"
@ -939,3 +932,5 @@
{campaigns/Heir_To_The_Throne/utils/deaths.cfg}
[/scenario]
#undef MERMAN_SPEAKS