upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 10:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify filters with multiple ids is UtBS:3

Browse Source
This commit is contained in:
Alarantalara 2013-11-09 10:13:01 -05:00
parent 32e3b82327
commit 63ec880f08
1 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View File

@ -747,10 +747,7 @@
description= _ "Whether used offensively or defensively, this attack presses the engagement until one of the combatants is slain, or 30 rounds of attacks have occurred." description= _ "Whether used offensively or defensively, this attack presses the engagement until one of the combatants is slain, or 30 rounds of attacks have occurred."
value=30 value=30
[filter_opponent] [filter_opponent]
id=Zur id=Grak,Zur
[or]
id=Grak
[/or]
[/filter_opponent] [/filter_opponent]
[/berserk] [/berserk]
#ifndef HARD #ifndef HARD
@ -762,10 +759,7 @@
value=70 value=70
cumulative=no cumulative=no
[filter_opponent] [filter_opponent]
id=Zur id=Grak,Zur
[or]
id=Grak
[/or]
[/filter_opponent] [/filter_opponent]
[/chance_to_hit] [/chance_to_hit]
[firststrike] [firststrike]
@ -774,10 +768,7 @@
name_inactive="" name_inactive=""
description= _ "This unit always strikes first with this attack, even if they are defending." description= _ "This unit always strikes first with this attack, even if they are defending."
[filter_opponent] [filter_opponent]
id=Zur id=Grak,Zur
[or]
id=Grak
[/or]
[/filter_opponent] [/filter_opponent]
[/firststrike] [/firststrike]
#endif #endif
@ -800,22 +791,10 @@
name=attack name=attack
first_time_only=no first_time_only=no
[filter] [filter]
id=Garak id=Garak,Grak,Zur
[or]
id=Grak
[/or]
[or]
id=Zur
[/or]
[/filter] [/filter]
[filter_second] [filter_second]
id=Garak id=Garak,Grak,Zur
[or]
id=Grak
[/or]
[or]
id=Zur
[/or]
[/filter_second] [/filter_second]
# Identify who was challenged # Identify who was challenged
@ -945,10 +924,7 @@
id=Garak id=Garak
[/filter] [/filter]
[filter_second] [filter_second]
id=Zur id=Grak,Zur
[or]
id=Grak
[/or]
[/filter_second] [/filter_second]
[message] [message]
speaker=$second_unit.id speaker=$second_unit.id
@ -963,10 +939,7 @@
[/filter] [/filter]
[filter_second] [filter_second]
[not] [not]
id=Grak id=Grak,Zur
[/not]
[not]
id=Zur
[/not] [/not]
[/filter_second] [/filter_second]
[message] [message]
@ -1962,10 +1935,7 @@
name=last breath name=last breath
first_time_only=no first_time_only=no
[filter] [filter]
id=Azkotep id=Azkotep,Ystara
[or]
id=Ystara
[/or]
[/filter] [/filter]
[if] [if]
[variable] [variable]