diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-01-23 16:52:05 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-23 16:52:05 +0000 |
| commit | 4e98d4621f225766abb32d30ab6cea8d2739a419 (patch) | |
| tree | 1ca67ca0a8465848870c91dfdf60baffc9767ba4 /npc/005-1_Snake_desert | |
| parent | 29bb178e6ac12d8edb32b89c336d46178421bd83 (diff) | |
| download | serverdata-4e98d4621f225766abb32d30ab6cea8d2739a419.tar.gz serverdata-4e98d4621f225766abb32d30ab6cea8d2739a419.tar.bz2 serverdata-4e98d4621f225766abb32d30ab6cea8d2739a419.tar.xz serverdata-4e98d4621f225766abb32d30ab6cea8d2739a419.zip | |
Start converting scripts over to "ItemName"
Instead of using the item number. A few small bug fixes are also here.
Diffstat (limited to 'npc/005-1_Snake_desert')
| -rw-r--r-- | npc/005-1_Snake_desert/spirit.txt | 6 | ||||
| -rw-r--r-- | npc/005-1_Snake_desert/tree.txt | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/npc/005-1_Snake_desert/spirit.txt b/npc/005-1_Snake_desert/spirit.txt index 5ef46cbc..ad835121 100644 --- a/npc/005-1_Snake_desert/spirit.txt +++ b/npc/005-1_Snake_desert/spirit.txt @@ -15,8 +15,6 @@ L_message: set @Q_STATUS_STUDENT2, 4; set @Q_STATUS_STUDENT3, 5; - set @BRANCH, 732; - set @s$, "girl"; if (Sex) set @s$, "boy"; @@ -143,7 +141,7 @@ L_Q_magic_1: "Where was the tree again?", L_Q_tree_where, "What is that tree?", L_Q_tree_what; - if (countitem(@BRANCH) < 1) + if (countitem("DruidTreeBranch") < 1) goto L_Q_tree_none; if (!(MAGIC_FLAGS & MFLAG_DID_CUTTREE)) goto L_Q_tree_dry; @@ -151,7 +149,7 @@ L_Q_magic_1: goto L_Q_tree_nomoney; set zeny, zeny - 100000; - delitem @BRANCH, 1; + delitem "DruidTreeBranch", 1; mes "[Earth Spirit]"; mes "Following the earth sprite's instructions, you throw branch and GP into the well."; diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1_Snake_desert/tree.txt index 5e576cea..093cbe1e 100644 --- a/npc/005-1_Snake_desert/tree.txt +++ b/npc/005-1_Snake_desert/tree.txt @@ -95,13 +95,12 @@ L_both: close; L_givewater: - set @WATER, 541; set @BOTTLE, 540; - if (countitem(@WATER) < 1) + if (countitem("BottleOfWater") < 1) goto L_no_water; - delitem @WATER, 1; - getitem @BOTTLE, 1; + delitem "BottleOfWater", 1; + getitem "EmptyBottle", 1; mes "[Dying Tree]"; mes "You pour a bottle of water into the sand. The water dissipates quickly, without any effect."; @@ -141,7 +140,7 @@ L_do_cut: L_really_cut: set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DID_CUTTREE; - getitem 732, 1; + getitem "DruidTreeBranch", 1; mes "[Dying Tree]"; mes "You cut off a branch from the tree."; mes "For an instant, you have an uneasy feeling, as if the branch were writhing in your hand..."; |