summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-06 12:37:45 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-06 22:33:07 -0700
commit62662676eb8ba15812b6f526bfe8d3a818634dcb (patch)
treee9dc08e839dda31db71f80bdc307a1ff68ddb1e5 /world/map
parent5a2fc507f0629399141c015d0437a1c6ae291492 (diff)
downloadserverdata-62662676eb8ba15812b6f526bfe8d3a818634dcb.tar.gz
serverdata-62662676eb8ba15812b6f526bfe8d3a818634dcb.tar.bz2
serverdata-62662676eb8ba15812b6f526bfe8d3a818634dcb.tar.xz
serverdata-62662676eb8ba15812b6f526bfe8d3a818634dcb.zip
Improve logic a bit
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/008-1/andra.txt2
-rw-r--r--world/map/npc/042-1/hasan.txt37
2 files changed, 19 insertions, 20 deletions
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 50ec653b..0ad3ab2a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -153,6 +153,4 @@ L_TooYoung:
OnInit:
set $@PLANTS_PER_SEED, 3;
set $@MAX_GLOBAL_PLANTS, 100; // You can plant only if the amount of plants currently in the map is < than this value.
- initnpctimer;
- stopnpctimer;
}
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 9f154b58..3e7184e4 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -11,7 +11,8 @@
goto L_Tut_Done;
if ( (@y < 64)&&(@x < 110) || (@x < 107) )
goto L_Cliff_Up;
- if (($@scorp) && (strcharinfo(0) == $@ScorpionFighter$))
+ // implicitly, $@ScorpionFighter is nonzero
+ if (getcharid(3) == $@ScorpionFighter)
goto L_Fear;
if (hasan == 4)
goto L_Thank;
@@ -86,16 +87,16 @@ L_Trick:
menu
"I don't have that much money!",L_NoPay,
"No. (Scratch your head.)",-;
- if ($@scorp == 1)
+ if ($@ScorpionFighter)
goto L_Wait;
mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
- close2;
- monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
set $@ScorpionTimer, 0;
- set $@ScorpionFighter$, strcharinfo(0);
- set $@scorp, 1;
+ set $@ScorpionFighter, getcharid(3);
set $@ScorpDeath, PC_DIE_COUNTER;
- startnpctimer;
+ // close2 blocks
+ close2;
+ monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+ initnpctimer;
end;
L_Thank:
@@ -171,12 +172,10 @@ L_SummonAgain:
L_Clean:
killmonster "042-1.gat", "Hasan::onScorpionDeath";
- set $@ScorpionFighter$, "";
+ set $@ScorpionFighter, 0;
set $@ScorpionTimer, 0;
- set $@scorp, 0;
set $@ScorpDeath, 0;
stopnpctimer;
- setnpctimer 0;
end;
L_TimeOut:
@@ -194,7 +193,7 @@ L_Wait:
close;
OnTimer5000:
- if (attachrid(getcharid(3,$@ScorpionFighter$)) == 0)
+ if (attachrid($@ScorpionFighter) == 0)
goto L_Clean;
set $@ScorpionTimer, $@ScorpionTimer + 5;
if ($@ScorpionTimer >= 300)
@@ -205,9 +204,8 @@ OnTimer5000:
end;
onScorpionDeath:
- if (strcharinfo(0) != $@ScorpionFighter$)
+ if (getcharid(3) != $@ScorpionFighter)
goto L_SummonAgain;
- set $@scorp, 0;
if (hasan != 3)
end;
set hasan, 4;
@@ -217,11 +215,11 @@ onScorpionDeath:
}
042-1.gat,111,68,0|script|#Toll|45,2,2,{
-
end;
OnTouch:
- if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+ // implicitly, $@ScorpionFighter is nonzero
+ if ($@ScorpionFighter == getcharid(3))
end;
if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
end;
@@ -233,15 +231,18 @@ OnTouch:
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;
- if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+ // implicitly, $@ScorpionFighter is nonzero
+ if ($@ScorpionFighter == getcharid(3))
message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\"";
- if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
+ if ($@ScorpionFighter && $@ScorpionFighter != getcharid(3))
+ // is this reachable?
message strcharinfo(0), "Hasan: \"Hey! Stop right there!\"";
- if (!$@scorp && hasan == 4)
+ if (hasan == 4)
message strcharinfo(0), "Hasan: \"Please wait a moment!\"";
end;
L_Tut: