From eee972d44685558a9fad69930780ca20f1f9a202 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 2 Dec 2020 20:05:53 +0100 Subject: [PATCH] - removed some unused functions from actor.cpp. --- source/blood/src/actor.cpp | 4542 ++++++++++++++++----------------- source/blood/src/actor.h | 2 - source/blood/src/bloodactor.h | 6 + 3 files changed, 2262 insertions(+), 2288 deletions(-) diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index dcfe0eecd..be968013a 100644 --- a/source/blood/src/actor.cpp +++ b/source/blood/src/actor.cpp @@ -59,2332 +59,2305 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_BLD_NS VECTORDATA gVectorData[] = { // this is constant EXCEPT for [VECTOR_TYPE_20].maxDist. What were they thinking... - - // Tine - { - DAMAGE_TYPE_2, - 17, - 174762, - 1152, - 10240, - 0, - 1, - 20480, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_43, FX_6, FX_NONE, 502, - FX_43, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_7, 502, - FX_43, FX_6, FX_7, 502, - FX_NONE, FX_NONE, FX_NONE, 503, - FX_43, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 503, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, + + // Tine + { + DAMAGE_TYPE_2, + 17, + 174762, + 1152, + 10240, + 0, + 1, + 20480, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_43, FX_6, FX_NONE, 502, + FX_43, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_7, 502, + FX_43, FX_6, FX_7, 502, + FX_NONE, FX_NONE, FX_NONE, 503, + FX_43, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 503, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, - // Shell - { - DAMAGE_TYPE_2, - 4, - 65536, - 0, - 8192, - 0, - 1, - 12288, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 501, - FX_43, FX_6, FX_NONE, -1, - FX_43, FX_0, FX_NONE, -1, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_43, FX_6, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Bullet - { - DAMAGE_TYPE_2, - 7, - 21845, - 0, - 32768, - 0, - 1, - 12288, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_7, 510, - FX_NONE, FX_5, FX_7, 511, - FX_43, FX_6, FX_NONE, 512, - FX_43, FX_0, FX_NONE, 513, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_7, 512, - FX_43, FX_6, FX_7, 512, - FX_NONE, FX_NONE, FX_NONE, 513, - FX_43, FX_NONE, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, + // Shell + { + DAMAGE_TYPE_2, + 4, + 65536, + 0, + 8192, + 0, + 1, + 12288, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 501, + FX_43, FX_6, FX_NONE, -1, + FX_43, FX_0, FX_NONE, -1, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_43, FX_6, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Bullet + { + DAMAGE_TYPE_2, + 7, + 21845, + 0, + 32768, + 0, + 1, + 12288, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_7, 510, + FX_NONE, FX_5, FX_7, 511, + FX_43, FX_6, FX_NONE, 512, + FX_43, FX_0, FX_NONE, 513, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_7, 512, + FX_43, FX_6, FX_7, 512, + FX_NONE, FX_NONE, FX_NONE, 513, + FX_43, FX_NONE, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, - }, - - // Tommy AP - { - DAMAGE_TYPE_2, - 20, - 65536, - 0, - 16384, - 0, - 1, - 20480, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_7, 510, - FX_NONE, FX_5, FX_7, 511, - FX_43, FX_6, FX_NONE, 512, - FX_43, FX_0, FX_NONE, 513, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_7, 512, - FX_43, FX_6, FX_7, 512, - FX_NONE, FX_NONE, FX_NONE, 513, - FX_43, FX_NONE, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Shell AP - { - DAMAGE_TYPE_2, - 6, - 87381, - 0, - 12288, - 0, - 1, - 6144, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 501, - FX_43, FX_6, FX_NONE, -1, - FX_43, FX_0, FX_NONE, -1, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_43, FX_6, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Tommy regular - { - DAMAGE_TYPE_2, - 12, - 65536, - 0, - 16384, - 0, - 1, - 12288, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_43, FX_5, FX_7, 510, - FX_NONE, FX_5, FX_7, 511, - FX_43, FX_6, FX_NONE, 512, - FX_43, FX_0, FX_NONE, 513, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_7, 512, - FX_43, FX_6, FX_7, 512, - FX_NONE, FX_NONE, FX_NONE, 513, - FX_43, FX_NONE, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_6, FX_NONE, 513, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Bat bite - { - DAMAGE_TYPE_2, - 4, - 0, - 921, - 0, - 0, - 1, - 4096, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, - - // Eel bite - { - DAMAGE_TYPE_2, - 12, - 0, - 1177, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, - - // Gill bite - { - DAMAGE_TYPE_2, - 9, - 0, - 1177, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, - - // Beast slash - { - DAMAGE_TYPE_3, - 50, - 43690, - 1024, - 8192, - 0, - 4, - 32768, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, - - // Axe - { - DAMAGE_TYPE_2, - 18, - 436906, - 1024, - 16384, - 0, - 2, - 20480, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Cleaver - { - DAMAGE_TYPE_2, - 9, - 218453, - 1024, - 0, - 0, - 1, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, - - // Phantasm slash - { - DAMAGE_TYPE_2, - 20, - 436906, - 1024, - 16384, - 0, - 3, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, + }, + + // Tommy AP + { + DAMAGE_TYPE_2, + 20, + 65536, + 0, + 16384, + 0, + 1, + 20480, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_7, 510, + FX_NONE, FX_5, FX_7, 511, + FX_43, FX_6, FX_NONE, 512, + FX_43, FX_0, FX_NONE, 513, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_7, 512, + FX_43, FX_6, FX_7, 512, + FX_NONE, FX_NONE, FX_NONE, 513, + FX_43, FX_NONE, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Shell AP + { + DAMAGE_TYPE_2, + 6, + 87381, + 0, + 12288, + 0, + 1, + 6144, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 501, + FX_43, FX_6, FX_NONE, -1, + FX_43, FX_0, FX_NONE, -1, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_43, FX_6, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Tommy regular + { + DAMAGE_TYPE_2, + 12, + 65536, + 0, + 16384, + 0, + 1, + 12288, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_43, FX_5, FX_7, 510, + FX_NONE, FX_5, FX_7, 511, + FX_43, FX_6, FX_NONE, 512, + FX_43, FX_0, FX_NONE, 513, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_7, 512, + FX_43, FX_6, FX_7, 512, + FX_NONE, FX_NONE, FX_NONE, 513, + FX_43, FX_NONE, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_6, FX_NONE, 513, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Bat bite + { + DAMAGE_TYPE_2, + 4, + 0, + 921, + 0, + 0, + 1, + 4096, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, + + // Eel bite + { + DAMAGE_TYPE_2, + 12, + 0, + 1177, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, + + // Gill bite + { + DAMAGE_TYPE_2, + 9, + 0, + 1177, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, + + // Beast slash + { + DAMAGE_TYPE_3, + 50, + 43690, + 1024, + 8192, + 0, + 4, + 32768, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, + + // Axe + { + DAMAGE_TYPE_2, + 18, + 436906, + 1024, + 16384, + 0, + 2, + 20480, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Cleaver + { + DAMAGE_TYPE_2, + 9, + 218453, + 1024, + 0, + 0, + 1, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, + + // Phantasm slash + { + DAMAGE_TYPE_2, + 20, + 436906, + 1024, + 16384, + 0, + 3, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, - // Gargoyle Slash - { - DAMAGE_TYPE_2, - 16, - 218453, - 1024, - 8192, - 0, - 4, - 20480, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - }, + // Gargoyle Slash + { + DAMAGE_TYPE_2, + 16, + 218453, + 1024, + 8192, + 0, + 4, + 20480, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + }, - // Cerberus bite - { - DAMAGE_TYPE_2, - 19, - 218453, - 614, - 8192, - 0, - 2, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Cerberus bite + { + DAMAGE_TYPE_2, + 19, + 218453, + 614, + 8192, + 0, + 2, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Hound bite - { - DAMAGE_TYPE_2, - 10, - 218453, - 614, - 8192, - 0, - 2, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Hound bite + { + DAMAGE_TYPE_2, + 10, + 218453, + 614, + 8192, + 0, + 2, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Rat bite - { - DAMAGE_TYPE_2, - 4, - 0, - 921, - 0, - 0, - 1, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Rat bite + { + DAMAGE_TYPE_2, + 4, + 0, + 921, + 0, + 0, + 1, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Spider bite - { - DAMAGE_TYPE_2, - 8, - 0, - 614, - 0, - 0, - 1, - 24576, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Spider bite + { + DAMAGE_TYPE_2, + 8, + 0, + 614, + 0, + 0, + 1, + 24576, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Unk - { - DAMAGE_TYPE_2, - 9, - 0, - 512, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_5, FX_NONE, 500, - FX_NONE, FX_5, FX_NONE, 501, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_0, FX_NONE, 503, - FX_NONE, FX_4, FX_NONE, -1, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_6, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 502, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, - - { - (DAMAGE_TYPE)-1, - 0, - 0, - 2560, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_34, FX_35, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Unk + { + DAMAGE_TYPE_2, + 9, + 0, + 512, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_5, FX_NONE, 500, + FX_NONE, FX_5, FX_NONE, 501, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_0, FX_NONE, 503, + FX_NONE, FX_4, FX_NONE, -1, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_6, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 502, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, + + { + (DAMAGE_TYPE)-1, + 0, + 0, + 2560, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_34, FX_35, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Tchernobog burn vector - { - DAMAGE_TYPE_1, - 2, - 0, - 0, - 0, - 15, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Tchernobog burn vector + { + DAMAGE_TYPE_1, + 2, + 0, + 0, + 0, + 15, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // Vodoo 1.0 vector - { - DAMAGE_TYPE_5, - 25, - 0, - 0, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, -1, - }, + // Vodoo 1.0 vector + { + DAMAGE_TYPE_5, + 25, + 0, + 0, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, -1, + }, - // 22 kVectorGenDudePunch - { - DAMAGE_TYPE_0, - 37, - 874762, - 620, - 0, - 0, - 0, - 0, - FX_NONE, FX_NONE, FX_NONE, -1, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - FX_NONE, FX_NONE, FX_NONE, 357, - }, + // 22 kVectorGenDudePunch + { + DAMAGE_TYPE_0, + 37, + 874762, + 620, + 0, + 0, + 0, + 0, + FX_NONE, FX_NONE, FX_NONE, -1, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + FX_NONE, FX_NONE, FX_NONE, 357, + }, }; const ITEMDATA gItemData[] = { - { - 0, - 2552, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - 2553, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - 2554, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - 2555, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - 2556, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - 2557, - (char)-8, - 0, - 32, - 32, - -1, - }, - { - 0, - -1, - (char)-8, - 0, - 255, - 255, - -1, - }, - { - 0, - 519, - (char)-8, - 0, - 48, - 48, - 0, - }, - { - 0, - 822, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 2169, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 2433, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 517, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 783, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 896, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 825, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 827, - (char)-8, - 0, - 40, - 40, - 4, - }, - { - 0, - 828, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 829, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 830, - (char)-8, - 0, - 80, - 64, - 1, - }, - { - 0, - 831, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 863, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 760, - (char)-8, - 0, - 40, - 40, - 2, - }, - { - 0, - 836, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 851, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 2428, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 839, - (char)-8, - 0, - 40, - 40, - 3, - }, - { - 0, - 768, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 840, - (char)-8, - 0, - 48, - 48, - -1, - }, - { - 0, - 841, - (char)-8, - 0, - 48, - 48, - -1, - }, - { - 0, - 842, - (char)-8, - 0, - 48, - 48, - -1, - }, - { - 0, - 843, - (char)-8, - 0, - 48, - 48, - -1, - }, - { - 0, - 683, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 521, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 604, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 520, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 803, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 518, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 522, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 523, - (char)-8, - 0, - 40, - 40, - -1, - }, - { - 0, - 837, - (char)-8, - 0, - 80, - 64, - -1, - }, - { - 0, - 2628, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 2586, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 2578, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 2602, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 2594, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 753, - (char)-8, - 0, - 64, - 64, - -1, - }, - { - 0, - 753, - (char)-8, - 7, - 64, - 64, - -1, - }, - { - 0, - 3558, - (char)-128, - 0, - 64, - 64, - -1, - }, - { - 0, - 3558, - (char)-128, - 7, - 64, - 64, - -1, - } + { + 0, + 2552, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + 2553, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + 2554, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + 2555, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + 2556, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + 2557, + (char)-8, + 0, + 32, + 32, + -1, + }, + { + 0, + -1, + (char)-8, + 0, + 255, + 255, + -1, + }, + { + 0, + 519, + (char)-8, + 0, + 48, + 48, + 0, + }, + { + 0, + 822, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 2169, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 2433, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 517, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 783, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 896, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 825, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 827, + (char)-8, + 0, + 40, + 40, + 4, + }, + { + 0, + 828, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 829, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 830, + (char)-8, + 0, + 80, + 64, + 1, + }, + { + 0, + 831, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 863, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 760, + (char)-8, + 0, + 40, + 40, + 2, + }, + { + 0, + 836, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 851, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 2428, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 839, + (char)-8, + 0, + 40, + 40, + 3, + }, + { + 0, + 768, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 840, + (char)-8, + 0, + 48, + 48, + -1, + }, + { + 0, + 841, + (char)-8, + 0, + 48, + 48, + -1, + }, + { + 0, + 842, + (char)-8, + 0, + 48, + 48, + -1, + }, + { + 0, + 843, + (char)-8, + 0, + 48, + 48, + -1, + }, + { + 0, + 683, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 521, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 604, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 520, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 803, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 518, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 522, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 523, + (char)-8, + 0, + 40, + 40, + -1, + }, + { + 0, + 837, + (char)-8, + 0, + 80, + 64, + -1, + }, + { + 0, + 2628, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 2586, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 2578, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 2602, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 2594, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 753, + (char)-8, + 0, + 64, + 64, + -1, + }, + { + 0, + 753, + (char)-8, + 7, + 64, + 64, + -1, + }, + { + 0, + 3558, + (char)-128, + 0, + 64, + 64, + -1, + }, + { + 0, + 3558, + (char)-128, + 7, + 64, + 64, + -1, + } }; const AMMOITEMDATA gAmmoItemData[] = { - { - 0, - 618, - (char)-8, - 0, - 40, - 40, - 480, - 6, - 7 - }, - { - 0, - 589, - (char)-8, - 0, - 48, - 48, - 1, - 5, - 6 - }, - { - 0, - 589, - (char)-8, - 0, - 48, - 48, - 1, - 5, - 6 - }, - { - 0, - 809, - (char)-8, - 0, - 48, - 48, - 5, - 5, - 6 - }, - { - 0, - 811, - (char)-8, - 0, - 48, - 48, - 1, - 10, - 11 - }, - { - 0, - 810, - (char)-8, - 0, - 48, - 48, - 1, - 11, - 12 - }, - { - 0, - 820, - (char)-8, - 0, - 24, - 24, - 10, - 8, - 0 - }, - { - 0, - 619, - (char)-8, - 0, - 48, - 48, - 4, - 2, - 0 - }, - { - 0, - 812, - (char)-8, - 0, - 48, - 48, - 15, - 2, - 0 - }, - { - 0, - 813, - (char)-8, - 0, - 48, - 48, - 15, - 3, - 0 - }, - { - 0, - 525, - (char)-8, - 0, - 48, - 48, - 100, - 9, - 10 - }, - { - 0, - 814, - (char)-8, - 0, - 48, - 48, - 15, - 255, - 0 - }, - { - 0, - 817, - (char)-8, - 0, - 48, - 48, - 100, - 3, - 0 - }, - { - 0, - 548, - (char)-8, - 0, - 24, - 24, - 32, - 7, - 0 - }, - { - 0, - 0, - (char)-8, - 0, - 48, - 48, - 6, - 255, - 0 - }, - { - 0, - 0, - (char)-8, - 0, - 48, - 48, - 6, - 255, - 0 - }, - { - 0, - 816, - (char)-8, - 0, - 48, - 48, - 8, - 1, - 0 - }, - { - 0, - 818, - (char)-8, - 0, - 48, - 48, - 8, - 255, - 0 - }, - { - 0, - 819, - (char)-8, - 0, - 48, - 48, - 8, - 255, - 0 - }, - { - 0, - 801, - (char)-8, - 0, - 48, - 48, - 6, - 4, - 0 - }, - { - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - }, + { + 0, + 618, + (char)-8, + 0, + 40, + 40, + 480, + 6, + 7 + }, + { + 0, + 589, + (char)-8, + 0, + 48, + 48, + 1, + 5, + 6 + }, + { + 0, + 589, + (char)-8, + 0, + 48, + 48, + 1, + 5, + 6 + }, + { + 0, + 809, + (char)-8, + 0, + 48, + 48, + 5, + 5, + 6 + }, + { + 0, + 811, + (char)-8, + 0, + 48, + 48, + 1, + 10, + 11 + }, + { + 0, + 810, + (char)-8, + 0, + 48, + 48, + 1, + 11, + 12 + }, + { + 0, + 820, + (char)-8, + 0, + 24, + 24, + 10, + 8, + 0 + }, + { + 0, + 619, + (char)-8, + 0, + 48, + 48, + 4, + 2, + 0 + }, + { + 0, + 812, + (char)-8, + 0, + 48, + 48, + 15, + 2, + 0 + }, + { + 0, + 813, + (char)-8, + 0, + 48, + 48, + 15, + 3, + 0 + }, + { + 0, + 525, + (char)-8, + 0, + 48, + 48, + 100, + 9, + 10 + }, + { + 0, + 814, + (char)-8, + 0, + 48, + 48, + 15, + 255, + 0 + }, + { + 0, + 817, + (char)-8, + 0, + 48, + 48, + 100, + 3, + 0 + }, + { + 0, + 548, + (char)-8, + 0, + 24, + 24, + 32, + 7, + 0 + }, + { + 0, + 0, + (char)-8, + 0, + 48, + 48, + 6, + 255, + 0 + }, + { + 0, + 0, + (char)-8, + 0, + 48, + 48, + 6, + 255, + 0 + }, + { + 0, + 816, + (char)-8, + 0, + 48, + 48, + 8, + 1, + 0 + }, + { + 0, + 818, + (char)-8, + 0, + 48, + 48, + 8, + 255, + 0 + }, + { + 0, + 819, + (char)-8, + 0, + 48, + 48, + 8, + 255, + 0 + }, + { + 0, + 801, + (char)-8, + 0, + 48, + 48, + 6, + 4, + 0 + }, + { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + }, }; const WEAPONITEMDATA gWeaponItemData[] = { - { - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, - -1, - 0 - }, - { - 0, - 559, - (char)-8, - 0, - 48, - 48, - 3, - 2, - 8 - }, - { - 0, - 558, - (char)-8, - 0, - 48, - 48, - 4, - 3, - 50 - }, - { - 0, - 524, - (char)-8, - 0, - 48, - 48, - 2, - 1, - 9 - }, - { - 0, - 525, - (char)-8, - 0, - 48, - 48, - 10, - 9, - 100 - }, - { - 0, - 539, - (char)-8, - 0, - 48, - 48, - 8, - 7, - 64 - }, - { - 0, - 526, - (char)-8, - 0, - 48, - 48, - 5, - 4, - 6 - }, - { - 0, - -1, - (char)0, - 0, - 0, - 0, - 1, - -1, - 0 - }, - { - 0, - 618, - (char)-8, - 0, - 48, - 48, - 7, - 6, - 480 - }, - { - 0, - 589, - (char)-8, - 0, - 48, - 48, - 6, - 5, - 1 - }, - { - 0, - 800, - (char)-8, - 0, - 48, - 48, - 9, - 8, - 35 - } + { + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, + -1, + 0 + }, + { + 0, + 559, + (char)-8, + 0, + 48, + 48, + 3, + 2, + 8 + }, + { + 0, + 558, + (char)-8, + 0, + 48, + 48, + 4, + 3, + 50 + }, + { + 0, + 524, + (char)-8, + 0, + 48, + 48, + 2, + 1, + 9 + }, + { + 0, + 525, + (char)-8, + 0, + 48, + 48, + 10, + 9, + 100 + }, + { + 0, + 539, + (char)-8, + 0, + 48, + 48, + 8, + 7, + 64 + }, + { + 0, + 526, + (char)-8, + 0, + 48, + 48, + 5, + 4, + 6 + }, + { + 0, + -1, + (char)0, + 0, + 0, + 0, + 1, + -1, + 0 + }, + { + 0, + 618, + (char)-8, + 0, + 48, + 48, + 7, + 6, + 480 + }, + { + 0, + 589, + (char)-8, + 0, + 48, + 48, + 6, + 5, + 1 + }, + { + 0, + 800, + (char)-8, + 0, + 48, + 48, + 9, + 8, + 35 + } }; const MissileType missileInfo[] = { - // Cleaver - { - 2138, - 978670, - 512, - 40, - 40, - (char)-16, - 16, - }, - // Regular flare - { - 2424, - 3145728, - 0, - 32, - 32, - (char)-128, - 32, - }, - // Tesla alt - { - 3056, - 2796202, - 0, - 32, - 32, - (char)-128, - 32, - }, - // Flare alt - { - 2424, - 2446677, - 0, - 32, - 32, - (char)-128, - 4, - }, - // Spray flame - { - 0, - 1118481, - 0, - 24, - 24, - (char)-128, - 16, - }, - // Fireball - { - 0, - 1118481, - 0, - 32, - 32, - (char)-128, - 32, - }, - // Tesla regular - { - 2130, - 2796202, - 0, - 32, - 32, - (char)-128, - 16, - }, - // EctoSkull - { - 870, - 699050, - 0, - 32, - 32, - (char)-24, - 32, - }, - // Hellhound flame - { - 0, - 1118481, - 0, - 24, - 24, - (char)-128, - 16, - }, - // Puke - { - 0, - 838860, - 0, - 16, - 16, - (char)-16, - 16, - }, - // Reserved - { - 0, - 838860, - 0, - 8, - 8, - (char)0, - 16, - }, - // Stone gargoyle projectile - { - 3056, - 2097152, - 0, - 32, - 32, - (char)-128, - 16, - }, - // Napalm launcher - { - 0, - 2446677, - 0, - 30, - 30, - (char)-128, - 24, - }, - // Cerberus fireball - { - 0, - 2446677, - 0, - 30, - 30, - (char)-128, - 24, - }, - // Tchernobog fireball - { - 0, - 1398101, - 0, - 24, - 24, - (char)-128, - 16, - }, - // Regular life leech - { - 2446, - 2796202, - 0, - 32, - 32, - (char)-128, - 16, - }, - // Dropped life leech (enough ammo) - { - 3056, - 2446677, - 0, - 16, - 16, - (char)-128, - 16, - }, - // Dropped life leech (no ammo) - { - 3056, - 1747626, - 0, - 32, - 32, - (char)-128, - 16, - } + // Cleaver + { + 2138, + 978670, + 512, + 40, + 40, + (char)-16, + 16, + }, + // Regular flare + { + 2424, + 3145728, + 0, + 32, + 32, + (char)-128, + 32, + }, + // Tesla alt + { + 3056, + 2796202, + 0, + 32, + 32, + (char)-128, + 32, + }, + // Flare alt + { + 2424, + 2446677, + 0, + 32, + 32, + (char)-128, + 4, + }, + // Spray flame + { + 0, + 1118481, + 0, + 24, + 24, + (char)-128, + 16, + }, + // Fireball + { + 0, + 1118481, + 0, + 32, + 32, + (char)-128, + 32, + }, + // Tesla regular + { + 2130, + 2796202, + 0, + 32, + 32, + (char)-128, + 16, + }, + // EctoSkull + { + 870, + 699050, + 0, + 32, + 32, + (char)-24, + 32, + }, + // Hellhound flame + { + 0, + 1118481, + 0, + 24, + 24, + (char)-128, + 16, + }, + // Puke + { + 0, + 838860, + 0, + 16, + 16, + (char)-16, + 16, + }, + // Reserved + { + 0, + 838860, + 0, + 8, + 8, + (char)0, + 16, + }, + // Stone gargoyle projectile + { + 3056, + 2097152, + 0, + 32, + 32, + (char)-128, + 16, + }, + // Napalm launcher + { + 0, + 2446677, + 0, + 30, + 30, + (char)-128, + 24, + }, + // Cerberus fireball + { + 0, + 2446677, + 0, + 30, + 30, + (char)-128, + 24, + }, + // Tchernobog fireball + { + 0, + 1398101, + 0, + 24, + 24, + (char)-128, + 16, + }, + // Regular life leech + { + 2446, + 2796202, + 0, + 32, + 32, + (char)-128, + 16, + }, + // Dropped life leech (enough ammo) + { + 3056, + 2446677, + 0, + 16, + 16, + (char)-128, + 16, + }, + // Dropped life leech (no ammo) + { + 3056, + 1747626, + 0, + 32, + 32, + (char)-128, + 16, + } }; const THINGINFO thingInfo[] = { - //TNT Barrel - { - 25, - 250, - 32, - 11, - 4096, - 80, - 384, - 907, - (char)0, - 0, - 0, - 0, - 256, 256, 128, 64, 0, 0, 128, - }, - - // Armed Proxy Dynamite - { - 5, - 5, - 16, - 3, - 24576, - 1600, - 256, - 3444, - (char)-16, - 0, - 32, - 32, - 256, 256, 256, 64, 0, 0, 512, - }, - // Armed Remote Dynamite - { - 5, - 5, - 16, - 3, - 24576, - 1600, - 256, - 3457, - (char)-16, - 0, - 32, - 32, - 256, 256, 256, 64, 0, 0, 512, - }, - // Vase1 - { - 1, - 20, - 32, - 3, - 32768, - 80, - 0, - 739, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 128, 0, 0, 0, - }, - // Vase2 - { - 1, - 150, - 32, - 3, - 32768, - 80, - 0, - 642, - (char)0, - 0, - 0, - 0, - 256, 256, 256, 128, 0, 0, 0, - }, - // Crate face - { - 10, - 0, - 0, - 0, - 0, - 0, - 0, - 462, - (char)0, - 0, - 0, - 0, - 0, 0, 0, 256, 0, 0, 0, - }, - // Glass window - { - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 266, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 256, 0, 0, 0, - }, - // Flourescent Light - { - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 796, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 256, 0, 0, 512, - }, - // Wall Crack - { - 50, - 0, - 0, - 0, - 0, - 0, - 0, - 1127, - (char)0, - 0, - 0, - 0, - 0, 0, 0, 256, 0, 0, 0, - }, - // Wood Beam - { - 8, - 0, - 0, - 0, - 0, - 0, - 0, - 1142, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 128, 0, 0, 0, - }, - // Spider's Web - { - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 1069, - (char)0, - 0, - 0, - 0, - 256, 256, 64, 256, 0, 0, 128, - }, - // Metal Grate - { - 40, - 0, - 0, - 0, - 0, - 0, - 0, - 483, - (char)0, - 0, - 0, - 0, - 64, 0, 128, 256, 0, 0, 0, - }, - // Flammable Tree - { - 1, - 0, - 0, - 0, - 0, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, 256, 0, 256, 0, 0, 128, - }, - // MachineGun Trap - { - 1000, - 0, - 0, - 8, - 0, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, 0, 128, 256, 0, 0, 512, - }, - // Falling Rock - { - 0, - 15, - 8, - 3, - 32768, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, - }, - // Kickable Pail - { - 0, - 8, - 48, - 3, - 49152, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, - }, - // Gib Object - { - 10, - 2, - 0, - 0, - 32768, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 256, 0, 0, 128, - }, - // Explode Object - { - 20, - 2, - 0, - 0, - 32768, - 0, - 0, - -1, - (char)0, - 0, - 0, - 0, - 0, 0, 0, 256, 0, 0, 128, - }, - // Armed stick Of TNT - { - 5, - 14, - 16, - 3, - 24576, - 1600, - 256, - 3422, - (char)-32, - 0, - 32, - 32, - 64, 256, 128, 64, 0, 0, 256, - }, - // Armed bundle Of TNT - { - 5, - 14, - 16, - 3, - 24576, - 1600, - 256, - 3433, - (char)-32, - 0, - 32, - 32, - 64, 256, 128, 64, 0, 0, 256, - }, - // Armed aerosol - { - 5, - 14, - 16, - 3, - 32768, - 1600, - 256, - 3467, - (char)-128, - 0, - 32, - 32, - 64, 256, 128, 64, 0, 0, 256, - }, - // Bone (Flesh Garg.) - { - 5, - 6, - 16, - 3, - 32768, - 1600, - 256, - 1462, - (char)0, - 0, - 32, - 32, - 0, 0, 0, 0, 0, 0, 0, - }, - // Some alpha stuff - { - 8, - 3, - 16, - 11, - 32768, - 1600, - 256, - -1, - (char)0, - 0, - 0, - 0, - 256, 0, 256, 256, 0, 0, 0, - }, - // WaterDrip - { - 0, - 1, - 1, - 2, - 0, - 0, - 0, - 1147, - (char)0, - 10, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, - }, - // BloodDrip - { - 0, - 1, - 1, - 2, - 0, - 0, - 0, - 1160, - (char)0, - 2, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, - }, - // Blood chucks1 - { - 15, - 4, - 4, - 3, - 24576, - 0, - 257, - -1, - (char)0, - 0, - 0, - 0, - 128, 64, 256, 256, 0, 0, 256, - }, - // Blood chucks2 - { - 30, - 30, - 8, - 3, - 8192, - 0, - 257, - -1, - (char)0, - 0, - 0, - 0, - 128, 64, 256, 256, 0, 0, 64, - }, - // Axe Zombie Head - { - 60, - 5, - 32, - 3, - 40960, - 1280, - 257, - 3405, - (char)0, - 0, - 40, - 40, - 128, 64, 256, 256, 0, 0, 64, - }, - // Napalm's Alt Fire explosion - { - 80, - 30, - 32, - 3, - 57344, - 1600, - 256, - 3281, - (char)-128, - 0, - 32, - 32, - 0, 0, 0, 0, 0, 0, 0, - }, - // Fire Pod Explosion - { - 80, - 30, - 32, - 3, - 57344, - 1600, - 256, - 2020, - (char)-128, - 0, - 32, - 32, - 256, 0, 256, 256, 0, 0, 0, - }, - // Green Pod Explosion - { - 80, - 30, - 32, - 3, - 57344, - 1600, - 256, - 1860, - (char)-128, - 0, - 32, - 32, - 256, 0, 256, 256, 0, 0, 0, - }, - // Life Leech - { - 150, - 30, - 48, - 3, - 32768, - 1600, - 257, - 800, - (char)-128, - 0, - 48, - 48, - 64, 64, 112, 64, 0, 96, 96, - }, - // Voodoo Head - { - 1, - 30, - 48, - 3, - 32768, - 1600, - 0, - 2443, - (char)-128, - 0, - 16, - 16, - 0, 0, 0, 0, 0, 0, 0, - }, - // 433 - kModernThingTNTProx - { - 5, - 5, - 16, - 3, - 24576, - 1600, - 256, - 3444, - (char)-16, - 7, - 32, - 32, - 256, 256, 256, 64, 0, 0, 512, - }, - // 434 - kModernThingThrowableRock - { - 5, - 6, - 16, - 3, - 32768, - 1600, - 256, - 1462, - (char)0, - 0, - 32, - 32, - 0, 0, 0, 0, 0, 0, 0, - }, - // 435 - kModernThingEnemyLifeLeech - { - 150, - 30, - 48, - 3, - 32768, - 1600, - 257, - 800, - (char)-128, - 0, - 44, - 44, - 0, 1024, 512, 1024, 0, 64, 512, - }, + //TNT Barrel + { + 25, + 250, + 32, + 11, + 4096, + 80, + 384, + 907, + (char)0, + 0, + 0, + 0, + 256, 256, 128, 64, 0, 0, 128, + }, + + // Armed Proxy Dynamite + { + 5, + 5, + 16, + 3, + 24576, + 1600, + 256, + 3444, + (char)-16, + 0, + 32, + 32, + 256, 256, 256, 64, 0, 0, 512, + }, + // Armed Remote Dynamite + { + 5, + 5, + 16, + 3, + 24576, + 1600, + 256, + 3457, + (char)-16, + 0, + 32, + 32, + 256, 256, 256, 64, 0, 0, 512, + }, + // Vase1 + { + 1, + 20, + 32, + 3, + 32768, + 80, + 0, + 739, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 128, 0, 0, 0, + }, + // Vase2 + { + 1, + 150, + 32, + 3, + 32768, + 80, + 0, + 642, + (char)0, + 0, + 0, + 0, + 256, 256, 256, 128, 0, 0, 0, + }, + // Crate face + { + 10, + 0, + 0, + 0, + 0, + 0, + 0, + 462, + (char)0, + 0, + 0, + 0, + 0, 0, 0, 256, 0, 0, 0, + }, + // Glass window + { + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 266, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 256, 0, 0, 0, + }, + // Flourescent Light + { + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 796, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 256, 0, 0, 512, + }, + // Wall Crack + { + 50, + 0, + 0, + 0, + 0, + 0, + 0, + 1127, + (char)0, + 0, + 0, + 0, + 0, 0, 0, 256, 0, 0, 0, + }, + // Wood Beam + { + 8, + 0, + 0, + 0, + 0, + 0, + 0, + 1142, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 128, 0, 0, 0, + }, + // Spider's Web + { + 4, + 0, + 0, + 0, + 0, + 0, + 0, + 1069, + (char)0, + 0, + 0, + 0, + 256, 256, 64, 256, 0, 0, 128, + }, + // Metal Grate + { + 40, + 0, + 0, + 0, + 0, + 0, + 0, + 483, + (char)0, + 0, + 0, + 0, + 64, 0, 128, 256, 0, 0, 0, + }, + // Flammable Tree + { + 1, + 0, + 0, + 0, + 0, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, 256, 0, 256, 0, 0, 128, + }, + // MachineGun Trap + { + 1000, + 0, + 0, + 8, + 0, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, 0, 128, 256, 0, 0, 512, + }, + // Falling Rock + { + 0, + 15, + 8, + 3, + 32768, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, 0, 0, 0, 0, 0, 0, + }, + // Kickable Pail + { + 0, + 8, + 48, + 3, + 49152, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, 0, 0, 0, 0, 0, 0, + }, + // Gib Object + { + 10, + 2, + 0, + 0, + 32768, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 256, 0, 0, 128, + }, + // Explode Object + { + 20, + 2, + 0, + 0, + 32768, + 0, + 0, + -1, + (char)0, + 0, + 0, + 0, + 0, 0, 0, 256, 0, 0, 128, + }, + // Armed stick Of TNT + { + 5, + 14, + 16, + 3, + 24576, + 1600, + 256, + 3422, + (char)-32, + 0, + 32, + 32, + 64, 256, 128, 64, 0, 0, 256, + }, + // Armed bundle Of TNT + { + 5, + 14, + 16, + 3, + 24576, + 1600, + 256, + 3433, + (char)-32, + 0, + 32, + 32, + 64, 256, 128, 64, 0, 0, 256, + }, + // Armed aerosol + { + 5, + 14, + 16, + 3, + 32768, + 1600, + 256, + 3467, + (char)-128, + 0, + 32, + 32, + 64, 256, 128, 64, 0, 0, 256, + }, + // Bone (Flesh Garg.) + { + 5, + 6, + 16, + 3, + 32768, + 1600, + 256, + 1462, + (char)0, + 0, + 32, + 32, + 0, 0, 0, 0, 0, 0, 0, + }, + // Some alpha stuff + { + 8, + 3, + 16, + 11, + 32768, + 1600, + 256, + -1, + (char)0, + 0, + 0, + 0, + 256, 0, 256, 256, 0, 0, 0, + }, + // WaterDrip + { + 0, + 1, + 1, + 2, + 0, + 0, + 0, + 1147, + (char)0, + 10, + 0, + 0, + 0, 0, 0, 0, 0, 0, 0, + }, + // BloodDrip + { + 0, + 1, + 1, + 2, + 0, + 0, + 0, + 1160, + (char)0, + 2, + 0, + 0, + 0, 0, 0, 0, 0, 0, 0, + }, + // Blood chucks1 + { + 15, + 4, + 4, + 3, + 24576, + 0, + 257, + -1, + (char)0, + 0, + 0, + 0, + 128, 64, 256, 256, 0, 0, 256, + }, + // Blood chucks2 + { + 30, + 30, + 8, + 3, + 8192, + 0, + 257, + -1, + (char)0, + 0, + 0, + 0, + 128, 64, 256, 256, 0, 0, 64, + }, + // Axe Zombie Head + { + 60, + 5, + 32, + 3, + 40960, + 1280, + 257, + 3405, + (char)0, + 0, + 40, + 40, + 128, 64, 256, 256, 0, 0, 64, + }, + // Napalm's Alt Fire explosion + { + 80, + 30, + 32, + 3, + 57344, + 1600, + 256, + 3281, + (char)-128, + 0, + 32, + 32, + 0, 0, 0, 0, 0, 0, 0, + }, + // Fire Pod Explosion + { + 80, + 30, + 32, + 3, + 57344, + 1600, + 256, + 2020, + (char)-128, + 0, + 32, + 32, + 256, 0, 256, 256, 0, 0, 0, + }, + // Green Pod Explosion + { + 80, + 30, + 32, + 3, + 57344, + 1600, + 256, + 1860, + (char)-128, + 0, + 32, + 32, + 256, 0, 256, 256, 0, 0, 0, + }, + // Life Leech + { + 150, + 30, + 48, + 3, + 32768, + 1600, + 257, + 800, + (char)-128, + 0, + 48, + 48, + 64, 64, 112, 64, 0, 96, 96, + }, + // Voodoo Head + { + 1, + 30, + 48, + 3, + 32768, + 1600, + 0, + 2443, + (char)-128, + 0, + 16, + 16, + 0, 0, 0, 0, 0, 0, 0, + }, + // 433 - kModernThingTNTProx + { + 5, + 5, + 16, + 3, + 24576, + 1600, + 256, + 3444, + (char)-16, + 7, + 32, + 32, + 256, 256, 256, 64, 0, 0, 512, + }, + // 434 - kModernThingThrowableRock + { + 5, + 6, + 16, + 3, + 32768, + 1600, + 256, + 1462, + (char)0, + 0, + 32, + 32, + 0, 0, 0, 0, 0, 0, 0, + }, + // 435 - kModernThingEnemyLifeLeech + { + 150, + 30, + 48, + 3, + 32768, + 1600, + 257, + 800, + (char)-128, + 0, + 44, + 44, + 0, 1024, 512, 1024, 0, 64, 512, + }, }; const EXPLOSION explodeInfo[] = { - { - 40, - 10, - 10, - 75, - 450, - 0, - 60, - 80, - 40 - }, - { - 80, - 20, - 10, - 150, - 900, - 0, - 60, - 160, - 60 - }, - { - 120, - 40, - 15, - 225, - 1350, - 0, - 60, - 240, - 80 - }, - { - 80, - 5, - 10, - 120, - 20, - 10, - 60, - 0, - 40 - }, - { - 120, - 10, - 10, - 180, - 40, - 10, - 60, - 0, - 80 - }, - { - 160, - 15, - 10, - 240, - 60, - 10, - 60, - 0, - 120 - }, - { - 40, - 20, - 10, - 120, - 0, - 10, - 30, - 60, - 40 - }, - { - 80, - 20, - 10, - 150, - 800, - 5, - 60, - 160, - 60 - }, + { + 40, + 10, + 10, + 75, + 450, + 0, + 60, + 80, + 40 + }, + { + 80, + 20, + 10, + 150, + 900, + 0, + 60, + 160, + 60 + }, + { + 120, + 40, + 15, + 225, + 1350, + 0, + 60, + 240, + 80 + }, + { + 80, + 5, + 10, + 120, + 20, + 10, + 60, + 0, + 40 + }, + { + 120, + 10, + 10, + 180, + 40, + 10, + 60, + 0, + 80 + }, + { + 160, + 15, + 10, + 240, + 60, + 10, + 60, + 0, + 120 + }, + { + 40, + 20, + 10, + 120, + 0, + 10, + 30, + 60, + 40 + }, + { + 80, + 20, + 10, + 150, + 800, + 5, + 60, + 160, + 60 + }, }; static const short gPlayerGibThingComments[] = { - 734, 735, 736, 737, 738, 739, 740, 741, 3038, 3049 + 734, 735, 736, 737, 738, 739, 740, 741, 3038, 3049 }; int gPostCount = 0; struct POSTPONE { - short sprite; - short status; + short sprite; + short status; }; POSTPONE gPost[kMaxSprites]; bool IsUnderwaterSector(int nSector) { - int nXSector = sector[nSector].extra; - if (nXSector > 0 && xsector[nXSector].Underwater) - return 1; - return 0; -} - -// Let's better forget that this shit ever existed. It will be a lot easier to substitute player owners upon respawn, if needed. - -int actOwnerIdToSpriteId(int nSprite) -{ - if (nSprite == -1) - return -1; - if (nSprite & kMaxSprites) - nSprite = gPlayer[nSprite&(kMaxSprites-1)].pSprite->index; - return nSprite; -} - -bool actTypeInSector(int nSector, int nType) -{ - int nSprite; - SectIterator it(nSector); - while ((nSprite = it.NextIndex()) >= 0) - { - if (sprite[nSprite].index == nType) - return 1; - } - return 0; -} - -void actAllocateSpares(void) -{ + int nXSector = sector[nSector].extra; + if (nXSector > 0 && xsector[nXSector].Underwater) + return 1; + return 0; } const int DudeDifficulty[5] = { @@ -2407,7 +2380,6 @@ void actInit(bool bSaveLoad) } #endif - int nSprite; BloodStatIterator it(kStatItem); while (auto act = it.Next()) { @@ -2484,14 +2456,13 @@ void actInit(bool bSaveLoad) if (gGameOptions.nMonsterSettings == 0) { gKillMgr.SetCount(0); - int nSprite; BloodStatIterator it(kStatDude); while (auto act = it.Next()) { spritetype *pSprite = &act->s(); if (act->hasX() && act->x().key > 0) // Drop Key actDropObject(pSprite, kItemKeyBase + (act->x().key - 1)); - DeleteSprite(nSprite); + DeleteSprite(act); } } else @@ -2500,7 +2471,6 @@ void actInit(bool bSaveLoad) /////////////// char unk[kDudeMax-kDudeBase]; memset(unk, 0, sizeof(unk)); - int nSprite; BloodStatIterator it(kStatDude); while (auto act = it.Next()) { diff --git a/source/blood/src/actor.h b/source/blood/src/actor.h index 48d53b80a..a0aabd6df 100644 --- a/source/blood/src/actor.h +++ b/source/blood/src/actor.h @@ -216,8 +216,6 @@ void actDoLight(int spriteNum); #endif bool IsUnderwaterSector(int nSector); -bool actTypeInSector(int nSector, int nType); -void actAllocateSpares(void); void actInit(bool bSaveLoad); void ConcussSprite(int a1, spritetype *pSprite, int x, int y, int z, int a6); int actWallBounceVector(int *x, int *y, int nWall, int a4); diff --git a/source/blood/src/bloodactor.h b/source/blood/src/bloodactor.h index 7bb24a595..b586c53b9 100644 --- a/source/blood/src/bloodactor.h +++ b/source/blood/src/bloodactor.h @@ -89,5 +89,11 @@ public: } }; +inline int DeleteSprite(DBloodActor* nSprite) +{ + if (nSprite) return DeleteSprite(nSprite->s().index); + return 0; +} + END_BLD_NS