UtBS: Updated many things to use FLASH macros and screen_fade
Most of these should be fine, but some need verification for correctness using the new effect. Some of the color_adjust values were very specific and i am not sure they give the same result now. Several effects could probably also be significantly improved using the new screen_fade system, with a little work.
This commit is contained in:
Tommy
Pentarctagon
parent
e47aa3532b
commit
06686e22e4
6 changed files with 85 additions and 298 deletions
|
|
@ -1489,27 +1489,11 @@
|
|||
message= _ "Burn, burn and die!"
|
||||
[/message]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=fire.wav
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=fire.wav
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
[message]
|
||||
speaker=Dwarf Leader
|
||||
|
|
@ -1681,27 +1665,11 @@
|
|||
message= _ "Let’s blast those monsters back to the pits they spawned from! Fire in the hole!"
|
||||
[/message]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=thunderstick.ogg
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=thunderstick.ogg
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
[message]
|
||||
speaker=Troll Leader
|
||||
|
|
|
|||
|
|
@ -503,23 +503,12 @@
|
|||
|
||||
# Have screen flash red
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=1000
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# TODO: should the explosion and shaking be inside the flash?
|
||||
{FLASH_RED (
|
||||
[delay]
|
||||
time=1000
|
||||
[/delay]
|
||||
)}
|
||||
|
||||
[sound]
|
||||
name=explosion.ogg
|
||||
|
|
@ -913,23 +902,8 @@
|
|||
|
||||
# Have screen flash red
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=200
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# TODO: should the explosion and shaking be inside the flash?
|
||||
{FLASH_RED ()}
|
||||
|
||||
[sound]
|
||||
name=flame-big.ogg
|
||||
|
|
|
|||
|
|
@ -522,27 +522,11 @@
|
|||
|
||||
# Have screen flash red
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=explosion.ogg
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=explosion.ogg
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
# Have wall shake, then be replaced by dirt, then add rubble
|
||||
|
||||
|
|
@ -1791,24 +1775,16 @@
|
|||
message= _ "Hey, wait a minute, that amulet glows the same color as this rune. Maybe if I put the amulet on and step into the rune..."
|
||||
[/message]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=246,0,243
|
||||
[/color_adjust]
|
||||
{FLASH 246 0 243 (
|
||||
{UTBS_SHAKE_SCREEN}
|
||||
|
||||
{UTBS_SHAKE_SCREEN}
|
||||
[terrain]
|
||||
x,y=46,21
|
||||
terrain=Uu
|
||||
[/terrain]
|
||||
|
||||
[terrain]
|
||||
x,y=46,21
|
||||
terrain=Uu
|
||||
[/terrain]
|
||||
|
||||
{PLACE_IMAGE scenery/rubble.png 46 21}
|
||||
|
||||
[redraw][/redraw]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
{PLACE_IMAGE scenery/rubble.png 46 21}
|
||||
)}
|
||||
|
||||
[remove_item]
|
||||
x,y=45,21
|
||||
|
|
|
|||
|
|
@ -1287,27 +1287,11 @@
|
|||
[/not]
|
||||
[/filter]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
[remove_item]
|
||||
x,y=20,45
|
||||
|
|
@ -1510,27 +1494,11 @@
|
|||
[/variable]
|
||||
[/filter_condition]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=31,122,255
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=heal.wav
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH 31 122 255 (
|
||||
[sound]
|
||||
name=heal.wav
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
[heal_unit]
|
||||
[/heal_unit]
|
||||
|
|
@ -1990,27 +1958,11 @@
|
|||
# upon entering chamber, remove entry rune and damage and
|
||||
# poison invading unit
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
[remove_item]
|
||||
x,y=18,34
|
||||
|
|
@ -2222,27 +2174,11 @@
|
|||
[event]
|
||||
name=new turn
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED (
|
||||
[sound]
|
||||
name=magic-dark-big-miss.ogg
|
||||
[/sound]
|
||||
)}
|
||||
|
||||
{NAMED_UNIT 3 (Ixthala Demon) 5 35 (Ancient Guardian 1) ( _ "Ancient Guardian") (upkeep=free)}{PASSABLE_HEX}
|
||||
{NAMED_UNIT 3 (Ixthala Demon) 8 33 (Ancient Guardian 2) ( _ "Ancient Guardian") (upkeep=free)}{PASSABLE_HEX}
|
||||
|
|
|
|||
|
|
@ -1346,21 +1346,7 @@
|
|||
message= _ "The time has come, my brethren. On this most holy day, let us sacrifice these infidels unto The Dark Lady. Their suffering shall be a testament to her power and glory!"
|
||||
[/message]
|
||||
|
||||
#have screen flash red
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=255, 0, 0
|
||||
[/color_adjust]
|
||||
[redraw]
|
||||
[/redraw]
|
||||
[delay]
|
||||
time=100
|
||||
[/delay]
|
||||
[color_adjust]
|
||||
red,green,blue=0, 0, 0
|
||||
[/color_adjust]
|
||||
[redraw]
|
||||
[/redraw]
|
||||
{FLASH_RED ()}
|
||||
|
||||
[if]
|
||||
[have_location]
|
||||
|
|
|
|||
|
|
@ -735,23 +735,10 @@
|
|||
time=400
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=40,0,100
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=250
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# TODO: check colour and timing for correctness with [screen_fade]
|
||||
# there was previously a significant 250ms delay here, but that's
|
||||
# still less time than the new flash animation takes to play.
|
||||
{FLASH 40 0 100 ()}
|
||||
|
||||
# main body appears
|
||||
|
||||
|
|
@ -868,23 +855,10 @@
|
|||
message= _ "Eloh protect us!"
|
||||
[/message]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=33,181,140
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=250
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# TODO: check colour and timing for correctness with [screen_fade]
|
||||
# there was previously a significant 250ms delay here, but that's
|
||||
# still less time than the new flash animation takes to play.
|
||||
{FLASH 33 181 140 ()}
|
||||
|
||||
# create 3/4/5 bugs
|
||||
[fire_event]
|
||||
|
|
@ -1165,23 +1139,12 @@
|
|||
|
||||
#used to be 140,255,247
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=40,0,100
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=250
|
||||
[/delay]
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# TODO: check colour and timing for correctness with [screen_fade]
|
||||
# there was previously a significant 250ms delay here, but that's
|
||||
# still less time than the new flash animation takes to play.
|
||||
# Note that the above colour comment is unrelated and this was
|
||||
# already 40 0 100 when converted to screen_fade.
|
||||
{FLASH 40 0 100 ()}
|
||||
|
||||
[delay]
|
||||
time=100
|
||||
|
|
@ -1393,55 +1356,39 @@
|
|||
x=-40
|
||||
[/scroll]
|
||||
|
||||
# flash dark blue, light blue, very light blue,
|
||||
# progressive flash: dark blue, light blue, very light blue
|
||||
# TODO: check colour and timing for correctness with [screen_fade]
|
||||
|
||||
# dark blue
|
||||
|
||||
[color_adjust]
|
||||
[screen_fade]
|
||||
red,green,blue=40,0,100
|
||||
[/color_adjust]
|
||||
alpha=200
|
||||
duration=300
|
||||
[/screen_fade]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
# light blue
|
||||
|
||||
[delay]
|
||||
time=300
|
||||
[/delay]
|
||||
|
||||
#light blue
|
||||
|
||||
[color_adjust]
|
||||
[screen_fade]
|
||||
red,green,blue=33,181,140
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=300
|
||||
[/delay]
|
||||
alpha=200
|
||||
duration=300
|
||||
[/screen_fade]
|
||||
|
||||
# very light blue
|
||||
|
||||
[color_adjust]
|
||||
[screen_fade]
|
||||
red,green,blue=140,255,247
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[delay]
|
||||
time=300
|
||||
[/delay]
|
||||
alpha=200
|
||||
duration=300
|
||||
[/screen_fade]
|
||||
|
||||
# back to normal
|
||||
|
||||
[color_adjust]
|
||||
red,green,blue=0,0,0
|
||||
[/color_adjust]
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
[screen_fade]
|
||||
alpha=0
|
||||
duration=300
|
||||
[/screen_fade]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue