upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 03:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use type_adv_tree in some filters to support addons adding advancements to existing unit types (#8895)

Browse Source
This commit is contained in:
newfrenchy83 2024-06-05 11:49:33 +02:00 committed by GitHub
parent ebbe03dc6c
commit 9dd2d5d94b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View File

@ -1380,7 +1380,7 @@ All sense of time and being are entombed within darkness. How long has passed si
[modify_unit] [modify_unit]
[filter] [filter]
type=Wolf,Great Wolf,Direwolf type_adv_tree=Wolf,Great Wolf,Direwolf
[/filter] [/filter]
[effect] [effect]
apply_to=status apply_to=status

2
data/campaigns/Descent_Into_Darkness/scenarios/07a_A_Small_Favor.cfg
View File

@ -708,7 +708,7 @@
[filter] [filter]
x,y=9,15 x,y=9,15
side=1 side=1
type=Walking Corpse, Soulless type_adv_tree=Walking Corpse
variation=mounted variation=mounted
[/filter] [/filter]

4
data/campaigns/Descent_Into_Darkness/scenarios/08_Alone_at_Last.cfg
View File

@ -1027,7 +1027,7 @@
x=$bookX x=$bookX
y=$bookY y=$bookY
side=1 side=1
type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Spectral Servant,Phantom,Eidolon type_adv_tree=Ghost,Spectral Servant,Phantom,Eidolon
[/filter] [/filter]
[message] [message]
@ -1043,7 +1043,7 @@
x=$bookX x=$bookX
y=$bookY y=$bookY
side=1 side=1
type=Vampire Bat,Blood Bat,Dread Bat type_adv_tree=Vampire Bat
[/filter] [/filter]
[message] [message]

46
data/campaigns/Descent_Into_Darkness/utils/abilities.cfg
View File

@ -580,7 +580,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=1 count=1
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -592,7 +592,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=2 count=2
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -604,7 +604,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=3 count=3
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -616,7 +616,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=4 count=4
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -628,7 +628,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=5 count=5
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -640,7 +640,7 @@
[filter_self] [filter_self]
[filter_adjacent] [filter_adjacent]
count=6 count=6
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter_self] [/filter_self]
@ -657,7 +657,7 @@
[/filter_attack] [/filter_attack]
[store_unit] [store_unit]
[filter] [filter]
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
[filter_adjacent] [filter_adjacent]
x,y=$x1,$y1 x,y=$x1,$y1
is_enemy=no is_enemy=no
@ -763,7 +763,7 @@
[affect_adjacent] [affect_adjacent]
adjacent=n,ne,se,s,sw,nw adjacent=n,ne,se,s,sw,nw
[filter] [filter]
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
[/filter] [/filter]
[/affect_adjacent] [/affect_adjacent]
[/heals] [/heals]
@ -779,7 +779,7 @@
[affect_adjacent] [affect_adjacent]
adjacent=n,ne,se,s,sw,nw adjacent=n,ne,se,s,sw,nw
[filter] [filter]
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
[/filter] [/filter]
[/affect_adjacent] [/affect_adjacent]
[/resistance] [/resistance]
@ -798,7 +798,7 @@
[affect_adjacent] [affect_adjacent]
adjacent=n,ne,se,s,sw,nw adjacent=n,ne,se,s,sw,nw
[filter] [filter]
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
[/filter] [/filter]
[/affect_adjacent] [/affect_adjacent]
[/leadership] [/leadership]
@ -811,7 +811,7 @@
[affect_adjacent] [affect_adjacent]
adjacent=n,ne,se,s,sw,nw adjacent=n,ne,se,s,sw,nw
[filter] [filter]
type=Walking Corpse,Soulless type_adv_tree=Walking Corpse
[/filter] [/filter]
[/affect_adjacent] [/affect_adjacent]
[/berserk] [/berserk]
@ -829,7 +829,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=1 count=1
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -841,7 +841,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=2 count=2
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -853,7 +853,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=3 count=3
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -865,7 +865,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=4 count=4
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -877,7 +877,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=5 count=5
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -889,7 +889,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=6 count=6
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -914,7 +914,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=1 count=1
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -926,7 +926,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=2 count=2
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -938,7 +938,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=3 count=3
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -950,7 +950,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=4 count=4
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -962,7 +962,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=5 count=5
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
@ -974,7 +974,7 @@
[filter] [filter]
[filter_adjacent] [filter_adjacent]
count=6 count=6
type=Ghoul,Necrophage,Ghast type_adv_tree=Ghoul
is_enemy=no is_enemy=no
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]

2
data/campaigns/Eastern_Invasion/utils/items.cfg
View File

@ -761,7 +761,7 @@ plague_staff #enddef
{ID_PLAGUE_STAFF} _"staff" items/plague-staff.png {X} {Y} {ID_PLAGUE_STAFF} _"staff" items/plague-staff.png {X} {Y}
( (
[not] [not]
type=White Mage,Mage of Light,Paladin type_adv_tree=White Mage,Paladin
[not] [not]
id=Dacyn id=Dacyn

8
data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
View File

@ -130,7 +130,7 @@
description= _ "This massive blade was created centuries ago by long-forgotten elvish forgemasters, who imbued the bluish steel with an inner magical fire. Tongues of flame dance on the surface, giving the metal a flawless mirrored finish." description= _ "This massive blade was created centuries ago by long-forgotten elvish forgemasters, who imbued the bluish steel with an inner magical fire. Tongues of flame dance on the surface, giving the metal a flawless mirrored finish."
cannot_use_message= _ "Only the leader of an army can wield this sword!" cannot_use_message= _ "Only the leader of an army can wield this sword!"
[filter] [filter]
type=Fighter,Commander,Lord,Princess,Battle Princess,Elvish Captain,Elvish Hero,Elvish Marshal,Elvish Champion,Paladin,Elvish Lord,Elvish High Lord type_adv_tree=Fighter,Princess,Elvish Captain,Elvish Hero,Paladin,Elvish Lord
x,y={X},{Y} x,y={X},{Y}
[/filter] [/filter]
[then] [then]
@ -217,7 +217,7 @@
[filter] [filter]
side=1 side=1
x,y={X},{Y} x,y={X},{Y}
type=Fighter,Commander,Lord,Princess,Battle Princess,Elvish Lord,Elvish High Lord,Elvish Fighter,Elvish Captain,Elvish Hero,Elvish Marshal,Elvish Champion,Elvish Ranger,Elvish Avenger,Horseman,Knight,Lancer,Paladin,Grand Knight,Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Lord,Dwarvish Guardsman,Dwarvish Stalwart,Dwarvish Sentinel type_adv_tree=Fighter,Princess,Elvish Fighter,Elvish Lord,Elvish Ranger,Horseman,Dwarvish Fighter,Dwarvish Guardsman
[/filter] [/filter]
[then] [then]
[remove_item] [remove_item]
@ -351,7 +351,7 @@ fire: +10%"
description= _ "This ancient Sceptre was forged by the great Dwarves of the Heart Mountains. A symbol of the kingship of Wesnoth, the Sceptre has the power to shoot fireballs at enemies of the bearer!" description= _ "This ancient Sceptre was forged by the great Dwarves of the Heart Mountains. A symbol of the kingship of Wesnoth, the Sceptre has the power to shoot fireballs at enemies of the bearer!"
cannot_use_message= _ "This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!" cannot_use_message= _ "This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!"
[filter] [filter]
type=Princess,Battle Princess,Fighter,Commander,Lord type_adv_tree=Fighter,Princess
x,y=$x1,$y1 x,y=$x1,$y1
[/filter] [/filter]
[effect] [effect]
@ -642,7 +642,7 @@ fire: +10%"
# everyone on lava dies # everyone on lava dies
[kill] [kill]
[not] [not]
type=Elvish Shyde,Elvish Sylph,Gryphon Rider,Gryphon Master type_adv_tree=Elvish Shyde,Elvish Sylph,Gryphon Rider
[/not] [/not]
[filter_location] [filter_location]
terrain=Ql terrain=Ql

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
View File

@ -244,7 +244,7 @@ Chapter Three"
kill=yes kill=yes
[filter] [filter]
side={SIDE} side={SIDE}
type=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter type_adv_tree=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter
[not] [not]
id=Kalenz id=Kalenz
[/not] [/not]

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
View File

@ -109,7 +109,7 @@
kill=yes kill=yes
[filter] [filter]
side={SIDE} side={SIDE}
type=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter type_adv_tree=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter
[not] [not]
id=Kalenz id=Kalenz
[/not] [/not]

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
View File

@ -81,7 +81,7 @@
{FILTER_LOYALS} {FILTER_LOYALS}
[/not] [/not]
[not] [not]
type={ELVES_NON_STEEL} type_adv_tree={ELVES_NON_STEEL}
[/not] [/not]
[/filter] [/filter]
[/store_unit] [/store_unit]

6
data/campaigns/Legend_of_Wesmere/utils/characters.cfg
View File

@ -31,7 +31,7 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
placement=map,leader placement=map,leader
[filter_recall] [filter_recall]
type={ELVES_STEEL} type_adv_tree={ELVES_STEEL}
[/filter_recall] [/filter_recall]
[modifications] [modifications]
{TRAIT_QUICK} {TRAIT_QUICK}
@ -83,7 +83,7 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
placement=map,leader placement=map,leader
[filter_recall] [filter_recall]
type={ELVES_STEEL} type_adv_tree={ELVES_STEEL}
[/filter_recall] [/filter_recall]
[modifications] [modifications]
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
@ -110,7 +110,7 @@
unrenamable=yes unrenamable=yes
placement=map,leader placement=map,leader
[filter_recall] [filter_recall]
type={ELVES_NON_STEEL} type_adv_tree={ELVES_NON_STEEL}
[/filter_recall] [/filter_recall]
[abilities] [abilities]
#ifndef MULTIPLAYER #ifndef MULTIPLAYER

6
data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
View File

@ -63,13 +63,13 @@
#enddef #enddef
#define ELVES_SCOUTS #define ELVES_SCOUTS
Elvish Scout, Elvish Rider, Elvish Outrider#enddef Elvish Scout#enddef
#define ELVES_STEEL #define ELVES_STEEL
Elvish Fighter, Elvish Hero, Elvish Captain, Elvish Marshal, Elvish Champion, Elvish Archer, Elvish Marksman, Elvish Sharpshooter, Elvish Ranger, Elvish Avenger, {ELVES_SCOUTS}#enddef Elvish Fighter, Elvish Archer, {ELVES_SCOUTS}#enddef
#define ELVES_NON_STEEL #define ELVES_NON_STEEL
Elvish Shaman, Elvish Shyde, Elvish Enchantress, Elvish Sorceress, Elvish Sylph, Elvish Druid, Wose, Elder Wose, Ancient Wose, {ELVES_SCOUTS}#enddef Elvish Shaman, Wose, {ELVES_SCOUTS}#enddef
#define NORTH_ELVES_VILLAGES #define NORTH_ELVES_VILLAGES
{STARTING_VILLAGES_AREA 2 24 7 12} {STARTING_VILLAGES_AREA 2 24 7 12}

2
data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
View File

@ -239,7 +239,7 @@
name=die name=die
[filter] [filter]
id=Shynal id=Shynal
type=SotA Lich, SotA Ancient Lich, Lich, Ancient Lich type_adv_tree=SotA Lich, Lich, Ancient Lich
[/filter] [/filter]
[if] [if]
[have_unit] [have_unit]

2
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View File

@ -799,7 +799,7 @@
[filter] [filter]
side=1,3,4 side=1,3,4
[not] [not]
type=Quenoth Sun Sylph,Quenoth Shyde,Dust Devil type_adv_tree=Quenoth Sun Sylph,Quenoth Shyde,Dust Devil
[/not] [/not]
[filter_location] [filter_location]
terrain=*^Yl terrain=*^Yl