diff --git a/ground/chaos.face b/ground/chaos.face index 460bc2ca8..17137aee0 100644 --- a/ground/chaos.face +++ b/ground/chaos.face @@ -1,6 +1,6 @@ animation chaos explosion.111 -burnout.11O +fire.11O fireball.111 ball_lightning.111 icestorm.111 diff --git a/ground/chaos_ball.face b/ground/chaos_ball.face index dfae94608..a9a890fa8 100644 --- a/ground/chaos_ball.face +++ b/ground/chaos_ball.face @@ -1,6 +1,6 @@ animation chaos_ball explosion.111 -burnout.11O +fire.11O fireball.111 ball_lightning.111 icestorm.111 diff --git a/ground/major_chaos.face b/ground/major_chaos.face index cec8c15e9..2071f7ccf 100644 --- a/ground/major_chaos.face +++ b/ground/major_chaos.face @@ -1,6 +1,6 @@ animation major_chaos explosion.111 -burnout.11O +fire.11O fireball.111 ball_lightning.111 icestorm.111 diff --git a/misc/fire.base.111.png b/misc/fire.base.111.png new file mode 100644 index 000000000..8bcf7087e Binary files /dev/null and b/misc/fire.base.111.png differ diff --git a/misc/fire.base.112.png b/misc/fire.base.112.png new file mode 100644 index 000000000..13a21d62c Binary files /dev/null and b/misc/fire.base.112.png differ diff --git a/misc/fire.base.113.png b/misc/fire.base.113.png new file mode 100644 index 000000000..9fc84cf0f Binary files /dev/null and b/misc/fire.base.113.png differ diff --git a/misc/fire.base.114.png b/misc/fire.base.114.png new file mode 100644 index 000000000..4cfcba8e1 Binary files /dev/null and b/misc/fire.base.114.png differ diff --git a/misc/fire.base.115.png b/misc/fire.base.115.png new file mode 100644 index 000000000..e7fbd9330 Binary files /dev/null and b/misc/fire.base.115.png differ diff --git a/misc/fire.base.116.png b/misc/fire.base.116.png new file mode 100644 index 000000000..5f0021d9b Binary files /dev/null and b/misc/fire.base.116.png differ diff --git a/misc/fire.base.117.png b/misc/fire.base.117.png new file mode 100644 index 000000000..f59837551 Binary files /dev/null and b/misc/fire.base.117.png differ diff --git a/misc/fire.base.118.png b/misc/fire.base.118.png new file mode 100644 index 000000000..3a6671c3f Binary files /dev/null and b/misc/fire.base.118.png differ diff --git a/misc/fire.base.119.png b/misc/fire.base.119.png new file mode 100644 index 000000000..767b0e927 Binary files /dev/null and b/misc/fire.base.119.png differ diff --git a/misc/fire.base.11A.png b/misc/fire.base.11A.png new file mode 100644 index 000000000..058688e99 Binary files /dev/null and b/misc/fire.base.11A.png differ diff --git a/misc/fire.base.11B.png b/misc/fire.base.11B.png new file mode 100644 index 000000000..57454c4c8 Binary files /dev/null and b/misc/fire.base.11B.png differ diff --git a/misc/fire.base.11C.png b/misc/fire.base.11C.png new file mode 100644 index 000000000..087c9a61e Binary files /dev/null and b/misc/fire.base.11C.png differ diff --git a/misc/fire.base.11D.png b/misc/fire.base.11D.png new file mode 100644 index 000000000..51394fa56 Binary files /dev/null and b/misc/fire.base.11D.png differ diff --git a/misc/fire.base.11E.png b/misc/fire.base.11E.png new file mode 100644 index 000000000..0b63199d2 Binary files /dev/null and b/misc/fire.base.11E.png differ diff --git a/misc/fire.base.11F.png b/misc/fire.base.11F.png new file mode 100644 index 000000000..ff5f32cd2 Binary files /dev/null and b/misc/fire.base.11F.png differ diff --git a/misc/fire.base.11G.png b/misc/fire.base.11G.png new file mode 100644 index 000000000..b6eb9a824 Binary files /dev/null and b/misc/fire.base.11G.png differ diff --git a/misc/fire.base.11H.png b/misc/fire.base.11H.png new file mode 100644 index 000000000..828753183 Binary files /dev/null and b/misc/fire.base.11H.png differ diff --git a/misc/fire.base.11J.png b/misc/fire.base.11J.png new file mode 100644 index 000000000..05fd567be Binary files /dev/null and b/misc/fire.base.11J.png differ diff --git a/misc/fire.base.11K.png b/misc/fire.base.11K.png new file mode 100644 index 000000000..692089664 Binary files /dev/null and b/misc/fire.base.11K.png differ diff --git a/misc/fire.base.11L.png b/misc/fire.base.11L.png new file mode 100644 index 000000000..87c53f30d Binary files /dev/null and b/misc/fire.base.11L.png differ diff --git a/misc/fire.base.11M.png b/misc/fire.base.11M.png new file mode 100644 index 000000000..267c5c9cd Binary files /dev/null and b/misc/fire.base.11M.png differ diff --git a/misc/fire.base.11N.png b/misc/fire.base.11N.png new file mode 100644 index 000000000..40970c4df Binary files /dev/null and b/misc/fire.base.11N.png differ diff --git a/misc/fire.base.11O.png b/misc/fire.base.11O.png new file mode 100644 index 000000000..c058a883e Binary files /dev/null and b/misc/fire.base.11O.png differ diff --git a/misc/fire.base.11P.png b/misc/fire.base.11P.png new file mode 100644 index 000000000..09a3663c7 Binary files /dev/null and b/misc/fire.base.11P.png differ diff --git a/misc/fire.base.11Q.png b/misc/fire.base.11Q.png new file mode 100644 index 000000000..ee927f4eb Binary files /dev/null and b/misc/fire.base.11Q.png differ diff --git a/spell/Burnout/burnout.base.11R.png b/misc/fire.base.11R.png similarity index 100% rename from spell/Burnout/burnout.base.11R.png rename to misc/fire.base.11R.png diff --git a/spell/Aura/flaming_aura.arc b/spell/Aura/flaming_aura.arc index 3adfcf46e..b8edc3da4 100644 --- a/spell/Aura/flaming_aura.arc +++ b/spell/Aura/flaming_aura.arc @@ -2,7 +2,7 @@ Object flaming_aura name Flaming Aura other_arch flaming_aura_mark invisible 1 -face burnout.111 +face fire.111 type 102 subtype 46 dam 1 diff --git a/spell/Aura/zone_of_healing.arc b/spell/Aura/zone_of_healing.arc index 9d89b0fcb..166c95a37 100644 --- a/spell/Aura/zone_of_healing.arc +++ b/spell/Aura/zone_of_healing.arc @@ -2,7 +2,7 @@ Object zone_of_healing name zone of healing other_arch spell_minor_healing invisible 1 -face burnout.111 +face fire.111 type 102 subtype 46 dam 1 diff --git a/spell/Bullet/meteor.arc b/spell/Bullet/meteor.arc index ff6c4f920..b8fa71d3a 100644 --- a/spell/Bullet/meteor.arc +++ b/spell/Bullet/meteor.arc @@ -12,7 +12,7 @@ end # Object fire_trail name burningtrail -face burnout.111 +face fire.111 animation meteor speed 1 food 9 diff --git a/spell/Bullet/meteor.face b/spell/Bullet/meteor.face index 76db13f40..17d2ed207 100644 --- a/spell/Bullet/meteor.face +++ b/spell/Bullet/meteor.face @@ -1,13 +1,13 @@ animation meteor -burnout.111 -burnout.112 -burnout.113 -burnout.114 -burnout.115 -burnout.116 -burnout.117 -burnout.118 -burnout.119 +fire.111 +fire.112 +fire.113 +fire.114 +fire.115 +fire.116 +fire.117 +fire.118 +fire.119 mina face meteor.111 magicmap grey diff --git a/spell/Burnout/burnout.arc b/spell/Burnout/burnout.arc index 1e1dbca8c..79373af2d 100644 --- a/spell/Burnout/burnout.arc +++ b/spell/Burnout/burnout.arc @@ -3,7 +3,7 @@ name burning item face burnout.114 animation burnout speed 1 -food 41 +food 26 is_used_up 1 no_pick 1 end diff --git a/spell/Burnout/burnout.base.111.png b/spell/Burnout/burnout.base.111.png index 8bcf7087e..b72544625 100644 Binary files a/spell/Burnout/burnout.base.111.png and b/spell/Burnout/burnout.base.111.png differ diff --git a/spell/Burnout/burnout.base.112.png b/spell/Burnout/burnout.base.112.png index 13a21d62c..3ae41da12 100644 Binary files a/spell/Burnout/burnout.base.112.png and b/spell/Burnout/burnout.base.112.png differ diff --git a/spell/Burnout/burnout.base.113.png b/spell/Burnout/burnout.base.113.png index 9fc84cf0f..3744f0e69 100644 Binary files a/spell/Burnout/burnout.base.113.png and b/spell/Burnout/burnout.base.113.png differ diff --git a/spell/Burnout/burnout.base.114.png b/spell/Burnout/burnout.base.114.png index 4cfcba8e1..8488e49b7 100644 Binary files a/spell/Burnout/burnout.base.114.png and b/spell/Burnout/burnout.base.114.png differ diff --git a/spell/Burnout/burnout.base.115.png b/spell/Burnout/burnout.base.115.png index e7fbd9330..3feb17247 100644 Binary files a/spell/Burnout/burnout.base.115.png and b/spell/Burnout/burnout.base.115.png differ diff --git a/spell/Burnout/burnout.base.116.png b/spell/Burnout/burnout.base.116.png index 5f0021d9b..89ef7dde1 100644 Binary files a/spell/Burnout/burnout.base.116.png and b/spell/Burnout/burnout.base.116.png differ diff --git a/spell/Burnout/burnout.base.117.png b/spell/Burnout/burnout.base.117.png index f59837551..bf2f4eb40 100644 Binary files a/spell/Burnout/burnout.base.117.png and b/spell/Burnout/burnout.base.117.png differ diff --git a/spell/Burnout/burnout.base.118.png b/spell/Burnout/burnout.base.118.png index 3a6671c3f..63361bd5f 100644 Binary files a/spell/Burnout/burnout.base.118.png and b/spell/Burnout/burnout.base.118.png differ diff --git a/spell/Burnout/burnout.base.119.png b/spell/Burnout/burnout.base.119.png index 767b0e927..e04506b72 100644 Binary files a/spell/Burnout/burnout.base.119.png and b/spell/Burnout/burnout.base.119.png differ diff --git a/spell/Burnout/burnout.base.11A.png b/spell/Burnout/burnout.base.11A.png index 058688e99..074ae343a 100644 Binary files a/spell/Burnout/burnout.base.11A.png and b/spell/Burnout/burnout.base.11A.png differ diff --git a/spell/Burnout/burnout.base.11B.png b/spell/Burnout/burnout.base.11B.png index 57454c4c8..6b5ae23a3 100644 Binary files a/spell/Burnout/burnout.base.11B.png and b/spell/Burnout/burnout.base.11B.png differ diff --git a/spell/Burnout/burnout.base.11C.png b/spell/Burnout/burnout.base.11C.png index 087c9a61e..4cb9e9649 100644 Binary files a/spell/Burnout/burnout.base.11C.png and b/spell/Burnout/burnout.base.11C.png differ diff --git a/spell/Burnout/burnout.base.11D.png b/spell/Burnout/burnout.base.11D.png index 51394fa56..4defb8560 100644 Binary files a/spell/Burnout/burnout.base.11D.png and b/spell/Burnout/burnout.base.11D.png differ diff --git a/spell/Burnout/burnout.base.11E.png b/spell/Burnout/burnout.base.11E.png index 0b63199d2..3e323c41e 100644 Binary files a/spell/Burnout/burnout.base.11E.png and b/spell/Burnout/burnout.base.11E.png differ diff --git a/spell/Burnout/burnout.base.11F.png b/spell/Burnout/burnout.base.11F.png index ff5f32cd2..14d2ae2fd 100644 Binary files a/spell/Burnout/burnout.base.11F.png and b/spell/Burnout/burnout.base.11F.png differ diff --git a/spell/Burnout/burnout.base.11G.png b/spell/Burnout/burnout.base.11G.png index b6eb9a824..414a5d5f7 100644 Binary files a/spell/Burnout/burnout.base.11G.png and b/spell/Burnout/burnout.base.11G.png differ diff --git a/spell/Burnout/burnout.base.11H.png b/spell/Burnout/burnout.base.11H.png index 828753183..2eedb9aff 100644 Binary files a/spell/Burnout/burnout.base.11H.png and b/spell/Burnout/burnout.base.11H.png differ diff --git a/spell/Burnout/burnout.base.11I.png b/spell/Burnout/burnout.base.11I.png new file mode 100644 index 000000000..d2fb6f327 Binary files /dev/null and b/spell/Burnout/burnout.base.11I.png differ diff --git a/spell/Burnout/burnout.base.11J.png b/spell/Burnout/burnout.base.11J.png index 05fd567be..24306bd59 100644 Binary files a/spell/Burnout/burnout.base.11J.png and b/spell/Burnout/burnout.base.11J.png differ diff --git a/spell/Burnout/burnout.base.11K.png b/spell/Burnout/burnout.base.11K.png index 692089664..bbbd63c5f 100644 Binary files a/spell/Burnout/burnout.base.11K.png and b/spell/Burnout/burnout.base.11K.png differ diff --git a/spell/Burnout/burnout.base.11L.png b/spell/Burnout/burnout.base.11L.png index 87c53f30d..83aba2a26 100644 Binary files a/spell/Burnout/burnout.base.11L.png and b/spell/Burnout/burnout.base.11L.png differ diff --git a/spell/Burnout/burnout.base.11M.png b/spell/Burnout/burnout.base.11M.png index 267c5c9cd..43d92ea23 100644 Binary files a/spell/Burnout/burnout.base.11M.png and b/spell/Burnout/burnout.base.11M.png differ diff --git a/spell/Burnout/burnout.base.11N.png b/spell/Burnout/burnout.base.11N.png index 40970c4df..67b264508 100644 Binary files a/spell/Burnout/burnout.base.11N.png and b/spell/Burnout/burnout.base.11N.png differ diff --git a/spell/Burnout/burnout.base.11O.png b/spell/Burnout/burnout.base.11O.png index c058a883e..c40c88388 100644 Binary files a/spell/Burnout/burnout.base.11O.png and b/spell/Burnout/burnout.base.11O.png differ diff --git a/spell/Burnout/burnout.base.11P.png b/spell/Burnout/burnout.base.11P.png index 09a3663c7..873034d19 100644 Binary files a/spell/Burnout/burnout.base.11P.png and b/spell/Burnout/burnout.base.11P.png differ diff --git a/spell/Burnout/burnout.base.11Q.png b/spell/Burnout/burnout.base.11Q.png index ee927f4eb..775c5286a 100644 Binary files a/spell/Burnout/burnout.base.11Q.png and b/spell/Burnout/burnout.base.11Q.png differ diff --git a/spell/Burnout/burnout.base.LICENSE b/spell/Burnout/burnout.base.LICENSE new file mode 100644 index 000000000..59048e954 --- /dev/null +++ b/spell/Burnout/burnout.base.LICENSE @@ -0,0 +1,4 @@ +comment Original artwork by Nicolas Weeger +license cc-by-3.0 +licenseurl https://creativecommons.org/licenses/by/3.0/legalcode +sourcename Nicolas Weeger diff --git a/spell/Burnout/burnout.face b/spell/Burnout/burnout.face index 723778a78..e17cf999d 100644 --- a/spell/Burnout/burnout.face +++ b/spell/Burnout/burnout.face @@ -1,22 +1,8 @@ animation burnout -burnout.111 +facings 1 burnout.111 burnout.112 -burnout.112 -burnout.111 -burnout.111 burnout.113 -burnout.113 -burnout.111 -burnout.111 -burnout.112 -burnout.112 -burnout.111 -burnout.111 -burnout.113 -burnout.113 -burnout.111 -burnout.111 burnout.114 burnout.115 burnout.116 @@ -31,6 +17,7 @@ burnout.11E burnout.11F burnout.11G burnout.11H +burnout.11I burnout.11J burnout.11K burnout.11L @@ -39,36 +26,4 @@ burnout.11N burnout.11O burnout.11P burnout.11Q -burnout.11R mina -face burnout.11O -is_floor 1 -visibility 100 -end -face burnout.111 -magicmap red -end -face burnout.112 -magicmap red -end -face burnout.113 -magicmap red -end -face burnout.114 -magicmap red -end -face burnout.115 -magicmap red -end -face burnout.116 -magicmap red -end -face burnout.117 -magicmap red -end -face burnout.118 -magicmap red -end -face burnout.119 -magicmap red -end diff --git a/spell/Cone/color_spray.face b/spell/Cone/color_spray.face index f1d3f4c24..e8e8d35e5 100644 --- a/spell/Cone/color_spray.face +++ b/spell/Cone/color_spray.face @@ -1,6 +1,6 @@ animation color_spray explosion.111 -burnout.11O +fire.11O fireball.111 ball_lightning.111 icestorm.111 diff --git a/spell/Swarm/swarm.arc b/spell/Swarm/swarm.arc index 365175906..a87133baa 100644 --- a/spell/Swarm/swarm.arc +++ b/spell/Swarm/swarm.arc @@ -1,6 +1,6 @@ Object swarm_spell invisible 1 -face burnout.111 +face fire.111 type 102 subtype 36 speed 1 diff --git a/spell/fire_permanent.arc b/spell/fire_permanent.arc index b1c122cf9..ae63d084b 100644 --- a/spell/fire_permanent.arc +++ b/spell/fire_permanent.arc @@ -1,6 +1,6 @@ Object fire_permanent name fire -face burnout.111 +face fire.111 animation fire_permanent anim_speed 1 client_anim_random 1 @@ -9,7 +9,7 @@ end # Another permanent fire with a different animation Object fire_permanent_flicker name fire -face burnout.111 +face fire.111 animation fire_flicker anim_speed 1 client_anim_random 1 diff --git a/spell/fire_permanent.face b/spell/fire_permanent.face index b545a0e70..d45990adf 100644 --- a/spell/fire_permanent.face +++ b/spell/fire_permanent.face @@ -1,44 +1,44 @@ animation fire_permanent -burnout.111 -burnout.112 -burnout.113 -burnout.114 -burnout.115 -burnout.116 -burnout.117 -burnout.118 -burnout.119 +fire.111 +fire.112 +fire.113 +fire.114 +fire.115 +fire.116 +fire.117 +fire.118 +fire.119 mina animation fire_flicker -burnout.111 -burnout.112 -burnout.113 -burnout.112 -burnout.111 -burnout.114 -burnout.115 -burnout.114 -burnout.113 -burnout.114 -burnout.112 -burnout.111 -burnout.112 -burnout.113 -burnout.112 -burnout.111 -burnout.112 -burnout.113 -burnout.114 -burnout.112 -burnout.114 -burnout.115 -burnout.116 -burnout.115 -burnout.114 -burnout.113 -burnout.114 -burnout.112 -burnout.113 -burnout.112 +fire.111 +fire.112 +fire.113 +fire.112 +fire.111 +fire.114 +fire.115 +fire.114 +fire.113 +fire.114 +fire.112 +fire.111 +fire.112 +fire.113 +fire.112 +fire.111 +fire.112 +fire.113 +fire.114 +fire.112 +fire.114 +fire.115 +fire.116 +fire.115 +fire.114 +fire.113 +fire.114 +fire.112 +fire.113 +fire.112 mina