summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/007-1/witch.txt2
-rw-r--r--world/map/npc/027-2/_mobs.txt2
-rw-r--r--world/map/npc/027-3/_import.txt1
-rw-r--r--world/map/npc/027-3/locked_doors.txt128
-rw-r--r--world/map/npc/042-2/tanisha.txt37
5 files changed, 18 insertions, 152 deletions
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index cd1ea5dd..cc009018 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -23,7 +23,7 @@
set @illia_iced_water, 4;
set $@illia_min_level, 90;
- if (getgmlevel() >= 40 && getequipid(equip_head) == 647 && (strcharinfo(0) == "AdminJen" || strcharinfo(0) == "V0id"))
+ if (getgmlevel() >= 40 && getequipid(equip_head) == 647)
goto L_DeveloperBoard;
if (BaseLevel < @illia_min_level) goto L_Unexperienced;
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index 345e7bc6..f2c20606 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -10,7 +10,7 @@
027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000,30000,Mob027-2::On1066
027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
027-2.gat,0,0,0|script|Mob027-2|-1,
diff --git a/world/map/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index d8f11879..00a7ad99 100644
--- a/world/map/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
@@ -5,6 +5,5 @@ npc: npc/027-3/_mobs.txt
npc: npc/027-3/_warps.txt
npc: npc/027-3/casket_traps.txt
npc: npc/027-3/general_krukan_door.txt
-npc: npc/027-3/locked_doors.txt
npc: npc/027-3/mapflags.txt
npc: npc/027-3/monsters.txt
diff --git a/world/map/npc/027-3/locked_doors.txt b/world/map/npc/027-3/locked_doors.txt
deleted file mode 100644
index b2ec8779..00000000
--- a/world/map/npc/027-3/locked_doors.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-// Locked Doors
-
-027-3.gat,22,29,0|script|#CLockDoor1|35,0,0
-{
- if (countitem("CryptKey") < 5)
- goto L_NoKeys;
- mes "Open the Locked Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- delitem "CryptKey", 5;
- warp "027-3.gat",22,26;
- goto L_Close;
-
-L_NoKeys:
- message strcharinfo(0), "This door is locked.";
- end;
-
-L_Close:
- close;
-}
-
-027-3.gat,22,27,0|script|#CInsideDoor1|35,0,0
-{
- mes "Open the Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- warp "027-3.gat",22,30;
- message strcharinfo(0), "This door slams shut and locks itself behind you.";
- goto L_Close;
-
-L_Close:
- close;
-}
-
-027-3.gat,37,29,0|script|#CLockDoor2|35,0,0
-{
- if (countitem("CryptKey") < 5)
- goto L_NoKeys;
- mes "Open the Locked Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- delitem "CryptKey", 5;
- warp "027-3.gat",37,26;
- goto L_Close;
-
-L_NoKeys:
- message strcharinfo(0), "This door is locked.";
- end;
-
-L_Close:
- close;
-}
-
-027-3.gat,37,27,0|script|#CInsideDoor2|35,0,0
-{
- mes "Open the Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- warp "027-3.gat",37,30;
- message strcharinfo(0), "This door slams shut and locks itself behind you.";
- goto L_Close;
-
-L_Close:
- close;
-}
-
-027-3.gat,128,29,0|script|#CLockDoor3|35,0,0
-{
- if (countitem("CryptKey") < 5)
- goto L_NoKeys;
- mes "Open the Locked Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- delitem "CryptKey", 5;
- warp "027-3.gat",128,26;
- goto L_Close;
-
-L_NoKeys:
- message strcharinfo(0), "This door is locked.";
- end;
-
-L_Close:
- close;
-}
-
-027-3.gat,128,27,0|script|#CInsideDoor3|35,0,0
-{
- mes "Open the Door?";
- menu
- "Yes.", L_Open,
- "No.", L_Close;
-
-L_Open:
- warp "027-3.gat",128,30;
- message strcharinfo(0), "This door slams shut and locks itself behind you.";
- goto L_Close;
-
-L_Close:
- close;
-}
-
-027-3.gat,22,22,0|script|Crypt#1|35,0,0
-{
- // Coords X: 117,104,110,118;
- // Coords Y: 53, 87, 53,87;
- end;
-}
-027-3.gat,35,22,0|script|Crypt#2|35,0,0
-{
- // Coords X: 105,118,118,122;
- // Coords Y: 58, 77, 72, 58
- end;
-}
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index fb67989d..77a02948 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -10,8 +10,7 @@
callfunc "TutorialState";
if ((@tutorial == 11) && !(@tanisha_hasan)) goto L_Hasan;
- if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
- if (@tutorial >= 8) goto L_Again;
+ if ((@tutorial >= 8) || (FLAGS & FLAG_TUTORIAL_DONE)) goto L_Tut_Done;
if (@tutorial == 7) goto L_Stats;
if (@tutorial == 6) goto L_Fail;
if (@tutorial == 5) goto L_Maggots;
@@ -138,9 +137,6 @@ L_StatsRe:
next;
mes "[Tanisha]";
mes "\"But I doubt he'd do that without a service in return.\"";
-
- if (@tutorial != 7)
- goto L_Close;
goto L_Money;
L_Money:
@@ -148,6 +144,9 @@ L_Money:
mes "[Tanisha]";
mes "\"Hey, you are so smart taking out all that yucky maggots for me.";
mes "You can have my pocket money. Here.\"";
+ set @tutorial_tmp, 8;
+ callfunc "SetTutorialMask";
+ callfunc "TutorialCompleted";
set Zeny, Zeny + 5;
next;
goto L_Advice;
@@ -156,23 +155,8 @@ L_Advice:
mes "\"When you go to Tulimshar, you should see Bernard. He can make a delicious soup!";
mes "Good luck!\"";
emotion EMOTE_HAPPY;
- if (@tutorial == 7)
- goto L_SetTutorial;
- goto L_Close;
-
-L_SetTutorial:
- set @tutorial_tmp, 8;
- callfunc "SetTutorialMask";
- callfunc "TutorialCompleted";
goto L_Close;
-L_Again:
- mes "[Tanisha]";
- mes "\"Hi there! Is everything alright? Do you have questions?\"";
- menu
- "Yes, could you explain again about...",L_Explain,
- "No, thanks.",L_Close;
-
L_Explain:
menu
"... how to fight?",L_Fight,
@@ -341,8 +325,20 @@ OnInit:
OnTouch:
callfunc "TutorialState";
+ if ((@tutorial >= 8) && !(FLAGS & FLAG_TUTORIAL_DONE))
+ goto L_Complete;
+ goto L_Check;
+
+L_Complete:
+ callfunc "TutorialCompleted";
+ goto L_Warp;
+
+L_Check:
if (!(FLAGS & FLAG_TUTORIAL_DONE))
goto L_Block;
+ goto L_Warp;
+
+L_Warp:
warp "042-1.gat", 63, 48;
end;
@@ -350,4 +346,3 @@ L_Block:
message strcharinfo(0), "Tanisha: Please come here. I'd like some help!";
end;
}
-
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-14 08:31:11 +0000