diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 22:36:41 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 22:36:41 +0000 |
| commit | 6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 (patch) | |
| tree | e91f8afd3b7b8b80f0c55aae07f7a478f469c37a /npc/cities/morocc.txt | |
| parent | 23e1b7db5ba2277a406fc84c30e87c324a83097c (diff) | |
| download | hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.gz hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.bz2 hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.xz hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.zip | |
* Merged changes from trunk [14496:14630/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities/morocc.txt')
| -rw-r--r-- | npc/cities/morocc.txt | 5 |
1 files changed, 4 insertions, 1 deletions
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 //=================================================== |