diff --git a/construct/tower/s_tower1.111.png b/construct/tower/s_tower1.111.png index c02fab694..cd2735344 100644 Binary files a/construct/tower/s_tower1.111.png and b/construct/tower/s_tower1.111.png differ diff --git a/construct/tower/s_tower1.211.png b/construct/tower/s_tower1.211.png index 95741ed69..c61159c1f 100644 Binary files a/construct/tower/s_tower1.211.png and b/construct/tower/s_tower1.211.png differ diff --git a/construct/tower/s_tower2.111.png b/construct/tower/s_tower2.111.png index 8ec284e78..a23a89901 100644 Binary files a/construct/tower/s_tower2.111.png and b/construct/tower/s_tower2.111.png differ diff --git a/construct/tower/s_tower2.211.png b/construct/tower/s_tower2.211.png index bbe2ecf19..3fc27c267 100644 Binary files a/construct/tower/s_tower2.211.png and b/construct/tower/s_tower2.211.png differ diff --git a/construct/tower/wizard_tower.111 b/construct/tower/wizard_tower.111 new file mode 100644 index 000000000..3c0ac52ca --- /dev/null +++ b/construct/tower/wizard_tower.111 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x80, 0x41, + 0x00, 0x40, 0x40, 0x00, 0x40, 0x80, 0x00, 0x20, 0x80, 0x00, 0x20, 0x80, + 0x00, 0x20, 0x80, 0x00, 0x60, 0x40, 0x00, 0x50, 0x40, 0x00, 0xb0, 0x31, + 0x00, 0x08, 0x1e, 0x00, 0x18, 0x08, 0x00, 0x04, 0x08, 0x00, 0x0c, 0x04, + 0x00, 0x02, 0x04, 0x00, 0x06, 0x02, 0x00, 0x01, 0x02, 0x00, 0x03, 0x01, + }; diff --git a/construct/tower/wizard_tower.111.png b/construct/tower/wizard_tower.111.png new file mode 100644 index 000000000..7c1ffc3f6 Binary files /dev/null and b/construct/tower/wizard_tower.111.png differ diff --git a/construct/tower/wizard_tower.111.xpm b/construct/tower/wizard_tower.111.xpm new file mode 100644 index 000000000..38d189c8a --- /dev/null +++ b/construct/tower/wizard_tower.111.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_1_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" ", +" ", +" ", +" ", +" . ", +" X. ", +" Xoo.. ", +" XXoo..OX ", +" Xooo..OOX ", +" Xoo...OO.X", +" Xoo...OOOOX", +" Xo....OOOOX", +" X....OOOOOX", +" XX...OOOOX ", +" X.X..OOOOOX ", +" XXoXXOOOXX ", +" Xooo..XXXX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX "}; diff --git a/construct/tower/wizard_tower.112 b/construct/tower/wizard_tower.112 new file mode 100644 index 000000000..3c0ac52ca --- /dev/null +++ b/construct/tower/wizard_tower.112 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x80, 0x41, + 0x00, 0x40, 0x40, 0x00, 0x40, 0x80, 0x00, 0x20, 0x80, 0x00, 0x20, 0x80, + 0x00, 0x20, 0x80, 0x00, 0x60, 0x40, 0x00, 0x50, 0x40, 0x00, 0xb0, 0x31, + 0x00, 0x08, 0x1e, 0x00, 0x18, 0x08, 0x00, 0x04, 0x08, 0x00, 0x0c, 0x04, + 0x00, 0x02, 0x04, 0x00, 0x06, 0x02, 0x00, 0x01, 0x02, 0x00, 0x03, 0x01, + }; diff --git a/construct/tower/wizard_tower.112.png b/construct/tower/wizard_tower.112.png new file mode 100644 index 000000000..c53d048d1 Binary files /dev/null and b/construct/tower/wizard_tower.112.png differ diff --git a/construct/tower/wizard_tower.112.xpm b/construct/tower/wizard_tower.112.xpm new file mode 100644 index 000000000..38d189c8a --- /dev/null +++ b/construct/tower/wizard_tower.112.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_1_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" ", +" ", +" ", +" ", +" . ", +" X. ", +" Xoo.. ", +" XXoo..OX ", +" Xooo..OOX ", +" Xoo...OO.X", +" Xoo...OOOOX", +" Xo....OOOOX", +" X....OOOOOX", +" XX...OOOOX ", +" X.X..OOOOOX ", +" XXoXXOOOXX ", +" Xooo..XXXX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX "}; diff --git a/construct/tower/wizard_tower.113 b/construct/tower/wizard_tower.113 new file mode 100644 index 000000000..3c0ac52ca --- /dev/null +++ b/construct/tower/wizard_tower.113 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x80, 0x41, + 0x00, 0x40, 0x40, 0x00, 0x40, 0x80, 0x00, 0x20, 0x80, 0x00, 0x20, 0x80, + 0x00, 0x20, 0x80, 0x00, 0x60, 0x40, 0x00, 0x50, 0x40, 0x00, 0xb0, 0x31, + 0x00, 0x08, 0x1e, 0x00, 0x18, 0x08, 0x00, 0x04, 0x08, 0x00, 0x0c, 0x04, + 0x00, 0x02, 0x04, 0x00, 0x06, 0x02, 0x00, 0x01, 0x02, 0x00, 0x03, 0x01, + }; diff --git a/construct/tower/wizard_tower.113.png b/construct/tower/wizard_tower.113.png new file mode 100644 index 000000000..e7ca15bc5 Binary files /dev/null and b/construct/tower/wizard_tower.113.png differ diff --git a/construct/tower/wizard_tower.113.xpm b/construct/tower/wizard_tower.113.xpm new file mode 100644 index 000000000..38d189c8a --- /dev/null +++ b/construct/tower/wizard_tower.113.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_1_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" ", +" ", +" ", +" ", +" . ", +" X. ", +" Xoo.. ", +" XXoo..OX ", +" Xooo..OOX ", +" Xoo...OO.X", +" Xoo...OOOOX", +" Xo....OOOOX", +" X....OOOOOX", +" XX...OOOOX ", +" X.X..OOOOOX ", +" XXoXXOOOXX ", +" Xooo..XXXX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXo..OOOX "}; diff --git a/construct/tower/wizard_tower.211 b/construct/tower/wizard_tower.211 new file mode 100644 index 000000000..581fc292d --- /dev/null +++ b/construct/tower/wizard_tower.211 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x80, 0x00, 0x01, 0x80, 0x81, 0x00, 0x40, 0x80, 0x00, 0xe0, 0x40, 0x00, + 0x30, 0x40, 0x00, 0x70, 0x20, 0x00, 0x28, 0x20, 0x00, 0x48, 0x30, 0x00, + 0x8c, 0x38, 0x00, 0x1c, 0x17, 0x00, 0x1e, 0x18, 0x00, 0x76, 0x0c, 0x00, + 0x8b, 0x0b, 0x00, 0x07, 0x04, 0x00, 0xe3, 0x04, 0x00, 0x96, 0x02, 0x00, + 0x4a, 0x02, 0x00, 0xcc, 0x01, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/construct/tower/wizard_tower.211.png b/construct/tower/wizard_tower.211.png new file mode 100644 index 000000000..846c34a8e Binary files /dev/null and b/construct/tower/wizard_tower.211.png differ diff --git a/construct/tower/wizard_tower.211.xpm b/construct/tower/wizard_tower.211.xpm new file mode 100644 index 000000000..55a14ce91 --- /dev/null +++ b/construct/tower/wizard_tower.211.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_2_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXXo..OOOX ", +" XXooo...OOX ", +" XXXo..OOOX ", +" XoXoo...OOX ", +" XooX..OOOXX ", +" XXoooX..OXXX ", +" XXXo..XXXOX ", +" XXXX....+OXX ", +" XXoXXX.+OXX ", +"XXoXo..XXX+X ", +"XXXo..OOOOX ", +"XXoo.XXXOOX ", +" XX.X@@XOX ", +" XoX@@XOOX ", +" XX@@XXX ", +" XXX ", +" ", +" ", +" ", +" ", +" "}; diff --git a/construct/tower/wizard_tower.212 b/construct/tower/wizard_tower.212 new file mode 100644 index 000000000..581fc292d --- /dev/null +++ b/construct/tower/wizard_tower.212 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x80, 0x00, 0x01, 0x80, 0x81, 0x00, 0x40, 0x80, 0x00, 0xe0, 0x40, 0x00, + 0x30, 0x40, 0x00, 0x70, 0x20, 0x00, 0x28, 0x20, 0x00, 0x48, 0x30, 0x00, + 0x8c, 0x38, 0x00, 0x1c, 0x17, 0x00, 0x1e, 0x18, 0x00, 0x76, 0x0c, 0x00, + 0x8b, 0x0b, 0x00, 0x07, 0x04, 0x00, 0xe3, 0x04, 0x00, 0x96, 0x02, 0x00, + 0x4a, 0x02, 0x00, 0xcc, 0x01, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/construct/tower/wizard_tower.212.png b/construct/tower/wizard_tower.212.png new file mode 100644 index 000000000..152e983eb Binary files /dev/null and b/construct/tower/wizard_tower.212.png differ diff --git a/construct/tower/wizard_tower.212.xpm b/construct/tower/wizard_tower.212.xpm new file mode 100644 index 000000000..55a14ce91 --- /dev/null +++ b/construct/tower/wizard_tower.212.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_2_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXXo..OOOX ", +" XXooo...OOX ", +" XXXo..OOOX ", +" XoXoo...OOX ", +" XooX..OOOXX ", +" XXoooX..OXXX ", +" XXXo..XXXOX ", +" XXXX....+OXX ", +" XXoXXX.+OXX ", +"XXoXo..XXX+X ", +"XXXo..OOOOX ", +"XXoo.XXXOOX ", +" XX.X@@XOX ", +" XoX@@XOOX ", +" XX@@XXX ", +" XXX ", +" ", +" ", +" ", +" ", +" "}; diff --git a/construct/tower/wizard_tower.213 b/construct/tower/wizard_tower.213 new file mode 100644 index 000000000..581fc292d --- /dev/null +++ b/construct/tower/wizard_tower.213 @@ -0,0 +1,10 @@ +#define tower_a_width 24 +#define tower_a_height 24 +static char tower_a_bits[] = { + 0x80, 0x00, 0x01, 0x80, 0x81, 0x00, 0x40, 0x80, 0x00, 0xe0, 0x40, 0x00, + 0x30, 0x40, 0x00, 0x70, 0x20, 0x00, 0x28, 0x20, 0x00, 0x48, 0x30, 0x00, + 0x8c, 0x38, 0x00, 0x1c, 0x17, 0x00, 0x1e, 0x18, 0x00, 0x76, 0x0c, 0x00, + 0x8b, 0x0b, 0x00, 0x07, 0x04, 0x00, 0xe3, 0x04, 0x00, 0x96, 0x02, 0x00, + 0x4a, 0x02, 0x00, 0xcc, 0x01, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; diff --git a/construct/tower/wizard_tower.213.png b/construct/tower/wizard_tower.213.png new file mode 100644 index 000000000..f8429d7eb Binary files /dev/null and b/construct/tower/wizard_tower.213.png differ diff --git a/construct/tower/wizard_tower.213.xpm b/construct/tower/wizard_tower.213.xpm new file mode 100644 index 000000000..55a14ce91 --- /dev/null +++ b/construct/tower/wizard_tower.213.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * tower_a_2_xpm [] = { +" 24 24 7 1 " , +" s None c None", +". s Gray c Grey50", +"X c Black", +"o s Dark gray c Grey25", +"O s Light gray c Grey75", +"+ c White", +"@ s Dark brown m white c Sienna", +" Xooo...OOX ", +" XXo..OOOX ", +" Xooo...OOX ", +" XXXo..OOOX ", +" XXooo...OOX ", +" XXXo..OOOX ", +" XoXoo...OOX ", +" XooX..OOOXX ", +" XXoooX..OXXX ", +" XXXo..XXXOX ", +" XXXX....+OXX ", +" XXoXXX.+OXX ", +"XXoXo..XXX+X ", +"XXXo..OOOOX ", +"XXoo.XXXOOX ", +" XX.X@@XOX ", +" XoX@@XOOX ", +" XX@@XXX ", +" XXX ", +" ", +" ", +" ", +" ", +" "}; diff --git a/construct/tower/wizard_tower.arc b/construct/tower/wizard_tower.arc new file mode 100644 index 000000000..771069c2a --- /dev/null +++ b/construct/tower/wizard_tower.arc @@ -0,0 +1,30 @@ +Object wizard_tower +name tower +type 66 +face wizard_tower.111 +anim +wizard_tower.111 +wizard_tower.112 +wizard_tower.113 +mina +speed -0.3000 +no_pick 1 +editable 2 +visibility 100 +magicmap grey +end +More +Object wizard_tower2 +name tower +type 66 +face wizard_tower.211 +anim +wizard_tower.211 +wizard_tower.212 +wizard_tower.213 +mina +y 1 +no_pick 1 +visibility 100 +magicmap grey +end diff --git a/magic/Cold/icestorm.111.png b/magic/Cold/icestorm.111.png index f1d921e6a..851177cb3 100644 Binary files a/magic/Cold/icestorm.111.png and b/magic/Cold/icestorm.111.png differ diff --git a/magic/Cold/icestorm.112.png b/magic/Cold/icestorm.112.png index 52b2f659d..362a180ac 100644 Binary files a/magic/Cold/icestorm.112.png and b/magic/Cold/icestorm.112.png differ diff --git a/magic/Cold/icestorm.113.png b/magic/Cold/icestorm.113.png index 8cddcb539..dac09d43b 100644 Binary files a/magic/Cold/icestorm.113.png and b/magic/Cold/icestorm.113.png differ diff --git a/magic/poison_fog.arc b/magic/poison_fog.arc index e45ac3e4f..ad5fabad7 100644 --- a/magic/poison_fog.arc +++ b/magic/poison_fog.arc @@ -9,7 +9,7 @@ poisonc.112 poisonc.113 mina food 40 -color_fg yellow +color_fg green is_used_up 1 is_animated 1 attacktype 1024 diff --git a/misc/statue_knight.111 b/misc/statue_knight.111 new file mode 100644 index 000000000..05e6dcef3 --- /dev/null +++ b/misc/statue_knight.111 @@ -0,0 +1,9 @@ +#define statue_width 24 +#define statue_height 24 +static char statue_bits[] = { +0x00,0x00,0x00,0x00,0x03,0x08,0x00,0x03,0x08,0x00,0x01,0x04, +0x80,0x0f,0x04,0x80,0x1f,0x02,0x80,0x37,0x02,0x80,0xc7,0x01, +0x80,0x03,0x01,0x80,0x07,0x00,0x80,0x06,0x00,0x80,0x0d,0x00, +0x80,0x08,0x00,0xa0,0x2a,0x00,0xb0,0xc8,0x00,0x88,0x19,0x01, +0x18,0x80,0x01,0x78,0x60,0x01,0x98,0x1f,0x01,0x18,0x00,0x01, +0x98,0x0a,0x01,0x10,0x85,0x00,0x60,0x60,0x00,0x80,0x1f,0x00}; diff --git a/misc/statue_knight.111.png b/misc/statue_knight.111.png new file mode 100644 index 000000000..60ff063bb Binary files /dev/null and b/misc/statue_knight.111.png differ diff --git a/misc/statue_knight.111.xpm b/misc/statue_knight.111.xpm new file mode 100644 index 000000000..ee27e95cc --- /dev/null +++ b/misc/statue_knight.111.xpm @@ -0,0 +1,36 @@ +/* XPM */ +static char * statue_111_xpm[] = { +/* width height ncolors chars_per_pixel */ +"24 24 6 1", +/* colors */ +" s None c None", +". s Light gray c grey75", +"X c black", +"o s Dark gray c Grey25", +"O s Gray m white c Grey50", +"+ c White", +/* pixels */ +" .", +" XXX X ", +" X.X . ", +" X.X X. ", +" XX . ", +" XoOOX..X ", +" X.OOOOXXX ", +" X.oOOX ", +" X.XOX ", +" XXXoOX ", +" XX+.XOOX ", +" X++XooOXX ", +" X+OX.+o.X ", +" X+XOX+X.X+X ", +" X+XOX+OX++X ", +" XXXX+++XXX+X ", +" XOX+++++++X ", +" XXOX+++++++X ", +" XO..XX+++XX ", +" XO...+XXX+X ", +" X...++++X ", +" X..+++++X ", +" XX+++XX ", +" XXX "}; diff --git a/player/class/Thief/thief.log b/player/class/Thief/thief.log deleted file mode 100644 index a3c773855..000000000 --- a/player/class/Thief/thief.log +++ /dev/null @@ -1,20 +0,0 @@ -This is METAFONT, Version 2.7182 (Web2C 7.3.1) (base=mf 2000.3.7) 13 OCT 2000 12:25 -**thief.111 thief.111.png thief.111.xpm thief.131 thief.131.png thief.131.xpm t -hief.151 thief.151.png thief.151.xpm thief.171 thief.171.png thief.171.xpm thie -f.arc Thief -(thief.111 ->> #define.thief_b_width24#define.thief_b_height24static -! Isolated expression. - - char -l.3 static char - thief_b_bits[] = { -? -! Emergency stop. - - char -l.3 static char - thief_b_bits[] = { -End of file on the terminal! - - diff --git a/weapon/artifact/Lslasher/lava_s.111.xpm.org b/weapon/artifact/Lslasher/lava_s.111.xpm.org deleted file mode 100644 index 786f8c641..000000000 --- a/weapon/artifact/Lslasher/lava_s.111.xpm.org +++ /dev/null @@ -1,33 +0,0 @@ -/* XPM */ -static char * lava_s_111_xpm[] = { -/* width height num_colors chars_per_pixel */ -"24 24 3 1", -/* colors */ -" s None c None", -". c black", -"X c white", -/* pixels */ -" . .XX.. ", -" ..XX..XX. ", -" XXXXXXXX. ", -" . .XXXXX.X. ", -" .X. .XXX.XXXX. ", -" XXX.X.XXXX.XX. ", -" .XXX.XX.X.XX. ", -" .X.X.XX.XX. ", -" . X.XX.XXXX. ", -" XX.X.XXXXX. . ", -" .XX.XX.XX. ", -" .XXX.XX. ", -" .XXXX . ", -" .X.X. ", -" .. .X.X. ", -" ..X.X. ", -" .... . ", -" ..... ", -" .X..X.. ", -" .X..XX.. ", -" ...XXX.. ", -" ..XX.. ", -" ... ", -" "};