From baab4dd2ebf6af5b1f5fa6ea3ce62655a8d7cbb9 Mon Sep 17 00:00:00 2001 From: zaCade Date: Fri, 10 Aug 2018 20:54:45 +0200 Subject: [PATCH] ItemSpawn: Clean up some outputs. --- ItemSpawn/scripting/items/balrog.inc | 32 ++++++++++---------- ItemSpawn/scripting/items/whiteknight.inc | 36 +++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ItemSpawn/scripting/items/balrog.inc b/ItemSpawn/scripting/items/balrog.inc index 786be330..a4898fbe 100644 --- a/ItemSpawn/scripting/items/balrog.inc +++ b/ItemSpawn/scripting/items/balrog.inc @@ -52,7 +52,7 @@ public void SpawnBalrog(float fOrigin[3]) DispatchKeyFormat(iKnife, "hammerid", "11051995%d", g_iCounter); DispatchKeyFormat(iKnife, "spawnflags", "1"); DispatchKeyFormat(iKnife, "angles", "0 0 0"); - DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_balrog_knife_%d,AddOutput,renderfx 6,0.02,1", g_iCounter); + DispatchKeyFormat(iKnife, "OnPlayerPickup", "!self,AddOutput,renderfx 6,0,1"); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_balrog_model_%d,SetAnimation,balrog_attack1,0,1", g_iCounter); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_balrog_model_%d,SetDefaultAnimation,crouch_walk_lower,0,1", g_iCounter); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_balrog_health_%d,FireUser1,,0,1", g_iCounter); @@ -105,7 +105,7 @@ public void SpawnBalrog(float fOrigin[3]) DispatchKeyFormat(iTriggerWalk, "targetname", "item_balrog_walk_%d", g_iCounter); DispatchKeyFormat(iTriggerWalk, "filtername", "item_spawn_human_filter"); DispatchKeyFormat(iTriggerWalk, "spawnflags", "9"); - DispatchKeyFormat(iTriggerWalk, "startdisabled", "0"); + DispatchKeyFormat(iTriggerWalk, "startdisabled", "1"); DispatchKeyFormat(iTriggerWalk, "damagetype", "128"); DispatchKeyFormat(iTriggerWalk, "damagemodel", "0"); DispatchKeyFormat(iTriggerWalk, "damagecap", "20"); @@ -300,20 +300,20 @@ public void SpawnBalrog(float fOrigin[3]) DispatchKeyFormat(iHealth, "damagetype", "0"); DispatchKeyFormat(iHealth, "damagetoenablemotion", "0"); DispatchKeyFormat(iHealth, "damagefilter", "item_spawn_human_filter"); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_knife_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_strip_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_walk_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_walk_sound_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_sound_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_sound_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_compare_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_compare_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_controls_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,ClearParent,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,SetAnimation,balrog_death,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,SetDefaultAnimation,balrog_death_idle,0,-1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_knife_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_strip_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_walk_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_walk_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_roar_compare_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_attack_compare_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_controls_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,ClearParent,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,SetAnimation,balrog_death,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_balrog_model_%d,SetDefaultAnimation,balrog_death_idle,0,1", g_iCounter); DispatchKeyFormat(iHealth, "OnUser1", "!activator,SetDamageFilter,item_spawn_zombie_filter,0,-1"); DispatchKeyFormat(iHealth, "OnUser1", "!activator,AddOutput,rendermode 10,0,-1"); DispatchKeyFormat(iHealth, "OnUser1", "!activator,AddOutput,renderfx 6,0,-1"); diff --git a/ItemSpawn/scripting/items/whiteknight.inc b/ItemSpawn/scripting/items/whiteknight.inc index 329cc3f2..b602fb2c 100644 --- a/ItemSpawn/scripting/items/whiteknight.inc +++ b/ItemSpawn/scripting/items/whiteknight.inc @@ -52,7 +52,7 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iKnife, "hammerid", "11051995%d", g_iCounter); DispatchKeyFormat(iKnife, "spawnflags", "1"); DispatchKeyFormat(iKnife, "angles", "0 0 0"); - DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_knight_knife_%d,AddOutput,renderfx 6,0.02,1", g_iCounter); + DispatchKeyFormat(iKnife, "OnPlayerPickup", "!self,AddOutput,renderfx 6,0,1"); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_knight_model_%d,SetAnimation,dog_run,0,1", g_iCounter); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_knight_model_%d,SetDefaultAnimation,dog_run,0,1", g_iCounter); DispatchKeyFormat(iKnife, "OnPlayerPickup", "item_knight_health_%d,FireUser1,,0,1", g_iCounter); @@ -73,7 +73,7 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iModel, "targetname", "item_knight_model_%d", g_iCounter); DispatchKeyFormat(iModel, "model", "models/dog_jugger.mdl"); DispatchKeyFormat(iModel, "disablebonefollowers", "1"); - DispatchKeyFormat(iModel, "defaultanim", "dog_defense"); + DispatchKeyFormat(iModel, "defaultanim", "ragdoll"); DispatchKeyFormat(iModel, "angles", "0 0 0"); DispatchKeyFormat(iModel, "solid", "0"); SpawnAndActivate(iModel); @@ -179,12 +179,12 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iRelayDeath, "targetname", "item_knight_death_%d", g_iCounter); DispatchKeyFormat(iRelayDeath, "spawnflags", "0"); DispatchKeyFormat(iRelayDeath, "OnTrigger", "!self,FireUser1,,0.1,-1"); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_knife_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_strip_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_push_1_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_push_2_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_hurt_1_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_hurt_2_%d,Kill,,0,-1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_knife_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_strip_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_push_1_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_push_2_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_hurt_1_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_knight_hurt_2_%d,Kill,,0,1", g_iCounter); DispatchKeyFormat(iRelayDeath, "OnUser1", "!activator,AddOutput,rendermode 0,0,1"); DispatchKeyFormat(iRelayDeath, "OnUser1", "!activator,AddOutput,renderfx 0,0,1"); DispatchKeyFormat(iRelayDeath, "OnUser1", "!activator,SetDamageFilter,,0,1"); @@ -226,17 +226,17 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iHealth, "damagetype", "0"); DispatchKeyFormat(iHealth, "damagetoenablemotion", "0"); DispatchKeyFormat(iHealth, "damagefilter", "item_spawn_zombie_filter"); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_knife_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_strip_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_push_1_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_push_2_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_hurt_1_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_hurt_2_%d,Kill,,0,-1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_knife_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_strip_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_push_1_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_push_2_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_hurt_1_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_hurt_2_%d,Kill,,0,1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_controls_%d,Kill,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,ClearParent,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,SetAnimation,dog_die,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,SetDefaultAnimation,dog_die_loop,0,-1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_controls_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,ClearParent,,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,SetAnimation,dog_die,0,1", g_iCounter); + DispatchKeyFormat(iHealth, "OnBreak", "item_knight_model_%d,SetDefaultAnimation,dog_die_loop,0,1", g_iCounter); DispatchKeyFormat(iHealth, "OnUser1", "!activator,SetDamageFilter,item_spawn_human_filter,0,-1"); DispatchKeyFormat(iHealth, "OnUser1", "!activator,AddOutput,rendermode 10,0,-1"); DispatchKeyFormat(iHealth, "OnUser1", "!activator,AddOutput,renderfx 6,0,-1");