From 2c29fda793d90cecc5b17889a70cac77066a248a Mon Sep 17 00:00:00 2001 From: Bubba Joe <89060381+BubbaJoeX@users.noreply.github.com> Date: Sat, 13 Jan 2024 03:34:05 -0600 Subject: [PATCH 1/3] Exclude default IntelliJ out folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0ea8568dc2..2ca5df58bf 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ object_template_crc_string_table.tab **/.idea/* *.iml +/out/* From 2bffe753ffe5df3202a1899fec78d26bd7a54bc3 Mon Sep 17 00:00:00 2001 From: Bubba Joe <89060381+BubbaJoeX@users.noreply.github.com> Date: Sat, 13 Jan 2024 03:45:18 -0600 Subject: [PATCH 2/3] Commonly requested commands admin subcommands /admin setCount /admin messageTo --- .../compiled/game/script/gm/cmd.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/gm/cmd.java b/sku.0/sys.server/compiled/game/script/gm/cmd.java index a9e031e1ea..d84837da84 100755 --- a/sku.0/sys.server/compiled/game/script/gm/cmd.java +++ b/sku.0/sys.server/compiled/game/script/gm/cmd.java @@ -4439,6 +4439,38 @@ else if (command.equalsIgnoreCase("setWeather")) { return SCRIPT_CONTINUE; } + else if (command.equalsIgnoreCase("setCount")) { + + int count; + if(st.hasMoreTokens()) { + count = utils.stringToInt(st.nextToken()); + } else { + sendSystemMessageTestingOnly(self, "Syntax: /admin setCount "); + return SCRIPT_CONTINUE; + } + if (count > 500) { + count = 500; + } + setCount(target, count); + sendConsoleMessage(self, "You have added " + count + " to " + target + " (" + getName(target) + ")"); + return SCRIPT_CONTINUE; + } + + else if (command.equalsIgnoreCase("messageTo")){ + String message; + float messageDelay; + if(st.hasMoreTokens()) { + message = st.nextToken(); + messageDelay = utils.stringToFloat(st.nextToken()); + } else { + sendSystemMessageTestingOnly(self, "Syntax: /admin messageTo "); + return SCRIPT_CONTINUE; + } + messageTo(target, message, null, messageDelay, true); + sendConsoleMessage(self, "Message " + message + " sent to " + target + " (" + getName(target) + ") with a delay of " + st.nextToken() + " seconds."); + return SCRIPT_CONTINUE; + } + else { showAdminCmdSyntax(self); } @@ -4457,6 +4489,10 @@ private static void showAdminCmdSyntax(obj_id self) throws InterruptedException sendConsoleMessage(self, "returns the account username of the specified player"); sendConsoleMessage(self, "\\#00ffff setWeather \\#bfff00 \\#."); sendConsoleMessage(self, "sets the weather for the current scene"); + sendConsoleMessage(self, "\\#00ffff setCount \\#bfff00 \\#."); + sendConsoleMessage(self, "sets the amount of a stackable item."); + sendConsoleMessage(self, "\\#00ffff sendMessageTo \\#bfff00