diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-02 09:39:37 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-02 09:39:37 +0200 |
| commit | 609a14e0a4b1dee14bd1ff6c6da0bd8fa87c0824 (patch) | |
| tree | 58d4ae83813096c286c781a45730593f9794b053 | |
| parent | c12d6f5816291f011547dfee540e4441b0e3cbc9 (diff) | |
| parent | 44552917efd5117214fa2a77cc6dc5f13ae55281 (diff) | |
| download | serverdata-609a14e0a4b1dee14bd1ff6c6da0bd8fa87c0824.tar.gz serverdata-609a14e0a4b1dee14bd1ff6c6da0bd8fa87c0824.tar.bz2 serverdata-609a14e0a4b1dee14bd1ff6c6da0bd8fa87c0824.tar.xz serverdata-609a14e0a4b1dee14bd1ff6c6da0bd8fa87c0824.zip | |
Merge remote-tracking branch 'mainline/master'
| -rw-r--r-- | news.php | 2 | ||||
| -rw-r--r-- | npc/027-2_Caretakers_House/lover.txt | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -14,7 +14,7 @@ if (substr($agent, 0, 3) == "TMW" || substr($agent, 0, 4) == "Mana") } $min_version = '0.0.29.1'; -$cur_version = '0.0.29.1'; +$cur_version = '0.5.2'; if (substr($agent, 0, 3) == "TMW" and $agent < 'TMW/' . $min_version) { diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt index e194dce5..7233cb57 100644 --- a/npc/027-2_Caretakers_House/lover.txt +++ b/npc/027-2_Caretakers_House/lover.txt @@ -71,7 +71,7 @@ L_Crystals: if (countitem("DarkCrystal") < @CRYSTAL_AMOUNT) goto L_Not_Enough_Crystals; - delitem "DarkCrystal", countitem("DarkCrystal"); + delitem "DarkCrystal", @CRYSTAL_AMOUNT; getexp @CRYSTAL_EXP, 0; next; mes "\"Oh, I can feel them! Please lay them down on the floor.\""; |