diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-12-28 15:20:51 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-12-28 15:20:51 -0200 |
| commit | c43204f99f32d34a9f81bf6b1f4526855977887a (patch) | |
| tree | 8b27654d26d34f03d129920956f9d8dca0c2e9db | |
| parent | 56a4e2eb29ee6152a71116614651e5546f4b2702 (diff) | |
| download | serverdata-c43204f99f32d34a9f81bf6b1f4526855977887a.tar.gz serverdata-c43204f99f32d34a9f81bf6b1f4526855977887a.tar.bz2 serverdata-c43204f99f32d34a9f81bf6b1f4526855977887a.tar.xz serverdata-c43204f99f32d34a9f81bf6b1f4526855977887a.zip | |
Update @w
| -rw-r--r-- | conf/groups.conf | 1 | ||||
| -rw-r--r-- | npc/commands/warp.txt | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/conf/groups.conf b/conf/groups.conf index 417c5d329..3bec841d1 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -121,7 +121,6 @@ groups: ( hugo: true linus: true charcommands: true - rates: true uptime: true showdelay: true exp: true diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt index c04c5133d..873ba2216 100644 --- a/npc/commands/warp.txt +++ b/npc/commands/warp.txt @@ -25,28 +25,24 @@ OnCall: for (.@i = 0; .@i < .count; .@i += 2) { - if (.@request$ ~= .aliases$[.@i]) - { + if (.@request$ ~= .aliases$[.@i]) { sscanf .aliases$[.@i + 1], "%s %d %d", .@map$, .@x, .@y; break; } } - if (.@map$ == "") - { + if (.@map$ == "") { .@map$ = .@atcmd_parameters$[0]; } - if (.@atcmd_parameters$[2] != "") - { + if (.@atcmd_parameters$[2] != "") { .@x = atoi(.@atcmd_parameters$[1]); .@y = atoi(.@atcmd_parameters$[2]); } // FIXME: here getmapusers() is used only to check if the map exists // replace this when/if we get a dedicated function for that - if (getmapusers(.@map$) < 0) - { + if (getmapusers(.@map$) < 0) { end; // invalid map } @@ -66,6 +62,8 @@ OnInit: // PROLOGUE "^START|^BEGIN", "000-0 22 24", // starting point "^NARD|^SHIP", "002-1 53 38", // nard's ship (outside instance) + "^000-0", "000-0 34 17", // Intro Lookout Area + "^000-0-0", "000-0-0 29 28", // Intro B Lookout Area // TMW2 "^TULIM", "003-1 41 48", // Tulishmar @@ -73,11 +71,13 @@ OnInit: "^HALI", "009-1 28 33", // Halinarzo "^HURN", "012-1 83 63", // Hurnscald "^LOF", "017-1 120 89", // Land Of Fire Village - "^NIVAL", "019-2 94 118", // Nivalis (WIP) + "^PORT", "019-2 94 118", // Nivalis Port (WIP) + "^NIVAL", "020-1 58 65", // Nivalis (WIP) // TBR - To Be Removed - "^BOSS", "boss 45 45", // (TBR) Jesusalva Boss Arena + "^BOSS", "boss 45 45", // (TBR) Monster King's Throne Room "^BOT", "botcheck 26 30", // (TBR) Botcheck area + "^HEROES|^HH", "018-2 72 66", // (TBR) Heroes Hold // GM Stuff "^AEROS|^GM", "001-1 235 26", // Floating Island of Aeros (GM Events) |