From b6f8ede4662647e3942ceabef7e207b318b2f4aa Mon Sep 17 00:00:00 2001 From: LordMisfit Date: Mon, 14 Aug 2017 17:56:08 -0400 Subject: [PATCH] - More ZScript tweaking. :V --- DUMP3/decorate/dump3-dvds.dec | 15 ++++----------- KDIZD/Decorate/KDIZDOriginal.dec | 12 ++++-------- TCOTD2/decorate/tcotd2monsters.dec | 9 +++------ Unloved/decorate/unlovedmonsters.dec | 3 +-- circus666/decorate/circus666.dec | 3 --- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/DUMP3/decorate/dump3-dvds.dec b/DUMP3/decorate/dump3-dvds.dec index f3ce051d1..c8ecd21b4 100644 --- a/DUMP3/decorate/dump3-dvds.dec +++ b/DUMP3/decorate/dump3-dvds.dec @@ -17,9 +17,6 @@ ACTOR AdolfHitlerDS : AetheriusMonsterZSC replaces AdolfHitler Painchance "Fist", 255 // Fist attacks have a +50% chance of stunning an enemy Painchance "Kick", 255 // Kick attacks have a +150% chance of stunning an enemy Painchance "Gauntlets", 255 // Fist attacks have a +50% chance of stunning an enemy - Painchance "GravityHP", 255 - Painchance "GravityMP", 255 - Painchance "GravityHPMP", 255 States { @@ -72,8 +69,7 @@ ACTOR AdolfHitlerDS : AetheriusMonsterZSC replaces AdolfHitler { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomBulletAttack (user_shotaccuracy, user_shotzaccuracy, 3, ((random(1,5) * 3) * ACS_NamedExecuteWithResult("CrisisMultiplier")), "BulletPuff", 0, 1); } else @@ -85,8 +81,7 @@ ACTOR AdolfHitlerDS : AetheriusMonsterZSC replaces AdolfHitler { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); @@ -115,8 +110,7 @@ ACTOR AdolfHitlerDS : AetheriusMonsterZSC replaces AdolfHitler { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomBulletAttack (user_shotaccuracy, user_shotzaccuracy, 3, ((random(1,5) * 3) * ACS_NamedExecuteWithResult("CrisisMultiplier")), "BulletPuff", 0, 1); } else @@ -128,8 +122,7 @@ ACTOR AdolfHitlerDS : AetheriusMonsterZSC replaces AdolfHitler { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); A_CustomMissile("ZombieBulletTracerCrisis", 24, 0, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); diff --git a/KDIZD/Decorate/KDIZDOriginal.dec b/KDIZD/Decorate/KDIZDOriginal.dec index acb76d35e..d197aca41 100644 --- a/KDIZD/Decorate/KDIZDOriginal.dec +++ b/KDIZD/Decorate/KDIZDOriginal.dec @@ -586,8 +586,7 @@ ACTOR MaulerDemon : AetheriusMonsterZSC 3123 if(GetCVar("dvds_monstercrisisattacks") == 0) { A_SetUserVar("user_canusecrisisatk",0); } if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack2",7); - A_PlaySound("crisisattack",6); + A_PlayCrisisAtkSound; A_CustomMeleeAttack( ((random(1,10)*4) * ACS_NamedExecuteWithResult("CrisisMultiplier")) ,"none","none"); // A_SargAttack } else @@ -852,8 +851,7 @@ ACTOR RapidFireTrooper : AetheriusMonsterZSC 3201 { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomBulletAttack(user_shotaccuracy, user_shotzaccuracy, 1, ((random(1,5) * 3) * ACS_NamedExecuteWithResult("CrisisMultiplier")), "BulletPuff", 0, CBAF_NORANDOM); } else @@ -865,8 +863,7 @@ ACTOR RapidFireTrooper : AetheriusMonsterZSC 3201 { if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomMissile("ZombieBulletTracerCrisis", 32, 12, frandom(user_shotaccuracy1,user_shotaccuracy2), CMF_OFFSETPITCH, frandom(user_shotzaccuracy1,user_shotzaccuracy2)); } else @@ -2289,8 +2286,7 @@ actor MagmantisLostSoul : AetheriusMonsterZSC if(GetCVar("dvds_monstercrisisattacks") == 0) { A_SetUserVar("user_canusecrisisatk",0); } if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack2",7); - A_PlaySound("crisisattack",6); + A_PlayCrisisAtkSound; A_SkullAttack(50); } else diff --git a/TCOTD2/decorate/tcotd2monsters.dec b/TCOTD2/decorate/tcotd2monsters.dec index 0e987f638..06daca5ce 100644 --- a/TCOTD2/decorate/tcotd2monsters.dec +++ b/TCOTD2/decorate/tcotd2monsters.dec @@ -622,8 +622,7 @@ ACTOR TommyGunCultistNew : AetheriusMonsterZSC 29011 //if(GetCVar("dvds_monstercrisisattacks") == 0) { A_SetUserVar("user_canusecrisisatk",0); } if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomBulletAttack(10, 5.6, 1, ((Random(4,6) * Random(1,2)) * ACS_NamedExecuteWithResult("CrisisMultiplier")), "BulletPuff2", 0, CBAF_NORANDOM); } else @@ -638,8 +637,7 @@ ACTOR TommyGunCultistNew : AetheriusMonsterZSC 29011 if(GetCVar("dvds_monstercrisisattacks") == 0) { A_SetUserVar("user_canusecrisisatk",0); } if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; A_CustomMissile("TCOTDBulletTracerCrisis", 32, 12, frandom(-5.0,5.0), CMF_OFFSETPITCH, frandom(-2.8,2.8)); } else @@ -772,8 +770,7 @@ ACTOR ShotgunCultistNew : TommyGunCultistNew 29010 A_SetUserVar("user_canusecrisisatk",0); if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack",6); - A_PlaySound("crisisattack2",7); + A_PlayCrisisAtkSound; if (GetCVar("dvds_monsterbulletstracers") == 0) // Hitscan { A_CustomBulletAttack (user_shotaccuracy, user_shotzaccuracy, 3, ((Random(4,6) * Random(1,2)) * ACS_NamedExecuteWithResult("CrisisMultiplier")), "BulletPuff", 0, 1); diff --git a/Unloved/decorate/unlovedmonsters.dec b/Unloved/decorate/unlovedmonsters.dec index 5c28c5564..74517e575 100644 --- a/Unloved/decorate/unlovedmonsters.dec +++ b/Unloved/decorate/unlovedmonsters.dec @@ -1260,8 +1260,7 @@ ACTOR BloodFiendNew : AetheriusMonsterZSC replaces BloodFiend 30100 if(GetCVar("dvds_monstercrisisattacks") == 0) { A_SetUserVar("user_canusecrisisatk",0); } if(user_canusecrisisatk == 1) { - A_PlaySound("crisisattack2",7); - A_PlaySound("crisisattack",6); + A_PlayCrisisAtkSound; A_CustomMeleeAttack( ((random(1,10)*4) * ACS_NamedExecuteWithResult("CrisisMultiplier")) ,"none","none"); // A_SargAttack } else diff --git a/circus666/decorate/circus666.dec b/circus666/decorate/circus666.dec index 8a6165582..107e531f2 100644 --- a/circus666/decorate/circus666.dec +++ b/circus666/decorate/circus666.dec @@ -320,9 +320,6 @@ ACTOR PennywiseHeadNew : AetheriusMonsterZSC replaces Pennywise 32119 Painchance "Fist", 120 // Fist attacks have a +50% chance of stunning an enemy Painchance "Kick", 200 // Kick attacks have a +150% chance of stunning an enemy Painchance "Gauntlets", 120 // Fist attacks have a +50% chance of stunning an enemy - Painchance "GravityHP", 255 - Painchance "GravityMP", 255 - Painchance "GravityHPMP", 255 DamageFactor "Holy", 2 DamageFactor "Magic", 1.25 Painchance "Holy", 160