diff --git a/buildcfg.txt b/buildcfg.txt index eba8b04a..ec81e3d8 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1394,83 +1394,65 @@ PAINJ0 40 71 PAINK0 37 71 PAINL0 38 67 PAINM0 45 69 -SKELA1D1 20 58 ; revenant -SKELA2D8 17 57 -SKELA3D7 13 58 -SKELA4D6 17 56 -SKELA5D5 20 59 -SKELA6D4 18 59 -SKELA7D3 28 59 -SKELA8D2 24 58 -SKELB1E1 18 59 -SKELB2E8 26 57 -SKELB3E7 18 56 -SKELB4E6 14 53 -SKELB5E5 19 59 -SKELB6E4 21 55 -SKELB7E3 19 56 -SKELB8E2 22 58 -SKELC1F1 20 59 -SKELC2F8 26 57 -SKELC3F7 21 59 -SKELC4F6 22 59 -SKELC5F5 19 60 -SKELC6F4 18 59 -SKELC7F3 22 59 -SKELC8F2 21 59 -SKELG1 22 60 -SKELG2 16 60 -SKELG3 15 58 -SKELG4 23 58 -SKELG5 22 60 -SKELG6 21 57 -SKELG7 23 58 -SKELG8 26 58 -SKELH1 21 58 -SKELH2 19 59 -SKELH3 16 56 -SKELH4 25 57 -SKELH5 20 57 -SKELH6 17 57 -SKELH7 13 57 -SKELH8 18 58 -SKELI1 20 60 -SKELI2 30 58 -SKELI3 34 58 -SKELI4 21 59 -SKELI5 18 59 -SKELI6 16 58 -SKELI7 11 59 -SKELI8 18 59 -SKELJ1 19 58 -SKELJ2 17 58 -SKELJ3 22 57 -SKELJ4 18 57 -SKELJ5 19 58 -SKELJ6 20 57 -SKELJ7 19 58 -SKELJ8 14 59 -SKELK1 20 57 -SKELK2 17 56 -SKELK3 17 56 -SKELK4 16 56 -SKELK5 19 58 -SKELK6 17 56 -SKELK7 12 56 -SKELK8 21 56 -SKELL1 32 56 -SKELL2 24 55 -SKELL3 15 57 -SKELL4 27 57 -SKELL5 27 58 -SKELL6 21 57 -SKELL7 20 57 -SKELL8 26 53 -SKELM0 27 50 -SKELN0 22 51 -SKELO0 34 49 -SKELP0 37 39 -SKELQ0 36 17 +SKELA1D1 21 61 ; revenant +SKELA2D8 24 61 +SKELA3D7 29 61 +SKELA4D6 24 63 +SKELA5D5 21 61 +SKELA6D4 26 63 +SKELA7D3 21 61 +SKELA8D2 19 61 +SKELB1E1 23 63 +SKELB2E8 23 63 +SKELB3E7 19 63 +SKELB4E6 26 62 +SKELB5E5 23 64 +SKELB6E4 23 63 +SKELB7E3 23 63 +SKELB8E2 23 63 +SKELC1F1 20 62 +SKELC2F8 23 63 +SKELC3F7 21 63 +SKELC4F6 22 62 +SKELC5F5 20 62 +SKELC6F4 21 62 +SKELC7F3 26 62 +SKELC8F2 23 62 +SKELG1 24 60 +SKELG5 22 59 +SKELG6G4 25 62 +SKELG7G3 16 60 +SKELG8G2 22 60 +SKELH1 26 59 +SKELH5 22 57 +SKELH6H4 25 55 +SKELH7H3 17 58 +SKELH8H2 22 57 +SKELI1 19 54 +SKELI5 20 54 +SKELI6I4 25 53 +SKELI7I3 17 52 +SKELI8I2 22 54 +SKELJ1 22 51 +SKELJ5 21 52 +SKELJ6J4 25 49 +SKELJ7J3 23 50 +SKELJ8J2 25 51 +SKELK1 23 59 +SKELK5 22 58 +SKELK6K4 22 55 +SKELK7K3 20 56 +SKELK8K2 23 57 +SKELL1 31 58 +SKELL5 24 63 +SKELL6L4 22 63 +SKELL7L3 15 61 +SKELL8L2 22 62 +SKELM0 32 54 +SKELN0 30 50 +SKELO0 27 34 +SKELP0 30 24 +SKELQ0 32 21 FATBA1 11 15 ; revenant rocket FATBA2A8 15 15 FATBA3A7 17 15 diff --git a/lumps/dehacked/dehacked.txt b/lumps/dehacked/dehacked.txt index 11f9c2e4..df8c3dfb 100644 --- a/lumps/dehacked/dehacked.txt +++ b/lumps/dehacked/dehacked.txt @@ -249,7 +249,7 @@ CC_HELL = pain bringer CC_BARON = pain lord CC_ARACH = technospider CC_PAIN = matribite -CC_REVEN = dark soldier +CC_REVEN = octaminator CC_MANCU = combat slug CC_ARCH = necromancer CC_SPIDER = large technospider @@ -600,10 +600,10 @@ OB_STEALTHDEMON=%o thought %g saw a flesh worm. OB_STEALTHKNIGHT=%o thought %g saw a pain bringer. OB_STEALTHIMP=%o thought %g saw a serpentipede. OB_STEALTHFATSO=%o thought %g saw a combat slug. -OB_STEALTHUNDEAD=%o thought %g saw a dark soldier. +OB_STEALTHUNDEAD=%o thought %g saw an octaminator. OB_STEALTHSHOTGUY=%o thought %g saw a shotgun zombie. OB_STEALTHZOMBIE=%o thought %g saw a zombie. -OB_UNDEADHIT=%o was punched by a dark soldier. +OB_UNDEADHIT=%o was punched by an octaminator. OB_IMPHIT=%o was slashed by a serpentipede. OB_CACOHIT=%o got too close to a trilobite. OB_DEMONHIT=%o was bitten by a flesh worm. @@ -613,7 +613,7 @@ OB_KNIGHTHIT=%o was gutted by a pain bringer. OB_ZOMBIE=%o was killed by a zombie. OB_SHOTGUY=%o was gunned down by a shotgun zombie. OB_VILE=%o was incinerated by a necromancer. -OB_UNDEAD=%o couldn't evade the dark soldier's fireball. +OB_UNDEAD=%o couldn't evade an octaminator's fireball. OB_FATSO=%o was blasted by a combat slug. OB_CHAINGUY=%o was perforated by a minigun zombie. OB_SKULL=%o was slammed by a hatchling. diff --git a/manual/images/monster-octaminator.png b/manual/images/monster-octaminator.png new file mode 100644 index 00000000..321d410b Binary files /dev/null and b/manual/images/monster-octaminator.png differ diff --git a/manual/manual-es.adoc b/manual/manual-es.adoc index fbe26445..bb44d598 100644 --- a/manual/manual-es.adoc +++ b/manual/manual-es.adoc @@ -438,10 +438,10 @@ image:images/monster-pain-bringer.png[Pain Bringer,100,100,width=100%] Por si el Pain Bringer no fuera lo suficientemente duro, este puede resistir cinco explosiones de cohetes. | image:images/monster-pain-lord.png[Pain Lord,100,100,width=100%] -| **Dark Soldier** | -Rápidos, resistentes y disparan misiles que buscan el calor. No te metas en un +| **Octaminator** | +Rápidos, resistentes y disparan misiles autoguiados. No te metas en un combate de boxeo con uno de estos tipos. | -image:images/monster-dark-soldier.png[Dark Soldier,100,100,width=100%] +image:images/monster-octaminator.png[Octaminator,100,100,width=100%] | **Necromancer** | Si no te está prendiendo fuego, está deshaciendo todo tu arduo trabajo al traer a sus amigos de entre los muertos. | diff --git a/manual/manual.adoc b/manual/manual.adoc index 959f4590..ceb23ce9 100644 --- a/manual/manual.adoc +++ b/manual/manual.adoc @@ -451,10 +451,10 @@ image:images/monster-pain-bringer.png[Pain Bringer,100,100,width=100%] If the Pain Bringer wasn’t tough enough, this one will take five rocket blasts. | image:images/monster-pain-lord.png[Pain Lord,100,100,width=100%] -| **Dark Soldier** | -Fast moving, tough, and fires heat-seeking missiles. Do not get into a boxing +| **Octaminator** | +Fast moving, tough, and fires homing missiles. Do not get into a boxing match with one of these guys. | -image:images/monster-dark-soldier.png[Dark Soldier,100,100,width=100%] +image:images/monster-octaminator.png[Octaminator,100,100,width=100%] | **Necromancer** | If he’s not setting you on fire, he’s undoing all your hard work by bringing his friends back from the dead. | diff --git a/sounds/dsskepch.wav b/sounds/dsskepch.wav index be57b825..2eae82ac 100644 Binary files a/sounds/dsskepch.wav and b/sounds/dsskepch.wav differ diff --git a/sprites/skela1d1.png b/sprites/skela1d1.png index b9251781..13ef9f18 100644 Binary files a/sprites/skela1d1.png and b/sprites/skela1d1.png differ diff --git a/sprites/skela2d8.png b/sprites/skela2d8.png index 5e98f6b7..72c3fc1d 100644 Binary files a/sprites/skela2d8.png and b/sprites/skela2d8.png differ diff --git a/sprites/skela3d7.png b/sprites/skela3d7.png index bf2e23ca..ecc68224 100644 Binary files a/sprites/skela3d7.png and b/sprites/skela3d7.png differ diff --git a/sprites/skela4d6.png b/sprites/skela4d6.png index a5fd2002..971759ea 100644 Binary files a/sprites/skela4d6.png and b/sprites/skela4d6.png differ diff --git a/sprites/skela5d5.png b/sprites/skela5d5.png index a0099a42..8da01f0c 100644 Binary files a/sprites/skela5d5.png and b/sprites/skela5d5.png differ diff --git a/sprites/skela6d4.png b/sprites/skela6d4.png index d3935e2f..52d45f71 100644 Binary files a/sprites/skela6d4.png and b/sprites/skela6d4.png differ diff --git a/sprites/skela7d3.png b/sprites/skela7d3.png index 6afcfe55..c1669614 100644 Binary files a/sprites/skela7d3.png and b/sprites/skela7d3.png differ diff --git a/sprites/skela8d2.png b/sprites/skela8d2.png index 9d0a9bb8..cb42a626 100644 Binary files a/sprites/skela8d2.png and b/sprites/skela8d2.png differ diff --git a/sprites/skelb1e1.png b/sprites/skelb1e1.png index 860ab670..f8f847b9 100644 Binary files a/sprites/skelb1e1.png and b/sprites/skelb1e1.png differ diff --git a/sprites/skelb2e8.png b/sprites/skelb2e8.png index 2c9e8e34..2dc3669a 100644 Binary files a/sprites/skelb2e8.png and b/sprites/skelb2e8.png differ diff --git a/sprites/skelb3e7.png b/sprites/skelb3e7.png index a47caa11..a42db6a9 100644 Binary files a/sprites/skelb3e7.png and b/sprites/skelb3e7.png differ diff --git a/sprites/skelb4e6.png b/sprites/skelb4e6.png index 13e0c5da..5e75bae6 100644 Binary files a/sprites/skelb4e6.png and b/sprites/skelb4e6.png differ diff --git a/sprites/skelb5e5.png b/sprites/skelb5e5.png index b8dffd79..64f5d816 100644 Binary files a/sprites/skelb5e5.png and b/sprites/skelb5e5.png differ diff --git a/sprites/skelb6e4.png b/sprites/skelb6e4.png index ebd9a8e3..9c8a0d13 100644 Binary files a/sprites/skelb6e4.png and b/sprites/skelb6e4.png differ diff --git a/sprites/skelb7e3.png b/sprites/skelb7e3.png index 482d64bf..1a25c068 100644 Binary files a/sprites/skelb7e3.png and b/sprites/skelb7e3.png differ diff --git a/sprites/skelb8e2.png b/sprites/skelb8e2.png index 71da7d60..9edeebf4 100644 Binary files a/sprites/skelb8e2.png and b/sprites/skelb8e2.png differ diff --git a/sprites/skelc1f1.png b/sprites/skelc1f1.png index 7c74bccc..1b53dc88 100644 Binary files a/sprites/skelc1f1.png and b/sprites/skelc1f1.png differ diff --git a/sprites/skelc2f8.png b/sprites/skelc2f8.png index 6ce5114d..67da6e25 100644 Binary files a/sprites/skelc2f8.png and b/sprites/skelc2f8.png differ diff --git a/sprites/skelc3f7.png b/sprites/skelc3f7.png index bb1bf461..bdf2a971 100644 Binary files a/sprites/skelc3f7.png and b/sprites/skelc3f7.png differ diff --git a/sprites/skelc4f6.png b/sprites/skelc4f6.png index 52feecdd..84e93216 100644 Binary files a/sprites/skelc4f6.png and b/sprites/skelc4f6.png differ diff --git a/sprites/skelc5f5.png b/sprites/skelc5f5.png index be8fe930..8e1f9cc0 100644 Binary files a/sprites/skelc5f5.png and b/sprites/skelc5f5.png differ diff --git a/sprites/skelc6f4.png b/sprites/skelc6f4.png index 7553bb88..b31acada 100644 Binary files a/sprites/skelc6f4.png and b/sprites/skelc6f4.png differ diff --git a/sprites/skelc7f3.png b/sprites/skelc7f3.png index cf79f750..6bfa87f2 100644 Binary files a/sprites/skelc7f3.png and b/sprites/skelc7f3.png differ diff --git a/sprites/skelc8f2.png b/sprites/skelc8f2.png index 7697978a..e98db31e 100644 Binary files a/sprites/skelc8f2.png and b/sprites/skelc8f2.png differ diff --git a/sprites/skelg1.png b/sprites/skelg1.png index bc0a5d21..866b4edf 100644 Binary files a/sprites/skelg1.png and b/sprites/skelg1.png differ diff --git a/sprites/skelg5.png b/sprites/skelg5.png index 9ca24f12..46720b95 100644 Binary files a/sprites/skelg5.png and b/sprites/skelg5.png differ diff --git a/sprites/skelg6g4.png b/sprites/skelg6g4.png new file mode 100644 index 00000000..dc42eda9 Binary files /dev/null and b/sprites/skelg6g4.png differ diff --git a/sprites/skelg7g3.png b/sprites/skelg7g3.png new file mode 100644 index 00000000..be8b0764 Binary files /dev/null and b/sprites/skelg7g3.png differ diff --git a/sprites/skelg8g2.png b/sprites/skelg8g2.png new file mode 100644 index 00000000..5b244037 Binary files /dev/null and b/sprites/skelg8g2.png differ diff --git a/sprites/skelh1.png b/sprites/skelh1.png index ed67e1af..b4e2f77f 100644 Binary files a/sprites/skelh1.png and b/sprites/skelh1.png differ diff --git a/sprites/skelh5.png b/sprites/skelh5.png index 44f97632..70f3bdeb 100644 Binary files a/sprites/skelh5.png and b/sprites/skelh5.png differ diff --git a/sprites/skelh6h4.png b/sprites/skelh6h4.png new file mode 100644 index 00000000..00dab138 Binary files /dev/null and b/sprites/skelh6h4.png differ diff --git a/sprites/skelh7h3.png b/sprites/skelh7h3.png new file mode 100644 index 00000000..45982b90 Binary files /dev/null and b/sprites/skelh7h3.png differ diff --git a/sprites/skelh8h2.png b/sprites/skelh8h2.png new file mode 100644 index 00000000..b237376e Binary files /dev/null and b/sprites/skelh8h2.png differ diff --git a/sprites/skeli1.png b/sprites/skeli1.png index 0178c082..ec3a06c0 100644 Binary files a/sprites/skeli1.png and b/sprites/skeli1.png differ diff --git a/sprites/skeli5.png b/sprites/skeli5.png index d03e18da..9eecaeba 100644 Binary files a/sprites/skeli5.png and b/sprites/skeli5.png differ diff --git a/sprites/skeli6i4.png b/sprites/skeli6i4.png new file mode 100644 index 00000000..92d31f10 Binary files /dev/null and b/sprites/skeli6i4.png differ diff --git a/sprites/skeli7i3.png b/sprites/skeli7i3.png new file mode 100644 index 00000000..385141fe Binary files /dev/null and b/sprites/skeli7i3.png differ diff --git a/sprites/skeli8i2.png b/sprites/skeli8i2.png new file mode 100644 index 00000000..b269a7b8 Binary files /dev/null and b/sprites/skeli8i2.png differ diff --git a/sprites/skelj1.png b/sprites/skelj1.png index 69a800ec..2b041fbe 100644 Binary files a/sprites/skelj1.png and b/sprites/skelj1.png differ diff --git a/sprites/skelj5.png b/sprites/skelj5.png index e8fd4f56..fa7502c9 100644 Binary files a/sprites/skelj5.png and b/sprites/skelj5.png differ diff --git a/sprites/skelj6j4.png b/sprites/skelj6j4.png new file mode 100644 index 00000000..23d6893a Binary files /dev/null and b/sprites/skelj6j4.png differ diff --git a/sprites/skelj7j3.png b/sprites/skelj7j3.png new file mode 100644 index 00000000..cf1a84c6 Binary files /dev/null and b/sprites/skelj7j3.png differ diff --git a/sprites/skelj8j2.png b/sprites/skelj8j2.png new file mode 100644 index 00000000..d1c45cac Binary files /dev/null and b/sprites/skelj8j2.png differ diff --git a/sprites/skelk1.png b/sprites/skelk1.png index 1829bb16..40447ab6 100644 Binary files a/sprites/skelk1.png and b/sprites/skelk1.png differ diff --git a/sprites/skelk5.png b/sprites/skelk5.png index ddf0071c..1e5241f6 100644 Binary files a/sprites/skelk5.png and b/sprites/skelk5.png differ diff --git a/sprites/skelk6k4.png b/sprites/skelk6k4.png new file mode 100644 index 00000000..25f67428 Binary files /dev/null and b/sprites/skelk6k4.png differ diff --git a/sprites/skelk7k3.png b/sprites/skelk7k3.png new file mode 100644 index 00000000..99c936bb Binary files /dev/null and b/sprites/skelk7k3.png differ diff --git a/sprites/skelk8k2.png b/sprites/skelk8k2.png new file mode 100644 index 00000000..32c2112b Binary files /dev/null and b/sprites/skelk8k2.png differ diff --git a/sprites/skell1.png b/sprites/skell1.png index 57d7cf8c..d71b5bac 100644 Binary files a/sprites/skell1.png and b/sprites/skell1.png differ diff --git a/sprites/skell5.png b/sprites/skell5.png index 1c75d1ca..5fdc91ac 100644 Binary files a/sprites/skell5.png and b/sprites/skell5.png differ diff --git a/sprites/skell6l4.png b/sprites/skell6l4.png new file mode 100644 index 00000000..a00c72ea Binary files /dev/null and b/sprites/skell6l4.png differ diff --git a/sprites/skell7l3.png b/sprites/skell7l3.png new file mode 100644 index 00000000..4cf91758 Binary files /dev/null and b/sprites/skell7l3.png differ diff --git a/sprites/skell8l2.png b/sprites/skell8l2.png new file mode 100644 index 00000000..2ba623f3 Binary files /dev/null and b/sprites/skell8l2.png differ diff --git a/sprites/skelm0.png b/sprites/skelm0.png index 07bfb89a..eaa8c42f 100644 Binary files a/sprites/skelm0.png and b/sprites/skelm0.png differ diff --git a/sprites/skeln0.png b/sprites/skeln0.png index f4d76e6e..4c320876 100644 Binary files a/sprites/skeln0.png and b/sprites/skeln0.png differ diff --git a/sprites/skelo0.png b/sprites/skelo0.png index 6c29a437..bcae1af2 100644 Binary files a/sprites/skelo0.png and b/sprites/skelo0.png differ diff --git a/sprites/skelp0.png b/sprites/skelp0.png index 8157eec4..bad5f5a1 100644 Binary files a/sprites/skelp0.png and b/sprites/skelp0.png differ diff --git a/sprites/skelq0.png b/sprites/skelq0.png index 83a8ffed..3bc7590e 100644 Binary files a/sprites/skelq0.png and b/sprites/skelq0.png differ