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

Code cleanup

Browse source
This commit is contained in:
Jackzie 2021-05-14 21:08:29 -05:00
parent b88976a38d
commit 5417e5a97e
No known key found for this signature in database
GPG key ID: 1E834FE36520537A
5 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/l4d2_extraplayeritems.smx
View file

Binary file not shown.

BIN
plugins/l4d_survivor_identity_fix.smx
View file

Binary file not shown.

4
scripting/l4d2_autorestart.sp
View file

@ -38,7 +38,7 @@ public Action Timer_Check(Handle h) {
// ServerCommand("quit");
// return Plugin_Stop;
// }else
if(IsServerEmptyAndNonHibernating()) {
if(IsServerEmpty()) {
//Server is stuck in non-hibernation with only bots, quit
LogAction(0, -1, "Detected server in hibernation with no players, restarting...");
ServerCommand("quit");
@ -46,7 +46,7 @@ public Action Timer_Check(Handle h) {
}
//Returns true if there is a bot connected and there is no real players
bool IsServerEmptyAndNonHibernating() {
bool IsServerEmpty() {
bool hasClient;
for(int i = 1; i < MaxClients; i++) {
if(IsClientConnected(i) && IsClientInGame(i)) {

34
scripting/l4d2_extraplayeritems.sp
View file

@ -10,26 +10,26 @@
Once a new map starts, all item spawners are checked and randomly their spawn count will be increased by 1.
*/
//TODO: On 3rd/4th kit pickup in area, add more
//TODO: Add extra pills too, on pickup
#pragma semicolon 1
#pragma newdecls required
//#define DEBUG 0
#define PLUGIN_VERSION "1.0"
#define MAX_ENTITY_LIMIT 2000
#include <sourcemod>
#include <sdktools>
#include <sdkhooks>
#include <left4dhooks>
#include <jutils>
//TODO: On 3rd/4th kit pickup in area, add more
//TODO: Add extra pills too, on pickup
#define L4D2_WEPUPGFLAG_NONE (0 << 0)
#define L4D2_WEPUPGFLAG_INCENDIARY (1 << 0)
#define L4D2_WEPUPGFLAG_EXPLOSIVE (1 << 1)
#define L4D2_WEPUPGFLAG_LASER (1 << 2)
#define L4D2_WEPUPGFLAG_LASER (1 << 2)
#define AMMOPACK_ENTID 0
#define AMMOPACK_USERS 1
@ -50,13 +50,6 @@ static bool isCheckpointReached, isLateLoaded, firstGiven, isFailureRound, isGam
static ArrayList ammoPacks;
static int g_iAmmoTable;
/*
on first start: Everyone has a kit, new comers also get a kit.
then when you reach the saferoom, extraKitsAmount is set to the amount of players minus 4. Ex: 5 players -> 1 extra kit
Then on heal at the point, you get an extra kit. After a map transition when a player_spawn is fired, if they do not have a kit; give an extra kit if there is any.
Any left over kits will be used on heals until depleted.
*/
public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) {
if(late) isLateLoaded = true;
}
@ -258,9 +251,7 @@ public void OnMapStart() {
HookEntityOutput("info_changelevel", "OnStartTouch", EntityOutput_OnStartTouchSaferoom);
HookEntityOutput("trigger_changelevel", "OnStartTouch", EntityOutput_OnStartTouchSaferoom);
//Lock the saferoom door until 80% loaded in: //&& abmExtraCount > 4
playersLoadedIn = 0;
}
public void OnMapEnd() {
@ -359,9 +350,6 @@ public Action Event_Pickup(int client, int weapon) {
if(UseExtraKit(client)) {
return Plugin_Stop;
}
/*else i*/
//FIXME: For some fucking reason this shit crashes server in end saferoom now.
//Literally, it should be impossible for it to do a stack crash, as this should have a LIMITED AMOUNT!!
}
return Plugin_Continue;
}
@ -382,6 +370,7 @@ public Action OnUpgradePackUse(int entity, int activator, int caller, UseType ty
if(IsValidEdict(primaryWeapon) && HasEntProp(primaryWeapon, Prop_Send, "m_upgradeBitVec")) {
int index = ammoPacks.FindValue(entity, AMMOPACK_ENTID);
if(index == -1) return Plugin_Continue;
ArrayList clients = ammoPacks.Get(index, AMMOPACK_USERS);
if(clients.FindValue(activator) > -1) {
ClientCommand(activator, "play ui/menu_invalid.wav");
@ -389,7 +378,7 @@ public Action OnUpgradePackUse(int entity, int activator, int caller, UseType ty
}
char classname[32];
int upgradeBits = GetEntProp(primaryWeapon, Prop_Send, "m_upgradeBitVec"), ammo = 40;
int upgradeBits = GetEntProp(primaryWeapon, Prop_Send, "m_upgradeBitVec"), ammo = 10;
//Get the new flag bits
GetEntityClassname(entity, classname, sizeof(classname));
@ -405,6 +394,7 @@ public Action OnUpgradePackUse(int entity, int activator, int caller, UseType ty
int currentAmmo = GetEntProp(primaryWeapon, Prop_Send, "m_iClip1");
if(currentAmmo > ammo) ammo = currentAmmo;
}
SetEntProp(primaryWeapon, Prop_Send, "m_nUpgradedPrimaryAmmoLoaded", ammo);
clients.Push(activator);
@ -441,6 +431,7 @@ public void PopulateItems() {
PrintToConsoleAll("Populating extra items based on player count (%d) | Percentage %.2f%%", survivors, percentage * 100);
char classname[32];
int affected = 0;
for(int i = MaxClients + 1; i < 2048; i++) {
if(IsValidEntity(i)) {
GetEntityClassname(i, classname, sizeof(classname));
@ -575,13 +566,4 @@ stock float GetAverageHP() {
}
}
return float(totalHP) / float(clients);
}
void SetUsedBySurvivor(int client, int entity) {
int usedMask = GetEntProp(entity, Prop_Send, "m_iUsedBySurvivorsMask");
bool bAlreadyUsed = !(usedMask & (1 << client - 1));
if (bAlreadyUsed) return;
int newMask = usedMask | (1 << client - 1);
SetEntProp(entity, Prop_Send, "m_iUsedBySurvivorsMask", newMask);
}

6
scripting/l4d_survivor_identity_fix.sp
View file

@ -229,7 +229,7 @@ public void OnClientCookiesCached(int client) {
if(strlen(modelPref) > 0) {
int type;
if(StringToIntEx(modelPref, type) > 0) {
PrintToServer(">>> %N has cookie for: %s", client, survivor_models[type - 1][18]);
PrintToServer("%N has cookie for '%s'", client, survivor_models[type - 1][18]);
strcopy(g_Models[client], 64, survivor_models[type - 1]);
g_iPendingCookieModel[client] = type;
}
@ -239,6 +239,8 @@ public void OnClientCookiesCached(int client) {
//Prevent issues with L4D1 characters being TP'd and stuck in brain dead form
public void OnMapStart() {
survivors = 0;
for(int i = 0; i < sizeof(survivor_models); i++) {
PrecacheModel(survivor_models[i], true);
}
@ -341,7 +343,7 @@ public void Frame_SetPlayerModel(int client) {
}
public Action Timer_SetAllCookieModels(Handle h) {
for(int i = 1; i <= MaxClients; i++) {
if(IsClientConnected(i) && g_iPendingCookieModel[i] && GetClientTeam(i) == 2) {
if(IsClientConnected(i) && IsClientInGame(i) && g_iPendingCookieModel[i] && GetClientTeam(i) == 2) {
SetEntityModel(i, survivor_models[g_iPendingCookieModel[i] - 1]);
SetEntProp(i, Prop_Send, "m_survivorCharacter", g_iPendingCookieModel[i] - 1);
}