From 603acbea0d6a0b1f7491332b1ec24c484213ab49 Mon Sep 17 00:00:00 2001 From: Pinsplash <39359267+Pinsplash@users.noreply.github.com> Date: Fri, 26 May 2023 22:36:18 -0500 Subject: [PATCH] added Griefing Grigori to CFGs, added Malignant Mossman --- sourcemods/ep1chaos/cfg/autoexec.cfg | 6 ++++++ sourcemods/ep1chaos/cfg/groups.cfg | 6 +++++- sourcemods/ep2chaos/cfg/autoexec.cfg | 6 ++++++ sourcemods/ep2chaos/cfg/groups.cfg | 6 +++++- sourcemods/hl2chaos/cfg/autoexec.cfg | 6 ++++++ sourcemods/hl2chaos/cfg/groups.cfg | 6 +++++- sp/src/game/server/hl2/chaos.h | 1 + sp/src/game/server/hl2/hl2_player.cpp | 5 +++++ 8 files changed, 39 insertions(+), 3 deletions(-) diff --git a/sourcemods/ep1chaos/cfg/autoexec.cfg b/sourcemods/ep1chaos/cfg/autoexec.cfg index 94bcf75b..f2ec2994 100644 --- a/sourcemods/ep1chaos/cfg/autoexec.cfg +++ b/sourcemods/ep1chaos/cfg/autoexec.cfg @@ -257,6 +257,9 @@ chaos_prob_use_spam 100 //Grenade Guns chaos_prob_nade_guns 100 +//Griefing Grigori +chaos_prob_evil_grigori 100 + //Invert Gravity chaos_prob_invertg 100 @@ -275,6 +278,9 @@ chaos_prob_lock_vehicle 600 //Low Gravity chaos_prob_lowg 100 +//Malignant Mossman +chaos_prob_evil_mossman 100 + //NPCs Explode on Death chaos_prob_explode_on_death 100 diff --git a/sourcemods/ep1chaos/cfg/groups.cfg b/sourcemods/ep1chaos/cfg/groups.cfg index caedf37a..a96c98af 100644 --- a/sourcemods/ep1chaos/cfg/groups.cfg +++ b/sourcemods/ep1chaos/cfg/groups.cfg @@ -14,4 +14,8 @@ chaos_group 26 34 //No Looking Up/Down, Left 4 Dead chaos_group 25 72 //No Looking Left/Right, Bastard Barney chaos_group 26 72 //No Looking Up/Down, Bastard Barney chaos_group 25 74 //No Looking Left/Right, Krazy Kleiner -chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner \ No newline at end of file +chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner +chaos_group 25 75 //No Looking Left/Right, Griefing Grigori +chaos_group 26 75 //No Looking Up/Down, Griefing Grigori +chaos_group 25 76 //No Looking Left/Right, Malignant Mossman +chaos_group 26 76 //No Looking Up/Down, Malignant Mossman \ No newline at end of file diff --git a/sourcemods/ep2chaos/cfg/autoexec.cfg b/sourcemods/ep2chaos/cfg/autoexec.cfg index 94bcf75b..f2ec2994 100644 --- a/sourcemods/ep2chaos/cfg/autoexec.cfg +++ b/sourcemods/ep2chaos/cfg/autoexec.cfg @@ -257,6 +257,9 @@ chaos_prob_use_spam 100 //Grenade Guns chaos_prob_nade_guns 100 +//Griefing Grigori +chaos_prob_evil_grigori 100 + //Invert Gravity chaos_prob_invertg 100 @@ -275,6 +278,9 @@ chaos_prob_lock_vehicle 600 //Low Gravity chaos_prob_lowg 100 +//Malignant Mossman +chaos_prob_evil_mossman 100 + //NPCs Explode on Death chaos_prob_explode_on_death 100 diff --git a/sourcemods/ep2chaos/cfg/groups.cfg b/sourcemods/ep2chaos/cfg/groups.cfg index caedf37a..a96c98af 100644 --- a/sourcemods/ep2chaos/cfg/groups.cfg +++ b/sourcemods/ep2chaos/cfg/groups.cfg @@ -14,4 +14,8 @@ chaos_group 26 34 //No Looking Up/Down, Left 4 Dead chaos_group 25 72 //No Looking Left/Right, Bastard Barney chaos_group 26 72 //No Looking Up/Down, Bastard Barney chaos_group 25 74 //No Looking Left/Right, Krazy Kleiner -chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner \ No newline at end of file +chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner +chaos_group 25 75 //No Looking Left/Right, Griefing Grigori +chaos_group 26 75 //No Looking Up/Down, Griefing Grigori +chaos_group 25 76 //No Looking Left/Right, Malignant Mossman +chaos_group 26 76 //No Looking Up/Down, Malignant Mossman \ No newline at end of file diff --git a/sourcemods/hl2chaos/cfg/autoexec.cfg b/sourcemods/hl2chaos/cfg/autoexec.cfg index 3f202a5b..ba553be4 100644 --- a/sourcemods/hl2chaos/cfg/autoexec.cfg +++ b/sourcemods/hl2chaos/cfg/autoexec.cfg @@ -257,6 +257,9 @@ chaos_prob_use_spam 100 //Grenade Guns chaos_prob_nade_guns 100 +//Griefing Grigori +chaos_prob_evil_grigori 100 + //Invert Gravity chaos_prob_invertg 100 @@ -275,6 +278,9 @@ chaos_prob_lock_vehicle 600 //Low Gravity chaos_prob_lowg 100 +//Malignant Mossman +chaos_prob_evil_mossman 100 + //NPCs Explode on Death chaos_prob_explode_on_death 100 diff --git a/sourcemods/hl2chaos/cfg/groups.cfg b/sourcemods/hl2chaos/cfg/groups.cfg index caedf37a..a96c98af 100644 --- a/sourcemods/hl2chaos/cfg/groups.cfg +++ b/sourcemods/hl2chaos/cfg/groups.cfg @@ -14,4 +14,8 @@ chaos_group 26 34 //No Looking Up/Down, Left 4 Dead chaos_group 25 72 //No Looking Left/Right, Bastard Barney chaos_group 26 72 //No Looking Up/Down, Bastard Barney chaos_group 25 74 //No Looking Left/Right, Krazy Kleiner -chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner \ No newline at end of file +chaos_group 26 74 //No Looking Up/Down, Krazy Kleiner +chaos_group 25 75 //No Looking Left/Right, Griefing Grigori +chaos_group 26 75 //No Looking Up/Down, Griefing Grigori +chaos_group 25 76 //No Looking Left/Right, Malignant Mossman +chaos_group 26 76 //No Looking Up/Down, Malignant Mossman \ No newline at end of file diff --git a/sp/src/game/server/hl2/chaos.h b/sp/src/game/server/hl2/chaos.h index 2d16a029..ea81ce1e 100644 --- a/sp/src/game/server/hl2/chaos.h +++ b/sp/src/game/server/hl2/chaos.h @@ -90,6 +90,7 @@ enum Effect_T EFFECT_GOOD_GMAN, EFFECT_EVIL_KLEINER, EFFECT_EVIL_GRIGORI, + EFFECT_EVIL_MOSSMAN, //EFFECT_EVIL_ELI, //EFFECT_EVIL_BREEN, diff --git a/sp/src/game/server/hl2/hl2_player.cpp b/sp/src/game/server/hl2/hl2_player.cpp index f494e48f..d78bc23b 100644 --- a/sp/src/game/server/hl2/hl2_player.cpp +++ b/sp/src/game/server/hl2/hl2_player.cpp @@ -5166,6 +5166,7 @@ ConVar chaos_prob_evil_barney("chaos_prob_evil_barney", "100"); ConVar chaos_prob_good_gman("chaos_prob_good_gman", "100"); ConVar chaos_prob_evil_kleiner("chaos_prob_evil_kleiner", "100"); ConVar chaos_prob_evil_grigori("chaos_prob_evil_grigori", "100"); +ConVar chaos_prob_evil_mossman("chaos_prob_evil_mossman", "100"); //ConVar chaos_prob_evil_eli("chaos_prob_evil_eli", "100"); //ConVar chaos_prob_evil_breen("chaos_prob_evil_breen", "100"); #define ERROR_WEIGHT 1 @@ -5247,6 +5248,7 @@ void CHL2_Player::PopulateEffects() CreateEffect<>(EFFECT_GOOD_GMAN, MAKE_STRING("Good Man"), EC_NONE, -1, chaos_prob_good_gman.GetInt()); CreateEffect(EFFECT_EVIL_KLEINER, MAKE_STRING("Krazy Kleiner"), EC_HAS_WEAPON, -1, chaos_prob_evil_kleiner.GetInt()); CreateEffect(EFFECT_EVIL_GRIGORI, MAKE_STRING("Griefing Grigori"), EC_HAS_WEAPON, -1, chaos_prob_evil_grigori.GetInt()); + CreateEffect(EFFECT_EVIL_MOSSMAN, MAKE_STRING("Malignant Mossman"), EC_HAS_WEAPON, -1, chaos_prob_evil_mossman.GetInt()); //CreateEffect(EFFECT_EVIL_ELI, MAKE_STRING("Evil Eli"), EC_HAS_WEAPON, -1, chaos_prob_evil_eli.GetInt()); //CreateEffect(EFFECT_EVIL_BREEN, MAKE_STRING("Hands-on Dr. Breen"), EC_HAS_WEAPON, -1, chaos_prob_evil_breen.GetInt()); } @@ -7407,6 +7409,9 @@ void CEEvilNPC::StartEffect() case EFFECT_EVIL_GRIGORI: m_iSavedChaosID = ChaosSpawnNPC("npc_monk", MAKE_STRING("Griefing Grigori"), SPAWNTYPE_EYELEVEL_REGULAR, "_", "monk", "weapon_annabelle", CSF_EVIL)->m_iChaosID; break; + case EFFECT_EVIL_MOSSMAN: + m_iSavedChaosID = ChaosSpawnNPC("npc_mossman", MAKE_STRING("Malignant Mossman"), SPAWNTYPE_EYELEVEL_REGULAR, "_", "mossman", "weapon_crowbar", CSF_EVIL)->m_iChaosID; + break; /* case EFFECT_EVIL_ELI: m_iSavedChaosID = ChaosSpawnNPC("npc_eli", MAKE_STRING("Evil Eli"), SPAWNTYPE_EYELEVEL_REGULAR, "models/eli.mdl", "eli", "weapon_crossbow", true)->m_iChaosID;