Ported 2009-07-02T20:16:15Z!lari.nieminen@iki.fi and 2009-07-02T20:25:46Z!lari.nieminen@iki.fi to trunk.

This commit is contained in:
Lari Nieminen 2009-07-02 20:43:51 +00:00
parent a7c09ce667
commit 4cee1ea7c8
3 changed files with 21 additions and 17 deletions

View File

@ -381,10 +381,12 @@ Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$s
message= _ "Our talks are complete - the Dwarves will gladly fight by your side. Which of our brethren do you want to recruit?"
#wmllint: display off
{PICK_RECRUIT_OPTION ("units/dwarves/fighter.png~TC(1,magenta)") ("Dwarvish Fighter") ally_1}
{PICK_RECRUIT_OPTION ("units/dwarves/guard.png~TC(1,magenta)") ("Dwarvish Guardsman") ally_2}
{PICK_RECRUIT_OPTION ("units/dwarves/thunderer.png~TC(1,magenta)") ("Dwarvish Thunderer") ally_3}
{PICK_RECRUIT_OPTION ("units/dwarves/ulfserker.png~TC(1,magenta)") ("Dwarvish Ulfserker") ally_4}
#textdomain wesnoth-units
{PICK_RECRUIT_OPTION ("units/dwarves/fighter.png~TC($side_number|,magenta)") "Dwarvish Fighter" _"Dwarvish Fighter" ally_1}
{PICK_RECRUIT_OPTION ("units/dwarves/guard.png~TC($side_number|,magenta)") "Dwarvish Guardsman" _"Dwarvish Guardsman" ally_2}
{PICK_RECRUIT_OPTION ("units/dwarves/thunderer.png~TC($side_number|,magenta)") "Dwarvish Thunderer" _"Dwarvish Thunderer" ally_3}
{PICK_RECRUIT_OPTION ("units/dwarves/ulfserker.png~TC($side_number|,magenta)") "Dwarvish Ulfserker" _"Dwarvish Ulfserker" ally_4}
#textdomain wesnoth-anl
[/message]
{VARIABLE_OP player_$side_number|.leader_option_1.progress format 0}
[/then]
@ -403,10 +405,12 @@ Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$s
message= _ "Our talks are complete - the Elves shall aid you in this battle. Which our of kin do you wish to recruit?"
#wmllint: display off
{PICK_RECRUIT_OPTION ("units/elves-wood/archer.png~TC(1,magenta)") ("Elvish Archer") ally_5}
{PICK_RECRUIT_OPTION ("units/elves-wood/fighter.png~TC(1,magenta)") ("Elvish Fighter") ally_6}
{PICK_RECRUIT_OPTION ("units/elves-wood/scout.png~TC(1,magenta)") ("Elvish Scout") ally_7}
{PICK_RECRUIT_OPTION ("units/elves-wood/shaman.png~TC(1,magenta)") ("Elvish Shaman") ally_8}
#textdomain wesnoth-units
{PICK_RECRUIT_OPTION ("units/elves-wood/archer.png~TC($side_number|,magenta)") "Elvish Archer" _"Elvish Archer" ally_5}
{PICK_RECRUIT_OPTION ("units/elves-wood/fighter.png~TC($side_number|,magenta)") "Elvish Fighter" _"Elvish Fighter" ally_6}
{PICK_RECRUIT_OPTION ("units/elves-wood/scout.png~TC($side_number|,magenta)") "Elvish Scout" _"Elvish Scout" ally_7}
{PICK_RECRUIT_OPTION ("units/elves-wood/shaman.png~TC($side_number|,magenta)") "Elvish Shaman" _"Elvish Shaman" ally_8}
#textdomain wesnoth-anl
[/message]
{VARIABLE_OP player_$side_number|.leader_option_2.progress format 0}
[/then]

View File

@ -35,13 +35,13 @@
message= _ "Which type of unit would you like to be able to recruit?"
#wmllint: display off
#textdomain wesnoth-units
{PICK_RECRUIT_OPTION ("units/human-loyalists/spearman.png~TC(1,magenta)") (_"Spearman") troop_1}
{PICK_RECRUIT_OPTION ("units/human-loyalists/bowman.png~TC(1,magenta)") (_"Bowman") troop_2}
{PICK_RECRUIT_OPTION ("units/human-loyalists/fencer.png~TC(1,magenta)") (_"Fencer") troop_3}
{PICK_RECRUIT_OPTION ("units/human-loyalists/heavyinfantry.png~TC(1,magenta)") (_"Heavy Infantryman") troop_4}
{PICK_RECRUIT_OPTION ("units/human-loyalists/sergeant.png~TC(1,magenta)") (_"Sergeant") troop_5}
{PICK_RECRUIT_OPTION ("units/human-loyalists/cavalryman.png~TC(1,magenta)") (_"Cavalryman") troop_6}
{PICK_RECRUIT_OPTION ("units/human-loyalists/horseman.png~TC(1,magenta)") (_"Horseman") troop_7}
{PICK_RECRUIT_OPTION ("units/human-loyalists/spearman.png~TC($side_number|,magenta)") "Spearman" _"Spearman" troop_1}
{PICK_RECRUIT_OPTION ("units/human-loyalists/bowman.png~TC($side_number|,magenta)") "Bowman" _"Bowman" troop_2}
{PICK_RECRUIT_OPTION ("units/human-loyalists/fencer.png~TC($side_number|,magenta)") "Fencer" _"Fencer" troop_3}
{PICK_RECRUIT_OPTION ("units/human-loyalists/heavyinfantry.png~TC($side_number|,magenta)") "Heavy Infantryman" _"Heavy Infantryman" troop_4}
{PICK_RECRUIT_OPTION ("units/human-loyalists/sergeant.png~TC($side_number|,magenta)") "Sergeant" _"Sergeant" troop_5}
{PICK_RECRUIT_OPTION ("units/human-loyalists/cavalryman.png~TC($side_number|,magenta)") "Cavalryman" _"Cavalryman" troop_6}
{PICK_RECRUIT_OPTION ("units/human-loyalists/horseman.png~TC($side_number|,magenta)") "Horseman" _"Horseman" troop_7}
#textdomain wesnoth-anl
[/message]
{VARIABLE_OP player_$side_number|.warfare.troop_available add -1}

View File

@ -98,9 +98,9 @@
[/set_variables]
#enddef
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE VAR
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE UNIT_TYPE_NAME VAR
[option]
message= {MENU_IMG_TXT {UNIT_IMAGE} _{UNIT_TYPE}}
message="&"+{UNIT_IMAGE}+"="+{UNIT_TYPE_NAME}
[show_if]
{CONDITION player_$side_number|.{VAR} equals no}
[/show_if]