From: Mario Date: Sun, 30 Aug 2015 04:20:35 +0000 (+1000) Subject: Add some monster flags for later use X-Git-Tag: xonotic-v0.8.2~1988 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc829528986909cb96fe28b65b6d447f27235b65;p=xonotic%2Fxonotic-data.pk3dir.git Add some monster flags for later use --- diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh index 0f2f13c5e..20a210378 100644 --- a/qcsrc/common/monsters/all.qh +++ b/qcsrc/common/monsters/all.qh @@ -42,6 +42,8 @@ const int MONSTER_SIZE_BROKEN = 128; // TODO: remove when bad models are replace const int MON_FLAG_SUPERMONSTER = 256; // incredibly powerful monster const int MON_FLAG_RANGED = 512; // monster shoots projectiles const int MON_FLAG_MELEE = 1024; +const int MON_FLAG_CRUSH = 2048; // monster can be stomped in special modes +const int MON_FLAG_RIDE = 4096; // monster can be ridden in special modes // entity properties of monsterinfo: .string netname; // short name diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index dae97c187..0179c66b9 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -3,7 +3,7 @@ bool M_Spider(int); #endif REGISTER_MONSTER_SIMPLE( /* MON_##id */ SPIDER, -/* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED, +/* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED | MON_FLAG_RIDE, /* mins,maxs */ '-18 -18 -25', '18 18 30', /* model */ "spider.dpm", /* netname */ "spider", diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index 4dd3fd71f..9bdc4c63a 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -3,7 +3,7 @@ bool M_Wyvern(int); #endif REGISTER_MONSTER_SIMPLE( /* MON_##id */ WYVERN, -/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED, +/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE, /* mins,maxs */ '-20 -20 -58', '20 20 20', /* model */ "wizard.mdl", /* netname */ "wyvern", diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index 1ccfa82c8..780cf74b3 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -3,7 +3,7 @@ bool M_Zombie(int); #endif REGISTER_MONSTER_SIMPLE( /* MON_##id */ ZOMBIE, -/* spawnflags */ MON_FLAG_MELEE, +/* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RIDE, /* mins,maxs */ '-18 -18 -25', '18 18 47', /* model */ "zombie.dpm", /* netname */ "zombie",