diff --git a/ItemSpawn/scripting/items/balrog.inc b/ItemSpawn/scripting/items/balrog.inc index 8302456e..2ddc91a3 100644 --- a/ItemSpawn/scripting/items/balrog.inc +++ b/ItemSpawn/scripting/items/balrog.inc @@ -134,7 +134,7 @@ public void SpawnBalrog(float fOrigin[3]) DispatchKeyFormat(iTriggerRoar, "damagecap", "20"); DispatchKeyFormat(iTriggerRoar, "damage", "-20000"); DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "!activator,AddOutput,max_health 10000,0,-1"); - DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "!activator,AddOutput,max_health 100,0.01,-1"); + DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "!activator,AddOutput,max_health 100,0.02,-1"); DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "!activator,AddOutput,rendercolor 255 0 0,0,-1"); DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "!activator,AddOutput,rendercolor 255 255 255,10,-1"); DispatchKeyFormat(iTriggerRoar, "OnStartTouch", "item_spawn_speedmod,ModifySpeed,1.5,0,-1"); @@ -250,21 +250,22 @@ public void SpawnBalrog(float fOrigin[3]) int iRelayDeath = CreateEntityAtOrigin("logic_compare", fOrigin); DispatchKeyFormat(iRelayDeath, "targetname", "item_balrog_death_%d", g_iCounter); DispatchKeyFormat(iRelayDeath, "spawnflags", "0"); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_knife_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_strip_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_walk_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_roar_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_attack_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_walk_sound_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_roar_sound_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_attack_sound_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_roar_compare_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "item_balrog_attack_compare_%d,Kill,,1,-1", g_iCounter); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "!activator,AddOutput,rendermode 0,1,-1"); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "!activator,AddOutput,renderfx 0,1,-1"); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "!activator,AddOutput,gravity 1,0,-1"); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "!activator,SetDamageFilter,,1,-1"); - DispatchKeyFormat(iRelayDeath, "OnTrigger", "!activator,SetHealth,0,1.02,-1"); + DispatchKeyFormat(iRelayDeath, "OnTrigger", "!self,FireUser1,,0.1,-1"); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_knife_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_strip_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_walk_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_roar_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_attack_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_walk_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_roar_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_attack_sound_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_roar_compare_%d,Kill,,0,1", g_iCounter); + DispatchKeyFormat(iRelayDeath, "OnUser1", "item_balrog_attack_compare_%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,AddOutput,gravity 1,0,1"); + DispatchKeyFormat(iRelayDeath, "OnUser1", "!activator,SetDamageFilter,,0,1"); + DispatchKeyFormat(iRelayDeath, "OnUser1", "!activator,SetHealth,0,0.02,-1"); SpawnAndActivate(iRelayDeath); ParentToEntity(iRelayDeath, iKnife); @@ -324,8 +325,8 @@ public void SpawnBalrog(float fOrigin[3]) DispatchKeyFormat(iHealth, "OnUser2", "item_balrog_walk_%d,Enable,,0.1,-1", g_iCounter); DispatchKeyFormat(iHealth, "OnUser2", "!self,FireUser2,,0.95,-1"); DispatchKeyFormat(iHealth, "OnUser3", "item_balrog_death_%d,CancelPending,,0,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnUser3", "item_balrog_death_%d,Trigger,,0.1,-1", g_iCounter); - DispatchKeyFormat(iHealth, "OnUser3", "!self,FireUser3,,0.2,-1"); + DispatchKeyFormat(iHealth, "OnUser3", "item_balrog_death_%d,Trigger,,0.05,-1", g_iCounter); + DispatchKeyFormat(iHealth, "OnUser3", "!self,FireUser3,,0.1,-1"); SpawnAndActivate(iHealth); ParentToEntity(iHealth, iKnife);