From 49b56d7354bac77d84804a228f628a28f886577a Mon Sep 17 00:00:00 2001
From: NekosakiSR <105573819+NekosakiSR@users.noreply.github.com>
Date: Mon, 11 Jul 2022 10:44:27 -0400
Subject: [PATCH] Commands/Permissions/Grammar update (#81)
* Updating to new clear commands
* Updated Mora command and added /stop command
~ Increased the amount of Mora the command gives to 100mill
~ Added stop command
* Added and updated permissions
~ .others permissions allow players to use commands on other ppl instead of themselves
~ The old give permissions no longer work so deleted them
* Updating grammar
~ Changed "Banner editor" to "Banner Editor"
~ Replaced "Top most" with "Always on top"
~ Adding an S to "Artifact" tab, but didn't know which is which hope I guessed right
~ Fixed Grammar in Quest tab
~ The word "Management" is not needed next to every word, feel free to re-add them if you needed.
~ Added an S next to "Perm"
~ Replaced "Host" with "Server IP"
* Replacing "Topmost" to "Always on top"
---
.../Forms/FormMain.en-us.resx | 24 +++++++--------
.../Forms/FormTextMapBrowser.en-US.resx | 4 +--
.../Resources/Permissions.txt | 30 +++++++++++++++----
.../Resources/en-us/CustomCommands.txt | 12 ++++----
4 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/Source/GrasscutterTools/Forms/FormMain.en-us.resx b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
index b708c38..f931262 100644
--- a/Source/GrasscutterTools/Forms/FormMain.en-us.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
@@ -224,7 +224,7 @@
35, 17
- Host
+ Server IP
Remote
@@ -257,7 +257,7 @@
UID
- Ban Management
+ Ban
49, 21
@@ -293,7 +293,7 @@
127, 23
- Account Management
+ Account
Delete
@@ -305,7 +305,7 @@
38, 17
- Perm
+ Perms
30, 25
@@ -317,7 +317,7 @@
UID
- Permission Management
+ Permissions
Manage
@@ -343,7 +343,7 @@
Teleporting
-Tip: You can quickly teleport through the 'fishing hook' mark on the minimap in the game
+Tip: You can quickly teleport through the 'fishing hook' pin on the map in-game.
In the command, you can use ~ to indicate the current position, and ~100 to indicate the relative current 100
@@ -453,7 +453,7 @@ Tip: Most of the scenes have no effect and cannot be entered.
93, 17
- Geive Weapon
+ Give Weapon
203, 218
@@ -489,7 +489,7 @@ Tip: Most of the scenes have no effect and cannot be entered.
147, 216
- Weapon
+ Weapons
126, 135
@@ -671,7 +671,7 @@ Tip: Most of the scenes have no effect and cannot be entered.
Add or Finish Quest
Tip: Many quest require server-side scripting support
-Therefore, the quest can be add and finish, but not necessarily can be work
+Therefore, the quest can be added and finished, but not necessarily work.
Quest
@@ -734,7 +734,7 @@ Therefore, the quest can be add and finish, but not necessarily can be workStars
- Artifact
+ Artifacts
533, 216
@@ -812,13 +812,13 @@ Therefore, the quest can be add and finish, but not necessarily can be workTextMapBrowser
- Banner editor
+ Banner Editor
83, 21
- Top most
+ Always on top
95, 21
diff --git a/Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx b/Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx
index a92a730..ad8fe25 100644
--- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx
+++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx
@@ -134,7 +134,7 @@
80, 21
- TopMost
+ Always on top
294, 17
@@ -148,4 +148,4 @@
Text Map Browser
-
\ No newline at end of file
+
diff --git a/Source/GrasscutterTools/Resources/Permissions.txt b/Source/GrasscutterTools/Resources/Permissions.txt
index fc7022f..5a00ee3 100644
--- a/Source/GrasscutterTools/Resources/Permissions.txt
+++ b/Source/GrasscutterTools/Resources/Permissions.txt
@@ -4,33 +4,53 @@ player.**
server.*
server.**
player.changescene
-player.clearinv
+player.clear
player.enterdungeon
+player.enterdungeon.others
player.give
-player.giveall
-player.giveart
-player.givechar
+player.give.others
player.godmode
player.heal
+player.heal.others
player.killcharacter
+player.killcharacter.others
+player.quest
+player.quest.others
player.resetconstellation
+player.resetconstellation.others
player.setfetterlevel
+player.setfetterlevel.others
+player.setprop
+player.setprop.others
player.setstats
+player.setstats.others
player.settalent
+player.settalent.others
player.setworldlevel
+player.team
+player.team.others
player.teleport
+player.teleport.others
player.tpall
+player.tpall.others
player.weather
+player.weather.others
+server.announce
server.broadcast
server.coop
+server.coop.others
server.drop
server.kick
server.killall
+server.killall.others
server.reload
server.resetshop
+server.resetshop.others
server.sendmail
server.sendmessage
+server.sendmessage.others
server.spawn
+server.spawn.others
server.stop
mea.notice
-mea.mail
\ No newline at end of file
+mea.mail
diff --git a/Source/GrasscutterTools/Resources/en-us/CustomCommands.txt b/Source/GrasscutterTools/Resources/en-us/CustomCommands.txt
index ef6bc56..fa5a001 100644
--- a/Source/GrasscutterTools/Resources/en-us/CustomCommands.txt
+++ b/Source/GrasscutterTools/Resources/en-us/CustomCommands.txt
@@ -30,18 +30,18 @@ Give me ALL!
/give 224 x10000
100k Primogem
/give 201 x100000
-100k Mora
-/give 202 x100000
+100Mill Mora
+/give 202 x100000000
Reload config
/reload
Re-login
/kick
Clear Backpack(ALL)
-/clear all
+/clear all lv90 r5 5*
Clear Weapons
-/clear wp
+/clear wp lv90 r5 5*
Clear Artifacts
-/clear art
+/clear art lv20 r5 5*
Clear Materials
/clear mat
Reset Current Constellation(Need Re-login)
@@ -60,3 +60,5 @@ Broadcast
/say Hello everyone~
Server Announcement
/a Welcome to grasscutter PS!
+Close Server
+/stop