summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-23 16:16:08 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-23 16:16:08 +0000
commitf9bb6cca7f02a7b80d39f1f163d4fccfd096b315 (patch)
tree27b69462eec1a3924a9d04d7fed1fe7077ee7d7b /npc/quests
parentd40848e2dd9e69d1f74bf01de714aa22f0731a81 (diff)
downloadhercules-f9bb6cca7f02a7b80d39f1f163d4fccfd096b315.tar.gz
hercules-f9bb6cca7f02a7b80d39f1f163d4fccfd096b315.tar.bz2
hercules-f9bb6cca7f02a7b80d39f1f163d4fccfd096b315.tar.xz
hercules-f9bb6cca7f02a7b80d39f1f163d4fccfd096b315.zip
* Optimized "Erundek" NPC (battleground\bg_common.txt)
* More general cleaning... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16329 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/thana_quest.txt130
1 files changed, 13 insertions, 117 deletions
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index ab3307c5f..654e5474e 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= [Ishizu-chan]
//===== Current Version: =====================================
-//= 2.5a
+//= 2.6
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -28,6 +28,7 @@
//= 2.4 Fixed a minor bug with Arch Bishop checks. [Euphy]
//= 2.5 Cleaning. [Euphy]
//= 2.5a Fixed an incorrect variable. [Euphy]
+//= 2.6 Merged identical timer labels. [Euphy]
//============================================================
hu_fild01,140,163,5 script Tower Keeper 852,3,3,{
@@ -2280,34 +2281,17 @@ OnEnable:
end;
OnTimer500:
- specialeffect EF_BEGINSPELL7;
- end;
-
OnTimer1000:
- specialeffect EF_BEGINSPELL7;
- end;
-
OnTimer1500:
- specialeffect EF_BEGINSPELL7;
- end;
-
OnTimer2000:
- specialeffect EF_BEGINSPELL7;
- end;
-
OnTimer2500:
specialeffect EF_BEGINSPELL7;
end;
OnTimer3000:
specialeffect EF_BEGINSPELL7;
- if ($@thana_summon == 6) {
- stopnpctimer;
- }
- else {
- stopnpctimer;
- initnpctimer;
- }
+ stopnpctimer;
+ if ($@thana_summon != 6) initnpctimer;
end;
OnDisable:
@@ -2323,34 +2307,17 @@ OnEnable:
end;
OnTimer500:
- specialeffect EF_BEGINSPELL3;
- end;
-
OnTimer1000:
- specialeffect EF_BEGINSPELL3;
- end;
-
OnTimer1500:
- specialeffect EF_BEGINSPELL3;
- end;
-
OnTimer2000:
- specialeffect EF_BEGINSPELL3;
- end;
-
OnTimer2500:
specialeffect EF_BEGINSPELL3;
end;
OnTimer3000:
specialeffect EF_BEGINSPELL3;
- if ($@thana_summon == 6) {
- stopnpctimer;
- }
- else {
- stopnpctimer;
- initnpctimer;
- }
+ stopnpctimer;
+ if ($@thana_summon != 6) initnpctimer;
end;
OnDisable:
@@ -2365,34 +2332,17 @@ OnEnable:
end;
OnTimer500:
- specialeffect EF_BEGINSPELL5;
- end;
-
OnTimer1000:
- specialeffect EF_BEGINSPELL5;
- end;
-
OnTimer1500:
- specialeffect EF_BEGINSPELL5;
- end;
-
OnTimer2000:
- specialeffect EF_BEGINSPELL5;
- end;
-
OnTimer2500:
specialeffect EF_BEGINSPELL5;
end;
OnTimer3000:
specialeffect EF_BEGINSPELL5;
- if ($@thana_summon == 6) {
- stopnpctimer;
- }
- else {
- stopnpctimer;
- initnpctimer;
- }
+ stopnpctimer;
+ if ($@thana_summon != 6) initnpctimer;
end;
OnDisable:
@@ -2408,34 +2358,17 @@ OnEnable:
end;
OnTimer500:
- specialeffect EF_BEGINSPELL4;
- end;
-
OnTimer1000:
- specialeffect EF_BEGINSPELL4;
- end;
-
OnTimer1500:
- specialeffect EF_BEGINSPELL4;
- end;
-
OnTimer2000:
- specialeffect EF_BEGINSPELL4;
- end;
-
OnTimer2500:
specialeffect EF_BEGINSPELL4;
end;
OnTimer3000:
specialeffect EF_BEGINSPELL4;
- if ($@thana_summon == 6) {
- stopnpctimer;
- }
- else {
- stopnpctimer;
- initnpctimer;
- }
+ stopnpctimer;
+ if ($@thana_summon != 6) initnpctimer;
end;
OnDisable:
@@ -2451,34 +2384,17 @@ OnEnable:
end;
OnTimer500:
- specialeffect EF_BEGINSPELL2;
- end;
-
OnTimer1000:
- specialeffect EF_BEGINSPELL2;
- end;
-
OnTimer1500:
- specialeffect EF_BEGINSPELL2;
- end;
-
OnTimer2000:
- specialeffect EF_BEGINSPELL2;
- end;
-
OnTimer2500:
specialeffect EF_BEGINSPELL2;
end;
OnTimer3000:
specialeffect EF_BEGINSPELL2;
- if ($@thana_summon == 6) {
- stopnpctimer;
- }
- else {
- stopnpctimer;
- initnpctimer;
- }
+ stopnpctimer;
+ if ($@thana_summon != 6) initnpctimer;
end;
OnDisable:
@@ -2502,9 +2418,7 @@ OnTouch:
donpcevent "tt_effect5::OnDisable";
hideonnpc "to_the_boss_room_tt";
}
- else {
- warp "thana_boss",136,116;
- }
+ else warp "thana_boss",136,116;
end;
}
@@ -2813,29 +2727,11 @@ OnTimer5000:
end;
OnTimer60000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer1000000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer2000000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer3000000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer4000000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer5000000:
- mapwarp "thana_boss","tha_t12",130,47;
- end;
-
OnTimer6000000:
mapwarp "thana_boss","tha_t12",130,47;
end;