Random changes hope they work

This commit is contained in:
Jackzie 2024-03-28 12:13:30 -05:00
parent 9007092afd
commit ccc68b9935
16 changed files with 431 additions and 227 deletions

View file

@ -211,7 +211,7 @@ enum struct EditorData {
}
void CycleStacker(float tick) {
if(tick - cmdThrottle[this.client] <= 0.20) return;
if(tick - cmdThrottle[this.client] <= 0.10) return;
int newDirection = view_as<int>(this.stackerDirection) + 1;
if(newDirection == view_as<int>(Stack_Down)) newDirection = 0;
this.stackerDirection = view_as<StackerDirection>(newDirection);
@ -334,8 +334,10 @@ enum struct EditorData {
return this._FinishPreview(entity) ? Complete_PropSpawned : Complete_PropError;
} else {
// Is edit, do nothing, just reset
PrintHintText(this.client, "Edit Complete");
this.Reset();
entity = 0;
return Complete_EditSuccess;
}
}
@ -384,6 +386,7 @@ enum struct EditorData {
this.Reset();
if(!isEdit) {
id = createdWalls.Push(EntIndexToEntRef(blocker));
PrintToChat(this.client, "\x04[Editor]\x01 Created wall \x05#%d\x01.", id);
}
return true;
}
@ -430,7 +433,8 @@ enum struct EditorData {
this.origin[2] += (size[2] * sign);
}
}
PrintHintText(this.client, "%s\n%s", this.classname, this.data);
// PrintToChat(this.client, "\x04[Editor]\x01 Editing copy \x05%d\x01 of entity \x05%d\x01. End with \x05/edit done\x01 or \x04/edit cancel\x01", entity, oldEntity);
// Don't kill preview until cancel
return true;
}
@ -606,7 +610,8 @@ enum struct EditorData {
TeleportEntity(this.entity, this.prevOrigin, this.prevAngles, NULL_VECTOR);
}
this.SetMode(INACTIVE);
CPrintToChat(this.client, "\x04[Editor]\x01 Cancelled.");
PrintHintText(this.client, "Cancelled");
// CPrintToChat(this.client, "\x04[Editor]\x01 Cancelled.");
}
}
EditorData Editor[MAXPLAYERS+1];

View file

@ -372,7 +372,7 @@ Action Command_DoAHat(int client, int args) {
if(IsFakeClient(entity) && L4D_GetIdlePlayerOfBot(entity) > 0) {
PrintToChat(client, "[Hats] Cannot hat idle bots");
return Plugin_Handled;
} else if(GetClientTeam(entity) != 2 && ~cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_InfectedHats)) {
} else if(!isForced && GetClientTeam(entity) != 2 && ~cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_InfectedHats)) {
PrintToChat(client, "[Hats] Cannot make enemy a hat... it's dangerous");
return Plugin_Handled;
} else if(entity == EntRefToEntIndex(Editor[client].entity)) {
@ -747,7 +747,11 @@ void EquipHat(int client, int entity, const char[] classname = "", int flags = H
} else {
float mins[3];
GetEntPropVector(modifyEntity, Prop_Send, "m_vecMins", mins);
hatData[client].offset[2] += mins[2];
if(StrContains(classname, "weapon_molotov") > -1 || StrContains(classname, "weapon_pipe_bomb") > -1 || StrContains(classname, "weapon_vomitjar") > -1) {
hatData[client].offset[2] += 7.2;
} else {
hatData[client].offset[2] += mins[2];
}
}
if(cvar_sm_hats_flags.IntValue & view_as<int>(HatConfig_ReversedHats) && flags & view_as<int>(HAT_REVERSED)) {