diff --git a/buildcfg.txt b/buildcfg.txt index 0c84efa9..6a4c55b8 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2034,95 +2034,70 @@ SKULH0 20 37 SKULI0 24 40 SKULJ0 27 42 SKULK0 30 46 -SPIDA1 128 100 ; spider mastermind -SPIDA2 128 100 -SPIDA3 128 100 -SPIDA4 128 100 -SPIDA5 128 100 -SPIDA6 128 100 -SPIDA7 128 100 -SPIDA8 128 100 -SPIDB1 128 100 -SPIDB2 128 100 -SPIDB3 128 100 -SPIDB4 128 100 -SPIDB5 128 100 -SPIDB6 128 100 -SPIDB7 128 100 -SPIDB8 128 100 -SPIDC1 128 100 -SPIDC2 128 100 -SPIDC3 128 100 -SPIDC4 128 100 -SPIDC5 128 100 -SPIDC6 128 100 -SPIDC7 128 100 -SPIDC8 128 100 -SPIDD1 128 100 -SPIDD2 128 100 -SPIDD3 128 100 -SPIDD4 128 100 -SPIDD5 128 100 -SPIDD6 128 100 -SPIDD7 128 100 -SPIDD8 128 100 -SPIDE1 128 100 -SPIDE2 128 100 -SPIDE3 128 100 -SPIDE4 128 100 -SPIDE5 128 100 -SPIDE6 128 100 -SPIDE7 128 100 -SPIDE8 128 100 -SPIDF1 128 100 -SPIDF2 128 100 -SPIDF3 128 100 -SPIDF4 128 100 -SPIDF5 128 100 -SPIDF6 128 100 -SPIDF7 128 100 -SPIDF8 128 100 -SPIDG1 128 100 -SPIDG2 128 100 -SPIDG3 128 100 -SPIDG4 128 100 -SPIDG5 128 100 -SPIDG6 128 100 -SPIDG7 128 100 -SPIDG8 128 100 -SPIDH1 128 100 -SPIDH2 128 100 -SPIDH3 128 100 -SPIDH4 128 100 -SPIDH5 128 100 -SPIDH6 128 100 -SPIDH7 128 100 -SPIDH8 128 100 -SPIDI1 128 100 -SPIDI2 128 100 -SPIDI3 128 100 -SPIDI4 128 100 -SPIDI5 128 100 -SPIDI6 128 100 -SPIDI7 128 100 -SPIDI8 128 100 -SPIDJ1 128 100 -SPIDJ2 128 100 -SPIDJ3 128 100 -SPIDJ4 128 100 -SPIDJ5 128 100 -SPIDJ6 128 100 -SPIDJ7 128 100 -SPIDJ8 128 100 -SPIDK0 128 100 -SPIDL0 128 100 -SPIDM0 128 100 -SPIDN0 128 100 -SPIDO0 128 100 -SPIDP0 128 100 -SPIDQ0 128 100 -SPIDR0 128 100 -SPIDS0 128 100 +SPIDA1 120 155 ; spider mastermind +SPIDA2A8 120 155 +SPIDA3A7 120 155 +SPIDA4A6 120 155 +SPIDA5 120 155 +SPIDB1 120 155 +SPIDB2B8 120 155 +SPIDB3B7 120 155 +SPIDB4B6 120 155 +SPIDB5 120 155 +SPIDC1 120 155 +SPIDC2C8 120 155 +SPIDC3C7 120 155 +SPIDC4C6 120 155 +SPIDC5 120 155 +SPIDD1 120 155 +SPIDD2D8 120 155 +SPIDD3D7 120 155 +SPIDD4D6 120 155 +SPIDD5 120 155 +SPIDE1 120 155 +SPIDE2E8 120 155 +SPIDE3E7 120 155 +SPIDE4E6 120 155 +SPIDE5 120 155 +SPIDF1 120 155 +SPIDF2f8 120 155 +SPIDF3F7 120 155 +SPIDF4F6 120 155 +SPIDF5 120 155 +SPIDG1 120 155 +SPIDG2 120 155 +SPIDG3 120 155 +SPIDG4 120 155 +SPIDG5 120 155 +SPIDG6 120 155 +SPIDG7 120 155 +SPIDG8 120 155 +SPIDH1 120 155 +SPIDH2 120 155 +SPIDH3 120 155 +SPIDH4 120 155 +SPIDH5 120 155 +SPIDH6 120 155 +SPIDH7 120 155 +SPIDH8 120 155 +SPIDI1 120 155 +SPIDI2 120 155 +SPIDI3 120 155 +SPIDI4 120 155 +SPIDI5 120 155 +SPIDI6 120 155 +SPIDI7 120 155 +SPIDI8 120 155 +SPIDJ0 120 155 +SPIDK0 120 155 +SPIDL0 120 155 +SPIDM0 120 155 +SPIDN0 120 155 +SPIDO0 120 155 +SPIDP0 120 105 +SPIDQ0 152 105 +SPIDR0 152 53 +SPIDS0 152 53 ; The following sprites are technically Doom 2 sprites, but appear ; in doom.wad, and so must be included for compatibility reasons (some diff --git a/sprites/spida1.png b/sprites/spida1.png index 0d221d3e..3e67ce62 100644 Binary files a/sprites/spida1.png and b/sprites/spida1.png differ diff --git a/sprites/spida2.png b/sprites/spida2.png deleted file mode 100644 index fd68cf48..00000000 Binary files a/sprites/spida2.png and /dev/null differ diff --git a/sprites/spida2a8.png b/sprites/spida2a8.png new file mode 100644 index 00000000..ccf8cb57 Binary files /dev/null and b/sprites/spida2a8.png differ diff --git a/sprites/spida3.png b/sprites/spida3.png deleted file mode 100644 index c2d77371..00000000 Binary files a/sprites/spida3.png and /dev/null differ diff --git a/sprites/spida3a7.png b/sprites/spida3a7.png new file mode 100644 index 00000000..3d2aaafc Binary files /dev/null and b/sprites/spida3a7.png differ diff --git a/sprites/spida4.png b/sprites/spida4.png deleted file mode 100644 index 95a036a4..00000000 Binary files a/sprites/spida4.png and /dev/null differ diff --git a/sprites/spida4a6.png b/sprites/spida4a6.png new file mode 100644 index 00000000..bed09a2e Binary files /dev/null and b/sprites/spida4a6.png differ diff --git a/sprites/spida5.png b/sprites/spida5.png index 642d78ce..4c40ef63 100644 Binary files a/sprites/spida5.png and b/sprites/spida5.png differ diff --git a/sprites/spida6.png b/sprites/spida6.png deleted file mode 100644 index d7835122..00000000 Binary files a/sprites/spida6.png and /dev/null differ diff --git a/sprites/spida7.png b/sprites/spida7.png deleted file mode 100644 index 436db32d..00000000 Binary files a/sprites/spida7.png and /dev/null differ diff --git a/sprites/spida8.png b/sprites/spida8.png deleted file mode 100644 index 4f8e5332..00000000 Binary files a/sprites/spida8.png and /dev/null differ diff --git a/sprites/spidb1.png b/sprites/spidb1.png index 04aa2228..ef20b013 100644 Binary files a/sprites/spidb1.png and b/sprites/spidb1.png differ diff --git a/sprites/spidb2.png b/sprites/spidb2.png deleted file mode 100644 index 01c12f99..00000000 Binary files a/sprites/spidb2.png and /dev/null differ diff --git a/sprites/spidb2b8.png b/sprites/spidb2b8.png new file mode 100644 index 00000000..8cd2c45e Binary files /dev/null and b/sprites/spidb2b8.png differ diff --git a/sprites/spidb3.png b/sprites/spidb3.png deleted file mode 100644 index 91d430cd..00000000 Binary files a/sprites/spidb3.png and /dev/null differ diff --git a/sprites/spidb3b7.png b/sprites/spidb3b7.png new file mode 100644 index 00000000..02fecff0 Binary files /dev/null and b/sprites/spidb3b7.png differ diff --git a/sprites/spidb4.png b/sprites/spidb4.png deleted file mode 100644 index 20f6145e..00000000 Binary files a/sprites/spidb4.png and /dev/null differ diff --git a/sprites/spidb4b6.png b/sprites/spidb4b6.png new file mode 100644 index 00000000..186c45e3 Binary files /dev/null and b/sprites/spidb4b6.png differ diff --git a/sprites/spidb5.png b/sprites/spidb5.png index 3ec42920..3c5c59cc 100644 Binary files a/sprites/spidb5.png and b/sprites/spidb5.png differ diff --git a/sprites/spidb6.png b/sprites/spidb6.png deleted file mode 100644 index 32addec7..00000000 Binary files a/sprites/spidb6.png and /dev/null differ diff --git a/sprites/spidb7.png b/sprites/spidb7.png deleted file mode 100644 index aec4e9ff..00000000 Binary files a/sprites/spidb7.png and /dev/null differ diff --git a/sprites/spidb8.png b/sprites/spidb8.png deleted file mode 100644 index fea8216c..00000000 Binary files a/sprites/spidb8.png and /dev/null differ diff --git a/sprites/spidc1.png b/sprites/spidc1.png index f2e7319d..862ca58a 100644 Binary files a/sprites/spidc1.png and b/sprites/spidc1.png differ diff --git a/sprites/spidc2.png b/sprites/spidc2.png deleted file mode 100644 index 4c0b3474..00000000 Binary files a/sprites/spidc2.png and /dev/null differ diff --git a/sprites/spidc2c8.png b/sprites/spidc2c8.png new file mode 100644 index 00000000..ac486899 Binary files /dev/null and b/sprites/spidc2c8.png differ diff --git a/sprites/spidc3.png b/sprites/spidc3.png deleted file mode 100644 index ae95051f..00000000 Binary files a/sprites/spidc3.png and /dev/null differ diff --git a/sprites/spidc3c7.png b/sprites/spidc3c7.png new file mode 100644 index 00000000..14223f69 Binary files /dev/null and b/sprites/spidc3c7.png differ diff --git a/sprites/spidc4.png b/sprites/spidc4.png deleted file mode 100644 index 228f9ac9..00000000 Binary files a/sprites/spidc4.png and /dev/null differ diff --git a/sprites/spidc4c6.png b/sprites/spidc4c6.png new file mode 100644 index 00000000..673d534a Binary files /dev/null and b/sprites/spidc4c6.png differ diff --git a/sprites/spidc5.png b/sprites/spidc5.png index 6b5d6879..677d4b90 100644 Binary files a/sprites/spidc5.png and b/sprites/spidc5.png differ diff --git a/sprites/spidc6.png b/sprites/spidc6.png deleted file mode 100644 index cdedc860..00000000 Binary files a/sprites/spidc6.png and /dev/null differ diff --git a/sprites/spidc7.png b/sprites/spidc7.png deleted file mode 100644 index 5d462906..00000000 Binary files a/sprites/spidc7.png and /dev/null differ diff --git a/sprites/spidc8.png b/sprites/spidc8.png deleted file mode 100644 index 79c6bdb0..00000000 Binary files a/sprites/spidc8.png and /dev/null differ diff --git a/sprites/spidd1.png b/sprites/spidd1.png index c345c2c8..b04acb64 100644 Binary files a/sprites/spidd1.png and b/sprites/spidd1.png differ diff --git a/sprites/spidd2.png b/sprites/spidd2.png deleted file mode 100644 index d4485840..00000000 Binary files a/sprites/spidd2.png and /dev/null differ diff --git a/sprites/spidd2d8.png b/sprites/spidd2d8.png new file mode 100644 index 00000000..978e1e1c Binary files /dev/null and b/sprites/spidd2d8.png differ diff --git a/sprites/spidd3.png b/sprites/spidd3.png deleted file mode 100644 index 3593ddf8..00000000 Binary files a/sprites/spidd3.png and /dev/null differ diff --git a/sprites/spidd3d7.png b/sprites/spidd3d7.png new file mode 100644 index 00000000..e7ca6310 Binary files /dev/null and b/sprites/spidd3d7.png differ diff --git a/sprites/spidd4.png b/sprites/spidd4.png deleted file mode 100644 index 6ebb5a62..00000000 Binary files a/sprites/spidd4.png and /dev/null differ diff --git a/sprites/spidd4d6.png b/sprites/spidd4d6.png new file mode 100644 index 00000000..c42f1625 Binary files /dev/null and b/sprites/spidd4d6.png differ diff --git a/sprites/spidd5.png b/sprites/spidd5.png index cb1fa2e1..0a1a64a2 100644 Binary files a/sprites/spidd5.png and b/sprites/spidd5.png differ diff --git a/sprites/spidd6.png b/sprites/spidd6.png deleted file mode 100644 index ad299ecb..00000000 Binary files a/sprites/spidd6.png and /dev/null differ diff --git a/sprites/spidd7.png b/sprites/spidd7.png deleted file mode 100644 index 7b9e2299..00000000 Binary files a/sprites/spidd7.png and /dev/null differ diff --git a/sprites/spidd8.png b/sprites/spidd8.png deleted file mode 100644 index 6f03dc41..00000000 Binary files a/sprites/spidd8.png and /dev/null differ diff --git a/sprites/spide1.png b/sprites/spide1.png index 2bd348f2..89f6639a 100644 Binary files a/sprites/spide1.png and b/sprites/spide1.png differ diff --git a/sprites/spide2.png b/sprites/spide2.png deleted file mode 100644 index 9566d767..00000000 Binary files a/sprites/spide2.png and /dev/null differ diff --git a/sprites/spide2e8.png b/sprites/spide2e8.png new file mode 100644 index 00000000..d4cbe563 Binary files /dev/null and b/sprites/spide2e8.png differ diff --git a/sprites/spide3.png b/sprites/spide3.png deleted file mode 100644 index 734507dc..00000000 Binary files a/sprites/spide3.png and /dev/null differ diff --git a/sprites/spide3e7.png b/sprites/spide3e7.png new file mode 100644 index 00000000..104afd3e Binary files /dev/null and b/sprites/spide3e7.png differ diff --git a/sprites/spide4.png b/sprites/spide4.png deleted file mode 100644 index 2c83718d..00000000 Binary files a/sprites/spide4.png and /dev/null differ diff --git a/sprites/spide4e6.png b/sprites/spide4e6.png new file mode 100644 index 00000000..be572863 Binary files /dev/null and b/sprites/spide4e6.png differ diff --git a/sprites/spide5.png b/sprites/spide5.png index 2e48c037..36e02636 100644 Binary files a/sprites/spide5.png and b/sprites/spide5.png differ diff --git a/sprites/spide6.png b/sprites/spide6.png deleted file mode 100644 index f2d9cd62..00000000 Binary files a/sprites/spide6.png and /dev/null differ diff --git a/sprites/spide7.png b/sprites/spide7.png deleted file mode 100644 index 9f27e3a8..00000000 Binary files a/sprites/spide7.png and /dev/null differ diff --git a/sprites/spide8.png b/sprites/spide8.png deleted file mode 100644 index 080cc8ff..00000000 Binary files a/sprites/spide8.png and /dev/null differ diff --git a/sprites/spidf1.png b/sprites/spidf1.png index cd32c5c3..5421eff0 100644 Binary files a/sprites/spidf1.png and b/sprites/spidf1.png differ diff --git a/sprites/spidf2.png b/sprites/spidf2.png deleted file mode 100644 index d75befc9..00000000 Binary files a/sprites/spidf2.png and /dev/null differ diff --git a/sprites/spidf2f8.png b/sprites/spidf2f8.png new file mode 100644 index 00000000..92b4595b Binary files /dev/null and b/sprites/spidf2f8.png differ diff --git a/sprites/spidf3.png b/sprites/spidf3.png deleted file mode 100644 index b20e96f8..00000000 Binary files a/sprites/spidf3.png and /dev/null differ diff --git a/sprites/spidf3f7.png b/sprites/spidf3f7.png new file mode 100644 index 00000000..0d0ac9ab Binary files /dev/null and b/sprites/spidf3f7.png differ diff --git a/sprites/spidf4.png b/sprites/spidf4.png deleted file mode 100644 index d10f1119..00000000 Binary files a/sprites/spidf4.png and /dev/null differ diff --git a/sprites/spidf4f6.png b/sprites/spidf4f6.png new file mode 100644 index 00000000..603e3664 Binary files /dev/null and b/sprites/spidf4f6.png differ diff --git a/sprites/spidf5.png b/sprites/spidf5.png index 076f1026..26c734b4 100644 Binary files a/sprites/spidf5.png and b/sprites/spidf5.png differ diff --git a/sprites/spidf6.png b/sprites/spidf6.png deleted file mode 100644 index 809f4af2..00000000 Binary files a/sprites/spidf6.png and /dev/null differ diff --git a/sprites/spidf7.png b/sprites/spidf7.png deleted file mode 100644 index 1f7ae190..00000000 Binary files a/sprites/spidf7.png and /dev/null differ diff --git a/sprites/spidf8.png b/sprites/spidf8.png deleted file mode 100644 index bd9d2912..00000000 Binary files a/sprites/spidf8.png and /dev/null differ diff --git a/sprites/spidg1.png b/sprites/spidg1.png index 3bf060e7..884fb818 100644 Binary files a/sprites/spidg1.png and b/sprites/spidg1.png differ diff --git a/sprites/spidg2.png b/sprites/spidg2.png index 5eb77fe3..0ea02bfd 100644 Binary files a/sprites/spidg2.png and b/sprites/spidg2.png differ diff --git a/sprites/spidg3.png b/sprites/spidg3.png index 7157ce5c..221b6c59 100644 Binary files a/sprites/spidg3.png and b/sprites/spidg3.png differ diff --git a/sprites/spidg4.png b/sprites/spidg4.png index 68fadaaa..6a94d063 100644 Binary files a/sprites/spidg4.png and b/sprites/spidg4.png differ diff --git a/sprites/spidg5.png b/sprites/spidg5.png index fcdcf828..b6b67080 100644 Binary files a/sprites/spidg5.png and b/sprites/spidg5.png differ diff --git a/sprites/spidg6.png b/sprites/spidg6.png index cb997219..15e17f4a 100644 Binary files a/sprites/spidg6.png and b/sprites/spidg6.png differ diff --git a/sprites/spidg7.png b/sprites/spidg7.png index d104a4c3..18ade452 100644 Binary files a/sprites/spidg7.png and b/sprites/spidg7.png differ diff --git a/sprites/spidg8.png b/sprites/spidg8.png index a8a602a2..66056550 100644 Binary files a/sprites/spidg8.png and b/sprites/spidg8.png differ diff --git a/sprites/spidh1.png b/sprites/spidh1.png index a0242661..0e6c5b00 100644 Binary files a/sprites/spidh1.png and b/sprites/spidh1.png differ diff --git a/sprites/spidh2.png b/sprites/spidh2.png index 360a68dc..f4a39dee 100644 Binary files a/sprites/spidh2.png and b/sprites/spidh2.png differ diff --git a/sprites/spidh3.png b/sprites/spidh3.png index 2446bf68..78df23ad 100644 Binary files a/sprites/spidh3.png and b/sprites/spidh3.png differ diff --git a/sprites/spidh4.png b/sprites/spidh4.png index 952b172a..0e873944 100644 Binary files a/sprites/spidh4.png and b/sprites/spidh4.png differ diff --git a/sprites/spidh5.png b/sprites/spidh5.png index 130735fd..37de7b3a 100644 Binary files a/sprites/spidh5.png and b/sprites/spidh5.png differ diff --git a/sprites/spidh6.png b/sprites/spidh6.png index 7ac57b31..c697c445 100644 Binary files a/sprites/spidh6.png and b/sprites/spidh6.png differ diff --git a/sprites/spidh7.png b/sprites/spidh7.png index c8962fdf..f3a62bb4 100644 Binary files a/sprites/spidh7.png and b/sprites/spidh7.png differ diff --git a/sprites/spidh8.png b/sprites/spidh8.png index fafc8cd7..935c0538 100644 Binary files a/sprites/spidh8.png and b/sprites/spidh8.png differ diff --git a/sprites/spidi1.png b/sprites/spidi1.png index 34d49cb4..0a8d257a 100644 Binary files a/sprites/spidi1.png and b/sprites/spidi1.png differ diff --git a/sprites/spidi2.png b/sprites/spidi2.png index 02fcd681..edede721 100644 Binary files a/sprites/spidi2.png and b/sprites/spidi2.png differ diff --git a/sprites/spidi3.png b/sprites/spidi3.png index da2b9ebd..e34321f9 100644 Binary files a/sprites/spidi3.png and b/sprites/spidi3.png differ diff --git a/sprites/spidi4.png b/sprites/spidi4.png index 456c3d8b..ad91e6da 100644 Binary files a/sprites/spidi4.png and b/sprites/spidi4.png differ diff --git a/sprites/spidi5.png b/sprites/spidi5.png index 7d17540d..d71fc0b0 100644 Binary files a/sprites/spidi5.png and b/sprites/spidi5.png differ diff --git a/sprites/spidi6.png b/sprites/spidi6.png index 583c1e79..eb93fa79 100644 Binary files a/sprites/spidi6.png and b/sprites/spidi6.png differ diff --git a/sprites/spidi7.png b/sprites/spidi7.png index a7502741..cc273cbf 100644 Binary files a/sprites/spidi7.png and b/sprites/spidi7.png differ diff --git a/sprites/spidi8.png b/sprites/spidi8.png index 57f0f7ad..51dcadb5 100644 Binary files a/sprites/spidi8.png and b/sprites/spidi8.png differ diff --git a/sprites/spidj0.png b/sprites/spidj0.png new file mode 100644 index 00000000..9be1795d Binary files /dev/null and b/sprites/spidj0.png differ diff --git a/sprites/spidj1.png b/sprites/spidj1.png deleted file mode 100644 index 6908325e..00000000 Binary files a/sprites/spidj1.png and /dev/null differ diff --git a/sprites/spidj2.png b/sprites/spidj2.png deleted file mode 100644 index 87de2562..00000000 Binary files a/sprites/spidj2.png and /dev/null differ diff --git a/sprites/spidj3.png b/sprites/spidj3.png deleted file mode 100644 index c2b0b420..00000000 Binary files a/sprites/spidj3.png and /dev/null differ diff --git a/sprites/spidj4.png b/sprites/spidj4.png deleted file mode 100644 index 6b1b5a74..00000000 Binary files a/sprites/spidj4.png and /dev/null differ diff --git a/sprites/spidj5.png b/sprites/spidj5.png deleted file mode 100644 index a0c3e985..00000000 Binary files a/sprites/spidj5.png and /dev/null differ diff --git a/sprites/spidj6.png b/sprites/spidj6.png deleted file mode 100644 index e26e3db2..00000000 Binary files a/sprites/spidj6.png and /dev/null differ diff --git a/sprites/spidj7.png b/sprites/spidj7.png deleted file mode 100644 index fca47d87..00000000 Binary files a/sprites/spidj7.png and /dev/null differ diff --git a/sprites/spidj8.png b/sprites/spidj8.png deleted file mode 100644 index d6ab0d0e..00000000 Binary files a/sprites/spidj8.png and /dev/null differ diff --git a/sprites/spidk0.png b/sprites/spidk0.png index 85500947..3bb6cfd4 100644 Binary files a/sprites/spidk0.png and b/sprites/spidk0.png differ diff --git a/sprites/spidl0.png b/sprites/spidl0.png index 10f8193e..338a8657 100644 Binary files a/sprites/spidl0.png and b/sprites/spidl0.png differ diff --git a/sprites/spidm0.png b/sprites/spidm0.png index 9cb3cf3e..5f574abc 100644 Binary files a/sprites/spidm0.png and b/sprites/spidm0.png differ diff --git a/sprites/spidn0.png b/sprites/spidn0.png index 4a111913..58cec59a 100644 Binary files a/sprites/spidn0.png and b/sprites/spidn0.png differ diff --git a/sprites/spido0.png b/sprites/spido0.png index 392fbd54..e45a47fd 100644 Binary files a/sprites/spido0.png and b/sprites/spido0.png differ diff --git a/sprites/spidp0.png b/sprites/spidp0.png index 22fee017..a7e7cc18 100644 Binary files a/sprites/spidp0.png and b/sprites/spidp0.png differ diff --git a/sprites/spidq0.png b/sprites/spidq0.png index 2ea3cbbb..a8a05670 100644 Binary files a/sprites/spidq0.png and b/sprites/spidq0.png differ diff --git a/sprites/spidr0.png b/sprites/spidr0.png index 5240ce5d..c3148df6 100644 Binary files a/sprites/spidr0.png and b/sprites/spidr0.png differ diff --git a/sprites/spids0.png b/sprites/spids0.png index 0279808f..c3148df6 100644 Binary files a/sprites/spids0.png and b/sprites/spids0.png differ