summaryrefslogtreecommitdiff
path: root/npc/instances
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-03 02:24:34 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-03 02:24:34 +0000
commit8858572dd6887a2c41f9b4d64df3e1491dd3c452 (patch)
treec08ee6d76638d143b4737c813e25d96bdd119e48 /npc/instances
parentb4bcbd1a2dca417a61f70eb9d1524fa92b2e0aa9 (diff)
downloadhercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.gz
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.bz2
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.xz
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.zip
Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555) Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586) Corrected a typo in the christmas_2008 event. (bugreport:4600) Changed which White Lady spawns in endless tower. (bugreport:4601) Also added Quest Log Entries to Endless Tower, please test. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/instances')
-rw-r--r--npc/instances/EndlessTower.txt24
1 files changed, 18 insertions, 6 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 60894861d..796241785 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,6 +17,9 @@
//= 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.
+//= 1.4 Added quest log entries based on iRO. [L0ne_W0lf]
+//= You may need to update your questid2display.
+//= Changed White lady spawn to MVP White Lady. (bugreport:4601)
//============================================================
alberta,214,77,6 script Captain Janssen 709,{
@@ -201,6 +204,9 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
set .@partymembercount,$@partymembercount;
copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount;
+ set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week
+ set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours
+
set .@dun_lim_time,etower_timer+604800; // 1 week
set .@dun_lim_time2,etower_timer+14400; // 4 hours
set .@dun_cur_time,gettimetick(2);
@@ -210,7 +216,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
set .@dun_s,.@dun_ent_t - ((.@dun_h * 3600) + (.@dun_m * 60));
if ((.@party_id > 0) && (.@partymembercount > 1)) {
- if (etower_timer < 1) {
+ if (.@etower_timer == -1) {
if (.@ins_mas == getcharid(0)) {
mes "Confirmed the party has been made. Would you like to reserve for entrance to the Endless Tower?";
next;
@@ -273,6 +279,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
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);
+ setquest 60200;
+ setquest 60201;
warp "1@tower",52,354;
end;
}
@@ -299,6 +307,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
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);
+ setquest 60200;
+ setquest 60201;
warp "1@tower",52,354;
end;
}
@@ -314,7 +324,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
close;
}
}
- else if ((etower_timer > 0) && (.@dun_cur_time < .@dun_lim_time2)) {
+ else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) {
mes "If you have the dungeon generated already, you can enter it. ";
next;
switch(select(.@md_name$ + "Enter the dungeon:Return to Alberta:Cancel")) {
@@ -341,8 +351,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
}
close;
}
- else if ((.@dun_cur_time > .@dun_lim_time2) && (.@dun_cur_time < .@dun_lim_time)) {
- mes "Due to the entree aftereffect, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
+ else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) {
+ mes "Due to the entry after-effect, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
next;
mes "It is dangerous here. Let me move you to Alberta.";
close2;
@@ -351,6 +361,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
}
else {
set etower_timer,0;
+ erasequest 60200;
+ erasequest 60201;
mes "^0000ffThe records and after effects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
close;
}
@@ -1380,7 +1392,7 @@ OnInstanceInit:
OnEnable:
enablenpc instance_npcname("29FGate102tower", instance_id());
- areamonster "2@tower",352,351,362,387,"White Lady",1518,1,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead";
+ areamonster "2@tower",352,351,362,387,"White Lady",1630,1,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead";
areamonster "2@tower",352,351,362,387,"Evil Nymph",1416,30,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead";
end;