summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-06-12 19:32:50 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-06-12 19:32:50 +0200
commitdd5a1ed7e2e1e93bb74908ba4068350966e541b0 (patch)
treeef7e1c75fcbca20e5c87a4ce2e206c5c4cf8cdbf
parent1b800e81c08d79eb42dcd8f5721e8d1e4fad3bdb (diff)
downloadserverdata-dd5a1ed7e2e1e93bb74908ba4068350966e541b0.tar.gz
serverdata-dd5a1ed7e2e1e93bb74908ba4068350966e541b0.tar.bz2
serverdata-dd5a1ed7e2e1e93bb74908ba4068350966e541b0.tar.xz
serverdata-dd5a1ed7e2e1e93bb74908ba4068350966e541b0.zip
invisible npc that can't be clicked on the carpet
-rw-r--r--conf/char_athena.conf2
-rw-r--r--npc/042-1/hasan.txt4
-rw-r--r--npc/042-2/sorfina.txt42
-rw-r--r--npc/042-2/tanisha.txt2
4 files changed, 31 insertions, 19 deletions
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index eb4b62b4..dd387fd2 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -50,7 +50,7 @@ start_point: 042-2.gat,26,26
start_weapon: 0
// Starting armor for new characters
-start_armor: 1202
+start_armor: 0
// Starting zeny for new characters
start_zeny: 50
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
index a0ef2324..5d70fc23 100644
--- a/npc/042-1/hasan.txt
+++ b/npc/042-1/hasan.txt
@@ -163,7 +163,9 @@ onScorpionDeath:
end;
}
-042-1.gat,117,76,0 script #barrier 127,0,2{
+042-1.gat,117,76,0 script #barrier 45,0,2{
+ end;
+OnTouch:
if (FLAGS & FLAG_TUTORIAL_DONE)
goto L_Tut;
warp "042-1.gat", 115, 76;
diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt
index ea332a91..33c67e06 100644
--- a/npc/042-2/sorfina.txt
+++ b/npc/042-2/sorfina.txt
@@ -42,22 +42,10 @@ L_Tut:
mes "You're not used to the hot weather, right?\"";
next;
L_Carpet:
- if ((getx(0) > 31) && (getx(0) < 35) && (gety(0) > 25) && (gety(0) < 29)) goto L_Shirt;
mes "\"Try to do some steps and walk to that red carpet over there.";
mes "Just use the arrow keys or click at the place you want to go to.\"";
- next;
- mes "\"Talk to me again when you're on the red carpet. You can either click on me, or press N to focus on me and T to talk.\"";
- set sorfina, 1;
- close;
-
-L_Shirt:
- mes "\"Very good! I'm glad you're recovering.";
- mes "Now you should get dressed again. I gave you an old shirt from my son.\"";
- next;
- mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\"";
- next;
- mes "\"After we finished talking click on the shirt and press the equip button.\"";
- set sorfina, 2;
+ if (!sorfina)
+ set sorfina, 1;
close;
L_Naked:
@@ -214,7 +202,8 @@ L_SkipTut:
set tanisha, 0;
set maggot, 0;
set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
- getitem "knife", 1;
+ getitem "Knife", 1;
+ getitem "CottonShirt", 1;
mes "Good luck.\"";
close;
@@ -228,7 +217,28 @@ OnTouch:
close;
}
-042-2.gat,44,31,0 script #DoorOut 127,0,0{
+042-2.gat,33,27,0 script #Carpet 45,1,1{
+ end;
+OnTouch:
+ if (sorfina != 1)
+ end;
+ mes "[Sorfina]";
+ mes "\"Very good! I'm glad you're recovering.";
+ mes "Now you should get dressed again. Here is an old shirt from my son.\"";
+ getitem "CottonShirt", 1;
+ next;
+ mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\"";
+ next;
+ mes "\"After we finished talking click on the shirt and press the equip button.\"";
+ next;
+ mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\"";
+ set sorfina, 2;
+ close;
+}
+
+042-2.gat,44,31,0 script #DoorOut 45,0,0{
+ end;
+OnTouch:
if ((sorfina < 3) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block;
warp "042-1.gat", 37, 57;
end;
diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index fdc76ef0..b7855e2f 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -40,7 +40,7 @@ L_Maggots:
goto L_Crowded;
set $@TUT_MAGGOT, $@TUT_MAGGOT + 1;
set maggot, 0;
- getitem "knife", 1;
+ getitem "Knife", 1;
next;
L_Fight_Again:
mes "\"Ok, listen what to do.";