summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-16 10:17:30 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-16 10:17:30 +0000
commit9c598dec9e0aac139f9505652774c4b4c9a8cf9f (patch)
tree775df79ce821bbd786cb8c3b34c44635d9418076
parent1bbd61541307671424f128b12930e8d0f53b5f33 (diff)
downloadhercules-9c598dec9e0aac139f9505652774c4b4c9a8cf9f.tar.gz
hercules-9c598dec9e0aac139f9505652774c4b4c9a8cf9f.tar.bz2
hercules-9c598dec9e0aac139f9505652774c4b4c9a8cf9f.tar.xz
hercules-9c598dec9e0aac139f9505652774c4b4c9a8cf9f.zip
Stable: added official Ninja quest. Trunk: removed name duplicates
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9225 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/cities/rachel.txt30
-rw-r--r--npc/guides/guides_louyang.txt4
-rw-r--r--npc/jobs/novice/novice.txt2
-rw-r--r--npc/other/divorce.txt4
5 files changed, 15 insertions, 26 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 32fe96709..9a1208828 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -36,6 +36,7 @@ Date Added
11/16
* Added official Ninja Job quest! Thanks to Legionaire for translation [Lupus]
Don't forget to update your other\Global_Functions.txt
+ - Removed name duplicates
11/14
* Replaced current Rachel Sanctuary warps with jAthena's version [Playtester]
- some warps still seem to be wrong or missing
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index d4e180ff6..5ca143db8 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Tsuyuki and Harp
//===== Current Version: =====================================
-//= 0.5
+//= 0.6
//===== Compatible With: =====================================
//= Freya
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 0.5 Text translated from Korean > English, incomplete,
//= possibly missing some NPCs and missing all quests.
+//= 0.6 Removed Inn Keeper (it's in inn.txt), name duplicates [Lupus]
//============================================================
@@ -34,7 +35,7 @@ rachel.gat,268,120,1 script Rachel Guard#01 934,{
close;
}
-rachel.gat,261,175,3 script Kid 914,{
+rachel.gat,261,175,3 script Kid#ra0 914,{
mes "[Mankoo]";
mes "Ahhh my gosh";
@@ -203,7 +204,7 @@ rachel.gat,141,168,5 script Looking for Someone 916,{ // No Info
end;
}
-rachel.gat,151,155,3 script Kid 921,{
+rachel.gat,151,155,3 script Kid#ra1 921,{
mes "[Kid]";
mes "When I grow up, I'm going to become a traveller that";
@@ -253,19 +254,6 @@ rachel.gat,109,138,5 script Cool Event Corp 874,{
end;
}
-ra_in01.gat,376,68,4 script Hotel Employee 931,{
-
- mes "[Hotel Employee]";
- mes "My Freya's blessings be with you...";
- mes "Welcome to Rachel Hotel. Our Hotel takes pride in being";
- mes "as comfortable as Freya's endless love.";
- next;
- menu "Save",H_end,"Rest here - 5000z",H_end,"End Conversation",H_end;
-
- H_end:
- close;
-}
-
rachel.gat,197,137,3 script Wandering Citizen 51,{
mes "[Wandering Citizen]";
@@ -314,7 +302,7 @@ rachel.gat,120,46,3 script Idle Shopkeeper 85,{
close;
}
-rachel.gat,125,33,5 script Shopkeeper 85,{
+rachel.gat,125,33,5 script Shopkeeper#ra 85,{
end;
}
@@ -336,7 +324,7 @@ rachel.gat,206,30,3 script Freya Bishop 920,{
close;
}
-rachel.gat,243,37,3 script Kid 921,{
+rachel.gat,243,37,3 script Kid#ra2 921,{
mes "[Kid]";
mes "Stop trying to pat my head!";
@@ -388,7 +376,7 @@ rachel.gat,243,37,3 script Kid 921,{
// bottom right, right bottom of pond.
-rachel.gat,266,35,3 script Grandmother 918,{
+rachel.gat,266,35,3 script Grandmother#ra 918,{
mes "[Grandmother]";
mes "This pond not only has a good view, but it makes";
@@ -401,7 +389,7 @@ rachel.gat,266,35,3 script Grandmother 918,{
close;
}
-rachel.gat,273,33,3 script Little Kid 931,{
+rachel.gat,273,33,3 script Little Kid#ra 931,{
mes "[Little Kid]";
mes "I like being alone!!";
@@ -432,7 +420,7 @@ ra_in01.gat,250,19,3 script Cendal 929,{
close;
}
-rachel.gat,196,77,3 script Kid 914,{
+rachel.gat,196,77,3 script Kid#ra3 914,{
mes "[Kid]";
mes "Bluestiti is really nice and pretty. She even";
diff --git a/npc/guides/guides_louyang.txt b/npc/guides/guides_louyang.txt
index 09926f651..344ef7e76 100644
--- a/npc/guides/guides_louyang.txt
+++ b/npc/guides/guides_louyang.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= jAthena/Tsuyuki
//===== Current Version: =====================================
-//= 1.0
+//= 1.0a
//===== Compatible With: =====================================
//= Freya
//===== Description: =========================================
@@ -294,4 +294,4 @@ louyang.gat,160,175,4 script Soldier#Lou1 825,{
close;
}
-louyang.gat,213,213,4 duplicate(Soldier#Lou1) Soldier 825 \ No newline at end of file
+louyang.gat,213,213,4 duplicate(Soldier#Lou1) Soldier#Lou2 825 \ No newline at end of file
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index b944ba984..90267adfc 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -241,7 +241,7 @@ new_zone01.gat,144,107,2 script Guard#02 105,{
}
//Receptionist
-new_zone02.gat,100,29,4 script Receptionist 86,{
+new_zone02.gat,100,29,4 script Receptionist#nz 86,{
if(Class != Job_Novice || Upper) goto L_Fail;
mes "[Training Grounds Receptionist]";
mes "Welcome!";
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index 1c9fd887c..d861c4fbc 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Perkka, Scriptor, LightFighter
//===== Current Version: =====================================
-//= 1.0
+//= 1.0a
//===== Compatible With: =====================================
//= eAthena 1 +
//===== Description: =========================================
@@ -14,7 +14,7 @@
//============================================================
-nif_in.gat,190,112,5 script Deviruchi 1109,{
+nif_in.gat,190,112,5 script Deviruchi#divorce 1109,{
if (getpartnerid() == 0) {
mes "[Deviruchi]";
mes "Kekeke, humans are always alone in the end,";