Browse Source

Merge pull request #1054 from AtlantisRO/master

Fixes to some quests and typo errors
* Corrected miscellaneous Korean to English translations.
* Corrected the position and facing direction of NPC [Promotional Staff#iz] from [Onward to the New World] Quest (pre-renewal).
* Fixed NPC [Iromo's Mother#ep3_2] from [Alberta Boy] Quest where players could have their quest progress reset.
* Fixed NPC [The Blacksmith#rus06] from [Koschei the Immortal] Quest giving Iron_Boots01 instead of Iron_Boots02 to Ninja and Gunslinger classes.
Thanks to @AtlantisRO!
Aleos 9 years ago
parent
commit
d378ef2a0b

+ 3 - 3
npc/cities/izlude.txt

@@ -186,10 +186,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.";
@@ -206,7 +206,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]";

+ 4 - 4
npc/pre-re/mobs/dungeons/gefenia.txt

@@ -77,7 +77,7 @@ gefenia04,0,0,0,0	monster	Ogretooth	1204,1,18000000,14400000,0
 //==================================================
 //gefenia01,0,0,0,0	monster	Fake Angel	1371,10,0,0,0
 //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
@@ -92,7 +92,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
@@ -106,7 +106,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
@@ -120,7 +120,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

+ 1 - 1
npc/pre-re/quests/quests_13_1.txt

@@ -12,4 +12,4 @@
 //= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
 //============================================================ 
 
-izlude,101,173,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100
+izlude,99,136,5	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100

+ 1 - 1
npc/quests/quests_alberta.txt

@@ -2738,7 +2738,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 }
 
 alberta_in,120,93,3	script	Iromo's Mother#ep3_2	53,{
-	if (ep13_2_hiki == 8) {
+	if (ep13_2_hiki >= 8) {
 		mes "[Mother]";
 		mes "Thank you for helping my son.";
 		mes "But I think we can't do anything";

+ 1 - 1
npc/quests/quests_moscovia.txt

@@ -7296,7 +7296,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	1_M_SMITH,{
 			delitem 999,25;// Steel
 			rhea_rus_main = 8;
 			// changequest 8138,8139;
-			if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer || BaseClass == Job_Ninja || BaseClass == Job_Gunslinger)
+			if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer)
 				getitem 2429,1;// Iron_Boots01
 			else
 				getitem 2430,1;// Iron_Boots02

+ 1 - 1
npc/re/cities/dicastes.txt

@@ -561,7 +561,7 @@ dicastes01,235,245,4	script	Excited Piom#a	490,{
 dicastes01,284,262,3	script	Favorable Knit#a	453,{
 	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.";