Merge pull request #261 from samyycX/dev

Custom float
kgns · May 23, 2023 · 1223332 · 1223332
2 parents f5418f9 + bd21fab
commit 1223332
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 0 deletions.
diff --git a/addons/sourcemod/scripting/weapons/globals.sp b/addons/sourcemod/scripting/weapons/globals.sp
@@ -95,6 +95,7 @@ Handle g_FloatTimer[MAXPLAYERS+1] = { INVALID_HANDLE, ... };
 
 bool g_bWaitingForNametag[MAXPLAYERS+1] = { false, ... };
 bool g_bWaitingForSeed[MAXPLAYERS+1] = { false, ... };
+bool g_bWaitingForFloat[MAXPLAYERS+1] = { false, ... };
 int g_iSeedRandom[MAXPLAYERS+1][sizeof(g_WeaponClasses)];
 
 int g_iKnife[MAXPLAYERS+1] = { 0, ... };

diff --git a/addons/sourcemod/scripting/weapons/hooks.sp b/addons/sourcemod/scripting/weapons/hooks.sp
@@ -141,6 +141,46 @@ public Action ChatListener(int client, const char[] command, int args)
 
 		return Plugin_Handled;
 	}
+	else if (g_bWaitingForFloat[client] && IsValidClient(client) && g_iIndex[client] > -1 && !IsChatTrigger())
+	{
+		g_bWaitingForFloat[client] = false;
+
+		float customFloat;
+		if (StrEqual(msg, "!cancel") || StrEqual(msg, "!iptal") || StrEqual(msg, ""))
+		{
+			PrintToChat(client, " %s \x02%t", g_ChatPrefix, "CustomFloatCancelled");
+			return Plugin_Handled;
+		}
+		else if ((customFloat = StringToFloat(msg)) < 0 || customFloat >= 1)
+		{
+			PrintToChat(client, " %s \x02%t", g_ChatPrefix, "CustomFloatFailed");
+			return Plugin_Handled;
+		}
+		g_fFloatValue[client][g_iIndex[client]] = customFloat;
+		if(g_fFloatValue[client][g_iIndex[client]] < 0.0)
+		{
+			g_fFloatValue[client][g_iIndex[client]] = 0.0;
+		}
+		if(g_FloatTimer[client] != INVALID_HANDLE)
+		{
+			KillTimer(g_FloatTimer[client]);
+			g_FloatTimer[client] = INVALID_HANDLE;
+		}
+
+		DataPack pack;
+		g_FloatTimer[client] = CreateDataTimer(1.0, FloatTimer, pack);
+		pack.WriteCell(GetClientUserId(client));
+		pack.WriteCell(g_iIndex[client]);
+		int menuTime;
+		if((menuTime = GetRemainingGracePeriodSeconds(client)) >= 0)
+		{
+			CreateFloatMenu(client).Display(client, menuTime);
+		}
+
+		PrintToChat(client, " %s \x04%t: \x01%f", g_ChatPrefix, "CustomFloatSuccess", customFloat);
+
+		return Plugin_Handled;
+	}
 
 	return Plugin_Continue;
 }

diff --git a/addons/sourcemod/scripting/weapons/menus.sp b/addons/sourcemod/scripting/weapons/menus.sp
@@ -202,6 +202,9 @@ Menu CreateFloatMenu(int client)
 	Format(buffer, sizeof(buffer), "%T", "Decrease", client, g_iFloatIncrementPercentage);
 	menu.AddItem("decrease", buffer, wear == 0 ? ITEMDRAW_DISABLED : ITEMDRAW_DEFAULT);
 
+	Format(buffer, sizeof(buffer), "%T", "CustomFloat", client);
+	menu.AddItem("custom", buffer, ITEMDRAW_DEFAULT);
+
 	menu.ExitBackButton = true;
 
 	return menu;
@@ -261,6 +264,11 @@ public int FloatMenuHandler(Menu menu, MenuAction action, int client, int select
 						CreateFloatMenu(client).Display(client, menuTime);
 					}
 				}
+				else if(StrEqual(buffer, "custom"))
+				{
+					g_bWaitingForFloat[client] = true;
+					PrintToChat(client, " %s \x04%t", g_ChatPrefix, "CustomFloatInstruction");
+				}
 			}
 		}
 		case MenuAction_Cancel:

diff --git a/addons/sourcemod/translations/chi/weapons.phrases.txt b/addons/sourcemod/translations/chi/weapons.phrases.txt
@@ -28,6 +28,26 @@
 	{
 		"chi"	"减少 %d%%"
 	}
+	"CustomFloat"
+	{
+		"chi"	"输入指定磨损"
+	}
+	"CustomFloatInstruction"
+	{
+		"chi"	"请将你希望设置的磨损输入至聊天框。如需取消，请输入 !cancel 。"
+	}
+	"CustomFloatCancelled"
+	{
+		"chi"	"输入磨损已取消。"
+	}
+	"CustomFloatFailed"
+	{
+		"chi"	"无效的磨损 (0-1)。"
+	}
+	"CustomFloatSuccess"
+	{
+		"chi"	"指定磨损已设置"
+	}
 	"NameTagColor"
 	{
 		"chi"	"设置名称标签颜色"

diff --git a/addons/sourcemod/translations/weapons.phrases.txt b/addons/sourcemod/translations/weapons.phrases.txt
@@ -28,6 +28,26 @@
 	{
 		"en"	"Decrease by %d%%"
 	}
+	"CustomFloat"
+	{
+		"en"	"Input a custom float"
+	}
+	"CustomFloatInstruction"
+	{
+		"en"	"Write your desired float into chat. To abort, type !cancel."
+	}
+	"CustomFloatCancelled"
+	{
+		"en"	"Custom float operation aborted."
+	}
+	"CustomFloatFailed"
+	{
+		"en"	"Invalid float (0-1)."
+	}
+	"CustomFloatSuccess"
+	{
+		"en"	"Custom float successfully applied"
+	}
 	"NameTagInfo"
 	{
 		"en"	"Use !nametag <tag> to choose a name tag for your current weapon!"