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/001-1_Tulimshar/sandra.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/001-1_Tulimshar/sandra.txt')
| -rw-r--r-- | npc/001-1_Tulimshar/sandra.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt index 28a44d23..bbaca563 100644 --- a/npc/001-1_Tulimshar/sandra.txt +++ b/npc/001-1_Tulimshar/sandra.txt @@ -70,17 +70,17 @@ L_Set: close; L_Progress: - if (countitem(507) < 5) goto L_NotEnough; - if (countitem(517) < 1) goto L_NotEnough; + if (countitem("ScorpionStinger") < 5) goto L_NotEnough; + if (countitem("RedScorpionStinger") < 1) goto L_NotEnough; mes "[Sandra]"; mes "\"Excellent!"; mes "You brought me 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger]!\""; getinventorylist; - if ((@inventorylist_count - (countitem(507) == 5) - (countitem(517) == 1)) > 99 - (countitem(1199) == 0)) goto L_TooMany; - delitem 507, 5; - delitem 517, 1; - getitem 1200, 1; - getitem 1199, 100; + if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("RedScorpionStinger") == 1)) > 99 - (countitem("Arrow") == 0)) goto L_TooMany; + delitem "ScorpionStinger", 5; + delitem "RedScorpionStinger", 1; + getitem "Bow", 1; + getitem "Arrow", 100; set Scorp, 2; close; |