diff options
| author | Reid <reidyaro@gmail.com> | 2016-11-05 02:11:42 +0000 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2016-11-05 02:11:42 +0000 |
| commit | b512d2b935caa91f824c9e832efb4f6fc4bc8a87 (patch) | |
| tree | 363834f727cddb460cd2c34e80fe2cbfe4fcb5e7 | |
| parent | 6adf32ca56941699b9736e5f9d57790aa800198f (diff) | |
| parent | c2d88645247d31a5b7736a65afabb6d951aa2cb5 (diff) | |
| download | serverdata-b512d2b935caa91f824c9e832efb4f6fc4bc8a87.tar.gz serverdata-b512d2b935caa91f824c9e832efb4f6fc4bc8a87.tar.bz2 serverdata-b512d2b935caa91f824c9e832efb4f6fc4bc8a87.tar.xz serverdata-b512d2b935caa91f824c9e832efb4f6fc4bc8a87.zip | |
Merge branch 'chest_sound' into 'master'
chest 000-1 and 000-2-1, typo name, add sound
* turn #chest and Chest to Chest#000-1 and Chest#000-2-1.
* add misceffect 24 and 25, for open and close sound.
See merge request !33
| -rw-r--r-- | npc/000-1/chest.txt | 4 | ||||
| -rw-r--r-- | npc/000-2-1/chest.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index c69dc2ac..9e623aa8 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -11,12 +11,13 @@ // 0 Treasure Chest has not been opened yet. // 1 Treasure Chest has been opened. -000-1,83,70,0 script #chest NPC_CHEST,{ +000-1,83,70,0 script Chest#000-1 NPC_CHEST,{ if (.dir != 4) { .dir = 2; initnpctimer; startnpctimer; + misceffect 24; close; } @@ -33,6 +34,7 @@ .dir = 6; initnpctimer; startnpctimer; + misceffect 25; close; OnTimer160: diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index f82ab9e9..ff5a3232 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -10,7 +10,7 @@ // 1 Talked to Arpan and needs to get clothes. // 2 Has the clothes. -000-2-1,51,37,0 script Chest NPC_CHEST_BIG,{ +000-2-1,51,37,0 script Chest#000-2-1 NPC_CHEST_BIG,{ .@q = getq(ShipQuests_Arpan); if (.@q == 0) goto L_Talk; @@ -19,6 +19,7 @@ .dir = 2; initnpctimer; startnpctimer; + misceffect 24; close; L_Give: @@ -31,7 +32,7 @@ L_Give: npctalk3 l("You take the clothes from the chest."); goto L_Quit; -OnTimer220: +OnTimer360: stopnpctimer; if (.dir == 2) .dir = 4; if (.dir == 6) .dir = 0; @@ -46,6 +47,7 @@ L_Quit: .dir = 6; initnpctimer; startnpctimer; + misceffect 25; close; OnInit: |