jackz/sourcemod-plugins
1
0
Fork 0
mirror of https://github.com/Jackzmc/sourcemod-plugins.git synced 2025-05-07 16:53:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix l4d2_autobotcrown small issues

Browse source
This commit is contained in:
Jackzie 2021-04-17 15:21:05 -05:00
parent 3ea9678b53
commit de01ed6746
No known key found for this signature in database
GPG key ID: 1E834FE36520537A
2 changed files with 61 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/l4d2_autobotcrown.smx
View file

Binary file not shown.

76
scripting/l4d2_autobotcrown.sp
View file

@ -6,7 +6,7 @@
//#define DEBUG 0 //#define DEBUG 0
#define SCAN_INTERVAL 4.0 #define SCAN_INTERVAL 4.0
#define SCAN_RANGE 750.0 #define SCAN_RANGE 570.0
#define ACTIVE_INTERVAL 0.4 #define ACTIVE_INTERVAL 0.4
#include <sourcemod> #include <sourcemod>
@ -29,7 +29,7 @@ public Plugin myinfo =
static ArrayList WitchList; static ArrayList WitchList;
static Handle timer = INVALID_HANDLE; static Handle timer = INVALID_HANDLE;
static bool lateLoaded = false, AutoCrownInPosition = false; static bool lateLoaded = false, AutoCrownInPosition = false;
static int AutoCrownBot = -1, AutoCrownTarget, currentDifficulty; static int AutoCrownBot = -1, AutoCrownTarget, currentDifficulty, PathfindTries = 0;
static float CrownPos[3], CrownAng[3]; static float CrownPos[3], CrownAng[3];
static ConVar hValidDifficulties, hAllowedGamemodes; static ConVar hValidDifficulties, hAllowedGamemodes;
@ -46,18 +46,22 @@ public void OnPluginStart()
WitchList = new ArrayList(1, 0); WitchList = new ArrayList(1, 0);
if(lateLoaded) { if(lateLoaded) {
char classname[32]; char classname[8];
for(int i = MaxClients; i < 2048; i++) { for(int i = MaxClients; i < 2048; i++) {
if(IsValidEntity(i)) { if(IsValidEntity(i)) {
GetEntityClassname(i, classname, sizeof(classname)); GetEntityClassname(i, classname, sizeof(classname));
if(StrEqual(classname, "witch", false)) { if(StrEqual(classname, "witch", false)) {
WitchList.Push(i); WitchList.Push(i);
if(timer == INVALID_HANDLE) { #if defined DEBUG
timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT | TIMER_FLAG_NO_MAPCHANGE); PrintToServer("Found pre-existing witch %d", i);
} #endif
} }
} }
} }
if(timer == INVALID_HANDLE && WitchList.Length > 0) {
timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT);
}
} }
hValidDifficulties = CreateConVar("l4d2_autocrown_allowed_difficulty", "7", "The difficulties the plugin is active on. 1=Easy, 2=Normal 4=Advanced 8=Expert. Add numbers together.", FCVAR_NONE); hValidDifficulties = CreateConVar("l4d2_autocrown_allowed_difficulty", "7", "The difficulties the plugin is active on. 1=Easy, 2=Normal 4=Advanced 8=Expert. Add numbers together.", FCVAR_NONE);
@ -76,7 +80,20 @@ public void OnPluginStart()
HookEvent("difficulty_changed", Event_DifficultyChanged); HookEvent("difficulty_changed", Event_DifficultyChanged);
RegAdminCmd("sm_ws", Cmd_Status, ADMFLAG_ROOT); RegAdminCmd("sm_ws", Cmd_Status, ADMFLAG_ROOT);
#if defined DEBUG
CreateTimer(0.6, Timer_Debug, _, TIMER_REPEAT);
#endif
} }
#if defined DEBUG
public Action Timer_Debug(Handle timer) {
PrintHintTextToAll("Scan Timer: %b | Active: %b | In Position %b | Witches %d | Bot %N", timer != INVALID_HANDLE, AutoCrownBot > -1, AutoCrownInPosition, WitchList.Length, GetClientOfUserId(AutoCrownBot));
return Plugin_Continue;
}
#endif
public Action Cmd_Status(int client, int args) { public Action Cmd_Status(int client, int args) {
ReplyToCommand(client, "Scan Timer: %b | Active: %b | In Position %b | Witches %d | Bot %N", timer != INVALID_HANDLE, AutoCrownBot > -1, AutoCrownInPosition, WitchList.Length, GetClientOfUserId(AutoCrownBot)); ReplyToCommand(client, "Scan Timer: %b | Active: %b | In Position %b | Witches %d | Bot %N", timer != INVALID_HANDLE, AutoCrownBot > -1, AutoCrownInPosition, WitchList.Length, GetClientOfUserId(AutoCrownBot));
return Plugin_Handled; return Plugin_Handled;
@ -87,17 +104,15 @@ public void Event_DifficultyChanged(Event event, const char[] name, bool dontBro
currentDifficulty = GetDifficultyInt(diff); currentDifficulty = GetDifficultyInt(diff);
if(hAllowedGamemodes.IntValue & currentDifficulty > 0) { if(hAllowedGamemodes.IntValue & currentDifficulty > 0) {
if(timer == INVALID_HANDLE && AutoCrownBot == -1) { if(timer == INVALID_HANDLE && AutoCrownBot == -1) {
timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT | TIMER_FLAG_NO_MAPCHANGE); timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT);
} }
}else{ }else{
CloseHandle(timer); delete timer;
timer = INVALID_HANDLE;
} }
} }
public void Change_Gamemode(ConVar convar, const char[] oldValue, const char[] newValue) { public void Change_Gamemode(ConVar convar, const char[] oldValue, const char[] newValue) {
if(StrEqual(newValue, "realism")) { if(StrEqual(newValue, "realism")) {
CloseHandle(timer); delete timer;
timer = INVALID_HANDLE;
} }
} }
@ -112,8 +127,9 @@ public Action Event_WitchSpawn(Event event, const char[] name, bool dontBroadcas
#if defined DEBUG #if defined DEBUG
PrintToServer("Witch spawned: %d", witchID); PrintToServer("Witch spawned: %d", witchID);
#endif #endif
//If not currently scanning, begin scanning ONLY if not active
if(timer == INVALID_HANDLE && AutoCrownBot == -1) { if(timer == INVALID_HANDLE && AutoCrownBot == -1) {
timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT | TIMER_FLAG_NO_MAPCHANGE); timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT);
} }
} }
@ -126,6 +142,7 @@ public Action Event_WitchKilled(Event event, const char[] name, bool dontBroadca
if(index > -1) { if(index > -1) {
RemoveFromArray(WitchList, index); RemoveFromArray(WitchList, index);
} }
//If witch that was killed, terminate active loop
if(AutoCrownTarget == witchID) { if(AutoCrownTarget == witchID) {
ResetAutoCrown(); ResetAutoCrown();
#if defined DEBUG #if defined DEBUG
@ -139,10 +156,10 @@ public Action Timer_Active(Handle hdl) {
#if defined DEBUG #if defined DEBUG
PrintToServer("No witches detected, ending timer"); PrintToServer("No witches detected, ending timer");
#endif #endif
timer = INVALID_HANDLE;
return Plugin_Stop; return Plugin_Stop;
} }
//TODO: Also check if startled and cancel it immediately. //TODO: Also check if startled and cancel it immediately.
//TODO: X amount of tries, then ignore.
if(AutoCrownBot > -1) { if(AutoCrownBot > -1) {
int client = GetClientOfUserId(AutoCrownBot); int client = GetClientOfUserId(AutoCrownBot);
if(!IsValidEntity(AutoCrownTarget) || IsPlayerIncapped(client)) { if(!IsValidEntity(AutoCrownTarget) || IsPlayerIncapped(client)) {
@ -185,10 +202,21 @@ public Action Timer_Active(Handle hdl) {
AutoCrownInPosition = true; AutoCrownInPosition = true;
}else{ }else{
L4D2_RunScript("CommandABot({cmd=1,bot=GetPlayerFromUserID(%i),pos=Vector(%f,%f,%f)})", AutoCrownBot, witchPos[0], witchPos[1], witchPos[2]); L4D2_RunScript("CommandABot({cmd=1,bot=GetPlayerFromUserID(%i),pos=Vector(%f,%f,%f)})", AutoCrownBot, witchPos[0], witchPos[1], witchPos[2]);
PathfindTries++;
}
if(PathfindTries > 30) {
ResetAutoCrown();
int index = FindValueInArray(WitchList, AutoCrownTarget);
if(index > -1)
RemoveFromArray(WitchList, index);
//remove witch
#if defined DEBUG
PrintToServer("Could not pathfind to witch in time.");
#endif
} }
return Plugin_Continue; return Plugin_Continue;
}else{ }else{
timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT | TIMER_FLAG_NO_MAPCHANGE); timer = CreateTimer(SCAN_INTERVAL, Timer_Scan, _, TIMER_REPEAT);
return Plugin_Stop; return Plugin_Stop;
} }
} }
@ -198,6 +226,7 @@ public Action Timer_Scan(Handle hdl) {
#if defined DEBUG #if defined DEBUG
PrintToServer("No witches detected, ending timer"); PrintToServer("No witches detected, ending timer");
#endif #endif
timer = INVALID_HANDLE;
return Plugin_Stop; return Plugin_Stop;
} }
for(int bot = 1; bot <= MaxClients; bot++) { for(int bot = 1; bot <= MaxClients; bot++) {
@ -208,6 +237,7 @@ public Action Timer_Scan(Handle hdl) {
if(GetClientWeapon(bot, wpn, sizeof(wpn)) && (StrEqual(wpn, "weapon_autoshotgun") || StrEqual(wpn, "weapon_shotgun_spas"))) { if(GetClientWeapon(bot, wpn, sizeof(wpn)) && (StrEqual(wpn, "weapon_autoshotgun") || StrEqual(wpn, "weapon_shotgun_spas"))) {
GetClientAbsOrigin(bot, botPosition); GetClientAbsOrigin(bot, botPosition);
//Loop all witches, find any valid nearby witches:
for(int i = 0; i < WitchList.Length; i++) { for(int i = 0; i < WitchList.Length; i++) {
int witchID = WitchList.Get(i); int witchID = WitchList.Get(i);
if(IsValidEntity(witchID) && HasEntProp(witchID, Prop_Send, "m_rage") && GetEntPropFloat(witchID, Prop_Send, "m_rage") <= 0.4) { if(IsValidEntity(witchID) && HasEntProp(witchID, Prop_Send, "m_rage") && GetEntPropFloat(witchID, Prop_Send, "m_rage") <= 0.4) {
@ -255,7 +285,23 @@ public void ResetAutoCrown() {
if(AutoCrownBot > -1) if(AutoCrownBot > -1)
L4D2_RunScript("CommandABot({cmd=3,bot=GetPlayerFromUserID(%i)})", AutoCrownBot); L4D2_RunScript("CommandABot({cmd=3,bot=GetPlayerFromUserID(%i)})", AutoCrownBot);
AutoCrownBot = -1; AutoCrownBot = -1;
timer = INVALID_HANDLE; PathfindTries = 0;
if(timer != INVALID_HANDLE) {
CloseHandle(timer);
timer = INVALID_HANDLE;
}
}
public void OnMapStart() {
WitchList.Clear();
ResetAutoCrown();
}
public void OnMapEnd() {
if(timer != INVALID_HANDLE) {
CloseHandle(timer);
timer = INVALID_HANDLE;
}
WitchList.Clear();
} }
int GetDifficultyInt(const char[] type) { int GetDifficultyInt(const char[] type) {