summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/cities/izlude.txt6
-rw-r--r--npc/other/marriage.txt2
-rw-r--r--npc/pre-re/mobs/dungeons/gefenia.txt8
-rw-r--r--npc/re/cities/dicastes.txt2
-rw-r--r--npc/re/events/christmas_2013.txt2
5 files changed, 10 insertions, 10 deletions
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index f689fd421..7ee10f320 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -194,10 +194,10 @@
mes "Well, of course, they are all very cute, but Ghostring is an EXCEPTION. It is very very dangerous.";
next;
mes "[Dega]";
- mes "If you are lucky enough, you might even bump into Angelring, the Poring with Angel wings.";
+ mes "If you are lucky enough, you might even bump into Angeling, the Poring with Angel wings.";
next;
while(1) {
- switch(select("Ghostring?", "Angelring?", "End Conversation.")) {
+ switch(select("Ghostring?", "Angeling?", "End Conversation.")) {
case 1:
mes "[Dega]";
mes "Ghostring is a grayish Poring that floats around in the air like a ghost. Just like other ghosts, physical attacks can't do any damage to it.";
@@ -214,7 +214,7 @@
break;
case 2:
mes "[Dega]";
- mes "Angelrings are immune to Magic attacks. If people who can only attack with Magic face an Angelring, then it's time for";
+ mes "Angelings are immune to Magic attacks. If people who can only attack with Magic face an Angeling, then it's time for";
mes "them to run.";
next;
mes "[Dega]";
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 7522c4242..eca8001a6 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -130,7 +130,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{
mes "speak to the Bishop and tell";
mes "him the name of her groom.";
mes "If these names are correctly";
- mes "told to the Biship, they will";
+ mes "told to the Bishop, they will";
mes "be able to exchange rings.";
next;
mes "[Marry Happy]";
diff --git a/npc/pre-re/mobs/dungeons/gefenia.txt b/npc/pre-re/mobs/dungeons/gefenia.txt
index c3ce88a09..c6ec26d13 100644
--- a/npc/pre-re/mobs/dungeons/gefenia.txt
+++ b/npc/pre-re/mobs/dungeons/gefenia.txt
@@ -88,7 +88,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//- gefenia01 - Geffenia (Old) -
//gefenia01,0,0,0,0 monster Mini Demon 1292,6,300000,0,0
-//gefenia01,0,0,0,0 monster Apolcalips 1365,4,300000,0,0
+//gefenia01,0,0,0,0 monster Apocalypse 1365,4,300000,0,0
//gefenia01,0,0,0,0 monster Elder 1377,10,300000,0,1
//gefenia01,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1
//gefenia01,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
@@ -101,7 +101,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//gefenia02,0,0,0,0 monster Succubus 1370,6,0,0,0
//gefenia02,0,0,0,0 monster Incubus 1374,6,0,0,0
//gefenia02,0,0,0,0 monster Mini Demon 1292,10,300000,0,0
-//gefenia02,0,0,0,0 monster Apolcalips 1365,8,300000,0,0
+//gefenia02,0,0,0,0 monster Apocalypse 1365,8,300000,0,0
//gefenia02,0,0,0,0 monster Abyssmal Knight 1219,2,1800000,900000,1
//gefenia02,0,0,0,0 monster Bloody Knight 1268,5,300000,0,0
//gefenia02,0,0,0,0 monster Poring 1502,1,0,0,0
@@ -113,7 +113,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//gefenia03,0,0,0,0 monster Succubus 1370,5,0,0,0
//gefenia03,0,0,0,0 monster Incubus 1374,5,0,0,0
//gefenia03,0,0,0,0 monster Mini Demon 1292,10,300000,0,0
-//gefenia03,0,0,0,0 monster Apolcalips 1365,6,300000,0,0
+//gefenia03,0,0,0,0 monster Apocalypse 1365,6,300000,0,0
//gefenia03,0,0,0,0 monster Elder 1377,10,300000,0,1
//gefenia03,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1
//gefenia03,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
@@ -125,7 +125,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//gefenia04,0,0,0,0 monster Fake Angel 1371,10,0,0,0
//gefenia04,0,0,0,0 monster Succubus 1370,5,0,0,0
//gefenia04,0,0,0,0 monster Incubus 1374,3,0,0,0
-//gefenia04,0,0,0,0 monster Apolcalips 1365,4,300000,0,0
+//gefenia04,0,0,0,0 monster Apocalypse 1365,4,300000,0,0
//gefenia04,0,0,0,0 monster Abyssmal Knight 1219,5,1800000,900000,1
//gefenia04,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
//gefenia04,0,0,0,0 monster Poring 1502,1,0,0,0
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 6975e599a..f05d494f7 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -586,7 +586,7 @@ dicastes01,235,245,4 script Excited Piom#a 4_MAN_PIOM4,{
dicastes01,284,262,3 script Favorable Knit#a 4_MAN_NITT,{
mes "[Favorable Knit]";
if (isequipped(2782)) {
- mes "Unlike the Raphine, we Saphas";
+ mes "Unlike the Laphine, we Saphas";
mes "are a very close community.";
mes "We start by living together in common facilities after we are born.";
mes "That is why all Saphas are like family.";
diff --git a/npc/re/events/christmas_2013.txt b/npc/re/events/christmas_2013.txt
index 25fad1384..bc457cf0c 100644
--- a/npc/re/events/christmas_2013.txt
+++ b/npc/re/events/christmas_2013.txt
@@ -1745,5 +1745,5 @@ prt_fild08d,0,0,0,0 monster Gift Stealing Raccoon 2380,5,5000,0,0
prt_fild08d,0,0,0,0 monster Sock Stealing Raccoon 2379,5,5000,0,0
gl_chyard_,0,0,0,0 monster Gift Stealing Raccoon 2380,5,5000,0,0
gl_chyard_,0,0,0,0 monster Sock Stealing Raccoon 2379,5,5000,0,0
-gl_cas02_,0,0,0,0 monster Gift Stealing Raccoon 2380,5,5000,0,0m
+gl_cas02_,0,0,0,0 monster Gift Stealing Raccoon 2380,5,5000,0,0
gl_cas02_,0,0,0,0 monster Sock Stealing Raccoon 2379,5,5000,0,0