diff options
| -rw-r--r-- | npc/001-1_Tulimshar/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/guide.txt | 8 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/rules.txt | 9 | ||||
| -rw-r--r-- | npc/005-1_Snake_desert/spirit.txt | 5 | ||||
| -rw-r--r-- | npc/005-1_Snake_desert/tree.txt | 2 |
5 files changed, 13 insertions, 12 deletions
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt index 33d106c4..b33bbee9 100644 --- a/npc/001-1_Tulimshar/_import.txt +++ b/npc/001-1_Tulimshar/_import.txt @@ -16,7 +16,6 @@ npc: npc/001-1_Tulimshar/merchant.txt npc: npc/001-1_Tulimshar/monster_guide.txt npc: npc/001-1_Tulimshar/nodrop.txt npc: npc/001-1_Tulimshar/rewards_master.txt -npc: npc/001-1_Tulimshar/rules.txt npc: npc/001-1_Tulimshar/sandra.txt npc: npc/001-1_Tulimshar/soul-menhir.txt npc: npc/001-1_Tulimshar/trader.txt diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index 16be310b..b7f999c7 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -1,6 +1,6 @@ // -001-1.gat,33,27,0 script Ian 102,{ +001-1.gat,32,27,0 script Ian 102,4,4,{ if (TUT_var & 1 == 1 && TUT_var & 2 == 0 && BaseLevel >= 10) callsub S_Grad; mes "[Ian the Guide]"; mes "\"Would you like to know about something?\""; @@ -164,4 +164,10 @@ L_TooMany: mes "\"I wanted to give you something, but you don't have room for it.\""; next; return; + +OnTouch: + if (TUT_var & 1 == 1) close; + callfunc "GameRules"; + mes "Ian, the trainer, can help you get to know the game."; + close; } diff --git a/npc/001-1_Tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt deleted file mode 100644 index 1b58c12f..00000000 --- a/npc/001-1_Tulimshar/rules.txt +++ /dev/null @@ -1,9 +0,0 @@ -// - -//001-1.gat,29,28,0 script #Rules 0,1,1,{ -001-1.gat,29,28,0 script #Rules 127,1,1,{ - if (TUT_var & 1 == 1) close; - callfunc "GameRules"; - mes "Ian, the trainer, can help you get to know the game."; - close; -} diff --git a/npc/005-1_Snake_desert/spirit.txt b/npc/005-1_Snake_desert/spirit.txt index 1af21869..d6723c8e 100644 --- a/npc/005-1_Snake_desert/spirit.txt +++ b/npc/005-1_Snake_desert/spirit.txt @@ -1,7 +1,10 @@ function script EarthImpTouch { if (getskilllv(SKILL_MAGIC)) goto L_message; - close; + + mes "[Well]"; + mes "You hear noises from within the well."; + close; L_message: set @Q_MASK, NIBBLE_0_MASK; diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1_Snake_desert/tree.txt index 4eea7845..54b7ed1c 100644 --- a/npc/005-1_Snake_desert/tree.txt +++ b/npc/005-1_Snake_desert/tree.txt @@ -61,6 +61,8 @@ function script QuestTreeTouch { if ((MAGIC_FLAGS & (MFLAG_KNOWS_DRUIDTREE | MFLAG_KNOWS_CUTTREE)) > 0) //i.e., both are set goto L_both; + mes "[Dying Tree]"; + mes "You see a strange tree."; close; L_cut: |