From ba3e4147f6a098b23f006900551ad43bf1ecdc8b Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:49:56 +0300 Subject: [PATCH 01/11] BossHP: Added config for ze_alien_vs_predator_v4fix6 --- .../bosshp/ze_alien_vs_predator_v4fix6.cfg | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_alien_vs_predator_v4fix6.cfg diff --git a/BossHP/configs/bosshp/ze_alien_vs_predator_v4fix6.cfg b/BossHP/configs/bosshp/ze_alien_vs_predator_v4fix6.cfg new file mode 100644 index 00000000..96accd27 --- /dev/null +++ b/BossHP/configs/bosshp/ze_alien_vs_predator_v4fix6.cfg @@ -0,0 +1,103 @@ +"bosses" +{ + "0" + { + "name" "Predator" + "method" "hpbar" + "trigger" "tku2:OnStartTouch" + + "iterator" "pirate_hp_iterations" + "counter" "pirate_counter" + "backup" "pirate_hp_backup" + } + "1" + { + "name" "Uterus" + "method" "counter" + "trigger" "bazaaren:OnStartTouch" + + "counter" "Health3s" + } + "2" + { + "name" "Alien" + "method" "counter" + "trigger" "mult:OnStartTouch" + + "counter" "al_hp" + } + "3" + { + "name" "Alien" + "method" "counter" + "trigger" "multpret2:OnStartTouch" + + "counter" "al_hp" + } + "4" + { + "name" "Alien" + "method" "counter" + "trigger" "multpredaliens:OnStartTouch" + + "counter" "matpred" + } + "5" + { + "name" "Uterus" + "method" "counter" + "trigger" "multlevel4boss1:OnStartTouch" + + "counter" "Health3s4" + } + "6" + { + "name" "Predator" + "method" "hpbar" + "trigger" "multpret3:OnStartTouch" + + "iterator" "pirate_hp_iterations" + "counter" "pirate_counter" + "backup" "pirate_hp_backup" + } + "7" + { + "name" "Uterus" + "method" "counter" + "trigger" "multpret:OnStartTouch" + + "counter" "lm12" + } + "8" + { + "name" "Alien" + "method" "counter" + "trigger" "activatboi2:OnStartTouch" + + "counter" "pr_hp" + } + "9" + { + "name" "Uterus" + "method" "counter" + "trigger" "zadnica1:OnStartTouch" + + "counter" "ruina" + } + "10" + { + "name" "Predator" + "method" "counter" + "trigger" "predatortrigger3:OnStartTouch" + + "counter" "predatorcounter3" + } + "11" + { + "name" "Alien" + "method" "counter" + "trigger" "multpret:OnStartTouch" + + "counter" "al_hp" + } +} \ No newline at end of file From 9a0928f5664ffcd9ada0105eaf118606f7e3ac84 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:51:11 +0300 Subject: [PATCH 02/11] BossHP: Added config for ze_doom3_beta --- BossHP/configs/bosshp/ze_doom3_beta.cfg | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_doom3_beta.cfg diff --git a/BossHP/configs/bosshp/ze_doom3_beta.cfg b/BossHP/configs/bosshp/ze_doom3_beta.cfg new file mode 100644 index 00000000..f4a19e60 --- /dev/null +++ b/BossHP/configs/bosshp/ze_doom3_beta.cfg @@ -0,0 +1,23 @@ +"bosses" +{ + "0" + { + "name" "Guardian" + "method" "hpbar" + "trigger" "Noctali_Boss_Hp_To_Boss1:OnStartTouch" + + "iterator" "pirate_hp_iterations1" + "counter" "pirate_counter1" + "backup" "pirate_hp_backup1" + } + "1" + { + "name" "Invul" + "method" "hpbar" + "trigger" "Noctali_Boss_Hp_To_Boss:OnStartTouch" + + "iterator" "pirate_hp_iterations" + "counter" "pirate_counter" + "backup" "pirate_hp_backup" + } +} \ No newline at end of file From 05e51a15da6ae6b6b885835e71e1a9b245a2bcf1 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:51:43 +0300 Subject: [PATCH 03/11] BossHP: Added config for ze_epic_end_v4_3 --- BossHP/configs/bosshp/ze_epic_end_v4_3.cfg | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_epic_end_v4_3.cfg diff --git a/BossHP/configs/bosshp/ze_epic_end_v4_3.cfg b/BossHP/configs/bosshp/ze_epic_end_v4_3.cfg new file mode 100644 index 00000000..6e62e422 --- /dev/null +++ b/BossHP/configs/bosshp/ze_epic_end_v4_3.cfg @@ -0,0 +1,11 @@ +"bosses" +{ + "0" + { + "name" "Hedgehog" + "method" "counter" + "trigger" "XP_LEGO_BOSS:OnStartTouch" + + "counter" "math_boss" + } +} \ No newline at end of file From 02b756f458e916ae6ed430c7aee2d57c867de408 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:52:08 +0300 Subject: [PATCH 04/11] BossHP: Added config for ze_frozentemple_b8_2 --- BossHP/configs/bosshp/ze_frozentemple_b8_2.cfg | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_frozentemple_b8_2.cfg diff --git a/BossHP/configs/bosshp/ze_frozentemple_b8_2.cfg b/BossHP/configs/bosshp/ze_frozentemple_b8_2.cfg new file mode 100644 index 00000000..54d7616a --- /dev/null +++ b/BossHP/configs/bosshp/ze_frozentemple_b8_2.cfg @@ -0,0 +1,11 @@ +"bosses" +{ + "0" + { + "name" "Crystal" + "method" "counter" + "trigger" "boss_hp_trigger:OnStartTouch" + + "counter" "boss_hp_counter_1" + } +} \ No newline at end of file From 4d4ee0b72fda6c8409d7337995e52dff51bc7b99 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:58:27 +0300 Subject: [PATCH 05/11] BossHP: Added configs for ze_sky_athletic_v5_final --- .../bosshp/ze_sky_athletic_v5_final.cfg | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_sky_athletic_v5_final.cfg diff --git a/BossHP/configs/bosshp/ze_sky_athletic_v5_final.cfg b/BossHP/configs/bosshp/ze_sky_athletic_v5_final.cfg new file mode 100644 index 00000000..f209c9cb --- /dev/null +++ b/BossHP/configs/bosshp/ze_sky_athletic_v5_final.cfg @@ -0,0 +1,30 @@ +"bosses" +{ + "0" + { + "name" "Crasher" + "method" "counter" + "trigger" "lvfinal boss hp setting:OnStartTouch" + "timeout" "3" + + "counter" "crasher angry count" + } + "1" + { + "name" "Crasher" + "method" "counter" + "trigger" "lvfinal boss trigger:OnStartTouch" + "timeout" "3" + + "counter" "crasher angry count quick" + } + "2" + { + "name" "Crasher" + "method" "counter" + "trigger" "lvfinal boss trigger extra:OnStartTouch" + "timeout" "3" + + "counter" "crasher hp" + } +} \ No newline at end of file From 200b54c93e0e508721d1890ef396579bc0394611 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 12:58:42 +0300 Subject: [PATCH 06/11] BossHP: Added configs for ze_slender_escape_b4 --- .../configs/bosshp/ze_slender_escape_b4.cfg | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_slender_escape_b4.cfg diff --git a/BossHP/configs/bosshp/ze_slender_escape_b4.cfg b/BossHP/configs/bosshp/ze_slender_escape_b4.cfg new file mode 100644 index 00000000..c8cd13c6 --- /dev/null +++ b/BossHP/configs/bosshp/ze_slender_escape_b4.cfg @@ -0,0 +1,35 @@ +"bosses" +{ + "0" + { + "name" "BarrelBoss" + "method" "counter" + "trigger" "Item_Barrelboss_Stripper:OnStartTouch" + + "counter" "Item_Barrelboss_Count" + } + "1" + { + "name" "Spider" + "method" "counter" + "trigger" "Item_Spider_Stripper:OnStartTouch" + + "counter" "Item_Spider_Count" + } + "2" + { + "name" "Slender" + "method" "counter" + "trigger" "Item_Slenderzombie_Stripper:OnStartTouch" + + "counter" "Item_Slenderzombie_Count" + } + "2" + { + "name" "Skin" + "method" "counter" + "trigger" "P_Trigger:OnStartTouch" + + "counter" "P_Counter" + } +} \ No newline at end of file From d6dd481d74e74af1afc3e26f3c0e46a111a72419 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 13:00:21 +0300 Subject: [PATCH 07/11] BossHP: Added config for ze_v0u0v_a4 --- BossHP/configs/bosshp/ze_v0u0v_a4.cfg | 93 +++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 BossHP/configs/bosshp/ze_v0u0v_a4.cfg diff --git a/BossHP/configs/bosshp/ze_v0u0v_a4.cfg b/BossHP/configs/bosshp/ze_v0u0v_a4.cfg new file mode 100644 index 00000000..ae9140f3 --- /dev/null +++ b/BossHP/configs/bosshp/ze_v0u0v_a4.cfg @@ -0,0 +1,93 @@ +"bosses" +{ + "0" + { + "name" "Octopus" + "method" "hpbar" + "trigger" "bosslvl1_trigger:OnStartTouch" + + "iterator" "bosslvl1_4_counter3" + "counter" "bosslvl1_4_counter1" + "backup" "bosslvl1_4_counter2" + } + "0" + { + "name" "Octopus" + "method" "hpbar" + "trigger" "bosslvl4_trigger:OnStartTouch" + + "iterator" "bosslvl1_4_counter3" + "counter" "bosslvl1_4_counter1" + "backup" "bosslvl1_4_counter2" + } + "0" + { + "name" "Sonic" + "method" "hpbar" + "trigger" "bosslvl3_trigger:OnStartTouch" + + "iterator" "bosslvl3_6_counter3" + "counter" "bosslvl3_6_counter1" + "backup" "bosslvl3_6_counter2" + } + "0" + { + "name" "Sonic 2" + "method" "hpbar" + "trigger" "bosslvl3_trigger:OnStartTouch" + + "iterator" "bosslvl3_6_counter6" + "counter" "bosslvl3_6_counter4" + "backup" "bosslvl3_6_counter5" + } + "0" + { + "name" "Sonic the Bike" + "method" "hpbar" + "trigger" "bosslvl6_trigger:OnStartTouch" + + "iterator" "bosslvl6_counter3" + "counter" "bosslvl6_counter1" + "backup" "bosslvl6_counter2" + } + "0" + { + "name" "Sun" + "method" "hpbar" + "trigger" "bosslvl2_trigger:OnStartTouch" + + "iterator" "bosslvl2_5_counter3" + "counter" "bosslvl2_5_counter1" + "backup" "bosslvl2_5_counter2" + } + "0" + { + "name" "Sun" + "method" "hpbar" + "trigger" "bosslvl5_trigger:OnStartTouch" + + "iterator" "bosslvl2_5_counter3" + "counter" "bosslvl2_5_counter1" + "backup" "bosslvl2_5_counter2" + } + "0" + { + "name" "Priest" + "method" "hpbar" + "trigger" "bosslvl3_2_trigger_lvl3:OnStartTouch" + + "iterator" "bosslvl3_2_counter3" + "counter" "bosslvl3_2_counter1" + "backup" "bosslvl3_2_counter2" + } + "0" + { + "name" "Priest" + "method" "hpbar" + "trigger" "bosslvl3_2_trigger_lvl6:OnStartTouch" + + "iterator" "bosslvl3_2_counter3" + "counter" "bosslvl3_2_counter1" + "backup" "bosslvl3_2_counter2" + } +} \ No newline at end of file From c8e2bab8773b48944adfce4a08d0d6c06f1a5dbb Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 13:03:08 +0300 Subject: [PATCH 08/11] BossHP: Fixed config for ze_hellz_rescuebase_v5_a27 --- BossHP/configs/bosshp/ze_hellz_rescuebase_v5_a27.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BossHP/configs/bosshp/ze_hellz_rescuebase_v5_a27.cfg b/BossHP/configs/bosshp/ze_hellz_rescuebase_v5_a27.cfg index e49d8e54..71e4bc81 100644 --- a/BossHP/configs/bosshp/ze_hellz_rescuebase_v5_a27.cfg +++ b/BossHP/configs/bosshp/ze_hellz_rescuebase_v5_a27.cfg @@ -7,8 +7,8 @@ "trigger" "Noctali_Boss_AddHP:OnStartTouch" "iterator" "Noctali_Boss_Health_Final" - "counter" "Noctali_Boss_Health_Init" - "backup" "Noctali_Boss_Health" + "counter" "Noctali_Boss_Health" + "backup" "Noctali_Boss_Health_Init" } "1" // Stage 2 { @@ -34,7 +34,7 @@ "breakable" "Item_Balrog_HitBox" } - "3" // Stage + "4" // Stage { "name" "Hasard Wing" "method" "breakable" From 1491e4de9b9be6219706b2466c09f215a56bfcd7 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 13:06:08 +0300 Subject: [PATCH 09/11] BossHP: Added missing boss from ze_temple_raider_b4 to the config. --- BossHP/configs/bosshp/ze_temple_raider_b4.cfg | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/BossHP/configs/bosshp/ze_temple_raider_b4.cfg b/BossHP/configs/bosshp/ze_temple_raider_b4.cfg index fe1934cf..48b01272 100644 --- a/BossHP/configs/bosshp/ze_temple_raider_b4.cfg +++ b/BossHP/configs/bosshp/ze_temple_raider_b4.cfg @@ -12,9 +12,18 @@ } "1" { - "name" "UFO" + "name" "End Boss" "method" "counter" "trigger" "End_Boss_AddHP:OnStartTouch" + "counter" "End_Boss_Health" } + "2" + { + "name" "Boxes" + "method" "counter" + "trigger" "B_Trigger2:OnStartTouch" + + "counter" "B_Wooddoor_Counter" + } } \ No newline at end of file From e38eed1bfdca92b30bedc45efc345273127508bb Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 13:08:34 +0300 Subject: [PATCH 10/11] BossHP: Added two missing bosses to the ze_tyranny_v5fix config. --- BossHP/configs/bosshp/ze_tyranny_v5fix.cfg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/BossHP/configs/bosshp/ze_tyranny_v5fix.cfg b/BossHP/configs/bosshp/ze_tyranny_v5fix.cfg index 78889707..cd1aed15 100644 --- a/BossHP/configs/bosshp/ze_tyranny_v5fix.cfg +++ b/BossHP/configs/bosshp/ze_tyranny_v5fix.cfg @@ -98,4 +98,20 @@ "counter" "bosslvl5_laser_counter" } + "10" // Stage 4_statu + { + "name" "Statue 1" + "method" "breakable" + "trigger" "commandtrigger1:OnStartTouch" + + "breakable" "lvl5_shield_hit_t" + } + "11" // Stage 4_statu + { + "name" "Statue 2" + "method" "breakable" + "trigger" "commandtrigger1:OnStartTouch" + + "breakable" "lvl5_shield_hit_ct" + } } From 17a2d7cfea33664123caeedd5c95fc457303dc93 Mon Sep 17 00:00:00 2001 From: Oleg Tsvetkov Date: Mon, 1 May 2017 13:14:18 +0300 Subject: [PATCH 11/11] BossHP: Some code-style changes --- BossHP/configs/bosshp/ze_alien_shooter_v7.cfg | 1 + BossHP/configs/bosshp/ze_avalanche_b6.cfg | 2 +- BossHP/configs/bosshp/ze_bioshock_v6_2.cfg | 2 +- BossHP/configs/bosshp/ze_shroomforest2_v1.cfg | 10 +++++----- BossHP/configs/bosshp/ze_shroomforest_v4_5.cfg | 4 ++-- BossHP/configs/bosshp/ze_starwars_v2fix.cfg | 12 ++++++------ 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/BossHP/configs/bosshp/ze_alien_shooter_v7.cfg b/BossHP/configs/bosshp/ze_alien_shooter_v7.cfg index 8732f359..86408a62 100644 --- a/BossHP/configs/bosshp/ze_alien_shooter_v7.cfg +++ b/BossHP/configs/bosshp/ze_alien_shooter_v7.cfg @@ -15,6 +15,7 @@ "name" "Alien" "method" "counter" "trigger" "trigger_hp_add_lasers:OnStartTouch" + "counter" "roshi_counter" } } \ No newline at end of file diff --git a/BossHP/configs/bosshp/ze_avalanche_b6.cfg b/BossHP/configs/bosshp/ze_avalanche_b6.cfg index 444979a5..bbd7c2f6 100644 --- a/BossHP/configs/bosshp/ze_avalanche_b6.cfg +++ b/BossHP/configs/bosshp/ze_avalanche_b6.cfg @@ -58,4 +58,4 @@ "counter" "bosslvl2_5_counter1" "backup" "bosslvl2_5_counter2" } -} +} \ No newline at end of file diff --git a/BossHP/configs/bosshp/ze_bioshock_v6_2.cfg b/BossHP/configs/bosshp/ze_bioshock_v6_2.cfg index e4dbe25b..1416bb50 100644 --- a/BossHP/configs/bosshp/ze_bioshock_v6_2.cfg +++ b/BossHP/configs/bosshp/ze_bioshock_v6_2.cfg @@ -48,4 +48,4 @@ "breakable" "columbia_patriot_health" } -} +} \ No newline at end of file diff --git a/BossHP/configs/bosshp/ze_shroomforest2_v1.cfg b/BossHP/configs/bosshp/ze_shroomforest2_v1.cfg index 575e8d83..1d52a2c9 100644 --- a/BossHP/configs/bosshp/ze_shroomforest2_v1.cfg +++ b/BossHP/configs/bosshp/ze_shroomforest2_v1.cfg @@ -12,7 +12,7 @@ } "1" { - "name" "TV" + "name" "TV heart" "method" "hpbar" "trigger" "Lvl2_Boss_Tr:OnStartTouch" @@ -22,7 +22,7 @@ } "2" { - "name" "God" + "name" "GOD" "method" "hpbar" "trigger" "Lvl3_Boss_Tr:OnStartTouch" @@ -42,7 +42,7 @@ } "4" { - "name" "Fallen Angel" + "name" "FALLEN ANGEL" "method" "hpbar" "trigger" "Ext3_Boss_Tr:OnStartTouch" @@ -52,7 +52,7 @@ } "5" { - "name" "Dragon" + "name" "DRAGON" "method" "hpbar" "trigger" "Rescue_B_Path4:OnPass" @@ -62,7 +62,7 @@ } "6" { - "name" "Satan" + "name" "SATAN" "method" "hpbar" "trigger" "Part3_Relay:OnTrigger" diff --git a/BossHP/configs/bosshp/ze_shroomforest_v4_5.cfg b/BossHP/configs/bosshp/ze_shroomforest_v4_5.cfg index d1c1996f..5ae0cdd0 100644 --- a/BossHP/configs/bosshp/ze_shroomforest_v4_5.cfg +++ b/BossHP/configs/bosshp/ze_shroomforest_v4_5.cfg @@ -48,7 +48,7 @@ "counter" "dynamic_HP" } - "5" + "5" { "name" "Pikachu" "method" "counter" @@ -56,4 +56,4 @@ "counter" "dynamic_HP" } -} +} \ No newline at end of file diff --git a/BossHP/configs/bosshp/ze_starwars_v2fix.cfg b/BossHP/configs/bosshp/ze_starwars_v2fix.cfg index 1471d57e..c451a5f7 100644 --- a/BossHP/configs/bosshp/ze_starwars_v2fix.cfg +++ b/BossHP/configs/bosshp/ze_starwars_v2fix.cfg @@ -34,7 +34,7 @@ "counter" "Boss_heal_dart_vader" } - "3" // lvl3_2 + "4" // lvl3_2 { "name" "Darth Sidius" "method" "hpbar" @@ -44,7 +44,7 @@ "counter" "darth_sid_1" "backup" "darth_sid_2" } - "3" // lvl3_2 + "5" // lvl3_2 { "name" "Boss_Tank" "method" "counter" @@ -52,7 +52,7 @@ "counter" "Boss_heal_tank" } - "3" // lvl3_2 + "6" // lvl3_2 { "name" "Reactor" "method" "hpbar" @@ -62,7 +62,7 @@ "counter" "darth_sphere_1" "backup" "darth_sphere_2" } - "3" // lvl3_2 + "7" // lvl3_2 { "name" "Dart Vader" "method" "hpbar" @@ -72,7 +72,7 @@ "counter" "darth_vader_1" "backup" "darth_vader_2" } - "3" // lvl3_2 + "8" // lvl3_2 { "name" "Station" "method" "counter" @@ -80,4 +80,4 @@ "counter" "Math_conter_station" } -} +} \ No newline at end of file