summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-19 22:17:44 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-19 22:17:44 +0000
commitee6ed41176814afef6d4d1902311af3acf0e5929 (patch)
tree9c9aea548f68cfb35f21399458bd51e03cb6b23a /npc
parentcb227339015cdd739580b36222d31b6755694d49 (diff)
downloadhercules-ee6ed41176814afef6d4d1902311af3acf0e5929.tar.gz
hercules-ee6ed41176814afef6d4d1902311af3acf0e5929.tar.bz2
hercules-ee6ed41176814afef6d4d1902311af3acf0e5929.tar.xz
hercules-ee6ed41176814afef6d4d1902311af3acf0e5929.zip
- Patched the MAX_STATUSCHANGE startup error
- Fixed a compiler warning - Really removed duplicate Noyee npc git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10033 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/yuno.txt28
-rw-r--r--npc/jobs/2-2/dancer.txt2
3 files changed, 3 insertions, 29 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bf6c799be..cc5819552 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,6 +26,8 @@ KarLaeda
Date Added
======
+2007/03/20
+ * Removed duplicate Noyee npc (skipped in r9943 ?)
2007/03/17
* Fixed a missing curly brace and removed some more .gat-s [ultramage]
* Removed all .gat from the scripts [Lupus]
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index 1d7e213f8..ff7f5c8c9 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -51,34 +51,6 @@ yuno,208,164,4 script Active little girl 101,{
//======================================================================================
-yuno,164,200,4 script Noyee 101,{
- mes "[Noyee]";
- mes "Did you know that there's a";
- mes "difference between the armor you";
- mes "can buy from NPC shops and the";
- mes "kinds you obtain from hunting";
- mes "monsters?";
- next;
- mes "[Noyee]";
- mes "The difference, my friend, is in";
- mes "the number of ^5533FFslots^000000 in your armor.";
- next;
- mes "[Noyee]";
- mes "The same kind of Armor will have";
- mes "the same Defense. However, if an";
- mes "Armor has a slot, you can insert a";
- mes "Monster Card which will add an";
- mes "enhancement to that armor.";
- next;
- mes "[Noyee]";
- mes "Both Monster Cards and Slotted";
- mes "Armors are rarely dropped by";
- mes "monsters, and are thus valuable";
- mes "commodies.";
- close;
-}
-
-//======================================================================================
yuno,184,173,4 script Freidrich 729,{
mes "[Freidrich]";
mes "The city of Sages,";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index d9d2cf918..c5cda8186 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -310,7 +310,7 @@ job_duncer,95,93,4 script Bijou 101,{
if(@gift==50) {
getitem 1953,1;
mes "Since you are very experienced I have given you a Line, instead of a simple Rope that normal people would get.";
- mes "Now take you Line, and be the best Dancer you can be!";
+ mes "Now take your Line, and be the best Dancer you can be!";
} else {
getitem 1950,1;
mes "Now take this Rope, and be the best Dancer you can be!";