diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/052-2/chest.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/052-2/chest.txt')
| -rw-r--r-- | world/map/npc/052-2/chest.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index f1c9872e..59fe8ae4 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -12,7 +12,7 @@ // 3: player choosed to leave the room //----------------------------------------------------------------------------- -052-2.gat,136,73,0|script|Chest|111, +052-2.gat,136,73,0|script|Chest#illia|111, { set @step, 8; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -139,11 +139,11 @@ L_PrepareLeaving: L_Leave: set @illia_got_rewards, 3; set @illia_current_num_rewards, 0; - addtimer 1000, "Chest::OnMsg1"; - addtimer 4000, "Chest::OnMsg2"; - addtimer 7000, "Chest::OnMsg3"; - addtimer 9000, "Chest::OnFx"; - addtimer 10000, "Chest::OnRing"; + addtimer 1000, "Chest#illia::OnMsg1"; + addtimer 4000, "Chest#illia::OnMsg2"; + addtimer 7000, "Chest#illia::OnMsg3"; + addtimer 9000, "Chest#illia::OnFx"; + addtimer 10000, "Chest#illia::OnRing"; close; OnMsg1: |