diff --git a/magic/v_pool.111 b/magic/v_pool.111 new file mode 100644 index 000000000..4a1037d0a --- /dev/null +++ b/magic/v_pool.111 @@ -0,0 +1,10 @@ +#define v_pool_width 24 +#define v_pool_height 24 +static char v_pool_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x21, 0x02, 0x10, 0x00, 0x05, 0x28, 0x08, 0x03, + 0x30, 0x00, 0x20, 0x00, 0x66, 0x00, 0xc0, 0x99, 0x0e, 0x78, 0x88, 0x11, + 0x04, 0x20, 0x10, 0x44, 0x02, 0x28, 0x2c, 0x05, 0x60, 0x18, 0x06, 0x58, + 0x34, 0xc0, 0x28, 0x16, 0xa0, 0x11, 0x10, 0x00, 0x20, 0x08, 0x01, 0x31, + 0x84, 0xc1, 0x13, 0x4c, 0x63, 0x1a, 0x68, 0x45, 0x0c, 0xb0, 0x6d, 0x01, + 0x80, 0x31, 0x07, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/magic/v_pool.111.png b/magic/v_pool.111.png new file mode 100644 index 000000000..ffcf620ae Binary files /dev/null and b/magic/v_pool.111.png differ diff --git a/magic/v_pool.111.xpm b/magic/v_pool.111.xpm new file mode 100644 index 000000000..1f094f6ea --- /dev/null +++ b/magic/v_pool.111.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * v_pool_111_xpm[] = { +"24 24 3 1", +" s None c None", +". c sea green", +"X c green", +" ", +" . . . ", +" . X X .X. ", +" .X. . .. ", +" .. X . ", +" .. .. X ", +" ...XX..XX. ... ", +" ....XXXX.XXX..XXX. ", +" .XXXXXXXXXX.XXXXXX. ", +" .XXX.XX.XXXXXXXXX.X. ", +" ..X.XX.X.XXXXXXXXXX.. ", +" ..XXXX..XXXXXXXX..X. ", +" . ..XXXXXXXX..XXX. . ", +" .. .XXXXXXXX.X..XXX. ", +" .XXXXXXXXXXXXXXXX. ", +" .XXXX.XXXXXXX.XXX.. ", +" .XXXX..XXXXX....XX. ", +" ..XX. ..XXX.. .X.. ", +" .X.. . .XXX. .. ", +" .. .. ..X.. . ", +" .. .. ... ", +" .. ", +" ", +" "}; diff --git a/magic/v_pool.112 b/magic/v_pool.112 new file mode 100644 index 000000000..2c88668c9 --- /dev/null +++ b/magic/v_pool.112 @@ -0,0 +1,10 @@ +#define v_pool_width 24 +#define v_pool_height 24 +static char v_pool_bits[] = { + 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x80, 0x14, 0x20, 0x00, 0x0c, 0x51, + 0x00, 0x00, 0x30, 0x00, 0x66, 0x00, 0xc0, 0x99, 0x0e, 0x78, 0x89, 0x11, + 0x84, 0x21, 0x10, 0x44, 0x00, 0x28, 0x2c, 0x00, 0x60, 0x18, 0x18, 0x59, + 0x34, 0x2c, 0x28, 0x16, 0x00, 0x10, 0x10, 0x00, 0x20, 0x08, 0x01, 0x31, + 0x84, 0xc1, 0x13, 0x4c, 0x63, 0x1a, 0x68, 0x45, 0x0c, 0xb0, 0x6d, 0x01, + 0x80, 0x31, 0x07, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/magic/v_pool.112.png b/magic/v_pool.112.png new file mode 100644 index 000000000..da6144f87 Binary files /dev/null and b/magic/v_pool.112.png differ diff --git a/magic/v_pool.112.xpm b/magic/v_pool.112.xpm new file mode 100644 index 000000000..1b620304f --- /dev/null +++ b/magic/v_pool.112.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * v_pool_112_xpm[] = { +"24 24 3 1", +" s None c None", +". c sea green", +"X c green", +" ", +" . . ", +" X . .X. . ", +" X .. . .X. ", +" X .. ", +" .. .. ", +" ...XX..XX. ... ", +" ....X.XX.XXX..XXX. ", +" .XXXX..XXXX.XXXXXX. ", +" .XXX.XXXXXXXXXXXX.X. ", +" ..X.XXXXXXXXXXXXXXX.. ", +" ..XXXXXX..XXX.XX..X. ", +" . ..XXXX..X.XXXXX. . ", +" .. .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXXX. ", +" .XXXX.XXXXXXX.XXX.. ", +" .XXXX..XXXXX....XX. ", +" ..XX. ..XXX.. .X.. ", +" .X.. . .XXX. .. ", +" .. .. ..X.. . ", +" .. .. ... ", +" .. ", +" ", +" "}; diff --git a/magic/v_splash.111 b/magic/v_splash.111 new file mode 100644 index 000000000..b73d9757d --- /dev/null +++ b/magic/v_splash.111 @@ -0,0 +1,10 @@ +#define v_splash_width 24 +#define v_splash_height 24 +static char v_splash_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x01, 0x80, 0xc1, 0x03, + 0x00, 0x00, 0x01, 0x80, 0x88, 0x03, 0x40, 0x20, 0x02, 0x40, 0x80, 0x07, + 0x40, 0x24, 0x07, 0x80, 0xd0, 0x03, 0x40, 0xac, 0x03, 0xc0, 0xea, 0x03, + 0x40, 0xdf, 0x01, 0x80, 0x7b, 0x01, 0x00, 0x6d, 0x01, 0x00, 0x25, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/magic/v_splash.111.png b/magic/v_splash.111.png new file mode 100644 index 000000000..fc69000f1 Binary files /dev/null and b/magic/v_splash.111.png differ diff --git a/magic/v_splash.111.xpm b/magic/v_splash.111.xpm new file mode 100644 index 000000000..0cad424da --- /dev/null +++ b/magic/v_splash.111.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * v_splash_111_xpm[] = { +"24 24 3 1", +" s None c None", +". c green", +"X c sea green", +" ", +" ", +" ", +" ", +" ", +" ", +" .XX.XX X ", +" XX.....XXXX ", +" .........X ", +" X...X...XXX ", +" X......X...X ", +" X........XXXX ", +" X...X..X..XXX ", +" .X....X.XXXX ", +" X...XX.X.XXX ", +" XX.X.X.XXXXX ", +" X.XXXXX.XXX ", +" XXX.XXXX X ", +" X XX XX X ", +" X X X ", +" X ", +" ", +" ", +" "}; diff --git a/magic/v_splash.112 b/magic/v_splash.112 new file mode 100644 index 000000000..a87e881dd --- /dev/null +++ b/magic/v_splash.112 @@ -0,0 +1,10 @@ +#define v_splash_width 24 +#define v_splash_height 24 +static char v_splash_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0x00, 0x80, 0xc1, 0x00, + 0x80, 0x20, 0x01, 0x80, 0x80, 0x03, 0x40, 0x40, 0x07, 0x80, 0x84, 0x05, + 0x40, 0xa0, 0x03, 0x40, 0x69, 0x03, 0x40, 0xf2, 0x03, 0x80, 0xc8, 0x01, + 0x40, 0xff, 0x01, 0x80, 0xbb, 0x00, 0x80, 0xae, 0x00, 0x80, 0x26, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/magic/v_splash.112.png b/magic/v_splash.112.png new file mode 100644 index 000000000..0566e3edb Binary files /dev/null and b/magic/v_splash.112.png differ diff --git a/magic/v_splash.112.xpm b/magic/v_splash.112.xpm new file mode 100644 index 000000000..3c1f69a9f --- /dev/null +++ b/magic/v_splash.112.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * v_splash_112_xpm[] = { +"24 24 3 1", +" s None c None", +". c sea green", +"X c green", +" ", +" ", +" ", +" ", +" ", +" ", +" .X.... ", +" ..XXXXX.. ", +" .XXXXX.XX. ", +" .XXXXXXX... ", +" .XXXXXXX.X... ", +" X.XX.XXXX..X. ", +" .XXXXXX.X... ", +" .X.XX.X..X.. ", +" .XX.XX...... ", +" X.XXX.XX... ", +" .X......... ", +" ...X... . ", +" . ... . . ", +" . .. . ", +" . ", +" ", +" ", +" "}; diff --git a/magic/vitriol.arc b/magic/vitriol.arc index 4920ad453..c9d4a1a40 100644 --- a/magic/vitriol.arc +++ b/magic/vitriol.arc @@ -2,9 +2,8 @@ Object vitriol name vitriol other_arch vitriol_splash type 10 -face acidsphere.111 -animation acid_sphere -is_animated 0 +face v_splash.111 +animation vitriol_splash is_turnable 0 walk_on 1 fly_on 1 @@ -22,9 +21,11 @@ Object vitriol_splash name vitriol splash other_arch vitriol_pool type 88 -face acidsphere.111 -animation acid_sphere -is_animated 0 +face v_splash.111 +anim +v_splash.111 +v_splash.112 +mina is_turnable 1 walk_on 1 fly_on 1 @@ -46,13 +47,15 @@ walk_on 1 wc -30 food 1 name vitriol pool -face acid_pool.111 -animation acid_pool +face v_pool.111 +anim +v_pool.111 +v_pool.112 +mina speed 0.2 no_pick 1 attacktype 4 hp 60 dam 30 -is_floor 1 editable 8 end