diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-09-13 14:31:36 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-09-13 14:31:36 +0000 |
| commit | 6704c7be41b4054ea4f7ae91bc6b5dec2fb952d8 (patch) | |
| tree | c9538739cbbb528d1be308221286473883569682 /npc | |
| parent | 707ba8ba46715bb276310081b057b729b400262e (diff) | |
| download | hercules-6704c7be41b4054ea4f7ae91bc6b5dec2fb952d8.tar.gz hercules-6704c7be41b4054ea4f7ae91bc6b5dec2fb952d8.tar.bz2 hercules-6704c7be41b4054ea4f7ae91bc6b5dec2fb952d8.tar.xz hercules-6704c7be41b4054ea4f7ae91bc6b5dec2fb952d8.zip | |
* Some more Endless tower bugfixes.
- Fixed some copy/paste errors (1@orc -> 1@tower)
- No longer resets entrance time when re-entering.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14407 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 4 | ||||
| -rw-r--r-- | npc/instances/EndlessTower.txt | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 482b9aa2e..e7094059d 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,9 @@ Date Added ====== +2010/09/13 + * Rev. 14407 Some more Endless tower bugfixes. [L0ne_W0lf] + - Fixed some copy/paste errors (1@orc -> 1@tower) + - No longer resets entrance time when re-entering. 2010/09/06 * Rev. 14400 Touched up the endless tower script slightly. [L0ne_W0lf] - Added ends to several NPCs which would allow you to restart timers. diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index e10c2fefe..60894861d 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,6 +15,8 @@ //= 1.1 Removed a disablenpc from #102FShadowDust1. (bugreport:4415) //= 1.2 Added ends to several NPCs which would allow you to restart timers. //= Added some missing stopnpctimers to npcs. (bugreport:4418) +//= 1.3 Fixed a couple copy/paste errors :D I fail. [L0ne_W0lf] +// Timer no longer resets when re-entering. //============================================================ alberta,214,77,6 script Captain Janssen 709,{ @@ -292,7 +294,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ mes "The memorial dungeon " + .@md_name$ + " does not exist."; mes "The party leader did not generate the dungeon yet."; } - else if ((has_instance("1@orcs") != "") && (.@partymembercount < 2)) + else if ((has_instance("1@tower") != "") && (.@partymembercount < 2)) mes "You can enter the dungeon after making a party."; else { mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12; @@ -321,11 +323,10 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ mes "The memorial dungeon " + .@md_name$ + " does not exist."; mes "The party leader did not generate the dungeon yet."; } - else if ((has_instance("1@orcs") != "") && (.@partymembercount < 2)) + else if ((has_instance("1@tower") != "") && (.@partymembercount < 2)) mes "You can enter the dungeon after making a party."; else { mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12; - set etower_timer,gettimetick(2); warp "1@tower",52,354; end; } |