From: Mario Date: Wed, 17 Dec 2014 00:20:46 +0000 (+1100) Subject: Begin making players still gib in instagib X-Git-Tag: xonotic-v0.8.2~1917^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e5a6b70f5855f122423d9548ed508a29d88043c;p=xonotic%2Fxonotic-data.pk3dir.git Begin making players still gib in instagib --- diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc index cd0ebdd0f..d79b08b05 100644 --- a/qcsrc/server/mutators/mutator_instagib.qc +++ b/qcsrc/server/mutators/mutator_instagib.qc @@ -364,6 +364,14 @@ MUTATOR_HOOKFUNCTION(instagib_ItemCountdown) return FALSE; } +MUTATOR_HOOKFUNCTION(instagib_PlayerDies) +{ + if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER)) + frag_damage = 1000; // always gib if it was a vaporizer death + + return FALSE; +} + MUTATOR_HOOKFUNCTION(instagib_ItemTouch) { if(self.ammo_cells) @@ -449,6 +457,7 @@ MUTATOR_DEFINITION(mutator_instagib) MUTATOR_HOOK(FilterItem, instagib_FilterItem, CBC_ORDER_ANY); MUTATOR_HOOK(CustomizeWaypoint, instagib_CustomizeWaypoint, CBC_ORDER_ANY); MUTATOR_HOOK(Item_RespawnCountdown, instagib_ItemCountdown, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerDies, instagib_PlayerDies, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, instagib_SplitHealthArmor, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerPowerups, instagib_PlayerPowerups, CBC_ORDER_ANY); MUTATOR_HOOK(ForbidThrowCurrentWeapon, instagib_ForbidThrowing, CBC_ORDER_ANY);