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

Fixed deprecated code in ANL

Browse source
This commit is contained in:
Robert Wallace 2016-02-12 23:45:09 -05:00 • committed by Celtic Minstrel
parent 708af56409
commit afd53cf6a1
4 changed files with 87 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg
View file

@ -71,7 +71,8 @@
#define SHARE_FARMING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "items/flower4.png" $diplo_msg[{TARGET_SIDE}].farming}
image = "items/flower4.png"
message = $diplo_msg[{TARGET_SIDE}].farming
[show_if]
[variable]
name=player_$side_number|.farming.target
@ -109,7 +110,8 @@
#define SHARE_MINING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" $diplo_msg[{TARGET_SIDE}].mining}
image = "items/gold-coins-small.png"
message = $diplo_msg[{TARGET_SIDE}].mining
[show_if]
[variable]
name=player_$side_number|.mining.target
@ -147,7 +149,8 @@
#define SHARE_WARFARE_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "wesnoth-icon.png" $diplo_msg[{TARGET_SIDE}].warfare}
image = "wesnoth-icon.png"
message = $diplo_msg[{TARGET_SIDE}].warfare
[show_if]
[variable]
name=player_$side_number|.warfare.target
@ -307,8 +310,9 @@ Share knowledge of warfare"
# Giving Money
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ( _ "<span color='green'>Donate Funds</span>
Give 20 gold to another player")}
image = "items/gold-coins-small.png"
message = _ "<span color='green'>Donate Funds</span>
Give 20 gold to another player"
[command]
[set_variable]
name=finished_suboptions
@ -351,8 +355,9 @@ Give 20 gold to another player")}
# Sharing Knowledge
[option]
message= {MENU_IMG_TXT "items/book4.png" ( _ "<span color='green'>Share Knowledge</span>
Help an ally with their research")}
image = "items/book4.png"
message = _ "<span color='green'>Share Knowledge</span>
Help an ally with their research"
[command]
[set_variable]
name=finished_suboptions
@ -369,7 +374,7 @@ Help an ally with their research")}
[message]
caption= _ "Diplomatic Options"
speaker=unit
image=items/book4.png
image= "items/book4.png"
message= _ "Who will you share knowledge with?"
[option]
@ -408,9 +413,10 @@ Help an ally with their research")}
# Dwarves
[option]
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" ( _ "<span color='green'>Negotiate with the Dwarves</span>
image = "units/dwarves/lord.png~TC(1,magenta)"
message = _ "<span color='green'>Negotiate with the Dwarves</span>
Lets you recruit a Dwarvish unit
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target")}
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target"
[show_if]
[variable]
name=player_$side_number|.ally_1
@ -463,9 +469,10 @@ Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$s
# Elves
[option]
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" ( _ "<span color='green'>Negotiate with the Elves</span>
image = "units/elves-wood/marshal.png~TC(1,magenta)"
message = _ "<span color='green'>Negotiate with the Elves</span>
Lets you recruit an Elvish unit
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target")}
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target"
[show_if]
[variable]
name=player_$side_number|.ally_5

15
data/multiplayer/scenarios/ANL_utils/ANL_research_options.cfg
View file

@ -154,9 +154,10 @@ Our mines produce $player_$side_number|.mining.gold|g
# Farming
[option]
message= {MENU_IMG_TXT "items/flower4.png" ( _ "<span color='green'>Agriculture</span>
image = "items/flower4.png"
message = _ "<span color='green'>Agriculture</span>
Farmers produce +1 gold
Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.farming.target")}
Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.farming.target"
[command]
{TARGET_RESEARCH_COMMAND agriculture ( _ "agriculture")}
[/command]
@ -165,9 +166,10 @@ Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.fa
# Mining
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ( _ "<span color='green'>Mining</span>
image = "items/gold-coins-small.png"
message = _ "<span color='green'>Mining</span>
Miners produce +1 gold
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target")}
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target"
[command]
{TARGET_RESEARCH_COMMAND mining ( _ "mining")}
[/command]
@ -176,9 +178,10 @@ Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.min
#Warfare
[option]
message= {MENU_IMG_TXT "wesnoth-icon.png" ( _ "<span color='green'>Warfare</span>
image = "wesnoth-icon.png"
message = _ "<span color='green'>Warfare</span>
Allows you to recruit a new type of unit
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target")}
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target"
[show_if]
[variable]
name=player_$side_number|.troops

3
data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg
View file

@ -127,7 +127,8 @@
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE_STRING UNIT_TYPE_NAME_STRING VAR
[option]
message={MENU_IMG_TXT {UNIT_IMAGE} {UNIT_TYPE_NAME_STRING}}
image = {UNIT_IMAGE}
message = {UNIT_TYPE_NAME_STRING}
[show_if]
[variable]
name=player_$side_number|.{VAR}

76
data/multiplayer/scenarios/ANL_utils/ANL_worker_options.cfg
View file

@ -62,7 +62,9 @@ message= _ "Nothing"
# Convert to grassland
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Convert to Grassland" + "</span>") ("<span size='small'>" + _ "Cost: 0g" + "</span>")}
image = "terrain/grass/green6.png"
message= "<span color='green'>" + _ "Plant Farm" + "</span>"
description = "<span size='small'>" + _ "Cost: 0g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Re"}
[command]
{COMPLETE_ACTION 0}
@ -79,7 +81,9 @@ message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "
# Plant Farm
[option]
message= {MENU_IMG_TXT2 "terrain/embellishments/farm-veg-spring-icon.png" ("<span color='green'>" + _ "Plant Farm" + "</span>") ("<span size='small'>" + _ "Cost: 0g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Plant Farm" + "</span>"
description = "<span size='small'>" + _ "Cost: 0g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg,Gs"}
[command]
{COMPLETE_ACTION 0}
@ -93,7 +97,9 @@ message= {MENU_IMG_TXT2 "terrain/embellishments/farm-veg-spring-icon.png" ("<spa
# Build Village
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-tile.png" ("<span color='green'>" + _ "Build Village" + "</span>") ("<span size='small'>" + _ "Cost: 15g" + "</span>")}
image = "terrain/village/human-tile.png"
message = "<span color='green'>" + _ "Build Village" + "</span>"
description = "<span size='small'>" + _ "Cost: 15g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg,Gs"}
[command]
[if]
@ -115,7 +121,9 @@ message= {MENU_IMG_TXT2 "terrain/village/human-tile.png" ("<span color='green'>"
# Build Castle
[option]
message= {MENU_IMG_TXT2 "terrain/castle/castle-tile.png" ("<span color='green'>" + _ "Build Castle" + "</span>") ("<span size='small'>" + _ "Cost: 6g" + "</span>")}
image = "terrain/castle/castle-tile.png"
message = "<span color='green'>" + _ "Build Castle" + "</span>"
description = "<span size='small'>" + _ "Cost: 6g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg,Gs"}
[command]
[if]
@ -136,7 +144,9 @@ message= {MENU_IMG_TXT2 "terrain/castle/castle-tile.png" ("<span color='green'>"
# Flood
[option]
message= {MENU_IMG_TXT2 "terrain/water/coast-tile.png" ("<span color='green'>" + _ "Flood the Field" + "</span>") ("<span size='small'>" + _ "Cost: 4g" + "</span>")}
image = "terrain/water/coast-tile.png"
message = "<span color='green'>" + _ "Flood the Field" + "</span>"
description = "<span size='small'>" + _ "Cost: 4g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg,Gs"}
[command]
[if]
@ -159,7 +169,9 @@ message= {MENU_IMG_TXT2 "terrain/water/coast-tile.png" ("<span color='green'>" +
# Plant Saplings
[option]
message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("<span color='green'>" + _ "Plant Saplings" + "</span>") ("<span size='small'>" + _ "Cost: 1g" + "</span>")}
image = "terrain/forest/pine-tile.png"
message = "<span color='green'>" + _ "Plant Saplings" + "</span>"
description = "<span size='small'>" + _ "Cost: 1g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg,Gs"}
[command]
[if]
@ -185,7 +197,9 @@ message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("<span color='green'>" +
# Chop Down Forest
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Chop Down Forest" + "</span>") ("<span size='small'>" + _ "Earns: 1g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Chop Down Forest" + "</span>"
description = "<span size='small'>" + _ "Earns: 1g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gs^Fp,Gs^Ft,Aa^Fpa,Gg^Fet"}
[command]
[set_variable]
@ -240,7 +254,9 @@ message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "
# Build Gold Mine
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-hills-tile.png" ("<span color='green'>" + _ "Build Mine" + "</span>") ("<span size='small'>" + _ "Cost: 25g" + "</span>")}
image = "terrain/village/human-hills-tile.png"
message = "<span color='green'>" + _ "Build Mine" + "</span>"
description = "<span size='small'>" + _ "Cost: 25g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Hh"}
[command]
[if]
@ -265,7 +281,9 @@ message= {MENU_IMG_TXT2 "terrain/village/human-hills-tile.png" ("<span color='gr
# Build Gold Mine
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("<span color='green'>" + _ "Build Mine" + "</span>") ("<span size='small'>" + _ "Cost: 25g" + "</span>")}
image = "terrain/village/human-mountain-tile.png"
message = "<span color='green'>" + _ "Build Mine" + "</span>"
description = "<span size='small'>" + _ "Cost: 25g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Mm"}
[command]
[if]
@ -290,7 +308,9 @@ message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("<span color=
# Make a Ford
[option]
message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("<span color='green'>" + _ "Make a Ford" + "</span>") ("<span size='small'>" + _ "Cost: 3g" + "</span>")}
image = "terrain/water/ford.png"
message = "<span color='green'>" + _ "Make a Ford" + "</span>"
description = "<span size='small'>" + _ "Cost: 3g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Ww"}
[command]
[if]
@ -316,7 +336,9 @@ message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("<span color='green'>" + _ "Ma
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Landfill" + "</span>") ("<span size='small'>" + _ "Cost: 5g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Landfill" + "</span>"
description = "<span size='small'>" + _ "Cost: 5g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Ww"}
[command]
[if]
@ -345,7 +367,9 @@ message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "
# Destroy the Ford
[option]
message= {MENU_IMG_TXT2 "terrain/water/coast-tile.png" ("<span color='green'>" + _ "Destroy the Ford" + "</span>") ("<span size='small'>" + _ "Cost: 0g" + "</span>")}
image = "terrain/water/coast-tile.png"
message = "<span color='green'>" + _ "Destroy the Ford" + "</span>"
description = "<span size='small'>" + _ "Cost: 0g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Wwf"}
[command]
{COMPLETE_ACTION 0}
@ -368,7 +392,9 @@ message= {MENU_IMG_TXT2 "terrain/water/coast-tile.png" ("<span color='green'>" +
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Landfill" + "</span>") ("<span size='small'>" + _ "Cost: 1g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Landfill" + "</span>"
description = "<span size='small'>" + _ "Cost: 1g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Wwf"}
[command]
[if]
@ -397,7 +423,9 @@ message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "
# Break Up Cave
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Smash Cave Floor" + "</span>") ("<span size='small'>" + _ "Cost: 2g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Smash Cave Floor" + "</span>"
description = "<span size='small'>" + _ "Cost: 2g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Uu,Uu^Ii"}
[command]
[if]
@ -420,7 +448,9 @@ message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "
# Convert Cave To Hills
[option]
message= {MENU_IMG_TXT2 "terrain/hills/regular2.png" ("<span color='green'>" + _ "Smash Cave Floor" + "</span>") ("<span size='small'>" + _ "Cost: 3g" + "</span>")}
image = "terrain/hills/regular2.png"
message = "<span color='green'>" + _ "Smash Cave Floor" + "</span>"
description = "<span size='small'>" + _ "Cost: 3g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Uh,Uh^Ii"}
[command]
[if]
@ -443,7 +473,9 @@ message= {MENU_IMG_TXT2 "terrain/hills/regular2.png" ("<span color='green'>" + _
# Harvest Cave Mushrooms
[option]
message= {MENU_IMG_TXT2 "terrain/cave/floor.png" ("<span color='green'>" + _ "Harvest Mushrooms" + "</span>") ("<span size='small'>" + _ "Earns: 3g" + "</span>")}
image = "terrain/cave/floor.png"
message = "<span color='green'>" + _ "Harvest Mushrooms" + "</span>"
description = "<span size='small'>" + _ "Earns: 3g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Uu^Uf"}
[command]
[set_variable]
@ -491,7 +523,9 @@ message= {MENU_IMG_TXT2 "terrain/cave/floor.png" ("<span color='green'>" + _ "Ha
# Build Keep
[option]
message= {MENU_IMG_TXT2 "terrain/castle/keep-tile.png" ("<span color='green'>" + _ "Build a Keep" + "</span>") ("<span size='small'>" + _ "Cost: 6g" + "</span>")}
image = "terrain/castle/keep-tile.png"
message = "<span color='green'>" + _ "Build a Keep" + "</span>"
description = "<span size='small'>" + _ "Cost: 6g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Ch,Ce,Cv,Cud,Chr,Chw,Chs"}
[command]
[if]
@ -515,7 +549,9 @@ message= {MENU_IMG_TXT2 "terrain/castle/keep-tile.png" ("<span color='green'>" +
# Establish University
[option]
message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("<span color='green'>" + _ "Establish University" + "</span>") ("<span size='small'>" + _ "Cost: 7g" + "</span>")}
image = "terrain/village/elven-tile.png"
message = "<span color='green'>" + _ "Establish University" + "</span>"
description = "<span size='small'>" + _ "Cost: 7g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Gg^Vh,Aa^Vha"}
[command]
[if]
@ -540,7 +576,9 @@ message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("<span color='green'>"
# Clear Rubble
[option]
message= {MENU_IMG_TXT2 "terrain/grass/green6.png" ("<span color='green'>" + _ "Clear the Ground" + "</span>") ("<span size='small'>" + _ "Cost: 0g" + "</span>")}
image = "terrain/grass/green6.png"
message = "<span color='green'>" + _ "Clear the Ground" + "</span>"
description = "<span size='small'>" + _ "Cost: 0g" + "</span>"
{ANL_SHOW_IF ("Peasant") "Rd"}
[command]
{COMPLETE_ACTION (-0)}