diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
| commit | 8b70df06b9454fe76765dd3044b378d4b3002002 (patch) | |
| tree | 8518b9c58642ae85d17bc62ae87d0501858b7bdd /npc/010-2_Dimonds_Cove/doug.txt | |
| parent | 96c8a2957d499b4dd7c867455bdff51920eb31ea (diff) | |
| parent | f17c823d6f91ae535ebcadd8b5b369efea09b772 (diff) | |
| download | serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2 serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip | |
Merge branch 'master' of the testing branch
Conflicts:
conf/magic.conf
db/item_db.txt
npc/013-3_Cave/barrier.txt
Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'npc/010-2_Dimonds_Cove/doug.txt')
| -rw-r--r-- | npc/010-2_Dimonds_Cove/doug.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt index 505c7a54..adac3f97 100644 --- a/npc/010-2_Dimonds_Cove/doug.txt +++ b/npc/010-2_Dimonds_Cove/doug.txt @@ -3,7 +3,7 @@ 010-2.gat,68,87,0 script Doug 113,{ if(CaveSnakeLamp == 1) goto L_State2; if(CaveSnakeLamp == 2) goto L_Done; - set @TEMP,rand(4); + set @TEMP, rand(4); if(@TEMP == 0) goto L_0; if(@TEMP == 1) goto L_1; if(@TEMP == 2) goto L_2; @@ -40,7 +40,7 @@ L_Question: L_Sure: set CaveSnakeLamp, 1; - set @TEMP,rand(4); + set @TEMP, rand(4); if(@TEMP == 0) goto J_0; if(@TEMP == 1) goto J_1; if(@TEMP == 2) goto J_2; @@ -76,13 +76,13 @@ L_Go: close; L_State2: - if(countitem(612) >= 40) goto L_Have; + if(countitem("CaveSnakeLamp") >= 40) goto L_Have; mes "[Doug]"; mes "\"Please help me collect 40 [Cave Snake Lamp]s!\""; close; L_Have: - delitem 612, 40; + delitem "CaveSnakeLamp", 40; mes "[Doug]"; mes "\"Cool! Now I can make this light!\""; next; |