UtBS Balance (#8269)

This commit is contained in:
Hejnewar 2024-01-21 01:15:14 +01:00 committed by GitHub
parent ebab1ad8fd
commit b3ec3f4d0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 165 additions and 114 deletions

View file

@ -1107,8 +1107,8 @@
[modify_side] [modify_side]
side=3 side=3
{GOLD 180 240 300} {GOLD 180 300 420}
{INCOME 12 18 24} {INCOME 12 21 30}
[/modify_side] [/modify_side]
[remove_shroud] [remove_shroud]

View file

@ -21,7 +21,7 @@
id=Kaleh id=Kaleh
type=Quenoth Youth type=Quenoth Youth
canrecruit=yes canrecruit=yes
{GOLD 250 200 150} {GOLD 250 215 180}
{INCOME 5 4 3} {INCOME 5 4 3}
controller=human controller=human
shroud=yes shroud=yes

View file

@ -25,7 +25,7 @@
id=Kaleh id=Kaleh
type=Quenoth Youth type=Quenoth Youth
canrecruit=yes canrecruit=yes
{GOLD 240 180 120} {GOLD 240 200 140}
{INCOME 8 6 4} {INCOME 8 6 4}
controller=human controller=human
shroud=yes shroud=yes
@ -1267,8 +1267,8 @@
[filter_side] [filter_side]
side=4,5 side=4,5
[/filter_side] [/filter_side]
{INCOME -2 -3 -4} {INCOME -2 -2 -3}
{GOLD 50 40 30} {GOLD 50 50 40}
[/modify_side] [/modify_side]
#enemies #enemies
@ -1277,7 +1277,7 @@
side=2,3 side=2,3
[/filter_side] [/filter_side]
{INCOME 8 12 16} {INCOME 8 12 16}
{GOLD 100 150 200} {GOLD 100 130 160}
[/modify_side] [/modify_side]
[modify_unit] [modify_unit]
@ -1322,8 +1322,8 @@
[filter_side] [filter_side]
side=2,3 side=2,3
[/filter_side] [/filter_side]
{INCOME -2 -3 -4} {INCOME -2 -2 -3}
{GOLD 50 40 30} {GOLD 50 50 40}
[/modify_side] [/modify_side]
#enemies #enemies
@ -1331,8 +1331,8 @@
[filter_side] [filter_side]
side=4,5 side=4,5
[/filter_side] [/filter_side]
{INCOME 9 13 17} {INCOME 8 12 16}
{GOLD 100 150 200} {GOLD 100 130 160}
[/modify_side] [/modify_side]
[modify_unit] [modify_unit]
@ -1677,13 +1677,13 @@
#west side #west side
[move_unit_fake] [move_unit_fake]
type=Dwarvish Thunderguard type=Dwarvish Thunderer
side=4 side=4
x=26,27,28,29,30,30,30,30 x=26,27,28,29,30,30,30,30
y=18,19,19,19,19,20,21,22 y=18,19,19,19,19,20,21,22
[/move_unit_fake] [/move_unit_fake]
{NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 30 22 (Dwarf Grenadier) ( _ "Dwarf Grenadier")} {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderer) 30 22 (Dwarf Grenadier) ( _ "Dwarf Grenadier")}
[move_unit_fake] [move_unit_fake]
type=Dwarvish Thunderguard type=Dwarvish Thunderguard
@ -1697,13 +1697,13 @@
#ifdef HARD #ifdef HARD
[move_unit_fake] [move_unit_fake]
type=Dwarvish Thunderguard type=Dwarvish Thunderer
side=4 side=4
x=26,27,28,29,30,30,31,32,33,34 x=26,27,28,29,30,30,31,32,33,34
y=18,19,19,19,19,20,21,21,22,22 y=18,19,19,19,19,20,21,21,22,22
[/move_unit_fake] [/move_unit_fake]
{NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 34 22 () ( _ "Dwarf Grenadier")} {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderer) 34 22 () ( _ "Dwarf Grenadier")}
#endif #endif
#east side #east side
@ -1720,13 +1720,13 @@
#ifndef EASY #ifndef EASY
[move_unit_fake] [move_unit_fake]
type=Dwarvish Thunderguard type=Dwarvish Thunderer
side=5 side=5
x=45,44,44,43,43,42,42 x=45,44,44,43,43,42,42
y=18,18,19,20,21,21,22 y=18,18,19,20,21,21,22
[/move_unit_fake] [/move_unit_fake]
{NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 42 22 () ( _ "Dwarf Grenadier")} {NAMED_GENERIC_UNIT 5 (Dwarvish Thunderer) 42 22 () ( _ "Dwarf Grenadier")}
#endif #endif
[message] [message]

View file

@ -61,8 +61,8 @@
id=Kaleh id=Kaleh
type=Quenoth Youth type=Quenoth Youth
canrecruit=yes canrecruit=yes
{GOLD 320 240 160} {GOLD 320 280 240}
{INCOME 8 6 4} {INCOME 8 7 6}
controller=human controller=human
shroud=yes shroud=yes
fog=yes fog=yes
@ -122,8 +122,8 @@
id=Kelur id=Kelur
name= _ "Kelur" name= _ "Kelur"
canrecruit=yes canrecruit=yes
{GOLD 160 240 320} {GOLD 160 220 280}
{INCOME 15 25 35} {INCOME 15 22 28}
controller=ai controller=ai
team_name=eloh_ally team_name=eloh_ally
user_team_name=_"Eloh Cultists" user_team_name=_"Eloh Cultists"
@ -159,8 +159,8 @@
{TRAIT_STRONG} {TRAIT_STRONG}
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
[/modifications] [/modifications]
{GOLD 160 240 320} {GOLD 160 220 280}
{INCOME 15 25 35} {INCOME 15 22 28}
controller=ai controller=ai
team_name=eloh_ally team_name=eloh_ally
user_team_name=_"Eloh Cultists" user_team_name=_"Eloh Cultists"

View file

@ -31,7 +31,7 @@
impassable=50 impassable=50
[/defense] [/defense]
[resistance] [resistance]
blade=70 blade=50
pierce=50 pierce=50
impact=50 impact=50
fire=120 fire=120
@ -86,16 +86,16 @@
[effect] [effect]
apply_to=attack apply_to=attack
range=melee range=melee
increase_damage=1 increase_damage=2
[/effect] [/effect]
[effect] [effect]
apply_to=hitpoints apply_to=hitpoints
increase_total=2 increase_total=4
increase=2 increase=4
[/effect] [/effect]
[effect] [effect]
apply_to=max_experience apply_to=max_experience
increase=12 increase=33%
[/effect] [/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -106,11 +106,11 @@
[effect] [effect]
apply_to=attack apply_to=attack
range=ranged range=ranged
increase_attacks=1 increase_attacks=2
[/effect] [/effect]
[effect] [effect]
apply_to=max_experience apply_to=max_experience
increase=8 increase=25%
[/effect] [/effect]
[/advancement] [/advancement]
[advancement] [advancement]

View file

@ -81,15 +81,15 @@
[/unit_type] [/unit_type]
#enddef #enddef
{QUENOTH_FIGHTER_VARIANT 1 15} {QUENOTH_FIGHTER_VARIANT 1 13}
{QUENOTH_FIGHTER_VARIANT 2 17} {QUENOTH_FIGHTER_VARIANT 2 14}
{QUENOTH_FIGHTER_VARIANT 3 18} {QUENOTH_FIGHTER_VARIANT 3 15}
{QUENOTH_FIGHTER_VARIANT 4 19} {QUENOTH_FIGHTER_VARIANT 4 16}
{QUENOTH_FIGHTER_VARIANT 5 20} {QUENOTH_FIGHTER_VARIANT 5 17}
{QUENOTH_FIGHTER_VARIANT 6 21} {QUENOTH_FIGHTER_VARIANT 6 18}
{QUENOTH_FIGHTER_VARIANT 7 22} {QUENOTH_FIGHTER_VARIANT 7 19}
{QUENOTH_FIGHTER_VARIANT 8 23} {QUENOTH_FIGHTER_VARIANT 8 20}
{QUENOTH_FIGHTER_VARIANT 9 24} {QUENOTH_FIGHTER_VARIANT 9 21}
{QUENOTH_FIGHTER_VARIANT 10 25} {QUENOTH_FIGHTER_VARIANT 10 22}
#undef QUENOTH_FIGHTER_VARIANT #undef QUENOTH_FIGHTER_VARIANT

View file

@ -102,15 +102,15 @@
[/unit_type] [/unit_type]
#enddef #enddef
{QUENOTH_MYSTIC_VARIANT 1 18} {QUENOTH_MYSTIC_VARIANT 1 17}
{QUENOTH_MYSTIC_VARIANT 2 20} {QUENOTH_MYSTIC_VARIANT 2 18}
{QUENOTH_MYSTIC_VARIANT 3 21} {QUENOTH_MYSTIC_VARIANT 3 20}
{QUENOTH_MYSTIC_VARIANT 4 22} {QUENOTH_MYSTIC_VARIANT 4 21}
{QUENOTH_MYSTIC_VARIANT 5 23} {QUENOTH_MYSTIC_VARIANT 5 22}
{QUENOTH_MYSTIC_VARIANT 6 24} {QUENOTH_MYSTIC_VARIANT 6 24}
{QUENOTH_MYSTIC_VARIANT 7 25} {QUENOTH_MYSTIC_VARIANT 7 25}
{QUENOTH_MYSTIC_VARIANT 8 26} {QUENOTH_MYSTIC_VARIANT 8 26}
{QUENOTH_MYSTIC_VARIANT 9 27} {QUENOTH_MYSTIC_VARIANT 9 27}
{QUENOTH_MYSTIC_VARIANT 10 28} {QUENOTH_MYSTIC_VARIANT 10 29}
#undef QUENOTH_MYSTIC_VARIANT #undef QUENOTH_MYSTIC_VARIANT

View file

@ -96,14 +96,14 @@
#enddef #enddef
{QUENOTH_SCOUT_VARIANT 1 19} {QUENOTH_SCOUT_VARIANT 1 19}
{QUENOTH_SCOUT_VARIANT 2 20} {QUENOTH_SCOUT_VARIANT 2 21}
{QUENOTH_SCOUT_VARIANT 3 21} {QUENOTH_SCOUT_VARIANT 3 22}
{QUENOTH_SCOUT_VARIANT 4 22} {QUENOTH_SCOUT_VARIANT 4 24}
{QUENOTH_SCOUT_VARIANT 5 23} {QUENOTH_SCOUT_VARIANT 5 25}
{QUENOTH_SCOUT_VARIANT 6 24} {QUENOTH_SCOUT_VARIANT 6 27}
{QUENOTH_SCOUT_VARIANT 7 25} {QUENOTH_SCOUT_VARIANT 7 28}
{QUENOTH_SCOUT_VARIANT 8 26} {QUENOTH_SCOUT_VARIANT 8 30}
{QUENOTH_SCOUT_VARIANT 9 27} {QUENOTH_SCOUT_VARIANT 9 31}
{QUENOTH_SCOUT_VARIANT 10 28} {QUENOTH_SCOUT_VARIANT 10 33}
#undef QUENOTH_SCOUT_VARIANT #undef QUENOTH_SCOUT_VARIANT

View file

@ -7,7 +7,7 @@
gender=female gender=female
image=units/quenoth/sun_singer/sun-singer.png image=units/quenoth/sun_singer/sun-singer.png
profile="portraits/quenoth/sun_singer.webp" profile="portraits/quenoth/sun_singer.webp"
hitpoints=36 hitpoints=38
movement_type=quenoth_foot movement_type=quenoth_foot
movement=6 movement=6
experience=96 experience=96
@ -37,7 +37,7 @@
description= _"sun invocation" description= _"sun invocation"
type=arcane type=arcane
range=ranged range=ranged
damage=7 damage=8
number=3 number=3
icon=attacks/faerie-fire-sun.png icon=attacks/faerie-fire-sun.png
[specials] [specials]
@ -51,7 +51,7 @@
description= _"sun ray" description= _"sun ray"
type=arcane type=arcane
range=ranged range=ranged
damage=9 damage=11
number=3 number=3
icon=attacks/faerie-fire-sun.png icon=attacks/faerie-fire-sun.png
[specials] [specials]

View file

@ -8,7 +8,7 @@
image=units/quenoth/sun_sylph/sun-sylph.png image=units/quenoth/sun_sylph/sun-sylph.png
profile="portraits/quenoth/sun_sylph.webp" profile="portraits/quenoth/sun_sylph.webp"
halo=halo/elven/shyde-stationary-halo[1~6].png:150 halo=halo/elven/shyde-stationary-halo[1~6].png:150
hitpoints=42 hitpoints=47
movement_type=quenoth_float movement_type=quenoth_float
movement=6 movement=6
experience=150 experience=150
@ -40,7 +40,7 @@
description= _"sun invocation" description= _"sun invocation"
type=arcane type=arcane
range=ranged range=ranged
damage=7 damage=8
number=4 number=4
icon=attacks/faerie-fire-sun.png icon=attacks/faerie-fire-sun.png
[specials] [specials]
@ -54,7 +54,7 @@
description= _"sun ray" description= _"sun ray"
type=arcane type=arcane
range=ranged range=ranged
damage=9 damage=11
number=4 number=4
icon=attacks/faerie-fire-sun.png icon=attacks/faerie-fire-sun.png
[specials] [specials]
@ -70,7 +70,7 @@
description= _"sun incarnate" description= _"sun incarnate"
type=fire type=fire
range=ranged range=ranged
damage=11 damage=16
number=4 number=4
icon=attacks/faerie-fire-sun.png icon=attacks/faerie-fire-sun.png
[specials] [specials]

View file

@ -15,7 +15,7 @@
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
{TRAIT_DEXTROUS} {TRAIT_DEXTROUS}
{TRAIT_HEALTHY} {TRAIT_HEALTHY}
hitpoints=71 hitpoints=120
movement_type=quenoth_beast movement_type=quenoth_beast
#mostly like a foot Elf, but they are bad at defending in villages #mostly like a foot Elf, but they are bad at defending in villages
[defense] [defense]
@ -32,7 +32,7 @@
alignment=lawful alignment=lawful
advances_to=null advances_to=null
{AMLA_DEFAULT} {AMLA_DEFAULT}
cost=79 cost=136
usage=mixed fighter usage=mixed fighter
undead_variation=beast_rider undead_variation=beast_rider
description= _ "From the journal of Syniel, the Sand Skipper: description= _ "From the journal of Syniel, the Sand Skipper:

View file

@ -103,15 +103,15 @@
[/unit_type] [/unit_type]
#enddef #enddef
{QUENOTH_RIDER_VARIANT 1 26} {QUENOTH_RIDER_VARIANT 1 27}
{QUENOTH_RIDER_VARIANT 2 27} {QUENOTH_RIDER_VARIANT 2 29}
{QUENOTH_RIDER_VARIANT 3 28} {QUENOTH_RIDER_VARIANT 3 31}
{QUENOTH_RIDER_VARIANT 4 29} {QUENOTH_RIDER_VARIANT 4 33}
{QUENOTH_RIDER_VARIANT 5 30} {QUENOTH_RIDER_VARIANT 5 35}
{QUENOTH_RIDER_VARIANT 6 31} {QUENOTH_RIDER_VARIANT 6 37}
{QUENOTH_RIDER_VARIANT 7 32} {QUENOTH_RIDER_VARIANT 7 39}
{QUENOTH_RIDER_VARIANT 8 33} {QUENOTH_RIDER_VARIANT 8 41}
{QUENOTH_RIDER_VARIANT 9 34} {QUENOTH_RIDER_VARIANT 9 43}
{QUENOTH_RIDER_VARIANT 10 35} {QUENOTH_RIDER_VARIANT 10 45}
#undef QUENOTH_RIDER_VARIANT #undef QUENOTH_RIDER_VARIANT

View file

@ -27,7 +27,7 @@
impact=70 impact=70
[/resistance] [/resistance]
movement=5 movement=5
experience=119 experience=153
level=2 level=2
alignment=lawful alignment=lawful
advances_to=Tauroch Protector advances_to=Tauroch Protector

View file

@ -51,10 +51,10 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
formula="max_experience > 24" formula="max_experience > 24"
#endif #endif
#ifdef NORMAL #ifdef NORMAL
formula="max_experience > 28" formula="max_experience > 32"
#endif #endif
#ifdef HARD #ifdef HARD
formula="max_experience > 33" formula="max_experience > 42"
#endif #endif
[/filter] [/filter]
apply_to=level apply_to=level
@ -67,10 +67,10 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
formula="max_experience > 41" formula="max_experience > 41"
#endif #endif
#ifdef NORMAL #ifdef NORMAL
formula="max_experience > 46" formula="max_experience > 50"
#endif #endif
#ifdef HARD #ifdef HARD
formula="max_experience > 54" formula="max_experience > 64"
#endif #endif
[/filter] [/filter]
apply_to=level apply_to=level
@ -164,6 +164,11 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
{WEAPON_SPECIAL_USES_ATTACKS 1} {WEAPON_SPECIAL_USES_ATTACKS 1}
{WEAPON_SPECIAL_TAUNT} {WEAPON_SPECIAL_TAUNT}
[/specials] [/specials]
parry = 30
[/effect]
[effect]
apply_to = attack
name = sword
parry = 10 parry = 10
[/effect] [/effect]
[effect] [effect]
@ -183,6 +188,11 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
name = taunting_strike name = taunting_strike
set_movement_used = 0 set_movement_used = 0
[/effect] [/effect]
[effect]
apply_to = hitpoints
increase_total = 6
heal_full = yes
[/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -413,6 +423,11 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
{ABILITY_OPPORTUNIST} {ABILITY_OPPORTUNIST}
[/abilities] [/abilities]
[/effect] [/effect]
[effect]
apply_to = hitpoints
increase_total = 6
heal_full = yes
[/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -498,6 +513,11 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
[/set_specials] [/set_specials]
set_attacks_used = 2 set_attacks_used = 2
[/effect] [/effect]
[effect]
apply_to = attack
name = sword
increase_parry = 10
[/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -526,7 +546,7 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
[effect] [effect]
apply_to = attack apply_to = attack
name = bow name = bow
increase_damage = 1 increase_attacks = 1
[/effect] [/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -538,7 +558,7 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
[effect] [effect]
apply_to = attack apply_to = attack
name = bow name = bow
increase_parry = 10 increase_parry = 20
remove_specials = uses_attacks remove_specials = uses_attacks
[set_specials] [set_specials]
mode = replace mode = replace
@ -561,7 +581,7 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
#textdomain wesnoth-utbs #textdomain wesnoth-utbs
type = pierce type = pierce
range = ranged range = ranged
damage = 7 damage = 14
number = 1 number = 1
icon = attacks/bow-elven.png icon = attacks/bow-elven.png
[specials] [specials]
@ -586,7 +606,8 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
[effect] [effect]
apply_to = attack apply_to = attack
name = rain of arrows name = rain of arrows
increase_damage = -1 increase_damage = -6
increase_attacks = 1
[set_specials] [set_specials]
mode = append mode = append
{WEAPON_SPECIAL_POISON} {WEAPON_SPECIAL_POISON}
@ -679,16 +700,12 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
type = impact type = impact
range = ranged range = ranged
damage = 6 damage = 6
number = 1 number = 2
icon = attacks/bolas.png icon = attacks/bolas.png
[specials] [specials]
{WEAPON_SPECIAL_USES_ATTACKS 1} {WEAPON_SPECIAL_USES_ATTACKS 2}
[/specials] [/specials]
attacks_used = 1 attacks_used = 2
[/effect]
[effect]
apply_to = max_attacks
increase = 1
[/effect] [/effect]
[/advancement] [/advancement]
[advancement] [advancement]
@ -732,7 +749,7 @@ _"Nym is Kalehs childhood friend, a young, rebellious lady with quick wits an
[effect] [effect]
apply_to = attack apply_to = attack
name = bolas name = bolas
increase_attacks = 1 increase_attacks = 2
[/effect] [/effect]
[/advancement] [/advancement]

View file

@ -468,11 +468,14 @@ Any units adjacent to this unit will fight as if it were dusk when it is night,
find_in = unit find_in = unit
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
[/harm_unit] [/harm_unit]
[/event] [/event]
@ -509,11 +512,14 @@ Any units adjacent to this unit will fight as if it were dusk when it is night,
" "
[/filter_adjacent] [/filter_adjacent]
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
[/harm_unit] [/harm_unit]
[/event] [/event]
@ -1454,8 +1460,9 @@ Marksman attacks are only affected if the chance to hit is greater than 60%."
[/filter_second] [/filter_second]
amount = 6 amount = 6
damage_type = impact damage_type = impact
alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
slowed = yes slowed = yes
animate = yes animate = yes
@ -1583,7 +1590,7 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[/event] [/event]
[event] [event]
name = side 1 turn refresh name = side 1 turn refresh
id = cooling id = cooling_{X}
first_time_only = no first_time_only = no
[modify_unit] [modify_unit]
@ -1620,6 +1627,9 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[/filter_attack] [/filter_attack]
[store_unit] [store_unit]
[filter] [filter]
[not]
find_in = second_unit
[/not]
[filter_adjacent] [filter_adjacent]
find_in = second_unit find_in = second_unit
adjacent = $second_unit.facing adjacent = $second_unit.facing
@ -1649,10 +1659,14 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[filter] [filter]
find_in = pierce_hit_unit find_in = pierce_hit_unit
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
[/harm_unit] [/harm_unit]
[/then] [/then]
@ -1683,6 +1697,9 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[/filter_attack] [/filter_attack]
[store_unit] [store_unit]
[filter] [filter]
[not]
find_in = second_unit
[/not]
[filter_adjacent] [filter_adjacent]
find_in = second_unit find_in = second_unit
adjacent = $second_unit.facing adjacent = $second_unit.facing
@ -1725,10 +1742,14 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[filter] [filter]
find_in = puncture_hit_unit find_in = puncture_hit_unit
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
[/harm_unit] [/harm_unit]
[/then] [/then]
@ -1759,21 +1780,26 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[/filter_attack] [/filter_attack]
[store_unit] [store_unit]
[filter] [filter]
[filter_adjacent] [not]
find_in = second_unit find_in = second_unit
adjacent = $second_unit.facing [/not]
[/filter_adjacent] [and]
[or] [filter_adjacent]
[filter_location] find_in = second_unit
radius = 1 adjacent = $second_unit.facing
[filter_adjacent_location] [/filter_adjacent]
adjacent = $second_unit.facing [or]
[filter] [filter_location]
find_in = second_unit radius = 1
[/filter] [filter_adjacent_location]
[/filter_adjacent_location] adjacent = $second_unit.facing
[/filter_location] [filter]
[/or] find_in = second_unit
[/filter]
[/filter_adjacent_location]
[/filter_location]
[/or]
[/and]
[/filter] [/filter]
variable = rain_of_arrows_hit_units variable = rain_of_arrows_hit_units
[/store_unit] [/store_unit]
@ -1810,10 +1836,14 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[filter] [filter]
find_in = rain_of_arrows_hit_unit find_in = rain_of_arrows_hit_unit
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
poisoned = yes poisoned = yes
animate = yes animate = yes
@ -1827,10 +1857,14 @@ _ "After using this attack, you can't use it during your next two turns."#enddef
[filter] [filter]
find_in = rain_of_arrows_hit_unit find_in = rain_of_arrows_hit_unit
[/filter] [/filter]
[filter_second]
find_in = unit
[/filter_second]
amount = $weapon.damage amount = $weapon.damage
damage_type = $weapon.type damage_type = $weapon.type
alignment = $unit.alignment
kill = yes kill = yes
experience = yes experience = kill
fire_event = yes fire_event = yes
animate = yes animate = yes
[primary_attack] [primary_attack]

View file

@ -136,7 +136,7 @@ if(red <= green and green <= blue + 3, ({NEWCHAN} / 255.0)^2 * 255.0, {ORIGCHAN}
#enddef #enddef
#define UTBS_XP_MODIFIER #define UTBS_XP_MODIFIER
experience_modifier={ON_DIFFICULTY 100 125 150} experience_modifier={ON_DIFFICULTY 100 150 200}
#enddef #enddef
#define UTBS_CORRECT_RECALL_COST #define UTBS_CORRECT_RECALL_COST