diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
| commit | 9c322449ade0d1952f6ca4dd73cc92413f61ca69 (patch) | |
| tree | 1bff0731c4db0790ef57a2d524d739b1241ffa2c /npc/001-2-32 | |
| parent | 9c649056dc45d39e88036bdb2bb373c477f8571f (diff) | |
| parent | 255cf7c47f76a6e2f12fc809473ce513c294dfa4 (diff) | |
| download | serverdata-jesusalva/inns.tar.gz serverdata-jesusalva/inns.tar.bz2 serverdata-jesusalva/inns.tar.xz serverdata-jesusalva/inns.zip | |
Merge branch 'master' into jesusalva/innsjesusalva/inns
Diffstat (limited to 'npc/001-2-32')
| -rw-r--r-- | npc/001-2-32/_import.txt | 2 | ||||
| -rw-r--r-- | npc/001-2-32/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/001-2-32/serena.txt | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/npc/001-2-32/_import.txt b/npc/001-2-32/_import.txt index 9043352d..b59046e0 100644 --- a/npc/001-2-32/_import.txt +++ b/npc/001-2-32/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-32: unnamed +// Map 001-2-32: Training Arena Lobby // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-32/_warps.txt", "npc/001-2-32/doors.txt", diff --git a/npc/001-2-32/_warps.txt b/npc/001-2-32/_warps.txt index 306493cb..4db4b354 100644 --- a/npc/001-2-32/_warps.txt +++ b/npc/001-2-32/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-32: unnamed warps +// Map 001-2-32: Training Arena Lobby warps 001-2-32,27,33,0 warp #001-2-32_27_33 0,0,001-2-33,39,33 diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt index 187a654c..fa650ef1 100644 --- a/npc/001-2-32/serena.txt +++ b/npc/001-2-32/serena.txt @@ -6,9 +6,7 @@ 001-2-32,27,27,0 script Serena NPC_SERENA,{ mesn; - mesq lg("Oh darling, what brought you here?"); - // ^^^^^^^ - // Expresses familiarity or elderliness in relation to PC. + mesq lg("Oh darling, what brought you here?"); // TRANSLATORS: Darling - Expresses familiarity or elderliness in relation to PC. // <scratch> // [ PC]: I was just looking around. @@ -47,9 +45,6 @@ // Alt-Siege // The city is being attacked. Go help the warriors and town-guard. - goto L_Close; - -L_Close: close; OnInit: |