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

Add more checks

Browse source
This commit is contained in:
Jackz 2023-05-26 08:01:31 -05:00
parent e57151aaae
commit 9b49ec33f3
No known key found for this signature in database
GPG key ID: E0BBD94CF657F603
3 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripting/include/hats/hats.sp
View file

@ -188,6 +188,12 @@ public Action Command_DoAHat(int client, int args) {
} }
if(arg[0] == 'y') { // Hat yeeting: if(arg[0] == 'y') { // Hat yeeting:
char classname[16];
GetEntityClassname(entity, classname, sizeof(classname));
if(StrEqual(classname, "prop_dynamic")) {
ReplyToCommand(client, "You cannot yeet this prop (it has no physics)");
return Plugin_Handled;
}
GetClientEyeAngles(client, hatData[client].orgAng); GetClientEyeAngles(client, hatData[client].orgAng);
GetClientAbsOrigin(client, hatData[client].orgPos); GetClientAbsOrigin(client, hatData[client].orgPos);
hatData[client].orgPos[2] += 45.0; hatData[client].orgPos[2] += 45.0;
@ -318,6 +324,14 @@ public Action Command_DoAHat(int client, int args) {
} else if(entity == EntRefToEntIndex(WallBuilder[client].entity)) { } else if(entity == EntRefToEntIndex(WallBuilder[client].entity)) {
// Prevent making an entity you editing a hat // Prevent making an entity you editing a hat
return Plugin_Handled; return Plugin_Handled;
} else if(cvar_sm_hats_max_distance.FloatValue > 0.0 && entity >= MaxClients) {
float posP[3], posE[3];
GetClientEyePosition(client, posP);
GetEntPropVector(entity, Prop_Data, "m_vecOrigin", posE);
if(GetVectorDistance(posP, posE) > cvar_sm_hats_max_distance.FloatValue) {
PrintCenterText(client, "[Hats] Entity too far away");
return Plugin_Handled;
}
} }
// Make hat reversed if 'r' passed in // Make hat reversed if 'r' passed in
@ -373,7 +387,7 @@ public Action Command_DoAHat(int client, int args) {
if(!IsFakeClient(entity) && cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_PlayerHatConsent) && ~flags & view_as<int>(HAT_REVERSED)) { if(!IsFakeClient(entity) && cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_PlayerHatConsent) && ~flags & view_as<int>(HAT_REVERSED)) {
int lastRequestDiff = GetTime() - lastHatRequestTime[client]; int lastRequestDiff = GetTime() - lastHatRequestTime[client];
if(lastRequestDiff < PLAYER_HAT_REQUEST_COOLDOWN) { if(lastRequestDiff < PLAYER_HAT_REQUEST_COOLDOWN) {
PrintToChat(client, "[Hats] Player hat under %d seconds cooldown", lastRequestDiff); PrintToChat(client, "[Hats] Player hat under %d seconds cooldown", GetTime() - lastRequestDiff);
return Plugin_Handled; return Plugin_Handled;
} }
@ -533,6 +547,7 @@ bool CanTarget(int victim) {
} }
bool IsHatAllowed(int client) { bool IsHatAllowed(int client) {
if(L4D_IsMissionFinalMap()) return true;
char name[32]; char name[32];
GetEntityClassname(hatData[client].entity, name, sizeof(name)); GetEntityClassname(hatData[client].entity, name, sizeof(name));
// Don't allow non-weapons in saferoom // Don't allow non-weapons in saferoom
@ -553,6 +568,7 @@ bool IsHatAllowed(int client) {
bool CanHatBePlaced(int client, const float pos[3]) { bool CanHatBePlaced(int client, const float pos[3]) {
if(cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_NoSaferoomHats)) { if(cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_NoSaferoomHats)) {
if(IsHatAllowed(client)) return true;
Address nav = L4D_GetNearestNavArea(pos, 200.0); Address nav = L4D_GetNearestNavArea(pos, 200.0);
if(nav != Address_Null) { if(nav != Address_Null) {
int spawnFlags = L4D_GetNavArea_SpawnAttributes(nav) ; int spawnFlags = L4D_GetNavArea_SpawnAttributes(nav) ;

5
scripting/include/hats/walls.sp
View file

@ -60,6 +60,7 @@ enum struct WallBuilderData {
if(this.entity != INVALID_ENT_REFERENCE) { if(this.entity != INVALID_ENT_REFERENCE) {
if(!IsValidEntity(this.entity)) { if(!IsValidEntity(this.entity)) {
PrintToChat(client, "\x04[Hats]\x01 Entity has vanished, editing cancelled."); PrintToChat(client, "\x04[Hats]\x01 Entity has vanished, editing cancelled.");
this.Reset();
return false; return false;
} }
} }
@ -411,7 +412,7 @@ public Action Command_ManageWalls(int client, int args) {
PrintToChat(client, "\x04[Hats]\x01 Editing wall \x05%d\x01. End with \x05/wall done\x01 or \x04/wall cancel\x01", id); PrintToChat(client, "\x04[Hats]\x01 Editing wall \x05%d\x01. End with \x05/wall done\x01 or \x04/wall cancel\x01", id);
PrintToChat(client, "\x04[Hats]\x01 Mode: \x05Scale\x01"); PrintToChat(client, "\x04[Hats]\x01 Mode: \x05Scale\x01");
} }
} else if(StrEqual(arg1, "edite") || arg1[0] == 'c') { } else if(StrEqual(arg1, "edite") || (arg1[0] == 'c' && arg1[1] == 'u')) {
int index = GetLookingEntity(client, Filter_ValidHats); //GetClientAimTarget(client, false); int index = GetLookingEntity(client, Filter_ValidHats); //GetClientAimTarget(client, false);
if(index > 0) { if(index > 0) {
WallBuilder[client].Import(index, false, MOVE_ORIGIN); WallBuilder[client].Import(index, false, MOVE_ORIGIN);
@ -432,7 +433,7 @@ public Action Command_ManageWalls(int client, int args) {
PrintToChat(client, "\x04[Hats]\x01 Finish editing your wall first: \x05/wall done\x01 or \x04/wall cancel\x01"); PrintToChat(client, "\x04[Hats]\x01 Finish editing your wall first: \x05/wall done\x01 or \x04/wall cancel\x01");
} else { } else {
int entity = WallBuilder[client].Copy(); int entity = WallBuilder[client].Copy();
PrintToChat(client, "\x04[Hats]\x01 Editing copy \x05%d\x01 of entity \x05%d\x01. End with \x05/wall done\x01 or \x04/wall cancel\x01", entity, oldEntity); PrintToChat(client, "\x04[Hats]\x01 Editing copy \x05%d\x01 of entity \x05%d\x01. End with \x05/edit done\x01 or \x04/edit cancel\x01", entity, oldEntity);
} }
} else { } else {
int id = GetWallId(client, arg2); int id = GetWallId(client, arg2);

29
scripting/l4d2_hats.sp
View file

@ -30,9 +30,9 @@ Cookie noHatVictimCookie;
ConVar cvar_sm_hats_enabled; ConVar cvar_sm_hats_enabled;
ConVar cvar_sm_hats_flags; ConVar cvar_sm_hats_flags;
ConVar cvar_sm_hat_rainbow_speed; ConVar cvar_sm_hats_rainbow_speed;
ConVar cvar_sm_hats_blacklist_enabled; ConVar cvar_sm_hats_blacklist_enabled;
ConVar cvar_sm_hats_max_distance;
#include <hats/walls.sp> #include <hats/walls.sp>
@ -73,8 +73,9 @@ public void OnPluginStart() {
cvar_sm_hats_blacklist_enabled = CreateConVar("sm_hats_blacklist_enabled", "1", "Is the prop blacklist enabled", FCVAR_NONE, true, 0.0, true, 1.0); cvar_sm_hats_blacklist_enabled = CreateConVar("sm_hats_blacklist_enabled", "1", "Is the prop blacklist enabled", FCVAR_NONE, true, 0.0, true, 1.0);
cvar_sm_hats_enabled = CreateConVar("sm_hats_enabled", "1.0", "Enable hats.\n0=OFF, 1=Admins Only, 2=Any", FCVAR_NONE, true, 0.0, true, 2.0); cvar_sm_hats_enabled = CreateConVar("sm_hats_enabled", "1.0", "Enable hats.\n0=OFF, 1=Admins Only, 2=Any", FCVAR_NONE, true, 0.0, true, 2.0);
cvar_sm_hats_enabled.AddChangeHook(Event_HatsEnableChanged); cvar_sm_hats_enabled.AddChangeHook(Event_HatsEnableChanged);
cvar_sm_hats_flags = CreateConVar("sm_hats_features", "155", "Toggle certain features. Add bits together\n1 = Player Hats\n2 = Respect Admin Immunity\n4 = Create a fake hat for hat wearer to view instead, and for yeeting\n8 = No saferoom hats\n16 = Player hatting requires victim consent\n32 = Infected Hats\n64 = Reverse hats", FCVAR_CHEAT, true, 0.0); cvar_sm_hats_flags = CreateConVar("sm_hats_features", "153", "Toggle certain features. Add bits together\n1 = Player Hats\n2 = Respect Admin Immunity\n4 = Create a fake hat for hat wearer to view instead, and for yeeting\n8 = No saferoom hats\n16 = Player hatting requires victim consent\n32 = Infected Hats\n64 = Reverse hats\n128 = Delete Thrown Hats", FCVAR_CHEAT, true, 0.0);
cvar_sm_hat_rainbow_speed = CreateConVar("sm_hats_rainbow_speed", "1", "Speed of rainbow", FCVAR_NONE, true, 0.0); cvar_sm_hats_rainbow_speed = CreateConVar("sm_hats_rainbow_speed", "1", "Speed of rainbow", FCVAR_NONE, true, 0.0);
cvar_sm_hats_max_distance = CreateConVar("sm_hats_distance", "220", "The max distance away you can hat something. 0 = disable", FCVAR_NONE, true, 0.0);
noHatVictimCookie = new Cookie("hats_no_target", "Disables other players from making you their hat", CookieAccess_Public); noHatVictimCookie = new Cookie("hats_no_target", "Disables other players from making you their hat", CookieAccess_Public);
noHatVictimCookie.SetPrefabMenu(CookieMenu_OnOff_Int, "Disable player hats for self", OnLocalPlayerHatCookieSelect); noHatVictimCookie.SetPrefabMenu(CookieMenu_OnOff_Int, "Disable player hats for self", OnLocalPlayerHatCookieSelect);
@ -86,6 +87,7 @@ public void OnPluginStart() {
if(StrContains(targetName, "l4d2_hats_") == 0) { if(StrContains(targetName, "l4d2_hats_") == 0) {
createdWalls.Push(EntIndexToEntRef(entity)); createdWalls.Push(EntIndexToEntRef(entity));
} }
} }
for(int i = 1; i <= MaxClients; i++) { for(int i = 1; i <= MaxClients; i++) {
@ -270,7 +272,8 @@ Action Timer_PropSleep(Handle h, DataPack pack) {
int ref = pack.ReadCell(); int ref = pack.ReadCell();
int client = GetClientOfUserId(pack.ReadCell()); int client = GetClientOfUserId(pack.ReadCell());
if(client > 0 && IsValidEntity(ref)) { if(client > 0 && IsValidEntity(ref)) {
CheckKill(ref); CheckKill(ref, client);
PrintToServer("Hats: Yeet delete timeout");
if(hatData[client].yeetGroundTimer != null) { if(hatData[client].yeetGroundTimer != null) {
delete hatData[client].yeetGroundTimer; delete hatData[client].yeetGroundTimer;
} }
@ -285,7 +288,8 @@ Action Timer_GroundKill(Handle h, DataPack pack) {
float vel[3]; float vel[3];
GetEntPropVector(ref, Prop_Data, "m_vecVelocity", vel); GetEntPropVector(ref, Prop_Data, "m_vecVelocity", vel);
if(FloatAbs(vel[2]) < 0.2 || IsNearGround(ref)) { if(FloatAbs(vel[2]) < 0.2 || IsNearGround(ref)) {
CheckKill(ref); PrintToServer("Hats: Yeet ground check %b %b", FloatAbs(vel[2]) < 0.2, IsNearGround(ref));
CheckKill(ref, client);
hatData[client].yeetGroundTimer = null; hatData[client].yeetGroundTimer = null;
return Plugin_Stop; return Plugin_Stop;
} }
@ -296,7 +300,7 @@ Action Timer_GroundKill(Handle h, DataPack pack) {
void CheckKill(int ref) { void CheckKill(int ref, int client) {
// Check if we should delete thrown hat objects, such as physic props // Check if we should delete thrown hat objects, such as physic props
if(cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_DeleteThrownHats)) { if(cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_DeleteThrownHats)) {
// Don't delete if someone has hatted it (including ourself): // Don't delete if someone has hatted it (including ourself):
@ -469,7 +473,7 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
int visibleEntity = EntRefToEntIndex(hatData[client].visibleEntity); int visibleEntity = EntRefToEntIndex(hatData[client].visibleEntity);
///#HAT PROCESS ///#HAT PROCESS
if(entity > 0) { if(entity > 0) {
// try to tp hat to its own pos // try to tp hat to itys own pos
if(!onLadder[client] && GetEntityMoveType(client) == MOVETYPE_LADDER) { if(!onLadder[client] && GetEntityMoveType(client) == MOVETYPE_LADDER) {
onLadder[client] = true; onLadder[client] = true;
ClearParent(entity); ClearParent(entity);
@ -489,9 +493,9 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
if(HasFlag(client, HAT_RAINBOW)) { if(HasFlag(client, HAT_RAINBOW)) {
// Decrement and flip, possibly when rainbowticks // Decrement and flip, possibly when rainbowticks
if(hatData[client].rainbowReverse) { if(hatData[client].rainbowReverse) {
hatData[client].rainbowColor[0] -= cvar_sm_hat_rainbow_speed.FloatValue; hatData[client].rainbowColor[0] -= cvar_sm_hats_rainbow_speed.FloatValue;
} else { } else {
hatData[client].rainbowColor[0] += cvar_sm_hat_rainbow_speed.FloatValue; hatData[client].rainbowColor[0] += cvar_sm_hats_rainbow_speed.FloatValue;
} }
if(hatData[client].rainbowColor[0] > 360.0) { if(hatData[client].rainbowColor[0] > 360.0) {
@ -505,7 +509,7 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
static int rgb[3]; static int rgb[3];
HSVToRGBInt(hatData[client].rainbowColor, rgb); HSVToRGBInt(hatData[client].rainbowColor, rgb);
SetEntityRenderColor(entity, rgb[0], rgb[1], rgb[2]); SetEntityRenderColor(entity, rgb[0], rgb[1], rgb[2]);
hatData[client].rainbowTicks = -cvar_sm_hat_rainbow_speed.IntValue; hatData[client].rainbowTicks = -cvar_sm_hats_rainbow_speed.IntValue;
EquipHat(client, entity); EquipHat(client, entity);
} }
@ -566,7 +570,7 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
bool isRotate; bool isRotate;
int flags = GetEntityFlags(client); int flags = GetEntityFlags(client);
if(buttons & IN_USE) { if(buttons & IN_USE) {
PrintCenterText(client, "%d %d", mouse[0], mouse[1]); PrintCenterText(client, "%.1f %.1f %.1f", WallBuilder[client].angles[0], WallBuilder[client].angles[1], WallBuilder[client].angles[2]);
isRotate = true; isRotate = true;
SetEntityFlags(client, flags |= FL_FROZEN); SetEntityFlags(client, flags |= FL_FROZEN);
if(buttons & IN_ATTACK) WallBuilder[client].CycleAxis(client, tick); if(buttons & IN_ATTACK) WallBuilder[client].CycleAxis(client, tick);
@ -688,6 +692,7 @@ public Action OnTakeDamageAlive(int victim, int& attacker, int& inflictor, float
public void OnClientDisconnect(int client) { public void OnClientDisconnect(int client) {
tempGod[client] = false; tempGod[client] = false;
WallBuilder[client].Reset(); WallBuilder[client].Reset();
ClearHat(client, true);
} }
public void OnEntityDestroyed(int entity) { public void OnEntityDestroyed(int entity) {