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

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]
[filter]
type=Wolf,Great Wolf,Direwolf
type_adv_tree=Wolf,Great Wolf,Direwolf
[/filter]
[effect]
apply_to=status

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

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

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

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

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

@ -580,7 +580,7 @@
[filter_self]
[filter_adjacent]
count=1
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -592,7 +592,7 @@
[filter_self]
[filter_adjacent]
count=2
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -604,7 +604,7 @@
[filter_self]
[filter_adjacent]
count=3
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -616,7 +616,7 @@
[filter_self]
[filter_adjacent]
count=4
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -628,7 +628,7 @@
[filter_self]
[filter_adjacent]
count=5
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -640,7 +640,7 @@
[filter_self]
[filter_adjacent]
count=6
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
is_enemy=no
[/filter_adjacent]
[/filter_self]
@ -657,7 +657,7 @@
[/filter_attack]
[store_unit]
[filter]
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
[filter_adjacent]
x,y=$x1,$y1
is_enemy=no
@ -763,7 +763,7 @@
[affect_adjacent]
adjacent=n,ne,se,s,sw,nw
[filter]
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
[/filter]
[/affect_adjacent]
[/heals]
@ -779,7 +779,7 @@
[affect_adjacent]
adjacent=n,ne,se,s,sw,nw
[filter]
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
[/filter]
[/affect_adjacent]
[/resistance]
@ -798,7 +798,7 @@
[affect_adjacent]
adjacent=n,ne,se,s,sw,nw
[filter]
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
[/filter]
[/affect_adjacent]
[/leadership]
@ -811,7 +811,7 @@
[affect_adjacent]
adjacent=n,ne,se,s,sw,nw
[filter]
type=Walking Corpse,Soulless
type_adv_tree=Walking Corpse
[/filter]
[/affect_adjacent]
[/berserk]
@ -829,7 +829,7 @@
[filter]
[filter_adjacent]
count=1
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -841,7 +841,7 @@
[filter]
[filter_adjacent]
count=2
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -853,7 +853,7 @@
[filter]
[filter_adjacent]
count=3
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -865,7 +865,7 @@
[filter]
[filter_adjacent]
count=4
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -877,7 +877,7 @@
[filter]
[filter_adjacent]
count=5
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -889,7 +889,7 @@
[filter]
[filter_adjacent]
count=6
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -914,7 +914,7 @@
[filter]
[filter_adjacent]
count=1
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -926,7 +926,7 @@
[filter]
[filter_adjacent]
count=2
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -938,7 +938,7 @@
[filter]
[filter_adjacent]
count=3
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -950,7 +950,7 @@
[filter]
[filter_adjacent]
count=4
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -962,7 +962,7 @@
[filter]
[filter_adjacent]
count=5
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/filter]
@ -974,7 +974,7 @@
[filter]
[filter_adjacent]
count=6
type=Ghoul,Necrophage,Ghast
type_adv_tree=Ghoul
is_enemy=no
[/filter_adjacent]
[/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}
(
[not]
type=White Mage,Mage of Light,Paladin
type_adv_tree=White Mage,Paladin
[not]
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."
cannot_use_message= _ "Only the leader of an army can wield this sword!"
[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}
[/filter]
[then]
@ -217,7 +217,7 @@
[filter]
side=1
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]
[then]
[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!"
cannot_use_message= _ "This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!"
[filter]
type=Princess,Battle Princess,Fighter,Commander,Lord
type_adv_tree=Fighter,Princess
x,y=$x1,$y1
[/filter]
[effect]
@ -642,7 +642,7 @@ fire: +10%"
# everyone on lava dies
[kill]
[not]
type=Elvish Shyde,Elvish Sylph,Gryphon Rider,Gryphon Master
type_adv_tree=Elvish Shyde,Elvish Sylph,Gryphon Rider
[/not]
[filter_location]
terrain=Ql

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

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

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

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

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

@ -81,7 +81,7 @@
{FILTER_LOYALS}
[/not]
[not]
type={ELVES_NON_STEEL}
type_adv_tree={ELVES_NON_STEEL}
[/not]
[/filter]
[/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
placement=map,leader
[filter_recall]
type={ELVES_STEEL}
type_adv_tree={ELVES_STEEL}
[/filter_recall]
[modifications]
{TRAIT_QUICK}
@ -83,7 +83,7 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
placement=map,leader
[filter_recall]
type={ELVES_STEEL}
type_adv_tree={ELVES_STEEL}
[/filter_recall]
[modifications]
{TRAIT_DEXTROUS}
@ -110,7 +110,7 @@
unrenamable=yes
placement=map,leader
[filter_recall]
type={ELVES_NON_STEEL}
type_adv_tree={ELVES_NON_STEEL}
[/filter_recall]
[abilities]
#ifndef MULTIPLAYER

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

@ -63,13 +63,13 @@
#enddef
#define ELVES_SCOUTS
Elvish Scout, Elvish Rider, Elvish Outrider#enddef
Elvish Scout#enddef
#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
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
{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
[filter]
id=Shynal
type=SotA Lich, SotA Ancient Lich, Lich, Ancient Lich
type_adv_tree=SotA Lich, Lich, Ancient Lich
[/filter]
[if]
[have_unit]

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

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