summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 05:29:32 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 05:29:32 +0000
commitfd2d4c51ac792699de06aa814393c7b89463cd0a (patch)
treedb9d2152de868b805b17e9b3265e161a7da4c763
parent9a13c358e79e1a9ae97bcf120783abdaee6a2e39 (diff)
downloadhercules-fd2d4c51ac792699de06aa814393c7b89463cd0a.tar.gz
hercules-fd2d4c51ac792699de06aa814393c7b89463cd0a.tar.bz2
hercules-fd2d4c51ac792699de06aa814393c7b89463cd0a.tar.xz
hercules-fd2d4c51ac792699de06aa814393c7b89463cd0a.zip
- Follow up to r16545: fixed unreadable character at the beginning of jawaii.txt
and fixed duplicate npc names. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16549 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/cities/jawaii.txt4
-rw-r--r--npc/re/cities/jawaii.txt2
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt2
-rw-r--r--npc/re/quests/quests_lighthalzen.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index aa467b02f..2d18d6298 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
//= Jawaii (The Lovers' Paradise) Town script
//===== By: ==================================================
//= jAthena (1.0)
@@ -20,7 +20,7 @@
//= 1.5 Fixed Script, and spelling errors, some thanks to Sparkles [DNett123]
//= 1.6 Final corrections (not complete), thanks to the public, and DNett123!
//= 1.6c added missing monsters. Still 1 type is missing [Lupus]
-//= 1.7 Fixed a lot of typo�s [Nexon]
+//= 1.7 Fixed a lot of typos [Nexon]
//= 1.8 Removed monster spawns, added aegis ep 8.5 spawns to npc/mobs/fields/jawaii.txt [MasterOfMuppets]
//= 2.0 Updated the npcs according to iRO [MasterOfMuppets]
//= 2.01 fixed missing @ at randomdrink, thanks to theultramage [Lupus]
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index 02687149b..04744d1ee 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
//= Jawaii Town Renewal
//===== By: ==================================================
//= Daegaladh, Masao
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index e30ffd2ab..d42deb9e9 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -3728,7 +3728,7 @@ OnMyMobDead:
end;
}
-job3_rune01,92,62,3 script Kafra Employee 114,{
+job3_rune01,92,62,3 script Kafra Employee#job3 114,{
cutin "kafra_04",2;
mes "[Kafra Employee]";
mes "Hello. Kafra Service are always with you.";
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index 5523e5dd0..09d92bef4 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -12,4 +12,4 @@
//= 1.0 Updated to match the new Izlude Map. [Masao]
//============================================================
-izlude,171,73,6 duplicate(Scamp) Scamp 853
+izlude,171,73,6 duplicate(Scamp) Scamp#2 853