diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-04-11 02:27:01 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-11 02:27:01 +0000 |
| commit | 7f2f35256e17cf341a4198b959631929a8998953 (patch) | |
| tree | d7eff5add0d3781ab41cc61ffbec8e4cc08a6fbd | |
| parent | 5f5ef84359a2fc509fb2c27f3a813f6dba111683 (diff) | |
| parent | c5393082d051428affec7d3a3c4fb8f0731f96e2 (diff) | |
| download | serverdata-7f2f35256e17cf341a4198b959631929a8998953.tar.gz serverdata-7f2f35256e17cf341a4198b959631929a8998953.tar.bz2 serverdata-7f2f35256e17cf341a4198b959631929a8998953.tar.xz serverdata-7f2f35256e17cf341a4198b959631929a8998953.zip | |
Merge branch 'jesusalva/menhir' into 'master'
Soul Menhir changes (pt. 1)
See merge request legacy/serverdata!638
| -rw-r--r-- | world/map/npc/026-1/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/026-1/soul-menhir.txt | 17 | ||||
| -rw-r--r-- | world/map/npc/functions/global_event_handler.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/items/warpTowels.txt | 2 |
4 files changed, 2 insertions, 19 deletions
diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt index 46291c40..a0e29b08 100644 --- a/world/map/npc/026-1/_import.txt +++ b/world/map/npc/026-1/_import.txt @@ -9,5 +9,4 @@ npc: npc/026-1/headless_man.txt npc: npc/026-1/husband.txt npc: npc/026-1/mapflags.txt npc: npc/026-1/sign.txt -npc: npc/026-1/soul-menhir.txt npc: npc/026-1/traveler.txt diff --git a/world/map/npc/026-1/soul-menhir.txt b/world/map/npc/026-1/soul-menhir.txt deleted file mode 100644 index 9b1b87b4..00000000 --- a/world/map/npc/026-1/soul-menhir.txt +++ /dev/null @@ -1,17 +0,0 @@ -// - -026-1,29,34,0|script|Soul Menhir#deadmire|351 -{ - set @map$, "026-1"; - setarray @Xs, 28, 29, 30, 28, 30, 28, 30; - setarray @Ys, 32, 33, 34, 32, 34, 32, 34; - set @x, 0; - set @y, 0; - callfunc "SoulMenhir"; - set @map$, ""; - cleararray @Xs[0], 0, 7; - cleararray @Ys[0], 0, 7; - set @x, 0; - set @y, 0; - close; -} diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index f7156539..8c4425d8 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -38,6 +38,7 @@ OnPCDieEvent: callfunc "SpawnGhost"; callfunc "MiriamExpire"; // force the speed skill quest to expire set @killerrid, 0; // reset killer rid + set TowelLastUsed, gettimetick(2); // reset towel cooldown timer end; OnPCLogoutEvent: diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index b6faaec3..77a405b5 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,7 +1,7 @@ // See #TravelConfig function|script|WarpTowel { - set @seconds, TowelLastUsed - (gettimetick(2) - 1200); + set @seconds, TowelLastUsed - (gettimetick(2) - 300); if (@seconds > 0 && GM < 1) goto L_DontPanic; if (isin("botcheck",25,27,51,47)) |