From 40fbe720eb470028ed89dee31c6bfba757cca5ec Mon Sep 17 00:00:00 2001 From: zaCade Date: Sun, 12 Aug 2018 16:09:46 +0200 Subject: [PATCH] ItemSpawn: Whiteknight complete. --- ItemSpawn/scripting/items/whiteknight.inc | 31 ++++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/ItemSpawn/scripting/items/whiteknight.inc b/ItemSpawn/scripting/items/whiteknight.inc index 0369323d..884e2e1f 100644 --- a/ItemSpawn/scripting/items/whiteknight.inc +++ b/ItemSpawn/scripting/items/whiteknight.inc @@ -143,10 +143,6 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iTriggerAttack3, "damagemodel", "0"); DispatchKeyFormat(iTriggerAttack3, "damagecap", "20"); DispatchKeyFormat(iTriggerAttack3, "damage", "800"); - DispatchKeyFormat(iTriggerAttack3, "OnUser1", "!self,AddOutput,damage 800,0,-1"); - DispatchKeyFormat(iTriggerAttack3, "OnUser2", "!self,AddOutput,damage 1500,0,-1"); - DispatchKeyFormat(iTriggerAttack3, "OnUser1", "!self,Enable,,0,-1"); - DispatchKeyFormat(iTriggerAttack3, "OnUser2", "!self,Enable,,0,-1"); SpawnAndActivate(iTriggerAttack3); ParentToEntity(iTriggerAttack3, iKnife); @@ -240,8 +236,9 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iBranchAttack, "spawnflags", "0"); DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_case_1_%d,PickRandom,,0,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_sound_1_%d,PlaySound,,0.3,-1", g_iCounter); - DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_1_%d,Enable,,0.3,-1", g_iCounter); - DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_3_%d,FireUser1,,0.3,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_3_%d,AddOutput,damage 800,0.3,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_1_%d,Enable,,0.31,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_3_%d,Enable,,0.31,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_1_%d,Disable,,0.5,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_3_%d,Disable,,0.5,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnFalse", "item_knight_attack_compare_%d,SetValue,0,1,-1", g_iCounter); @@ -251,8 +248,9 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iBranchAttack, "OnTrue", "item_spawn_speedmod,ModifySpeed,0,0,-1"); DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_case_2_%d,PickRandom,,0,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_sound_2_%d,PlaySound,,1,-1", g_iCounter); - DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_2_%d,Enable,,1,-1", g_iCounter); - DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_3_%d,FireUser2,,1,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_3_%d,AddOutput,damage 1500,1,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_2_%d,Enable,,1.01,-1", g_iCounter); + DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_3_%d,Enable,,1.01,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_2_%d,Disable,,1.2,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_3_%d,Disable,,1.2,-1", g_iCounter); DispatchKeyFormat(iBranchAttack, "OnTrue", "item_knight_attack_compare_%d,SetValue,0,2,-1", g_iCounter); @@ -310,16 +308,25 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iCompareShield, "OnEqualTo", "item_knight_walk_%d,Trigger,,2,-1", g_iCounter); SpawnAndActivate(iCompareShield); ParentToEntity(iCompareShield, iKnife); -/* + // logic_compare nuke. int iCompareNuke = CreateEntityAtOrigin("logic_compare", fOrigin); DispatchKeyFormat(iCompareNuke, "targetname", "item_knight_nuke_compare_%d", g_iCounter); DispatchKeyFormat(iCompareNuke, "spawnflags", "0"); DispatchKeyFormat(iCompareNuke, "OnEqualTo", "!self,SetValue,1,0,-1"); DispatchKeyFormat(iCompareNuke, "OnEqualTo", "!self,SetValue,0,150,-1"); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_spawn_speedmod,ModifySpeed,0,0,-1"); DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_attack_compare_%d,SetCompareValue,-1,0,-1", g_iCounter); DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_shield_compare_%d,SetCompareValue,-1,0,-1", g_iCounter); DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_nuke_compare_%d,SetCompareValue,-1,0,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_model_%d,SetAnimation,dog_ultimated,0,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_walk_%d,Disable,,0,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_nuke_sound_1_%d,PlaySound,,0,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_nuke_sound_2_%d,PlaySound,,5.1,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_nuke_%d,Enable,,5.1,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_nuke_%d,Disable,,5.3,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_walk_%d,Enable,,5.5,-1", g_iCounter); + DispatchKeyFormat(iCompareNuke, "OnEqualTo", "item_knight_walk_%d,Trigger,,5.51,-1", g_iCounter); SpawnAndActivate(iCompareNuke); ParentToEntity(iCompareNuke, iKnife); @@ -407,7 +414,7 @@ public void SpawnWhiteKnight(float fOrigin[3]) DispatchKeyFormat(iRelayCombo8, "OnTrigger", "item_knight_nuke_compare_%d,Compare,,0,-1", g_iCounter); SpawnAndActivate(iRelayCombo8); ParentToEntity(iRelayCombo8, iKnife); -*/ + // logic_relay walk. int iRelayWalk = CreateEntityAtOrigin("logic_relay", fOrigin); DispatchKeyFormat(iRelayWalk, "targetname", "item_knight_walk_%d", g_iCounter); @@ -463,7 +470,7 @@ public void SpawnWhiteKnight(float fOrigin[3]) // health origin. fOriginTemp[0] = fOrigin[0] + 6.0; fOriginTemp[1] = fOrigin[1]; - fOriginTemp[2] = fOrigin[2] + 56.0; + fOriginTemp[2] = fOrigin[2] - 80.0; // func_physbox_multiplayer health. int iHealth = CreateEntityAtOrigin("func_physbox_multiplayer", fOriginTemp); @@ -535,7 +542,7 @@ public void SpawnWhiteKnight(float fOrigin[3]) ParentToEntity(iHealth, iKnife); // make the physbox work. - SetEntityBBox(iHealth, view_as({-36.0, -52.0, -56.0}), view_as({36.0, 52.0, 56.0})); + SetEntityBBox(iHealth, view_as({-36.0, -52.0, 48.0}), view_as({36.0, 52.0, 160.0})); SetEntityProps(iHealth); HookSingleEntityOutput(iHealth, "OnBreak", WhiteKnightKill, true);