diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
| commit | db53017bd8172d7679b2ce3e7cc6c67927031f2c (patch) | |
| tree | 6777db7b72f0329937f17153ddfa3567695d45ea /npc/001-1 | |
| parent | c0fa45992b123f08e91e86dac11aca765ea73cd2 (diff) | |
| parent | 246072120a1edcba61a350bad56049f110457489 (diff) | |
| download | serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.gz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.bz2 serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.xz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.zip | |
Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata
Conflicts:
db/const.txt
npc/022-1_Tulimshar/_import.txt
npc/_import.txt
Diffstat (limited to 'npc/001-1')
| -rw-r--r-- | npc/001-1/guide.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/npc/001-1/guide.txt b/npc/001-1/guide.txt index d00a2a6f..be04e307 100644 --- a/npc/001-1/guide.txt +++ b/npc/001-1/guide.txt @@ -1,6 +1,6 @@ // -001-1.gat,32,27,0 script Ian 102,4,4,{ +001-1.gat,32,27,0 script Ian 102,{ // This line is only relevant for players, who started before the timestamp was introduced. // Set the graduation cap flag at the right position. // It is a bugfix @@ -40,7 +40,7 @@ L_Fight: L_Items: mes "[Ian the Guide]"; mes "\"There are three types of items."; - mes "They can be Consumables, Equipment, or Miscellaneous\""; + mes "They can be Consumables, Equipment or Miscellaneous\""; next; mes "[Ian the Guide]"; mes "\"Consumable items such as Potions, can be used only once."; @@ -176,10 +176,4 @@ L_TooMany: mes "\"I wanted to give you something, but you don't have room for it.\""; next; return; - -OnTouch: - if (TUT_var != 0) close; - callfunc "GameRules"; - mes "Ian, the trainer, can help you get to know the game."; - close; } |