summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-26 18:14:09 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-26 18:14:09 +0000
commit1428fd11d993010c52cf19068f5c836566d81b56 (patch)
tree75ba581de6346c7281adcea14232ae3e3f1a90d1
parentc4e79414b1fe9e6f70c7ac6d27bffab308c24f07 (diff)
downloadhercules-1428fd11d993010c52cf19068f5c836566d81b56.tar.gz
hercules-1428fd11d993010c52cf19068f5c836566d81b56.tar.bz2
hercules-1428fd11d993010c52cf19068f5c836566d81b56.tar.xz
hercules-1428fd11d993010c52cf19068f5c836566d81b56.zip
fixed missing tabs, extra params. thanks to irmin i CAHTEXHuK. fixed warp coord of DTS warper. added missing next; to priest
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9078 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/airports/airships.txt4
-rw-r--r--npc/cities/comodo.txt2
-rw-r--r--npc/jobs/2-1/knight.txt2
-rw-r--r--npc/jobs/2-1/priest.txt2
-rw-r--r--npc/other/dts_warper.txt5
-rw-r--r--npc/quests/seals/megingard_seal.txt2
-rw-r--r--npc/warps/fields/abyss_warper.txt5
7 files changed, 12 insertions, 10 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index db00a9c89..5da2f8ec1 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 0.5b
+//= 0.5c
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -848,7 +848,7 @@ s_Warp:
//= Apple Gambling Function
//============================================================
-function script applegamble {
+function script applegamble {
mes "["+getarg(0)+"]";
mes "Hi, I'm "+getarg(0)+"~";
mes "How would you like";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index d8bc17b11..2dabfd036 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -325,7 +325,7 @@ cmd_fild07.gat,299,83,4 script Sailor#01 100,{
}
//=========================================================
-cmd_fild07.gat,94,134,4, script Sailor#02 100,{
+cmd_fild07.gat,94,134,4 script Sailor#02 100,{
mes "[Sarumane]";
mes "Hello my friend, where do you wish to go?";
next;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index b0e7ca66c..992bb6b53 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -791,7 +791,7 @@ L_Done:
// Waiting Room ---------------------------------------------------------------------------
-job_knt.gat,89,110,4, script Sir Windsor#2::SW2 733,{
+job_knt.gat,89,110,4 script Sir Windsor#2::SW2 733,{
mes "[Sir Windsor]";
mes "..........";
next;
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index fcdcfa2d4..ecc02fcd2 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -493,9 +493,9 @@ L_Start:
mes "[Father Peter]";
mes "Oh, is that so, i think i'll need to explain it to you.";
mes "After listening to what i have to say, i think you'll understand.";
- next;
L_Cont:
+ next;
mes "[Father Peter]";
mes "What is overcoming evil? its basically destroying it.";
mes "What is evil? its basically devil, ghosts etc...";
diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt
index bf3647c6b..402f19675 100644
--- a/npc/other/dts_warper.txt
+++ b/npc/other/dts_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera
//===== Current Version: =====================================
-//= 2.3a
+//= 2.3b
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@@ -70,6 +70,7 @@
//= Fixed bug that involved having both warpers enabled at the same time. [Evera]
//= New $dtsday system and bug fix[Evera]
//= 2.3a fixed 2 bugs with comparision [Lupus]
+//= 2.3b corrected Glast warp coords [Lupus]
//============================================================
//Yuno
@@ -849,7 +850,7 @@ function script F_DTS_Warp {
if (@dtswarpmap$[@num] == "Clock Tower, Basement 3") warp "alde_dun03.gat",277,178;
- if (@dtswarpmap$[@num] == "Glastheim Entrance") warp "glast_01.gat",375,304;
+ if (@dtswarpmap$[@num] == "Glastheim Entrance") warp "glast_01.gat",370,304;
cutin "", 255;
end;
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index cc0e053f7..00d9361f6 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -2705,7 +2705,7 @@ aldebaran.gat,66,213,0 script Lady#megin 69,{
}
-cmd_in02.gat,190,94,3,0 script Man#megin 828,{
+cmd_in02.gat,190,94,3 script Man#megin 828,{
if ($God1 > 49 && $God2 < 100)
{
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index 502e05d0b..beb15ae82 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 Added by Nexon [Nexon]
//= 1.1 Removed Duplicates [Silent]
+//= 1.2 Fixed tab - missing pillar's appeared [Lupus]
//============================================================
hu_fild05.gat,168,303,0 script Pillar#01 111,{
@@ -59,7 +60,7 @@ OnInit:
}
-hu_fild05.gat,171,212,0 script Pillar#02 111,{
+hu_fild05.gat,171,212,0 script Pillar#02 111,{
mes "[Ancient Voice]";
mes "Leave the island?";
next;