summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorSinSloth <SinSloth@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-23 08:58:06 +0000
committerSinSloth <SinSloth@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-23 08:58:06 +0000
commita112d894597529efc23915b9bc3e6252430038c7 (patch)
tree33c86c3485c0720dec00356fe9090446d6909f22 /npc
parente673f5e2aaf6db243a139c4c45fb4f336943cb39 (diff)
downloadhercules-a112d894597529efc23915b9bc3e6252430038c7.tar.gz
hercules-a112d894597529efc23915b9bc3e6252430038c7.tar.bz2
hercules-a112d894597529efc23915b9bc3e6252430038c7.tar.xz
hercules-a112d894597529efc23915b9bc3e6252430038c7.zip
* Added a check in Thanatos Boss room to reset event if there's no player inside.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10610 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/quests/thana_quest.txt34
2 files changed, 33 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 36c4aab54..f176e547f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/05/23
+ * Added a check in Thanatos Boss room to reset event if there's no player inside. [SinSloth]
2007/05/22
* Tweaked some recent npcs [ultramage]
- I find using close; to exit a switched callsub/callfunc a major wtf,
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index bb645bde5..68e7532b7 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= [Ishizu-chan]
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version i guess?
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= 1.0 - First Release [Ishizu-chan]
//= 1.1 - Updated Thanatos Tower Quest to official. [SinSloth]
//= 1.2 - Fixed a bug where Reward NPC didn't give you Zeny and Exp. [SinSloth]
+//= 1.3 - Added a checking in boss map to reset event if there's no player. [SinSloth]
//============================================================
hu_fild01,140,163,5 script Tower Keeper 852,3,3,{
@@ -1869,8 +1870,8 @@ tha_t12,96,58,0 script Stone Statue 111,{
else if((countitem(7426)) || (countitem(7427)) || (countitem(7428)) || (countitem(7429)) || (countitem(7430)))
{
next;
- mes "^3355FFAs you approach this statue, one^FFFFFF ^3355FF of your Charm Stones begins to";
- mes "glow. However, the statue itself^FFFFFF ^000000 is not responding. You probably";
+ mes "^3355FFAs you approach this statue, one of your Charm Stones begins to";
+ mes "glow. However, the statue itself is not responding. You probably";
mes "need all the Charm Stones in";
mes "order to fully activate it.^000000";
close;
@@ -2505,6 +2506,7 @@ thana_boss,5,5,0 script #thanasummon -1,{
OnSummon:
monster "thana_boss",139,129,"Thanatos Phantom",1708,1,"#Death::OnThanaDead";
+ donpcevent "thanareset::OnCheck";
end;
}
@@ -2550,6 +2552,7 @@ OnTimer60000:
end;
OnTimer7200000:
+ killmonsterall "thana_boss";
set $@thana_summon,0;
stopnpctimer;
end;
@@ -2573,8 +2576,33 @@ OnWave:
OnThanaDead:
donpcevent "#thanatimer::OnActive";
end;
+
}
+thana_boss,2,2,0 script thanareset -1,{
+
+OnCheck:
+ initnpctimer;
+ end;
+
+OnTimer300000:
+ if(!getmapusers("thana_boss"))
+ {
+ killmonsterall "thana_boss";
+ enablenpc "Crest#1";
+ enablenpc "Crest#2";
+ enablenpc "Crest#3";
+ enablenpc "Crest#4";
+ enablenpc "Crest#5";
+ set $@thana_summon,0;
+ stopnpctimer;
+ end;
+ }
+ stopnpctimer;
+ goto OnCheck;
+}
+
+
tha_t06,119,120,0 script thana6-7 45,1,1,{
if((Class == Job_Lord_Knight) || (Class == Job_High_Priest) || (Class == Job_High_Wizard) || (Class == Job_Whitesmith) || (Class == Job_Sniper) || (Class == Job_Assassin_Cross) || (Class == Job_High_Wizard) || (Class == Job_Lord_Knight2) || (Class == Job_Paladin) || (Class == Job_Champion) || (Class == Job_Professor) || (Class == Job_Stalker) || (Class == Job_Creator) || (Class == Job_Clown) || (Class == Job_Gypsy) || (Class == Job_Paladin2)) warp "thana_step",69,369;