diff --git a/BossHP/configs/bosshp/ZE_FFVII_Mako_Reactor_V6_B08.cfg b/BossHP/configs/bosshp/ZE_FFVII_Mako_Reactor_V6_B08.cfg index 94cc761a..51e873ac 100644 --- a/BossHP/configs/bosshp/ZE_FFVII_Mako_Reactor_V6_B08.cfg +++ b/BossHP/configs/bosshp/ZE_FFVII_Mako_Reactor_V6_B08.cfg @@ -27,7 +27,7 @@ "name" "Bahamut" "method" "breakable" "trigger" "Sephiroth_Final_HP_Counter:OnStartTouch" - "hurttrigger" "Final_Fulgor_Breakable:OnHealthChanged" + "hurttrigger" "Final_Fulgor_Breakable:OnTakeDamage" "breakable" "Final_Fulgor_Breakable" } @@ -36,7 +36,7 @@ "name" "Sephiroth" "method" "breakable" "trigger" "Sephiroth_Final_HP_Counter:OnTrigger" - "hurttrigger" "Sephiroth_Final_Breakable:OnHealthChanged" + "hurttrigger" "Sephiroth_Final_Breakable:OnTakeDamage" "breakable" "Sephiroth_Final_Breakable" "timeout" "1" diff --git a/BossHP/configs/bosshp/ze_Ancient_wrath_v1_fix2.cfg b/BossHP/configs/bosshp/ze_Ancient_wrath_v1_fix2.cfg index af9f559f..8f2bd404 100644 --- a/BossHP/configs/bosshp/ze_Ancient_wrath_v1_fix2.cfg +++ b/BossHP/configs/bosshp/ze_Ancient_wrath_v1_fix2.cfg @@ -6,7 +6,7 @@ "name" "Energy Beam 1" "method" "breakable" "trigger" "boss_3_energy_trigger:OnStartTouch" - "hurttrigger" "boss_3_energy_1:OnHealthChanged" + "hurttrigger" "boss_3_energy_1:OnTakeDamage" "breakable" "boss_3_energy_1" } @@ -15,7 +15,7 @@ "name" "Energy Beam 2" "method" "breakable" "trigger" "boss_3_energy_trigger:OnStartTouch" - "hurttrigger" "boss_3_energy_2:OnHealthChanged" + "hurttrigger" "boss_3_energy_2:OnTakeDamage" "breakable" "boss_3_energy_2" } @@ -24,7 +24,7 @@ "name" "Container" "method" "breakable" "trigger" "boss_3_energy_counter:OnHitMax" - "hurttrigger" "boss_3_container:OnHealthChanged" + "hurttrigger" "boss_3_container:OnTakeDamage" "breakable" "boss_3_container" } diff --git a/BossHP/configs/bosshp/ze_FFVII_Mako_Reactor_v5_3.cfg b/BossHP/configs/bosshp/ze_FFVII_Mako_Reactor_v5_3.cfg index 8fddbe5d..c4d657df 100644 --- a/BossHP/configs/bosshp/ze_FFVII_Mako_Reactor_v5_3.cfg +++ b/BossHP/configs/bosshp/ze_FFVII_Mako_Reactor_v5_3.cfg @@ -5,7 +5,7 @@ "name" "Scorpion" "method" "breakable" "trigger" "calcVidaM:OnStartTouch" - "hurttrigger" "Monstruo_Breakable:OnDamaged" + "hurttrigger" "Monstruo_Breakable:OnTakeDamage" "breakable" "Monstruo_Breakable" } @@ -23,7 +23,7 @@ "name" "Sephiroth" "method" "breakable" "trigger" "puertafinal:OnStartTouch" - "hurttrigger" "glassT:OnDamaged" + "hurttrigger" "glassT:OnTakeDamage" "breakable" "glassT" } @@ -32,7 +32,7 @@ "name" "Bahamut" "method" "breakable" "trigger" "baha_vida:OnStartTouch" - "hurttrigger" "bahamutend:OnDamaged" + "hurttrigger" "bahamutend:OnTakeDamage" "breakable" "bahamutend" } @@ -41,7 +41,7 @@ "name" "Sephiroth" "method" "breakable" "trigger" "baha_vida2:OnStartTouch" - "hurttrigger" "bahamutend1:OnDamaged" + "hurttrigger" "bahamutend1:OnTakeDamage" "breakable" "bahamutend1" } @@ -50,7 +50,7 @@ "name" "Sephiroth" "method" "breakable" "trigger" "ex3_sephiroth_wpn:OnPlayerPickup" - "hurttrigger" "ex3_sephiroth:OnDamaged" + "hurttrigger" "ex3_sephiroth:OnTakeDamage" "breakable" "ex3_sephiroth" } diff --git a/BossHP/configs/bosshp/ze_FFXII_Feywood_b3_1.cfg b/BossHP/configs/bosshp/ze_FFXII_Feywood_b3_1.cfg index cbc95661..435b2b5f 100644 --- a/BossHP/configs/bosshp/ze_FFXII_Feywood_b3_1.cfg +++ b/BossHP/configs/bosshp/ze_FFXII_Feywood_b3_1.cfg @@ -60,7 +60,7 @@ "name" "Crystal 1" "method" "breakable" "trigger" "lvl2_Action_3:OnTrigger" - "hurttrigger" "Tomb_01_Crystall_1:OnHealthChanged" + "hurttrigger" "Tomb_01_Crystall_1:OnTakeDamage" "breakable" "Tomb_01_Crystall_1" } @@ -69,7 +69,7 @@ "name" "Crystal 2" "method" "breakable" "trigger" "lvl2_Action_3:OnTrigger" - "hurttrigger" "Tomb_01_Crystall_2:OnHealthChanged" + "hurttrigger" "Tomb_01_Crystall_2:OnTakeDamage" "breakable" "Tomb_01_Crystall_2" } @@ -78,7 +78,7 @@ "name" "Energy Ball" "method" "breakable" "trigger" "lvl3_Action_5:OnStartTouch" - "hurttrigger" "Glass_Ball_Break:OnHealthChanged" + "hurttrigger" "Glass_Ball_Break:OnTakeDamage" "breakable" "Glass_Ball_Break" } @@ -87,7 +87,7 @@ "name" "Cactus" "method" "breakable" "trigger" "lvl5_Cactus_Trigger:OnStartTouch" - "hurttrigger" "Boss_Cactus_Break:OnHealthChanged" + "hurttrigger" "Boss_Cactus_Break:OnTakeDamage" "breakable" "Boss_Cactus_Break" } diff --git a/BossHP/configs/bosshp/ze_FFXII_Paramina_Rift_v1_4.cfg b/BossHP/configs/bosshp/ze_FFXII_Paramina_Rift_v1_4.cfg index a2f7216c..67b08766 100644 --- a/BossHP/configs/bosshp/ze_FFXII_Paramina_Rift_v1_4.cfg +++ b/BossHP/configs/bosshp/ze_FFXII_Paramina_Rift_v1_4.cfg @@ -5,7 +5,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_1:OnHealthChanged" - "hurttrigger" "Rift_Tower_1:OnHealthChanged" + "hurttrigger" "Rift_Tower_1:OnTakeDamage" "breakable" "Rift_Tower_1" "timeout" "3" } @@ -14,7 +14,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_2:OnHealthChanged" - "hurttrigger" "Rift_Tower_2:OnHealthChanged" + "hurttrigger" "Rift_Tower_2:OnTakeDamage" "breakable" "Rift_Tower_2" "timeout" "3" } @@ -23,7 +23,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_3:OnHealthChanged" - "hurttrigger" "Rift_Tower_3:OnHealthChanged" + "hurttrigger" "Rift_Tower_3:OnTakeDamage" "breakable" "Rift_Tower_3" "timeout" "3" } @@ -32,7 +32,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_4:OnHealthChanged" - "hurttrigger" "Rift_Tower_4:OnHealthChanged" + "hurttrigger" "Rift_Tower_4:OnTakeDamage" "breakable" "Rift_Tower_4" "timeout" "3" } @@ -41,7 +41,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_5:OnHealthChanged" - "hurttrigger" "Rift_Tower_5:OnHealthChanged" + "hurttrigger" "Rift_Tower_5:OnTakeDamage" "breakable" "Rift_Tower_5" "timeout" "3" } @@ -50,7 +50,7 @@ "name" "Tower" "method" "breakable" "trigger" "Rift_Tower_6:OnHealthChanged" - "hurttrigger" "Rift_Tower_6:OnHealthChanged" + "hurttrigger" "Rift_Tower_6:OnTakeDamage" "breakable" "Rift_Tower_6" "timeout" "3" } @@ -60,7 +60,7 @@ "name" "Frozen lake" "method" "breakable" "trigger" "Forest_BreakGlass:OnTakeDamage" - "hurttrigger" "Forest_BreakGlass:OnHealthChanged" + "hurttrigger" "Forest_BreakGlass:OnTakeDamage" "breakable" "Forest_BreakGlass" } diff --git a/BossHP/configs/bosshp/ze_FFXII_Westersand_v8zeta1.cfg b/BossHP/configs/bosshp/ze_FFXII_Westersand_v8zeta1.cfg index 496356b1..e3a33abb 100644 --- a/BossHP/configs/bosshp/ze_FFXII_Westersand_v8zeta1.cfg +++ b/BossHP/configs/bosshp/ze_FFXII_Westersand_v8zeta1.cfg @@ -103,7 +103,7 @@ "method" "breakable" "trigger" "Summon_Belias_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Belias_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Belias_Summon_Physbox:OnTakeDamage" "breakable" "Belias_Summon_Physbox" } @@ -113,7 +113,7 @@ "method" "breakable" "trigger" "Summon_Chaos_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Chaos_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Chaos_Summon_Physbox:OnTakeDamage" "breakable" "Chaos_Summon_Physbox" } @@ -123,7 +123,7 @@ "method" "breakable" "trigger" "Summon_Mateus_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Mateus_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Mateus_Summon_Physbox:OnTakeDamage" "breakable" "Mateus_Summon_Physbox" } diff --git a/BossHP/configs/bosshp/ze_LOTR_Isengard_v2_3.cfg b/BossHP/configs/bosshp/ze_LOTR_Isengard_v2_3.cfg index 4f069f19..f6dc798d 100644 --- a/BossHP/configs/bosshp/ze_LOTR_Isengard_v2_3.cfg +++ b/BossHP/configs/bosshp/ze_LOTR_Isengard_v2_3.cfg @@ -56,7 +56,7 @@ "name" "Web" "method" "breakable" "trigger" "point_web2:OnEntitySpawned" - "hurttrigger" "web3:OnHealthChanged" + "hurttrigger" "web3:OnTakeDamage" "multitrigger" "1" "namefixup" "1" @@ -67,7 +67,7 @@ "name" "Web" "method" "breakable" "trigger" "point_web2:OnEntitySpawned" - "hurttrigger" "web2:OnHealthChanged" + "hurttrigger" "web2:OnTakeDamage" "multitrigger" "1" "namefixup" "1" @@ -78,7 +78,7 @@ "name" "Nazgul" "method" "breakable" "trigger" "boat_1_path1:OnPass:0.03" - "hurttrigger" "box_nazgryl:OnHealthChanged" + "hurttrigger" "box_nazgryl:OnTakeDamage" "breakable" "box_nazgryl" } @@ -98,7 +98,7 @@ "name" "Support 1" "method" "breakable" "trigger" "trigger_set_damba_hp:OnStartTouch:0.03" - "hurttrigger" "beam_1:OnHealthChanged" + "hurttrigger" "beam_1:OnTakeDamage" "breakable" "beam_1" } @@ -107,7 +107,7 @@ "name" "Support 2" "method" "breakable" "trigger" "trigger_set_damba_hp:OnStartTouch:0.03" - "hurttrigger" "beam_2:OnHealthChanged" + "hurttrigger" "beam_2:OnTakeDamage" "breakable" "beam_2" } @@ -116,7 +116,7 @@ "name" "Grima" "method" "breakable" "trigger" "stripper_grima_trigger:OnTrigger:0.03" - "hurttrigger" "box_grima_helth:OnHealthChanged" + "hurttrigger" "box_grima_helth:OnTakeDamage" "breakable" "box_grima_helth" } diff --git a/BossHP/configs/bosshp/ze_PoncherMonkey_Shooter_v3_5.cfg b/BossHP/configs/bosshp/ze_PoncherMonkey_Shooter_v3_5.cfg index 689c07f4..be07b328 100644 --- a/BossHP/configs/bosshp/ze_PoncherMonkey_Shooter_v3_5.cfg +++ b/BossHP/configs/bosshp/ze_PoncherMonkey_Shooter_v3_5.cfg @@ -133,7 +133,7 @@ "method" "breakable" "trigger" "Typhoon_GoatTemplate:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Vacuum_HitBox:OnHealthChanged" + "hurttrigger" "Vacuum_HitBox:OnTakeDamage" "breakable" "Typhoon_GoatHitBox" } diff --git a/BossHP/configs/bosshp/ze_bioshock_v6_3.cfg b/BossHP/configs/bosshp/ze_bioshock_v6_3.cfg index 8e1a2bc3..113cc1bc 100644 --- a/BossHP/configs/bosshp/ze_bioshock_v6_3.cfg +++ b/BossHP/configs/bosshp/ze_bioshock_v6_3.cfg @@ -49,7 +49,7 @@ "name" "Patriot" "method" "breakable" "trigger" "columbia_patriot_timer:OnTimer" - "hurttrigger" "columbia_patriot_health:OnHealthChanged" + "hurttrigger" "columbia_patriot_health:OnTakeDamage" "breakable" "columbia_patriot_health" } diff --git a/BossHP/configs/bosshp/ze_chroma_v0_4.cfg b/BossHP/configs/bosshp/ze_chroma_v0_4.cfg index 6e399180..2875418f 100644 --- a/BossHP/configs/bosshp/ze_chroma_v0_4.cfg +++ b/BossHP/configs/bosshp/ze_chroma_v0_4.cfg @@ -13,7 +13,7 @@ "name" "Boss" "method" "breakable" "trigger" "tr_bossaddhp:OnStartTouch" - "trigger" "pbox_boss:OnHealthChanged" + "hurttrigger" "pbox_boss:OnTakeDamage" "multitrigger" "1" "breakable" "pbox_boss" diff --git a/BossHP/configs/bosshp/ze_dev_r4a.cfg b/BossHP/configs/bosshp/ze_dev_r4a.cfg index 34ee6918..f330ae2c 100644 --- a/BossHP/configs/bosshp/ze_dev_r4a.cfg +++ b/BossHP/configs/bosshp/ze_dev_r4a.cfg @@ -5,7 +5,7 @@ "name" "Boss" "method" "breakable" "trigger" "#7483:OnStartTouch" - "hurttrigger" "lasercube:OnHealthChanged" + "hurttrigger" "lasercube:OnTakeDamage" "breakable" "lasercube" } @@ -14,7 +14,7 @@ "name" "Boss" "method" "breakable" "trigger" "l2Bosshpscale:OnStartTouch" - "hurttrigger" "l2Boss:OnHealthChanged" + "hurttrigger" "l2Boss:OnTakeDamage" "breakable" "l2Boss" } @@ -23,7 +23,7 @@ "name" "Boss" "method" "breakable" "trigger" "l3bosshpscale:OnStartTouch" - "hurttrigger" "l3boss:OnHealthChanged" + "hurttrigger" "l3boss:OnTakeDamage" "breakable" "l3boss" } @@ -32,7 +32,7 @@ "name" "Boss" "method" "breakable" "trigger" "l3bosslaserscale:OnStartTouch" - "hurttrigger" "laserL3:OnHealthChanged" + "hurttrigger" "laserL3:OnTakeDamage" "breakable" "laserL3" } diff --git a/BossHP/configs/bosshp/ze_doom3_v1.cfg b/BossHP/configs/bosshp/ze_doom3_v1.cfg index bba6c961..ce341be5 100644 --- a/BossHP/configs/bosshp/ze_doom3_v1.cfg +++ b/BossHP/configs/bosshp/ze_doom3_v1.cfg @@ -9,7 +9,7 @@ "multitrigger" "1" "namefixup" "1" "timeout" "4" - "hurttrigger" "npc_phys2gg2:OnDamaged" + "hurttrigger" "npc_phys2gg2:OnTakeDamage" "breakable" "npc_phys2gg2" } @@ -22,7 +22,7 @@ "multitrigger" "1" "namefixup" "1" "timeout" "4" - "hurttrigger" "npc_phys2gg3:OnDamaged" + "hurttrigger" "npc_phys2gg3:OnTakeDamage" "breakable" "npc_phys2gg3" } @@ -42,7 +42,7 @@ "method" "breakable" "trigger" "stage2_trigger:OnStartTouch" "timeout" "3" - "hurttrigger" "vedr1blac:OnDamaged" + "hurttrigger" "vedr1blac:OnTakeDamage" "breakable" "vedr1blac" } diff --git a/BossHP/configs/bosshp/ze_doom_v1_1.cfg b/BossHP/configs/bosshp/ze_doom_v1_1.cfg index 9e82f9cf..90f3a876 100644 --- a/BossHP/configs/bosshp/ze_doom_v1_1.cfg +++ b/BossHP/configs/bosshp/ze_doom_v1_1.cfg @@ -5,7 +5,7 @@ "name" "Boss Phase 1/4" "method" "breakable" "trigger" "boss_trigger:OnStartTouch" - "hurttrigger" "Bossheadbegin:OnHealthChanged" + "hurttrigger" "Bossheadbegin:OnTakeDamage" "breakable" "Bossheadbegin" } @@ -14,7 +14,7 @@ "name" "Boss Phase 2/4" "method" "breakable" "trigger" "Bossheadfirst:OnAwakened" - "hurttrigger" "Bossheadfirst:OnHealthChanged" + "hurttrigger" "Bossheadfirst:OnTakeDamage" "breakable" "Bossheadfirst" } @@ -23,7 +23,7 @@ "name" "Boss Phase 3/4" "method" "breakable" "trigger" "Bossheadsecond:OnAwakened" - "hurttrigger" "Bossheadsecond:OnHealthChanged" + "hurttrigger" "Bossheadsecond:OnTakeDamage" "breakable" "Bossheadsecond" } @@ -32,7 +32,7 @@ "name" "Boss Phase 4/4" "method" "breakable" "trigger" "BossHeadfinal:OnAwakened" - "hurttrigger" "BossHeadfinal:OnHealthChanged" + "hurttrigger" "BossHeadfinal:OnTakeDamage" "breakable" "BossHeadfinal" } diff --git a/BossHP/configs/bosshp/ze_dreamin_v2_1s_fix3.cfg b/BossHP/configs/bosshp/ze_dreamin_v2_1s_fix3.cfg index a57e41da..5acb6464 100644 --- a/BossHP/configs/bosshp/ze_dreamin_v2_1s_fix3.cfg +++ b/BossHP/configs/bosshp/ze_dreamin_v2_1s_fix3.cfg @@ -5,7 +5,7 @@ "name" "Crystal" "method" "breakable" "trigger" "#23551:OnHealthChanged" - "hurttrigger" "#23551:OnHealthChanged" + "hurttrigger" "#23551:OnTakeDamage" "breakable" "#23551" } "-1" @@ -13,7 +13,7 @@ "name" "Crystal" "method" "breakable" "trigger" "#3664:OnHealthChanged" - "hurttrigger" "#3664:OnHealthChanged" + "hurttrigger" "#3664:OnTakeDamage" "breakable" "#3664" } "0" @@ -53,7 +53,7 @@ "name" "???" "method" "breakable" "trigger" "st2_hitbox:OnDamaged" - "hurttrigger" "st2_hitbox:OnHealthChanged" + "hurttrigger" "st2_hitbox:OnTakeDamage" "breakable" "st2_hitbox" } "5" diff --git a/BossHP/configs/bosshp/ze_ffxii_ridorana_cataract_t5_3.cfg b/BossHP/configs/bosshp/ze_ffxii_ridorana_cataract_t5_3.cfg index d4834741..443555a9 100644 --- a/BossHP/configs/bosshp/ze_ffxii_ridorana_cataract_t5_3.cfg +++ b/BossHP/configs/bosshp/ze_ffxii_ridorana_cataract_t5_3.cfg @@ -101,7 +101,7 @@ "name" "Crystal - 2" "method" "breakable" "trigger" "Stage_1_Hold_3_Crystall_2:OnHealthChanged" - "hurttrigger" "Stage_1_Hold_3_Crystall_2:OnHealthChanged" + "hurttrigger" "Stage_1_Hold_3_Crystall_2:OnTakeDamage" "breakable" "Stage_1_Hold_3_Crystall_2" } @@ -110,7 +110,7 @@ "name" "Crystal - 1" "method" "breakable" "trigger" "Stage_1_Hold_3_Crystall_1:OnHealthChanged" - "hurttrigger" "Stage_1_Hold_3_Crystall_1:OnHealthChanged" + "hurttrigger" "Stage_1_Hold_3_Crystall_1:OnTakeDamage" "breakable" "Stage_1_Hold_3_Crystall_1" } diff --git a/BossHP/configs/bosshp/ze_frostdrake_tower_v1s.cfg b/BossHP/configs/bosshp/ze_frostdrake_tower_v1s.cfg index 0a3b7409..16dd20d5 100644 --- a/BossHP/configs/bosshp/ze_frostdrake_tower_v1s.cfg +++ b/BossHP/configs/bosshp/ze_frostdrake_tower_v1s.cfg @@ -5,7 +5,7 @@ "name" "Frostdrake" "method" "breakable" "trigger" "healthadder:OnStartTouch" - "hurttrigger" "drake_hp:OnHealthChanged" + "hurttrigger" "drake_hp:OnTakeDamage" "breakable" "drake_hp" } diff --git a/BossHP/configs/bosshp/ze_onahole_v3s_fix.cfg b/BossHP/configs/bosshp/ze_onahole_v3s_fix.cfg index 0122f0f6..70f1816e 100644 --- a/BossHP/configs/bosshp/ze_onahole_v3s_fix.cfg +++ b/BossHP/configs/bosshp/ze_onahole_v3s_fix.cfg @@ -6,7 +6,7 @@ "method" "breakable" "trigger" "barry_temp2:OnEntitySpawned" "showtrigger" "barry_health2:OnDamaged" - "hurttrigger" "barry_health2:OnHealthChanged" + "hurttrigger" "barry_health2:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -19,7 +19,7 @@ "method" "breakable" "trigger" "barry_temp1:OnEntitySpawned" "showtrigger" "barry_health1:OnDamaged" - "hurttrigger" "barry_health1:OnHealthChanged" + "hurttrigger" "barry_health1:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -31,6 +31,7 @@ "name" "Onabox" "method" "breakable" "trigger" "bossshield:OnBreak" + "hurttrigger" "Onabox:OnTakeDamage" "breakable" "Onabox" } @@ -39,6 +40,7 @@ "name" "Hank Hill" "method" "breakable" "trigger" "Hank_hitbox:OnHealthChanged" + "hurttrigger" "Hank_hitbox":OnTakeDamage" "breakable" "Hank_hitbox" } @@ -48,6 +50,7 @@ "method" "breakable" "trigger" "boss_health2:OnHealthChanged" "showtrigger" "invisboss2:OnBreak" + "hurttrigger" "boss_health2:OnTakeDamage" "breakable" "boss_health2" } @@ -57,6 +60,7 @@ "method" "breakable" "trigger" "boss_health2_ex:OnHealthChanged" "showtrigger" "invisboss2:OnBreak" + "hurttrigger" "boss_health2_ex:OnTakeDamage" "breakable" "boss_health2_ex" } @@ -65,6 +69,7 @@ "name" "Kazoo" "method" "breakable" "trigger" "ex2_boss2_health:OnHealthChanged" + "hurttrigger" "ex2_boss2_health:OnTakeDamage" "breakable" "ex2_boss2_health" } @@ -73,6 +78,7 @@ "name" "Hank Hill" "method" "breakable" "trigger" "hank_bahamut_hp:OnHealthChanged" + "hurttrigger" "hank_bahamut_hp:OnTakeDamage" "breakable" "hank_bahamut_hp" } @@ -81,6 +87,7 @@ "name" "Barry Bee" "method" "counter" "trigger" "final_lasers:OnTrigger" + "hurttrigger" "barry_final_health:OnTakeDamage" "counter" "barry_final_health" } @@ -89,6 +96,7 @@ "name" "Vagene" "method" "breakable" "trigger" "boss3_hitbox_health:OnHealthChanged" + "hurttrigger" "boss3_hitbox_health:OnTakeDamage" "breakable" "boss3_hitbox_health" } diff --git a/BossHP/configs/bosshp/ze_pkmn_adventure_v7_2s.cfg b/BossHP/configs/bosshp/ze_pkmn_adventure_v7_2s.cfg index 4a8c8f90..c3586c50 100644 --- a/BossHP/configs/bosshp/ze_pkmn_adventure_v7_2s.cfg +++ b/BossHP/configs/bosshp/ze_pkmn_adventure_v7_2s.cfg @@ -6,7 +6,7 @@ "name" "Nidoqueen" "method" "breakable" "trigger" "nidoqueen_template:OnEntitySpawned" - "hurttrigger" "nidoqueen:OnHealthChanged" + "hurttrigger" "nidoqueen:OnTakeDamage" "breakable" "nidoqueen" } @@ -27,7 +27,7 @@ "name" "Kirlia" "method" "breakable" "trigger" "KirliaSpawn:OnEntitySpawned" - "hurttrigger" "kirlia:OnHealthChanged" + "hurttrigger" "kirlia:OnTakeDamage" "breakable" "kirlia" } @@ -36,7 +36,7 @@ "name" "Crobat" "method" "breakable" "trigger" "CrobatSpawn:OnEntitySpawned" - "hurttrigger" "Crobat:OnHealthChanged" + "hurttrigger" "Crobat:OnTakeDamage" "breakable" "Crobat" } diff --git a/BossHP/configs/bosshp/ze_rizomata_s1_3.cfg b/BossHP/configs/bosshp/ze_rizomata_s1_3.cfg index a72d37e9..ce239e38 100644 --- a/BossHP/configs/bosshp/ze_rizomata_s1_3.cfg +++ b/BossHP/configs/bosshp/ze_rizomata_s1_3.cfg @@ -90,7 +90,7 @@ "name" "Philia" "method" "breakable" "trigger" "5_master_temp:OnEntitySpawned" - "hurttrigger" "5_master_target:OnHealthChanged" + "hurttrigger" "5_master_target:OnTakeDamage" "breakable" "5_master_target" } diff --git a/BossHP/configs/bosshp/ze_santassination_css2.cfg b/BossHP/configs/bosshp/ze_santassination_css2.cfg index 84428000..7cc14b58 100644 --- a/BossHP/configs/bosshp/ze_santassination_css2.cfg +++ b/BossHP/configs/bosshp/ze_santassination_css2.cfg @@ -6,7 +6,7 @@ "method" "breakable" "trigger" "s_npc_beaver:OnEntitySpawned" "showtrigger" "npc_phys2gg:OnDamaged" - "hurttrigger" "npc_phys2gg:OnHealthChanged" + "hurttrigger" "npc_phys2gg:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -19,7 +19,7 @@ "method" "breakable" "trigger" "s_npc_elv:OnEntitySpawned" "showtrigger" "npc_phys2gg1:OnDamaged" - "hurttrigger" "npc_phys2gg1:OnHealthChanged" + "hurttrigger" "npc_phys2gg1:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -32,7 +32,7 @@ "method" "breakable" "trigger" "s_npc_present:OnEntitySpawned" "showtrigger" "npc_phys2gg2:OnDamaged" - "hurttrigger" "npc_phys2gg2:OnHealthChanged" + "hurttrigger" "npc_phys2gg2:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -45,7 +45,7 @@ "method" "breakable" "trigger" "s_npc_bender:OnEntitySpawned" "showtrigger" "npc_phys2gg3:OnDamaged" - "hurttrigger" "npc_phys2gg3:OnHealthChanged" + "hurttrigger" "npc_phys2gg3:OnTakeDamage" "multitrigger" "1" "namefixup" "1" "timeout" "3" @@ -57,7 +57,7 @@ "name" "Mufasa" "method" "breakable" "trigger" "lionking_mufasaskip_tem:OnEntitySpawned" - "hurttrigger" "lionking_mufasaskip:OnHealthChanged" + "hurttrigger" "lionking_mufasaskip:OnTakeDamage" "breakable" "lionking_mufasaskip" } @@ -66,7 +66,7 @@ "name" "Santa Claus" "method" "breakable" "trigger" "bosss_start:OnStartTouch" - "hurttrigger" "bosss_hp:OnHealthChanged" + "hurttrigger" "bosss_hp:OnTakeDamage" "breakable" "bosss_hp" } @@ -75,7 +75,7 @@ "name" "Santa Claus" "method" "breakable" "trigger" "bosss_start1:OnStartTouch" - "hurttrigger" "bosss_hp1:OnHealthChanged" + "hurttrigger" "bosss_hp1:OnTakeDamage" "breakable" "bosss_hp1" } @@ -84,7 +84,7 @@ "name" "Socrates" "method" "breakable" "trigger" "bosss_start2:OnStartTouch" - "hurttrigger" "bosss_hp2:OnHealthChanged" + "hurttrigger" "bosss_hp2:OnTakeDamage" "breakable" "bosss_hp2" } diff --git a/BossHP/configs/bosshp/ze_shroomforest3_b6_2.cfg b/BossHP/configs/bosshp/ze_shroomforest3_b6_2.cfg index afed9919..d7c0b976 100644 --- a/BossHP/configs/bosshp/ze_shroomforest3_b6_2.cfg +++ b/BossHP/configs/bosshp/ze_shroomforest3_b6_2.cfg @@ -61,7 +61,7 @@ "method" "breakable" "trigger" "Spider_Break1:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break1:OnHealthChanged" + "hurttrigger" "Spider_Break1:OnTakeDamage" "breakable" "Spider_Break1" } @@ -71,7 +71,7 @@ "method" "breakable" "trigger" "Spider_Break2:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break2:OnHealthChanged" + "hurttrigger" "Spider_Break2:OnTakeDamage" "breakable" "Spider_Break2" } @@ -81,7 +81,7 @@ "method" "breakable" "trigger" "Spider_Break3:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break3:OnHealthChanged" + "hurttrigger" "Spider_Break3:OnTakeDamage" "breakable" "Spider_Break3" } @@ -91,7 +91,7 @@ "method" "breakable" "trigger" "Spider_Break4:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break4:OnHealthChanged" + "hurttrigger" "Spider_Break4:OnTakeDamage" "breakable" "Spider_Break4" } @@ -101,7 +101,7 @@ "method" "breakable" "trigger" "Spider_Break5:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break5:OnHealthChanged" + "hurttrigger" "Spider_Break5:OnTakeDamage" "breakable" "Spider_Break5" } @@ -111,7 +111,7 @@ "method" "breakable" "trigger" "Spider_Break6:OnTakeDamage" "timeout" "3" - "hurttrigger" "Spider_Break6:OnHealthChanged" + "hurttrigger" "Spider_Break6:OnTakeDamage" "breakable" "Spider_Break6" } @@ -151,7 +151,7 @@ "name" "Tank" "method" "breakable" "trigger" "Template_HitlerBoss:OnEntitySpawned" - "hurttrigger" "Hitler_Boss_Tank1_Break:OnHealthChanged" + "hurttrigger" "Hitler_Boss_Tank1_Break:OnTakeDamage" "breakable" "Hitler_Boss_Tank1_Break" } @@ -160,7 +160,7 @@ "name" "Tank" "method" "breakable" "trigger" "Template_HitlerBoss:OnEntitySpawned" - "hurttrigger" "Hitler_Boss_Tank2_Break:OnHealthChanged" + "hurttrigger" "Hitler_Boss_Tank2_Break:OnTakeDamage" "breakable" "Hitler_Boss_Tank2_Break" } diff --git a/BossHP/configs/bosshp/ze_tesv_skyrim_v4fix.cfg b/BossHP/configs/bosshp/ze_tesv_skyrim_v4fix.cfg index 22c5c89f..5161dc54 100644 --- a/BossHP/configs/bosshp/ze_tesv_skyrim_v4fix.cfg +++ b/BossHP/configs/bosshp/ze_tesv_skyrim_v4fix.cfg @@ -38,7 +38,7 @@ "name" "Dwarven Sphere" "method" "breakable" "trigger" "smalldwboss_template1:OnEntitySpawned" - "hurttrigger" "smalldwboss_physbox2:OnHealthChanged" + "hurttrigger" "smalldwboss_physbox2:OnTakeDamage" "multitrigger" "1" "breakable" "smalldwboss_physbox2" @@ -48,7 +48,7 @@ "name" "Dragonpriest" "method" "breakable" "trigger" "phbox:OnAwakened" - "hurttrigger" "phbox:OnHealthChanged" + "hurttrigger" "phbox:OnTakeDamage" "breakable" "phbox" } @@ -68,7 +68,7 @@ "name" "Nightingale" "method" "breakable" "trigger" "night_phbox:OnTakeDamage" - "hurttrigger" "st1_dragonphysbox:OnHealthChanged" + "hurttrigger" "st1_dragonphysbox:OnTakeDamage" "timeout" "3" "breakable" "night_phbox" @@ -114,7 +114,7 @@ "name" "Dragonpriest" "method" "breakable" "trigger" "dr_phbox:OnTakeDamage" - "hurttrigger" "st1_dragonphysbox:OnHealthChanged" + "hurttrigger" "st1_dragonphysbox:OnTakeDamage" "timeout" "3" "breakable" "dr_phbox" diff --git a/BossHP/configs/bosshp/ze_totally_new_wester.cfg b/BossHP/configs/bosshp/ze_totally_new_wester.cfg index 496356b1..e3a33abb 100644 --- a/BossHP/configs/bosshp/ze_totally_new_wester.cfg +++ b/BossHP/configs/bosshp/ze_totally_new_wester.cfg @@ -103,7 +103,7 @@ "method" "breakable" "trigger" "Summon_Belias_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Belias_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Belias_Summon_Physbox:OnTakeDamage" "breakable" "Belias_Summon_Physbox" } @@ -113,7 +113,7 @@ "method" "breakable" "trigger" "Summon_Chaos_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Chaos_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Chaos_Summon_Physbox:OnTakeDamage" "breakable" "Chaos_Summon_Physbox" } @@ -123,7 +123,7 @@ "method" "breakable" "trigger" "Summon_Mateus_Temp:OnEntitySpawned" "multitrigger" "1" - "hurttrigger" "Mateus_Summon_Physbox:OnHealthChanged" + "hurttrigger" "Mateus_Summon_Physbox:OnTakeDamage" "breakable" "Mateus_Summon_Physbox" } diff --git a/BossHP/scripting/BossHP.sp b/BossHP/scripting/BossHP.sp index d73b28aa..56d4ada0 100644 --- a/BossHP/scripting/BossHP.sp +++ b/BossHP/scripting/BossHP.sp @@ -37,7 +37,7 @@ public Plugin myinfo = public void OnPluginStart() { g_hFwd_OnBossInitialized = CreateGlobalForward("OnBossInitialized", ET_Ignore, Param_Any, Param_Any); - g_hFwd_OnBossDamaged = CreateGlobalForward("OnBossDamaged", ET_Ignore, Param_Any, Param_Any, Param_Cell); + g_hFwd_OnBossDamaged = CreateGlobalForward("OnBossDamaged", ET_Ignore, Param_Any, Param_Any, Param_Cell, Param_Float); g_hFwd_OnBossKilled = CreateGlobalForward("OnBossKilled", ET_Ignore, Param_Any, Param_Any, Param_Cell); g_hCvar_DebugMode = CreateConVar("bosshp_debug", "0", _, _, true, 0.0, true, 1.0); @@ -763,7 +763,7 @@ void OnKillTrigger(int entity, const char[] output, SDKHookType HookType = view_ } } -void OnHurtTrigger(int entity, const char[] output, int activator) +void OnHurtTrigger(int entity, const char[] output, int activator, float damage = 1.0) { char sTargetname[64]; GetEntPropString(entity, Prop_Data, "m_iName", sTargetname, sizeof(sTargetname)); @@ -824,6 +824,7 @@ void OnHurtTrigger(int entity, const char[] output, int activator) Call_PushCell(Boss); Call_PushCell(Boss.dConfig); Call_PushCell(activator); + Call_PushFloat(damage); Call_Finish(); } } @@ -893,7 +894,7 @@ public void OnTakeDamagePostKill(int victim, int attacker, int inflictor, float public void OnTakeDamagePostHurt(int victim, int attacker, int inflictor, float damage, int damagetype) { - OnHurtTrigger(victim, "OnTakeDamage", attacker); + OnHurtTrigger(victim, "OnTakeDamage", attacker, damage); } public void OnGameFrame() diff --git a/BossHP/scripting/BossHP_Ranking.sp b/BossHP/scripting/BossHP_Ranking.sp index b8443d7d..1e95c74c 100644 --- a/BossHP/scripting/BossHP_Ranking.sp +++ b/BossHP/scripting/BossHP_Ranking.sp @@ -84,18 +84,23 @@ public void OnClientDisconnect(int client) //---------------------------------------------------------------------------------------------------- // Purpose: //---------------------------------------------------------------------------------------------------- -public void OnBossDamaged(any Boss, any Config, int client) +public void OnBossDamaged(any Boss, any Config, int client, float damage) { if (!IsValidClient(client)) return; - //int iCurrentCash = GetEntProp(client, Prop_Send, "m_iAccount"); - - //if (iCurrentCash < 16000) - // SetEntProp(client, Prop_Send, "m_iAccount", iCurrentCash + 1); - SetEntProp(client, Prop_Send, "m_iAccount", GetEntProp(client, Prop_Send, "m_iAccount") + 1); + bool bBreakable; + CConfig _Config = view_as(Config); + + if (_Config.IsBreakable) + bBreakable = true; + else + bBreakable = false; + + delete _Config; + for (int index = 0; index < g_hStats[client].Length; index++) { any BossDamage[2]; @@ -103,7 +108,10 @@ public void OnBossDamaged(any Boss, any Config, int client) if (BossDamage[0] == Boss) { - BossDamage[1] += 1; + if (bBreakable) + BossDamage[1] += RoundToNearest(damage); + else + BossDamage[1] += 1; g_hStats[client].SetArray(index, BossDamage, sizeof(BossDamage)); return; @@ -112,7 +120,11 @@ public void OnBossDamaged(any Boss, any Config, int client) any BossDamage[2]; BossDamage[0] = Boss; - BossDamage[1] = 1; + + if (bBreakable) + BossDamage[1] = RoundToNearest(damage); + else + BossDamage[1] = 1; g_hStats[client].PushArray(BossDamage, sizeof(BossDamage)); } @@ -178,6 +190,12 @@ public void OnBossKilled(any Boss, any Config, int reason) char sBossName[64]; _Config.GetName(sBossName, sizeof(sBossName)); + char sType[16]; + if (_Config.IsBreakable) + sType = "damage" + else + sType = "hits" + delete _Config; char sBuffer[512]; @@ -186,19 +204,19 @@ public void OnBossKilled(any Boss, any Config, int reason) if (iSortedList[0][0]) { - Format(sBuffer, sizeof(sBuffer), "%s\n1. %N - %d hits", sBuffer, iSortedList[0][0], iSortedList[0][1]); + Format(sBuffer, sizeof(sBuffer), "%s\n1. %N - %d %s", sBuffer, iSortedList[0][0], iSortedList[0][1], sType); LogPlayerEvent(iSortedList[0][0], "triggered", "ze_boss_damage_first"); } if (iSortedList[1][0]) { - Format(sBuffer, sizeof(sBuffer), "%s\n2. %N - %d hits", sBuffer, iSortedList[1][0], iSortedList[1][1]); + Format(sBuffer, sizeof(sBuffer), "%s\n2. %N - %d %s", sBuffer, iSortedList[1][0], iSortedList[1][1], sType); LogPlayerEvent(iSortedList[1][0], "triggered", "ze_boss_damage_second"); } if (iSortedList[2][0]) { - Format(sBuffer, sizeof(sBuffer), "%s\n3. %N - %d hits", sBuffer, iSortedList[2][0], iSortedList[2][1]); + Format(sBuffer, sizeof(sBuffer), "%s\n3. %N - %d %s", sBuffer, iSortedList[2][0], iSortedList[2][1], sType); LogPlayerEvent(iSortedList[2][0], "triggered", "ze_boss_damage_third"); } diff --git a/BossHP/scripting/include/BossHP.inc b/BossHP/scripting/include/BossHP.inc index 0022f7f6..45560946 100644 --- a/BossHP/scripting/include/BossHP.inc +++ b/BossHP/scripting/include/BossHP.inc @@ -6,6 +6,6 @@ forward void OnBossIntialized(any Boss, any Config); -forward void OnBossDamaged(any Boss, any Config, int activator); +forward void OnBossDamaged(any Boss, any Config, int activator, float damage); -forward void OnBossKilled(any Boss, any Config, int reason); //reason: 0 = RoundEnd/MapEnd, 1 = KillTrigger, 2 = Death. +forward void OnBossKilled(any Boss, any Config, int reason);//reason: 0 = RoundEnd/MapEnd, 1 = KillTrigger, 2 = Death.