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

Update things

Browse source
This commit is contained in:
Jackzie 2024-03-06 18:00:10 -06:00
parent d4f9241b3c
commit 6fb8dfa7aa
2 changed files with 95 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

43
scripting/include/hats/props/menu_methods.sp
View file

@ -181,4 +181,47 @@ void Spawn_ShowFavorites(int client) {
GetClientAuthId(client, AuthId_Steam2, query, sizeof(query)); GetClientAuthId(client, AuthId_Steam2, query, sizeof(query));
g_db.Format(query, sizeof(query), "SELECT model, name FROM editor_favorites WHERE steamid = '%s' ORDER BY position DESC", query); g_db.Format(query, sizeof(query), "SELECT model, name FROM editor_favorites WHERE steamid = '%s' ORDER BY position DESC", query);
g_db.Query(DB_GetFavoritesCallback, query, GetClientUserId(client)); g_db.Query(DB_GetFavoritesCallback, query, GetClientUserId(client));
}
void Spawn_ShowSaveLoadMainMenu(int client) {
Menu menu = new Menu(SaveLoadMainMenuHandler);
menu.SetTitle("Save / Load");
// Id is SaveType
menu.AddItem("1", "Map Scenes");
menu.AddItem("2", "Schematics");
menu.ExitBackButton = true;
menu.ExitButton = true;
menu.Display(client, MENU_TIME_FOREVER);
}
void ShowSaves(int client, SaveType type) {
ArrayList saves;
Menu newMenu;
if(type == Save_Scene) {
newMenu = new Menu(SaveLoadSceneHandler);
newMenu.SetTitle("Save & Load > Map Scenes");
newMenu.AddItem("", "[Save New Scene]");
saves = LoadScenes();
} else if(type == Save_Schematic) {
newMenu = new Menu(SaveLoadSchematicHandler);
newMenu.SetTitle("Save & Load > Schematics");
if(g_PropData[client].pendingSaveType == Save_Schematic) {
newMenu.AddItem("", "[Save Schematic]");
} else {
newMenu.AddItem("", "[Start New Schematic]");
// Don't load saves when in middle of creating schematic
saves = LoadSchematics();
}
}
if(saves != null) {
char name[64];
for(int i = 0; i < saves.Length; i++) {
saves.GetString(i, name, sizeof(name));
newMenu.AddItem(name, name);
}
delete saves;
}
newMenu.ExitBackButton = true;
newMenu.ExitButton = true;
newMenu.Display(client, MENU_TIME_FOREVER);
} }

98
scripting/include/hats/props/methods.sp
View file

@ -1,5 +1,5 @@
ArrayList LoadSaves() { ArrayList LoadScenes() {
char path[PLATFORM_MAX_PATH]; char path[PLATFORM_MAX_PATH];
BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s", g_currentMap); BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s", g_currentMap);
FileType fileType; FileType fileType;
@ -15,9 +15,23 @@ ArrayList LoadSaves() {
return saves; return saves;
} }
ArrayList g_previewItems; ArrayList LoadSchematics() {
char path[PLATFORM_MAX_PATH];
BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/schematics");
FileType fileType;
DirectoryListing listing = OpenDirectory(path);
if(listing == null) return null;
char buffer[64];
ArrayList saves = new ArrayList(ByteCountToCells(64));
while(listing.GetNext(buffer, sizeof(buffer), fileType) && fileType == FileType_File) {
if(buffer[0] == '.') continue;
saves.PushString(buffer);
}
delete listing;
return saves;
}
bool LoadSave(const char[] save, bool asPreview = false) { bool LoadScene(const char[] save, bool asPreview = false) {
char path[PLATFORM_MAX_PATH]; char path[PLATFORM_MAX_PATH];
BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s/%s", g_currentMap, save); BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s/%s", g_currentMap, save);
// ArrayList savedItems = new ArrayList(sizeof(SaveData)); // ArrayList savedItems = new ArrayList(sizeof(SaveData));
@ -33,41 +47,24 @@ bool LoadSave(const char[] save, bool asPreview = false) {
while(file.ReadLine(buffer, sizeof(buffer))) { while(file.ReadLine(buffer, sizeof(buffer))) {
if(buffer[0] == '#') continue; if(buffer[0] == '#') continue;
data.Deserialize(buffer); data.Deserialize(buffer);
int entity = -1; int entity = data.ToEntity(NULL_VECTOR, asPreview);
if(data.type == Build_Physics)
entity = CreateEntityByName("prop_physics");
else
entity = CreateEntityByName("prop_dynamic_override");
if(entity == -1) { if(entity == -1) {
PrintToServer("[Editor] LoadSave(\"%s\", %b): failed to create %s", save, asPreview, buffer); PrintToServer("[Editor] LoadScene(\"%s\", %b): failed to create %s", save, asPreview, buffer);
continue; continue;
} }
PrecacheModel(data.model);
DispatchKeyValue(entity, "model", data.model);
DispatchKeyValue(entity, "targetname", "saved_prop");
if(asPreview) {
DispatchKeyValue(entity, "rendermode", "1");
DispatchKeyValue(entity, "solid", "0");
} else {
DispatchKeyValue(entity, "solid", data.type == Build_NonSolid ? "0" : "6");
}
TeleportEntity(entity, data.origin, data.angles, NULL_VECTOR);
if(!DispatchSpawn(entity)) {
PrintToServer("[Editor] LoadSave(\"%s\", %b): failed to spawn %s", save, asPreview, buffer);
continue;
}
int alpha = asPreview ? 200 : data.color[3];
SetEntityRenderColor(entity, data.color[0], data.color[1], data.color[2], alpha);
if(asPreview)
g_previewItems.Push(EntIndexToEntRef(entity));
else
AddSpawnedItem(entity);
} }
delete file; delete file;
return true; return true;
} }
void ConfirmSave(int client, const char[] name) {
Menu newMenu = new Menu(SaveLoadConfirmHandler);
newMenu.AddItem(name, "Spawn");
newMenu.AddItem("", "Cancel");
newMenu.ExitBackButton = false;
newMenu.ExitButton = false;
newMenu.Display(client, 0);
}
void ClearSavePreview() { void ClearSavePreview() {
if(g_previewItems != null) { if(g_previewItems != null) {
for(int i = 0; i < g_previewItems.Length; i++) { for(int i = 0; i < g_previewItems.Length; i++) {
@ -82,14 +79,16 @@ void ClearSavePreview() {
} }
void AddSpawnedItem(int entity, int client = 0) { void AddSpawnedItem(int entity, int client = 0) {
if(client > 0 && g_PropData[client].pendingSaveType == Save_Schematic) {
g_PropData[client].schematic.AddEntity(entity, client);
}
// TODO: confirm if we want it to be in list, otherwise we need to clean manually
int userid = client > 0 ? GetClientUserId(client) : 0;
int index = g_spawnedItems.Push(EntIndexToEntRef(entity)); int index = g_spawnedItems.Push(EntIndexToEntRef(entity));
if(client == 0) g_spawnedItems.Set(index, userid, 1);
g_spawnedItems.Set(index, 0, 1);
else
g_spawnedItems.Set(index, GetClientUserId(client), 1);
} }
bool CreateSave(const char[] name) { bool CreateSceneSave(const char[] name) {
char path[PLATFORM_MAX_PATH]; char path[PLATFORM_MAX_PATH];
BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s", g_currentMap); BuildPath(Path_SM, path, sizeof(path), "data/prop_spawner/saves/%s", g_currentMap);
CreateDirectory(path, 509); CreateDirectory(path, 509);
@ -321,13 +320,18 @@ public Action OnClientSayCommand(int client, const char[] command, const char[]
} }
switch(g_PropData[client].chatPrompt) { switch(g_PropData[client].chatPrompt) {
case Prompt_Search: DoSearch(client, sArgs); case Prompt_Search: DoSearch(client, sArgs);
case Prompt_Save: { case Prompt_SaveScene: {
if(CreateSave(sArgs)) { if(CreateSceneSave(sArgs)) {
PrintToChat(client, "\x04[Editor]\x01 Saved as \x05%s/%s.txt", g_currentMap, sArgs); PrintToChat(client, "\x04[Editor]\x01 Saved as \x05%s/%s.txt", g_currentMap, sArgs);
} else { } else {
PrintToChat(client, "\x04[Editor]\x01 Unable to save. Sorry."); PrintToChat(client, "\x04[Editor]\x01 Unable to save. Sorry.");
} }
} }
case Prompt_SaveSchematic: {
g_PropData[client].StartSchematic(client, sArgs);
}
default:
PrintToChat(client, "\x04[Editor]\x01 Not implemented.");
} }
g_PropData[client].chatPrompt = Prompt_None; g_PropData[client].chatPrompt = Prompt_None;
return Plugin_Handled; return Plugin_Handled;
@ -471,13 +475,15 @@ int DeleteAll(int onlyPlayer = 0) {
int ref = g_spawnedItems.Get(i); int ref = g_spawnedItems.Get(i);
int spawnedBy = g_spawnedItems.Get(i, 1); int spawnedBy = g_spawnedItems.Get(i, 1);
// Skip if wishing to only delete certain items: // Skip if wishing to only delete certain items:
if(onlyPlayer != 0 && spawnedBy != userid) continue; if(onlyPlayer == 0 || spawnedBy == userid) {
if(IsValidEntity(ref)) { if(IsValidEntity(ref)) {
RemoveEntity(ref); RemoveEntity(ref);
}
// TODO: erasing while removing
g_spawnedItems.Erase(i);
i--; // go back up one
count++;
} }
// TODO: erasing while removing
g_spawnedItems.Erase(i);
count++;
} }
return count; return count;
} }
@ -488,9 +494,9 @@ void ShowHint(int client) {
int lastActive = g_PropData[client].lastActiveTime; int lastActive = g_PropData[client].lastActiveTime;
g_PropData[client].lastActiveTime = time; g_PropData[client].lastActiveTime = time;
if(time - lastActive < SHOW_HINT_MIN_DURATION) return; if(time - lastActive < SHOW_HINT_MIN_DURATION) return;
PrintToChat(client, "\x05R: \x01Change Mode"); PrintToChat(client, "\x05ZOOM: \x01Change Mode");
PrintToChat(client, "\x05Middle Click: \x01Cancel Placement \x05Shift + Middle Click: \x01Place \x05Ctrl + Middle Click: \x01Change Type"); PrintToChat(client, "\x05USE: \x01Place \x05Shift + USE: \x01Cancel \x05Ctrl + USE: \x01Change Type");
PrintToChat(client, "\x05E: \x01Rotate (hold, use mouse) \x05Left Click: \x01Change Axis \x05Right Click: \x01Snap Angle"); PrintToChat(client, "\x05R: \x01Rotate (hold, use mouse) \x05Left Click: \x01Change Axis \x05Right Click: \x01Snap Angle");
PrintToChat(client, "Type \x05/prop favorite\x01 to (un)favorite."); PrintToChat(client, "Type \x05/prop favorite\x01 to (un)favorite.");
PrintToChat(client, "More information & cheatsheat: \x05%s", "https://admin.jackz.me/docs/props"); PrintToChat(client, "More information & cheatsheat: \x05%s", "https://admin.jackz.me/docs/props");
} }