summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/lighthalzen.txt8
-rw-r--r--npc/cities/morocc.txt5
2 files changed, 10 insertions, 3 deletions
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index dc4a31cc7..df5e6fa2a 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA, Au{R}oN (Translated by Alan), $ephiroth
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -40,6 +40,7 @@
//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf]
//= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard]
+//= 2.1 Commented out Duplicate NPCs. (bugreport:4555)
//=============================================================
lighthalzen,198,285,5 script Jiwon#zen5 862,{
@@ -278,8 +279,8 @@ lighthalzen,78,120,3 script Maivi#zen1 862,{
close;
}
+/*
lighthalzen,226,210,3 script Nannan 86,{
-
mes "[Nannan]";
mes "You know, I always thought";
mes "that all Alchemists were bookish,";
@@ -305,6 +306,7 @@ lighthalzen,226,210,3 script Nannan 86,{
mes "to a street guy like me...";
close;
}
+*/
lighthalzen,230,182,4 script Klaubis#zen3 866,{
mes "[Klaubis]";
@@ -3144,6 +3146,7 @@ lhz_in02,36,284,0 script Cool Event Staff#Cesuna 874,{
close;
}
+/*
lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{
mes "[Kudiuu]";
mes "Holy...!";
@@ -3154,6 +3157,7 @@ lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{
mes "almost a health hazard!";
close;
}
+*/
// Lighthalzen Mushroom.
// Don't really understand why it's there, but it's funny regardless.
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 75b1c0c04..5faf5e4a6 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,6 +24,7 @@
//= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 2.0a Fixed outdated info about Milk [Lupus]
//= 2.1 Updated/Added NPCs for episode 12.1. [L0ne_W0lf]
+//= 2.2 Removed duplicate bartender NPC. (bugreport:4555) [L0ne_W0lf]
//============================================================
// Morroc
@@ -715,6 +716,7 @@ moc_fild16,211,254,4 script Assassin#07rhea_30 118,{
// Other NPCs
//============================================================
//Bartender
+/*
morocc_in,166,76,3 script Bartender#02 46,{
mes "[Bartender]";
mes "What are you going to order?";
@@ -752,6 +754,7 @@ morocc_in,166,76,3 script Bartender#02 46,{
mes "Don't even think about drinking if you don't have 1,000 zeny.";
close;
}
+*/
// Assassin Guild Guards
//===================================================