diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-16 09:55:19 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-16 09:55:19 -0600 |
| commit | 1806e5eeb7501e79976cbbe430075d3b0dc1c7ec (patch) | |
| tree | 660f853621b36395dd1d6c40126cb5a4934f4bb7 /npc | |
| parent | db9196a8c809431de190e674d6661d2f69aabaf7 (diff) | |
| parent | b1a467259dc2a01eac243a73574ff5abcbc69390 (diff) | |
| download | serverdata-1806e5eeb7501e79976cbbe430075d3b0dc1c7ec.tar.gz serverdata-1806e5eeb7501e79976cbbe430075d3b0dc1c7ec.tar.bz2 serverdata-1806e5eeb7501e79976cbbe430075d3b0dc1c7ec.tar.xz serverdata-1806e5eeb7501e79976cbbe430075d3b0dc1c7ec.zip | |
Merge commit 'mainline/master'
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/021-1_Tulimshar/eurni.txt | 2 | ||||
| -rw-r--r-- | npc/024-2_Tulimshar_Magic_School/_import.txt | 1 | ||||
| -rw-r--r-- | npc/024-2_Tulimshar_Magic_School/barrier.txt | 1 | ||||
| -rw-r--r-- | npc/024-2_Tulimshar_Magic_School/tyer.txt | 19 | ||||
| -rw-r--r-- | npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt | 23 |
5 files changed, 25 insertions, 21 deletions
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1_Tulimshar/eurni.txt index 1edfc94e..1a140e81 100644 --- a/npc/021-1_Tulimshar/eurni.txt +++ b/npc/021-1_Tulimshar/eurni.txt @@ -2,7 +2,7 @@ 021-1.gat,141,113,0 script Eurni 136,{ if (BaseLevel < 10) goto L_TooYoung; - if (zeny < 10000) goto L_No_Money; + if (zeny < 10000) goto L_NoMoney; mes "[Eurni the Surgeon]"; mes "\"Are you tired of being what you are?\""; diff --git a/npc/024-2_Tulimshar_Magic_School/_import.txt b/npc/024-2_Tulimshar_Magic_School/_import.txt index be56cb29..125b42f3 100644 --- a/npc/024-2_Tulimshar_Magic_School/_import.txt +++ b/npc/024-2_Tulimshar_Magic_School/_import.txt @@ -3,3 +3,4 @@ npc: npc/024-2_Tulimshar_Magic_School/_mobs.txt npc: npc/024-2_Tulimshar_Magic_School/_warps.txt npc: npc/024-2_Tulimshar_Magic_School/barrier.txt npc: npc/024-2_Tulimshar_Magic_School/tyer.txt +npc: npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt diff --git a/npc/024-2_Tulimshar_Magic_School/barrier.txt b/npc/024-2_Tulimshar_Magic_School/barrier.txt index 6450d5ad..ffe5a3f3 100644 --- a/npc/024-2_Tulimshar_Magic_School/barrier.txt +++ b/npc/024-2_Tulimshar_Magic_School/barrier.txt @@ -5,7 +5,6 @@ close; L_PushBack: - doevent "Tyer::OnBarrier"; warp "024-2.gat", 34, 24; close; } diff --git a/npc/024-2_Tulimshar_Magic_School/tyer.txt b/npc/024-2_Tulimshar_Magic_School/tyer.txt index f46190f2..f6b78331 100644 --- a/npc/024-2_Tulimshar_Magic_School/tyer.txt +++ b/npc/024-2_Tulimshar_Magic_School/tyer.txt @@ -4,23 +4,4 @@ mes "[Tyer]"; mes "\"Hello.\""; close; - -OnBarrier: - mes "[Tyer]"; - mes "\"You're still too young to go in there.\""; - next; - - menu - "What do you mean I'm too young to go in there?", L_Explain, - "Ah, right.", -; - close; - -L_Explain: - mes "[Tyer]"; - mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\""; - next; - - mes "[Tyer]"; - mes "\"That barrier was made to keep those that are too young out.\""; - close; } diff --git a/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt b/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt new file mode 100644 index 00000000..2ae884da --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt @@ -0,0 +1,23 @@ +// A man in the magic school + +024-2.gat,33,24,0 script #Tyer_Trigger 127,1,1,{ + if (BaseLevel >= 40) end; + + mes "[Tyer]"; + mes "\"You're still too young to go in there.\""; + next; + + menu + "What do you mean I'm too young to go in there?", L_Explain, + "Ah, right.", -; + close; + +L_Explain: + mes "[Tyer]"; + mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\""; + next; + + mes "[Tyer]"; + mes "\"That barrier was made to keep those that are too young out.\""; + close; +} |