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

Rename type_tree to type_adv_tree in SUF

Browse source 
This matches the usage in the [hide_help] tag.
This commit is contained in:
Celtic Minstrel 2017-01-19 22:55:06 -05:00
parent 356665a81f
commit 1e9454b6f9
11 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
View file

@ -580,7 +580,7 @@
[if]
[have_unit]
x,y=$x2,$y2
type_tree=Merman Child King,Cuttle Fish,Vampire Bat
type_adv_tree=Merman Child King,Cuttle Fish,Vampire Bat
[/have_unit]
[then]
{VARIABLE staff_tip_off Cylanna}
@ -593,7 +593,7 @@
[if]
[have_unit]
x,y=$x2,$y2
type_tree=Cuttle Fish,Vampire Bat
type_adv_tree=Cuttle Fish,Vampire Bat
[/have_unit]
[then]
[message]

2
data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
View file

@ -144,7 +144,7 @@
[event]
name=attack
[filter]
type_tree=Bowman
type_adv_tree=Bowman
[/filter]
[message]
speaker=unit

6
data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
View file

@ -178,7 +178,7 @@
[event]
name=attack
[filter]
type_tree=Orcish Assassin
type_adv_tree=Orcish Assassin
[/filter]
[filter_second]
side=1
@ -196,7 +196,7 @@
[event]
name=die
[filter]
type_tree=Orcish Assassin
type_adv_tree=Orcish Assassin
[/filter]
[filter_second]
side=1
@ -220,7 +220,7 @@
[/not]
[/filter]
[filter_second]
type_tree=Orcish Assassin
type_adv_tree=Orcish Assassin
[/filter_second]
[message]
speaker=Leollyn

4
data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
View file

@ -148,10 +148,10 @@
[event]
name=attack
[filter]
type_tree=Heavy Infantryman
type_adv_tree=Heavy Infantryman
[/filter]
[filter_second]
type_tree=Skeleton,Skeleton Archer
type_adv_tree=Skeleton,Skeleton Archer
[/filter_second]
[message]
speaker=unit

4
data/campaigns/Delfadors_Memoirs/utils/generators.cfg
View file

@ -38,7 +38,7 @@
[filter]
side=1
x,y={X},{Y}
type_tree=Mage,Journeyman Mage,Paladin
type_adv_tree=Mage,Journeyman Mage,Paladin
[/filter]
[message]
@ -73,7 +73,7 @@
x,y={X},{Y}
side=1
[not]
type_tree=Mage,Journeyman Mage,Paladin
type_adv_tree=Mage,Journeyman Mage,Paladin
[/not]
[/filter]

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

@ -174,7 +174,7 @@
action=add
[filter]
type_tree=Fencer
type_adv_tree=Fencer
role=target_Konrad
[/filter]
[filter_second]
@ -194,7 +194,7 @@
action=add
[filter]
type_tree=Fencer
type_adv_tree=Fencer
role=target_Delfador
[/filter]
[filter_second]
@ -256,7 +256,7 @@
[store_unit]
[filter]
side=2
type_tree=Fencer
type_adv_tree=Fencer
[/filter]
kill=no

2
data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
View file

@ -621,7 +621,7 @@
[filter]
x,y=1,1
[not] # Elvish Rangers already know this
type_tree=Elvish Ranger
type_adv_tree=Elvish Ranger
[/not]
[/filter]
[then]

6
data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
View file

@ -6,7 +6,7 @@
first_time_only=no
[filter]
side=1
type_tree=Mage
type_adv_tree=Mage
[not]
id=Ratheln
[/not]
@ -24,7 +24,7 @@
[have_unit]
search_recall_list=yes
side=1
type_tree=Mage
type_adv_tree=Mage
[not]
id=Ratheln
[/not]
@ -85,7 +85,7 @@
cannot_use_message= _ "Only a mage may wield this Staff."
[filter]
side=1
type_tree=Mage
type_adv_tree=Mage
x,y=$x1,$y1
[/filter]

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

@ -1712,7 +1712,7 @@
[/message]
#TODO: add better role-based speaker selection
[message]
type_tree=Quenoth Mystic
type_adv_tree=Quenoth Mystic
[not]
id=Zhul
[/not]
@ -1720,7 +1720,7 @@
message= _ "The Goddess!"
[/message]
[message]
type_tree=Quenoth Fighter
type_adv_tree=Quenoth Fighter
side=1
message= _ "Forgive me my sins!"
[/message]
@ -1737,7 +1737,7 @@
message= _ "I come to you with dire news: one of you has betrayed me, and is a traitor to your cause."
[/message]
[message]
type_tree=Quenoth Mystic
type_adv_tree=Quenoth Mystic
[not]
id=Zhul
[/not]
@ -1745,12 +1745,12 @@
message= _ "What?"
[/message]
[message]
type_tree=Quenoth Scout
type_adv_tree=Quenoth Scout
side=1
message= _ "No!"
[/message]
[message]
type_tree=Tauroch Rider
type_adv_tree=Tauroch Rider
side=1
message= _ "Who?"
[/message]
@ -1781,7 +1781,7 @@
message= _ "Wait, my people, do not be deceived. This thing that appears by Tanstafaal’s side is not our god. I too was fooled at first, but I have come to realize by her actions that she is an impostor. When she appeared to me the night before Garak died, she told me to kill all that lived under the mountains, even the dwarves who ended up helping us. Likewise when we escaped from the caves, she appeared to me again, and told me to bow down to the humans, else she would destroy me. Never has Eloh threatened one of us or dictated our actions."
[/message]
[message]
type_tree=Quenoth Fighter,Quenoth Scout
type_adv_tree=Quenoth Fighter,Quenoth Scout
side=1
message= _ "Why should we trust you? We have not heard Eloh’s words directly. Only now that you have led us into this folly has Eloh appeared to us."
[/message]
@ -1796,7 +1796,7 @@
message= _ "Wait, my people, do not be deceived. This thing that appears by Tanstafaal’s side is not our god. I too was fooled at first, but I have come to realize by her actions that she is an impostor. When she appeared to me the night before Garak died, she told me to kill all that lived under the mountains, even the trolls who ended up helping us. Likewise when we escaped from the caves, she appeared to me again, and told me to bow down to the humans, else she would destroy me. Never has Eloh threatened one of us or dictated our actions."
[/message]
[message]
type_tree=Quenoth Fighter,Quenoth Scout
type_adv_tree=Quenoth Fighter,Quenoth Scout
side=1
message= _ "Why should we trust you? We have not heard these words directly. Only now that you have led us into this folly has she appeared to us."
[/message]

2
data/tools/wmllint
View file

@ -1013,7 +1013,7 @@ def is_translatable(key):
"defeat_string", "gold_carryover_string", "notes_string", "text", "title",
"title2", "tooltip", "translator_comment", "user_team_name"
)
return key in translatables or (key.startswith(("type_", "range_")) and key != "type_tree")
return key in translatables or (key.startswith(("type_", "range_")) and key != "type_adv_tree")
# This is a list of mainline campaigns, used to convert UMC from
# "data/campaigns" to "data/add-ons" while not clobbering mainline.

4
src/units/filter.cpp
View file

@ -320,9 +320,9 @@ bool basic_unit_filter_impl::internal_matches_filter(const unit & u, const map_l
}
// Shorthand for all advancements of a given type
if (!vcfg["type_tree"].empty()) {
if (!vcfg["type_adv_tree"].empty()) {
std::set<std::string> types;
for(const std::string type : utils::split(vcfg["type_tree"])) {
for(const std::string type : utils::split(vcfg["type_adv_tree"])) {
if(types.count(type)) {
continue;
}