From: Mario Date: Sun, 1 Sep 2013 19:29:32 +0000 (+1000) Subject: Change miniboss spawnflag value to original Quake value X-Git-Tag: xonotic-v0.8.0~241^2^2~104 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d28cb3de508e8784f2cabe7fc1a5978d59dc8db;p=xonotic%2Fxonotic-data.pk3dir.git Change miniboss spawnflag value to original Quake value --- diff --git a/qcsrc/common/monsters/monster/animus.qc b/qcsrc/common/monsters/monster/animus.qc index 1d68dc415..8d56e0fec 100644 --- a/qcsrc/common/monsters/monster/animus.qc +++ b/qcsrc/common/monsters/monster/animus.qc @@ -54,18 +54,12 @@ float animus_attack(float attack_type) { case MONSTER_ATTACK_MELEE: { - if(monster_melee(self.enemy, MON_CVAR(animus, attack_melee_damage), animus_anim_attack, self.attack_range, 1, DEATH_MONSTER_ANIMUS, TRUE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(animus, attack_melee_damage), animus_anim_attack, self.attack_range, 1, DEATH_MONSTER_ANIMUS, TRUE); } case MONSTER_ATTACK_RANGED: { makevectors(self.angles); - if(monster_leap(animus_anim_leap, animus_touch_jump, v_forward * 700 + '0 0 300', 0.8)) - return TRUE; - - return FALSE; + return monster_leap(animus_anim_leap, animus_touch_jump, v_forward * 700 + '0 0 300', 0.8); } } diff --git a/qcsrc/common/monsters/monster/bruiser.qc b/qcsrc/common/monsters/monster/bruiser.qc index fb9c06618..3ab609c91 100644 --- a/qcsrc/common/monsters/monster/bruiser.qc +++ b/qcsrc/common/monsters/monster/bruiser.qc @@ -41,10 +41,7 @@ float bruiser_attack(float attack_type) { float len = vlen(self.velocity); - if(monster_melee(self.enemy, MON_CVAR(bruiser, attack_melee_damage), ((len < 50) ? bruiser_anim_attack : bruiser_anim_runattack), self.attack_range, 1.25, DEATH_MONSTER_BRUISER, FALSE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(bruiser, attack_melee_damage), ((len < 50) ? bruiser_anim_attack : bruiser_anim_runattack), self.attack_range, 1.25, DEATH_MONSTER_BRUISER, FALSE); } case MONSTER_ATTACK_RANGED: { diff --git a/qcsrc/common/monsters/monster/cerberus.qc b/qcsrc/common/monsters/monster/cerberus.qc index 951aae796..bbd353acd 100644 --- a/qcsrc/common/monsters/monster/cerberus.qc +++ b/qcsrc/common/monsters/monster/cerberus.qc @@ -89,18 +89,12 @@ float cerberus_attack(float attack_type) { case MONSTER_ATTACK_MELEE: { - if(monster_melee(self.enemy, MON_CVAR(cerberus, attack_bite_damage), cerberus_anim_attack, self.attack_range, 0.7, DEATH_MONSTER_CERBERUS_BITE, TRUE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(cerberus, attack_bite_damage), cerberus_anim_attack, self.attack_range, 0.7, DEATH_MONSTER_CERBERUS_BITE, TRUE); } case MONSTER_ATTACK_RANGED: { makevectors(self.angles); - if(monster_leap(cerberus_anim_attack, cerberus_touch_jump, v_forward * 300 + '0 0 200', 0.8)) - return TRUE; - - return FALSE; + return monster_leap(cerberus_anim_attack, cerberus_touch_jump, v_forward * 300 + '0 0 200', 0.8); } } diff --git a/qcsrc/common/monsters/monster/knight.qc b/qcsrc/common/monsters/monster/knight.qc index 1e86618cb..78fe2a1b8 100644 --- a/qcsrc/common/monsters/monster/knight.qc +++ b/qcsrc/common/monsters/monster/knight.qc @@ -241,17 +241,11 @@ float knight_attack(float attack_type) else anim = knight_anim_wattack; - if(monster_melee(self.enemy, MON_CVAR(knight, attack_melee_damage), anim, self.attack_range, 0.7, DEATH_MONSTER_KNIGHT_MELEE, TRUE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(knight, attack_melee_damage), anim, self.attack_range, 0.7, DEATH_MONSTER_KNIGHT_MELEE, TRUE); } case MONSTER_ATTACK_RANGED: { - if(knight_attack_ranged()) - return TRUE; - - return FALSE; + return knight_attack_ranged(); } } diff --git a/qcsrc/common/monsters/monster/slime.qc b/qcsrc/common/monsters/monster/slime.qc index 31680a278..ee3f247bd 100644 --- a/qcsrc/common/monsters/monster/slime.qc +++ b/qcsrc/common/monsters/monster/slime.qc @@ -55,8 +55,7 @@ float slime_attack(float attack_type) case MONSTER_ATTACK_RANGED: { makevectors(self.angles); - if(monster_leap(slime_anim_jump, slime_touch_jump, v_forward * 600 + '0 0 200', 0.5)) - return TRUE; + return monster_leap(slime_anim_jump, slime_touch_jump, v_forward * 600 + '0 0 200', 0.5); } } diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 9d7e33f1e..28e7383c9 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -141,11 +141,8 @@ float spider_attack(float attack_type) switch(attack_type) { case MONSTER_ATTACK_MELEE: - { - if(monster_melee(self.enemy, MON_CVAR(spider, attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, MON_CVAR(spider, attack_bite_delay), DEATH_MONSTER_SPIDER, TRUE)) - return TRUE; - - return FALSE; + { + return monster_melee(self.enemy, MON_CVAR(spider, attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, MON_CVAR(spider, attack_bite_delay), DEATH_MONSTER_SPIDER, TRUE); } case MONSTER_ATTACK_RANGED: { @@ -187,7 +184,7 @@ float m_spider(float req) case MR_DEATH: { monsters_setframe(spider_anim_attack); - self.angles += '180 0 0'; + self.angles_x = 180; self.SendFlags |= MSF_ANG; return TRUE; } diff --git a/qcsrc/common/monsters/monster/stingray.qc b/qcsrc/common/monsters/monster/stingray.qc index c6d02fb5d..5a5335617 100644 --- a/qcsrc/common/monsters/monster/stingray.qc +++ b/qcsrc/common/monsters/monster/stingray.qc @@ -33,10 +33,7 @@ float stingray_attack(float attack_type) { case MONSTER_ATTACK_MELEE: { - if(monster_melee(self.enemy, MON_CVAR(stingray, attack_bite_damage), stingray_anim_attack, self.attack_range, MON_CVAR(stingray, attack_bite_delay), DEATH_MONSTER_STINGRAY, FALSE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(stingray, attack_bite_damage), stingray_anim_attack, self.attack_range, MON_CVAR(stingray, attack_bite_delay), DEATH_MONSTER_STINGRAY, FALSE); } case MONSTER_ATTACK_RANGED: { diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index 69deac51a..c87044d45 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -92,18 +92,12 @@ float zombie_attack(float attack_type) else chosen_anim = zombie_anim_attackstanding3; - if(monster_melee(self.enemy, MON_CVAR(zombie, attack_melee_damage), chosen_anim, self.attack_range, MON_CVAR(zombie, attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE)) - return TRUE; - - return FALSE; + return monster_melee(self.enemy, MON_CVAR(zombie, attack_melee_damage), chosen_anim, self.attack_range, MON_CVAR(zombie, attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE); } case MONSTER_ATTACK_RANGED: { makevectors(self.angles); - if(monster_leap(zombie_anim_attackleap, zombie_attack_leap_touch, v_forward * MON_CVAR(zombie, attack_leap_speed) + '0 0 200', MON_CVAR(zombie, attack_leap_delay))) - return TRUE; - - return FALSE; + return monster_leap(zombie_anim_attackleap, zombie_attack_leap_touch, v_forward * MON_CVAR(zombie, attack_leap_speed) + '0 0 200', MON_CVAR(zombie, attack_leap_delay)); } } diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh index 6f5271d65..dd0056f6a 100644 --- a/qcsrc/common/monsters/sv_monsters.qh +++ b/qcsrc/common/monsters/sv_monsters.qh @@ -37,11 +37,11 @@ const float MONSTERSKILL_NOTMEDIUM = 512; // monster will not spawn on skill 2 const float MONSTERSKILL_NOTHARD = 1024; // monster will not spawn on skill >= 3 // new flags -const float MONSTERFLAG_MINIBOSS = 1; // monster spawns as mini-boss (also has a chance of naturally becoming one) const float MONSTERFLAG_APPEAR = 2; // delay spawn until triggered const float MONSTERFLAG_NORESPAWN = 4; const float MONSTERFLAG_FLY_VERTICAL = 8; // fly/swim vertically const float MONSTERFLAG_INFRONT = 16; // only check for enemies infront of us +const float MONSTERFLAG_MINIBOSS = 64; // monster spawns as mini-boss (also has a chance of naturally becoming one) const float MONSTERFLAG_SPAWNED = 16384; // flag for spawned monsters .float msound_delay; // restricts some monster sounds