diff --git a/buildcfg.txt b/buildcfg.txt index e30cb723..c3ca6f50 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1354,47 +1354,47 @@ KEENK0 19 65 KEENL0 19 22 KEENM0 10 68 -PAINA1 31 63 ; pain elemental -PAINA2A8 30 60 -PAINA3A7 30 63 -PAINA4A6 30 60 -PAINA5 30 60 -PAINB1 30 63 -PAINB2B8 30 60 -PAINB3B7 30 60 -PAINB4B6 30 60 -PAINB5 30 60 -PAINC1 31 65 -PAINC2C8 30 61 -PAINC3C7 30 61 -PAINC4C6 30 60 -PAINC5 31 60 -PAIND1 30 61 -PAIND2D8 31 60 -PAIND3D7 34 60 -PAIND4D6 30 60 -PAIND5 30 60 -PAINE1 30 60 -PAINE2E8 34 60 -PAINE3E7 37 60 -PAINE4E6 30 60 -PAINE5 31 60 -PAINF1 31 60 -PAINF2F8 35 60 -PAINF3F7 41 60 -PAINF4F6 32 60 -PAINF5 31 60 -PAING1 30 63 -PAING2G8 30 60 -PAING3G7 30 60 -PAING4G6 30 60 -PAING5 30 60 -PAINH0 30 68 -PAINI0 30 61 -PAINJ0 31 61 -PAINK0 31 60 -PAINL0 31 61 -PAINM0 30 61 +PAINA1 37 62 ; pain elemental +PAINA2A8 43 60 +PAINA3A7 47 62 +PAINA4A6 37 58 +PAINA5 33 60 +PAINB1 37 62 +PAINB2B8 43 60 +PAINB3B7 47 62 +PAINB4B6 37 58 +PAINB5 33 60 +PAINC1 37 62 +PAINC2C8 43 60 +PAINC3C7 47 62 +PAINC4C6 37 58 +PAINC5 33 60 +PAIND1 37 56 +PAIND2D8 44 57 +PAIND3D7 48 57 +PAIND4D6 37 59 +PAIND5 33 60 +PAINE1 37 62 +PAINE2E8 44 63 +PAINE3E7 49 65 +PAINE4E6 37 58 +PAINE5 33 62 +PAINF1 36 63 +PAINF2F8 48 63 +PAINF3F7 50 64 +PAINF4F6 39 59 +PAINF5 33 61 +PAING1 37 61 +PAING2G8 44 61 +PAING3G7 47 62 +PAING4G6 37 59 +PAING5 33 61 +PAINH0 37 61 +PAINI0 38 62 +PAINJ0 40 71 +PAINK0 37 71 +PAINL0 38 67 +PAINM0 45 69 SKELA1D1 20 58 ; revenant SKELA2D8 17 57 SKELA3D7 13 58 @@ -2095,37 +2095,37 @@ HEADI0 50 69 HEADJ0 39 68 HEADK0 37 47 HEADL0 38 28 -SKULA1 22 44 ; lost soul -SKULA8A2 18 39 -SKULA7A3 19 43 -SKULA6A4 17 43 -SKULA5 20 43 -SKULB1 20 42 -SKULB8B2 18 39 -SKULB7B3 19 43 -SKULB6B4 16 42 -SKULB5 20 43 -SKULC1 22 44 -SKULC8C2 18 39 -SKULC7C3 19 43 -SKULC6C4 16 42 -SKULC5 20 43 -SKULD1 22 44 -SKULD8D2 18 39 -SKULD7D3 19 43 -SKULD6D4 16 42 -SKULD5 20 43 -SKULE1 22 44 -SKULE8E2 18 39 -SKULE7E3 19 43 -SKULE6E4 16 42 -SKULE5 20 43 -SKULF0 22 47 -SKULG0 22 47 -SKULH0 24 46 -SKULI0 24 46 -SKULJ0 34 68 -SKULK0 40 73 +SKULA1 15 35 ; lost soul +SKULA8A2 14 35 +SKULA7A3 15 35 +SKULA6A4 15 35 +SKULA5 15 35 +SKULB1 15 35 +SKULB8B2 14 35 +SKULB7B3 15 35 +SKULB6B4 15 35 +SKULB5 15 35 +SKULC1 16 33 +SKULC8C2 17 33 +SKULC7C3 15 34 +SKULC6C4 19 32 +SKULC5 17 32 +SKULD1 16 32 +SKULD8D2 16 33 +SKULD7D3 17 34 +SKULD6D4 18 33 +SKULD5 17 32 +SKULE1 17 33 +SKULE8E2 16 33 +SKULE7E3 16 35 +SKULE6E4 18 32 +SKULE5 17 32 +SKULF0 14 32 +SKULG0 15 32 +SKULH0 13 33 +SKULI0 15 36 +SKULJ0 20 38 +SKULK0 24 42 SPIDA1 128 100 ; spider mastermind SPIDA2 128 100 SPIDA3 128 100 diff --git a/sounds/dspedth.wav b/sounds/dspedth.wav index a2469c4f..8cd727c7 100644 Binary files a/sounds/dspedth.wav and b/sounds/dspedth.wav differ diff --git a/sprites/paina1.png b/sprites/paina1.png index cac04e53..5c362e7e 100644 Binary files a/sprites/paina1.png and b/sprites/paina1.png differ diff --git a/sprites/paina2a8.png b/sprites/paina2a8.png index e03c6721..2ef834c8 100644 Binary files a/sprites/paina2a8.png and b/sprites/paina2a8.png differ diff --git a/sprites/paina3a7.png b/sprites/paina3a7.png index 4484c18c..a7abf235 100644 Binary files a/sprites/paina3a7.png and b/sprites/paina3a7.png differ diff --git a/sprites/paina4a6.png b/sprites/paina4a6.png index 0937d552..00135e1c 100644 Binary files a/sprites/paina4a6.png and b/sprites/paina4a6.png differ diff --git a/sprites/paina5.png b/sprites/paina5.png index 68ed77b1..9af90b14 100644 Binary files a/sprites/paina5.png and b/sprites/paina5.png differ diff --git a/sprites/painb1.png b/sprites/painb1.png index 085f3974..c52b83a8 100644 Binary files a/sprites/painb1.png and b/sprites/painb1.png differ diff --git a/sprites/painb2b8.png b/sprites/painb2b8.png index d45dc543..f7ed8d1d 100644 Binary files a/sprites/painb2b8.png and b/sprites/painb2b8.png differ diff --git a/sprites/painb3b7.png b/sprites/painb3b7.png index d58bd3b8..7e55896e 100644 Binary files a/sprites/painb3b7.png and b/sprites/painb3b7.png differ diff --git a/sprites/painb4b6.png b/sprites/painb4b6.png index 52974e04..00135e1c 100644 Binary files a/sprites/painb4b6.png and b/sprites/painb4b6.png differ diff --git a/sprites/painb5.png b/sprites/painb5.png index 52989593..9af90b14 100644 Binary files a/sprites/painb5.png and b/sprites/painb5.png differ diff --git a/sprites/painc1.png b/sprites/painc1.png index eddebb74..19ec1666 100644 Binary files a/sprites/painc1.png and b/sprites/painc1.png differ diff --git a/sprites/painc2c8.png b/sprites/painc2c8.png index 6bb52c1f..f1d4b4f4 100644 Binary files a/sprites/painc2c8.png and b/sprites/painc2c8.png differ diff --git a/sprites/painc3c7.png b/sprites/painc3c7.png index 9951312a..04a4f329 100644 Binary files a/sprites/painc3c7.png and b/sprites/painc3c7.png differ diff --git a/sprites/painc4c6.png b/sprites/painc4c6.png index ad8b7129..00135e1c 100644 Binary files a/sprites/painc4c6.png and b/sprites/painc4c6.png differ diff --git a/sprites/painc5.png b/sprites/painc5.png index a7b7d094..9af90b14 100644 Binary files a/sprites/painc5.png and b/sprites/painc5.png differ diff --git a/sprites/paind1.png b/sprites/paind1.png index d75a57f9..5ae6c7de 100644 Binary files a/sprites/paind1.png and b/sprites/paind1.png differ diff --git a/sprites/paind2d8.png b/sprites/paind2d8.png index d00ef0b6..014ea993 100644 Binary files a/sprites/paind2d8.png and b/sprites/paind2d8.png differ diff --git a/sprites/paind3d7.png b/sprites/paind3d7.png index baeb3703..0265dc48 100644 Binary files a/sprites/paind3d7.png and b/sprites/paind3d7.png differ diff --git a/sprites/paind4d6.png b/sprites/paind4d6.png index c6e781c2..b7996e77 100644 Binary files a/sprites/paind4d6.png and b/sprites/paind4d6.png differ diff --git a/sprites/paind5.png b/sprites/paind5.png index 42e683da..d75c3fb8 100644 Binary files a/sprites/paind5.png and b/sprites/paind5.png differ diff --git a/sprites/paine1.png b/sprites/paine1.png index a00886d6..b67e6763 100644 Binary files a/sprites/paine1.png and b/sprites/paine1.png differ diff --git a/sprites/paine2e8.png b/sprites/paine2e8.png index e6539858..0c2d1297 100644 Binary files a/sprites/paine2e8.png and b/sprites/paine2e8.png differ diff --git a/sprites/paine3e7.png b/sprites/paine3e7.png index 0136653c..263f0699 100644 Binary files a/sprites/paine3e7.png and b/sprites/paine3e7.png differ diff --git a/sprites/paine4e6.png b/sprites/paine4e6.png index 1f5e421a..a77136a9 100644 Binary files a/sprites/paine4e6.png and b/sprites/paine4e6.png differ diff --git a/sprites/paine5.png b/sprites/paine5.png index b46012ef..eaa19a7b 100644 Binary files a/sprites/paine5.png and b/sprites/paine5.png differ diff --git a/sprites/painf1.png b/sprites/painf1.png index 466ae409..04839b59 100644 Binary files a/sprites/painf1.png and b/sprites/painf1.png differ diff --git a/sprites/painf2f8.png b/sprites/painf2f8.png index e1652d05..994f9947 100644 Binary files a/sprites/painf2f8.png and b/sprites/painf2f8.png differ diff --git a/sprites/painf3f7.png b/sprites/painf3f7.png index 64fddb11..009341b2 100644 Binary files a/sprites/painf3f7.png and b/sprites/painf3f7.png differ diff --git a/sprites/painf4f6.png b/sprites/painf4f6.png index c3f7eec8..d5a033e4 100644 Binary files a/sprites/painf4f6.png and b/sprites/painf4f6.png differ diff --git a/sprites/painf5.png b/sprites/painf5.png index 2ed9b2ba..d308a8df 100644 Binary files a/sprites/painf5.png and b/sprites/painf5.png differ diff --git a/sprites/paing1.png b/sprites/paing1.png index cef5c3f1..842d3e47 100644 Binary files a/sprites/paing1.png and b/sprites/paing1.png differ diff --git a/sprites/paing2g8.png b/sprites/paing2g8.png index dc33610f..8364beec 100644 Binary files a/sprites/paing2g8.png and b/sprites/paing2g8.png differ diff --git a/sprites/paing3g7.png b/sprites/paing3g7.png index b3cf0617..277be1c8 100644 Binary files a/sprites/paing3g7.png and b/sprites/paing3g7.png differ diff --git a/sprites/paing4g6.png b/sprites/paing4g6.png index 2e77f934..a1a0ab50 100644 Binary files a/sprites/paing4g6.png and b/sprites/paing4g6.png differ diff --git a/sprites/paing5.png b/sprites/paing5.png index 1d290676..cc84f911 100644 Binary files a/sprites/paing5.png and b/sprites/paing5.png differ diff --git a/sprites/painh0.png b/sprites/painh0.png index f001bb2a..4cfb4a39 100644 Binary files a/sprites/painh0.png and b/sprites/painh0.png differ diff --git a/sprites/paini0.png b/sprites/paini0.png index 630ed792..fe619cc1 100644 Binary files a/sprites/paini0.png and b/sprites/paini0.png differ diff --git a/sprites/painj0.png b/sprites/painj0.png index 6f44e608..0c21d469 100644 Binary files a/sprites/painj0.png and b/sprites/painj0.png differ diff --git a/sprites/paink0.png b/sprites/paink0.png index 307128e4..311521e3 100644 Binary files a/sprites/paink0.png and b/sprites/paink0.png differ diff --git a/sprites/painl0.png b/sprites/painl0.png index a5ec84fb..67e6541c 100644 Binary files a/sprites/painl0.png and b/sprites/painl0.png differ diff --git a/sprites/painm0.png b/sprites/painm0.png index ea54051e..03230644 100644 Binary files a/sprites/painm0.png and b/sprites/painm0.png differ diff --git a/sprites/skula1.png b/sprites/skula1.png index 2244fc2b..25472ab6 100644 Binary files a/sprites/skula1.png and b/sprites/skula1.png differ diff --git a/sprites/skula5.png b/sprites/skula5.png index 9a54a838..cd01eaf5 100644 Binary files a/sprites/skula5.png and b/sprites/skula5.png differ diff --git a/sprites/skula6a4.png b/sprites/skula6a4.png index 3886a46c..129ce70a 100644 Binary files a/sprites/skula6a4.png and b/sprites/skula6a4.png differ diff --git a/sprites/skula7a3.png b/sprites/skula7a3.png index b015256c..0656d86a 100644 Binary files a/sprites/skula7a3.png and b/sprites/skula7a3.png differ diff --git a/sprites/skula8a2.png b/sprites/skula8a2.png index 3a2e2536..477b8cf5 100644 Binary files a/sprites/skula8a2.png and b/sprites/skula8a2.png differ diff --git a/sprites/skulb1.png b/sprites/skulb1.png index 6788f206..3ba9a954 100644 Binary files a/sprites/skulb1.png and b/sprites/skulb1.png differ diff --git a/sprites/skulb5.png b/sprites/skulb5.png index 9a54a838..561c48ae 100644 Binary files a/sprites/skulb5.png and b/sprites/skulb5.png differ diff --git a/sprites/skulb6b4.png b/sprites/skulb6b4.png index cd824df7..1376d6d1 100644 Binary files a/sprites/skulb6b4.png and b/sprites/skulb6b4.png differ diff --git a/sprites/skulb7b3.png b/sprites/skulb7b3.png index c63718ff..061bd0ab 100644 Binary files a/sprites/skulb7b3.png and b/sprites/skulb7b3.png differ diff --git a/sprites/skulb8b2.png b/sprites/skulb8b2.png index 3a2e2536..f590b9fd 100644 Binary files a/sprites/skulb8b2.png and b/sprites/skulb8b2.png differ diff --git a/sprites/skulc1.png b/sprites/skulc1.png index 11d29680..874f342b 100644 Binary files a/sprites/skulc1.png and b/sprites/skulc1.png differ diff --git a/sprites/skulc5.png b/sprites/skulc5.png index 9a54a838..2141e3ed 100644 Binary files a/sprites/skulc5.png and b/sprites/skulc5.png differ diff --git a/sprites/skulc6c4.png b/sprites/skulc6c4.png index cd824df7..4c201f21 100644 Binary files a/sprites/skulc6c4.png and b/sprites/skulc6c4.png differ diff --git a/sprites/skulc7c3.png b/sprites/skulc7c3.png index 6e45dbef..1be2730d 100644 Binary files a/sprites/skulc7c3.png and b/sprites/skulc7c3.png differ diff --git a/sprites/skulc8c2.png b/sprites/skulc8c2.png index 38e321ec..00aa2e85 100644 Binary files a/sprites/skulc8c2.png and b/sprites/skulc8c2.png differ diff --git a/sprites/skuld1.png b/sprites/skuld1.png index 11d29680..24c886a7 100644 Binary files a/sprites/skuld1.png and b/sprites/skuld1.png differ diff --git a/sprites/skuld5.png b/sprites/skuld5.png index 9a54a838..a0ed79a4 100644 Binary files a/sprites/skuld5.png and b/sprites/skuld5.png differ diff --git a/sprites/skuld6d4.png b/sprites/skuld6d4.png index cd824df7..8b7c9e42 100644 Binary files a/sprites/skuld6d4.png and b/sprites/skuld6d4.png differ diff --git a/sprites/skuld7d3.png b/sprites/skuld7d3.png index 6e45dbef..a92c47d8 100644 Binary files a/sprites/skuld7d3.png and b/sprites/skuld7d3.png differ diff --git a/sprites/skuld8d2.png b/sprites/skuld8d2.png index 38e321ec..0787b06b 100644 Binary files a/sprites/skuld8d2.png and b/sprites/skuld8d2.png differ diff --git a/sprites/skule1.png b/sprites/skule1.png index 11d29680..b87286d8 100644 Binary files a/sprites/skule1.png and b/sprites/skule1.png differ diff --git a/sprites/skule5.png b/sprites/skule5.png index 9a54a838..8e03f1a0 100644 Binary files a/sprites/skule5.png and b/sprites/skule5.png differ diff --git a/sprites/skule6e4.png b/sprites/skule6e4.png index cd824df7..39424a77 100644 Binary files a/sprites/skule6e4.png and b/sprites/skule6e4.png differ diff --git a/sprites/skule7e3.png b/sprites/skule7e3.png index 6e45dbef..e842c076 100644 Binary files a/sprites/skule7e3.png and b/sprites/skule7e3.png differ diff --git a/sprites/skule8e2.png b/sprites/skule8e2.png index 38e321ec..07aaa56f 100644 Binary files a/sprites/skule8e2.png and b/sprites/skule8e2.png differ diff --git a/sprites/skulf0.png b/sprites/skulf0.png index 11d29680..6a24c348 100644 Binary files a/sprites/skulf0.png and b/sprites/skulf0.png differ diff --git a/sprites/skulg0.png b/sprites/skulg0.png index 778f1881..06578863 100644 Binary files a/sprites/skulg0.png and b/sprites/skulg0.png differ diff --git a/sprites/skulh0.png b/sprites/skulh0.png index 09b53d09..e4bd39e9 100644 Binary files a/sprites/skulh0.png and b/sprites/skulh0.png differ diff --git a/sprites/skuli0.png b/sprites/skuli0.png index 2bf9e137..02f7229a 100644 Binary files a/sprites/skuli0.png and b/sprites/skuli0.png differ diff --git a/sprites/skulj0.png b/sprites/skulj0.png index 42af217f..a6295d42 100644 Binary files a/sprites/skulj0.png and b/sprites/skulj0.png differ diff --git a/sprites/skulk0.png b/sprites/skulk0.png index 8d634124..5446ee5f 100644 Binary files a/sprites/skulk0.png and b/sprites/skulk0.png differ