diff options
| author | gumi <git@gumi.ca> | 2020-06-12 03:20:20 +0000 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2020-06-12 03:20:20 +0000 |
| commit | 5e80b6670f5813ddeae79f9a72cc24692cafc50f (patch) | |
| tree | 3ab6ad3a583b1183ebdeb60cbfee7cfa23d1e5a3 | |
| parent | 936664a20b34af590d791bfe224b216bb508ef90 (diff) | |
| download | serverdata-5e80b6670f5813ddeae79f9a72cc24692cafc50f.tar.gz serverdata-5e80b6670f5813ddeae79f9a72cc24692cafc50f.tar.bz2 serverdata-5e80b6670f5813ddeae79f9a72cc24692cafc50f.tar.xz serverdata-5e80b6670f5813ddeae79f9a72cc24692cafc50f.zip | |
fix the divorce command
| -rw-r--r-- | world/map/npc/commands/divorce.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/world/map/npc/commands/divorce.txt b/world/map/npc/commands/divorce.txt index 954e4e92..2a3c43f3 100644 --- a/world/map/npc/commands/divorce.txt +++ b/world/map/npc/commands/divorce.txt @@ -1,12 +1,13 @@ -|script|@divorce|32767 { callfunc "argv_splitter"; - set .@n$, if_then_else(@argv$[1] != "", "char", "") + "divorce"; + set .@n$, if_then_else(@argv$[0] != "", "char", "") + "divorce"; if (GM < CMD_DIVORCE && GM < G_SYSOP) goto L_GM; // check if you can use it on self set .@target_id, BL_ID; - if (@argv$[1] != "") set .@target_id, getcharid(3, @argv$[1]); - if (@argv$[1] != "" && !(isloggedin(.@target_id))) goto L_Failed; // do NOT fallback to self - if (@argv$[1] != "" && GM < CMD_CHARDIVORCE && GM < G_SYSOP) goto L_GM; // when target is not self, use chardivorce permission + if (@argv$[0] != "") set .@target_id, getcharid(3, @argv$[0]); + if (@argv$[0] != "" && !(isloggedin(.@target_id))) set .@target_id, getcharid(3, @args$); + if (@argv$[0] != "" && !(isloggedin(.@target_id))) goto L_Failed; // do NOT fallback to self + if (@argv$[0] != "" && GM < CMD_CHARDIVORCE && GM < G_SYSOP) goto L_GM; // when target is not self, use chardivorce permission set PARTNER, 0, .@target_id; gmlog "@"+.@n$+" " + @args$; @@ -18,7 +19,7 @@ L_Failed: end; L_GM: - message strcharinfo(0), .@n$+" : GM command is level "+ if_then_else(@argv$[1] != "", CMD_CHARDIVORCE, CMD_DIVORCE) +", but you are level " + GM; + message strcharinfo(0), .@n$+" : GM command is level "+ if_then_else(@argv$[0] != "", CMD_CHARDIVORCE, CMD_DIVORCE) +", but you are level " + GM; end; OnInit: |