diff --git a/db/mob_chat_db.txt b/db/mob_chat_db.txt index 403aa28ba0..33503c1dcc 100644 --- a/db/mob_chat_db.txt +++ b/db/mob_chat_db.txt @@ -19,7 +19,7 @@ 14#0xFF0000#This is how you attack? Watch and learn, weaklings! 15#0xFF0000#It's time to finish the game! 16#0xFF0000#Oh, you're stronger than I thought! -17#0xFF0000#No, this can't be happening! I'm Satan Morroc, Demon King of Destruction! +17#0xFF0000#No, this can't be happening! I'm Satan Morocc, Demon King of Destruction! 18#0xFF0000#I can never die! I'll be coming back for you! 19#0xFF0000#I was born to conquer this world! None shall stop me! 20#0xFF0000#Your days are numbered! diff --git a/db/pre-re/achievement_db.yml b/db/pre-re/achievement_db.yml index 2ad6076257..ba3746f209 100644 --- a/db/pre-re/achievement_db.yml +++ b/db/pre-re/achievement_db.yml @@ -452,7 +452,7 @@ Body: Score: 10 - ID: 120061 Group: "AG_ADVENTURE" - Name: "Yuno Field Exploration" + Name: "Juno Field Exploration" #Reward: # ItemID: 22876 Score: 10 @@ -704,7 +704,7 @@ Body: Score: 10 - ID: 120103 Group: "AG_ADVENTURE" - Name: "Gonryun Field Exploration" + Name: "Kunlun Field Exploration" #Reward: # ItemID: 22876 Score: 10 @@ -890,7 +890,7 @@ Body: Score: 20 - ID: 120134 Group: "AG_ADVENTURE" - Name: "Gonryun Dungeon Exploration" + Name: "Kunlun Dungeon Exploration" #Reward: # ItemID: 22876 Score: 20 @@ -1000,7 +1000,7 @@ Body: Score: 10 - ID: 127005 Group: "AG_CHATTING" - Name: "Yuno Contribution" + Name: "Juno Contribution" Map: "yuno" Target: - Id: 0 @@ -1564,7 +1564,7 @@ Body: Score: 20 - ID: 129008 Group: "AG_ADVENTURE" - Name: "Rune Midgard Explorer" + Name: "Rune-Midgarts Explorer" Dependent: - Id: 129001 - Id: 129002 @@ -1578,7 +1578,7 @@ Body: Score: 50 - ID: 129009 Group: "AG_ADVENTURE" - Name: "Yuno Explorer" + Name: "Juno Explorer" Dependent: - Id: 120052 - Id: 120053 diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index bd50fd7e25..ddbf167c7b 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -436,7 +436,7 @@ 1085,Mage_Test_2,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1086,Mage_Test_3,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1087,Mage_Test_4,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} -1088,Morocc_Potion,Morroc Solution,3,0,,10,,,,,,,,,,,,,{},{},{} +1088,Morocc_Potion,Morocc Solution,3,0,,10,,,,,,,,,,,,,{},{},{} 1089,Payon_Potion,Payon Solution,3,0,,10,,,,,,,,,,,,,{},{},{} 1090,Mage_Test_Etc,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1091,Merchant_Box_Etc,Delivery Box,3,0,,10,,,,,,,,,,,,,{},{},{} @@ -2572,7 +2572,7 @@ 5389,Angel_Spirit,Angel Spirit,4,20,,200,,0,,0,0xFFFFFFFF,7,2,512,,30,0,394,{ bonus bStr,2; bonus bHit,15; },{},{} 5390,Santa_Hat_2,Frozen Twin Pompom,4,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,0,1,395,{ bonus2 bResEff, Eff_Freeze, 3000; },{},{} 5391,Toast_C,Toast,4,20,,0,,0,,0,0xFFFFFFFF,7,2,1,,0,0,188,{ bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10; },{},{} -5392,Louyang_Cap,Louyang NewYear Hat,4,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,396,{ bonus bLuk,2; },{},{} +5392,Louyang_Cap,Luoyang NewYear Hat,4,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,396,{ bonus bLuk,2; },{},{} 5393,Valentine_Hat,Love Valentine's Hat,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,0,397,{ bonus bMaxSPrate, 7; bonus bMaxHPrate, 7; },{},{} 5394,Bubblegum_Lower,Bubblegum,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,0,0,0,{},{},{} 5395,Tiraya_Bonnet,Striped Hat,4,20,,500,,2,,1,0xFFFFFFFF,7,2,256,,50,1,398,{ bonus bMaxHP,100+(getrefine()*20); bonus bLuk,3; },{},{} @@ -3067,7 +3067,7 @@ 6026,Marriage_Covenant,Written Oath Of Marriage,3,0,,10,,,,,,,,,,,,,{},{},{} 6027,Crystal_Of_Feardoom,Crystal Of Feardom,3,0,,0,,,,,,,,,,,,,{},{},{} 6028,Seal_Scroll,Sealed Scroll,3,0,,0,,,,,,,,,,,,,{},{},{} -6029,Morocc_Tracing_Log,Morroc Tracing Log,3,0,,0,,,,,,,,,,,,,{},{},{} +6029,Morocc_Tracing_Log,Morocc Tracing Log,3,0,,0,,,,,,,,,,,,,{},{},{} 6030,Glitering_PaperA,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} 6031,Glitering_PaperB,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} 6032,Horn_Of_Hilsrion,Horn of Hillslion,3,500,,10,,,,,,,,,,,,,{},{},{} @@ -3771,7 +3771,7 @@ 7332,Slate,Complete Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7333,Piece_Of_Slate_1,Prontera Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7334,Piece_Of_Slate_2,Payon Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} -7335,Piece_Of_Slate_3,Morroc Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} +7335,Piece_Of_Slate_3,Morocc Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7336,Piece_Of_Slate_4,Geffen Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7337,Eye_Of_Hellion,Eye of Hellion,3,0,,0,,,,,,,,,,,,,{},{},{} 7338,RO_Transportation_Card,One-way Ticket,3,0,,0,,,,,,,,,,,,,{},{},{} @@ -3968,11 +3968,11 @@ 7529,Stolen_Sandals,Stolen Sandal,3,0,,0,,,,,,,,,,,,,{},{},{} 7530,Travel_Brochure_01,Travel Brochure [Amatsu],3,0,,0,,,,,,,,,,,,,{},{},{} 7531,Travel_Brochure_02,Travel Brochure [Kunlun],3,0,,0,,,,,,,,,,,,,{},{},{} -7532,Travel_Brochure_03,Travel Brochure [Louyang],3,0,,0,,,,,,,,,,,,,{},{},{} +7532,Travel_Brochure_03,Travel Brochure [Luoyang],3,0,,0,,,,,,,,,,,,,{},{},{} 7533,Travel_Brochure_04,Travel Brochure [Ayothaya],3,0,,0,,,,,,,,,,,,,{},{},{} 7534,Photo_Album_01,Amatsu Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7535,Photo_Album_02,Kunlun Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} -7536,Photo_Album_03,Louyang Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} +7536,Photo_Album_03,Luoyang Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7537,Photo_Album_04,Ayothaya Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7538,Sifted_Sand,Sand for Work,3,0,,0,,,,,,,,,,,,,{},{},{} 7539,Poring_Coin,Poring Coin,3,0,,0,,,,,,,,,,,,,{},{},{} @@ -4616,7 +4616,7 @@ 12046,Int_Dish01,Grape Juice Herbal Tea,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,1; percentheal 0,5; },{},{} 12047,Int_Dish02,Autumn Red Tea,0,4000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,2; percentheal 0,5; },{},{} 12048,Int_Dish03,Honey Herbal Tea,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,3; percentheal 0,5; },{},{} -12049,Int_Dish04,Morroc Fruit Wine,0,8000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,4; percentheal 0,5; },{},{} +12049,Int_Dish04,Morocc Fruit Wine,0,8000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,4; percentheal 0,5; },{},{} 12050,Int_Dish05,Mastela Fruit Wine,0,10000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,1200000,5; percentheal 0,10; },{},{} 12051,Vit_Dish01,Steamed Crab Nippers,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD,1200000,1; percentheal 5,0; },{},{} 12052,Vit_Dish02,Assorted Seafood,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD,1200000,2; percentheal 5,0; },{},{} @@ -4885,7 +4885,7 @@ 12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12318,Little_Heart,Small Hearts,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{} -12320,Pineapple_Juice,Schwartzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20; },{},{} +12320,Pineapple_Juice,Schwarzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20; },{},{} 12321,Spicy_Sandwich,Arunafeltz Desert Sandwich,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCCRI,600000,7; },{},{} 12322,Chocolate_Pie,Chocolate Pie,0,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{} 12323,N_Fly_Wing,Novice Fly Wing,11,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "AL_TELEPORT",1; },{},{} @@ -5017,7 +5017,7 @@ 12449,F_Luk_Dish10_,F Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12450,F_Vit_Dish10_,F Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12451,F_WOB_Rune,F WOB Rune,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12452,F_WOB_Schwaltz,F WOB Schwaltz,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12452,F_WOB_Schwaltz,F WOB Schwarz,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12453,F_WOB_Rachel,F WOB Rachel,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12454,F_WOB_Local,F WOB Local,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12456,F_Greed_Scroll,F Greed Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} diff --git a/db/pre-re/item_trade.txt b/db/pre-re/item_trade.txt index 9c774bbe97..0ff39baac4 100644 --- a/db/pre-re/item_trade.txt +++ b/db/pre-re/item_trade.txt @@ -44,7 +44,7 @@ 7332,507,100 // Complete Tablet 7333,507,100 // Prontera Tablet 7334,507,100 // Payon Tablet -7335,507,100 // Morroc Tablet +7335,507,100 // Morocc Tablet 7336,507,100 // Geffen Tablet 7339,507,100 // Commemorative Travel Card 5132,472,100 // Angeling Hat @@ -113,7 +113,7 @@ 7341,507,100 // Old Pendant // Lighthalzen Quest items -// * Schwartzvalt Trilogy Quest items +// * Schwarzwald Trilogy Quest items 7342,507,100 // File Folder 7343,507,100 // Sealed File Folder 7344,507,100 // Shinokas Case File @@ -129,11 +129,11 @@ // "2006 USA 3rd Anniversary" related items 7530,507,100 // Travel Brochure [Amatsu] 7531,507,100 // Travel Brochure [Kunlun] -7532,507,100 // Travel Brochure [Louyang] +7532,507,100 // Travel Brochure [Luoyang] 7533,507,100 // Travel Brochure [Ayothaya] 7534,507,100 // Amatsu Completed Photo Album 7535,507,100 // Kunlun Completed Photo Album -7536,507,100 // Louyang Completed Photo Album +7536,507,100 // Luoyang Completed Photo Album 7537,507,100 // Ayothaya Completed Photo Album // Poring Coin items @@ -332,7 +332,7 @@ // Taiwan ??? 2713,507,100 // Certificate -// Satan Morroc +// Satan Morocc 7820,507,100 // Piece of Morocc Skin // Vietnam Independence Day diff --git a/db/pre-re/mob_branch.txt b/db/pre-re/mob_branch.txt index 002aa94133..114c6eb8ff 100644 --- a/db/pre-re/mob_branch.txt +++ b/db/pre-re/mob_branch.txt @@ -436,10 +436,10 @@ MOBG_Branch_Of_Dead_Tree,1881,Les,71428 MOBG_Branch_Of_Dead_Tree,1882,Baba-Yaga,71428 MOBG_Branch_Of_Dead_Tree,1883,Uzhas,71428 MOBG_Branch_Of_Dead_Tree,1884,Mavka,71428 -MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morroc,71428 +MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morocc,71428 MOBG_Branch_Of_Dead_Tree,1974,Banshee Master,71428 MOBG_Branch_Of_Dead_Tree,1975,Beholder Master,71428 MOBG_Branch_Of_Dead_Tree,1976,Cobalt Mineral,71428 diff --git a/db/pre-re/mob_db.txt b/db/pre-re/mob_db.txt index d9f4f80b39..6389bd52d8 100644 --- a/db/pre-re/mob_db.txt +++ b/db/pre-re/mob_db.txt @@ -519,7 +519,7 @@ 1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,3,1647,2576,26,52,0,1,90,124,74,45,14,12,2,7,62,0x6280084,170,854,2016,480,43632,607,5500,608,3500,732,5500,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1 -// Louyang +// Luoyang 1512,HYEGUN,Hyegun,Yao Jun,56,9981,0,2199,1022,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,0x3885,180,890,1320,720,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1 1513,CIVIL_SERVANT,Civil Servant,Mao Guai,62,14390,0,4023,2750,2,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,0x3885,200,1257,528,432,0,0,0,0,0,0,0,7262,4171,7263,2000,606,10,1023,100,693,100,0,0,0,0,0,0,0,0,4202,1 1514,DANCING_DRAGON,Dancing Dragon,Zhu Po Long,54,9136,0,3030,769,2,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,0x83,160,600,840,504,0,0,0,0,0,0,0,7266,4365,7265,3000,7268,800,1036,1000,7038,3000,0,0,0,0,0,0,0,0,4272,1 @@ -959,17 +959,17 @@ 1914,OBJ_A2,Blue Crystal,Blue Crystal,90,250,0,0,0,0,1,2,100,99,1,1,1,1,1,1,0,0,2,0,20,0x6370000,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1915,OBJ_B2,Pink Crystal,Pink Crystal,90,250,0,0,0,0,1,2,100,99,1,1,1,1,1,1,0,0,2,0,20,0x6370000,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -// Satan Morroc -1916,MOROCC,Satan Morroc,Satan Morroc,99,8388607,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x6203695,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1917,MOROCC_,Wounded Morroc,Wounded Morroc,99,8388607,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x6283695,100,576,540,432,1800000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 -1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,61000,140000,1,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 -1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 -1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,143000,0,50000,80000,2,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 -1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 -1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1923,G_MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1924,G_MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,1200000,0,0,0,2,16000,16001,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1925,G_MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,1200000,0,0,0,1,16000,16001,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +// Satan Morocc +1916,MOROCC,Satan Morocc,Satan Morocc,99,8388607,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x6203695,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1917,MOROCC_,Wounded Morocc,Wounded Morocc,99,8388607,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x6283695,100,576,540,432,1800000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 +1918,MOROCC_1,Incarnation of Morocc,Incarnation of Morocc,97,190000,0,61000,140000,1,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +1919,MOROCC_2,Incarnation of Morocc,Incarnation of Morocc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 +1920,MOROCC_3,Incarnation of Morocc,Incarnation of Morocc,96,143000,0,50000,80000,2,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 +1921,MOROCC_4,Incarnation of Morocc,Incarnation of Morocc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 +1922,G_MOROCC_1,Incarnation of Morocc,Incarnation of Morocc,97,1200000,0,0,0,1,16000,16001,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1923,G_MOROCC_2,Incarnation of Morocc,Incarnation of Morocc,97,1200000,0,0,0,1,16000,16001,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1924,G_MOROCC_3,Incarnation of Morocc,Incarnation of Morocc,96,1200000,0,0,0,2,16000,16001,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1925,G_MOROCC_4,Incarnation of Morocc,Incarnation of Morocc,98,1200000,0,0,0,1,16000,16001,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // God Item Creation (WoE SE); Catacombs 1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,10,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,1062,3000,1062,3000,0,0,535,3000,535,3000,535,3000,0,0,0,0,0,0,0,0 1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,10,0,45,1,51,14,0,60,0,10,12,0,6,68,0x2003095,150,1960,960,504,0,0,0,0,0,0,0,1059,5000,1059,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt index 779fddf69b..8ac3331051 100644 --- a/db/pre-re/mob_skill_db.txt +++ b/db/pre-re/mob_skill_db.txt @@ -4854,206 +4854,206 @@ 1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,, -// Satan Morroc (12.1) +// Satan Morocc (12.1) //5% HP - Dragon Fear -1916,Satan Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 -1916,Satan Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1916,Satan Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1916,Satan Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 //10% HP - Talk -1916,Satan Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 -1916,Satan Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1916,Satan Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1916,Satan Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 //30% HP - Earthquake Combo -1916,Satan Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1916,Satan Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1916,Satan Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1916,Satan Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1916,Satan Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, //40% HP - Mixed Combo -1916,Satan Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1916,Satan Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1916,Satan Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1916,Satan Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1916,Satan Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, //50% HP - Vampire Combo -1916,Satan Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1916,Satan Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1916,Satan Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1916,Satan Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1916,Satan Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, //60% HP - Hell Combo -1916,Satan Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1916,Satan Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1916,Satan Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1916,Satan Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1916,Satan Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, //80% HP - Magic Combo -1916,Satan Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1916,Satan Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1916,Satan Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1916,Satan Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1916,Satan Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 -1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1916,Satan Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1916,Satan Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, -1916,Satan Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, +1916,Satan Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1916,Satan Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1916,Satan Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1916,Satan Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1916,Satan Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1916,Satan Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 +1916,Satan Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1916,Satan Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1916,Satan Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, +1916,Satan Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, //5% HP - Dragon Fear -1917,Wounded Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 -1917,Wounded Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1917,Wounded Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1917,Wounded Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 //10% HP - Talk -1917,Wounded Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 -1917,Wounded Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1917,Wounded Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1917,Wounded Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 //30% HP - Earthquake Combo -1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1917,Wounded Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1917,Wounded Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, //40% HP - Mixed Combo -1917,Wounded Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1917,Wounded Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1917,Wounded Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1917,Wounded Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1917,Wounded Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, //50% HP - Vampire Combo -1917,Wounded Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1917,Wounded Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1917,Wounded Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1917,Wounded Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1917,Wounded Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, //60% HP - Hell Combo -1917,Wounded Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1917,Wounded Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1917,Wounded Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1917,Wounded Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1917,Wounded Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, //80% HP - Magic Combo -1917,Wounded Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1917,Wounded Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1917,Wounded Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1917,Wounded Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1917,Wounded Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 -1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1917,Wounded Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1917,Wounded Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, -1917,Wounded Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1918,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1918,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1918,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1918,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, -1918,Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1919,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1919,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1919,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1919,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,, -1920,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1920,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1920,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1920,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, -1920,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, -1921,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1921,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36, -1921,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,, -1921,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, -1921,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, -1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, -1922,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6, -1922,Incarnation of Morroc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,, -1922,Incarnation of Morroc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, -1923,Incarnation of Morroc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, -1923,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,, -1923,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36, -1924,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36, -1925,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36, +1917,Wounded Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1917,Wounded Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1917,Wounded Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1917,Wounded Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1917,Wounded Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1917,Wounded Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 +1917,Wounded Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1917,Wounded Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1917,Wounded Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, +1917,Wounded Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1918,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1918,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1918,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1918,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, +1918,Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1919,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1919,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1919,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1919,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,, +1920,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1920,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1920,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1920,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, +1920,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, +1921,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1921,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36, +1921,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,, +1921,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, +1921,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, +1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, +1922,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6, +1922,Incarnation of Morocc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,, +1922,Incarnation of Morocc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, +1923,Incarnation of Morocc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, +1923,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,, +1923,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36, +1924,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36, +1925,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36, 1927,Whisper@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,, 1927,Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,, 1927,Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,, diff --git a/db/pre-re/produce_db.txt b/db/pre-re/produce_db.txt index 83e3fc8a59..d5d36204fa 100644 --- a/db/pre-re/produce_db.txt +++ b/db/pre-re/produce_db.txt @@ -192,7 +192,7 @@ //--------------------LEVEL 4----------- -//-- Morroc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape +//-- Morocc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape 70,12049,14,0,0,7475,0,578,10,568,4,582,10,970,2,514,5 //-- Seasoned Jellyfish <-- 30 Tentacle, 10 White Herb, 10 Soft Blade Grass, 1 Old Frying Pan, 20 Squid Ink 71,12054,14,0,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20 diff --git a/db/pre-re/quest_db.txt b/db/pre-re/quest_db.txt index 29e0b96dab..013603284f 100644 --- a/db/pre-re/quest_db.txt +++ b/db/pre-re/quest_db.txt @@ -29,11 +29,11 @@ 1101,0,1164,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Sphinx Dungeon!" 1102,0,1194,40,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Clock Tower!" 1103,0,1213,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Clock Tower!" -1104,0,1519,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" -1105,0,1513,50,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" +1104,0,1519,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" +1105,0,1513,50,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" 1106,0,1375,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Amatsu Dungeon!" 1107,0,1403,40,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Amatsu Dungeon!" -1108,0,1631,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" +1108,0,1631,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" // Ropewa & Yuridi Quest 1109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth" @@ -1416,10 +1416,10 @@ 8120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Katinshuell" 8121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Katinshuell" 8122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bruspetti's resting place" -8123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" +8123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" 8127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" 8128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" 8129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" @@ -1783,7 +1783,7 @@ 10102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of the sphinx dungeon" 10103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Glast heim" -10104,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Yuno" +10104,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Juno" 10105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of a clock tower" 10106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of localizing " 10107,0,1164,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sphinx dungeon - Requiem" diff --git a/db/re/achievement_db.yml b/db/re/achievement_db.yml index c10e21e1ed..9afe2c89f7 100644 --- a/db/re/achievement_db.yml +++ b/db/re/achievement_db.yml @@ -452,7 +452,7 @@ Body: Score: 10 - ID: 120061 Group: "AG_ADVENTURE" - Name: "Yuno Field Exploration" + Name: "Juno Field Exploration" Reward: ItemID: 22876 Score: 10 @@ -704,7 +704,7 @@ Body: Score: 10 - ID: 120103 Group: "AG_ADVENTURE" - Name: "Gonryun Field Exploration" + Name: "Kunlun Field Exploration" Reward: ItemID: 22876 Score: 10 @@ -890,7 +890,7 @@ Body: Score: 20 - ID: 120134 Group: "AG_ADVENTURE" - Name: "Gonryun Dungeon Exploration" + Name: "Kunlun Dungeon Exploration" Reward: ItemID: 22876 Score: 20 @@ -1000,7 +1000,7 @@ Body: Score: 10 - ID: 127005 Group: "AG_CHATTING" - Name: "Yuno Contribution" + Name: "Juno Contribution" Map: "yuno" Target: - Id: 0 @@ -1564,7 +1564,7 @@ Body: Score: 20 - ID: 129008 Group: "AG_ADVENTURE" - Name: "Rune Midgard Explorer" + Name: "Rune-Midgarts Explorer" Dependent: - Id: 129001 - Id: 129002 @@ -1578,7 +1578,7 @@ Body: Score: 50 - ID: 129009 Group: "AG_ADVENTURE" - Name: "Yuno Explorer" + Name: "Juno Explorer" Dependent: - Id: 120052 - Id: 120053 diff --git a/db/re/item_db.txt b/db/re/item_db.txt index e1b75040d2..2686e2b564 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -439,7 +439,7 @@ 1085,Mage_Test_2,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1086,Mage_Test_3,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1087,Mage_Test_4,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} -1088,Morocc_Potion,Morroc Solution,3,0,,10,,,,,,,,,,,,,{},{},{} +1088,Morocc_Potion,Morocc Solution,3,0,,10,,,,,,,,,,,,,{},{},{} 1089,Payon_Potion,Payon Solution,3,0,,10,,,,,,,,,,,,,{},{},{} 1090,Mage_Test_Etc,Unknown Test Tube,3,0,,10,,,,,,,,,,,,,{},{},{} 1091,Merchant_Box_Etc,Delivery Box,3,0,,10,,,,,,,,,,,,,{},{},{} @@ -3578,7 +3578,7 @@ 5389,Angel_Spirit,Angel Spirit,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,0,0,394,{ bonus bStr,2; bonus bHit,15; },{},{} 5390,Santa_Hat_2,Frozen Twin Pompom,4,20,,100,,4,,0,0xFFFFFFFF,63,2,256,,0,1,395,{ bonus2 bResEff,Eff_Freeze,3000; },{},{} 5391,Toast_C,Toast,4,20,,0,,1,,0,0xFFFFFFFF,63,2,1,,0,0,188,{ bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10; },{},{} -5392,Louyang_Cap,Louyang NewYear Hat,4,20,,300,,6,,1,0xFFFFFFFF,63,2,256,,0,1,396,{ bonus bLuk,2; },{},{} +5392,Louyang_Cap,Luoyang NewYear Hat,4,20,,300,,6,,1,0xFFFFFFFF,63,2,256,,0,1,396,{ bonus bLuk,2; },{},{} 5393,Valentine_Hat,Love Valentine's Hat,4,20,,200,,4,,0,0xFFFFFFFF,63,2,256,,0,0,397,{ bonus bMaxSPrate,7; bonus bMaxHPrate,7; },{},{} 5394,Bubblegum_Lower,Bubblegum,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1,,0,0,572,{ bonus2 bExpAddClass,Class_All,100; },{},{} 5395,Tiraya_Bonnet,Striped Hat,4,20,,500,,6,,1,0xFFFFFFFF,63,2,256,,50,1,398,{ bonus bMaxHP,100+(getrefine()*20); bonus bLuk,3; },{},{} @@ -4125,7 +4125,7 @@ 6026,Marriage_Covenant,Written Oath Of Marriage,3,0,,10,,,,,,,,,,,,,{},{},{} 6027,Crystal_Of_Feardoom,Crystal Of Feardom,3,0,,0,,,,,,,,,,,,,{},{},{} 6028,Seal_Scroll,Sealed Scroll,3,0,,0,,,,,,,,,,,,,{},{},{} -6029,Morocc_Tracing_Log,Morroc Tracing Log,3,0,,0,,,,,,,,,,,,,{},{},{} +6029,Morocc_Tracing_Log,Morocc Tracing Log,3,0,,0,,,,,,,,,,,,,{},{},{} 6030,Glitering_PaperA,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} 6031,Glitering_PaperB,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} 6032,Horn_Of_Hilsrion,Horn of Hillslion,3,500,,10,,,,,,,,,,,,,{},{},{} @@ -4924,7 +4924,7 @@ 6923,Bright_Fire_Lights,Bright Fire Lights,3,10,,10,,,,,,,,,,,,,{},{},{} 6924,Red_Eye,Red Eye,3,10,,10,,,,,,,,,,,,,{},{},{} 6925,Letter_Of_Prisoner,Letter Of Prisoner,3,10,,0,,,,,,,,,,,,,{},{},{} -6926,Rune-Midgard_History_Book,Rune-Midgard History Book,3,10,,0,,,,,,,,,,,,,{},{},{} +6926,Rune-Midgard_History_Book,Rune-Midgarts History Book,3,10,,0,,,,,,,,,,,,,{},{},{} 6927,Stone_That_Contained_Sea,Stone That Contained Sea,3,10,,0,,,,,,,,,,,,,{},{},{} 6928,Poring_Scourer,Poring Scourer,3,10,,0,,,,,,,,,,,,,{},{},{} 6929,Letter_With_Stamped_Seal,Letter With Stamped Seal,3,10,,0,,,,,,,,,,,,,{},{},{} @@ -5317,7 +5317,7 @@ 7332,Slate,Complete Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7333,Piece_Of_Slate_1,Prontera Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7334,Piece_Of_Slate_2,Payon Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} -7335,Piece_Of_Slate_3,Morroc Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} +7335,Piece_Of_Slate_3,Morocc Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7336,Piece_Of_Slate_4,Geffen Tablet,3,0,,0,,,,,,,,,,,,,{},{},{} 7337,Eye_Of_Hellion,Eye of Hellion,3,0,,0,,,,,,,,,,,,,{},{},{} 7338,RO_Transportation_Card,One-way Ticket,3,0,,0,,,,,,,,,,,,,{},{},{} @@ -5514,11 +5514,11 @@ 7529,Stolen_Sandals,Stolen Sandal,3,0,,0,,,,,,,,,,,,,{},{},{} 7530,Travel_Brochure_01,Travel Brochure [Amatsu],3,0,,0,,,,,,,,,,,,,{},{},{} 7531,Travel_Brochure_02,Travel Brochure [Kunlun],3,0,,0,,,,,,,,,,,,,{},{},{} -7532,Travel_Brochure_03,Travel Brochure [Louyang],3,0,,0,,,,,,,,,,,,,{},{},{} +7532,Travel_Brochure_03,Travel Brochure [Luoyang],3,0,,0,,,,,,,,,,,,,{},{},{} 7533,Travel_Brochure_04,Travel Brochure [Ayothaya],3,0,,0,,,,,,,,,,,,,{},{},{} 7534,Photo_Album_01,Amatsu Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7535,Photo_Album_02,Kunlun Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} -7536,Photo_Album_03,Louyang Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} +7536,Photo_Album_03,Luoyang Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7537,Photo_Album_04,Ayothaya Completed Photo Album,3,0,,0,,,,,,,,,,,,,{},{},{} 7538,Sifted_Sand,Sand for Work,3,0,,0,,,,,,,,,,,,,{},{},{} 7539,Poring_Coin,Poring Coin,3,0,,0,,,,,,,,,,,,,{},{},{} @@ -6345,7 +6345,7 @@ 12046,Int_Dish01,Grape Juice Herbal Tea,0,2000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,1; percentheal 0,5; },{},{} 12047,Int_Dish02,Autumn Red Tea,0,4000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,2; percentheal 0,5; },{},{} 12048,Int_Dish03,Honey Herbal Tea,0,6000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,3; percentheal 0,5; },{},{} -12049,Int_Dish04,Morroc Fruit Wine,0,8000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,4; percentheal 0,5; },{},{} +12049,Int_Dish04,Morocc Fruit Wine,0,8000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,4; percentheal 0,5; },{},{} 12050,Int_Dish05,Mastela Fruit Wine,0,10000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1200000,5; percentheal 0,10; },{},{} 12051,Vit_Dish01,Steamed Crab Nippers,0,2000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1200000,1; percentheal 5,0; },{},{} 12052,Vit_Dish02,Assorted Seafood,0,4000,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1200000,2; percentheal 5,0; },{},{} @@ -6616,7 +6616,7 @@ 12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 12318,Little_Heart,Small Hearts,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{} -12320,Pineapple_Juice,Schwartzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_HITFOOD,600000,10; sc_start SC_FLEEFOOD,600000,20; },{},{} +12320,Pineapple_Juice,Schwarzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_HITFOOD,600000,10; sc_start SC_FLEEFOOD,600000,20; },{},{} 12321,Spicy_Sandwich,Arunafeltz Desert Sandwich,2,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INCCRI,600000,7; },{},{} 12322,Chocolate_Pie,Chocolate Pie,0,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,5; },{},{} 12323,N_Fly_Wing,Novice Fly Wing,11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "AL_TELEPORT",1; },{},{} @@ -6748,7 +6748,7 @@ 12449,F_Luk_Dish10_,F Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,1800000,10; },{},{} 12450,F_Vit_Dish10_,F Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1800000,10; },{},{} 12451,F_WOB_Rune,F WOB Rune,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} -12452,F_WOB_Schwaltz,F WOB Schwaltz,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} +12452,F_WOB_Schwaltz,F WOB Schwarz,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 12453,F_WOB_Rachel,F WOB Rachel,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 12454,F_WOB_Local,F WOB Local,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 12456,F_Greed_Scroll,F Greed Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} @@ -8685,7 +8685,7 @@ 14695,Costume_Enchant_Stone_Box_3,Costume Enchant Stone Box III,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem rand(6790,6792),1; getitem 4936,1; getitem 4937,1; getitem 4938,1; },{},{} 14696,Sealed_Gloom_Under_Night_Gachapon,Sealed Gloom Under Night Gachapon,18,0,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /* getitem callfunc("F_Rand",Sealed Cards Gloom Under Night, 9 weapons smelting ticket, Armor 9 smelting ticket, medium armor Shadow, Shadow Weapon Medium, costume Wings of the Kirin, costume enchant stone box); */ },{},{} 14699,Garuda_Scroll,Memorial Garuda Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Garuda_Scroll); },{},{} -14701,TW_13y_Lucky_Egg_06,Rune Midgard Imortal Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_TW_13y_Lucky_Egg_06); },{},{} +14701,TW_13y_Lucky_Egg_06,Midgard Immortal Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_TW_13y_Lucky_Egg_06); },{},{} 14704,Gemstone_Shadow_Box,Gemstone Shadow Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 24084,1; getitem 24085,1; getitem 24086,1; getitem 24087,1; getitem 24088,1; getitem 24089,1; },{},{} 14705,Sealed_Fallen_Bishop_Hibram_Scroll,Sealed Fallen Bishop Hibram Scroll,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: COnfirm the rates*/ getitem callfunc("F_Rand",6228,6232,14704,19884,14695,6697),1; },{},{} 14713,Sealed_Ifrit_Scroll,Sealed Ifrit Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /* getitem callfunc("F_Rand",Sealed ifrit card, 9 weapons smelting ticket, Armor 9 smelting ticket, costume Noah's hats, costumes Enchantment Stone Box); */ },{},{} @@ -11162,7 +11162,7 @@ 20923,Illusion_Goibne_Spaulders,Illusion Goibne Spaulders,4,0,,1000,,47,,1,0xFFFFFFFE,63,2,4,,130,1,0,{ .@r = getrefine(); bonus bMdef,2; bonus bVit,1; if (.@r >= 7) { .@val = 5; if (.@r >= 9) { .@val += 10; } } if (.@val) { bonus2 bAddEle,Ele_Water,.@val; bonus2 bAddEle,Ele_Wind,.@val; bonus2 bAddEle,Ele_Earth,.@val; bonus2 bAddEle,Ele_Fire,.@val; } },{},{} 20925,Commander_Manteau2,Commander Manteau,4,20,,300,,20,,1,0xFFFFFFFF,63,2,4,,100,1,0,{ .@r = getrefine(); bonus bMaxHPrate,3; bonus bMaxSPrate,3; bonus bMdef,10; bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_Player,3; if (.@r>=5) { bonus bBaseAtk,20; bonus bMatk,20; bonus bMaxHPrate,7; bonus bMaxSPrate,7; } if (.@r>=7) { bonus bBaseAtk,30; bonus bMatk,30; bonus bMaxHPrate,10; bonus bMaxSPrate,10; } },{},{} 20931,Prism_Rangers_Scarf,Prism Rangers Scarf,4,20,,300,,12,,0,0xFFFFFFFF,63,2,4,,100,1,0,{ .@r = getrefine(); bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; if (.@r >= 7) { .@val = 10; } else if (.@r >= 5) { .@val = 5; } else { .@val = 2; } bonus bMaxHPrate,.@val; bonus bMaxSPrate,.@val; bonus bLongAtkRate,.@val+2*getskilllv("RA_AIMEDBOLT"); if (getskilllv("RA_WUGRIDER") == 3) { bonus2 bSkillCooldown,"RA_UNLIMIT",-180000; } if (getskilllv("RA_CAMOUFLAGE") == 5) { bonus bDelayrate,-10; } bonus2 bSkillCooldown,"RA_ARROWSTORM",-200; bonus2 bSkillAtk,"RA_ARROWSTORM",1; },{},{ sc_end SC_UNLIMIT; } -20932,Old_Morroc_Shawl,Old Morroc Shawl,4,20,,300,,10,,1,0xFFFFFFFF,63,2,4,,100,1,0,{ .@r= getrefine(); bonus bMaxHPrate,5; bonus bFlee,10; if (.@r>=7) bonus bFlee,20; if (.@r>=8) { bonus bFlee,30; bonus bRestartFullRecover; } if (.@r>=9) bonus bFlee,40; if (.@r>=10) bonus bFlee2,25; },{},{} +20932,Old_Morroc_Shawl,Old Morocc Shawl,4,20,,300,,10,,1,0xFFFFFFFF,63,2,4,,100,1,0,{ .@r= getrefine(); bonus bMaxHPrate,5; bonus bFlee,10; if (.@r>=7) bonus bFlee,20; if (.@r>=8) { bonus bFlee,30; bonus bRestartFullRecover; } if (.@r>=9) bonus bFlee,40; if (.@r>=10) bonus bFlee2,25; },{},{} 20933,Illusion_Engine_wing_A-type,Illusion Engine wing A-type,4,0,,900,,50,,1,0xFFFFFFFF,63,2,4,,130,1,,{ .@r = getrefine(); bonus bMaxHP,1000+(100*(.@r/2)); if (.@r >= 7) { bonus bAspdRate,5; } },{},{} 20934,Illusion_Engine_wing_B-type,Illusion Engine wing B-type,4,0,,900,,50,,1,0xFFFFFFFF,63,2,4,,130,1,,{ .@r = getrefine(); bonus bMaxHP,1000+(100*(.@r/2)); if (.@r >= 7) { bonus bVariableCastrate,-5; } },{},{} 20935,Lava_Leather_Manteau,Lava Leather Manteau,4,20,,400,,50,,1,0xFFFFFFFF,63,2,4,,175,1,0,{ bonus bHit,10; .@r = getrefine(); if (.@r>=7) bonus bHit,5; if (.@r>=9) bonus bHit,5; if (.@r>=11) bonus bDelayrate,-3; },{},{} @@ -12022,7 +12022,7 @@ 25152,Cherished_Bouquet,Cherished Bouquet,3,0,,0,,,,,,,,,,,,,{},{},{} 25153,Broken_Gun_Wreck,Broken Gun Wreck,3,0,,0,,,,,,,,,,,,,{},{},{} 25154,Antique_Gunpowder,Antique Gunpowder,3,0,,10,,,,,,,,,,,,,{},{},{} -25155,Schwartz's_Honor_Token,Schwartz's Honor Token,3,0,,0,,,,,,,,,,,,,{},{},{} +25155,Schwartz's_Honor_Token,Schwarz's Honor Token,3,0,,0,,,,,,,,,,,,,{},{},{} 25156,Piece_of_Chimera,Piece of Chimera,3,0,,10,,,,,,,,,,,,,{},{},{} 25157,Fallen_Leaves_Branch,Fallen Leaves Branch,3,0,,10,,,,,,,,,,,,,{},{},{} 25158,Core_Jelly,Core Jelly,3,0,,10,,,,,,,,,,,,,{},{},{} @@ -13165,7 +13165,7 @@ 31599,C_Medium_Wave,C Medium Wave,4,0,,,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1803,{},{},{} 31600,C_Kishu_Dog,C Kishu Dog,4,0,,,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1804,{},{},{} 31601,C_Under_Rim_Glasses_Blue,C Under Rim Glasses Blue,4,0,,,,0,,0,0xFFFFFFFF,63,2,2048,,1,,1805,{},{},{} -31602,C_Midgarts_Glory,C Rune Midgarts Glory,4,0,,,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1807,{ hateffect(HAT_EF_MIDGARTS_GLORY,true); },{},{ hateffect(HAT_EF_MIDGARTS_GLORY,false); } +31602,C_Midgarts_Glory,C Rune-Midgarts Glory,4,0,,,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1807,{ hateffect(HAT_EF_MIDGARTS_GLORY,true); },{},{ hateffect(HAT_EF_MIDGARTS_GLORY,false); } 31606,C_Autumn_Headband,C Autumn Headband,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1119,{},{},{} 31607,C_Cat_Ear_Witch_Hat,C Cat Ear Witch Hat,4,0,,,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1808,{},{},{} 31608,C_Magicstone_of_Grace,C Magic Stone of Grace,4,0,,,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,1420,{},{},{} diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt index 658ae09a0e..4b86b29140 100644 --- a/db/re/item_trade.txt +++ b/db/re/item_trade.txt @@ -321,9 +321,9 @@ 2723,499,100 // Medal_Mage 2724,499,100 // Medal_Archer 2725,499,100 // Medal_Merchant -2730,467,100 // Morroc_Seal -2731,467,100 // Morroc_Charm_Stone -2732,467,100 // Morroc_Ring +2730,467,100 // Morocc_Seal +2731,467,100 // Morocc_Charm_Stone +2732,467,100 // Morocc_Ring 2733,499,100 // Medal_Gunner 2734,507,100 // Directive_A 2735,507,100 // Directive_B @@ -1249,7 +1249,7 @@ 7801,499,100 // Girl_Fan_Letter 7802,499,100 // Autograph_Book 7803,475,100 // Battle_Manual_TW -7820,507,100 // Morroc_Skin +7820,507,100 // Morocc_Skin 7821,475,100 // Green_Apple 7822,475,100 // Whole_Barbecue 7823,475,100 // Meat_Veg_Skewer diff --git a/db/re/mob_branch.txt b/db/re/mob_branch.txt index ca06ec0528..afc2c653fb 100644 --- a/db/re/mob_branch.txt +++ b/db/re/mob_branch.txt @@ -436,10 +436,10 @@ MOBG_Branch_Of_Dead_Tree,1881,Les,71428 MOBG_Branch_Of_Dead_Tree,1882,Baba-Yaga,71428 MOBG_Branch_Of_Dead_Tree,1883,Uzhas,71428 MOBG_Branch_Of_Dead_Tree,1884,Mavka,71428 -MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morroc,71428 -MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morroc,71428 +MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morocc,71428 +MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morocc,71428 MOBG_Branch_Of_Dead_Tree,1974,Banshee Master,71428 MOBG_Branch_Of_Dead_Tree,1975,Beholder Master,71428 MOBG_Branch_Of_Dead_Tree,1976,Cobalt Mineral,71428 diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index bb1108cb5e..350dcae475 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -378,7 +378,7 @@ 1362,TREASURE_BOX39,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x6200000,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0 1363,TREASURE_BOX40,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x6200000,0,0,0,0,0,0,0,0,0,0,0,7092,80,658,500,604,10000,984,4850,985,7275,2506,43,2254,43,1529,38,0,0,0,0 -// Yuno (5.0) +// Juno (5.0) 1364,G_ASSULTER,Assaulter,Assaulter,98,7798,1,0,0,2,293,67,83,49,100,86,30,20,82,15,10,12,1,6,44,0x2003695,155,1000,900,432,0,0,0,0,0,0,0,1019,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1365,APOCALIPS,Apocalypse,Apocalypse,121,22090,1,3042,2282,2,1053,116,136,26,130,53,76,25,89,15,10,12,2,0,60,0x91,400,1840,1440,384,0,0,0,0,0,0,0,7095,5335,7094,2400,7093,2200,985,5,13161,1,2506,20,12735,100,0,0,0,0,4242,1 1366,LAVA_GOLEM,Lava Golem,Lava Golem,103,8452,1,2232,1674,1,777,53,299,27,126,42,103,28,77,15,10,12,2,0,83,0x3095,400,2190,2040,336,0,0,0,0,0,0,0,7096,4559,7097,3686,2317,1,2316,2,509,2500,1818,20,6245,500,0,0,0,0,4184,1 @@ -428,7 +428,7 @@ 1406,KAPHA,Kapha,Kapha,83,5470,1,1035,1164,1,306,32,61,38,67,59,40,31,61,24,10,12,1,5,21,0x3885,165,2012,1728,672,0,0,0,0,0,0,0,7149,6500,7053,3500,13304,20,521,2300,708,2,1915,10,13008,5,0,0,0,0,4287,1 //1407,DOKEBI_,Dokebi,Dokebi,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,0x0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -// Gonryun (6.1) +// Kunlun (6.1) 1408,BLOOD_BUTTERFLY,Bloody Butterfly,Bloody Butterfly,94,7030,1,1555,1749,3,361,67,79,50,70,68,40,55,90,30,10,12,1,4,44,0x200308D,145,472,576,288,0,0,0,0,0,0,0,7163,4608,7168,2500,602,1200,924,5500,0,0,1962,1,0,0,0,0,0,0,4327,1 1409,RICE_CAKE_BOY,Rice Cake Boy,Dumpling Child,60,2098,1,531,597,1,134,22,96,12,50,43,29,5,43,10,10,12,0,7,20,0x91,160,1247,768,420,0,0,0,0,0,0,0,7150,3200,7151,2500,2262,1,7192,5000,553,1000,7187,3000,0,0,0,0,0,0,4154,1 1410,LIVE_PEACH_TREE,Live Peach Tree,Enchanted Peach Tree,92,8777,1,1499,1724,7,351,72,109,40,76,52,55,40,77,50,10,12,1,3,42,0x2085,410,400,672,480,0,0,0,0,0,0,0,7164,4365,7939,100,526,1000,604,400,532,100,603,5,0,0,0,0,0,0,4217,1 @@ -996,16 +996,16 @@ 1915,OBJ_B2,Pink Crystal,Pink Crystal,90,750,1,0,0,0,1,1,160,99,1,1,1,1,1,1,0,0,2,0,20,0x6370000,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Dimentional Gorge (12.1) -1916,MOROCC,Satan Morroc,Satan Morroc,151,7000000,1,0,0,2,5340,2640,400,65,165,182,180,225,180,89,10,12,2,6,87,0x6203695,100,312,624,432,0,0,0,0,0,0,0,5808,1500,2374,7000,2375,7000,2433,7000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 -1917,MOROCC_,Wounded Morroc,Wounded Morroc,151,5000000,1,4050000,3042000,2,4530,2880,425,65,165,185,200,245,180,89,10,12,2,6,87,0x6283695,100,312,624,432,2025000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 -1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,132,63900,1,4392,3294,1,1901,145,199,35,126,91,63,61,76,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 -1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,132,64922,1,5094,3821,1,1625,159,92,5,121,86,71,65,75,44,10,12,1,6,67,0x6203695,150,576,648,300,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 -1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,133,94800,1,5220,3780,2,1218,363,111,37,102,59,55,82,98,54,10,12,1,6,69,0x6203695,150,212,432,360,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 -1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,134,77389,1,4608,4056,1,1235,599,109,54,114,88,62,97,109,43,10,12,1,6,68,0x6203695,150,1536,648,300,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 -1922,G_MOROCC_1,Incarnation of Morroc,Shadow of Morroc,132,63900,1,0,0,1,1901,145,199,35,126,91,63,61,76,37,10,12,2,8,27,0x6203695,110,312,480,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1923,G_MOROCC_2,Incarnation of Morroc,Shadow of Morroc,132,64922,1,0,0,1,1625,159,92,5,121,86,71,65,75,44,10,12,1,6,67,0x6203695,150,312,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1924,G_MOROCC_3,Incarnation of Morroc,Shadow of Morroc,133,94800,1,0,0,2,1218,363,111,37,102,59,55,82,98,54,10,12,1,6,69,0x6203695,150,212,432,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1925,G_MOROCC_4,Incarnation of Morroc,Shadow of Morroc,134,77389,1,0,0,1,1235,599,109,54,114,88,62,97,109,43,10,12,1,6,68,0x6203695,150,1536,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1916,MOROCC,Satan Morocc,Satan Morocc,151,7000000,1,0,0,2,5340,2640,400,65,165,182,180,225,180,89,10,12,2,6,87,0x6203695,100,312,624,432,0,0,0,0,0,0,0,5808,1500,2374,7000,2375,7000,2433,7000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 +1917,MOROCC_,Wounded Morocc,Wounded Morocc,151,5000000,1,4050000,3042000,2,4530,2880,425,65,165,185,200,245,180,89,10,12,2,6,87,0x6283695,100,312,624,432,2025000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 +1918,MOROCC_1,Incarnation of Morocc,Incarnation of Morocc,132,63900,1,4392,3294,1,1901,145,199,35,126,91,63,61,76,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +1919,MOROCC_2,Incarnation of Morocc,Incarnation of Morocc,132,64922,1,5094,3821,1,1625,159,92,5,121,86,71,65,75,44,10,12,1,6,67,0x6203695,150,576,648,300,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 +1920,MOROCC_3,Incarnation of Morocc,Incarnation of Morocc,133,94800,1,5220,3780,2,1218,363,111,37,102,59,55,82,98,54,10,12,1,6,69,0x6203695,150,212,432,360,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 +1921,MOROCC_4,Incarnation of Morocc,Incarnation of Morocc,134,77389,1,4608,4056,1,1235,599,109,54,114,88,62,97,109,43,10,12,1,6,68,0x6203695,150,1536,648,300,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 +1922,G_MOROCC_1,Incarnation of Morocc,Shadow of Morocc,132,63900,1,0,0,1,1901,145,199,35,126,91,63,61,76,37,10,12,2,8,27,0x6203695,110,312,480,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1923,G_MOROCC_2,Incarnation of Morocc,Shadow of Morocc,132,64922,1,0,0,1,1625,159,92,5,121,86,71,65,75,44,10,12,1,6,67,0x6203695,150,312,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1924,G_MOROCC_3,Incarnation of Morocc,Shadow of Morocc,133,94800,1,0,0,2,1218,363,111,37,102,59,55,82,98,54,10,12,1,6,69,0x6203695,150,212,432,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1925,G_MOROCC_4,Incarnation of Morocc,Shadow of Morocc,134,77389,1,0,0,1,1235,599,109,54,114,88,62,97,109,43,10,12,1,6,68,0x6203695,150,1536,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // God Item Creation (WoE SE); Catacombs 1926,JAKK_H,Jakk,Jakk,1,1000,0,0,0,1,1,1,1,1,1,1,1,1,1,1,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,12396,1000,6298,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1526,8 +1526,8 @@ 2372,SOIL,Soil,Soil,1,15,0,0,0,1,1,1,100,99,0,0,0,0,0,0,7,12,0,3,22,0x170000,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2373,ROCK,Rock,Rock,1,15,0,0,0,1,1,1,100,99,0,0,0,0,0,0,7,12,0,3,22,0x170000,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2374,THICKET,Thicket,Thicket,1,15,0,0,0,1,1,1,100,99,0,0,0,0,0,0,7,12,0,3,22,0x170000,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2375,MOROCC_4_142,Incarnation of Morroc,Incarnation of Morroc,100,4444,1,0,0,1,171,85,80,6,114,88,62,97,164,43,10,12,1,6,69,0x83,150,1536,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2376,MOROCC_2_142,Incarnation of Morroc,Incarnation of Morroc,100,2000,1,0,0,1,181,83,81,5,121,86,71,65,113,44,10,12,1,6,67,0x83,150,576,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2375,MOROCC_4_142,Incarnation of Morocc,Incarnation of Morocc,100,4444,1,0,0,1,171,85,80,6,114,88,62,97,164,43,10,12,1,6,69,0x83,150,1536,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2376,MOROCC_2_142,Incarnation of Morocc,Incarnation of Morocc,100,2000,1,0,0,1,181,83,81,5,121,86,71,65,113,44,10,12,1,6,67,0x83,150,576,648,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2377,E_NOVUS_,Novus,Novus,1,12,1,0,0,1,50,50,1,1,1,10,1,10,30,5,10,12,0,9,20,0x83,100,252,816,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2378,MER_ANTLER_SCARABA,Antler Scaraba,Antler Scaraba,136,30000,1,0,0,1,1418,410,155,102,23,99,59,129,137,45,10,12,1,4,42,0x6203695,200,504,624,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2379,XMAS_SMOKEY_SOCK,Smokey Sock,Socks Stealing Raccoon,10,10,1,0,0,1,70,11,1,0,1,1,16,5,100,100,10,12,0,2,22,0x2170081,200,1576,576,420,0,0,0,0,0,0,0,7909,3000,7910,3000,6682,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1899,9 +1899,9 @@ 2739,C1_MUMMY,Swift Mummy,Swift Mummy,55,10775,1,1275,4110,1,216,21,95,3,54,4,14,1,68,0,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,930,9000,756,100,934,550,2604,1,2611,10,525,250,508,850,0,0,0,0,4106,1 2740,C2_MUMMY,Solid Mummy,Solid Mummy,55,21550,1,1275,4110,1,216,21,95,3,54,4,14,1,68,0,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,930,9000,756,100,934,550,2604,1,2611,10,525,250,508,850,0,0,0,0,4106,1 2741,C3_MUKA,Muka Ringleader,Muka Ringleader,23,2340,1,360,1215,1,79,9,28,0,18,9,28,5,43,5,10,12,2,3,22,0x81,300,1960,960,384,0,0,0,0,0,0,0,993,70,952,9000,601,2000,511,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1 -2742,C4_MOROCC_1,Furious Incarnation of Morroc,Furious Incarnation of Morroc,132,319500,1,14275,24705,1,2280,145,199,35,126,118,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 -2743,C5_MOROCC_1,Elusive Incarnation of Morroc,Elusive Incarnation of Morroc,132,319500,1,14275,24705,1,2281,145,199,35,126,91,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 -2744,C1_MOROCC_1,Swift Incarnation of Morroc,Swift Incarnation of Morroc,132,319500,1,14275,24705,1,2281,145,199,35,126,91,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +2742,C4_MOROCC_1,Furious Incarnation of Morocc,Furious Incarnation of Morocc,132,319500,1,14275,24705,1,2280,145,199,35,126,118,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +2743,C5_MOROCC_1,Elusive Incarnation of Morocc,Elusive Incarnation of Morocc,132,319500,1,14275,24705,1,2281,145,199,35,126,91,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +2744,C1_MOROCC_1,Swift Incarnation of Morocc,Swift Incarnation of Morocc,132,319500,1,14275,24705,1,2281,145,199,35,126,91,63,61,114,37,10,12,2,8,27,0x6203695,110,576,480,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 2745,C2_MOLE,Solid Holden,Solid Holden,85,62280,1,3315,10185,9,343,49,82,16,53,65,31,30,58,31,10,12,0,2,42,0x1089,300,1400,960,504,0,0,0,0,0,0,0,1017,5000,1018,5000,5119,50,0,0,0,0,0,0,0,0,0,0,0,0,4343,1 2746,C3_MIYABI_NINGYO,Miyabi Doll Ringleader,Miyabi Doll Ringleader,85,25940,1,3070,9420,1,285,66,57,19,66,30,30,55,88,40,10,12,1,6,27,0x2000091,250,1938,2112,768,0,0,0,0,0,0,0,7152,5335,7153,2500,509,1550,1000,1250,12127,10,13014,5,0,0,0,0,0,0,4208,1 2747,C4_MINOROUS,Furious Minorous,Furious Minorous,58,9465,1,1425,4515,1,296,36,100,10,65,54,36,43,61,25,10,12,2,2,43,0x3095,200,1360,960,432,0,0,0,0,0,0,0,941,5335,756,196,1361,2,1005,10,6254,10,1301,200,568,300,0,0,0,0,4126,1 @@ -2155,17 +2155,17 @@ 2995,XM_TEDDY_BEAR,Abandoned Teddy Bear,Abandoned Teddy Bear,148,180000,1,6666,7332,1,1444,1444,106,44,44,166,44,44,166,44,10,12,0,6,69,0x2003295,150,512,780,504,0,0,0,0,0,0,0,7317,1900,615,150,12074,100,12734,1000,12738,100,0,0,0,0,0,0,0,0,31022,1 2996,XM_CELINE_KIMI,Celine Kimi,Celine Kimi,160,66666666,1,4444444,4033332,2,6666,6666,479,444,144,166,44,444,166,166,10,12,2,1,28,0x6283695,100,768,1056,480,444444,616,10000,617,10000,22534,10000,22534,4000,18549,4000,7642,4000,19701,100,13442,100,712,10000,0,0,0,0,0,0,0,0 2997,G_XM_CELINE_KIMI,Kimi's Phantom,Kimi's Phantom,160,66666666,1,0,0,2,6666,6666,479,444,144,166,44,444,166,166,10,12,2,1,28,0x6203695,100,768,1056,480,0,0,0,0,0,0,0,6683,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2998,EP14_MORS_EVENT,Weakened Morroc,Weakened Morroc,158,1771440,1,12390,16104,1,1872,900,113,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2998,EP14_MORS_EVENT,Weakened Morocc,Weakened Morocc,158,1771440,1,12390,16104,1,1872,900,113,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2999,EP14_MORS_BOSSA,Morocc Necromancer,Morocc Necromancer,158,4000000,1,2106000,1336500,1,700,0,215,555,165,190,142,146,299,93,12,12,1,7,60,0x6280085,100,300,384,288,0,0,0,0,0,0,0,607,2000,603,200,604,200,0,0,0,0,0,0,522,200,0,0,0,0,0,0 3000,EP14_MORS_BOSSB,Morocc Necromancer,Morocc Necromancer,101,80000000,1,2310750,1465200,12,700,1,1,1,1,1,1,180,1,1,12,12,1,7,82,0x6280085,2000,2700,384,288,0,0,0,0,0,0,0,607,2000,603,200,604,200,22537,10000,22537,10000,0,0,522,200,0,0,0,0,0,0 -3001,EP14_MORS_MOB1,Morroc's Ghoul,Morroc's Ghoul,158,295240,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,1000,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3002,EP14_MORS_MOB2,Morroc's Osiris,Morroc's Osiris,158,442860,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3003,EP14_MORS_MOB3,Morroc's Archer Skeleton,Morroc's Archer Skeleton,158,295240,1,1239,1610,7,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3004,EP14_MORS_MOB4,Morroc's Wraith,Morroc's Wraith,158,100000,1,1239,1610,1,90,90,13,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,600,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3005,EP14_MORS_MOB5,Morroc's Verit,Morroc's Verit,158,442860,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3006,EP14_MORS_MOB6,Morroc's Lude,Morroc's Lude,158,885720,1,1239,1610,3,113,113,113,45,87,51,45,88,299,50,12,12,0,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3001,EP14_MORS_MOB1,Morocc's Ghoul,Morocc's Ghoul,158,295240,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,1000,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3002,EP14_MORS_MOB2,Morocc's Osiris,Morocc's Osiris,158,442860,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3003,EP14_MORS_MOB3,Morocc's Archer Skeleton,Morocc's Archer Skeleton,158,295240,1,1239,1610,7,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3004,EP14_MORS_MOB4,Morocc's Wraith,Morocc's Wraith,158,100000,1,1239,1610,1,90,90,13,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,600,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3005,EP14_MORS_MOB5,Morocc's Verit,Morocc's Verit,158,442860,1,1239,1610,1,1872,900,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3006,EP14_MORS_MOB6,Morocc's Lude,Morocc's Lude,158,885720,1,1239,1610,3,113,113,113,45,87,51,45,88,299,50,12,12,0,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 3007,EP14_MORS_DUMMY,Death Soul,Death Soul,158,99999999,1,0,0,1,1872,900,113,45,87,51,45,88,106,50,12,12,0,6,60,0x6370000,195,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -3008,EP14_MORS_HIDDEN,Morroc Hidden,Morroc Hidden,158,295240,1,0,0,1,1,1,113,45,1,51,45,255,106,50,12,12,0,6,60,0x620008C,2000,2000,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3008,EP14_MORS_HIDDEN,Morocc Hidden,Morocc Hidden,158,295240,1,0,0,1,1,1,113,45,1,51,45,255,106,50,12,12,0,6,60,0x620008C,2000,2000,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //3009,EP14_3_DEATH_BOSS 3010,EP14_3_DEATH_A_MOB1,Corrupt Orc Baby,Corrupt Orc Baby,158,250000,1,12390,16104,1,948,215,240,50,120,85,80,60,88,50,10,12,0,7,42,0x0000085,150,864,400,150,0,0,0,0,0,0,0,607,10,603,20,604,20,715,20,717,20,716,20,522,20,0,0,0,0,0,0 3011,EP14_3_DEATH_A_MOB2,Corrupt Baby Desert Wol,Corrupt Baby Desert Wol,158,232890,1,12390,16104,1,948,215,240,45,100,85,100,88,120,50,10,12,0,2,43,0x0000085,150,864,400,150,0,0,0,0,0,0,0,607,10,603,20,604,20,715,20,717,20,716,20,522,20,0,0,0,0,0,0 diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt index d06308e727..d6a0dd596a 100644 --- a/db/re/mob_skill_db.txt +++ b/db/re/mob_skill_db.txt @@ -4855,206 +4855,206 @@ 1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,, -// Satan Morroc (12.1) +// Satan Morocc (12.1) //5% HP - Dragon Fear -1916,Satan Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 -1916,Satan Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1916,Satan Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1916,Satan Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 //10% HP - Talk -1916,Satan Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 -1916,Satan Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1916,Satan Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1916,Satan Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 //30% HP - Earthquake Combo -1916,Satan Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1916,Satan Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1916,Satan Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, -1916,Satan Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1916,Satan Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1916,Satan Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1916,Satan Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, //40% HP - Mixed Combo -1916,Satan Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1916,Satan Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1916,Satan Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, -1916,Satan Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1916,Satan Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1916,Satan Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1916,Satan Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, //50% HP - Vampire Combo -1916,Satan Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1916,Satan Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1916,Satan Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, -1916,Satan Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1916,Satan Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1916,Satan Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1916,Satan Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, //60% HP - Hell Combo -1916,Satan Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1916,Satan Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1916,Satan Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, -1916,Satan Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1916,Satan Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1916,Satan Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1916,Satan Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, //80% HP - Magic Combo -1916,Satan Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1916,Satan Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1916,Satan Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1916,Satan Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1916,Satan Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1916,Satan Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1916,Satan Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 -1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1916,Satan Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1916,Satan Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, -1916,Satan Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, +1916,Satan Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1916,Satan Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1916,Satan Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1916,Satan Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1916,Satan Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1916,Satan Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1916,Satan Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1916,Satan Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 +1916,Satan Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1916,Satan Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1916,Satan Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, +1916,Satan Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, //5% HP - Dragon Fear -1917,Wounded Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 -1917,Wounded Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1917,Wounded Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 +1917,Wounded Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17 //10% HP - Talk -1917,Wounded Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 -1917,Wounded Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1917,Wounded Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 +1917,Wounded Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16 //30% HP - Earthquake Combo -1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 -1917,Wounded Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, -1917,Wounded Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6 +1917,Wounded Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, +1917,Wounded Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,, //40% HP - Mixed Combo -1917,Wounded Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1917,Wounded Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 -1917,Wounded Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, -1917,Wounded Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1917,Wounded Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14 +1917,Wounded Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, +1917,Wounded Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,, //50% HP - Vampire Combo -1917,Wounded Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1917,Wounded Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 -1917,Wounded Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, -1917,Wounded Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1917,Wounded Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15 +1917,Wounded Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, +1917,Wounded Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,, //60% HP - Hell Combo -1917,Wounded Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1917,Wounded Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 -1917,Wounded Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, -1917,Wounded Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1917,Wounded Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3 +1917,Wounded Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, +1917,Wounded Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,, //80% HP - Magic Combo -1917,Wounded Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1917,Wounded Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 -1917,Wounded Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, -1917,Wounded Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1917,Wounded Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1917,Wounded Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, -1917,Wounded Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 -1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1917,Wounded Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 -1917,Wounded Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, -1917,Wounded Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1918,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1918,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1918,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1918,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, -1918,Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,, -1918,Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1919,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1919,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1919,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1919,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, -1919,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,, -1920,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1920,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1920,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1920,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, -1920,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, -1920,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, -1921,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -1921,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36, -1921,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,, -1921,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, -1921,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1922,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, -1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, -1922,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, -1922,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6, -1922,Incarnation of Morroc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,, -1922,Incarnation of Morroc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,, -1922,Incarnation of Morroc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1923,Incarnation of Morroc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, -1923,Incarnation of Morroc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, -1923,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,, -1923,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,, -1923,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, -1924,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36, -1924,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36, -1925,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, -1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, -1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36, +1917,Wounded Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1917,Wounded Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2 +1917,Wounded Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,, +1917,Wounded Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1917,Wounded Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1917,Wounded Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1917,Wounded Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,, +1917,Wounded Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1 +1917,Wounded Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1917,Wounded Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4 +1917,Wounded Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,, +1917,Wounded Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1918,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1918,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1918,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1918,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, +1918,Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,, +1918,Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1919,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1919,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1919,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1919,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, +1919,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,, +1920,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1920,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1920,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1920,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, +1920,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, +1920,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36, +1921,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +1921,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36, +1921,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,, +1921,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, +1921,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1922,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, +1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,, +1922,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,, +1922,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6, +1922,Incarnation of Morocc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,, +1922,Incarnation of Morocc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,, +1922,Incarnation of Morocc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1923,Incarnation of Morocc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, +1923,Incarnation of Morocc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,, +1923,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,, +1923,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,, +1923,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,, +1924,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36, +1924,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36, +1925,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,, +1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36, +1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36, 1927,Whisper@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,, 1927,Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,, 1927,Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,, @@ -9829,47 +9829,47 @@ 2741,Muka Ringleader@NPC_PIERCINGATT,attack,158,2,500,0,5000,yes,target,always,,,,,,,6, 2741,Muka Ringleader@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,, 2741,Muka Ringleader@NPC_SUMMONSLAVE,idle,196,2,10000,700,30000,no,self,slavele,0,1055,,,,,, -2742,Furious Incarnation of Morroc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -2742,Furious Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -2742,Furious Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -2742,Furious Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, -2742,Furious Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, -2742,Furious Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, -2742,Furious Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, -2743,Elusive Incarnation of Morroc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -2743,Elusive Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -2743,Elusive Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -2743,Elusive Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, -2743,Elusive Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, -2743,Elusive Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, -2743,Elusive Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, -2744,Swift Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -2744,Swift Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -2744,Swift Incarnation of Morroc@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,, -2744,Swift Incarnation of Morroc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, -2744,Swift Incarnation of Morroc@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,, -2744,Swift Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, -2744,Swift Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, -2744,Swift Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, -2744,Swift Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, +2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +2742,Furious Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +2742,Furious Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +2742,Furious Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, +2742,Furious Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, +2742,Furious Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, +2742,Furious Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, +2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +2743,Elusive Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +2743,Elusive Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +2743,Elusive Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, +2743,Elusive Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, +2743,Elusive Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, +2743,Elusive Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, +2744,Swift Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +2744,Swift Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +2744,Swift Incarnation of Morocc@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,, +2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,, +2744,Swift Incarnation of Morocc@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,, +2744,Swift Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6, +2744,Swift Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,, +2744,Swift Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,, +2744,Swift Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,, 2745,Solid Holden@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,,,,,,,, 2745,Solid Holden@NPC_COMBOATTACK,chase,171,1,500,700,5000,no,target,always,,,,,,,, 2745,Solid Holden@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,,,,,,,, @@ -11163,18 +11163,18 @@ 3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,83,,,,,,9, 3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,longrangeattacked,,,,,,,9, 3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,casttargeted,,,,,,,9, -3004,Morroc's Wraith@NPC_SELFDESTRUCTION,attack,173,1,10000,1700,0,yes,self,always,0,,,,,,, -3006,Morroc's Lude@NPC_POISON,attack,176,5,2000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_BLINDATTACK,attack,177,5,2000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_SILENCEATTACK,attack,178,5,5000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_STUNATTACK,attack,179,5,5000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_PETRIFYATTACK,attack,180,5,2000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_CURSEATTACK,attack,181,5,5000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_SLEEPATTACK,attack,182,5,2000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_HALLUCINATION,attack,207,5,2000,0,0,yes,target,always,0,,,,,,, -3006,Morroc's Lude@NPC_BLEEDING,attack,660,5,2000,0,0,yes,target,always,0,,,,,,, -3008,Morroc Hidden@AL_HEAL,attack,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,, -3008,Morroc Hidden@AL_HEAL,idle,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,, +3004,Morocc's Wraith@NPC_SELFDESTRUCTION,attack,173,1,10000,1700,0,yes,self,always,0,,,,,,, +3006,Morocc's Lude@NPC_POISON,attack,176,5,2000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_BLINDATTACK,attack,177,5,2000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_SILENCEATTACK,attack,178,5,5000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_STUNATTACK,attack,179,5,5000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_PETRIFYATTACK,attack,180,5,2000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_CURSEATTACK,attack,181,5,5000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_SLEEPATTACK,attack,182,5,2000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_HALLUCINATION,attack,207,5,2000,0,0,yes,target,always,0,,,,,,, +3006,Morocc's Lude@NPC_BLEEDING,attack,660,5,2000,0,0,yes,target,always,0,,,,,,, +3008,Morocc Hidden@AL_HEAL,attack,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,, +3008,Morocc Hidden@AL_HEAL,idle,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,, 3026,Fire Pit@NPC_DEATHSUMMON,dead,718,3,10000,0,10000,no,self,always,0,3027,3027,3027,,,, diff --git a/db/re/produce_db.txt b/db/re/produce_db.txt index 28c493670d..415d4edde5 100644 --- a/db/re/produce_db.txt +++ b/db/re/produce_db.txt @@ -192,7 +192,7 @@ //--------------------LEVEL 4----------- -//-- Morroc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape +//-- Morocc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape 70,12049,14,0,0,7475,0,578,10,568,4,582,10,970,2,514,5 //-- Seasoned Jellyfish <-- 30 Tentacle, 10 White Herb, 10 Soft Blade Grass, 1 Old Frying Pan, 20 Squid Ink 71,12054,14,0,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20 diff --git a/db/re/quest_db.txt b/db/re/quest_db.txt index f8a2e86592..6421e9eb7e 100644 --- a/db/re/quest_db.txt +++ b/db/re/quest_db.txt @@ -34,11 +34,11 @@ 1101,0,1164,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Sphinx Dungeon!" 1102,0,1194,40,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Clock Tower!" 1103,0,1213,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soloing Clock Tower!" -1104,0,1519,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" -1105,0,1513,50,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" +1104,0,1519,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" +1105,0,1513,50,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" 1106,0,1375,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Amatsu Dungeon!" 1107,0,1403,40,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Amatsu Dungeon!" -1108,0,1631,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Louyang!" +1108,0,1631,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Solo at Luoyang!" // Ropewa & Yuridi Quest 1109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth" @@ -461,7 +461,7 @@ 3083,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Kids in Veins - Mr. Lockenlock's key" 3085,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Call from the commander" 3086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Commander's Duty" -3087,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report to Rune Midgard" +3087,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report to Midgard" 3088,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report to the continent - Accident!" 3089,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report to the continent - How to restore" 3090,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report to the continent - Location of reports" @@ -1853,10 +1853,10 @@ 8120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Katinshuell" 8121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Katinshuell" 8122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bruspetti's resting place" -8123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" -8126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayotaya's world famous dish, Tom Yum Goong" +8123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" +8126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ayothaya's world famous dish, Tom Yum Goong" 8127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" 8128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" 8129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Momotaro Field Trip" @@ -2150,8 +2150,8 @@ 9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Re-exploring the crack of spaces" // EP14.3 Morse's Cave -9318,0,3000,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morroc" -9319,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morroc Continues" +9318,0,3000,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morocc" +9319,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morocc Continues" //9327,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"" //9328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"" @@ -2280,7 +2280,7 @@ 10102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of the sphinx dungeon" 10103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Glast heim" -10104,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Yuno" +10104,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of Juno" 10105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of a clock tower" 10106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To client - the chapter of localizing " 10107,0,1164,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sphinx dungeon - Requiem" diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index a3d7122631..0b9e95438d 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -339,7 +339,7 @@ airplane,80,71,2 script Zerta#01airplane 834,{ mes "I am currently on a"; mes "sacred journey, offering"; mes "prayer for the sake of the"; - mes "Rune-Midgard continent."; + mes "Midgard continent."; close; } diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index ba4c50bbc9..fadbf3c0a5 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -97,7 +97,7 @@ einbroch,94,267,3 script Airship Staff#ein01 91,{ mes "Please use this door to"; mes "board the Airship which stops"; mes "over Juno, Lighthalzen and"; - mes "Hugel in the Schwaltzvalt Republic."; + mes "Hugel in the Schwarzwald Republic."; next; mes "[Airship Staff]"; mes "Otherwise, if Einbroch is"; diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index 86afb9765a..b7439ce4f0 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Airport Staff +//= Juno Airport Staff //===== By: ================================================== //= L0ne_W0lf, Muad_Dib //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Yuno Airport Staff +//= Juno Airport Staff //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ @@ -148,7 +148,7 @@ yuno,88,263,3 script Airship Staff#yuno02 91,{ mes "Please use this door to"; mes "board the Airship which stops"; mes "over Einbroch, Lighthalzen and"; - mes "Hugel in the Schwaltzvalt Republic."; + mes "Hugel in the Schwarzwald Republic."; next; mes "[Airship Staff]"; mes "Otherwise, if Juno is"; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 9777899ba5..f930a6a2e2 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -223,7 +223,7 @@ aldebaran,117,181,4 script Phracon Guy#alde 48,{ switch(select("About Phracon:Advice about Phracon:End Conversation")) { case 1: mes "[Joy]"; - mes "Phracon is a pretty common metal and can be found all over the Rune-Midgard continent."; + mes "Phracon is a pretty common metal and can be found all over the Midgard continent."; next; mes "[Joy]"; mes "Although it lacks the strength of other metals, it's easy to find and obtain. You can get Phracons by killing monsters or by buying them in Forging Shops in towns."; @@ -309,7 +309,7 @@ aldebaran,121,231,4 script Alchemy Guy#alde 49,{ close; case 4: mes "[Chemirre]"; - mes "You can talk about Rune Midgard's alchemy"; + mes "You can talk about Rune-Midgarts' alchemy"; mes "without talking about the Al De Baran Alchemist Guild!"; mes "Long Live Alchemists!"; close; @@ -449,7 +449,7 @@ aldebaran,180,46,4 script Joo Jahk#alde 88,{ next; if (select("Continue.:End conversation.") == 1) { mes "[Joo Jahk]"; - mes "On one of my travels around Rune-Midgard, I've heard from a really high level Mage that physical attacks, or magic with Neutral Property, won't damage Spiritual Property monsters."; + mes "On one of my travels around Midgard, I've heard from a really high level Mage that physical attacks, or magic with Neutral Property, won't damage Spiritual Property monsters."; next; mes "[Joo Jahk]"; mes "Maybe that advice will come in handy, now that you know that. Always remember the importance of the Properties of your skills and weapons when battling monsters."; @@ -950,7 +950,7 @@ aldeba_in,142,238,4 script Kafra Service#3alde 114,{ cutin "kafra_04",2; mes "[Kafra Roxie]"; mes "Welcome~!"; - mes "The Kafra Corporation will always support Rune-Midgard's adventurers with our excellent services."; + mes "The Kafra Corporation will always support Midgard's adventurers with our excellent services."; next; mes "[Kafra Roxie]"; mes "My name is Roxie!"; @@ -989,7 +989,7 @@ aldeba_in,142,238,4 script Kafra Service#3alde 114,{ break; case 2: mes "[Kafra Roxie]"; - mes "As you may know, the Kafra Corporation has a special relationship with the Merchant Guild, as well as the Blacksmith and Alchemist guilds in Rune-Midgard."; + mes "As you may know, the Kafra Corporation has a special relationship with the Merchant Guild, as well as the Blacksmith and Alchemist guilds in Midgard."; next; mes "[Kafra Roxie]"; mes "The Kafra Corporation only rents Carts to Merchants, Blacksmiths and Alchemists since these job associations have a special contract with us."; diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index cfd71bef5c..f3eba8cbd1 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -22,7 +22,7 @@ mes "Hey, there."; mes "Have you ever heard that there"; mes "are totally different countries"; - mes "than the Rune-Midgard Kingdom?"; + mes "than the Rune-Midgarts Kingdom?"; next; switch(select("About Amatsu...:Go to Amatsu:Cancel")) { case 1: @@ -45,7 +45,7 @@ next; mes "[Walter Moers]"; mes "He passed away when he returned"; - mes "to Rune-Midgard. Fortunately,"; + mes "to Rune-Midgarts. Fortunately,"; mes "the map was given to our king, Tristan III."; next; mes "[Walter Moers]"; @@ -183,7 +183,7 @@ amatsu,179,107,4 script John#ama 86,{ mes "[John]"; mes "At first, I thought, 'What"; mes "a great chance!' when the"; - mes "trade between the Rune-Midgard"; + mes "trade between the Rune-Midgarts"; mes "Kingdom and Amatsu started."; next; mes "[John]"; diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 71e0da38d7..1829d6c22f 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Ayotaya Town +//= Ayothaya Town //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== @@ -8,7 +8,7 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Ayotaya Town Script +//= Ayothaya Town Script //===== Additional Comments: ================================= //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.7 Fixed character's anme bugs [Lupus] @@ -24,12 +24,12 @@ mes "Let me take you away to"; mes "a distant spiritual place,"; mes "a land of exotic mystery,"; - mes "my hometown Ayotaya!"; + mes "my hometown Ayothaya!"; next; - switch(select("About Ayotaya.:Go to Ayotaya.:Cancel.")) { + switch(select("About Ayothaya.:Go to Ayothaya.:Cancel.")) { case 1: mes "[Aibakthing]"; - mes "We Ayotayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature."; + mes "We Ayothayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature."; next; mes "[Aibakthing]"; mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemon and Chillies, which has a tantalizing aroma and flavor beyond imagining."; @@ -41,13 +41,13 @@ mes "Hoo! Hahh! Hoo! Hahh!"; mes "No man alive can resist the"; mes "call of this beautiful land."; - mes "Rune-Midgardians are"; + mes "Midgardians are"; mes "always welcome!"; close; case 2: mes "[Aibakthing]"; mes "Ah, you must pay 10,000 Zeny"; - mes "if you wish to visit Ayotaya."; + mes "if you wish to visit Ayothaya."; mes "If you're ready, we can leave"; mes "right now~"; next; @@ -56,30 +56,23 @@ mes "[Aibakthing]"; mes "Hoo! Hah! Hoo! Hah!"; mes "Let us be off! Back to my"; - mes "beautiful Ayotaya!"; + mes "beautiful Ayothaya!"; close2; set Zeny, Zeny-10000; warp "ayothaya",149,71; end; } mes "[Aibakthing]"; - mes "I am sorry, but you do not have the 10,000 Zeny to travel to Ayotaya. Such a price is nothing compared to the experiences that await you!"; + mes "I am sorry, but you do not have the 10,000 Zeny to travel to Ayothaya. Such a price is nothing compared to the experiences that await you!"; close; } - mes "[Aibakthing]"; - mes "Have you ever dreamed"; - mes "of a beautiful place filled"; - mes "with spiritual serenity? You"; - mes "must have been dreaming"; - mes "of Ayotaya, my friend."; - close; case 3: mes "[Aibakthing]"; mes "Have you ever dreamed"; mes "of a beautiful place filled"; mes "with spiritual serenity? You"; mes "must have been dreaming"; - mes "of Ayotaya, my friend."; + mes "of Ayothaya, my friend."; close; } } @@ -87,7 +80,7 @@ ayothaya,152,68,1 script Aibakthing#ayo2 843,{ mes "[Aibakthing]"; mes "Hoo! Hah! Hmm! Hah!"; - mes "So, how did you like Ayotaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home."; + mes "So, how did you like Ayothaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home."; next; if (select("Go back to Alberta.:Cancel.") == 1) { mes "[Aibakthing]"; @@ -111,7 +104,7 @@ ayothaya,189,120,3 script Young Man#Thang 843,{ mes "[Thang]"; mes "There's an ancient,"; mes "dreadful building in"; - mes "Ayotaya that no one"; + mes "Ayothaya that no one"; mes "here dares approach..."; next; mes "[Thang]"; @@ -133,7 +126,7 @@ ayothaya,171,152,5 script Girl#Lalitha 838,{ next; mes "[Lalitha]"; mes "You must be"; - mes "from Rune-Midgard."; + mes "from Midgard."; mes "After all, I know every single person living in this village."; mes "Heh heh~"; next; @@ -246,7 +239,7 @@ ayothaya,197,189,5 script Young Man#1ayothaya 841,{ next; mes "[Kwan]"; mes "You must be"; - mes "from Rune-Midgard, huh?"; + mes "from Midgard, huh?"; mes "I've seen a lot of tourists"; mes "coming from there recently."; next; @@ -261,13 +254,13 @@ ayothaya,197,189,5 script Young Man#1ayothaya 841,{ mes "a little less worry..."; next; mes "[Kwan]"; - mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayotaya, and that you keep safe~"; + mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayothaya, and that you keep safe~"; close; } ayothaya,214,142,5 script Young Man#5ayothaya 843,{ mes "[Detzi]"; - mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong."; + mes "In Ayothaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong."; next; mes "[Detzi]"; mes "Why don't you learn our martial arts? I guarantee that it will help you greatly in your travels."; diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index b39e64a812..ec9f29bdfe 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -396,7 +396,7 @@ cmd_in02,146,180,4 script Kafra Employee::kaf_comodo2 721,{ end; } -// Morroc Field +// Morocc Field //============================================================ moc_fild12,35,303,4 script Serutero#cmd 59,{ mes "[Serutero]"; diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index 38e8385f5a..a67cd7d623 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -258,7 +258,7 @@ einbech,151,168,3 script Tollaf#ein 855,{ mes "live so much better than we"; mes "do, especially those snobs in"; mes "Einbroch! Einbech must be the"; - mes "worst town Schwaltzvalt Republic. No, it's the worst in the world!"; + mes "worst town Schwarzwald Republic. No, it's the worst in the world!"; close; } diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 87b0aaf135..0ad77a0fd2 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -609,13 +609,13 @@ geffen_in,27,134,5 script Waitress#elen 91,{ next; mes "[Elenore]"; mes "Well..."; - mes "I hear there's this person somewhere in Rune-Midgard..."; + mes "I hear there's this person somewhere in Rune-Midgarts..."; next; mes "[Elenore]"; if (Sex == SEX_MALE) mes "Tell me, have you ever heard of "+strcharinfo(0)+"? He's supposed to be the suavest hero around!"; else - mes "Have you ever heard of "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgard!"; + mes "Have you ever heard of "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgarts!"; break; case 4: switch(rand(1,2)) { @@ -743,7 +743,7 @@ geffen_in,70,67,3 script Waitress#elise 90,{ mes "The Rune-Midgarts Kingdom?"; next; mes "[Elisa]"; - mes "I hear that it was originally called the Rune-Midgard Kingdom, after our continent. However, for some reason, the name was changed to 'Rune-Midgarts.'"; + mes "I hear that it was originally called the Rune-Midgarts Kingdom, after our continent. However, for some reason, the name was changed to 'Rune-Midgarts.'"; next; mes "[Elisa]"; mes "It was obviously a wise decision, since too many people kept confusing the our continent with our kingdom. Weird, huh?"; @@ -877,16 +877,16 @@ geffen_in,79,76,2 script Merchant Daven 120,{ geffen_in,114,73,5 script Hadenheim 709,{ mes "[Hans Hadenheim]"; - mes "Man, the Rune-Midgard continent sure is big! How's it going, youngster?"; + mes "Man, the Midgard continent sure is big! How's it going, youngster?"; next; mes "[Hans Hadenheim]"; - mes "This Geffen sure is strange. But it was worth it to travel here all the way from the Schubaltzwald Republic."; + mes "This Geffen sure is strange. But it was worth it to travel here all the way from the Schwarzwald Republic."; next; - if (select("Schubaltzwald Republic?:So, why are you traveling?") == 1) { + if (select("Schwarzwald Republic?:So, why are you traveling?") == 1) { mes "[Hans Hadenheim]"; mes "You..."; mes "Don't know the"; - mes "Schubaltzwald Republic?"; + mes "Schwarzwald Republic?"; next; mes "[Hans Hadenheim]"; mes "You know, ally of the Rune-Midgarts Kingdom. Um... Our capital city is Juno?"; @@ -1122,7 +1122,7 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ mes "First off, be accountable for your own money and use a budget that works for you. A good rule of thumb? For every ten zeny you earn, put one zeny aside and either save it or invest it for later."; next; mes "[Psychic Advisor]"; - mes "And whatever you do, don't work as a psychic advisor in Rune-Midgard. The real cash, apparently, is in discovering new countries. Why didn't I do that?!"; + mes "And whatever you do, don't work as a psychic advisor in Rune-Midgarts. The real cash, apparently, is in discovering new countries. Why didn't I do that?!"; next; break; case 3: diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index eddf64a442..451083e628 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -24,7 +24,7 @@ mes "to my homeland, Kunlun."; mes "It is my honor to guide"; mes "such distinguished quests from"; - mes "the Rune-Midgard kingdom."; + mes "the Rune-Midgarts kingdom."; next; switch(select("About Kunlun:Visit Kunlun:Cancel")) { case 1: @@ -134,7 +134,7 @@ gon_fild01,255,79,7 script Kunlun Envoy#gon2 776,{ mes "[Wa Bai Hu]"; mes "So, did you enjoy your trip?"; mes "I guess it's the time for you to"; - mes "go home. The ship to Rune-Midgard is ready to depart at any time."; + mes "go home. The ship to Rune-Midgarts is ready to depart at any time."; next; if (select("Go back to Alberta:Cancel") == 1) { mes "[Wa Bai Hu]"; diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index f8efa54999..f0a432d807 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -182,7 +182,7 @@ hu_in01,18,94,0 script A Part-Timer#1 49,{ mes "Still, I think I can"; mes "handle this difficult task~"; mes "This room is the office for"; - mes "the Schwaltzvalt Republic team,"; + mes "the Schwarzwald Republic team,"; mes "and the other is for the Rune-"; mes "Midgarts Kingdom team."; next; diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index a9d6b7cfe8..35b21acc0e 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -77,7 +77,7 @@ mes "Izlude is the satellite city of Prontera, capital of the Rune-Midgarts kingdom."; next; mes "[Bonne]"; - mes "Izlude is key to our kingdom because of the Swordsman Association located here, as well as the fact that Izlude is in charge of protecting the Rune-Midgard coastline."; + mes "Izlude is key to our kingdom because of the Swordsman Association located here, as well as the fact that Izlude is in charge of protecting the Rune-Midgarts coastline."; next; mes "[Bonne]"; mes "I know, this bridge might look weak and fragile, but it is actually state of the art, built with the most sophisticated technology."; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 9ec5cee61b..13fa567dbf 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -1409,12 +1409,12 @@ prt_in,170,14,0 script Customer#Bachewcca 89,{ switch(select("Jawaii?:Let's go to Jawaii~!:Cancel.")) { case 1: mes "[Helper]"; - mes "There is an island far, far away from the Rune-Midgard continent."; + mes "There is an island far, far away from the Midgard continent."; mes "It is a very quiet and beautiful island resort that only opens"; mes "its doors to couples."; next; mes "[Helper]"; - mes "This is an exclusive travel offer to the special honeymoon resort for Rune-Midgard's citizens. The price, 100,000 zeny, may be expensive, but you really get what you pay for."; + mes "This is an exclusive travel offer to the special honeymoon resort for Midgard's citizens. The price, 100,000 zeny, may be expensive, but you really get what you pay for."; next; mes "[Helper]"; mes "I guarantee you that some of"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 220fdf1ca3..eb98d77d92 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -149,7 +149,7 @@ lighthalzen,233,121,3 script Kariya#li_01 72,{ mes "Still, it's a fitting"; mes "name for the wealthiest"; mes "and most luxurious city in"; - mes "all the Schwaltzvalt Republic."; + mes "all the Schwarzwald Republic."; mes "So how do you like this place?"; close; } @@ -485,7 +485,7 @@ lighthalzen,239,64,5 script Jade#zen2 862,{ next; mes "[Jade]"; mes "So are you from"; - mes "Rune-Midgard?"; + mes "Rune-Midgarts?"; mes "What do you think"; mes "of our city with its"; mes "advanced technology"; @@ -1556,7 +1556,7 @@ lhz_in03,193,25,2 script Bartender#12 61,{ mes "on the verge of bein' totally"; mes "ghetto, but we're proud to"; mes "have the best rum in all of"; - mes "Rune-Midgard. It's true~"; + mes "Midgard. It's true~"; next; mes "[Tony]"; mes "Just a sip of this"; @@ -2040,13 +2040,13 @@ lhz_in02,21,38,7 script Bank Clerk#1::BankClerk 86,{ lhz_in02,21,25,7 duplicate(BankClerk) Bank Clerk#2 86 lhz_in02,34,22,1 duplicate(BankClerk) Bank Clerk#3 755 -// Lightalzen Prison Area ------------------------------------------------------------- +// Lighthalzen Prison Area ------------------------------------------------------------- lhz_in02,145,177,0 script Togii#07 849,{ mes "[Togii]"; mes "Oooh yeah..."; mes "Goes down smooth."; - mes "Morroc whiskey's the best!"; + mes "Morocc whiskey's the best!"; mes "^333333*Hiccup*^000000 Whoa, this stuff"; mes "really works fast! Heh heh~"; close; @@ -2678,13 +2678,13 @@ lhz_in02,267,25,4 script Diana#npc 747,{ next; mes "[Diana]"; mes "Oh, I was born"; - mes "and raised in Morroc."; + mes "and raised in Morocc."; next; mes "[Shop Assistant]"; mes "Ah yes, I've heard many"; mes "good things about that town."; mes "You've certainly proven that"; - mes "people from Morroc truly have"; + mes "people from Morocc truly have"; mes "good taste. Now, this Stiletto"; mes "is a steal at 39,800 zeny..."; next; diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index e659ab5cfb..c6ebff611c 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang City NPCs +//= Luoyang City NPCs //===== By: ================================================== //= Vidar (1.0) //= Mass Zero (1.1) @@ -13,13 +13,13 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Louyang Town Script +//= Luoyang Town Script //===== Additional Comments: ================================= //= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] //= 3.0 Moved Alberta NPC to pre-re/re paths. [Euphy] //============================================================ -// Louyang Transportation +// Luoyang Transportation //============================================================ - script ::Girl_louyang -1,{ mes "[Girl]"; @@ -29,36 +29,36 @@ mes "on a picnic somewhere~"; mes "La la la la~"; next; - switch(select("About Louyang.:Go to Louyang.:Cancel.")) { + switch(select("About Luoyang.:Go to Luoyang.:Cancel.")) { case 1: mes "[Girl]"; mes "Oh, are you"; - mes "interested in Louyang?"; + mes "interested in Luoyang?"; mes "It's a nice place to"; mes "visit for travelers."; next; mes "[Girl]"; - mes "Louyang has a long history"; + mes "Luoyang has a long history"; mes "with stories of ancient magic and warriors. It's also rumored that many evil beasts roam the"; - mes "Louyang area."; + mes "Luoyang area."; next; mes "[Girl]"; mes "You can find cure-all medicines, mysterious occurrences, and"; mes "martial artists all in one place!"; next; mes "[Girl]"; - mes "I used to train in the martial arts every morning back when I was in Louyang. I might not look like it, but I'm pretty strong!"; + mes "I used to train in the martial arts every morning back when I was in Luoyang. I might not look like it, but I'm pretty strong!"; next; mes "[Girl]"; mes "If you want to visit"; - mes "Louyang, feel free to"; + mes "Luoyang, feel free to"; mes "tell me. Just give me"; mes "some Zeny and we'll go~"; close; case 2: mes "[Girl]"; mes "I'll guide you to"; - mes "Louyang right away."; + mes "Luoyang right away."; mes "For my service, I am"; mes "accepting 10,000 Zeny."; next; @@ -135,7 +135,7 @@ lou_fild01,190,100,7 script Girl#1lou 815,{ close; } -// Generic Louyang NPCs +// Generic Luoyang NPCs //============================================================ louyang,297,167,2 script Muscular Woman#lou 815,{ if (Sex == SEX_FEMALE) { @@ -261,7 +261,7 @@ louyang,272,133,0 duplicate(LouTrainee) Trainee#10lou 819 louyang,272,131,0 duplicate(LouTrainee) Trainee#11lou 819 louyang,272,129,0 duplicate(LouTrainee) Trainee#12lou 819 -// Louyang Viewing Tower +// Luoyang Viewing Tower //============================================================ lou_in01,25,23,5 script Friendly Looking Lady#lo 817,{ mes "[Hong Miao]"; @@ -274,11 +274,11 @@ lou_in01,25,23,5 script Friendly Looking Lady#lo 817,{ switch(select("Information.:Yes.:Maybe next time.")) { case 1: mes "[Hong Miao]"; - mes "After many suggestions and proposals were sent to the Louyang tourism office, the Observation Tower was built so tourists can enjoy the sights."; + mes "After many suggestions and proposals were sent to the Luoyang tourism office, the Observation Tower was built so tourists can enjoy the sights."; next; mes "[Hong Miao]"; mes "Due to the geographical"; - mes "features of Louyang, it's difficult to enjoy the breath taking view that our land has to offer."; + mes "features of Luoyang, it's difficult to enjoy the breath taking view that our land has to offer."; next; mes "[Hong Miao]"; mes "You can come up to the tower by taking the elevator right here. We are providing this quick and safe transfer service for 500 zeny per person."; @@ -347,7 +347,7 @@ louyang,84,254,0 script Exit#lou 111,{ //= 2.6 Removed Duplicates [Silent] //= 2.6a Updated a few names with new item_db.txt names [Evera] //= 2.7 Split quests to quests/quests_louyang.txt [Evera] -//= 2.7a Minor optimizations before Louyang quests [Lupus] +//= 2.7a Minor optimizations before Luoyang quests [Lupus] //= 2.7b Moved guides to the Guides folder. 2.7 more typos [Lupus] //= 2.8 Moved some quest-related NPCs to proper file. [SinSloth] //= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index fecf8ea792..c4bfe4ce25 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Town +//= Morocc Town //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== @@ -8,7 +8,7 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Morroc Town NPCs +//= Morocc Town NPCs //===== Additional Comments: ================================= //= Fully working //= Fixed Lapidary sprite, Implemented ANTHELL trigger @@ -27,99 +27,99 @@ //= 2.2 Removed duplicate bartender NPC. (bugreport:4555) [L0ne_W0lf] //============================================================ -// Morroc +// Morocc //============================================================ -morocc,150,120,5 script Soldier - Morroc#01::MocSoldier 707,3,3,{ - mes "[Morroc Soldier]"; +morocc,150,120,5 script Soldier - Morocc#01::MocSoldier 707,3,3,{ + mes "[Morocc Soldier]"; mes "Hey, you! Stop there."; next; - mes "[Morroc Soldier]"; + mes "[Morocc Soldier]"; mes "This is a restricted area. You can't come any further!"; close; OnTouch_: - mes "[Morroc Soldier]"; + mes "[Morocc Soldier]"; mes "Hey, you! Stop there."; next; - mes "[Morroc Soldier]"; + mes "[Morocc Soldier]"; mes "This is a restricted area. You can't come any further!"; close; } -morocc,202,244,0 script Volunteer - Morroc#01 745,{ - mes "[Morroc Volunteer]"; - mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us volunteers to help restorations."; +morocc,202,244,0 script Volunteer - Morocc#01 745,{ + mes "[Morocc Volunteer]"; + mes "After that terrible incident wiped out the entire Morocc, Rune-Midgarts Kingdom has gathered us volunteers to help restorations."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "As important as it seems, everyone's being careful but there are always some that really don't realize the situation, don't you think?"; close; } -morocc,88,133,3 script Volunteer - Morroc#02 748,{ - mes "[Morroc Volunteer]"; +morocc,88,133,3 script Volunteer - Morocc#02 748,{ + mes "[Morocc Volunteer]"; mes "We're... We're flooded with work..."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "This work's like never-ending, no matter how hard we try!!!"; - mes "People of Rune-Midgard!! Please lend us a helping hand!!"; + mes "People of Rune-Midgarts!! Please lend us a helping hand!!"; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "Haw.... Whew... Ugh..."; close; } -morocc,202,110,0 script Volunteer - Morroc#03 730,{ - mes "[Morroc Volunteer]"; +morocc,202,110,0 script Volunteer - Morocc#03 730,{ + mes "[Morocc Volunteer]"; mes "We're still unable to estimate the overall damage."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "Adventurers' Union and Prontera Kingdom are putting their efforts on restorations as well as restraints of the original cause of the disaster."; next; - mes "[Morroc Volunteer]"; - mes "Unless we settle the original cause, the damage will even spread out of Morroc. The only thing left is to get worse."; + mes "[Morocc Volunteer]"; + mes "Unless we settle the original cause, the damage will even spread out of Morocc. The only thing left is to get worse."; close; } -morocc,268,287,3 script Volunteer - Morroc#04 727,{ - mes "[Morroc Volunteer]"; +morocc,268,287,3 script Volunteer - Morocc#04 727,{ + mes "[Morocc Volunteer]"; mes "As bad as it seems, we can't even ask for more support."; - mes "This sure must be the worst thing ever happened in Rune-Midgard's history."; + mes "This sure must be the worst thing ever happened in Rune-Midgarts' history."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "I wish I knew how bad the damage is, but we can't even estimate it. It's like shovelling sand against the tide.."; close; } -morocc,37,287,0 script Volunteer - Morroc#05 79,{ - mes "[Morroc Volunteer]"; +morocc,37,287,0 script Volunteer - Morocc#05 79,{ + mes "[Morocc Volunteer]"; mes "The town's all shattered, but the real problem is the towners."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "It's a real pity to see those victims of the destroyed town, but the witnesses of the disaster are so much shocked. They're simply not normal now."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "People are scared to death, but those are fortunate at least.. cause.. many others got mentally ill and stuff.."; close; } -morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 741,{ - mes "[Morroc Volunteer]"; +morocc,223,102,0 script Volunteer - Morocc#06::MocVolunteer 741,{ + mes "[Morocc Volunteer]"; mes "Ugh.. It's kinda spooky, here.. Even this dry wind of the desert seems to have a dark nature."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "Ooh!! Something... I can feel something! The dark and gloomy air flowing around this town is actually giving me a musical motiff!"; next; - mes "[Morroc Volunteer]"; - mes "Right, I think you should hear it! The title is.. 'The Rhapsody of Morroc Satan's Rebirth'!!"; + mes "[Morocc Volunteer]"; + mes "Right, I think you should hear it! The title is.. 'The Rhapsody of Morocc Satan's Rebirth'!!"; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "When finally wake up, it's just the same darkness"; mes "Failed to be reborn at the same place,"; mes "Gotta try harder and harder, never ever give up,"; mes "But even after hundreds and thousands of trying,"; - mes "The great Satan of Morroc can't revive~"; + mes "The great Satan of Morocc can't revive~"; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "My stupid button men are useless,"; mes "Against those adventurers,"; mes "This time I must revive,"; @@ -128,27 +128,27 @@ morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 741,{ next; mes "[Ringing Voice]"; mes "Be quiet! Can't you see what's going on?!"; - specialeffect EF_HIT2,AREA,"Volunteer - Morroc#06"; + specialeffect EF_HIT2,AREA,"Volunteer - Morocc#06"; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "Heyyy, you're being too harsh, Senyorita. Your fist may be as fragile as you are, but it sure can hurt somebody."; next; mes "[Ringing Voice]"; mes "Anyways, isn't that a crib? I think I heard something like that before.."; next; - mes "[Morroc Volunteer]"; + mes "[Morocc Volunteer]"; mes "No, No way!? It,, sure is not!"; close; } -morocc,226,102,4 duplicate(MocVolunteer) Volunteer - Morroc#07 726 +morocc,226,102,4 duplicate(MocVolunteer) Volunteer - Morocc#07 726 moc_ruins,123,154,0 script Young Man#moc01 99,{ mes "[Young Man]"; mes "The town's completely destroyed, but that giant triangular structure hasn't been harmed at all. Maybe it's protected by some kinda special power."; next; mes "[Young Man]"; - mes "You know...Those giant, triangular buildings at the NorthWest corner of Morroc known are known to us as Pyramids..."; + mes "You know...Those giant, triangular buildings at the NorthWest corner of Morocc known are known to us as Pyramids..."; next; mes "[Young Man]"; mes "Those things have been around here for thousands and thousands of years. No one knows when and why they were built, or who built them."; @@ -163,7 +163,7 @@ moc_ruins,123,154,0 script Young Man#moc01 99,{ moc_ruins,128,153,0 script Grampa#moc 61,{ mes "[Old Scholar]"; - mes "I've devoted my life to researching the mysterious pyramids near Morroc. I haven't been able to concretely confirm anything yet, but..."; + mes "I've devoted my life to researching the mysterious pyramids near Morocc. I haven't been able to concretely confirm anything yet, but..."; next; mes "[Old Scholar]"; mes "I'm sure that the largest pyramid contains the tomb of the ancient king, Osiris! I'm willing to stake my life on it!"; @@ -179,13 +179,13 @@ moc_ruins,132,144,0 script Wolf Young Man#moc 85,{ mes "Those things are so mean and vicious.."; next; mes "[Young Man]"; - mes "But the thing is that.. I even kinda feel those merciless cold-blooded monsters are nothing to be afraid of, compared to what has happened in Morroc. Morroc is already a hell."; + mes "But the thing is that.. I even kinda feel those merciless cold-blooded monsters are nothing to be afraid of, compared to what has happened in Morocc. Morocc is already a hell."; close; } moc_ruins,115,144,3 script Muka Young Man#moc 83,{ mes "[Young Man]"; - mes "I work in the trading business, so I always have to cross the hot, dry Morroc Desert on business."; + mes "I work in the trading business, so I always have to cross the hot, dry Morocc Desert on business."; next; mes "[Young Man]"; mes "But I can't do that anymore."; @@ -226,7 +226,7 @@ morocc,54,251,0 script Young Man#moc02 89,{ mes "Heh heh~ Let me tell you a story. You know I just got out of that Tavern, there, huh?"; next; mes "[Drunken Young Man]"; - mes "I heard the Satan Morroc has revived. It just got out of cracking the time and the space blar... hic~"; + mes "I heard the Satan Morocc has revived. It just got out of cracking the time and the space blar... hic~"; next; mes "[Drunken Young Man]"; mes "Ah... I kinda wanna see that Satan with my own eyes, but! I really shouldn't. I shouldn't even dream of seeing that Satan in person."; @@ -248,7 +248,7 @@ moc_ruins,94,117,0 script Pale Looking Young Man 48,{ mes "Not even a whistle of dry wind, and the air so heavy and stuffy, I could hardly breathe."; next; mes "[Pale-looking Young Man]"; - mes "But then, Bang! It was right that time that I saw the enormous amount of smoke rising up at the Castle of Morroc with an earsplitting sound."; + mes "But then, Bang! It was right that time that I saw the enormous amount of smoke rising up at the Castle of Morocc with an earsplitting sound."; next; mes "[Pale-looking Young Man]"; mes "All happened so fast. The Oasis of the Castle was all dried up and the town was destroyed. And... and that voice... I heard a voice."; @@ -296,7 +296,7 @@ moc_ruins,118,82,1 script Little Boy#moc 706,{ moc_ruins,121,116,4 script Picky Lady#moc 66,{ mes "[Syvia]"; - mes "The fields of Rune-Midgard are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!"; + mes "The fields of Rune-Midgarts are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!"; mes "You know, like how Spore sticks out its tongue after you kill it.."; next; mes "[Syvia]"; @@ -391,7 +391,7 @@ moc_ruins,155,107,4 script Ant Man#moc 47,{ mes "Sharp teeth and strong jaws of the ants would be something that you should be careful of, but the shovelling skills of that old grandpa is very strong that you should watch out."; next; mes "[Akira]"; - mes "...Well, what am I talking about? What is left to be afraid when the Satan of Morroc is revived? Huh..huhhuh..."; + mes "...Well, what am I talking about? What is left to be afraid when the Satan of Morocc is revived? Huh..huhhuh..."; close; } } @@ -401,7 +401,7 @@ moc_ruins,143,43,4 script Assassin Boy#moc 118,{ mes "Unbeatable in man-to-man fights, Assassins always overcome their enemies! Erm, always overcome their enemies without a trace."; next; mes "[Slayer Kid]"; - mes "But what did they do when this destruction happened in Morroc!!!"; + mes "But what did they do when this destruction happened in Morocc!!!"; next; switch(select("?????:Where I can find the Assassin clan?:End Conversation")) { case 1: @@ -434,7 +434,7 @@ moc_ruins,143,43,4 script Assassin Boy#moc 118,{ mes "And I hear the coolest Assassin of them all is the Assassin Cross! But, that's even a bigger mystery~ You won't be able to see them unless you're a great thief!"; next; mes "[Slayer Kid]"; - mes "But then... What the hell were they doing when Morroc was destroyed?!!!"; + mes "But then... What the hell were they doing when Morocc was destroyed?!!!"; close; case 3: mes "[Slayer Kid]"; @@ -444,14 +444,14 @@ moc_ruins,143,43,4 script Assassin Boy#moc 118,{ mes "They're also very sneaky! I hear that they're able to cloak so that no one can see them!"; next; mes "[Slayer Kid]"; - mes "But then... What the hell were they doing when Morroc was destroyed?!!!"; + mes "But then... What the hell were they doing when Morocc was destroyed?!!!"; close; } } moc_ruins,173,141,4 script Dimitri#moc 49,{ mes "[Dimitri]"; - mes "The desert of Morroc has the highest average temperature in Midgard. You might as well think twice before you sit on the sand in the middle of the desert, cause your ass will be toasted."; + mes "The desert of Morocc has the highest average temperature in Midgard. You might as well think twice before you sit on the sand in the middle of the desert, cause your ass will be toasted."; next; switch(select("About the desert sands:About the remedy for Fatigue:End Conversation")) { case 1: @@ -460,13 +460,13 @@ moc_ruins,173,141,4 script Dimitri#moc 49,{ mes "It seems like it should be all burnt, but it's not!"; next; mes "[Dimitri]"; - mes "You can sit down and take a rest whenever you need to and your ass won't burn. I guess the Morroc sand doesn't conduct heat as much as it should."; + mes "You can sit down and take a rest whenever you need to and your ass won't burn. I guess the Morocc sand doesn't conduct heat as much as it should."; next; mes "[Dimitri]"; mes "That's why everyone could recover the HP and SP in the middle of desert."; next; mes "[Dimitri]"; - mes "Now I come to think of it, maybe the reason why Morroc has exceptionally high average temperature is because that Satan is sealed within."; + mes "Now I come to think of it, maybe the reason why Morocc has exceptionally high average temperature is because that Satan is sealed within."; close; case 2: mes "[Dimitri]"; @@ -514,7 +514,7 @@ moc_ruins,174,120,4 script Fly Man#moc 54,{ mes "And when you kill it, there's even a chance that you might earn a ^880000Clip^000000 item!"; next; mes "[Armani]"; - mes "Anyways, don't you think the Satan Morroc is so cruel?"; + mes "Anyways, don't you think the Satan Morocc is so cruel?"; mes "They may not be the same kind, but still isn't it cruel to take that monster's soul with a single blow?"; next; mes "[Armani]"; @@ -523,13 +523,13 @@ moc_ruins,174,120,4 script Fly Man#moc 54,{ } } -moc_ruins,173,70,4 script Uncle Morroc#moc 48,{ +moc_ruins,173,70,4 script Uncle Morocc#moc 48,{ mes "[Phlanette]"; - mes "Morroc is located in an extremely dry region, surrounded by desert."; - mes "No place in the world is as hot as Morroc."; + mes "Morocc is located in an extremely dry region, surrounded by desert."; + mes "No place in the world is as hot as Morocc."; next; mes "[Phlanette]"; - mes "I have a hunch that this hot and dry climate in Morroc is because of that Satan sealed deeper underground for so long."; + mes "I have a hunch that this hot and dry climate in Morocc is because of that Satan sealed deeper underground for so long."; next; switch(select("Tell me about the desert.:Quit Conversation")) { case 1: @@ -541,17 +541,17 @@ moc_ruins,173,70,4 script Uncle Morroc#moc 48,{ mes "Nonetheless, there are a few hardy plants that can survive and grow in the desert."; next; mes "[Phlanette]"; - mes "Unfortunately some of those plants growing around Morroc have been mutated into monsters."; + mes "Unfortunately some of those plants growing around Morocc have been mutated into monsters."; mes "One of those is Muka, the mutated cactus.."; next; mes "[Phlanette]"; - mes "However, now that the Satan has revived, no one's sure of what changes would be made in the life cycles of Morroc."; + mes "However, now that the Satan has revived, no one's sure of what changes would be made in the life cycles of Morocc."; close; case 2: mes "[Phlanette]"; mes "Here and there!"; mes "Sand everywhere..."; - mes "Oh, I curse you, the desert of Morroc!!"; + mes "Oh, I curse you, the desert of Morocc!!"; mes "Damn you!"; next; mes "[Phlanette]"; @@ -593,7 +593,7 @@ moc_fild16,199,212,4 script Uncle Assassin#moc 55,{ mes "[Hashisid]"; mes "Our true directive is to assassinate evil creatures,"; mes "and to use our stealth to gather intelligence"; - mes "for the good of all Rune-Midgard."; + mes "for the good of all Rune-Midgarts."; close; case 2: mes "[Hashisid]"; @@ -641,7 +641,7 @@ moc_fild16,211,254,4 script Assassin#07rhea_30 118,{ mes "and allows Assassins"; mes "to quickly slash their enemies."; mes "Anyone can buy a basic set of Katars"; - mes "in Morroc somewhere."; + mes "in Morocc somewhere."; mes "Of course, only Assassins can use them."; next; mes "[La Conte]"; diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index e39fab7a49..d9c6fb647c 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -27,7 +27,7 @@ case 1: mes "[Moscovia P.R. Officer]"; mes "Moscovia is a beautiful kingdom"; - mes "on an island located north of Rune"; + mes "on an island located north of Rune-"; mes "Midgarts."; next; mes "[Moscovia P.R. Officer]"; @@ -97,7 +97,7 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 960,{ mes "How was your trip?"; mes "Do you have good memories from Moscovia?"; mes "A ship is now leaving"; - mes "for Rune Midgarts."; + mes "for Rune-Midgarts."; next; if (select("Return to Alberta:Cancel") == 2) { mes "[Moscovia P.R. Officer]"; diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index d05e71f71a..2b4d021cbd 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -302,7 +302,7 @@ payon,132,235,3 script Monster Scholar#02 98,{ mes "[Monster Scholar Vuicokk]"; mes "Nice to meet you."; mes "I am called Vuicokk."; - mes "I am a scholar in the Monster Research organization of the Rune Midgarts Kingdom. Do you have any questions about monsters?"; + mes "I am a scholar in the Monster Research organization of the Rune-Midgarts Kingdom. Do you have any questions about monsters?"; next; switch(select("Any news?:Undead Monsters?:Monster Research Organization?")) { case 1: @@ -1024,7 +1024,7 @@ pay_arche,77,131,2 script Archer Joe#payon 88,{ mes "You must know this place used to be isolated because of the thick forests and the mountainous area."; next; mes "[Archer Joe]"; - mes "Because of that, the Payon developed a culture of its own, which is quite different than that of the rest of Rune-Midgard."; + mes "Because of that, the Payon developed a culture of its own, which is quite different than that of the rest of Rune-Midgarts."; next; mes "[Archer Joe]"; mes "This garment is traditional Payon clothing! Why don't you try wearing one? It's very comfortable~"; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 9dad8f0440..6560ef4444 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -92,7 +92,7 @@ prontera,149,202,2 script YuNa#pront 700,{ mes "God of war!"; next; mes "[YuNa]"; - mes "Here, in Rune-Midgard, we serve Odin, the fearsome god who sacrificed one of his eyes in order to acquire wisdom."; + mes "Here, in Rune-Midgarts, we serve Odin, the fearsome god who sacrificed one of his eyes in order to acquire wisdom."; next; mes "[YuNa]"; mes "The statue you see behind of me is a sculpture of mighty Odin. But, it's a shame because it's such a bad likeness."; @@ -215,7 +215,7 @@ prontera,78,150,3 script Dairenne#pront 90,{ mes "I wonder if you are interested in parties or dresses. Hehehe. These days, the hot topic is definitely the colorful, extravagant, magnificent dresses you can wear."; next; mes "[Towngirl Dairenne]"; - mes "To get such dazzling colors, I heard you have to use a dye that you can only get in Morroc. But I also heard that the price is beyond imagination."; + mes "To get such dazzling colors, I heard you have to use a dye that you can only get in Morocc. But I also heard that the price is beyond imagination."; next; mes "[Towngirl Dairenne]"; mes "Aahhhh~ I wish I could wear such a dress. Even if it's just once..."; diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index 500cf37abe..a98dd932aa 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -217,7 +217,7 @@ rachel,76,77,3 script Rachel Priest 927,{ ra_fild12,45,230,3 script Airship Guide#Fild 934,{ mes "[Airship Guide]"; - mes "The Schwaltzvalt Republic's"; + mes "The Schwarzwald Republic's"; mes "international Airship service"; mes "for Arunafeltz can only be"; mes "accessed in Rachel. Please"; diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index 57d240458d..c65b87ffff 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -265,7 +265,7 @@ umbala,70,106,3 script Utan Kid#um 781,{ mes "You look pretty well off..."; mes "Can donate some money for"; mes "re-constructing my parents' house?"; - mes "You Rune-Midgardians are all"; + mes "You Rune-Midgartsians are all"; mes "richer than Utans! I beg you!"; emotion ET_SMILE; next; @@ -443,7 +443,7 @@ umbala,177,153,3 script Pasto#um 97,{ mes "[Pasto]"; emotion ET_SURPRISE; mes "Oh my god~! Finally,"; - mes "another Rune-Midgardian!"; + mes "another Rune-Midgartsian!"; mes "I've never seen anyone from"; mes "home in this place before!"; mes "Nice to meet you, my name is Pasto!"; @@ -534,7 +534,7 @@ umbala,80,146,4 script Yuwooki#um 753,{ mes "I eventually realized that their"; mes "courtship rituals are actually"; mes "more advanced than anything the"; - mes "Rune-Midgard culture has to offer."; + mes "Rune-Midgarts culture has to offer."; next; mes "[Yuwooki]"; mes "It's really quite fascinating."; @@ -615,7 +615,7 @@ umbala,92,159,4 script Bertan#um 785,{ next; mes "[Bertan]"; mes "What's the matter,"; - mes "ya big Rune-Midgardian?!?!"; + mes "ya big Rune-Midgartsian?!?!"; mes "I just called you a 'loser!'"; mes "I guess you're too stupid"; mes "to understand!!"; @@ -640,7 +640,7 @@ umbala,92,159,4 script Bertan#um 785,{ switch(rand(1,6)) { case 1: mes "[Bertan]"; - mes "What did the Rune-Midgardian"; + mes "What did the Rune-Midgartsian"; mes "say to the Savage?"; mes "..."; next; @@ -695,7 +695,7 @@ umbala,92,159,4 script Bertan#um 785,{ close; case 4: mes "[Bertan]"; - mes "Why are Rune-Midgardians"; + mes "Why are Rune-Midgartsians"; mes "SOOoOOoo..."; mes "Um, hmmmmm."; mes "Maybe that joke"; @@ -807,7 +807,7 @@ umbala,92,159,4 script Bertan#um 785,{ umbala,194,104,4 script Utan Kid#2 787,{ if (event_umbala >= 3) { mes "[Boorkatan]"; - mes "Huh? You're from Rune-Midgard,"; + mes "Huh? You're from Rune-Midgarts,"; mes "aren't you? Have you ever been bungee jumping?"; next; if (select("Yeah:No") == 1) { @@ -879,7 +879,7 @@ umbala,139,205,4 script Utan Man#5 785,{ if (event_umbala >= 3) { mes "[Jooltan]"; mes "It's been a long time since I last"; - mes "saw a Rune-Midgardian~!"; + mes "saw a Rune-Midgartsian~!"; mes "Welcome, stranger."; next; mes "[Jooltan]"; diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index ca2067a872..d5af23eebe 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -367,7 +367,7 @@ yuno,142,183,5 script Airship Representative 100,{ mes "[Airship Representative]"; mes "The teleport fee is 1,800 zeny, regardless of where you want to go. Please let me know your desired destination."; next; - switch(select("Prontera:Izlude:Geffen:Morroc:Payon:Alberta:Comodo:Cancel")) { + switch(select("Prontera:Izlude:Geffen:Morocc:Payon:Alberta:Comodo:Cancel")) { case 1: callsub S_Warp,"prontera",116,72; case 2: if (checkre(0)) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103; case 3: callsub S_Warp,"geffen",120,39; diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index 04a71e617c..06a733b7b4 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -36,9 +36,9 @@ OnInit: setarray $locationsname$[10],"Amatsu"; setarray $locationsname$[11],"Niflheim"; setarray $locationsname$[12],"Lutie"; - setarray $locationsname$[13],"Louyang"; - setarray $locationsname$[14],"Gonryun"; - setarray $locationsname$[15],"Yuno"; + setarray $locationsname$[13],"Luoyang"; + setarray $locationsname$[14],"Kunlun"; + setarray $locationsname$[15],"Juno"; setarray $locationsname$[16],"Ant Hell"; setarray $locationsname$[17],"Jawaii"; setarray $locationsname$[18],"Orc Village"; diff --git a/npc/custom/etc/floating_rates.txt b/npc/custom/etc/floating_rates.txt index 95ecd00259..476d7493dd 100644 --- a/npc/custom/etc/floating_rates.txt +++ b/npc/custom/etc/floating_rates.txt @@ -37,6 +37,6 @@ OnHour18: setbattleflag("item_rate_equip",$@drate,true); // Apply new rates to configs set above //we don't change card drops rate, because these values won't change them anyway - announce "Current Rune-Midgard rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060; + announce "Current rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060; end; } diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt index 44610e805a..8647da8e84 100644 --- a/npc/custom/etc/morroc_raceway.txt +++ b/npc/custom/etc/morroc_raceway.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Raceway +//= Morocc Raceway //===== By: ================================================== //= acky //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Lets players race around Morroc (pvp_y_1-5) +//= Lets players race around Morocc (pvp_y_1-5) //===== Additional Comments: ================================= //= If there are more than 3 players, at least 3 people //= must finish before a new race can be started. @@ -23,7 +23,7 @@ //Warps you into race way morocc,166,105,6 script Race Girl#01 116,{ mes "[Race Girl]"; - mes "Would you like to visit ^0000FFMorroc Raceway^000000?"; + mes "Would you like to visit ^0000FFMorocc Raceway^000000?"; next; menu "Yes",L_Warp,"No",-; mes "[Race Girl]"; @@ -37,14 +37,14 @@ L_Warp: //Warps you out of raceway pvp_y_1-5,169,265,5 script Race Girl#02 116,{ mes "[Race Girl]"; - mes "Welcome to Morroc Raceway!"; + mes "Welcome to Morocc Raceway!"; next; menu "Information",-,"Leave",L_Warp,"Cancel",L_Cancel; mes "[Race Girl]"; mes "Someone must click on the Starter NPC to start the race."; next; mes "[Race Girl]"; - mes "Once the race is started, run around Morroc anti-clockwise."; + mes "Once the race is started, run around Morocc anti-clockwise."; next; mes "[Race Girl]"; mes "You must reach all the checkpoints - No cheating!"; diff --git a/npc/custom/etc/mvp_room.txt b/npc/custom/etc/mvp_room.txt index 7abe0a7bfa..27385b1593 100644 --- a/npc/custom/etc/mvp_room.txt +++ b/npc/custom/etc/mvp_room.txt @@ -288,7 +288,7 @@ OnInit: 1751,// Valkyrie Randgris 1685,// Vesper 1648,// Whitesmith Harword - 1917,// Wounded Morroc + 1917,// Wounded Morocc 1658;// Ygnizem setarray .bossid[0], diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index 5b0d24ff62..675ccb9784 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -39,7 +39,7 @@ // - fixed missing pyramid gats in @DGat$ array // - removed the culver level 5 that didn't exist //= 1.7 - Readability of Dungeon menu building increased [Neouni] -// - Thanatos Tower & Louyang Dungeon added +// - Thanatos Tower & Luoyang Dungeon added //= 1.8 - changed around unlock variables [Neouni] // - Moved warp variables to mark what you have unlocked to an binary array in login based permanent variable // (warp variables are saved in login database, so all charservers have these unlocked) @@ -812,8 +812,8 @@ function script QWS_Tarray { setarray @pTYcoords[@Ti], 66; QWS_Make_Town_Menu 8; -//----------------Gonryun: - setarray @pTmenuitems$[@Ti], "Gonryun"; +//----------------Kunlun: + setarray @pTmenuitems$[@Ti], "Kunlun"; setarray @pTprice[@Ti], $QW_OW_PRICE; setarray @pTmap$[@Ti], "gonryun"; @@ -857,8 +857,8 @@ function script QWS_Tarray { setarray @pTYcoords[@Ti], 110; QWS_Make_Town_Menu 13; -//----------------Louyang: - setarray @pTmenuitems$[@Ti], "Louyang"; +//----------------Luoyang: + setarray @pTmenuitems$[@Ti], "Luoyang"; setarray @pTprice[@Ti], $QW_OW_PRICE; setarray @pTmap$[@Ti], "louyang"; @@ -893,8 +893,8 @@ function script QWS_Tarray { setarray @pTYcoords[@Ti], 97; QWS_Make_Town_Menu 24; -//----------------Morroc: - setarray @pTmenuitems$[@Ti], "Morroc"; +//----------------Morocc: + setarray @pTmenuitems$[@Ti], "Morocc"; setarray @pTprice[@Ti], $QW_BW_PRICE; setarray @pTmap$[@Ti], "morocc"; @@ -965,8 +965,8 @@ function script QWS_Tarray { setarray @pTYcoords[@Ti], 123; QWS_Make_Town_Menu 28; -//----------------Yuno: - setarray @pTmenuitems$[@Ti], "Yuno"; +//----------------Juno: + setarray @pTmenuitems$[@Ti], "Juno"; setarray @pTprice[@Ti], $QW_AW_PRICE; setarray @pTmap$[@Ti], "yuno"; @@ -1082,8 +1082,8 @@ function script QWS_Darray { QWS_Make_Dungeon_Menu 2; -//----------------AYOTAYA - setarray @pDmenuitems$[@Di], "Ayotaya Dungeon"; +//----------------AYOTHAYA + setarray @pDmenuitems$[@Di], "Ayothaya Dungeon"; setarray @pDprice[@Di], $QW_OW_PRICE; setarray @pDfee$[@Di], "$QW_OW_FEE"; setarray @DLevels[3], 2; @@ -1208,8 +1208,8 @@ function script QWS_Darray { QWS_Make_Dungeon_Menu 11; -//----------------GONRYUN DUNGEON - setarray @pDmenuitems$[@Di], "Gonryun Dungeon"; +//----------------KUNLUN DUNGEON + setarray @pDmenuitems$[@Di], "Kunlun Dungeon"; setarray @pDprice[@Di], $QW_OW_PRICE; setarray @pDfee$[@Di], "$QW_OW_FEE"; setarray @DLevels[@Di], 3; @@ -1279,7 +1279,7 @@ function script QWS_Darray { QWS_Make_Dungeon_Menu 15; //----------------LOUYANG DUNGEON - setarray @pDmenuitems$[@Di], "Louyang Dungeon"; + setarray @pDmenuitems$[@Di], "Luoyang Dungeon"; setarray @pDprice[@Di], $QW_OW_PRICE; setarray @pDfee$[@Di], "$QW_OW_FEE"; setarray @DLevels[@Di], 2; @@ -1633,25 +1633,25 @@ yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 113 alberta,32,240,4 script Warpra#15 113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; } aldebaran,146,118,4 script Warpra#16 113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; } -ayothaya,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; } +ayothaya,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayothaya Town"; close; } amatsu,193,81,1 script Warpra#18 113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; } comodo,195,158,4 script Warpra#19 113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; } einbroch,229,196,5 script Warpra#20 113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; } einbech,173,131,5 script Warpra#21 113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; } geffen,116,66,4 script Warpra#22 113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; } -gonryun,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; } +gonryun,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Kunlun Town"; close; } hugel,90,127,5 script Warpra#24 113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; } jawaii,107,182,5 script Warpra#25 113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; } izlude,132,116,4 script Warpra#26 113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; } lighthalzen,153,100,5 script Warpra#27 113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; } -louyang,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; } -morocc,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; } +louyang,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Luoyang Town"; close; } +morocc,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morocc Town"; close; } nif_fild01,319,77,1 script Warpra#30 113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; } payon,183,110,4 script Warpra#31 113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; } prontera,147,172,5 script Warpra#32 113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; } umbala,133,130,4 script Warpra#33 113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; } xmas,151,136,4 script Warpra#34 113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; } -yuno,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; } +yuno,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Juno Town"; close; } brasilis,201,222,4 script Warpra#36 113,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; } dicastes01,194,194,6 script Warpra#37 113,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; } manuk,262,177,4 script Warpra#38 113,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; } @@ -1666,7 +1666,7 @@ eclage,107,37,4 script Warpra#45 113,{ callfunc "QWS_Town_Warpra",30,"Eclage Tow abyss_02,274,266,1 script Warpra Helper#0 112,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; } ama_dun02,192,118,5 script Warpra Helper#1 112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; } anthell02,170,165,3 script Warpra Helper#2 112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; } -ayo_dun02,258,193,5 script Warpra Helper#3 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; } +ayo_dun02,258,193,5 script Warpra Helper#3 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayothaya Dungeon"; close; } ein_dun02,292,282,1 script Warpra Helper#4 112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; } iz_dun03,202,47,2 script Warpra Helper#5 112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; } c_tower3,129,106,4 script Warpra Helper#6 112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; } @@ -1675,11 +1675,11 @@ prt_sewb2,176,30,3 script Warpra Helper#8 112,{ callfunc "QWS_Dungeon_Warpra",7, gefenia03,137,34,0 script Warpra Helper#9 112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; } gef_dun02,218,61,2 script Warpra Helper#10 112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; } glast_01,371,308,3 script Warpra Helper#11 112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; } -gon_dun01,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; } +gon_dun01,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Kunlun Dungeon"; close; } juperos_02,127,154,5 script Warpra Helper#13 112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; } kh_dun01,14,224,3 script Warpra Helper#14 112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; } lhz_dun02,156,151,5 script Warpra Helper#15 112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; } -lou_dun02,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; } +lou_dun02,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Luoyang Dungeon"; close; } mag_dun02,46,41,3 script Warpra Helper#17 112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; } odin_tem01,115,148,3 script Warpra Helper#18 112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; } orcsdun01,185,11,3 script Warpra Helper#19 112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; } diff --git a/npc/custom/events/holiday/valentinesdayexp.txt b/npc/custom/events/holiday/valentinesdayexp.txt index 8e4f021d11..0c92932379 100644 --- a/npc/custom/events/holiday/valentinesdayexp.txt +++ b/npc/custom/events/holiday/valentinesdayexp.txt @@ -77,7 +77,7 @@ OnInit: alberta,26,243,4 script Stephen#val1 58,{ mes "[Stephen]"; mes "Guess what I've got?"; - mes "A tasty treat not easily found in Rune-Midgard...."; + mes "A tasty treat not easily found in Midgard...."; next; mes "[Stephen]"; mes "Chocolate!"; diff --git a/npc/custom/official/GeffenMagicTournament.txt b/npc/custom/official/GeffenMagicTournament.txt index 40e02dbea5..0ecad08522 100644 --- a/npc/custom/official/GeffenMagicTournament.txt +++ b/npc/custom/official/GeffenMagicTournament.txt @@ -1692,7 +1692,7 @@ OnStart: sleep 3000; npctalk "The darling of this year's tournament!"; sleep 3000; - npctalk "Rune-Midgard newest star, "+'charname$+"!"; + npctalk "Rune-Midgarts newest star, "+'charname$+"!"; sleep 2000; npctalk "And "+('sex ? "his" : "her")+" opponent~!!!"; sleep 2000; @@ -1704,7 +1704,7 @@ OnStart: sleep 1000; npctalk "Slow as a turtle, fast as a hare!"; sleep 3000; - npctalk "The maniac of Rune Midgard! Ifodes!"; + npctalk "The maniac of Rune-Midgarts! Ifodes!"; donpcevent instance_npcname("#Talkcontrol")+"::OnRndtalk"; end; case 19: @@ -1742,7 +1742,7 @@ OnStart: sleep 1000; npctalk "And "+('sex ? "his" : "her")+" opponent~!!!"; sleep 1000; - npctalk "Seductress of Rune Midgard..."; + npctalk "Seductress of Rune-Midgarts..."; sleep 500; donpcevent instance_npcname("Odoric#1")+"::OnActivate"; sleep 500; @@ -1824,7 +1824,7 @@ OnStart: sleep 1000; npctalk "Oh! This match is going to be exciting!",instance_npcname("Chaos#a2"); sleep 2000; - npctalk "Is there any Wizard stronger in all of Rune-Midgard?!"; + npctalk "Is there any Wizard stronger in all of Rune-Midgarts?!"; sleep 3000; npctalk "The Blue Wizard! Fenris Fenrir~!!"; end; diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt index e6b2596c36..6a518bcdee 100644 --- a/npc/custom/quests/kahohorn.txt +++ b/npc/custom/quests/kahohorn.txt @@ -64,6 +64,6 @@ geffen,115,107,5 script Lord Kaho's Servant 61,{ set Zeny, Zeny-5000000; mes "Wow! You are brave indeed!"; getitem 5013,1; - mes "Enjoy being God of Rune-Midgard!"; + mes "Enjoy being God of Midgard!"; close; } diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt index e81d22337b..7f6432cfcc 100644 --- a/npc/custom/quests/sunglasses.txt +++ b/npc/custom/quests/sunglasses.txt @@ -23,7 +23,7 @@ alberta,88,193,5 script Sunglasses Trader 73,{ mes "There is nothing more I can tell you."; next; mes "[Sunglasses Trader]"; - mes "Go see Maseph. She is somewhere north of Morroc."; + mes "Go see Maseph. She is somewhere north of Morocc."; close; } mes "Hello. What can I do for you?"; next; @@ -64,7 +64,7 @@ alberta,88,193,5 script Sunglasses Trader 73,{ mes "Great. Now, listen carefully."; next; mes "[Sunglasses Trader]"; - mes "Look for someone named Maseph somewhere north of Morroc."; + mes "Look for someone named Maseph somewhere north of Morocc."; mes "I will send her a message to let her know that you are coming."; close; } diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index 7ad2aa750b..46ec6eed56 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/npc/custom/quests/thq/THQS_QuestNPC.txt @@ -173,8 +173,8 @@ N_JobList2: mes "^FF0000------------------^000000"; mes "I do not know much about this quest."; mes " "; - mes "A strange man came in here yesterday and asked me to deliver this ^FF0000Strange Letter^000000 to some woman in Morroc. Knowing us we do not ask questions so you must take care of this delivery."; - mes "The Woman is in located in Morroc and her name is Erika."; + mes "A strange man came in here yesterday and asked me to deliver this ^FF0000Strange Letter^000000 to some woman in Morocc. Knowing us we do not ask questions so you must take care of this delivery."; + mes "The Woman is in located in Morocc and her name is Erika."; getitem 1072,1; //Delivery_Message set two_qset, 1; goto L_QuestGiven; @@ -245,7 +245,7 @@ N_ProntCulvert: N_CoalMine: mes "^FF0000Trouble at the Coal Mine^000000"; mes "^FF0000************************^000000"; - mes "The fun...err...trouble never stops in Rune Midgard."; + mes "The fun...err...trouble never stops in Rune-Midgarts."; mes " "; mes "Recently there was an accident at the coal mines. There was a huge chasm that released some undead Evil Druids."; next; @@ -441,7 +441,7 @@ N_Delivery4: mes "^FF0000----------------^000000"; mes "Well yah box delivering is in high demand,lots of lazy people."; mes " "; - mes "Take this package to a man in Morroc named Klye."; + mes "Take this package to a man in Morocc named Klye."; getitem 1081,1; //Delivery_Box set eight_qset,2; goto L_QuestGiven; @@ -518,7 +518,7 @@ N_JobList10: mes "^FF0000The Blank Box^000000"; mes "^FF0000-------------^000000"; - mes "Package to Morroc"; + mes "Package to Morocc"; mes " "; mes "There is nothing written on this box but a notice to deliver it to a man Kreg."; getitem 1082,1; //Delivery_Box_ diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index 752ae7b081..f2ef03bda9 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -957,7 +957,7 @@ morocc,193,51,6 script Kreg 48,{ if (ten_qset == 1 && countitem(1082) > 0) goto N_QuestComp; if (ten_qset == 1) goto N_QuestStart; mes "[Kreg]"; - mes "Hello "+strcharinfo(0)+" welcome to Morroc."; + mes "Hello "+strcharinfo(0)+" welcome to Morocc."; close; N_QuestComp: mes "[Kreg]"; diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt index 96fc4102a0..0ee857737c 100644 --- a/npc/custom/quests/umbalian_language.txt +++ b/npc/custom/quests/umbalian_language.txt @@ -175,7 +175,7 @@ L_QUEST: mes "Actually it is knowledge of the Umbalian people. They are connected to this world of Midgard in some special way, we just can't confirm it yet. There is a theory that they may be like the elves and protect the ancient tree of Yggdrasil."; next; mes "[Fabius]"; - mes "And I, a great wise man of Yuno, will teach you their language!"; + mes "And I, a great wise man of Juno, will teach you their language!"; next; mes "^0000FF Learned the language of Umbalians! ^000000"; set umb_lang,2; diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt index e49c7c314c..1cf98b62aa 100644 --- a/npc/custom/warper.txt +++ b/npc/custom/warper.txt @@ -128,12 +128,12 @@ function Restrict { // -------------------------------------------------- menu "Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5, "Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10, - "Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15, - "Izlude",T16, "Jawaii",T17, "Lasagna",T18, "Lighthalzen",T19, "Louyang",T20, + "Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Kunlun",T14, "Hugel",T15, + "Izlude",T16, "Jawaii",T17, "Lasagna",T18, "Lighthalzen",T19, "Luoyang",T20, "Lutie",T21, "Malangdo",T22, "Malaya",T23, "Manuk",T24, - "Midgarts Expedition Camp",T25, "Mora",T26, "Morroc",T27, "Moscovia",T28, + "Midgarts Expedition Camp",T25, "Mora",T26, "Morocc",T27, "Moscovia",T28, "Nameless Island",T29, "Niflheim",T30, "Payon",T31, "Rachel",T32, "Splendide",T33, - "Thor Camp",T34, "Umbala",T35, "Veins",T36, "Yuno",T37; + "Thor Camp",T34, "Umbala",T35, "Veins",T36, "Juno",T37; T1: Go("prontera",155,183); T2: Go("alberta",28,234); @@ -188,13 +188,13 @@ T37: Go("yuno",157,51); menu "Amatsu Fields",F1, "Ayothaya Fields",F2, "Bifrost Fields", F3, "Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6, "Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9, - "Geffen Fields",F10, "Gonryun Fields",F11, "Hugel Fields",F12, - "Lasagna Fields",F13, "Lighthalzen Fields",F14, "Louyang Field",F15, + "Geffen Fields",F10, "Kunlun Fields",F11, "Hugel Fields",F12, + "Lasagna Fields",F13, "Lighthalzen Fields",F14, "Luoyang Field",F15, "Lutie Field",F16, "Malaya Fields",F17, "Manuk Fields",F18, "Mjolnir Fields",F19, "Moscovia Fields",F20, "Niflheim Fields",F21, "Payon Forests",F22, "Prontera Fields",F23, "Rachel Fields",F24, "Sograt Deserts",F25, "Splendide Fields",F26, "Umbala Fields",F27, - "Veins Fields",F28, "Yuno Fields",F29; + "Veins Fields",F28, "Juno Fields",F29; F1: setarray @c[2],190,197; Disp("Amatsu Field",1,1); Pick("ama_fild"); @@ -225,7 +225,7 @@ F10: Restrict("Pre-RE",13,15); setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185; Disp("Geffen Field",0,14); Pick("gef_fild",1); F11: setarray @c[2],220,227; - Disp("Gonryun Field",1,1); Pick("gon_fild"); + Disp("Kunlun Field",1,1); Pick("gon_fild"); F12: Restrict("Pre-RE",3,7); setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197; Disp("Hugel Field",1,7); Pick("hu_fild"); @@ -235,7 +235,7 @@ F13: Restrict("RE"); F14: setarray @c[2],240,179,185,235,240,226; Disp("Lighthalzen Field",1,3); Pick("lhz_fild"); F15: setarray @c[2],229,187; - Disp("Louyang Field",1,1); Pick("lou_fild"); + Disp("Luoyang Field",1,1); Pick("lou_fild"); F16: setarray @c[2],115,145; Disp("Lutie Field",1,1); Pick("xmas_fild"); F17: Restrict("RE"); @@ -257,7 +257,7 @@ F23: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193, F24: Restrict("Pre-RE",2,7,9,10,11,13); setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197; Disp("Rachel Field",1,13); Pick("ra_fild"); -F25: if(.Satan_Morroc){ +F25: if(.Satan_Morocc){ setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195; Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22"); Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22"); @@ -274,7 +274,7 @@ F28: Restrict("Pre-RE",5); Disp("Veins Field",1,7); Pick("ve_fild"); F29: Restrict("Pre-RE",5,10); setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304; - Disp("Yuno Field",1,12); Pick("yuno_fild"); + Disp("Juno Field",1,12); Pick("yuno_fild"); // -------------------------------------------------- Dungeons: @@ -285,9 +285,9 @@ menu "Abyss Lakes",D1, "Amatsu Dungeon",D2, "Anthell",D3, "Bio Labs",D6, "Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9, "Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13, "Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16, - "Glast Heim",D17, "Gonryun Dungeon",D18, "Hidden Dungeon",D19, + "Glast Heim",D17, "Kunlun Dungeon",D18, "Hidden Dungeon",D19, "Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Lasagna Dungeon",D23, - "Louyang Dungeon",D24, "Magma Dungeon",D25, "Malangdo Dungeon",D26, + "Luoyang Dungeon",D24, "Magma Dungeon",D25, "Malangdo Dungeon",D26, "Moscovia Dungeon",D27, "Nidhogg's Dungeon",D28, "Odin Temple",D29, "Orc Dungeon",D30, "Payon Dungeon",D31, "Pyramids",D32, "Rachel Sanctuary",D33, "Scaraba Hole",D34, "Sphinx",D35, "Sunken Ship",D36, "Thanatos Tower",D37, @@ -334,7 +334,7 @@ D17: setarray @c[2],370,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291, Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2"); Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1"); D18: setarray @c[2],153,53,28,113,68,16; - Disp("Gonryun Dungeon",1,3); Pick("gon_dun"); + Disp("Kunlun Dungeon",1,3); Pick("gon_dun"); D19: setarray @c[2],176,7,93,20,23,8; Disp("Hidden Dungeon",1,3); Pick("prt_maze"); D20: setarray @c[2],157,14,151,155,149,22,33,158; @@ -397,7 +397,7 @@ D42: Restrict("RE"); Castles: // -------------------------------------------------- menu "[FE] Aldebaran Castles",C1, "[FE] Geffen Castles",C2, "[FE] Payon Castles",C3, - "[FE] Prontera Castles",C4, "[SE] Arunafeltz Castles",C5, "[SE] Schwaltzvalt Castles",C6, + "[FE] Prontera Castles",C4, "[SE] Arunafeltz Castles",C5, "[SE] Schwarzwald Castles",C6, "[TE] Aldebaran Castles",C7, "[TE] Prontera Castles",C8; C1: setarray @c[2],48,83,95,249,142,85,239,242,264,90; @@ -431,7 +431,7 @@ C8: Restrict("RE"); Guild_Dungeons: // -------------------------------------------------- menu "Baldur",G1, "Luina",G2, "Valkyrie",G3, "Britoniah",G4, - "Arunafeltz",G5, "Schwaltzvalt",G6, "Kafragarten",G7, + "Arunafeltz",G5, "Schwarzwald",G6, "Kafragarten",G7, "Gloria",G8; G1: Restrict("RE",2,3); @@ -509,7 +509,7 @@ I20: Restrict("RE"); Special: // -------------------------------------------------- menu "Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Dimensional Rift",S4, - "Eden Group Headquarters",S5, "Gonryun Arena",S6, "Izlude Arena",S7, + "Eden Group Headquarters",S5, "Kunlun Arena",S6, "Izlude Arena",S7, "Monster Race Arena",S8, "Para Market",S9, "Turbo Track",S10; S1: Go("auction_01",22,68); @@ -527,7 +527,7 @@ S9: Restrict("RE"); S10: Go("turbo_room",99,114); OnInit: - .Satan_Morroc = true; // false will enable moc_fild 4,5,6,8,9,10,14,15 while disable moc_fild 20,21,22 Default is true. + .Satan_Morocc = true; // false will enable moc_fild 4,5,6,8,9,10,14,15 while disable moc_fild 20,21,22 Default is true. .OnlyFirstFld = false; // true will teleport to the first level of the Fields Default is false. .OnlyFirstDun = false; // true will teleport to the first level of the Dungeons Default is false. } diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index 55be8a11da..3835b62eba 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -88,7 +88,7 @@ OnInit: "schg_cas01","schg_cas02","schg_cas03","schg_cas04","schg_cas05"; setarray .EndLabel$[0],"ar01","ar02","ar03","ar04","ar05","sc01","sc02","sc03","sc04","sc05"; setarray .Days$[0],"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"; - setarray .Regions$[0],"Prontera","Payon","Geffen","Aldebaran","Arunafeltz","Schwaltzvalt"; + setarray .Regions$[0],"Prontera","Payon","Geffen","Aldebaran","Arunafeltz","Schwarzwald"; setarray .Map$[0],"prt_gld","pay_gld","gef_fild13","alde_gld","aru_gld","sch_gld"; setarray .MapX[0],134,240,153,111,208,121,295,317,140,204,214,308,143,193,305,48, 95,142,239,264,158,83, 68,299,292,293,288, 97,137, 71; setarray .MapY[0], 65,128,137,240,240,233,116,293,160,266, 75,240,240,278, 87,83,249, 85,242, 90,272,47,155,345,107,100,252,196, 90,315; diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index e8e6903074..2a2a329e41 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -39,7 +39,7 @@ prontera,114,81,5 script RWC2011 Agent#2 407,{ mes "It seems you've traveled quite enough but you're not good with hearing the news around the world."; next; mes "[New Agent]"; - mes "There are few adventurers in Rune-Midgard whose lives are dedicated to battle, who never skip their training, live in seclusion, and are experts in their art."; + mes "There are few adventurers in Midgard whose lives are dedicated to battle, who never skip their training, live in seclusion, and are experts in their art."; next; mes "[New Agent]"; mes "The RWC is the festival where those adventurers can compete with each other and find out who is the best!"; diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 0ad66b4791..5375b418ab 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -163,7 +163,7 @@ prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 709,{ mes "Chicken Eggs got to be so"; mes "expensive? I mean, 500 zeny"; mes "is a lot! I think it's because"; - mes "some guy in Morroc is trying"; + mes "some guy in Morocc is trying"; mes "to amass a ton of Holy Eggs!"; next; mes "[Cantankerous Geezer]"; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index f09a78a179..8478e30670 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Official Skill Resetter Event in Yuno (kRO & idRO) +//= Official Skill Resetter Event in Juno (kRO & idRO) //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 3938de78ef..1711104a74 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Guild dungeon event, Schwaltzvalt. +//= Guild dungeon event, Schwarzwald. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's +//= Guild dungeon event, Schwarzwald. Retrieve Morestone's //= pickaxe from Kublin. //===== Additional Comments: ================================= //= 1.0 First version diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index db0e68ac9f..e15b150e30 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -469,7 +469,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 891,{ } mes "[Rhehe Ravies]"; mes "Okay then, I'll explain a little about the summoning ritual."; - mes "Here in Yuno, the summoning ritual through the use of that flower will summon Valkyrie's Blessing and Valkyrie's Gift."; + mes "Here in Juno, the summoning ritual through the use of that flower will summon Valkyrie's Blessing and Valkyrie's Gift."; mes "The effects of the summoning ritual will last approximately one hour."; next; mes "[Rhehe Ravies]"; diff --git a/npc/events/halloween_2013.txt b/npc/events/halloween_2013.txt index 68e2b59d4b..c36587319e 100644 --- a/npc/events/halloween_2013.txt +++ b/npc/events/halloween_2013.txt @@ -322,7 +322,7 @@ niflheim,181,173,5 script Chef Candycon#2013HE 796,{ mes "Speaking like this is way better to scare people...heww..however, I can't bare it as it is too stuffy."; next; mes "[Chef Candycon]"; - mes "Anyway! It won't be delayed if those pumpkins didn't escape to Midgarts."; + mes "Anyway! It won't be delayed if those pumpkins didn't escape to Midgard."; next; mes "[Chef Candycon]"; mes "Obviously, we are dead so we are pretty weak to the sun. We would be a pile of ash if we searched during daytime."; diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 74f2172a40..84720aca2d 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -21,9 +21,9 @@ function script F_Flags { set .@GID, GetCastleData(getarg(1),1); if (getarg(5) == 0) return; if (.@GID == 0) { - mes " [ Edict of the Divine Rune Midgard Kingdom ]"; + mes " [ Edict of the Divine Rune-Midgarts Kingdom ]"; mes " "; - mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, "; + mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "We declare that"; mes "there is no formal master of this castle."; mes " "; @@ -45,10 +45,10 @@ function script F_Flags { } return; } - mes "[ Edict of the Divine Rune Midgard Kingdom ]"; + mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; mes " "; mes "1. Following the ordinance of the"; - mes "Divine Rune Midgard Kingdom,"; + mes "Divine Rune-Midgarts Kingdom,"; mes "we approve that this place is in"; mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild."; mes " "; diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index bd240d7094..29ae3e1d1c 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -20,7 +20,7 @@ alberta,26,243,4 script Stephen 58,{ mes "[Stephen]"; mes "Guess what I've got?"; - mes "A tasty treat not easily found in Rune-Midgard...."; + mes "A tasty treat not easily found in Midgard...."; next; mes "[Stephen]"; mes "Chocolate!"; diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 2787680984..f7daf02bdd 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -1747,7 +1747,7 @@ function script LinkFlag { //============================================================ function script ReturnFlag { .@map$ = getarg(0); - set .@str$, (compare(strnpcinfo(4),"aru"))?"Arunafeltz":"Schwaltzvalt"; + set .@str$, (compare(strnpcinfo(4),"aru"))?"Arunafeltz":"Schwarzwald"; .@GID = getcastledata(.@map$,CD_GUILD_ID); if (!.@GID) { mes "[ "+.@str$+" Royal Edict ]"; diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 3c50234591..98a55af123 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -996,10 +996,10 @@ function script F_Tower_Monster { areamonster .@map$,9,9,19,45,"Skeggiold",1754,10,.@label$; break; case 97: - areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1918,5,.@label$; - areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1919,5,.@label$; - areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1920,5,.@label$; - areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1921,5,.@label$; + areamonster .@map$,93,9,103,45,"Incarnation of Morocc",1918,5,.@label$; + areamonster .@map$,93,9,103,45,"Incarnation of Morocc",1919,5,.@label$; + areamonster .@map$,93,9,103,45,"Incarnation of Morocc",1920,5,.@label$; + areamonster .@map$,93,9,103,45,"Incarnation of Morocc",1921,5,.@label$; break; case 98: areamonster .@map$,181,9,191,45,"Kathryne Keyron",1639,2,.@label$; @@ -1025,13 +1025,13 @@ function script F_Tower_Monster { else if (.@mob_ran == 6) areamonster .@map$,267,9,277,45,"Cecil Damon",1638,2,.@label$; else if (.@mob_ran == 7) - areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1918,5,.@label$; + areamonster .@map$,267,9,277,45,"Incarnation of Morocc",1918,5,.@label$; else if (.@mob_ran == 8) - areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1919,5,.@label$; + areamonster .@map$,267,9,277,45,"Incarnation of Morocc",1919,5,.@label$; else if (.@mob_ran == 9) - areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1920,5,.@label$; + areamonster .@map$,267,9,277,45,"Incarnation of Morocc",1920,5,.@label$; else if (.@mob_ran == 10) - areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1921,5,.@label$; + areamonster .@map$,267,9,277,45,"Incarnation of Morocc",1921,5,.@label$; else if (.@mob_ran == 11) areamonster .@map$,267,9,277,45,"Valkyrie",1765,5,.@label$; else if (.@mob_ran == 12) diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index 6c8e934f9d..5d17de07c4 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -528,9 +528,9 @@ prt_in,171,94,3 script Assistant Naomi#edq 893,3,3,{ next; mes "Continuously, adventurers from Rune-Midgarts have attacked him and he is slowly losing his power. He would need more time to resurrect completely."; next; - mes "Satan Morroc stopped to destroy the city of Morroc, turning it into a ruined desert, then started to rip the world apart."; + mes "Satan Morocc stopped to destroy the city of Morocc, turning it into a ruined desert, then started to rip the world apart."; next; - mes "Satan Morroc was worried about those who would give chase, so he created Morocc clones to keep watch behind him."; + mes "Satan Morocc was worried about those who would give chase, so he created Morocc clones to keep watch behind him."; next; mes "Modeled after Morocc, their appearance made it difficult to go around the time-space gap."; next; @@ -538,13 +538,13 @@ prt_in,171,94,3 script Assistant Naomi#edq 893,3,3,{ next; mes "The reports of these adventurers have been sent to representatives of all kingdoms, and an expedition team has been created to find out more information."; next; - mes "The scientists of Schwartzwalt created a combination metal, using fragments of metals found in the dimensional gorge."; + mes "The scientists of Schwarzwald created a combination metal, using fragments of metals found in the dimensional gorge."; next; - mes "The Schwaltzvalt Republic requested approval to find the source of the new metal, and since Rune-Midgart couldn't complete the test themselves, they finally accepted."; + mes "The Schwarzwald Republic requested approval to find the source of the new metal, and since Rune-Midgarts couldn't complete the test themselves, they finally accepted."; next; mes "They associated together to gather volunteers. The Assassin Guild was the first to volunteer."; next; - mes "The Assassins have a terrible past with Satan Morroc, so they gathered 18 members to chase him down."; + mes "The Assassins have a terrible past with Satan Morocc, so they gathered 18 members to chase him down."; next; mes "About 3 hours later, all 18 members returned without any problem, and each man and woman shared the information that they had collected."; next; diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 2a3e851ff0..6d6b636457 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -119,7 +119,7 @@ gef_fild10,238,202,6 script Mad Scientist#orc 865,{ case 1: mes "[Mad Scientist]"; mes "Yeah, yeah.. I know it's hard to belive. I don't blame ya."; - mes "I used to study the Dimensional Gorge discovered near Morroc."; + mes "I used to study the Dimensional Gorge discovered near Morocc."; mes "According to my research, the minerals found there have enormous power inside them!"; next; break; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 7da38ab88d..9b0c3aa94d 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -488,7 +488,7 @@ OnTouch_: mes "As I have told you repeatedly: Katar class weapons (Jamadhar/Jur/Katar etc) are two-handed!"; next; mes "[Assassin 'Khai']"; - mes "City of desert... I miss my hometown, Morroc. I haven't been there for a long time. I feel like I became a Thief a few days ago. Time flies so fast..."; + mes "City of desert... I miss my hometown, Morocc. I haven't been there for a long time. I feel like I became a Thief a few days ago. Time flies so fast..."; next; mes "[Assassin 'Khai']"; mes "Heh. I remember my Thief quest. I was so damn nervous when I broke into the farm to get Mushrooms..."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 052e8f8c48..81b995905b 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -366,7 +366,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ mes "1. Which one of the following regions is matched incorrectly"; mes "with its specialty item?"; next; - if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4) + if (select("Morocc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4) set .@black_q,.@black_q+10; mes "[Geschupenschte]"; mes "2. What status can"; @@ -385,7 +385,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ mes "4. Where can you find a store"; mes "that sells Blue Gemstones?"; next; - if (select("Alberta:Morroc:Geffen:Prontera") == 3) + if (select("Alberta:Morocc:Geffen:Prontera") == 3) set .@black_q,.@black_q+10; mes "[Geschupenschte]"; mes "5. Where is the"; @@ -451,12 +451,12 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ mes "change your Job to"; mes "become a Merchant?"; next; - if (select("Alberta:Morroc:Geffen:Prontera") == 1) + if (select("Alberta:Morocc:Geffen:Prontera") == 1) set .@black_q,.@black_q+10; mes "[Geschupenschte]"; mes "5. Where is the"; mes "Weapons Dealer"; - mes "located in Morroc?"; + mes "located in Morocc?"; next; if (select("7 o'clock from the town's center:11 o'clock from the town's center:6 o'clock from the town's center:5 o'clock from the town's center") == 4) set .@black_q,.@black_q+10; @@ -693,7 +693,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ mes "to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom,"; break; case 10: - mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt."; + mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morocc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt."; getitem 1219,1; //Gladius if (checkquest(2004) != -1) { changequest 2004,2009; @@ -715,7 +715,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ next; mes "[Geschupenschte]"; mes "Anyway, take this"; - mes "to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom,"; + mes "to ^8E6B23Wickebine^000000 in Morocc of Rune-Midgarts Kingdom,"; break; case 11: mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt."; @@ -842,7 +842,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ } else if (BSMITH_Q == 10) { mes "Find the Swordmace"; - mes "dealer ^8E6B23Wickebine^000000 in Morroc. And don't forget the receipt."; + mes "dealer ^8E6B23Wickebine^000000 in Morocc. And don't forget the receipt."; } else if (BSMITH_Q == 11) { mes "In Lighthalzen, 6 o'clock direction from the town center, you will find ^8E6B23Krongast^000000 near the weapon shop. And don't forget the receipt."; @@ -1500,7 +1500,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{ mes "^8E6B23Crazy Uproar^000000 and"; mes "^8E6B23Change Cart^000000 skills?"; next; - if (select("Al De Baran:Alberta:Morroc:Izlude") == 2) + if (select("Al De Baran:Alberta:Morocc:Izlude") == 2) set .@blackss_te,.@blackss_te+20; mes "[Mitehmaeeuh]"; mes "3. From the center of Einbroch,"; @@ -1513,7 +1513,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{ mes "can you find the"; mes "most Blacksmiths?"; next; - if (select("Prontera:Morroc:Alberta:Einbroch") == 4) + if (select("Prontera:Morocc:Alberta:Einbroch") == 4) set .@blackss_te,.@blackss_te+20; mes "[Mitehmaeeuh]"; mes "5. Which of the"; @@ -1580,7 +1580,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{ else { emotion ET_SCRATCH; mes "[Mitehmaeeuh]"; - mes "I had to deal with the heat when I was in Morroc,"; + mes "I had to deal with the heat when I was in Morocc,"; mes "and now I have to deal with the smog in this Einbroch!"; next; mes "[Mitehmaeeuh]"; @@ -1601,10 +1601,10 @@ geffen_in,109,170,3 script Blacksmith Guildsman#gef 726,{ next; mes "[Blacksmith Guildsman]"; mes "I thank you for coming this far to visit our guild. However, I regret to inform you that Blacksmith Guild has been"; - mes "moved to ^3131FF'Einbroch' in the Schwaltzvalt Republic^000000."; + mes "moved to ^3131FF'Einbroch' in the Schwarzwald Republic^000000."; next; mes "[Blacksmith Guildsman]"; - mes "You can travel to Schwaltzvalt Republic by using the airship."; + mes "You can travel to Schwarzwald Republic by using the airship."; mes "I can provide you a teleport service to Izlude, where you can use the airship."; mes "Would you like to move to Izlude immediately?"; next; @@ -1614,10 +1614,10 @@ geffen_in,109,170,3 script Blacksmith Guildsman#gef 726,{ mes "Oops, haven't you used the airship yet?"; next; mes "[Blacksmith Guildsman]"; - mes "Unlike Rune-Midgarts Kingdom, Schwalitzvalt Republic has 'the airship' instead of teleport services to move between towns."; + mes "Unlike Rune-Midgarts Kingdom, Schwarzwald Republic has 'the airship' instead of teleport services to move between towns."; next; mes "[Blacksmith Guildsman]"; - mes "In ^3131FF'Izlude'^000000, you can use ^3131FF'the international airship'^000000 which travels between ^3131FFIzlude and Juno in Schwaltzvalt Republic^000000."; + mes "In ^3131FF'Izlude'^000000, you can use ^3131FF'the international airship'^000000 which travels between ^3131FFIzlude and Juno in Schwarzwald Republic^000000."; next; mes "[Blacksmith Guildsman]"; mes "Take the airship, and go to Juno. Then from Juno, you need to take ^3131FFthe domestic airship^000000 to go to Einbroch."; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 3934ac74f3..9b7c0b0ecf 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -60,7 +60,7 @@ in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 727,{ mes "============ Notice ============"; mes "We would like to inform that the Hunter Job Change Location"; - mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic."; + mes "has been moved to ^ff0000Hugel^000000 in the Schwarzwald Republic."; next; mes "You can now use the Hugel airline, so please use the airship to visit Hugel."; next; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index a1194fe60a..d77590952a 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -444,7 +444,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 56,{ mes "[Captain Herman]"; mes "Go forth!"; mes "The future of"; - mes "Rune-Midgard"; + mes "Rune-Midgarts"; mes "rests on your"; mes "shoulders!"; close; @@ -1601,7 +1601,7 @@ prt_in,69,107,6 script Lady Amy#knt 728,{ mes "let's begin!"; next; mes "[Lady Amy]"; - mes "You are a Knight and you are looking for a party in Morroc."; + mes "You are a Knight and you are looking for a party in Morocc."; mes "How would you go about doing so?"; next; } @@ -1612,7 +1612,7 @@ prt_in,69,107,6 script Lady Amy#knt 728,{ close; } } - mes "You are a Knight and you are looking for a party in Morroc."; + mes "You are a Knight and you are looking for a party in Morocc."; mes "How would you go about doing so?"; next; if (select("Shout out that you are looking for a party.:Open a chat room and wait.:Look for people seeking Knights.") != 1) @@ -2018,7 +2018,7 @@ prt_in,87,92,4 script Sir Gray#knt 119,{ switch(select("About ^3355FFClaymore^000000:Buy Claymore:End Conversation")) { case 1: mes "[Sir Gray]"; - mes "Claymore, one of the best among the famous swords you can attain in Rune-Midgarts's Prontera!! Its value is priceless when considered by a Knight."; + mes "Claymore, one of the best among the famous swords you can attain in Rune-Midgarts' Prontera!! Its value is priceless when considered by a Knight."; next; mes "[Sir Gray]"; mes "Now, the Prontera Chivalry is making these fabulous Claymores. For Knights, they are only ^3355FF74,000^000000 Zeny."; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index a450a45b92..243fb32e18 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -298,7 +298,7 @@ prt_church,16,41,4 script High Bishop#prst 60,{ next; mes "[Bishop Paul]"; mes "Second, please visit Sister Mathilda. She is located in"; - mes "an area near Morroc, Southwest of Prontera."; + mes "an area near Morocc, Southwest of Prontera."; next; mes "[Bishop Paul]"; mes "The third Priest you must visit is Father Yosuke. He is in a field Northwest of Prontera."; @@ -353,7 +353,7 @@ prt_church,16,41,4 script High Bishop#prst 60,{ mes "First, meet Father Rubalkabara. He's at the Northeast of the Prontera ruins."; next; mes "[Bishop Paul]"; - mes "Then, remember to meet Sister Mathilda. She's somewhere near the town of Morroc, Southwest of Prontera."; + mes "Then, remember to meet Sister Mathilda. She's somewhere near the town of Morocc, Southwest of Prontera."; next; mes "[Bishop Paul]"; mes "And lastly, please seek out Father Yosuke. He is in the a field Northwest of Prontera."; @@ -632,10 +632,10 @@ prt_church,27,24,1 script Sister Cecilia 79,{ close; } else if (PRIEST_Q == 2) { - mes "Oh, you've met Father Rubalkabara. Now it's time for you to visit Sister Mathilda. She is near a town named Morroc."; + mes "Oh, you've met Father Rubalkabara. Now it's time for you to visit Sister Mathilda. She is near a town named Morocc."; next; mes "[Sister Cecilia]"; - mes "She has been training her religious discipline somewhere in a field North of Morroc. If you look around that field, you will be able to find her."; + mes "She has been training her religious discipline somewhere in a field North of Morocc. If you look around that field, you will be able to find her."; next; mes "[Sister Cecilia]"; mes "Of course, sometimes I want to devote myself to training like those other Priests, but I have my duty to assist those Acolytes applying for the Priest job."; @@ -1777,7 +1777,7 @@ function script F_MotherMart { mes "the peoples of the Earth."; next; mes "[Mother Mathilda]"; - mes "After you become a Priest, your travels may take you to the Morroc Pyramids. I hope that you may release the Undead there from the evil to which they are bound."; + mes "After you become a Priest, your travels may take you to the Morocc Pyramids. I hope that you may release the Undead there from the evil to which they are bound."; next; mes "[Mother Mathilda]"; mes "Well then..."; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 796ad56438..91c4999b2a 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -708,7 +708,7 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{ mes "[Raulel]"; mes "4. Which town is the home of Mages?"; next; - if (select("Prontera:Morroc:Alberta:Geffen") == 4) + if (select("Prontera:Morocc:Alberta:Geffen") == 4) set .@wizard_t,.@wizard_t+10; mes "[Raulel]"; mes "5. Which of the following cards has nothing to do with INT?"; diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index a8f9b9c23e..e3456ea89b 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -41,7 +41,7 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ else if (ADVJOB == Job_High_Wizard && Class == Job_Mage_High && JobLevel > 39) { mes "[High Wizard]"; mes "It is time."; - mes "And Rune-Midgard has"; + mes "And Midgard has"; mes "need of those who can"; mes "wield the strongest of magic..."; next; diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index 277af29ea4..06d06e8ac0 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -71,7 +71,7 @@ valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ mes "As a MasterSmith,"; mes "I hope you will forge"; mes "a path towards a brighter"; - mes "future for Rune-Midgard."; + mes "future for Midgard."; close; } mes "[MasterSmith]"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index e11664b86d..3c429e6a51 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -703,7 +703,7 @@ job_duncer,95,93,4 script Bijou#da 101,{ mes "4. Which town has"; mes "the most Dancers?"; next; - if (select("Al De Baran:Juno:Morroc:Comodo") == 4) + if (select("Al De Baran:Juno:Morocc:Comodo") == 4) set .@da_score,.@da_score+10; mes "[Bijou]"; mes "5. Of the following,"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 1e92703fba..6b0c0e7260 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -19,7 +19,7 @@ //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf] //= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf] //= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm] -//= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf] +//= 2.8 Moved "Thug" to Morocc Ruins. [L0ne_W0lf] //= 2.9 Added Quest Log commands. [Kisuka] //============================================================ @@ -354,13 +354,13 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{ mes "[Markie]"; mes "3. Choose the location where Thieves can change their jobs to Rogues."; next; - if (select("Comodo:Kokomo Beach:Paros Lighthouse:Morroc") == 3) + if (select("Comodo:Kokomo Beach:Paros Lighthouse:Morocc") == 3) set .@assassin_t,.@assassin_t+10; mes "[Markie]"; mes "4. In which town can Novices change their jobs to Thieves?"; next; - if (select("Comodo:Lutie:Alberta:Morroc") == 4) + if (select("Comodo:Lutie:Alberta:Morocc") == 4) set .@assassin_t,.@assassin_t+10; mes "[Markie]"; @@ -391,7 +391,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{ mes "[Markie]"; mes "8. You want to dye your hair blue. What town do you go to, and in which direction, with 12 o' clock being North."; next; - if (select("Morroc, 7 o'clock:Prontera, 7 o'clock:Morroc, 5 o'clock:Prontera, 1 o'clock") == 2) + if (select("Morocc, 7 o'clock:Prontera, 7 o'clock:Morocc, 5 o'clock:Prontera, 1 o'clock") == 2) set .@assassin_t,.@assassin_t+10; mes "[Markie]"; @@ -869,7 +869,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{ mes "Alright... Now that I've calmed down, I can inform you of your next destination. *Whew*"; next; mes "[Mr. Smith]"; - mes "Go and find Hermanthorn Junior, who is living near the ^0000FFthe checkpoint of Paros Lighthouse^000000, which is at the border between Morroc and Comodo."; + mes "Go and find Hermanthorn Junior, who is living near the ^0000FFthe checkpoint of Paros Lighthouse^000000, which is at the border between Morocc and Comodo."; next; mes "[Mr. Smith]"; mes "Ah...almost forgot, keep in mind not to mention anything about upgrading items. This is very important."; @@ -915,7 +915,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{ mes "forgot where to go?"; next; mes "[Mr. Smith]"; - mes "Go to the field South of Sandarman Fortress, which is on the way to Morroc from here, to meet Hollgrehenn Junior."; + mes "Go to the field South of Sandarman Fortress, which is on the way to Morocc from here, to meet Hollgrehenn Junior."; next; mes "[Mr. Smith]"; mes "The password is ^0000FFMy father never hoarded upgrade items^000000."; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index f6502821a7..3e65183c4f 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -719,7 +719,7 @@ L_AskQuestions: set .@sage_t,.@sage_t+5; mes "2. Choose a city where you cannot purchase a Stiletto."; next; - if (select("Prontera:Morroc:Geffen:Lutie") == 1) + if (select("Prontera:Morocc:Geffen:Lutie") == 1) set .@sage_t,.@sage_t+5; mes "3. Choose the closest city to Turtle Island."; next; @@ -795,17 +795,17 @@ L_AskQuestions: set .@sage_t,.@sage_t+5; break; case 2: - mes "1. Choose the jewel that the Morroc Jewel Merchant does not sell."; + mes "1. Choose the jewel that the Morocc Jewel Merchant does not sell."; next; if (select("Topaz:Garnet:Diamond:Sapphire") == 2) set .@sage_t,.@sage_t+5; mes "2. Choose the city where users cannot purchase Monster's Feed from an NPC."; next; - if (select("Prontera:Morroc:Al De Baran:Alberta") == 3) + if (select("Prontera:Morocc:Al De Baran:Alberta") == 3) set .@sage_t,.@sage_t+5; mes "3. Choose the closest city to the Maze."; next; - if (select("Prontera:Morroc:Geffen:Payon") == 1) + if (select("Prontera:Morocc:Geffen:Payon") == 1) set .@sage_t,.@sage_t+5; mes "4. Choose the monster that is a different type than the others."; next; @@ -827,7 +827,7 @@ L_AskQuestions: next; if (select("Paul:Sir Windsor:Peter S. Alberto:Cecilia") == 2) set .@sage_t,.@sage_t+5; - mes "9. Choose the NPC that is not a citizen of Morroc."; + mes "9. Choose the NPC that is not a citizen of Morocc."; next; if (select("Syvia:Akira:Antonio:Dmitrii") == 3) set .@sage_t,.@sage_t+5; @@ -887,7 +887,7 @@ L_AskQuestions: set .@sage_t,.@sage_t+5; mes "3. Choose the closest city to Glast Heim."; next; - if (select("Prontera:Geffen:Morroc:Payon") == 2) + if (select("Prontera:Geffen:Morocc:Payon") == 2) set .@sage_t,.@sage_t+5; mes "4. Choose the monster that is a different type than the others."; next; @@ -1535,7 +1535,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{ mes "Lutie, the winter land,"; break; } - switch(select("Midgard, where humans live,:Rune-Midgarts where humans live,:Tritonia, where mermaids live,:Morroc, the desert city,")) { + switch(select("Midgard, where humans live,:Rune-Midgarts where humans live,:Tritonia, where mermaids live,:Morocc, the desert city,")) { case 1: mes "Midgard, where humans live in,"; break; @@ -1549,7 +1549,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{ break; case 4: set .@w_point,.@w_point+1; - mes "Morroc, the desert city,"; + mes "Morocc, the desert city,"; break; } switch(select("Abguard, where gods live.:Asgard, where gods live.:Schwarzwald, where citizens live.:Prontera, the capital of Rune-Midgarts.")) { @@ -2431,9 +2431,9 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{ mes "You never know the limits of magic"; break; } - switch(select("Merchant Lady in Morroc is also as cute as YuPi.:Nobody knows why Red Potion tastes like strawberries.:It is not suggested to be too addicted to magic spells.")) { + switch(select("Merchant Lady in Morocc is also as cute as YuPi.:Nobody knows why Red Potion tastes like strawberries.:It is not suggested to be too addicted to magic spells.")) { case 1: - mes "Merchant Lady in Morroc is also as cute as YuPi."; + mes "Merchant Lady in Morocc is also as cute as YuPi."; break; case 2: mes "Nobody knows why Red Potion tastes like strawberries."; diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index 4414b43274..789a4dc4fd 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -44,7 +44,7 @@ valkyrie,53,42,3 script Champion#Valkyrie 52,{ mes "Time for great heroes"; mes "to stand up against the"; mes "forces of evil which plague"; - mes "the world of Rune-Midgard!"; + mes "the world of Midgard!"; next; mes "[Champion]"; mes "Would you like"; diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt index f3855ddd3b..ef35f84b44 100644 --- a/npc/jobs/2-2a/Clown.txt +++ b/npc/jobs/2-2a/Clown.txt @@ -43,7 +43,7 @@ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ next; mes "[Minstrel]"; mes "Will you do this"; - mes "for Rune-Midgard..."; + mes "for Midgard..."; mes "As a Minstrel?"; next; if (select("No.:Yes.") == 1) { diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index 3177f1ca92..0e013d27dd 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -91,7 +91,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ mes "Yes..."; mes "It's about time."; mes "We need more geniuses"; - mes "like you on Rune-Midgard."; + mes "like you on Midgard."; next; mes "[Biochemist]"; mes "Would you like to"; diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt index ea74fa3e42..9992130e7d 100644 --- a/npc/jobs/2-2a/Gypsy.txt +++ b/npc/jobs/2-2a/Gypsy.txt @@ -35,7 +35,7 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ } else if (ADVJOB == Job_Gypsy && Class == Job_Archer_High && JobLevel > 39) { mes "[Gypsy]"; - mes "The land of Rune-Midgard"; + mes "The land of Midgard"; mes "is in need of talented women"; mes "to subtly change the balances"; mes "in the battle between good"; diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt index 8ca3bb8a42..32e6380c72 100644 --- a/npc/jobs/2-2a/Professor.txt +++ b/npc/jobs/2-2a/Professor.txt @@ -42,7 +42,7 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ } else if (ADVJOB == Job_Professor && Class == Job_Mage_High && JobLevel > 39) { mes "[Scholar]"; - mes "Rune-Midgard doesn't"; + mes "Midgard doesn't"; mes "have enough Scholars to"; mes "help usher in a new age"; mes "of prosperity. The"; @@ -51,7 +51,7 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ mes "[Scholar]"; mes "Will you take this"; mes "awesome responsibility?"; - mes "Will you serve Rune-Midgard"; + mes "Will you serve Midgard"; mes "as a Scholar?"; next; if (select("No.:Yes.") == 1) { diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 522bfb25f3..b4516c4c62 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -341,7 +341,7 @@ OnTouch_: mes "[Maia]"; mes "Hm? How did you come"; mes "here? You're not qualified"; - mes "for this ceremony yet. Come,I will bring you back to Morroc..."; + mes "for this ceremony yet. Come,I will bring you back to Morocc..."; close2; warp "morocc",157,47; end; @@ -466,7 +466,7 @@ OnTouch_: mes "The time for you"; mes "to be here has not"; mes "arrived. Let's go"; - mes "back to Morroc..."; + mes "back to Morocc..."; close2; warp "morocc",157,47; end; @@ -484,7 +484,7 @@ OnTouch_: mes "That's strange..."; mes "You're not supposed to"; mes "be here. Let me guide"; - mes "you back to Morroc..."; + mes "you back to Morocc..."; } close2; warp "morocc",157,47; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index 5dccc88675..06518e335f 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -249,7 +249,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{ mes "was much suffering in the"; mes "world, especially among"; mes "the common people of"; - mes "Rune-Midgard..."; + mes "Midgard..."; next; mes "[Tzerero]"; mes "He learned many skills from"; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index c43761866a..9a4dcfe490 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -373,7 +373,7 @@ valkyrie,44,33,5 script Teleporter 124,{ mes "Honorable one,"; mes "which place do you wish to go?"; next; - switch(select("Prontera:Morroc:Payon:Geffen:Alberta:Izlude:Al De Baran:Comodo:Juno")) { + switch(select("Prontera:Morocc:Payon:Geffen:Alberta:Izlude:Al De Baran:Comodo:Juno")) { case 1: callsub S_Warpchar,"prontera",116,72; case 2: callsub S_Warpchar,"morocc",156,46; case 3: callsub S_Warpchar,"payon",69,100; diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index bad3423117..d816a8180b 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -50,7 +50,7 @@ //= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan //= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 2.5 Converted from Aegis file. (11.3) [L0ne_W0lf] -//= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf] +//= 2.6 Moved Morocc NPCs to Morocc Ruins. [L0ne_W0lf] //= 2.7 Fixed a typo, a - to a +. Not sure how that happened. [L0ne_w0lf] //= 2.8 Corrected another typo this time in a variable. //= 2.9 Added GM management function. [Euphy] @@ -755,7 +755,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ mes "details, please visit our"; mes "headquarters in the city of"; mes "Lighthalzen located in the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; mes "Thank you for your time."; break; case 2: diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 5b6dffe4f4..92eb5e6ca6 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -24,9 +24,9 @@ //= 2.3 Removed SAVE from Niflheim. [Lupus] //= 2.3 removed "fix" by HawkMoon RTFM and check supernovice.txt . There's a SPECIAL Kafra which gives CARTS to SN for a special proce. [Lupus] //= 2.4 Added Baby Class Support (Baby Novice check) Removed annoying storage feature where u had to close dialog window to be able to use your storage [Lupus] -//= 2.5 Added Louyang official Kafra, fixes some Kafras, not letting you to Save your position [Lupus] +//= 2.5 Added Luoyang official Kafra, fixes some Kafras, not letting you to Save your position [Lupus] //= 2.6 Reverted Dungeons Kafras (they should offer only Storage). Added temp Ayothaya Kafra -//= 2.7 Added correct Ayothaya, Louyang & Amatsu Kafras. [Lupus] +//= 2.7 Added correct Ayothaya, Luoyang & Amatsu Kafras. [Lupus] //= 2.8 Fixed Amatsu Storage problems [Lupus] 2.9 Fixed spelling mistakes. [Nexon] //= 3.0 Added special "not working teleport menu" for Einbroch Kafras [Lupus] //= 3.1 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon] @@ -105,7 +105,7 @@ function script F_Kafra { mes "The air is eternally heavy with the"; mes "scent of pleasant wildflowers."; break; - case 4:// Louyang and Ayothaya specific message (obsolete) + case 4:// Luoyang and Ayothaya specific message (obsolete) mes "[Kafra Employee]"; mes "With our many Kafra"; mes "service locations, you're never"; @@ -163,7 +163,7 @@ function script F_Kafra { mes "Transport Agreement^000000, the"; mes "Kafra Corporation cannot"; mes "provide Teleport Services"; - mes "in the Schwaltzvalt Republic."; + mes "in the Schwarzwald Republic."; next; mes "[Kafra Employee]"; mes "We ask that you please"; @@ -322,7 +322,7 @@ function script F_KafTele { } else if (@wrpD$[.@j] == "Juno") warp "yuno", 158, 125; else if (@wrpD$[.@j] == "Mjolnir Dead Pit") warp "mjolnir_02", 99, 351; - else if (@wrpD$[.@j] == "Morroc") warp "morocc", 156, 46; + else if (@wrpD$[.@j] == "Morocc") warp "morocc", 156, 46; else if (@wrpD$[.@j] == "Orc Dungeon") warp "gef_fild10", 52, 326; else if (@wrpD$[.@j] == "Payon") warp "payon", 161, 58; else if (@wrpD$[.@j] == "Prontera") warp "prontera", 116, 72; @@ -611,23 +611,23 @@ function script F_KafSet { .@map$ = strnpcinfo(4); if (.@map$ == "prontera") { - setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta"; + setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morocc", "Orc Dungeon", "Alberta"; setarray @wrpP[0], 600, 1200, 1200, 1200, 1700, 1800; setarray @viewpX[0], 151, 29, 282, 152; setarray @viewpY[0], 29, 207, 200, 326; } else if (.@map$ == "alberta") { setarray @wrpP[0], 1200, 1800, 1800; - setarray @wrpD$[0], "Payon", "Morroc", "Prontera"; + setarray @wrpD$[0], "Payon", "Morocc", "Prontera"; setarray @viewpX[0], 28, 113, 0, 0; setarray @viewpY[0], 229, 60, 0, 0; } else if (.@map$ == "aldebaran") { setarray @wrpP[0], 1200, 1200, 1800, 1700; setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit"; } else if (.@map$ == "comodo" ) { - setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala"; + setarray @wrpD$[0], "Morocc", "Comodo Pharos Beacon", "Umbala"; setarray @wrpP[0], 1800, 1200, 1800; } else if (.@map$ == "cmd_fild07") { - setarray @wrpD$[0], "Comodo", "Morroc"; + setarray @wrpD$[0], "Comodo", "Morocc"; setarray @wrpP[0], 1200, 1200; } else if (.@map$ == "geffen") { setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit"; @@ -635,7 +635,7 @@ function script F_KafSet { setarray @viewpX[0], 120, 203; setarray @viewpY[0], 62, 123; } else if (.@map$ == "izlude") { - setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran"; + setarray @wrpD$[0], "Geffen", "Payon", "Morocc", "Al De Baran"; setarray @wrpP[0], 1200, 1200, 1200, 1800; } else if (.@map$ == "morocc") { setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon"; @@ -646,7 +646,7 @@ function script F_KafSet { setarray @wrpD$[0], "Comodo"; setarray @wrpP[0], 1800; } else if (.@map$ == "payon") { - setarray @wrpD$[0], "Prontera", "Alberta", "Morroc"; + setarray @wrpD$[0], "Prontera", "Alberta", "Morocc"; setarray @wrpP[0], 1200, 1200, 1200; } else if (.@map$ == "yuno") { setarray @wrpD$[0], "Al De Baran"; @@ -654,7 +654,7 @@ function script F_KafSet { setarray @viewpX[0], 328, 278, 153, 0; setarray @viewpY[0], 108, 221, 187, 0; } else if (.@map$ == "job3_rune01") { - setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Alberta"; + setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morocc", "Alberta"; setarray @wrpP[0], 600, 1200, 1200, 1200, 1800; } diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 8326a62050..9774348e08 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -48,7 +48,7 @@ aldeba_in,96,181,4 script Kafra Service 113,{ mes "Please make use of"; mes "the Kafra Services that are"; mes "available throughout all of"; - mes "Rune Midgard. Thank you for"; + mes "Midgard. Thank you for"; mes "visiting the Kafra Headquarters."; close2; break; @@ -92,7 +92,7 @@ aldeba_in,96,181,4 script Kafra Service 113,{ mes "[Kafra Leilah]"; mes "Kafra Employees are"; mes "stationed all over the"; - mes "Rune Midgard continent,"; + mes "Midgard continent,"; mes "and you should be able to find"; mes "plenty outside in Al De Baran."; close2; @@ -147,7 +147,7 @@ geffen,203,123,2 script Kafra Employee::geffen2 114,{ mes "Welcome!"; mes "The Kafra Corporation"; mes "will always support the"; - mes "adventurers of Rune-Midgard"; + mes "adventurers of Rune-Midgarts"; mes "with its excellent service. So"; mes "what can I do for you today?"; callfunc "F_Kafra",5,0,0,30,750; @@ -167,7 +167,7 @@ morocc,156,97,4 script Kafra Employee::kaf_morocc 113,{ mes "How may I be of assistance?"; callfunc "F_Kafra",5,0,0,60,930; savepoint "morocc",156,46,1,1; - callfunc "F_KafEnd",0,1,"in the city of Morroc"; + callfunc "F_KafEnd",0,1,"in the city of Morocc"; } morocc,160,258,4 script Kafra::kaf_morocc2 114,{ @@ -177,12 +177,12 @@ morocc,160,258,4 script Kafra::kaf_morocc2 114,{ mes "Welcome!"; mes "The Kafra Corporation"; mes "will always support the"; - mes "adventurers of Rune-Midgard"; + mes "adventurers of Rune-Midgarts"; mes "with its excellent service. So"; mes "what can I do for you today?"; callfunc "F_Kafra",5,0,0,60,930; savepoint "morocc",157,272,1,1; - callfunc "F_KafEnd",0,1,"in the city of Morroc"; + callfunc "F_KafEnd",0,1,"in the city of Morocc"; } // Payon @@ -278,7 +278,7 @@ prontera,282,200,2 script Kafra Employee::kaf_prontera4 114,{ mes "Welcome!"; mes "The Kafra Corporation"; mes "will always support the"; - mes "adventurers of Rune-Midgard"; + mes "adventurers of Rune-Midgarts"; mes "with its excellent service. So"; mes "what can I do for you today?"; callfunc "F_Kafra",5,0,0,40,800; @@ -300,7 +300,7 @@ prontera,146,89,6 script Kafra Employee::kaf_prontera5 117,{ callfunc "F_KafEnd",0,1,"in the city of Prontera"; } -// Yuno +// Juno //============================================================ yuno,152,187,4 script Kafra Employee::kaf_yuno 860,{ cutin "kafra_08",2; @@ -457,7 +457,7 @@ ayothaya,212,169,5 script Kafra Employee::kaf_ayothaya 116,{ mes "How can I help you today?"; callfunc "F_Kafra",5,3,1,50,700; savepoint "ayothaya",149,69,1,1; - callfunc "F_KafEnd",0,1,"in the city of Ayotaya"; + callfunc "F_KafEnd",0,1,"in the city of Ayothaya"; } // Einbech @@ -502,7 +502,7 @@ einbroch,59,203,6 script Kafra Employee#ein1::kaf_einbroch2 861,{ callfunc "F_KafEnd",0,1,"in the city of Einbroch"; } -// Gonryun +// Kunlun //============================================================ gonryun,159,122,4 script Kafra Employee::kaf_gonryun 116,{ cutin "kafra_02",2; @@ -556,7 +556,7 @@ lhz_in02,237,284,4 script Kafra Employee::kaf_lhz_in02 861,{ callfunc "F_KafEnd",0,1,"in the city of Lighthalzen"; } -// Louyang +// Luoyang //============================================================ louyang,210,104,5 script Kafra Employee::kaf_louyang 4_F_KAFRA2,{ cutin "kafra_01",2; @@ -568,7 +568,7 @@ louyang,210,104,5 script Kafra Employee::kaf_louyang 4_F_KAFRA2,{ mes "How can I help you today?"; callfunc "F_Kafra",5,3,1,50,700; savepoint "louyang",217,92,1,1; - callfunc "F_KafEnd",0,1,"in the city of Louyang"; + callfunc "F_KafEnd",0,1,"in the city of Luoyang"; } // Umbala @@ -623,7 +623,7 @@ prt_fild05,290,224,3 script Kafra Employee::prt_fild05 114,{ mes "Welcome!"; mes "The Kafra Corporation"; mes "will always support the"; - mes "adventurers of Rune-Midgard"; + mes "adventurers of Rune-Midgarts"; mes "with its excellent service. So"; mes "what can I do for you today?"; callfunc "F_Kafra",5,1,1,40,0; @@ -645,14 +645,14 @@ mjolnir_02,83,362,4 script Kafra Employee::kaf_mjolnir_02 116,{ callfunc "F_KafEnd",0,1,"at Mjolnir Dead Pit"; } -// - Morroc Ruins +// - Morocc Ruins moc_ruins,59,157,5 script Kafra Employee::moc_ruins 114,{ cutin "kafra_04",2; mes "[Kafra Employee]"; mes "Welcome!"; mes "The Kafra Corporation"; mes "will always support the"; - mes "adventurers of Rune-Midgard"; + mes "adventurers of Rune-Midgarts"; mes "with its excellent service. So"; mes "what can I do for you today?"; callfunc "F_Kafra",5,2,1,90,1200; diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt index a200910389..ee38b0ee36 100644 --- a/npc/mapflag/nomemo.txt +++ b/npc/mapflag/nomemo.txt @@ -308,7 +308,7 @@ in_sphinx2 mapflag nomemo in_sphinx3 mapflag nomemo in_sphinx4 mapflag nomemo in_sphinx5 mapflag nomemo -// Louyang Dun -------------- +// Luoyang Dun -------------- lou_dun03 mapflag nomemo lou_dun02 mapflag nomemo lou_dun01 mapflag nomemo @@ -345,7 +345,7 @@ prt_sewb1 mapflag nomemo prt_sewb2 mapflag nomemo prt_sewb3 mapflag nomemo prt_sewb4 mapflag nomemo -// Gonryun Dun --------------- +// Kunlun Dun --------------- gon_dun01 mapflag nomemo gon_dun02 mapflag nomemo gon_dun03 mapflag nomemo diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index c6417d7939..9078f358e0 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -38,7 +38,7 @@ function Dyes; case 1: mes .n$; mes "Life may have gotten a bit better, but when I look at all of the orders I've received... Whew!"; - mes "It seems that the young women of Rune Midgard must be very well off these days."; + mes "It seems that the young women of Rune-Midgarts must be very well off these days."; next; mes .n$; mes "Not that I think that they are indulging in anything luxurious, mind you."; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 4411714996..85f7528017 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -81,8 +81,8 @@ // Alberta alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85 -// Morroc Field +// Morocc Field moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85 -// Morroc +// Morocc //morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85 diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index ba25583be5..439145ee57 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -29,7 +29,7 @@ //= - Small corrections to the prontera Inns. //= - Removed the Cancel dialog. //= 1.6 More fixes, changed progression of "Rest"ing. -//= - Corrected Morroc NPCs. [L0ne_W0lf] +//= - Corrected Morocc NPCs. [L0ne_W0lf] //= 1.7 Corrected Payon NPC. [L0ne_W0lf] //= 1.8 Corrected Geffen NPC. [L0ne_W0lf] //= 1.9 Added the Inn for Al De baran. [L0ne_W0lf] @@ -41,7 +41,7 @@ //= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. //= 2.5 Added Moskovia Gostinitsa (Inn) from jA //= 2.6 Updated Alberta inn to official. [L0ne_W0lf] -//= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf] +//= 2.7 Removed Morocc Inns as per episode 12.1. [L0ne_W0lf] //= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka] //= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka] //= 2.9a Added 'npcskill' command. [Euphy] @@ -88,13 +88,13 @@ payon_in01,132,62,5 script Inn Employee#Ahee 53,{ /* morocc_in,147,141,3 script Inn Employee#Hasna 53,{ - callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140; + callfunc "F_InnMaid","[Employee Hasna]","Morocc Inn","morocc_in",142,140; warp "morocc_in",173,135; end; } // South -------------------------------- morocc_in,80,100,5 script Inn Employee#Manar 53,{ - callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95; + callfunc "F_InnMaid","[Employee Manar]","Morocc Inn","morocc_in",78,95; warp "morocc_in",79,123; end; } */ diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index f335f9a71d..5f536eac1a 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -73,7 +73,7 @@ prontera,123,102,5 script Merchant#pron 85,{ } } -morocc,180,259,3 script Merchant#morroc 85,{ +morocc,180,259,3 script Merchant#Morocc 85,{ if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 34719ebc20..14772926ff 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -1226,7 +1226,7 @@ function script repairmain { //= Syrus22 - Completely redid the script using functions... also //= added the option for auto safe refining and multiple refining. //= 1.1 Negative input bug fixed [Lupus] -//= 1.2 Added additional reparimen in morroc and payon. Added +//= 1.2 Added additional reparimen in Morocc and payon. Added //= Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88] //= 1.3 New Payon Locations [Darkchild] //= Corrected zeny subtraction thx to jpnmania77.[kobra_k88] @@ -1267,5 +1267,5 @@ function script repairmain { //= 2.8 Added proper Blacksmith Supplier to Einroch. [L0ne_W0lf] //= Updated dated features comment to reflect new usage. //= 2.8a Small bugfix. (bugreport:2418) [Paradox924X] -//= 2.9 Moved Morroc repairman to Morroc Ruins. [L0ne_W0lf] +//= 2.9 Moved Morocc repairman to Morocc Ruins. [L0ne_W0lf] //============================================================ diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 91a3843cd5..c042a9a7f4 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -21,14 +21,14 @@ //= 2.2 Added Veins shops. [L0ne_W0lf] //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf] -//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf] +//= 2.5 Updated Morocc shops to episode 12.1. [L0ne_W0lf] //= 2.6 Added Brasilis shops. [L0ne_W0lf] //= Updated Pet Groomers with four new pet feeds. //= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf] //= Made Brasilis shop names unique, and uncommented. //= Changed the whip sold in comodo weapon shop. (1956 ->1960) //= Added Fire and Silver arrow to Einbroch tool dealer. -//= Re-added Bill of Birds to Morroc Item Collectors. +//= Re-added Bill of Birds to Morocc Item Collectors. //= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf] //= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf] //= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] @@ -119,7 +119,7 @@ geffen_in,171,123,4 shop Tool Dealer#gef2 64,1092:-1,1093:-1 geffen,193,152,4 shop Pet Groomer#gef 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 //======================================================= -// Gonryun +// Kunlun //======================================================= gonryun,147,84,5 shop Tool Dealer#gon 777,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 gonryun,174,101,3 shop Weapon Dealer#gon 774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 @@ -158,7 +158,7 @@ yuno,163,187,5 shop Magical Item Seller#yuno 90,717:-1,1601:-1,1604:-1,1607:-1,1 yuno_in01,25,34,5 shop Tool Dealer#yuno2 83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 yuno_in01,103,35,2 shop Weapon Dealer#yuno 49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 yuno_in01,112,26,4 shop Armor Dealer#yuno 101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -yuno_in03,176,22,3 shop Scroll Merchant#yuno03 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls +yuno_in03,176,22,3 shop Scroll Merchant#yuno03 89,7433:-1 //Temp shop in Juno that sells Blank Scrolls //======================================================= // Lighthalzen @@ -186,7 +186,7 @@ lhz_in03,258,101,3 shop Arrow Merchant#lhz 855,1750:-1,1770:-1,1752:-1,1751:-1 lhz_in03,249,24,4 shop Merchant#lhz 855,911:-1,910:-1,912:-1,528:-1 //======================================================= -// Louyang +// Luoyang //======================================================= lou_in02,121,182,5 shop Armor Dealer#lou 818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 lou_in02,130,182,5 shop Weapon Dealer#lou 822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 @@ -201,7 +201,7 @@ xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,7 xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 //======================================================= -// Morroc - Post Ep. 12.1 +// Morocc - Post Ep. 12.1 //======================================================= in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1 moc_ruins,93,53,2 shop Item Collector#moc1 85,911:-1,528:-1,919:-1,925:-1 @@ -315,22 +315,22 @@ niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1 //===== Additional Comments(old): ================================= //= swapped shop titles in GONRYUN, thanks to Kashy -//= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88] +//= 1.3a Fixed Luoyang map name. Added additional shops in Juno. [kobra_k88] //= 1.4 Added Niflheim Shops //= 1.5 New Payon Locations [Darkchild] //= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88] //= 1.6 Removed GRAPE ID 514 from shops (caused exploits) //= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit) -//= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest] -//= 1.9 Updated Louyang shops thanks to MasterOfMuppets +//= 1.8 Corrected Niflheim Shops and Morocc Jewel Merchant [celest] +//= 1.9 Updated Luoyang shops thanks to MasterOfMuppets //= 1.10 Lutie Tools coords [Yor] //= 1.11 Added Belts to Prontera/Aldebaran shops, thanks to reddozen [Lupus] //= 1.12 official Ayothaya Shops, thanks to MasterOfMuppets [Lupus] //= 1.13 Added 5092 Coif into Prontera Church shop [Lupus] -//= 1.14 Added Lighthalzen,Einbroch,Einbech shops. Updated Prontera,Morroc,Payon shops [Lupus] +//= 1.14 Added Lighthalzen,Einbroch,Einbech shops. Updated Prontera,Morocc,Payon shops [Lupus] //= 1.15 Added Venom Knives into every Weapon Shop (that sells Knife[3]) [Lupus] //= 1.15a Fixed a small typo in alberta's weapon shop, thanks to reddozen for the fix [MasterOfMuppets] -//= 1.16 Added a temp shop in Yuno to sell Blank scrolls, thanks to reddozen [MasterOfMuppets] +//= 1.16 Added a temp shop in Juno to sell Blank scrolls, thanks to reddozen [MasterOfMuppets] //= 1.17 Added wand of hypnotist to the Lighthalzen weapon shop [MasterOfMuppets] //= 1.18 Fixed some shops based on kRO shots [Poki#3] //= 1.19 Added Hugel and fixed Payon shops based on kRO shots [Poki#3] @@ -342,7 +342,7 @@ niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1 //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus] //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA] //= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA] -//= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets] +//= 1.4 Added an ingredient seller to Morocc, thanks to Muad_Dib [MasterOfMuppets] //= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus] //= 1.4b Commented out temp Gunslinger shops. [Lupus] //= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA] diff --git a/npc/mobs/towns.txt b/npc/mobs/towns.txt index b4996f3dd3..9341cda7a0 100644 --- a/npc/mobs/towns.txt +++ b/npc/mobs/towns.txt @@ -34,6 +34,6 @@ jawaii_in,124,76,1,1 monster Black Mushroom 1084,1,3600000,1200000 jawaii_in,72,74,5,1 monster Black Mushroom 1084,2,3000000,1200000 //================================================== -// Inside Lightalzen +// Inside Lighthalzen //================================================== lhz_in01,157,54 monster Red Mushroom 1085,1,120000,100000 diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 63a8b24ec5..e843c536fc 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -77,7 +77,7 @@ function script F_CashReset { function script F_CashDungeon { switch(getarg(0)) { case 1: - switch(select("Nogg Road:Mjolnir Dead Pit:"+((checkre(0))?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) { + switch(select("Nogg Road:Mjolnir Dead Pit:"+((checkre(0))?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Luoyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) { case 1: warp "mag_dun01",125,71; end; // Nogg Road case 2: warp "mjo_dun02",80,297; end; // Mjolnir Dead Pit case 3: warp "um_dun02",125,122; end; // Umbala Dungeon (Pre-Renewal only) @@ -85,7 +85,7 @@ function script F_CashDungeon { case 5: warp "pay_dun03",155,150; end; // Payon Caves case 6: warp "xmas_dun01",133,130; end; // Toy Factory case 7: warp "gl_prison",140,15; end; // Glast Heim Prison - case 8: warp "lou_dun03",165,38; end; // Louyang Dungeon + case 8: warp "lou_dun03",165,38; end; // Luoyang Dungeon case 9: warp "gon_dun02",251,263; end; // Kunlun Dungeon case 10: warp "iz_dun02",350,335; end; // Izlude Undersea Tunnel case 11: warp "tur_dun02",165,30; end; // Turtle Island @@ -97,7 +97,7 @@ function script F_CashDungeon { case 17: warp "prt_sewb3",20,175; end; // Prontera Culverts 3F case 18: warp "ama_dun01",222,144; end; // Amatsu Dungeon 1F case 19: warp "lhz_dun01",19,153; end; // Somatology Laboratory 1F - case 20: warp "ayo_dun02",70,240; end; // Ayotaya Dungeon 2F + case 20: warp "ayo_dun02",70,240; end; // Ayothaya Dungeon 2F } case 2: // Menu names are not official. switch(select("Thor Volcano 2f:Ice Dungeon Entrance:Nameless Island Entrance:Niflheim:Labyrinth Forest 2f:Ruins of Juperos Entrance:Ant Hell 2f:Kiel Hyre's Academy Entrance:Thanatos Tower Entrance:Abyss Lake Entrance:Rachel Sanctuary Entrance:Odin Temple 2f")) { @@ -133,8 +133,8 @@ function script F_CashDungeon { // - Arg(0) = type of scroll. function script F_CashCity { switch(getarg(0)) { - case 1: // Yellow - Rune-Midgart - switch(select("Prontera:Izlude:Geffen:Payon:Morroc:Alberta:Al de Baran")) { + case 1: // Yellow - Rune-Midgarts + switch(select("Prontera:Izlude:Geffen:Payon:Morocc:Alberta:Al de Baran")) { case 1: warp "prontera",122,87; end; case 2: if (checkre(0)) warp "izlude",130,90; else warp "izlude",91,105; end; case 3: warp "geffen",128,48; end; @@ -143,7 +143,7 @@ function script F_CashCity { case 6: warp "alberta",117,50; end; case 7: warp "aldebaran",140,110; end; } - case 2: // Green - Schwartzvalt + case 2: // Green - Schwarzwald switch(select("Juno:Lighthalzen:Einbroch:Einbech:Hugel")) { case 1: warp "yuno",160,170; end; case 2: warp "lighthalzen",190,310; end; @@ -157,14 +157,14 @@ function script F_CashCity { case 2: warp "veins",215,105; end; } case 4: // Blue - Islands - switch(select("Amatsu:Kunlun:Ayotaya:Louyang")) { + switch(select("Amatsu:Kunlun:Ayothaya:Luoyang")) { case 1: warp "amatsu",110,140; end; case 2: warp "gonryun",160,115; end; case 3: warp "ayothaya",220,170; end; case 4: warp "louyang",217,95; end; } case 5: // Blue - Islands (Renewal) - switch(select("Amatsu:Kunlun:Ayotaya:Louyang:Moscovia:Dewata:Brasilis")) { + switch(select("Amatsu:Kunlun:Ayothaya:Luoyang:Moscovia:Dewata:Brasilis")) { case 1: warp "amatsu",110,140; end; case 2: warp "gonryun",160,115; end; case 3: warp "ayothaya",220,170; end; @@ -192,7 +192,7 @@ function script F_CashTele { case 5: warp "SavePoint",0,0; end; } case 2: - switch(select("Payon:Alberta:Morroc:Comodo:Savepoint")) { + switch(select("Payon:Alberta:Morocc:Comodo:Savepoint")) { case 1: warp "payon",158,55; end; case 2: warp "alberta",115,57; end; case 3: warp "morocc",158,48; end; @@ -200,7 +200,7 @@ function script F_CashTele { case 5: warp "SavePoint",0,0; end; } case 3: - switch(select("Louyang:Amatsu:Kunlun Field:Ayothaya:Savepoint")) { + switch(select("Luoyang:Amatsu:Kunlun Field:Ayothaya:Savepoint")) { case 1: warp "louyang",214,101; end; case 2: warp "amatsu",112,145; end; case 3: warp "gonryun",160,118; end; diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt index c962af5561..c6f13c97bf 100644 --- a/npc/other/acolyte_warp.txt +++ b/npc/other/acolyte_warp.txt @@ -21,7 +21,7 @@ prontera,98,121,4 script Acolyte#Prtclear 90,{ mes "[Keiki]"; mes "Hello there, adventurer."; - mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class."; + mes "I've been studying magic from all over Rune-Midgarts to upgrade what I believe to be one of the greatest skills available to the acolyte class."; next; if (is_function("VIP_iRO_Acolyte")) @@ -47,7 +47,7 @@ prontera,98,121,4 script Acolyte#Prtclear 90,{ mes "I wish you goodluck on your journey."; next; - setarray .@towns$[0], "Izlude", "Geffen", "Payon", "Morroc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno"; + setarray .@towns$[0], "Izlude", "Geffen", "Payon", "Morocc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno"; setarray .@cost[0], 600, 1200, 1200, 1200, 1800, 2200, 2200, 2200, 1800; set .@size, getarraysize(.@towns$); diff --git a/npc/other/auction.txt b/npc/other/auction.txt index 34c10e7bee..92d24be9e3 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -11,7 +11,7 @@ //= Auction house releated NPCs, and warps //===== Additional Comments: ================================= //= 1.0 First version, place holders only. [L0ne_W0lf] -//= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf] +//= 1.1 Moved Morocc Auction NPCs to Morocc Ruins. [L0ne_W0lf] //= 1.2 Warp fixed. Dialog in Ruins/Lighthalzen changed. [Kisuka] //= 1.3 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ diff --git a/npc/other/books.txt b/npc/other/books.txt index f0ab13fd4a..adbda92437 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -1502,7 +1502,7 @@ prt_in,172,96,4 script Monster Encyclopedia#4pr HIDDEN_NPC,{ mes "5. Doppelganger"; mes "A ghostly double of a Swordman."; mes "Perhaps the coolest and baddest"; - mes "monster in all of Rune-Midgard."; + mes "monster in all of Rune-Midgarts."; mes "^0099FFItem Drops^000000: Spiky Band, Blue"; mes "Potion, Cursed Ruby, Ruby"; next; @@ -3354,7 +3354,7 @@ prt_in,164,102,4 script Monster Encyclopedia#7pr HIDDEN_NPC,{ mes "^FF0000[Prontera Maze 3F Monsters]^000000"; mes "27. Mastering"; mes "A giant Poring rarely seen in the"; - mes "Morroc Desert, Mt. Mjolnir or the"; + mes "Morocc Desert, Mt. Mjolnir or the"; mes "Prontera Maze. It may be the Master"; mes "of Porings, but... it's still a"; mes "Poring"; diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index be8e1c95fa..9a6b198cc5 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -14,7 +14,7 @@ //= 1.5a Fixed a small screw up with the color codes in the Glastheim BB [MasterOfMuppets] //= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla] //= 1.6 Removed Duplicates [Silent] -//= 1.7 Updated Morroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf] +//= 1.7 Updated Morocc NPCs to reflect episode 12.1 changes. [L0ne_W0lf] //= 1.8 Updated Payon Cave Bulletion Board Locations. [Masao] //= 1.9 Moved Izlude NPC to Pre-RE path. [Euphy] //= 2.0 Moved some NPC to Pre-re path. [Capuche] @@ -93,7 +93,7 @@ payon,178,108,5 script Bulletin Board#06 837,{ mes "Near the Archer Village, you can find the ^2F0400Payon Cave^000000 where Undead monsters reside."; next; mes "[Payon: The Mountain City]"; - mes "From Payon, ^123972Alberta^000000 is located to the Southeast, and ^866C4BMorroc^000000 is to the West. ^5E5C69Izlude^000000 and ^6D6FE0Prontera^000000 are North of Payon."; + mes "From Payon, ^123972Alberta^000000 is located to the Southeast, and ^866C4BMorocc^000000 is to the West. ^5E5C69Izlude^000000 and ^6D6FE0Prontera^000000 are North of Payon."; mes "Enjoy your travels."; close; } @@ -112,48 +112,48 @@ pay_arche,79,31,5 script Bulletin Board#07 837,{ prontera,148,49,5 script Bulletin Board#09 837,{ mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "Welcome to Prontera, the capital city of Rune-Midgard."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "Prontera is located in the center of the Rune-Midgard continent and is very well-known as a city of flourishing commerce."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "In this city, you can fint the Sanctuary, where people can change their jobs to Acolyte and Priest."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "You can also find the Castle, where people can change their jobs to Crusader."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "Please feel free to explore the streets of Prontera, as there are various tourist attractions within the city."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "When you need to upgrade your weapons and armors, please visit the building in the 5 o'clock direction from the fountain in the center of Prontera."; next; mes "[Prontera: Capital of the]"; - mes "[Rune-Midgards Kingdom]"; + mes "[Rune-Midgarts Kingdom]"; mes "From Prontera, ^5E5C69Izlude^000000 is located to the Southeast, ^1F3A11Payon^000000 to the far South, ^683C1FGeffen^000000 to the far West and ^2D3832Al De Baran^000000 to the far North."; mes "Enjoy your time in Prontera."; close; } morocc,152,110,5 script Bulletin Board#11 837,{ - mes "[Morroc: The Frontier Town]"; - mes "Welcome to Morroc, the City of the Desert. Morroc was built on an oasis, so this town can accomodate its many visitors and travelers."; + mes "[Morocc: The Frontier Town]"; + mes "Welcome to Morocc, the City of the Desert. Morocc was built on an oasis, so this town can accomodate its many visitors and travelers."; next; - mes "[Morroc: The Frontier Town]"; - mes "Morroc Castle lies in the center of this city. Please feel free to explore this town, and enjoy its unique atmosphere. However, watch your pockets and beware of Rogues and Thieves."; + mes "[Morocc: The Frontier Town]"; + mes "Morocc Castle lies in the center of this city. Please feel free to explore this town, and enjoy its unique atmosphere. However, watch your pockets and beware of Rogues and Thieves."; next; - mes "[Morroc: The Frontier Town]"; - mes "From Morroc, the ^660000Pyramid Dungeon^000000 can be found to the Northwest, and the ^660000Sphinx Dungeon^000000 can be found to the West. To the Southeast, you may find ^660000Ant Hell^000000."; + mes "[Morocc: The Frontier Town]"; + mes "From Morocc, the ^660000Pyramid Dungeon^000000 can be found to the Northwest, and the ^660000Sphinx Dungeon^000000 can be found to the West. To the Southeast, you may find ^660000Ant Hell^000000."; next; - mes "[Morroc: The Frontier Town"; - mes "The Assassin Guild is rumored to be located to the Southeast. When you head East from Morroc, and then North, you will arrive at ^3355FFProntera^000000."; + mes "[Morocc: The Frontier Town"; + mes "The Assassin Guild is rumored to be located to the Southeast. When you head East from Morocc, and then North, you will arrive at ^3355FFProntera^000000."; close; } @@ -189,7 +189,7 @@ comodo,210,148,5 script Bulletin Board#12 837,{ next; mes "[Comodo: The Beach City]"; mes "From Comodo, you can travel to"; - mes "^866C4BMorroc^000000 through the East Cave"; + mes "^866C4BMorocc^000000 through the East Cave"; mes "and to ^7D2272Umbala^000000 through the North"; mes "Cave."; next; diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index 718299cf81..1ee1931dd9 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -136,13 +136,13 @@ List of GM Management NPCs (incomplete) - Extra Story Patch - boss::boss_aru_monas - Koshei GlobalVar#admin -- Morroc GlobalVar Admin::MorrocAdmin_sec -- Morroc GlobalVar Admin::MorrocAdmin_moc -- Morroc Invasion Manager (disabled) +- Morocc GlobalVar Admin::MoroccAdmin_sec +- Morocc GlobalVar Admin::MoroccAdmin_moc +- Morocc Invasion Manager (disabled) [ Other ] -------- Marriage -------- -- The King of Midgart +- The King of Rune-Midgarts - Divorce Staff - Remarry Staff ------ Izlude Arena ------ diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 9abb6f28f9..97e1a77319 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -16,7 +16,7 @@ //= 1.3 Added Veins mail box. [L0ne_W0lf] //= 1.3a Corrected a typo error. (bugreport:798) [Samuray22] //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus] -//= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf] +//= 1.5 Moved Morocc Mail boxes to Morocc Ruins. [L0ne_W0lf] //= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //= 1.7 Updated Script from the Official. [Elias] //= 1.8 Optimized a bit. [Daegaladh] @@ -61,7 +61,7 @@ prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888 //============================================================ izlude,136,94,0 duplicate(MailBox) Mailbox#iz 888 -// Morroc +// Morocc //============================================================ moc_ruins,72,166,0 duplicate(MailBox) Mailbox#1moc 888 moc_ruins,156,52,0 duplicate(MailBox) Mailbox#2moc 888 @@ -91,7 +91,7 @@ aldebaran,135,122,0 duplicate(MailBox) Mailbox#alde 888 yuno,148,187,0 duplicate(MailBox) Mailbox#yuno 888 yuno,332,108,0 duplicate(MailBox) Mailbox#2yuno 888 -// Lightalzen +// Lighthalzen //============================================================ lighthalzen,164,85,0 duplicate(MailBox) Mailbox#lht 888 lighthalzen,196,320,0 duplicate(MailBox) Mailbox#2lht 888 @@ -114,7 +114,7 @@ umbala,104,155,0 duplicate(MailBox) Mailbox#um 888 //============================================================ amatsu,102,146,0 duplicate(MailBox) Mailbox#ama 888 -// Gonryun +// Kunlun //============================================================ gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 888 @@ -122,7 +122,7 @@ gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 888 //============================================================ ayothaya,205,169,0 duplicate(MailBox) Mailbox#ayo 888 -// Louyang +// Luoyang //============================================================ louyang,204,100,0 duplicate(MailBox) Mailbox#lou 888 diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 2a6b1615c6..7019ae5404 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -424,7 +424,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{ donpcevent "Single Army#Morocc::OnEnable"; donpcevent "Single Army#Payon::OnEnable"; donpcevent "Single Army#Amatsu::OnEnable"; - donpcevent "Single Army#Gonryun::OnEnable"; + donpcevent "Single Army#Kunlun::OnEnable"; emotion ET_HUK; mes "[Single Army]"; mes "^CC9933You have to refine"; @@ -462,7 +462,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{ mes "[Single Army]"; mes "^669900...We're the free! We're"; mes "the Invincible Single Army!^000000"; - emotion ET_ROCK, getnpcid(0, "Single Army#Gonryun"); + emotion ET_ROCK, getnpcid(0, "Single Army#Kunlun"); close2; cutin "wedding_marry01",255; emotion ET_SWEAT; @@ -471,7 +471,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{ donpcevent "Single Army#Morocc::OnInit"; donpcevent "Single Army#Payon::OnInit"; donpcevent "Single Army#Amatsu::OnInit"; - donpcevent "Single Army#Gonryun::OnInit"; + donpcevent "Single Army#Kunlun::OnInit"; end; } close2; @@ -572,18 +572,18 @@ OnEnable: end; } -prt_church,102,102,0 script Single Army#Gonryun 780,{ +prt_church,102,102,0 script Single Army#Kunlun 780,{ mes "[Single Army]"; mes "^669900...We're the free! We're"; mes "the Invincible Single Army!^000000"; close; OnInit: - hideonnpc "Single Army#Gonryun"; + hideonnpc "Single Army#Kunlun"; end; OnEnable: - hideoffnpc "Single Army#Gonryun"; + hideoffnpc "Single Army#Kunlun"; emotion ET_GO; end; } @@ -849,7 +849,7 @@ OnTimer180000: end; } -prt_church,28,178,4 script The King of Midgart 108,{ +prt_church,28,178,4 script The King of Rune-Midgarts 108,{ callfunc "F_GM_NPC"; mes "[Vomars]"; mes "Wh-who are you?"; diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index f6c2602da6..5976602d9b 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -33,18 +33,18 @@ yuno_in03,32,15,3 script Museum Guide 67,{ mes "the Sages of the Schweicherbil"; mes "Magic Academy after researching"; mes "every creature dwelling in the"; - mes "Rune-Midgard continent."; + mes "Midgard continent."; next; mes "[Cenia]"; mes "In this museum, you can see every"; - mes "single monster in Rune-Midgard,"; + mes "single monster in Midgard,"; mes "even the ones you hardly ever encounter."; next; mes "[Cenia]"; mes "The glass tubes holding monsters"; mes "was developed with the latest"; mes "technology as a part of the"; - mes "Schwartz Project. Rest assured,"; + mes "Schwarz Project. Rest assured,"; mes "you'll be well protected."; next; break; @@ -375,7 +375,7 @@ yuno_in03,18,108,1 script #TRI_JOINT 111,{ mes "instead of eyes so that it can"; mes "live in dark places."; next; - mes "Recently, since many Tri Joints have been discovered inside many caves, Sages are very excited to study them to learn more about the evolution of monsters in Rune-Midgard."; + mes "Recently, since many Tri Joints have been discovered inside many caves, Sages are very excited to study them to learn more about the evolution of monsters in Midgard."; close; } @@ -548,7 +548,7 @@ yuno_in03,46,112,1 script #RAFFLESIA 111,{ mes "A puffy, leafy monster"; mes "threatened with extinction."; mes "Rafflesia is the rarest"; - mes "monster in Rune-Midgard and"; + mes "monster in Midgard and"; mes "is thus protected by law."; next; mes "Due to this situation, most Sages"; diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 15513748da..6464527716 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -1924,7 +1924,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 854,{ mes "[Ei'felle]"; mes "There's a small village"; mes "at the outskirts of the"; - mes "Schwaltzvalt Republic that"; + mes "Schwarzwald Republic that"; mes "gives these special medals"; mes "that are made of this metal"; mes "which we desperately need..."; @@ -2735,7 +2735,7 @@ airplane,246,47,1 script Eocatt#decoy01 878,{ mes "[Eocatt]"; mes "There's an old, humble"; mes "village on the outskirts of"; - mes "the Schwaltzvalt Republic."; + mes "the Schwarzwald Republic."; mes "It was just a tiny blip on the"; mes "map until they opened up"; mes "their Monster Race Arena!"; diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index bfb1240674..f6b54bc0a6 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -11,7 +11,7 @@ //===== Description: ========================================= //= Misc. Message Boards for: //= - Prontera -//= - Morroc +//= - Morocc //= - Geffen //= - Al De Baran //= - Izlude @@ -37,7 +37,7 @@ prontera,158,213,1 script Sign Post#Prt1 111,{ mes "East to Prontera Fields"; mes "South to Prontera Fields"; mes "Southeast to Alberta"; - mes "Southwest to Morroc"; + mes "Southwest to Morocc"; mes "Southwest to Comodo"; mes "West to Prontera Fields"; close; @@ -52,7 +52,7 @@ prontera,156,197,1 script Prontera Bulletin#Prt2 111,{ mes "Will take any offer!"; mes "Contact Abramulious"; mes "Help Wanted: Buying or selling a used Peco Peco?"; - mes "Contact Grasisium in Morroc now!"; + mes "Contact Grasisium in Morocc now!"; close; } @@ -93,7 +93,7 @@ prontera,145,304,1 script Sign#Prt7 111,{ close; } -// Morroc +// Morocc //============================================================ morocc,144,84,1 script Sign#Moc1 111,{ mes "^993300- The Sign Reads -^000000"; @@ -111,15 +111,15 @@ morocc,145,83,1 script Sign#Moc2 111,{ morocc,32,174,1 script Bulletin#Moc3 111,{ mes "^993300- The Bulletin Reads -^000000"; - mes "^0099FFMorroc women up in arms!^000000"; + mes "^0099FFMorocc women up in arms!^000000"; mes "A recent study has shown that the majority of male citizens in"; - mes "Morroc prefer the women of Geffen. 90 of the 100 male citizens"; - mes "of Morroc claimed that they have had numerous relationships"; - mes "with Geffen women outside of the Morroc Region."; + mes "Morocc prefer the women of Geffen. 90 of the 100 male citizens"; + mes "of Morocc claimed that they have had numerous relationships"; + mes "with Geffen women outside of the Morocc Region."; next; mes "^993300- The Bulletin Continued -^000000"; - mes "'I just prefer their company better, that's all...' said one Morroc man."; - mes "'it's not like I'm against Morroc women or anything, so what's the problem...'"; + mes "'I just prefer their company better, that's all...' said one Morocc man."; + mes "'it's not like I'm against Morocc women or anything, so what's the problem...'"; mes "Besides emotional and stressful issues in regards to the daily"; mes "activities of these males."; mes "Hunting still seems to be their number one priority"; @@ -129,7 +129,7 @@ morocc,32,174,1 script Bulletin#Moc3 111,{ morocc,168,266,1 script Sign#Moc5 111,{ mes "^993300- The Sign Reads -^000000"; - mes "Welcome to Morroc."; + mes "Welcome to Morocc."; close; } @@ -143,7 +143,7 @@ morocc,168,264,1 script Billboard#Moc6 111,{ morocc,298,211,1 script Sign#Moc7 111,{ mes "^993300- The Sign Reads -^000000"; - mes "Welcome to Morroc."; + mes "Welcome to Morocc."; close; } @@ -179,7 +179,7 @@ geffen,119,190,1 script Sign Post#Gef4 111,{ mes "Northeast to Al De Baran"; mes "Northwest to Glast Heim"; mes "East to Geffen Fields"; - mes "South to Morroc"; + mes "South to Morocc"; mes "Southeast to Prontera"; mes "Southeast to Alberta"; mes "Southwest to Comodo"; diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 24ca8bfbb0..a8b1b4280f 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Official Gonryun Power Arena +//= Official Kunlun Power Arena //===== By: ================================================== //= KarLaeda //===== Current Version: ===================================== diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 229317651e..24fd0814ed 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -296,7 +296,7 @@ function script F_PVP_FSRS { if (strnpcinfo(4) == "pvp_y_room") { set .@base$, "pvp_y_"+strnpcinfo(2); setarray .@Maps$[0], .@base$+"-1", .@base$+"-2", .@base$+"-3", .@base$+"-4", .@base$+"-5"; - setarray .@Name$[0], "Prontera", "Izlude", "Payon", "Alberta", "Morroc"; + setarray .@Name$[0], "Prontera", "Izlude", "Payon", "Alberta", "Morocc"; setarray .@Limit[0], 128, 128, 128, 128, 128; } else { setarray .@Maps$[0], "pvp_n_8-1", "pvp_n_8-2", "pvp_n_8-3", "pvp_n_8-4", "pvp_n_8-5"; diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 05ddad86b7..410ee4e543 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -71,7 +71,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{ amatsu,251,283,4 script Guide Man#2ama 767,{ mes "[Guide Man]"; - mes "Welcome, tourist from Rune-Midgard."; + mes "Welcome, tourist from Midgard."; mes "I'm the guide of"; mes "our beautiful town, Amatsu."; next; diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt index 3b2f949204..d563e567f4 100644 --- a/npc/pre-re/guides/guides_ayothaya.txt +++ b/npc/pre-re/guides/guides_ayothaya.txt @@ -8,14 +8,14 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Guides for the City of Ayotaya +//= Guides for the City of Ayothaya //===== Additional Comments: ================================= //= 1.0 First version [L0ne_W0lf] //============================================================ ayothaya,203,169,3 script Noi#ayo 839,{ mes "[Noi]"; - mes "Welcome to Ayotaya."; + mes "Welcome to Ayothaya."; mes "Our beautiful village is built"; mes "above the water, surrounded"; mes "by a dense forest."; @@ -38,7 +38,7 @@ ayothaya,203,169,3 script Noi#ayo 839,{ mes "[Noi]"; mes "At our Weapon Shop,"; mes "you will find great weapons"; - mes "favored by brave Ayotayan seafarers."; + mes "favored by brave Ayothayan seafarers."; next; mes "[Noi]"; mes "Our Weapon Shop"; @@ -47,7 +47,7 @@ ayothaya,203,169,3 script Noi#ayo 839,{ close; case 2: mes "[Noi]"; - mes "We Ayotayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, doesn't it?"; + mes "We Ayothayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, doesn't it?"; next; mes "[Noi]"; mes "Our Tool Shop"; diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index 4d94e50897..9d92867eab 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -167,7 +167,7 @@ einbroch,72,202,4 script Guide#ein::EinGuide 852,{ case 3: mes "[Einbroch Guide]"; mes "Through the technology of"; - mes "the Schwaltzvalt Republic,"; + mes "the Schwarzwald Republic,"; mes "we've upgraded to a digital"; mes "information system that allows"; mes "us to mark locations on your"; @@ -314,7 +314,7 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ case 3: mes "[Einbech Guide]"; mes "Through the technology of"; - mes "the Schwaltzvalt Republic,"; + mes "the Schwarzwald Republic,"; mes "we've upgraded to a digital"; mes "information system that allows"; mes "us to mark locations on your"; diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt index 7dfa4a4476..12fcc675fb 100644 --- a/npc/pre-re/guides/guides_juno.txt +++ b/npc/pre-re/guides/guides_juno.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Guides +//= Juno Guides //===== By: ================================================== //= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt index b20825237b..d9d64a7e88 100644 --- a/npc/pre-re/guides/guides_lighthalzen.txt +++ b/npc/pre-re/guides/guides_lighthalzen.txt @@ -55,7 +55,7 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ mes "[Lighthalzen Guide]"; mes "Rekenber Corporation,"; mes "the largest company in"; - mes "the Schwaltzvalt Republic,"; + mes "the Schwarzwald Republic,"; mes "in located in northwestern"; mes "Lighthalzen. You can't miss"; mes "the headquarters building."; @@ -107,7 +107,7 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ mes "The Airport is to the far"; mes "west of the Central Promenade."; mes "You can travel anywhere within"; - mes "the Schwaltzvalt Republic by"; + mes "the Schwarzwald Republic by"; mes "riding on one of the Airships."; if (.@compass_check) viewpoint 1,267,75,7,0x00FF00; diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index ebbaee49d6..af3473405a 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Guides +//= Luoyang Guides //===== By: ================================================== //= jAthena/Tsuyuki; L0ne_W0lf //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Guides for the City of Louyang +//= Guides for the City of Luoyang //===== Additional Comments: ================================= //= 0.5 Added first, Japanese version [Tsuyuki] //= 1.0 Translated to English from iRO NPC Dialogue (100% Official) [Tsuyuki] @@ -17,7 +17,7 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ mes "[Soldier]"; - mes "Welcome to Louyang,"; + mes "Welcome to Luoyang,"; mes "a city with a long"; mes "and colorful history."; next; @@ -28,12 +28,12 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ mes "foreign nations."; next; mes "[Soldier]"; - mes "Louyang is well-known for various specialties in addition to its rich history. Here you can find many things unique to our land."; + mes "Luoyang is well-known for various specialties in addition to its rich history. Here you can find many things unique to our land."; next; mes "[Soldier]"; mes "Please take your time"; mes "and we invite you to enjoy"; - mes "your trip here in Louyang."; + mes "your trip here in Luoyang."; next; switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) { case 1: @@ -78,7 +78,7 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ mes "You will see"; mes "marvelous weapons forged"; mes "by the well-experienced"; - mes "blacksmiths of Louyang."; + mes "blacksmiths of Luoyang."; viewpoint 1,145,174,5,0x55FF33; break; case 5: @@ -129,7 +129,7 @@ louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825 louyang,224,104,3 script Representative#lou 818,{ mes "[Representative]"; - mes "Welcome to Louyang,"; + mes "Welcome to Luoyang,"; mes "an ancient land with"; mes "a history full of tales"; mes "of bravery."; @@ -138,7 +138,7 @@ louyang,224,104,3 script Representative#lou 818,{ mes "We now provide an ocean lane to accomodate foreign travelers and intercultural exchange from which all can benefit."; next; mes "[Representative]"; - mes "Louyang is famous for"; + mes "Luoyang is famous for"; mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay."; next; switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) { @@ -185,7 +185,7 @@ louyang,224,104,3 script Representative#lou 818,{ mes "You will see"; mes "marvelous weapons forged"; mes "by the well-experienced"; - mes "blacksmiths of Louyang."; + mes "blacksmiths of Luoyang."; viewpoint 1,145,174,5,0xFF55FF; break; case 5: @@ -225,7 +225,7 @@ louyang,224,104,3 script Representative#lou 818,{ break; case 3: mes "[Representative]"; - mes "I understand that you want to explore Louyang and see the"; + mes "I understand that you want to explore Luoyang and see the"; mes "sights for yourself. Alright then, take care!"; break; } diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index dd78cc38a5..2f4f10a00f 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Guides +//= Morocc Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== @@ -8,7 +8,7 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Guides for the City of Morroc +//= Guides for the City of Morocc //===== Additional Comments: ================================= //= 1.1 Now using duplicate command. //= 1.2 Optimized, updated common guide names [Lupus] @@ -20,8 +20,8 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ cutin "moc_soldier",2; - mes "[Morroc Guide]"; - mes "Welcome to Morroc,"; + mes "[Morocc Guide]"; + mes "Welcome to Morocc,"; mes "the frontier town of the"; mes "Rune-Midgarts Kingdom."; mes "Please ask me for help if"; @@ -32,7 +32,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ next; switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) { case 1: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Please select"; mes "a location from"; mes "the following menu."; @@ -50,7 +50,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) { case 1: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The Thief Guild is"; mes "in charge of all Job"; mes "Changes to the Thief"; @@ -61,50 +61,50 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ viewpoint 1,24,297,2,0xFF0000; break; case 2: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The Weapon Shop"; mes "is in the southeast"; - mes "end of Morroc."; + mes "end of Morocc."; if (.@compass_check) viewpoint 1,253,56,3,0xFF00FF; break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "There are Inns"; mes "where you can rest"; mes "at the southeast and"; - mes "northeast ends of Morroc."; + mes "northeast ends of Morocc."; if (.@compass_check) { viewpoint 1,197,66,4,0xFF00FF; viewpoint 1,273,269,5,0xFF00FF; } break; case 4: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "You can find the"; - mes "Pub in northeast Morroc."; + mes "Pub in northeast Morocc."; if (.@compass_check) viewpoint 1,52,259,6,0xFF00FF; break; case 5: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The Mercenary"; mes "Guild is located"; - mes "in East Morroc."; + mes "in East Morocc."; if (.@compass_check) viewpoint 1,284,171,7,0x00FF00; break; case 6: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The Forge is"; mes "located just"; mes "southwest from"; - mes "the center of Morroc."; + mes "the center of Morocc."; if (.@compass_check) viewpoint 1,47,47,7,0xFF00FF; break; case 7: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Please ask me to ''Remove"; mes "Marks from Mini-Map'' if you"; mes "no longer wish to have the"; @@ -124,7 +124,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ set .@compass_check,0; break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Advances in sorcery and"; mes "technology have allowed"; mes "us to update our information"; @@ -132,23 +132,23 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ mes "locations on your Mini-Map"; mes "for easier navigation."; next; - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Your Mini-Map is located"; mes "in the upper right corner"; mes "of the screen. If you can't"; mes "see it, press the Ctrl + Tab"; mes "keys or click the ''Map'' button in your Basic Info Window."; next; - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "On your Mini-Map,"; mes "click on the ''+'' and ''-''"; mes "symbols to zoom in and"; mes "our of your Mini-Map. We"; mes "hope you enjoy your travels"; - mes "here in the city of Morroc."; + mes "here in the city of Morocc."; break; case 4: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Alright then,"; mes "try to stay out of"; mes "too much trouble"; diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index d12f8c8c83..1c2c232ea4 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -222,7 +222,7 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{ mes "[Prontera Guide]"; mes "Well, adventurer..."; mes "I hope your journeys"; - mes "through Rune-Midgard"; + mes "through Rune-Midgarts"; mes "are both fun and safe."; close2; set .@loop1,0; diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index ab42557d03..fc99bbeada 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -112,7 +112,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ break; case 1: set job_acolyte_q,3; - mes "Please visit ^000077Mother Mathilda^000000 and then return to me. She has been practicing asceticism near ^000077Morroc Town, SouthWest of Prontera City^000000."; + mes "Please visit ^000077Mother Mathilda^000000 and then return to me. She has been practicing asceticism near ^000077Morocc Town, SouthWest of Prontera City^000000."; setquest 1002; break; case 2: @@ -160,7 +160,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ mes "Please Visit ^000077Mother Mathilda^000000 and return here to me."; next; mes "[Father Mareusis]"; - mes "She has been practicing asceticism near ^000077Morroc Town, located SouthWest of Prontera City^000000."; + mes "She has been practicing asceticism near ^000077Morocc Town, located SouthWest of Prontera City^000000."; break; case 4: mes "[Father Mareusis]"; @@ -222,7 +222,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ mes "For your trial, please visit ^000077Mother Mathilda^000000 and return here to me."; next; mes "[Father Mareusis]"; - mes "She has been practicing asceticism near ^000077Morroc, located to the SouthWest of Prontera City^000000."; + mes "She has been practicing asceticism near ^000077Morocc, located to the SouthWest of Prontera City^000000."; break; default: mes "For your trial, please visit ^000077Father Yosuke^000000 and return here to me."; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 7ac47e4920..5e45eabfc1 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -294,7 +294,7 @@ geffen_in,164,112,4 script Mixing Machine 111,{ mes "Solvent for"; mes "the Solution."; next; - switch(select("Payon Solution.:Morroc Solution.:No Solvent.")) { + switch(select("Payon Solution.:Morocc Solution.:No Solvent.")) { case 1: if (countitem(1089) == 0) { mes "[Mixing Machine]"; @@ -329,7 +329,7 @@ geffen_in,164,112,4 script Mixing Machine 111,{ if (.@mixitem1_3 != 0) mes "Milk: " + .@mixitem1_3 + " ea."; if (.@mixitem2 == 0) mes "Solvent: None."; if (.@mixitem2 == 1) mes "Solvent: Payon Solution."; - if (.@mixitem2 == 2) mes "Solvent: Morroc Solution."; + if (.@mixitem2 == 2) mes "Solvent: Morocc Solution."; next; mes "[Mixing Machine]"; mes "Please choose if you wish to begin mixing, or to re-enter the number of items to be mixed."; @@ -594,7 +594,7 @@ geffen_in,164,112,4 script Mixing Machine 111,{ close; } -// The Morroc Solution and Payon Solution traders +// The Morocc Solution and Payon Solution traders // are also used in the Sage skill quests, and have // been moved to npc/quests/mage_solution.txt. // @@ -680,9 +680,9 @@ geffen_in,177,112,4 script Bookshelf 111,{ next; mes "[Mage Test Solution No. 4]"; mes "* Solvent Agent *"; - mes "Morroc Solution"; + mes "Morocc Solution"; mes "Where to Find:"; - mes "A small spring near entrance of pyramid in Morroc."; + mes "A small spring near entrance of pyramid in Morocc."; next; mes "[Mage Test Solution No. 4]"; mes "* Magic Power Serial Code *"; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 3db83bdf66..ac3bafe640 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -210,7 +210,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ } } else if (job_merchant_q2 == 5 || job_merchant_q2 == 6) { - mes "First, get the delivery package from the storehouse, and then take it to Morroc."; + mes "First, get the delivery package from the storehouse, and then take it to Morocc."; next; mes "[Chief Mahnsoo]"; mes "You'll have to find Java Dullihan, the Dyemaker, so that you can deliver the product he ordered."; @@ -394,7 +394,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ callsub S_GiveSerial,2989396,3,2191737,4,1010; break; case 3: - mes "First, get the delivery package from the storehouse, and then go to Morroc. There you must find Java Dullihan, the dyemaker."; + mes "First, get the delivery package from the storehouse, and then go to Morocc. There you must find Java Dullihan, the dyemaker."; next; mes "[Chief Mahnsoo]"; mes "He's a bit forgetful, so you should probably give the package to one of his students."; @@ -528,7 +528,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ else if (job_merchant_q2 == 3 || job_merchant_q2 == 4) mes "Geffen Magic Academy. Okay, receipt?"; else if (job_merchant_q2 == 5 || job_merchant_q2 == 6) - mes "The dyemaker in Morroc. Not bad. Receipt?"; + mes "The dyemaker in Morocc. Not bad. Receipt?"; else if (job_merchant_q2 == 7 || job_merchant_q2 == 8) mes "Oh hohohoho~! The Kafra Babe on Byalan Island?! Awesome! Anyway, did you bring the receipt?"; @@ -846,7 +846,7 @@ morocc_in,140,102,4 script Student#mer 86,{ } else { mes "[Dyer's Student]"; - mes "Mr. Java Dullihan is the one and only, the best dye maker on the Rune-Midgard continent."; + mes "Mr. Java Dullihan is the one and only, the best dye maker on the Midgard continent."; next; mes "[Dyer's Student]"; mes "Aaaand I'm proud to say that I'm his student! Someday, I'll be able to make really beautiful dyes too!"; diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 31698e5e46..4bccfc1945 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -314,7 +314,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ mes "Alright, let me inform you then. Listen carefully. This test decides if you are worthy of becoming a Thief."; next; mes "[Thief Guide]"; - mes "You will be sneaking to Shibu's Farm. He is the worst Merchant, in terms of character, in Morroc."; + mes "You will be sneaking to Shibu's Farm. He is the worst Merchant, in terms of character, in Morocc."; next; mes "[Thief Guide]"; mes "Alright, for your test, you gotta steal Mushrooms from his farm. Don't worry, that guy deserves to be robbed."; diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 8aecf33a4e..f338983d64 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -583,7 +583,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{ mes "When you attend the Skill Information class, you'll gain a better understanding of the use of skills."; next; mes "[Kris]"; - mes "Since the use of skills is integral to survival in Rune-Midgard, I strongly suggest that you attend the class. Come, I shall guide you there."; + mes "Since the use of skills is integral to survival in Midgard, I strongly suggest that you attend the class. Come, I shall guide you there."; close2; warp "new_1-2",84,107; end; @@ -1288,13 +1288,13 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ if ( select("Teleport Service","About Kafra services") == 1 ) { if (nov_get_item02 < 10 && nov_get_item03 < 10 && nov_get_item04 < 10) { mes "[Kafra Employee]"; - mes "I see, you must want to teleport to a town in Rune-Midgard imediately. First, let me briefly inform you about the different towns and cities in Ragnarok."; + mes "I see, you must want to teleport to a town in Rune-Midgarts imediately. First, let me briefly inform you about the different towns and cities in Ragnarok."; next; mes "[Kafra Employee]"; mes "Prontera is the capital of the Rune-Midgarts kingdom, and its satellite, Izlude, is closeby."; next; mes "[Kafra Employee]"; - mes "^996633Morroc^000000 is in the desert. It's the town where you can change your job to the Thief and Assassin classes."; + mes "^996633Morocc^000000 is in the desert. It's the town where you can change your job to the Thief and Assassin classes."; next; mes "[Kafra Employee]"; mes "^006600Payon^000000 is in the mountains, and is famous for its Archer Village, where Novices can change their jobs to Archers."; @@ -1309,7 +1309,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ mes "Please choose"; mes "your destination."; next; - switch(select("Prontera:Morroc:Payon:Alberta:Geffen")) { + switch(select("Prontera:Morocc:Payon:Alberta:Geffen")) { case 1: set .@dest$,"Prontera"; set .@mapn$,"prontera"; @@ -1317,7 +1317,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ set .@warpX,150; set .@warpY,50; break; case 2: - set .@dest$,"Morroc"; + set .@dest$,"Morocc"; set .@mapn$,"morocc"; set .@saveX,150; set .@saveY,99; set .@warpX,155; set .@warpY,110; @@ -1372,7 +1372,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ end; } else { - switch(select("Field Combat Course:Prontera:Morroc:Payon:Alberta:Geffen")) { + switch(select("Field Combat Course:Prontera:Morocc:Payon:Alberta:Geffen")) { case 1: mes "[Kafra Employee]"; mes "Thank you, let"; @@ -1388,7 +1388,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ set .@warpX,150; set .@warpY,50; break; case 3: - set .@dest$,"Morroc"; + set .@dest$,"Morocc"; set .@mapn$,"morocc"; set .@saveX,150; set .@saveY,99; set .@warpX,155; set .@warpY,110; @@ -1474,7 +1474,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ break; case 2: mes "[Kafra Employee]"; - mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Rune-Midgard continent."; + mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Midgard continent."; next; mes "[Kafra Employee]"; mes "You can store and retrieve"; @@ -1522,7 +1522,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ mes "traveling time."; next; mes "[Kafra Employee]"; - mes "Our Teleport Service is safe and comfortable, and will allow you to fully explore the various lands of the Rune-Midgard continent."; + mes "Our Teleport Service is safe and comfortable, and will allow you to fully explore the various lands of the Midgard continent."; next; mes "[Kafra Employee]"; mes "We thank our valued customers for their great support and continue to provide them with the best"; @@ -1614,7 +1614,7 @@ new_1-2,161,182,5 script Instructor#nv 92,{ mes "If you carry over 50 % of your maximum weight limit, your HP and SP will not be restored by resting, so be careful."; next; mes "[Edwin]"; - mes "The numerical value next to the weight limit shows the current amount of Zeny, the currency of Rune-Midgard, that you possess."; + mes "The numerical value next to the weight limit shows the current amount of Zeny, the currency of Midgard, that you possess."; next; mes "[Edwin]"; mes "On the right side of the"; @@ -2487,7 +2487,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 92,{ } else if (nov_2nd_cos > 0 && nov_2nd_cos < 21) { mes "[Muriel]"; - mes "Field Combat Training is an actual fight class where you can gain basic fighting skills that you can use to defend yourself in Rune-Midgard."; + mes "Field Combat Training is an actual fight class where you can gain basic fighting skills that you can use to defend yourself in Midgard."; next; mes "[Muriel]"; mes "Please kill as many monsters as you can to increase your base level at least 2 times."; @@ -3349,7 +3349,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. 'Falchion' is a weapon that will be very useful once you become a Swordman."; + mes "'Zeny' is the currency of Midgard. 'Falchion' is a weapon that will be very useful once you become a Swordman."; next; mes "[Hanson]"; mes "'Phracon' is an ore which can be used to upgrade lvl 1 weapons. To strengthen your Falchion with this Phracon, please visit a forge in one of the towns."; @@ -3420,7 +3420,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. That 'Cutter' has been given to you so that you can fight monsters before you become a Mage."; + mes "'Zeny' is the currency of Midgard. That 'Cutter' has been given to you so that you can fight monsters before you become a Mage."; next; mes "[Hanson]"; mes "Once you become a Mage, you can use the 'Rod' that has been given to you. It will be very useful during your early days as a Mage."; @@ -3492,7 +3492,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. 'Battle Axe' will come in handy once you become a Merchant."; + mes "'Zeny' is the currency of Midgard. 'Battle Axe' will come in handy once you become a Merchant."; next; mes "[Hanson]"; mes "'Phracon' is an ore which can be used to upgrade lvl 1 weapons. To strengthen your Battle Axe with this Phracon, please visit a forge in one of the towns."; @@ -3568,13 +3568,13 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. 'Main Gauche' is a weapon that will be very useful once you become a Thief."; + mes "'Zeny' is the currency of Midgard. 'Main Gauche' is a weapon that will be very useful once you become a Thief."; next; mes "[Hanson]"; mes "'Phracon' is an ore which can be used to upgrade lvl 1 weapons. To strengthen your Main Gauche with this Phracon, please visit a forge in one of the towns."; next; mes "[Hanson]"; - mes "The town you will be sent to is named Morroc. The Thief Guild is in the first underground floor of the pyramid NorthWest of Morroc. Remember this."; + mes "The town you will be sent to is named Morocc. The Thief Guild is in the first underground floor of the pyramid NorthWest of Morocc. Remember this."; next; mes "[Hanson]"; mes "You will now"; @@ -3629,7 +3629,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. 'Composite Bow' is a weapon that will be very useful once you become an Archer."; + mes "'Zeny' is the currency of Midgard. 'Composite Bow' is a weapon that will be very useful once you become an Archer."; next; mes "[Hanson]"; mes "'Phracon' is an ore which can be used to upgrade lvl 1 weapons. To strengthen your Composite Bow with this Phracon, please visit a forge in one of the towns."; @@ -3701,7 +3701,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. 'Mace' is a weapon that will be very useful once you become an Acolyte."; + mes "'Zeny' is the currency of Midgard. 'Mace' is a weapon that will be very useful once you become an Acolyte."; next; mes "[Hanson]"; mes "'Phracon' is an ore which can be used to upgrade lvl 1 weapons. To strengthen your Mace with this Phracon, please visit a forge in one of the towns."; @@ -3741,7 +3741,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "immediately."; next; mes "[Hanson]"; - mes "For more information and knowledge, I hope you will obtain your own experiences in Rune-Midgard."; + mes "For more information and knowledge, I hope you will obtain your own experiences in Midgard."; next; mes "[Hanson]"; mes "Lastly..."; @@ -3800,7 +3800,7 @@ new_1-4,100,29,1 script Hanson#nv 46,{ mes "[Hanson]"; mes "The only thing"; mes "left to do is to lead"; - mes "you to Rune-Midgard~"; + mes "you to Midgard~"; next; set nov_1st_cos,0; set nov_2nd_cos,0; @@ -3892,7 +3892,7 @@ S_UserJobchoice: else if (@menu == 4) { mes "to become a Thief."; mes "You will be sent to"; - mes "the town of Morroc."; + mes "the town of Morocc."; next; mes "[Hanson]"; mes "The Thief guild is in the underground 1st floor of a pyramid which is NorthWest of town. Please remember this."; @@ -3941,7 +3941,7 @@ S_UserJobchoice: mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services."; next; mes "[Hanson]"; - mes "'Zeny' is the currency of Rune-Midgard. The 'Adventurer's Suit' will come in handy once you become a " + .@Jobs$[@menu] + "."; + mes "'Zeny' is the currency of Midgard. The 'Adventurer's Suit' will come in handy once you become a " + .@Jobs$[@menu] + "."; next; mes "[Hanson]"; mes "You will now"; @@ -4087,7 +4087,7 @@ new_1-4,91,22,4 script Bruce#nv 57,{ break; case 6: mes "[Bruce]"; - mes "In Ragnarok Online, Acolytes act as messengers of God in Rune-Midgard. They possess skills that support their allies, as well as the life saving Heal ability."; + mes "In Ragnarok Online, Acolytes act as messengers of God in Rune-Midgarts. They possess skills that support their allies, as well as the life saving Heal ability."; next; mes "[Bruce]"; mes "The Acolyte's support abilities make them a welcome addition to any party. In difficult situations, the Acolyte's skills will ensure the survival of the party, allowing other members to focus on offense."; @@ -4244,7 +4244,7 @@ new_1-4,91,22,4 script Bruce#nv 57,{ break; case 6: mes "[Bruce]"; - mes "In Ragnarok Online, Acolytes act as messengers of God in Rune-Midgard. They possess skills that support their allies, as well as the life saving Heal ability."; + mes "In Ragnarok Online, Acolytes act as messengers of God in Rune-Midgarts. They possess skills that support their allies, as well as the life saving Heal ability."; next; mes "[Bruce]"; mes "The Acolyte's support abilities make them a welcome addition to any party. In difficult situations, the Acolyte's skills will ensure the survival of the party, allowing other members to focus on offense."; diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 7db2914805..ae955cf189 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -36,7 +36,7 @@ izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506 izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 //======================================================= -// Morroc - Post Ep. 12.1 +// Morocc - Post Ep. 12.1 //======================================================= moc_ruins,118,170,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 moc_ruins,91,128,4 shop Tool Dealer#moc1 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 diff --git a/npc/pre-re/mobs/dungeons/gld_dunSE.txt b/npc/pre-re/mobs/dungeons/gld_dunSE.txt index 86131aa7da..10d5931508 100644 --- a/npc/pre-re/mobs/dungeons/gld_dunSE.txt +++ b/npc/pre-re/mobs/dungeons/gld_dunSE.txt @@ -21,7 +21,7 @@ arug_dun01,0,0 monster Fanat 1797,17 arug_dun01,0,0 monster Aunoe 1796,17 //================================================== -// schg_dun01 - Schwartzvald Guild Dungeon +// schg_dun01 - Schwarzwald Guild Dungeon //================================================== schg_dun01,0,0 monster Hell Apocalypse 1978,20 schg_dun01,0,0 monster Zakudam 1979,20 diff --git a/npc/pre-re/mobs/dungeons/gon_dun.txt b/npc/pre-re/mobs/dungeons/gon_dun.txt index de8e2522d1..5e9639badb 100644 --- a/npc/pre-re/mobs/dungeons/gon_dun.txt +++ b/npc/pre-re/mobs/dungeons/gon_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Gonryun Dungeon Monster Spawn Script +//= Kunlun Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== @@ -12,7 +12,7 @@ //============================================================ //================================================== -// gon_dun01 - Shrine of Gonryun Queen +// gon_dun01 - Shrine of Kunlun Queen //================================================== gon_dun01,0,0 monster Bloody Butterfly 1408,55,650000,350000 gon_dun01,0,0 monster Enchanted Peach Tree 1410,35 diff --git a/npc/pre-re/mobs/dungeons/lou_dun.txt b/npc/pre-re/mobs/dungeons/lou_dun.txt index fdd2d15324..d30f4c3ad3 100644 --- a/npc/pre-re/mobs/dungeons/lou_dun.txt +++ b/npc/pre-re/mobs/dungeons/lou_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Dungeon Monster Spawn Script +//= Luoyang Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== diff --git a/npc/pre-re/mobs/fields/gonryun.txt b/npc/pre-re/mobs/fields/gonryun.txt index 3f888e3d47..4e4de1115c 100644 --- a/npc/pre-re/mobs/fields/gonryun.txt +++ b/npc/pre-re/mobs/fields/gonryun.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// gon_fild01 - Gonryun Field +// gon_fild01 - Kunlun Field //================================================== gon_fild01,0,0 monster Baby Leopard 1415,40,600000,300000 gon_fild01,0,0 monster Zipper Bear 1417,20 diff --git a/npc/pre-re/mobs/fields/louyang.txt b/npc/pre-re/mobs/fields/louyang.txt index 5916cff998..14cb5f3b70 100644 --- a/npc/pre-re/mobs/fields/louyang.txt +++ b/npc/pre-re/mobs/fields/louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Fields Monster Spawn Script +//= Luoyang Fields Monster Spawn Script //===== By: ================================================== //= Evera/Lorri //===== Current Version: ===================================== @@ -12,7 +12,7 @@ //============================================================ //================================================== -// lou_fild01 - Louyang Field +// lou_fild01 - Luoyang Field //================================================== lou_fild01,224,315,100,50 monster Bigfoot 1060,7 lou_fild01,203,225,110,35 monster Bigfoot 1060,4,60000,30000 diff --git a/npc/pre-re/mobs/fields/morocc.txt b/npc/pre-re/mobs/fields/morocc.txt index 2a5829dda6..f916c9789b 100644 --- a/npc/pre-re/mobs/fields/morocc.txt +++ b/npc/pre-re/mobs/fields/morocc.txt @@ -9,11 +9,11 @@ //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] -//= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf] +//= 1.3 Added Morocc field 20, 21, and 22 spawns, as [L0ne_W0lf] //= 1.4 Updated spawns to reflect episode 12.1. [L0ne_W0lf] //= 1.5 Fixed Pheeroni spawn location. [Kisuka] -//= 1.6 Added Satan MOrroc static spawn. [L0ne_W0lf] -//= Added 30s spawn time for all Morroc Shadows. +//= 1.6 Added Satan Morocc static spawn. [L0ne_W0lf] +//= Added 30s spawn time for all Morocc Shadows. //= 1.7 Corrected MVP spawn variance. [L0ne_W0lf] //============================================================ @@ -299,10 +299,10 @@ moc_fild20,0,0 monster Drops 1113,30 moc_fild20,0,0 monster Scorpion 1001,70 moc_fild20,0,0 monster Picky 1050,50 moc_fild20,0,0 monster Picky 1049,50 -moc_fild20,0,0 monster Morroc's Shadow 1918,1,30000,0,0 -moc_fild20,0,0 monster Morroc's Shadow 1919,1,30000,0,0 -moc_fild20,0,0 monster Morroc's Shadow 1920,1,30000,0,0 -moc_fild20,0,0 monster Morroc's Shadow 1921,1,30000,0,0 +moc_fild20,0,0 monster Morocc's Shadow 1918,1,30000,0,0 +moc_fild20,0,0 monster Morocc's Shadow 1919,1,30000,0,0 +moc_fild20,0,0 monster Morocc's Shadow 1920,1,30000,0,0 +moc_fild20,0,0 monster Morocc's Shadow 1921,1,30000,0,0 //================================================== // moc_fild21 - Dimensional Gorge @@ -310,16 +310,16 @@ moc_fild20,0,0 monster Morroc's Shadow 1921,1,30000,0,0 moc_fild21,0,0 monster Golem 1040,61 moc_fild21,0,0 monster Stalactic Golem 1278,46 moc_fild21,0,0 monster Lava Golem 1366,46 -moc_fild21,0,0 monster Morroc's Shadow 1918,46,30000,0,0 -moc_fild21,0,0 monster Morroc's Shadow 1919,46,30000,0,0 -moc_fild21,0,0 monster Morroc's Shadow 1920,46,30000,0,0 -moc_fild21,0,0 monster Morroc's Shadow 1921,34,30000,0,0 +moc_fild21,0,0 monster Morocc's Shadow 1918,46,30000,0,0 +moc_fild21,0,0 monster Morocc's Shadow 1919,46,30000,0,0 +moc_fild21,0,0 monster Morocc's Shadow 1920,46,30000,0,0 +moc_fild21,0,0 monster Morocc's Shadow 1921,34,30000,0,0 //================================================== // moc_fild22 - Dimensional Gorge //================================================== -moc_fild22,0,0 monster Morroc's Shadow 1918,60,30000,0,0 -moc_fild22,0,0 monster Morroc's Shadow 1919,60,30000,0,0 -moc_fild22,0,0 monster Morroc's Shadow 1920,60,30000,0,0 -moc_fild22,0,0 monster Morroc's Shadow 1921,25,30000,0,0 -moc_fild22,0,0 monster Wounded Satan Morroc 1917,1,43200000,3600000 +moc_fild22,0,0 monster Morocc's Shadow 1918,60,30000,0,0 +moc_fild22,0,0 monster Morocc's Shadow 1919,60,30000,0,0 +moc_fild22,0,0 monster Morocc's Shadow 1920,60,30000,0,0 +moc_fild22,0,0 monster Morocc's Shadow 1921,25,30000,0,0 +moc_fild22,0,0 monster Wounded Satan Morocc 1917,1,43200000,3600000 diff --git a/npc/pre-re/mobs/fields/yuno.txt b/npc/pre-re/mobs/fields/yuno.txt index 3d33a1a1b3..4feeb51ada 100644 --- a/npc/pre-re/mobs/fields/yuno.txt +++ b/npc/pre-re/mobs/fields/yuno.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Fields Monster Spawn Script +//= Juno Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== @@ -16,7 +16,7 @@ //= Mob quantity is custom. //= 1.5b Changed the spawn numbers a bit. [Poki#3] //= Thanks to Playtester and Emperium.org -//= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3] +//= 1.6 Fixed Juno Field 10. Mob amount sugested by Playtester [Poki#3] //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.8 Added kRO 10.1 spawns where they fit [Playtester] //= 1.9 More accurate spawns [Playtester] @@ -96,7 +96,7 @@ yuno_fild05,176,202,8,8 monster Blue Plant 1079,2,180000,90000 yuno_fild05,300,280,5,5 monster Blue Plant 1079,2,180000,90000 //================================================== -// yuno_fild06 - Yuno Field +// yuno_fild06 - Juno Field //================================================== yuno_fild06,0,0 monster Sleeper 1386,70 yuno_fild06,0,0 monster Goat 1372,40 @@ -147,7 +147,7 @@ yuno_fild09,0,0 monster Green Plant 1080,10,180000,90000 yuno_fild09,0,0 monster Yellow Plant 1081,10,180000,90000 //================================================== -// yuno_fild10 - Yuno Field +// yuno_fild10 - Juno Field //================================================== yuno_fild10,0,0 monster Beetle King 1494,40 yuno_fild10,0,0 monster Stainer 1174,20 @@ -156,7 +156,7 @@ yuno_fild10,0,0 monster Geographer 1368,20 yuno_fild10,0,0 monster Hunter Fly 1035,10 //================================================== -// yuno_fild11 - Yuno Field +// yuno_fild11 - Juno Field //================================================== yuno_fild11,0,0 monster Sleeper 1386,10 yuno_fild11,0,0 monster Demon Pungus 1378,10,120000 diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index b2cd2d4878..1c66102af4 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -155,13 +155,13 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 707,{ case 1: // Item turn in mes "[Private Jeremy]"; - mes "The Morroc Guard needs ^FF0000Stone Hearts^000000 for our training regimen."; + mes "The Morocc Guard needs ^FF0000Stone Hearts^000000 for our training regimen."; next; switch(select("I have Stone Hearts:What did you need?")) { case 1: if (countitem(953) > 24) { mes "[Private Jeremy]"; - mes "The Morroc Guard thanks you, citizen."; + mes "The Morocc Guard thanks you, citizen."; delitem 953,25; //Stone_Heart getexp 14000,9000; close; @@ -171,12 +171,12 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 707,{ mes "It doesn't look like you have enough."; next; mes "[Private Jeremy]"; - mes "The Morroc Guard needs ^FF000025 Stone Hearts^000000, for our training regimen."; + mes "The Morocc Guard needs ^FF000025 Stone Hearts^000000, for our training regimen."; close; } case 2: mes "[Private Jeremy]"; - mes "The Morroc Guard needs ^FF000025 Stone Hearts^000000, for our training regimen."; + mes "The Morocc Guard needs ^FF000025 Stone Hearts^000000, for our training regimen."; close; } case 2: @@ -218,7 +218,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 707,{ mes "Greetings citizen!"; next; mes "[Private Jeremy]"; - mes "Please do not interrupt my mission for the Morroc Guard."; + mes "Please do not interrupt my mission for the Morocc Guard."; close; } } diff --git a/npc/pre-re/quests/quests_morocc.txt b/npc/pre-re/quests/quests_morocc.txt index 6a5ebada0f..5c5bc0012e 100644 --- a/npc/pre-re/quests/quests_morocc.txt +++ b/npc/pre-re/quests/quests_morocc.txt @@ -1,8 +1,8 @@ //===== rAthena Script ======================================= -//= Morroc Quest NPCs +//= Morocc Quest NPCs //===== Description: ========================================= //= [Official Conversion] -//= Quest NPCs related to Morroc. +//= Quest NPCs related to Morocc. //===== Changelogs: ========================================== //= 1.0 Succession of the Prince removed in ep16.1 [Capuche] //= 1.1 Moved renewal specific npcs [zackdreaver] @@ -16,7 +16,7 @@ moc_ruins,113,181,4 duplicate(William) William#moc 89 // ============================================================ moc_ruins,118,176,4 duplicate(Alchemist) Alchemist#moc 64 -// Resurrection of Satan Morroc +// Resurrection of Satan Morocc // ============================================================ morocc,176,103,3 duplicate(Continental Official) Continental Official#mor 754 @@ -34,7 +34,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "It might have brought national disorder, but people are all wary about the rebirth of the devil. We are in the perfect times to process this issue without making any additional fuss."; next; mes "[Messenger]"; - mes "Oh, I don't want you to panic too much... Hmm... what I want to say is, Tristan the third, the ruler of Rune Midgarts..."; + mes "Oh, I don't want you to panic too much... Hmm... what I want to say is, Tristan the third, the ruler of Rune-Midgarts..."; next; switch(select("Passed away?:Came for a celebration again?")) { case 1: @@ -47,7 +47,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "[Messenger]"; mes "The King's position cannot"; mes "be empty for too long."; - mes "Now, the debate over selecting our next King is actively in progress. Please give us a hand with this, for the tomorrow of Rune Midgarts."; + mes "Now, the debate over selecting our next King is actively in progress. Please give us a hand with this, for the tomorrow of Rune-Midgarts."; set nk_prince,1; setquest 10000; close; @@ -64,7 +64,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "It's quite natural for you to expect nothing. I still don't know how to express this to you. Don't be too perplexed."; next; mes "[Messenger]"; - mes "Tristan the 3rd, the ruler of Rune Midgarts..."; + mes "Tristan the 3rd, the ruler of Rune-Midgarts..."; next; mes "[Messenger]"; mes "..."; @@ -79,7 +79,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "[Messenger]"; mes "Please...Please..."; mes "Lend a hand for the future"; - mes "of the Rune Midgarts kingdom."; + mes "of the Rune-Midgarts kingdom."; set nk_prince,1; setquest 10000; close; @@ -114,7 +114,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "They will let you know what"; mes "you have to do in court."; mes "I hope you will help bring"; - mes "peace to Rune Midgarts."; + mes "peace to Rune-Midgarts."; set nk_prince,1; setquest 10000; close; @@ -122,7 +122,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ } else { mes "[Messenger]"; - mes "I am a messenger of Rune Midgarts."; + mes "I am a messenger of Rune-Midgarts."; mes "Is there something special"; mes "in this country?"; next; @@ -136,7 +136,7 @@ prontera,153,353,4 script Messenger#prince1 105,{ mes "I want you to go to the Prontera Royal Court to help in the next King's selection."; next; mes "[Messenger]"; - mes "I will stay here to find other adventurers. May your heart bring great glory to Rune Midgarts!"; + mes "I will stay here to find other adventurers. May your heart bring great glory to Rune-Midgarts!"; close; } else { @@ -402,7 +402,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{ } mes "[Inspector]"; mes "What has to be done first when"; - mes "ruling the Rune Midgarts kingdom?"; + mes "ruling the Rune-Midgarts kingdom?"; next; switch(select("Dominate countries by reinforcing militia.:Advancement of economy and technology.:Keep public security firm.")) { case 1: @@ -740,7 +740,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{ } mes "[Inspector]"; mes "What has to be done first when"; - mes "ruling the Rune Midgarts kingdom?"; + mes "ruling the Rune-Midgarts kingdom?"; next; switch(select("Dominate countries by reinforcing militia.:Advancement of economy and technology.:Keep public security firm.")) { case 1: @@ -862,10 +862,10 @@ prt_castle,117,163,5 script Inspector#prince 755,{ mes "The original rule is that the quality of princes has to be appraised by royal families for a long time, and one has to be elected by internal ordinance."; next; mes "[Inspector]"; - mes "Because of the resurrection of the devil Satan Morroc, people are too uneasy to follow regular announcements, and the atmosphere of the kingdom is not stable."; + mes "Because of the resurrection of the devil Satan Morocc, people are too uneasy to follow regular announcements, and the atmosphere of the kingdom is not stable."; next; mes "[Inspector]"; - mes "Each kingdom is busy preventing the interference of Satan Morroc too."; + mes "Each kingdom is busy preventing the interference of Satan Morocc too."; next; mes "[Inspector]"; mes "So this time, the Court decided to change its ways, giving the opportunity to appraise the candidates to famous and devoted adventurers like yourself. That's why you are here."; @@ -904,7 +904,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{ mes "Behind the soldier, you can find a secret door. If you talk to the soldier, the soldier will allow you to get in."; next; mes "[Inspector]"; - mes "As I have expressed, this is a very important issue for the Rune Midgarts kingdom. Although I've stressed this point repeateadly, I cannot stress it enough."; + mes "As I have expressed, this is a very important issue for the Rune-Midgarts kingdom. Although I've stressed this point repeateadly, I cannot stress it enough."; next; mes "[Inspector]"; mes "Please behave accordingly."; @@ -961,7 +961,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{ next; mes "[Inspector]"; mes "So, keep up the good work."; - mes "For the Kingdom of Rune Midgarts!"; + mes "For the Kingdom of Rune-Midgarts!"; if (checkre(3)) { if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 40000,0; else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 45000,0; @@ -990,7 +990,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{ else if ((nk_prince == 8) || (nk_prince == 9)) { mes "[Inspector]"; mes "All for the glory"; - mes "of Rune Midgarts!"; + mes "of Rune-Midgarts!"; close; } else { @@ -1952,12 +1952,12 @@ prt_castle,314,373,4 script Prince#eisen 983,{ else if (nkprince_eisen == 4) { mes "[Ahrum]"; mes "I am Eigen Ahrum,"; - mes "I will be the light of Rune Midgarts."; + mes "I will be the light of Rune-Midgarts."; close; } else if (nkprince_eisen == 5) { mes "[Ahrum]"; - mes "Whoever be the king, let's make Rune Midgarts... the best country in the world, by helping each other."; + mes "Whoever be the king, let's make Rune-Midgarts... the best country in the world, by helping each other."; next; mes "[Ernst]"; mes "We can make it."; @@ -2769,7 +2769,7 @@ prt_castle,314,371,0 script Prince#another_ern 985,{ if (nkprince_eisen == 5) { mes "[Ahrum]"; mes "Whoever be the king,"; - mes "let's make Rune Midgarts..."; + mes "let's make Rune-Midgarts..."; mes "the best country in the world, by helping each other."; next; mes "[Ernst]"; diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf index ea869ffffd..4cb4306aee 100644 --- a/npc/pre-re/scripts_athena.conf +++ b/npc/pre-re/scripts_athena.conf @@ -72,7 +72,7 @@ npc: npc/pre-re/other/turbo_track.txt //npc: npc/pre-re/quests/collection/quest_hode.txt //npc: npc/pre-re/quests/collection/quest_leafcat.txt //npc: npc/pre-re/quests/collection/quest_mantis.txt -// - Exploitable due to vendor selling Bill of Birds in Morroc +// - Exploitable due to vendor selling Bill of Birds in Morocc //npc: npc/pre-re/quests/collection/quest_pecopeco.txt //npc: npc/pre-re/quests/collection/quest_pupa.txt //npc: npc/pre-re/quests/collection/quest_zhupolong.txt diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index 8141a5dbab..3a8b1057f8 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Field Warp Script +//= Morocc Field Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Warp Points for Morroc Fields +//= Warp Points for Morocc Fields //===== Additional Comments: ================================= //= 1.1 changed 'anthell' to @anthell [Lupus] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] @@ -114,6 +114,6 @@ moc_fild19,169,107,0 warp mocf004 1,4,morocc,27,164 moc_fild19,71,170,0 warp mocf018 8,2,moc_ruins,71,19 moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9 -// Satan Morroc Addition +// Satan Morocc Addition moc_fild21,26,196,0 warp mocf020 1,1,moc_fild20,349,179 moc_fild22,32,196,0 warp mocf021 1,1,moc_fild20,349,179 diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt index 2d0d3df7df..0ff7b840d6 100644 --- a/npc/pre-re/warps/fields/yuno_fild.txt +++ b/npc/pre-re/warps/fields/yuno_fild.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Field Warp Script +//= Juno Field Warp Script //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== @@ -7,13 +7,13 @@ //===== Compatible With: ===================================== //= rAthena Project; RO Episode 5+ //===== Description: ========================================= -//= Warp Points for Yuno Field +//= Warp Points for Juno Field //===== Additional Comments: ================================= -//= 1.1 - Updated for the new Yuno Fields +//= 1.1 - Updated for the new Juno Fields //= 1.2 New field update - Hugel Field by Sara - Version 1 //============================================================ -//= Yuno Field =============================================== +//= Juno Field =============================================== //yuno_fild01,286,368,0 warp yunfild01 1,1,yuno_fild02,294,26 //yuno_fild02,294,24,0 warp yunfild01-1 1,1,yuno_fild01,286,366 //yuno_fild01,70,378,0 warp yunfild02 1,1,yuno_fild02,70,25 @@ -28,7 +28,7 @@ yuno_fild04,375,150,0 warp yunfild05-1 1,1,yuno_fild03,22,155 yuno_fild04,231,288,0 warp yunfild-yun 1,1,yuno,158,17 yuno_fild03,32,139,0 warp yunfild-mag01 1,1,mag_dun01,126,68 -//= New Yuno Fields ========================================== +//= New Juno Fields ========================================== yuno_fild01,26,246,0 warp newjun01 1,1,yuno_fild12,373,239 yuno_fild12,375,239,0 warp newjun01a 1,1,yuno_fild01,28,246 yuno_fild12,23,338,0 warp newjun02 1,1,yuno_fild11,366,361 @@ -61,7 +61,7 @@ yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 -//= Al de Baran <-> Yuno Connection ========================== +//= Al de Baran <-> Juno Connection ========================== aldebaran,140,244,0 warp alde-yunfild 1,1,yuno_fild01,208,19 yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242 diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 55389f0250..52eab8c02b 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -175,7 +175,7 @@ geffen,132,38,3 script Bard#2 51,{ cutin "bard_eland01",2; mes "[Errende]"; mes "So, have you met Mr. Kitty?"; - mes "Ah, in Morroc? He has a chronic disease, but obviously doesn't"; + mes "Ah, in Morocc? He has a chronic disease, but obviously doesn't"; mes "seem to care about it."; mes "So what did he say?"; next; @@ -1046,7 +1046,7 @@ S_StorySong: mes "the Pub in Geffen."; next; mes "[Errende]"; - mes "Judging from his clothes, he must be from Morroc, which is a lot warmer. That's why he's got a Hood, even though it has no drawstrings, for the cooler weather over here."; + mes "Judging from his clothes, he must be from Morocc, which is a lot warmer. That's why he's got a Hood, even though it has no drawstrings, for the cooler weather over here."; next; mes "[Errende]"; mes "I must warn you, don't let him talk you into buying that Hood of his since he's selling it for an outrageous price. He's definitely not trustworthy."; @@ -1061,16 +1061,16 @@ S_StorySong: mes "It's tragic that he left his family behind in that way. But perhaps, it is more tragic that his spirit scares away anyone interested in those girls."; } else if (.@random == 2) { - mes "Okay, let me tell you a story about Morroc, city of the desert. Adventurers worth their salt are expected to have explored the city and its surrounding desert."; + mes "Okay, let me tell you a story about Morocc, city of the desert. Adventurers worth their salt are expected to have explored the city and its surrounding desert."; next; mes "[Errende]"; mes "The Sphinx and the Pyramids are especially popular areas of exploration for adventurers. Have you been there before? I haven't yet, but perhaps someday I'll go."; next; mes "[Errende]"; - mes "While I was in Morroc, I found a Merchant that sells Sword Maces to Priests and Priestess. Aside from those, Priests are prohibited from using any kind of weapon with blades."; + mes "While I was in Morocc, I found a Merchant that sells Sword Maces to Priests and Priestess. Aside from those, Priests are prohibited from using any kind of weapon with blades."; next; mes "[Errende]"; - mes "I also saw an energetic little boy who kept begging his father to tame a Munak for him. I heard the father speak a bit, and it seems that one of his friends from Morroc is lost in Alberta."; + mes "I also saw an energetic little boy who kept begging his father to tame a Munak for him. I heard the father speak a bit, and it seems that one of his friends from Morocc is lost in Alberta."; next; cutin "bard_eland02",2; mes "[Errende]"; @@ -1487,7 +1487,7 @@ morocc,134,111,3 script Bard#3 741,{ mes "Mmm, let me think..."; next; mes "[Kino Kitty]"; - mes "When you go venture Southwest from Morroc, you will arrive at Fortress Sandarman. Did you know that the fortress is built on a sand hill, which serves as a natural defense?"; + mes "When you go venture Southwest from Morocc, you will arrive at Fortress Sandarman. Did you know that the fortress is built on a sand hill, which serves as a natural defense?"; next; mes "[Kino Kitty]"; mes "When you go South of Sandarman, you will see Paros Lighthouse. East from the Lighthouse, you will see Kokomo Beach. North of the beach is Papuchica Forest."; @@ -1592,7 +1592,7 @@ morocc,134,111,3 script Bard#3 741,{ next; mes "^D43D1AI still remember the clear chimes"; mes "Of the Prontera Church Bells"; - mes "The ice cream we shared in Morroc,"; + mes "The ice cream we shared in Morocc,"; mes "Being chased by bats"; mes "In Payon dungeon.^000000"; next; @@ -1631,7 +1631,7 @@ morocc,134,111,3 script Bard#3 741,{ mes "Mmm, let me think..."; next; mes "[Kino Kitty]"; - mes "When you go venture Southwest from Morroc, you will arrive at Fortress Sandarman. Did you know that the fortress is built on a sand hill, which serves as a natural defense?"; + mes "When you go venture Southwest from Morocc, you will arrive at Fortress Sandarman. Did you know that the fortress is built on a sand hill, which serves as a natural defense?"; next; mes "[Kino Kitty]"; mes "When you go South of Sandarman, you will see Paros Lighthouse. East from the Lighthouse, you will see Kokomo Beach. North of the beach is Papuchica Forest."; @@ -2868,7 +2868,7 @@ yuno_in04,20,123,7 script Representative#bq 95,{ mes "Kino Kitty, Kino Kitty... Oh, here we are. He sent us a letter that says, 'I will stay in the desert until I find my real self.'"; next; mes "[Marlin Putiur]"; - mes "He doesn't seem healthy, but I guess he's still traveling. Trying seeking him out in Morroc, and give my regards to him if you get the chance."; + mes "He doesn't seem healthy, but I guess he's still traveling. Trying seeking him out in Morocc, and give my regards to him if you get the chance."; close; } else if (.@inputstr$ == "Gunther Doubleharmony") { diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 05aa9c15a9..fdc2a60d18 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -86,7 +86,7 @@ emotion ET_FRET; mes "[Charles Orleans]"; mes "Monsieur, why you look"; - mes "at me so? Is it the Morroc"; + mes "at me so? Is it the Morocc"; mes "silk shirt I am wearing, my"; mes "hair styled by Madam Veronica,"; mes "or my brand name muffler"; @@ -1057,7 +1057,7 @@ mes "sort of trouble. It makes me"; mes "me laugh whenever anyone"; mes "suggests that he is hiding"; - mes "in the Schwaltzvalt Republic..."; + mes "in the Schwarzwald Republic..."; next; emotion ET_GO; mes "[Charles Orleans]"; diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt index 7b67daf6ce..b042e9ed8d 100644 --- a/npc/quests/dandelion_request.txt +++ b/npc/quests/dandelion_request.txt @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= A Morroc quest that is no longer used. +//= A Morocc quest that is no longer used. //===== Additional Comments: ================================= //= 1.1 Fixed a small bug in Dandelion's Request. [SinSloth] //= 1.2 Moved Dandelion's Request to its own file. @@ -32,7 +32,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "There are rumors"; mes "going around about"; mes "the disappearances of"; - mes "children in the Morroc"; + mes "children in the Morocc"; mes "area. Some guilds believe"; mes "these are actually kidnappings."; next; @@ -57,7 +57,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ next; mes "[Guildsman]"; mes "Anyway, I don't know if you"; - mes "know this, but a lot of kids are missing from Morroc recently."; + mes "know this, but a lot of kids are missing from Morocc recently."; mes "We're not sure, but we think it's related to the latest assignment"; mes "for our Assassin Guild."; next; @@ -95,10 +95,10 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "big going on, and I think it's"; mes "the most important thing the"; mes "Swordman Association has ever"; - mes "been involved in. Pack your bags and head to Morroc right now!"; + mes "been involved in. Pack your bags and head to Morocc right now!"; next; mes "[" + strcharinfo(0) + "]"; - mes "All the way to Morroc...?"; + mes "All the way to Morocc...?"; mes "Why, what's going on?"; next; mes "[Guildsman]"; @@ -145,7 +145,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "Guild in any way befitting of"; mes "the Knighthood in a special"; mes "mission to rescue children"; - mes "missing from Morroc."; + mes "missing from Morocc."; mes "-- Captain Herman''"; next; mes "[Guildsman]"; @@ -207,7 +207,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "[Guildsman]"; mes "If you check out the"; mes "west side of the Oasis"; - mes "inside Morroc, you'll find"; + mes "inside Morocc, you'll find"; mes "a very suspicious looking"; mes "hut. Your contact from the"; mes "Assassin Guild is near there."; @@ -226,7 +226,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "you'll need to meet with your"; mes "contact from the Assassin"; mes "Guild near a hut at the west"; - mes "side of the Oasis inside Morroc. So keep an eye out for him."; + mes "side of the Oasis inside Morocc. So keep an eye out for him."; next; mes "[Guildsman]"; mes "I doubt you'll have"; @@ -244,7 +244,7 @@ izlude,103,106,3 script Guildsman#1 48,3,3,{ mes "the mission? That's great!"; mes "Now, you need to meet your"; mes "contact from the Assassin"; - mes "Guild outside a hut on the west side of the Oasis inside Morroc."; + mes "Guild outside a hut on the west side of the Oasis inside Morocc."; next; mes "[Guildsman]"; mes "I know those directions"; @@ -305,7 +305,7 @@ OnTouch: next; mes "[Guildsman]"; mes "Anyway, I don't know if you"; - mes "know this, but a lot of kids are missing from Morroc recently."; + mes "know this, but a lot of kids are missing from Morocc recently."; mes "We're not sure, but we think it's related to the latest assignment"; mes "for our Assassin Guild."; next; @@ -343,10 +343,10 @@ OnTouch: mes "big going on, and I think it's"; mes "the most important thing the"; mes "Swordman Association has ever"; - mes "been involved in. Pack your bags and head to Morroc right now!"; + mes "been involved in. Pack your bags and head to Morocc right now!"; next; mes "[" + strcharinfo(0) + "]"; - mes "All the way to Morroc...?"; + mes "All the way to Morocc...?"; mes "Why, what's going on?"; next; mes "[Guildsman]"; @@ -393,7 +393,7 @@ OnTouch: mes "Guild in any way befitting of"; mes "the Knighthood in a special"; mes "mission to rescue children"; - mes "missing from Morroc."; + mes "missing from Morocc."; mes "-- Captain Herman''"; next; mes "[Guildsman]"; @@ -499,7 +499,7 @@ prontera,237,313,3 script Nun#moc 79,3,3,{ mes "You may have heard that"; mes "there's been a recent influx"; mes "of missing child reports from"; - mes "Morroc. Apparently, someone"; + mes "Morocc. Apparently, someone"; mes "has hired the Assassin Guild"; mes "to investigate these cases."; next; @@ -519,7 +519,7 @@ prontera,237,313,3 script Nun#moc 79,3,3,{ mes "client can be trusted."; next; mes "[Nun]"; - mes "Please visit Morroc"; + mes "Please visit Morocc"; mes "as soon as you can."; mes "When you arrive, you"; mes "will need the Bishop's"; @@ -536,7 +536,7 @@ prontera,237,313,3 script Nun#moc 79,3,3,{ mes "will need to meet your contact"; mes "from the Assassin Guild near"; mes "a hut on the west side of the"; - mes "Oasis inside Morroc. I wonder"; + mes "Oasis inside Morocc. I wonder"; mes "why they chose that location?"; next; mes "[Nun]"; @@ -605,7 +605,7 @@ OnTouch: mes "You may have heard that"; mes "there's been a recent influx"; mes "of missing child reports from"; - mes "Morroc. Apparently, someone"; + mes "Morocc. Apparently, someone"; mes "has hired the Assassin Guild"; mes "to investigate these cases."; next; @@ -625,7 +625,7 @@ OnTouch: mes "client can be trusted."; next; mes "[Nun]"; - mes "Please visit Morroc"; + mes "Please visit Morocc"; mes "as soon as you can."; mes "When you arrive, you"; mes "will need the Bishop's"; @@ -656,7 +656,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "[Guildsman]"; mes "Say, have you heard"; mes "what's happening in"; - mes "Morroc recently? There's"; + mes "Morocc recently? There's"; mes "something major going on..."; close; } @@ -759,7 +759,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "I think they're working for"; mes "a client, investigating these"; mes "children that are missing"; - mes "from Morroc. If you want to"; + mes "from Morocc. If you want to"; mes "help them, you'll need this"; mes "letter of recommendation, okay?"; set mao_request,1; @@ -774,14 +774,14 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "ran into you. I know this is"; mes "sudden, but the Blacksmith"; mes "Guild has an assignment"; - mes "for you over in Morroc."; + mes "for you over in Morocc."; next; mes "[Guildsman]"; mes "You see, the Assassin Guild"; mes "has formally requested for our"; mes "help in a mission regarding"; mes "children that have been missing"; - mes "from Morroc recently. Here, take this letter of recommendation..."; + mes "from Morocc recently. Here, take this letter of recommendation..."; next; mes "[Guildsman]"; mes "If the Assassin Guild"; @@ -809,7 +809,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "officially asked our guild"; mes "for help in a mission regarding"; mes "children that have been missing"; - mes "from Morroc, and they want us"; + mes "from Morocc, and they want us"; mes "to send somebody... you!"; next; mes "[Guildsman]"; @@ -823,7 +823,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "[Guildsman]"; mes "Here, take this letter of"; mes "recommendation with you and"; - mes "head over to Morroc as soon"; + mes "head over to Morocc as soon"; mes "as you can. If even the Assassin Guild needs help, I'm sure that"; mes "spells really big trouble..."; set mao_request,1; @@ -845,7 +845,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ next; mes "[Guildsman]"; mes "^71637DYou know the oasis inside"; - mes "Morroc? To the west of that,"; + mes "Morocc? To the west of that,"; mes "you'll find your contact from"; mes "the Assassin Guild.^000000"; mes " "; @@ -868,7 +868,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "the Assassin Guild? Great!"; mes "You can meet your contact"; mes "on the west side of the oasis,"; - mes "next to a hut, inside Morroc."; + mes "next to a hut, inside Morocc."; next; mes "[Guildsman]"; mes "Hey, good luck and"; @@ -887,7 +887,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "behalf of the Blacksmiths?"; mes "Then please meet your contact"; mes "at the west side of the Oasis"; - mes "inside Morroc. Good luck~"; + mes "inside Morocc. Good luck~"; close; } else if((Class == Job_Alchemist) || (Class == Job_Creator)) @@ -898,7 +898,7 @@ alberta,129,59,3 script Guildsman#2 49,3,3,{ mes "from the Assassin Guild"; mes "will be waiting for you"; mes "at the west side of the"; - mes "Oasis inside Morroc."; + mes "Oasis inside Morocc."; next; mes "[Guildsman]"; mes "Please help the"; @@ -1099,7 +1099,7 @@ OnTouch: mes "I think they're working for"; mes "a client, investigating these"; mes "children that are missing"; - mes "from Morroc. If you want to"; + mes "from Morocc. If you want to"; mes "help them, you'll need this"; mes "letter of recommendation, okay?"; set mao_request,1; @@ -1114,14 +1114,14 @@ OnTouch: mes "ran into you. I know this is"; mes "sudden, but the Blacksmith"; mes "Guild has an assignment"; - mes "for you over in Morroc."; + mes "for you over in Morocc."; next; mes "[Guildsman]"; mes "You see, the Assassin Guild"; mes "has formally requested for our"; mes "help in a mission regarding"; mes "children that have been missing"; - mes "from Morroc recently. Here, take this letter of recommendation..."; + mes "from Morocc recently. Here, take this letter of recommendation..."; next; mes "[Guildsman]"; mes "If the Assassin Guild"; @@ -1149,7 +1149,7 @@ OnTouch: mes "officially asked our guild"; mes "for help in a mission regarding"; mes "children that have been missing"; - mes "from Morroc, and they want us"; + mes "from Morocc, and they want us"; mes "to send somebody... you!"; next; mes "[Guildsman]"; @@ -1163,7 +1163,7 @@ OnTouch: mes "[Guildsman]"; mes "Here, take this letter of"; mes "recommendation with you and"; - mes "head over to Morroc as soon"; + mes "head over to Morocc as soon"; mes "as you can. If even the Assassin Guild needs help, I'm sure that"; mes "spells really big trouble..."; set mao_request,1; @@ -1243,7 +1243,7 @@ geffen,123,109,3 script Academy Staff 742,3,3,{ mes "[Academy Staff]"; mes "Have you decided to help"; mes "the Assassin Guild? Then"; - mes "please, head to Morroc and"; + mes "please, head to Morocc and"; mes "meet your contact that will"; mes "be waiting for you west of"; mes "the Oasis inside of the city."; @@ -1484,7 +1484,7 @@ morocc,155,56,3 script Miya 93,3,3,{ { mes "[Miya]"; mes "Look west of the Oasis"; - mes "here in Morroc to find Jack,"; + mes "here in Morocc to find Jack,"; mes "who will let you go inside the"; mes "pub. Our guildmaster will be"; mes "waiting for you inside..."; @@ -1640,7 +1640,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "[Guildsman]"; mes "Please be careful if you're"; mes "planning to travel through"; - mes "Morroc. Recently, there have"; + mes "Morocc. Recently, there have"; mes "been reports of missing"; mes "children there..."; close; @@ -1679,7 +1679,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "If you are interested in"; mes "assisting them, please take"; mes "this Letter of Recommendation"; - mes "and bring it to the contact from the Assassin Guild in Morroc."; + mes "and bring it to the contact from the Assassin Guild in Morocc."; set mao_request,1; getitem 7416,1; next; @@ -1687,7 +1687,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "You can meet the"; mes "Assassin Guildsman near"; mes "some hut on the west side"; - mes "of the Oasis inside Morroc."; + mes "of the Oasis inside Morocc."; mes "Good luck, my friend, and please represent Taekwon Do with pride."; close; } @@ -1713,7 +1713,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "letter of recommendation"; mes "and meet with our Asssasin"; mes "Guild contact to the west"; - mes "of the Oasis in Morroc."; + mes "of the Oasis in Morocc."; mes "Well, good luck, pal~"; set mao_request,1; getitem 7416,1; @@ -1750,7 +1750,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "Just... Just meet with the"; mes "contact from the Assassin"; mes "Guild just west of the Oasis"; - mes "inside Morroc. I'm sure he"; + mes "inside Morocc. I'm sure he"; mes "can explain everything better."; close; } @@ -1792,7 +1792,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "For now, your cooperation"; mes "with the Assassin Guild is"; mes "probably your biggest priority."; - mes "Head over to Morroc and look"; + mes "Head over to Morocc and look"; mes "for your contact to the west"; mes "of the Oasis inside town."; next; @@ -1814,7 +1814,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "You can meet the"; mes "Assassin Guildsman near"; mes "some hut on the west side"; - mes "of the Oasis inside Morroc."; + mes "of the Oasis inside Morocc."; mes "Good luck, my friend, and please represent Taekwon Do with pride."; close; } @@ -1825,7 +1825,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "letter of recommendation"; mes "and meet with our Asssasin"; mes "Guild contact to the west"; - mes "of the Oasis in Morroc."; + mes "of the Oasis in Morocc."; mes "Well, good luck, pal~"; close; } @@ -1835,7 +1835,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "Just... Just meet with the"; mes "contact from the Assassin"; mes "Guild just west of the Oasis"; - mes "inside Morroc. I'm sure he"; + mes "inside Morocc. I'm sure he"; mes "can explain everything better."; close; } @@ -1845,7 +1845,7 @@ payon,231,323,3 script Guildsman#3 59,3,3,{ mes "For now, your cooperation"; mes "with the Assassin Guild is"; mes "probably your biggest priority."; - mes "Head over to Morroc and look"; + mes "Head over to Morocc and look"; mes "for your contact to the west"; mes "of the Oasis inside town."; next; @@ -1952,7 +1952,7 @@ OnTouch: mes "If you are interested in"; mes "assisting them, please take"; mes "this Letter of Recommendation"; - mes "and bring it to the contact from the Assassin Guild in Morroc."; + mes "and bring it to the contact from the Assassin Guild in Morocc."; set mao_request,1; getitem 7416,1; next; @@ -1960,7 +1960,7 @@ OnTouch: mes "You can meet the"; mes "Assassin Guildsman near"; mes "some hut on the west side"; - mes "of the Oasis inside Morroc."; + mes "of the Oasis inside Morocc."; mes "Good luck, my friend, and please represent Taekwon Do with pride."; close; } @@ -1986,7 +1986,7 @@ OnTouch: mes "letter of recommendation"; mes "and meet with our Asssasin"; mes "Guild contact to the west"; - mes "of the Oasis in Morroc."; + mes "of the Oasis in Morocc."; mes "Well, good luck, pal~"; set mao_request,1; getitem 7416,1; @@ -2023,7 +2023,7 @@ OnTouch: mes "Just... Just meet with the"; mes "contact from the Assassin"; mes "Guild just west of the Oasis"; - mes "inside Morroc. I'm sure he"; + mes "inside Morocc. I'm sure he"; mes "can explain everything better."; close; } @@ -2065,7 +2065,7 @@ OnTouch: mes "For now, your cooperation"; mes "with the Assassin Guild is"; mes "probably your biggest priority."; - mes "Head over to Morroc and look"; + mes "Head over to Morocc and look"; mes "for your contact to the west"; mes "of the Oasis inside town."; next; @@ -3014,7 +3014,7 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "The Assassin Guild agreed to"; mes "perform two missions that are"; mes "supposed to be related to the"; - mes "missing children in Morroc."; + mes "missing children in Morocc."; mes "You must choose one mission"; mes "in which you will participate."; next; @@ -3183,7 +3183,7 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "[" + strcharinfo(0) + "]"; mes "W-wait; a minute..."; mes "Are you saying we stopped"; - mes "Satan Morroc's revival, but"; + mes "Satan Morocc's revival, but"; mes "Raiyan Moore escaped?"; next; mes "[Lin]"; @@ -3264,13 +3264,13 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "I must say that you"; mes "did a good job. We"; mes "didn't save the children,"; - mes "but we stopped Satan Morroc."; + mes "but we stopped Satan Morocc."; } else { mes "We failed our original"; mes "objective to save those kids,"; - mes "but we did stop Satan Morroc."; + mes "but we did stop Satan Morocc."; mes "You did a good job, and we'll"; mes "notify your guild of your good"; mes "work. Thanks for your help."; @@ -3325,7 +3325,7 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "damned bastard. Everything"; mes "that Raiyan Moore wanted us"; mes "to do was for the sake of"; - mes "Satan Morroc's reincarnation."; + mes "Satan Morocc's reincarnation."; mes "He almost got away with it..."; cutin "mocseal_rin01.bmp",2; next; @@ -3352,7 +3352,7 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "be blaming ourselves or "; mes "each other. For now, we can"; mes "be satisfied with preventing"; - mes "Satan Morroc's revival, and"; + mes "Satan Morocc's revival, and"; mes "then focus on Raiyan Moore."; cutin "mocseal_kid01.bmp",255; next; @@ -3463,7 +3463,7 @@ que_job01,16,21,5 script Valdes#1 55,{ mes "Guild. Your aid will"; mes "always be welcome here."; mes "If it weren't for you, then"; - mes "Satan Morroc would have..."; + mes "Satan Morocc would have..."; } close2; } @@ -3660,7 +3660,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "research, and may provide"; mes "clues to finding those children"; mes "that have been missing from"; - mes "Morroc. Please retrieve them!"; + mes "Morocc. Please retrieve them!"; cutin "mocseal_dan01.bmp",0; next; mes "[Lin]"; @@ -3831,7 +3831,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "[Lin]"; mes "I guess we should do as"; mes "Mr. R asks. Go ahead and"; - mes "check the field west of Morroc"; + mes "check the field west of Morocc"; mes "for one of those artifacts or"; mes "crests, and I'll remain here"; mes "to guard Mr. R, just in case."; @@ -3868,7 +3868,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ next; mes "[Lin]"; mes "There's all this mention"; - mes "of Morroc, Morroc Satan,"; + mes "of Morocc, Morocc Satan,"; mes "and Thanatos Tower... How"; mes "is this all connected to the"; mes "missing children? If you ask"; @@ -3877,7 +3877,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "[Lin]"; mes "Hey, I want you to find out"; mes "what you can from our local"; - mes "historian in Morroc about Morroc Satan and all that. There's"; + mes "historian in Morocc about Morocc Satan and all that. There's"; mes "too much we don't know, and"; mes "I don't wanna take chances."; set mao_request,116; @@ -3945,7 +3945,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "^A9A9A9THE^000000 came back because you"; mes "^A9A9A9HISTORIAN^000000 forgot something. "; mes "Now hurry ^A9A9A9IN^000000 up, we're going to"; - mes "need ^A9A9A9MORROC^000000 snacks ^A9A9A9NOW^000000 soon."; + mes "need ^A9A9A9Morocc^000000 snacks ^A9A9A9NOW^000000 soon."; close2; } else if(mao_request == 117) @@ -4004,15 +4004,15 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "[R. Moore]"; mes "I think it's possible that the"; mes "missing children were kidnapped"; - mes "to revive an ancient evil, Satan Morroc. I believe we can learn"; + mes "to revive an ancient evil, Satan Morocc. I believe we can learn"; mes "more about the kidnappers by"; - mes "learning about Satan Morroc."; + mes "learning about Satan Morocc."; next; mes "[R. Moore]"; mes "I know this all sounds"; mes "crazy, but please trust me."; mes "Thanatos Tower is somehow"; - mes "related to Satan Morroc, so"; + mes "related to Satan Morocc, so"; mes "if you could tell me what"; mes "you can learn from there..."; next; @@ -4046,9 +4046,9 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "First, those men that"; mes "attacked you. Are they"; mes "trying to revive Satan"; - mes "Morroc? And those crests..."; + mes "Morocc? And those crests..."; mes "Were they built to break Satan"; - mes "Morroc's seal or protect it?"; + mes "Morocc's seal or protect it?"; next; cutin "mocseal_dan01.bmp",1; mes "[R. Moore]"; @@ -4056,27 +4056,27 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "idea what they could want."; mes "As for the elemental crests,"; mes "they were originally built by"; - mes "a madman to revive Satan Morroc. "; + mes "a madman to revive Satan Morocc. "; next; mes "[R. Moore]"; mes "However, once that crazed"; mes "man's plot was discovered,"; mes "the crests were modified to"; mes "further shield the seal that"; - mes "contains Satan Morroc."; + mes "contains Satan Morocc."; next; mes "[R. Moore]"; mes "But as a historian..."; mes "These stories about Satan"; - mes "Morroc and seals are just"; + mes "Morocc and seals are just"; mes "conjecture. I need concrete"; mes "proof that the threat of"; - mes "Satan Morroc truly exists."; + mes "Satan Morocc truly exists."; next; mes "[R. Moore]"; mes "If I can obtain that,"; mes "people would be able to"; - mes "take Satan Morroc's threat"; + mes "take Satan Morocc's threat"; mes "more seriously. And Thanatos Tower wouldn't be a tourist area."; next; mes "[R. Moore]"; @@ -4084,7 +4084,7 @@ que_job01,84,17,3 script Lin#2-1 885,{ mes "go to Thanatos Tower and"; mes "try to find some sort of solid"; mes "historical record that proves"; - mes "that Satan Morroc really"; + mes "that Satan Morocc really"; mes "existed in our world."; set mao_request,120; close2; @@ -4269,14 +4269,14 @@ que_job01,79,15,1 script R 880,{ mes "[R. Moore]"; mes "There are four crests"; mes "hidden in four different"; - mes "directions around Morroc"; + mes "directions around Morocc"; mes "which regulate the power"; mes "of the Water, Wind, Earth"; mes "and Fire elements in the area."; next; mes "[R. Moore]"; mes "The stability of these"; - mes "elements in Morroc is in"; + mes "elements in Morocc is in"; mes "currently in question, so"; mes "I want you to ^4D4DFFuse enchanted"; mes "stones^000000 to strengthen the power"; @@ -4303,7 +4303,7 @@ que_job01,79,15,1 script R 880,{ mes "Regardless, those men"; mes "attacked me because they"; mes "did not want me to repair"; - mes "Morroc's elemental equilibrium."; + mes "Morocc's elemental equilibrium."; mes "At least, that's what I believe."; set mao_request,109; next; @@ -4319,7 +4319,7 @@ que_job01,79,15,1 script R 880,{ cutin "mocseal_dan01.bmp",0; mes "[R. Moore]"; mes "Why don't you search West"; - mes "Morroc first for one of the"; + mes "Morocc first for one of the"; mes "elemental artifacts since it"; mes "is closer? It should be where"; mes "the pyramids are located."; @@ -4346,7 +4346,7 @@ que_job01,79,15,1 script R 880,{ mes "You should be able to find"; mes "the element regulation device"; mes "behind one of the pyramids in"; - mes "the field west of Morroc. Please"; + mes "the field west of Morocc. Please"; mes "use an enchanted stone to"; mes "boost the crest's power."; close2; @@ -4387,7 +4387,7 @@ que_job01,79,15,1 script R 880,{ mes "Well, I guess I'll go out"; mes "and try to activate those"; mes "other elemental crests"; - mes "just outside of Morroc."; + mes "just outside of Morocc."; close2; } else if(mao_request > 112 && mao_request < 115) @@ -4503,15 +4503,15 @@ que_job01,79,15,1 script R 880,{ mes "[R. Moore]"; mes "I think it's possible that the"; mes "missing children were kidnapped"; - mes "to revive an ancient evil, Satan Morroc. I believe we can learn"; + mes "to revive an ancient evil, Satan Morocc. I believe we can learn"; mes "more about the kidnappers by"; - mes "learning about Satan Morroc."; + mes "learning about Satan Morocc."; next; mes "[R. Moore]"; mes "I know this all sounds"; mes "crazy, but please trust me."; mes "Thanatos Tower is somehow"; - mes "related to Satan Morroc, so"; + mes "related to Satan Morocc, so"; mes "if you could tell me what"; mes "you can learn from there..."; next; @@ -4543,7 +4543,7 @@ que_job01,79,15,1 script R 880,{ mes "go to Thanatos Tower and"; mes "try to find some sort of solid"; mes "historical record that proves"; - mes "that Satan Morroc really"; + mes "that Satan Morocc really"; mes "existed in our world."; close2; } @@ -4684,7 +4684,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[Dandelion Member]"; mes "Let me go, I can feel"; mes "something happening in"; - mes "Morroc Castle! We have"; + mes "Morocc Castle! We have"; mes "to go over there right now!"; close2; } @@ -4785,7 +4785,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "Anyway, back to the task at"; mes "hand. All we know is that our"; mes "target was last seen checking"; - mes "out the Morroc ruins. Now, I think that we should begin our search "; + mes "out the Morocc ruins. Now, I think that we should begin our search "; mes "by visiting the Juno Library."; next; switch( select( "Why should we go there?","Right, I understand!" ) ) @@ -4795,7 +4795,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "Our target, Raiyan Moore"; mes "is a scholar, an academic."; mes "If he was researching the"; - mes "Morroc Ruins, there's a good"; + mes "Morocc Ruins, there's a good"; mes "chance that he went to the"; mes "Juno Library beforehand."; next; @@ -4843,7 +4843,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[Kidd]"; mes "Hey you, Dandelion guy,"; mes "you know why these four"; - mes "directions in Morroc are"; + mes "directions in Morocc are"; mes "so important to Moore?"; mes "He wrote something about"; mes "it in his research journal."; @@ -4853,7 +4853,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "Hm? No, not really."; mes "In fact, it's even more"; mes "baffling. What could be"; - mes "here in Morroc, and how"; + mes "here in Morocc, and how"; mes "can it possibly relate"; mes "to the missing children?"; next; @@ -4872,22 +4872,22 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "So..."; mes "How should we go"; mes "about investigating the"; - mes "four directions in Morroc?"; + mes "four directions in Morocc?"; next; cutin "mocseal_kid01.bmp",2; mes "[Kidd]"; mes "Hmm... Why don't we try"; mes "this? I'll check the south"; - mes "part of Morroc for anything"; + mes "part of Morocc for anything"; mes "out of the ordinary, while you"; - mes "check the west part of Morroc."; + mes "check the west part of Morocc."; next; mes "[Kidd]"; mes "Since Moore was performing"; mes "historical research, it would"; mes "probably be best for you to"; mes "investigate the pyramids west"; - mes "of Morroc. If you happen to find anything, then meet me back here."; + mes "of Morocc. If you happen to find anything, then meet me back here."; set mao_request,10; next; cutin "mocseal_dan01.bmp",0; @@ -4904,7 +4904,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ cutin "mocseal_kid01.bmp",2; mes "[Kidd]"; mes "For now, investigate"; - mes "the west part of Morroc"; + mes "the west part of Morocc"; mes "where the pyramids are"; mes "located. If you find anything"; mes "that may interest Moore, come"; @@ -4918,16 +4918,16 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "Ah, you've returned."; mes "I found some sort of"; mes "elemental crest over in"; - mes "the south part of Morroc."; + mes "the south part of Morocc."; mes "It was full of Earth magic..."; next; mes "[" + strcharinfo(0) + "]"; mes "Really? I actually found the"; mes "Wind elemental crest west"; - mes "of Morroc. Do you think this"; + mes "of Morocc. Do you think this"; mes "means that there's elemental"; mes "crests in the fields north and"; - mes "east of Morroc as well?"; + mes "east of Morocc as well?"; next; cutin "mocseal_kid01.bmp",2; mes "[Kidd]"; @@ -4936,7 +4936,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "in those elemental crests. Now,"; mes "from what we read in Moore's"; mes "research, the four directions"; - mes "in Morroc have to be balanced."; + mes "in Morocc have to be balanced."; next; cutin "mocseal_dan01.bmp",0; mes "[Dandelion Member]"; @@ -4953,11 +4953,11 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "unstable when I found it."; mes "For now, go and stabilize"; mes "all four elemental crests"; - mes "located just outside of Morroc."; + mes "located just outside of Morocc."; next; mes "[Kidd]"; mes "While you're doing that,"; - mes "I'm going to visit Morroc's"; + mes "I'm going to visit Morocc's"; mes "local historian and see what"; mes "I can learn about those crests"; mes "and Raiyan Moore's intentions."; @@ -4980,7 +4980,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "types of those elemental"; mes "stones. Anyway, you already"; mes "know where the west crest is."; - mes "The south crest is in the lowest part of the field south of Morroc."; + mes "The south crest is in the lowest part of the field south of Morocc."; next; mes "[Kidd]"; mes "As for the north and east"; @@ -5096,9 +5096,9 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[Kidd]"; mes "You should be able to"; mes "find our local historian in"; - mes "the Morroc Inn. If you can, ask"; + mes "the Morocc Inn. If you can, ask"; mes "him about the crests around"; - mes "Morroc and their importance."; + mes "Morocc and their importance."; next; mes "[Kidd]"; mes "We need to gather as"; @@ -5174,15 +5174,15 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[" + strcharinfo(0) + "]"; mes "Well, those elemental crests"; mes "are supposed to protect some"; - mes "seal beneath Morroc Castle"; + mes "seal beneath Morocc Castle"; mes "that keeps this monster, Satan"; - mes "Morroc, from invading our world. It might be just a legend, but..."; + mes "Morocc, from invading our world. It might be just a legend, but..."; next; mes "[" + strcharinfo(0) + "]"; mes "The assistant told me that"; mes "Thanatos Tower was actually"; mes "a place originally used by"; - mes "Satan Morroc to summon his"; + mes "Satan Morocc to summon his"; mes "minions. Now, demons or angels"; mes "or whatever inhabit that tower."; next; @@ -5195,7 +5195,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[" + strcharinfo(0) + "]"; mes "Well... Let's say that"; mes "Raiyan Moore's goal is to"; - mes "revive Satan Morroc, if it"; + mes "revive Satan Morocc, if it"; mes "truly exists. It might be"; mes "possible to do that by"; mes "offering a blood sacrifice."; @@ -5215,7 +5215,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "You know... I've been"; mes "thinking about what we"; mes "should do next. If Satan"; - mes "Morroc really exists, then"; + mes "Morocc really exists, then"; mes "that would be a worldwide"; mes "catastrophe, right?"; next; @@ -5230,9 +5230,9 @@ que_job01,91,83,3 script Kidd#hall 884,{ cutin "mocseal_dan01.bmp",0; mes "[Dandelion Member]"; mes "There are those seals"; - mes "around Morroc, but we're"; + mes "around Morocc, but we're"; mes "not sure if they help keep"; - mes "Satan Morroc sealed, or if"; + mes "Satan Morocc sealed, or if"; mes "their magic makes it easier for humans to live in that desert."; next; cutin "mocseal_kid01.bmp",2; @@ -5242,7 +5242,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "to Thanatos Tower and see if"; mes "you can find those kids, Raiyan"; mes "Moore, or concrete proof of"; - mes "Satan Morroc's existence."; + mes "Satan Morocc's existence."; set mao_request,22; next; mes "[Kidd]"; @@ -5260,7 +5260,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "So how's the investigation of"; mes "Thanatos Tower coming along?"; mes "Did you learn anything about"; - mes "Raiyan Moore or Satan Morroc?"; + mes "Raiyan Moore or Satan Morocc?"; next; switch( select( "Yes, I did.","No, not yet..." ) ) { @@ -5269,10 +5269,10 @@ que_job01,91,83,3 script Kidd#hall 884,{ { mes "[" + strcharinfo(0) + "]"; mes "Well, I found some old log"; - mes "entries about Satan Morroc."; + mes "entries about Satan Morocc."; mes "They pretty much confirm that"; - mes "Satan Morroc is real, and that"; - mes "it's sealed under Morroc Castle. "; + mes "Satan Morocc is real, and that"; + mes "it's sealed under Morocc Castle. "; next; mes "["+ strcharinfo(0) +"]"; mes "The Rekenber Corporation"; @@ -5284,7 +5284,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ cutin "mocseal_kid01.bmp",2; mes "[Kidd]"; mes "So it's true..."; - mes "Satan Morroc does exist."; + mes "Satan Morocc does exist."; mes "If Raiyan Moore kidnapped"; mes "those children, then he must"; mes "be planning to sacrifice them"; @@ -5315,7 +5315,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "[Kidd]"; mes "Hmm... Your investigation"; mes "wasn't thorough enough. You"; - mes "need to find concrete proof about Satan Morroc's existence or Raiyan"; + mes "need to find concrete proof about Satan Morocc's existence or Raiyan"; mes "Moore's intentions. Hurry back to Thanatos Tower and find it!"; close2; } @@ -5357,7 +5357,7 @@ que_job01,91,83,3 script Kidd#hall 884,{ mes "This is bad... Not only"; mes "are the missing children in"; mes "danger, but if Raiyan may even"; - mes "revive Satan Morroc. We cannot"; + mes "revive Satan Morocc. We cannot"; mes "allow that to happen at any cost."; next; cutin "mocseal_kid01.bmp",2; @@ -5469,10 +5469,10 @@ que_job01,91,83,3 script Kidd#hall 884,{ cutin "mocseal_kid01.bmp",2; mes "[Kidd]"; mes "Something huge is going"; - mes "on at Morroc Castle. If that's"; - mes "where Satan Morroc is sealed,"; + mes "on at Morocc Castle. If that's"; + mes "where Satan Morocc is sealed,"; mes "then the demon is beginning"; - mes "to revive. We gotta stop it before Satan Morroc can enter our world!"; + mes "to revive. We gotta stop it before Satan Morocc can enter our world!"; close2; } else if(mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127) @@ -5549,7 +5549,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "[Dandelion Member]"; mes "Let me go, I can feel"; mes "something happening in"; - mes "Morroc Castle! We have"; + mes "Morocc Castle! We have"; mes "to go over there right now!"; close2; } @@ -5663,7 +5663,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "All we know is that"; mes "Raiyan Moore has last"; mes "been spotted investigating"; - mes "the ruins around Morroc."; + mes "the ruins around Morocc."; mes "For now, I suggest that you plan your next action with Kidd."; next; mes "^3355FFThe representative from"; @@ -5705,7 +5705,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "Raiyan seems to have"; mes "been conducting some very"; mes "peculiar research. What could"; - mes "the meaning of ''Morroc's four"; + mes "the meaning of ''Morocc's four"; mes "directions'' be? How can it"; mes "possibly be of significance?"; close2; @@ -5716,9 +5716,9 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "[Dandelion Member]"; mes "So you're really going to"; mes "check the four directions"; - mes "in Morroc... What could"; + mes "in Morocc... What could"; mes "possibly interest Raiyan"; - mes "Moore in Morroc? Perhaps"; + mes "Moore in Morocc? Perhaps"; mes "he is not just a kidnapper..."; close2; } @@ -5741,7 +5741,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "I don't understand what"; mes "could be so important about"; mes "these elemental crest devices"; - mes "hidden in Morroc. What could"; + mes "hidden in Morocc. What could"; mes "Raiyan Moore be planning...?"; close2; } @@ -5783,7 +5783,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ { cutin "mocseal_dan01.bmp",0; mes "[Dandelion Member]"; - mes "Now why would Morroc's"; + mes "Now why would Morocc's"; mes "local historian refuse to see"; mes "Kidd? Maybe he didn't fully"; mes "understand the importance"; @@ -5873,7 +5873,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "[Dandelion Member]"; mes "Raiyan Moore..."; mes "The missing children..."; - mes "Satan Morroc and Thanatos"; + mes "Satan Morocc and Thanatos"; mes "Tower. They couldn't all be"; mes "connected somehow, can they?"; close2; @@ -5908,7 +5908,7 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "[Dandelion Member]"; mes "Raiyan Moore kidnapped"; mes "the children to revive Satan"; - mes "Morroc, and had the nerve"; + mes "Morocc, and had the nerve"; mes "to hire the Assassin Guild"; mes "to protect him?! He's truly"; mes "a devious mastermind..."; @@ -5946,9 +5946,9 @@ que_job01,89,85,5 script Dandelion Member 880,{ mes "This is bad news..."; mes "It looks like Raiyan Moore"; mes "is performing the ritual to"; - mes "revive Satan Morroc. We need"; - mes "to go to Morroc Castle, where"; - mes "Satan Morroc is sealed..."; + mes "revive Satan Morocc. We need"; + mes "to go to Morocc Castle, where"; + mes "Satan Morocc is sealed..."; close2; } else if(mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127) @@ -6240,11 +6240,11 @@ yuno_in04,180,106,3 script Reading Girl 73,{ mes "Maybe this'll tell me about"; mes "Mr. R. Moore's research..."; next; - mes "^4d4dffSatan Morroc appeared,"; + mes "^4d4dffSatan Morocc appeared,"; mes "turning the world into a"; mes "living hell. Somehow, the"; mes "monster was sealed, and a"; - mes "castle and town was built over^FFFFFF ^4d4dff its prison. This place is Morroc."; + mes "castle and town was built over^FFFFFF ^4d4dff its prison. This place is Morocc."; next; mes "[" + strcharinfo(0) + "]"; mes "Whoa, that's actually"; @@ -6337,7 +6337,7 @@ yuno_in04,175,129,0 script Workbook#mao 111,{ mes "this paper from Moore's desk."; next; mes "[" + strcharinfo(0) + "]"; - mes "...Morroc..."; + mes "...Morocc..."; mes "Were summoned..."; mes "Through the tower...?"; mes "This handwriting is so"; @@ -6348,8 +6348,8 @@ yuno_in04,175,129,0 script Workbook#mao 111,{ mes "Uhhh... Tower..."; mes "Prontera... Impact created..."; mes "Desert? Must... four directions"; - mes "in Morroc... Oh! Balance the"; - mes "four directions in Morroc"; + mes "in Morocc... Oh! Balance the"; + mes "four directions in Morocc"; mes "to prevent a great evil."; next; mes "[Kidd]"; @@ -6357,14 +6357,14 @@ yuno_in04,175,129,0 script Workbook#mao 111,{ mes "spent the time to write that"; mes "part clearly, then he must be"; mes "planning to investigate the"; - mes "four directions in Morroc."; + mes "four directions in Morocc."; next; mes "[Kidd]"; mes "I'm not sure what it"; mes "could all mean, but I'm"; mes "gonna bring this part of"; mes "his journal with me. I'll"; - mes "meet you back in Morroc."; + mes "meet you back in Morocc."; set mao_request,8; close2; cutin "mocseal_kid01.bmp",255; @@ -6506,14 +6506,14 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "the historian guy, and he"; mes "got a little intimidated. Now"; mes "he's holed up somewhere"; - mes "in the Morroc Inn, and I don't"; + mes "in the Morocc Inn, and I don't"; mes "think he's seeing anybody."; next; mes "[Lin]"; - mes "I want you to find Morroc's"; + mes "I want you to find Morocc's"; mes "historian and find out what"; - mes "you can about Satan Morroc,"; - mes "Morroc, and Thanatos Tower."; + mes "you can about Satan Morocc,"; + mes "Morocc, and Thanatos Tower."; mes "We need to know how they're"; mes "linked to the missing kids."; next; @@ -6526,7 +6526,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "Great, thanks a lot."; mes "Okay then, I'll see"; mes "you later. Remember,"; - mes "the Morroc Inn, alright?"; + mes "the Morocc Inn, alright?"; set mao_request,116; close2; cutin "mocseal_rin01.bmp",255; @@ -6556,7 +6556,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ next; mes "["+ strcharinfo(0) +"]"; mes "Thanatos Tower was used"; - mes "by Morroc Satan to summon"; + mes "by Morocc Satan to summon"; mes "his own monsters into our"; mes "world. Now, it's being rebuilt,"; mes "even though it houses these"; @@ -6571,7 +6571,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "did you manage to learn?"; next; mes "[" + strcharinfo(0) + "]"; - mes "Well, Satan Morroc, if it"; + mes "Well, Satan Morocc, if it"; mes "exists, might be able to"; mes "come back into our world"; mes "if the seal is broken by"; @@ -6581,7 +6581,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "That... That sounds"; mes "really bad, especially"; mes "with all of those children"; - mes "missing from Morroc lately."; + mes "missing from Morocc lately."; mes "What'll be our next move?"; mes "I guess we'll talk to Mr. R."; set mao_request,118; @@ -6608,10 +6608,10 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ next; mes "[" + strcharinfo(0) + "]"; mes "Well, I found some old log"; - mes "entries about Satan Morroc."; + mes "entries about Satan Morocc."; mes "They pretty much confirm that"; - mes "Satan Morroc is real, and that"; - mes "it's sealed under Morroc Castle. "; + mes "Satan Morocc is real, and that"; + mes "it's sealed under Morocc Castle. "; next; mes "["+ strcharinfo(0) +"]"; mes "The Rekenber Corporation"; @@ -6624,13 +6624,13 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "Why would they want to do"; mes "something crazy like that?"; mes "If Mr. R is really preventing"; - mes "Morroc Satan's return, then"; + mes "Morocc Satan's return, then"; mes "his attackers must want"; - mes "to revive Morroc Satan..."; + mes "to revive Morocc Satan..."; next; mes "[Lin]"; mes "But if he's lying, and"; - mes "he's trying to bring Morroc"; + mes "he's trying to bring Morocc"; mes "Satan into our world, then"; mes "he's wanted by the Dandelion"; mes "group... meaning, he may be"; @@ -6649,7 +6649,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{ mes "both of these missions?!"; mes "In the worst case scenario,"; mes "we might be the ones who'll"; - mes "have to keep Satan Morroc"; + mes "have to keep Satan Morocc"; mes "from returning to this world..."; set mao_request,122; close2; @@ -6693,7 +6693,7 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{ mes "Alright..."; mes "Now I should look for"; mes "the crest hidden in the"; - mes "field north of Morroc."; + mes "field north of Morocc."; close2; } else @@ -6738,7 +6738,7 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{ mes "Alright..."; mes "Now I should look for"; mes "the crest hidden in the"; - mes "field north of Morroc."; + mes "field north of Morocc."; close2; } else @@ -6943,7 +6943,7 @@ moc_fild19,21,33,1 script Unturned Spot#wind 111,{ mes "Now I need to talk to Lin"; mes "and figure out if there are"; mes "more of these things to be"; - mes "found outside of Morroc."; + mes "found outside of Morocc."; close2; } else @@ -7009,7 +7009,7 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{ mes "That was simple."; mes "Alright, now I should"; mes "try to find the crest"; - mes "hidden east of Morroc."; + mes "hidden east of Morocc."; close2; } else @@ -7060,7 +7060,7 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{ mes "Great, I think that actually"; mes "worked! Now, I should try"; mes "to find the crest hidden to"; - mes "the east of Morroc."; + mes "the east of Morocc."; cutin "mocseal_earth01.bmp",2; close2; } @@ -7196,7 +7196,7 @@ morocc_in,46,125,5 script Assistant 729,{ mes "Hopefully, I was able to"; mes "help you with whatever"; mes "information that you needed."; - mes "Morroc has a much richer"; + mes "Morocc has a much richer"; mes "history than most people"; mes "realize, don't you think?"; close; @@ -7207,7 +7207,7 @@ morocc_in,46,125,5 script Assistant 729,{ mes "Hopefully, I was able to"; mes "help you with whatever"; mes "information that you needed."; - mes "Morroc has a much richer"; + mes "Morocc has a much richer"; mes "history than most people"; mes "realize, don't you think?"; next; @@ -7249,12 +7249,12 @@ morocc_in,46,125,5 script Assistant 729,{ mes "If it's really important,"; mes "then I might be able to"; mes "answer your questions if"; - mes "they're about Morroc's most"; + mes "they're about Morocc's most"; mes "ancient histories and legends."; next; mes "^3355FFYou ask Sephit about the"; mes "four elemental crests around"; - mes "Morroc, their significance, and"; + mes "Morocc, their significance, and"; mes "about Raiyan Moore. You also"; mes "inform her that you've already"; mes "stabilized the crests' power.^000000"; @@ -7273,17 +7273,17 @@ morocc_in,46,125,5 script Assistant 729,{ mes "those crests. Still, you did"; mes "a great service by stabilizing"; mes "them. Otherwise, the seal under"; - mes "Morroc Castle would break."; + mes "Morocc Castle would break."; next; mes "[Sephit]"; - mes "The seal beneath Morroc"; + mes "The seal beneath Morocc"; mes "Castle actually keeps Satan"; - mes "Morroc from entering our world."; + mes "Morocc from entering our world."; mes "If he ever returned, he might"; mes "repeat the mass destruction"; next; mes "[Sephit]"; - mes "When Satan Morroc"; + mes "When Satan Morocc"; mes "was terrorizing the human"; mes "world, he used Thanatos"; mes "Tower as his power base."; @@ -7299,25 +7299,25 @@ morocc_in,46,125,5 script Assistant 729,{ mes "roam that place freely."; next; mes "[Sephit]"; - mes "Satan Morroc may have been"; + mes "Satan Morocc may have been"; mes "unimaginably powerful, but"; mes "it would take a lot of work"; mes "to bring him back into our"; mes "world. Let's see, you could"; - mes "destroy Morroc's seal..."; + mes "destroy Morocc's seal..."; next; mes "[Sephit]"; mes "There was also... Oh, God."; mes "Long ago, someone actually"; mes "sacrificed children in a failed"; - mes "attempt to revive Morroc Satan."; + mes "attempt to revive Morocc Satan."; mes "The children missing here in"; - mes "Morroc-- Y-you don't think..."; + mes "Morocc-- Y-you don't think..."; next; mes "[Sephit]"; mes "But who really knows?"; mes "I mean we have historical"; - mes "records of Satan Morroc, "; + mes "records of Satan Morocc, "; mes "but maybe it's just a legend."; mes "Aside from that, we have no"; mes "proof that he really exists."; @@ -7354,12 +7354,12 @@ morocc_in,46,125,5 script Assistant 729,{ mes "If it's really important,"; mes "then I might be able to"; mes "answer your questions if"; - mes "they're about Morroc's most"; + mes "they're about Morocc's most"; mes "ancient histories and legends."; next; mes "^3355FFYou ask Sephit for any"; mes "information related to"; - mes "Satan Morroc and Thanatos"; + mes "Satan Morocc and Thanatos"; mes "Tower, particularly their"; mes "significance and how"; mes "they might be related.^000000"; @@ -7368,7 +7368,7 @@ morocc_in,46,125,5 script Assistant 729,{ mes "about Moore's research,"; mes "and about the elemental"; mes "crests hidden throughout"; - mes "Morroc that you've balanced.^000000"; + mes "Morocc that you've balanced.^000000"; next; mes "[Sephit]"; mes "Moore... Moore..."; @@ -7384,12 +7384,12 @@ morocc_in,46,125,5 script Assistant 729,{ mes "those crests. Still, you did"; mes "a great service by stabilizing"; mes "them. Otherwise, the seal under"; - mes "Morroc Castle would break."; + mes "Morocc Castle would break."; next; mes "[Sephit]"; - mes "The seal beneath Morroc"; + mes "The seal beneath Morocc"; mes "Castle actually keeps Satan"; - mes "Morroc from entering our world."; + mes "Morocc from entering our world."; mes "If he ever returned, he might"; mes "repeat the mass destruction"; mes "that he caused in the past."; @@ -7397,7 +7397,7 @@ morocc_in,46,125,5 script Assistant 729,{ mes "[Sephit]"; mes "It's funny that you should ask"; mes "about Thanatos Tower. When"; - mes "Satan Morroc was terrorizing"; + mes "Satan Morocc was terrorizing"; mes "our world, he used that place"; mes "to summon hordes of minions"; mes "that would menace us humans."; @@ -7411,25 +7411,25 @@ morocc_in,46,125,5 script Assistant 729,{ mes "roam that place freely."; next; mes "[Sephit]"; - mes "Satan Morroc may have been"; + mes "Satan Morocc may have been"; mes "unimaginably powerful, but"; mes "it would take a lot of work"; mes "to bring him back into our"; mes "world. Let's see, you could"; - mes "destroy Morroc's seal..."; + mes "destroy Morocc's seal..."; next; mes "[Sephit]"; mes "There was also... Oh, God."; mes "Long ago, someone actually"; mes "sacrificed children in a failed"; - mes "attempt to revive Morroc Satan."; + mes "attempt to revive Morocc Satan."; mes "The children missing here in"; - mes "Morroc-- Y-you don't think..."; + mes "Morocc-- Y-you don't think..."; next; mes "[Sephit]"; mes "But who really knows?"; mes "I mean we have historical"; - mes "records of Satan Morroc, "; + mes "records of Satan Morocc, "; mes "but maybe it's just a legend."; mes "Aside from that, we have no"; mes "proof that he really exists."; @@ -7459,11 +7459,11 @@ morocc_in,46,125,5 script Assistant 729,{ mes "digging through some"; mes "old historical records and"; mes "learned something about"; - mes "a monster called Satan Morroc."; + mes "a monster called Satan Morocc."; next; mes "[Sephit]"; mes "According to the legends,"; - mes "he's sealed beneath Morroc"; + mes "he's sealed beneath Morocc"; mes "Castle, and our town gets its"; mes "name from him. That sounds"; mes "pretty grotesque, don't you"; @@ -7498,7 +7498,7 @@ OnTouch: mes "kidnapper when you told"; mes "me just now. But to sacrifice"; mes "them in order to revive Satan"; - mes "Morroc... That's beyond evil."; + mes "Morocc... That's beyond evil."; next; mes "[Valdes]"; mes "Mr. R... If he is Raiyan"; @@ -7581,7 +7581,7 @@ OnTouch: mes "I think..."; mes "I think it's the"; mes "ceremony to revive"; - mes "Satan Morroc! Mr. R must"; + mes "Satan Morocc! Mr. R must"; mes "have went there to stop"; mes "them... or to join them!"; next; @@ -7601,7 +7601,7 @@ OnTouch: mes "No matter what the "; mes "cost, we can't let"; mes "that ritual finish...!"; - mes "If Satan Morroc really"; + mes "If Satan Morocc really"; mes "exists, we can't let"; mes "him enter our world!"; set mao_request,124; @@ -7682,7 +7682,7 @@ OnTouch: mes "[Kidd]"; mes "Damn, that has to be him!"; mes "He's trying to revive Satan"; - mes "Morroc right now! And where's"; + mes "Morocc right now! And where's"; mes "Lin?! What happened to her?"; next; mes "[Valdes]"; @@ -7691,7 +7691,7 @@ OnTouch: mes "Assassin Guild. You and Kidd"; mes "go try to find the source of"; mes "that voice and stop this!"; - mapannounce "que_job01","...By Satan Morroc's blessings... Grant me... Immortality!",1,0x7B68EE; + mapannounce "que_job01","...By Satan Morocc's blessings... Grant me... Immortality!",1,0x7B68EE; next; mes "[Kidd]"; mes "Yes, sir!"; @@ -7873,7 +7873,7 @@ OnTouch: mes "What is this place?"; mes "Arrgh, my head hurts,"; mes "but I've got to stop"; - mes "Satan Morroc's revival..."; + mes "Satan Morocc's revival..."; mapannounce "que_job02","...Blood... is the currency... of the soul...",1,0x7B68EE; next; mes "[" + strcharinfo(0) + "]"; @@ -7967,10 +7967,10 @@ OnTouch: next; mes "[???????]"; mes "But the hatred of Satan"; - mes "Morroc has not ebbed with"; + mes "Morocc has not ebbed with"; mes "time. If you look at the full"; mes "moon from here, it is colored"; - mes "red with Satan Morroc's rage..."; + mes "red with Satan Morocc's rage..."; next; mes "......"; mes "........."; @@ -8035,7 +8035,7 @@ OnTouch: mes "They're like past"; mes "memories of something"; mes "that's happened here"; - mes "in Castle Morroc..."; + mes "in Castle Morocc..."; close2; soundeffect "wander_man_move.wav",0; sc_end SC_All; @@ -8138,7 +8138,7 @@ OnTouch: mes "......"; mes "........."; mes "............"; - mapannounce "que_job02","...Morroc Satan... needs... fresher blood...",1,0x7B68EE; + mapannounce "que_job02","...Morocc Satan... needs... fresher blood...",1,0x7B68EE; next; mes "["+ strcharinfo(0) +"]"; mes "I can't..."; @@ -8183,7 +8183,7 @@ OnTouch: mes "What?! Why would"; mes "anyone do something"; mes "so stupid, so foolhardy,"; - mes "as revive Satan Morroc?!"; + mes "as revive Satan Morocc?!"; next; mes "[????]"; mes "Why...?"; @@ -8320,7 +8320,7 @@ que_job02,66,85,5 script Dandelion Member#1_bt 880,{ mes "I gathered as many members"; mes "of Dandelion as I could. From"; mes "the looks of it, I wouldn't be"; - mes "surprised if Satan Morroc was"; + mes "surprised if Satan Morocc was"; mes "almost unsealed by now..."; next; mes "[" + strcharinfo(0) + "]"; @@ -8439,7 +8439,7 @@ OnTouch: mes "hunting him down. Your client,"; mes "Mr. R. Moore, is none other"; mes "than Raiyan Moore-- and he"; - mes "plans to revive Satan Morroc!"; + mes "plans to revive Satan Morocc!"; next; cutin "mocseal_rin01.bmp",2; mes "[Lin]"; @@ -8469,7 +8469,7 @@ OnTouch: mes "and be accepted into"; mes "this sacrifice... Lin..."; mes "Your blood will be used"; - mes "to revive Morroc Satan!"; + mes "to revive Morocc Satan!"; donpcevent "R#maogate1::OnSpell"; emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate1_1"); emotion ET_SURPRISE, playerattached(); @@ -8489,7 +8489,7 @@ OnTouch: mes "Wh-why...?"; mes "Mr. Moore, you said"; mes "that you were trying to"; - mes "stop Satan Morroc's revival..."; + mes "stop Satan Morocc's revival..."; next; mes "[Kidd]"; mes "Can't you see...?"; @@ -8501,7 +8501,7 @@ OnTouch: mes "You're resisting?"; mes "Fine, you leave me"; mes "no choice. Feel the"; - mes "power of Morroc Satan!"; + mes "power of Morocc Satan!"; emotion ET_KIK, getnpcid(0, "R#maogate1"); next; donpcevent "R#maogate1::OnInit"; @@ -8856,7 +8856,7 @@ OnTouch: mes "What is this place?"; mes "Arrgh, my head hurts,"; mes "but I've got to stop"; - mes "Satan Morroc's revival..."; + mes "Satan Morocc's revival..."; mapannounce "que_job03","...Blood... is the currency... of the soul...",1,0x7B68EE; next; mes "[" + strcharinfo(0) + "]"; @@ -8950,10 +8950,10 @@ OnTouch: next; mes "[???????]"; mes "But the hatred of Satan"; - mes "Morroc has not ebbed with"; + mes "Morocc has not ebbed with"; mes "time. If you look at the full"; mes "moon from here, it is colored"; - mes "red with Satan Morroc's rage..."; + mes "red with Satan Morocc's rage..."; next; mes "......"; mes "........."; @@ -9018,7 +9018,7 @@ OnTouch: mes "They're like past"; mes "memories of something"; mes "that's happened here"; - mes "in Castle Morroc..."; + mes "in Castle Morocc..."; close2; soundeffect "wander_man_move.wav",0; sc_end SC_All; @@ -9121,7 +9121,7 @@ OnTouch: mes "......"; mes "........."; mes "............"; - mapannounce "que_job03","...Morroc Satan... needs... fresher blood...",1,0x7B68EE; + mapannounce "que_job03","...Morocc Satan... needs... fresher blood...",1,0x7B68EE; next; mes "["+ strcharinfo(0) +"]"; mes "I can't..."; @@ -9166,7 +9166,7 @@ OnTouch: mes "What?! Why would"; mes "anyone do something"; mes "so stupid, so foolhardy,"; - mes "as revive Satan Morroc?!"; + mes "as revive Satan Morocc?!"; next; mes "[????]"; mes "Why...?"; @@ -9314,7 +9314,7 @@ que_job03,66,85,5 script Dandelion Member#2_bt 880,{ mes "Dandelion Organization,"; mes "and we've been trying to find"; mes "him. It turns out that we were"; - mes "right about Moore: he's really planning to revive Satan Morroc."; + mes "right about Moore: he's really planning to revive Satan Morocc."; next; mes "[" + strcharinfo(0) + "]"; mes "Huh? What are you"; @@ -9432,7 +9432,7 @@ OnTouch: mes "hunting him down. Your client,"; mes "Mr. R. Moore, is none other"; mes "than Raiyan Moore-- and he"; - mes "plans to revive Satan Morroc!"; + mes "plans to revive Satan Morocc!"; next; cutin "mocseal_rin01.bmp",2; mes "[Lin]"; @@ -9462,7 +9462,7 @@ OnTouch: mes "and be accepted into"; mes "this sacrifice... Lin..."; mes "Your blood will be used"; - mes "to revive Morroc Satan!"; + mes "to revive Morocc Satan!"; donpcevent "R#maogate2::OnSpell"; emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate2_1"); emotion ET_SURPRISE, playerattached(); @@ -9482,7 +9482,7 @@ OnTouch: mes "Wh-why...?"; mes "Mr. Moore, you said"; mes "that you were trying to"; - mes "stop Satan Morroc's revival..."; + mes "stop Satan Morocc's revival..."; next; mes "[Kidd]"; mes "Can't you see...?"; @@ -9494,7 +9494,7 @@ OnTouch: mes "You're resisting?"; mes "Fine, you leave me"; mes "no choice. Feel the"; - mes "power of Morroc Satan!"; + mes "power of Morocc Satan!"; emotion ET_KIK, getnpcid(0, "R#maogate2"); next; donpcevent "R#maogate2::OnInit"; @@ -9997,7 +9997,7 @@ OnTimer320000: end; OnTimer325000: - mapannounce "morocc","???: Morroc Satan's angry! Oh Freya, please protect us from the evil being...",1,0x7B68EE; + mapannounce "morocc","???: Morocc Satan's angry! Oh Freya, please protect us from the evil being...",1,0x7B68EE; monster "morocc",163,185,"Satan's Wrath",1041,1,"#mao_manager::OnMyMobDead"; monster "morocc",161,185,"Satan's Wrath",1041,1,"#mao_manager::OnMyMobDead"; monster "morocc",159,185,"Satan's Wrath",1041,1,"#mao_manager::OnMyMobDead"; @@ -10029,7 +10029,7 @@ OnTimer327000: end; OnTimer329000: - announce "Kafra Pavianne: This is the Morroc Kafra Branch! The m-monsters are... Aaaaahhh!",bc_all,0x70DBDB; + announce "Kafra Pavianne: This is the Morocc Kafra Branch! The m-monsters are... Aaaaahhh!",bc_all,0x70DBDB; monster "morocc",163,203,"Satan's Wrath",1154,1,"#mao_manager::OnMyMobDead"; monster "morocc",161,203,"Satan's Wrath",1154,1,"#mao_manager::OnMyMobDead"; monster "morocc",159,203,"Satan's Wrath",1154,1,"#mao_manager::OnMyMobDead"; @@ -10197,20 +10197,20 @@ que_job01,68,88,5 script Simon#mao 881,{ que_job01,70,84,1 duplicate(Simon#mao) Kimmie 882 -sec_in02,38,162,0 script Morroc Invasion Manager 882,{ +sec_in02,38,162,0 script Morocc Invasion Manager 882,{ callfunc "F_GM_NPC"; mes "A total of " + $maoattack + " users completed"; - mes "the Satan Morroc: Lin Quest."; + mes "the Satan Morocc: Lin Quest."; mes "There are 2 requirements to"; - mes "summon Satan Morroc's troops."; + mes "summon Satan Morocc's troops."; mes "1) 50 users must complete"; - mes "this Satan Morroc: Lin Quest."; + mes "this Satan Morocc: Lin Quest."; next; mes "2) One of these users that"; mes "completed the Lin Quest must"; mes "approach the Dandelion Org"; - mes "NPCs at the outskirts of Morroc to trigger the monster invasion."; - mes "Change the GlobalVar to affect status of Satan Morroc invasation?"; + mes "NPCs at the outskirts of Morocc to trigger the monster invasion."; + mes "Change the GlobalVar to affect status of Satan Morocc invasation?"; next; switch( select( "Set Globalvar","Cancel" ) ) { @@ -10228,14 +10228,14 @@ sec_in02,38,162,0 script Morroc Invasion Manager 882,{ mes "The GlobalVar has been"; mes "set to 49. The Lin Quest"; mes "must be completed 1 more"; - mes "time before the Satan Morroc"; + mes "time before the Satan Morocc"; mes "invasion can be triggered."; set $maoattack,49; close; case 2: mes "The GlobalVar has been"; - mes "set to 50. The Satan Morroc"; + mes "set to 50. The Satan Morocc"; mes "invasion can now be triggered."; set $maoattack,50; close; @@ -10244,7 +10244,7 @@ sec_in02,38,162,0 script Morroc Invasion Manager 882,{ mes "The GlobalVar has been"; mes "set to 0. The Lin Quest"; mes "must be completed 1 more"; - mes "time before the Satan Morroc"; + mes "time before the Satan Morocc"; mes "invasion can be triggered."; set $maoattack,0; close; diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index b3889729d2..53ad706c8c 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -311,7 +311,7 @@ mjolnir_02,186,193,4 script Middle-Aged Man#magum1 57,{ mes "As for our younger brother,"; mes "Huey, I haven't heard from"; mes "him in a while. I think he's"; - mes "travelling around in Morroc?"; + mes "travelling around in Morocc?"; close; } else if (dmdswrd_Q >= 40 && dmdswrd_Q <= 44) { @@ -660,7 +660,7 @@ payon,248,159,1 script Old Man#magum1 120,{ mes "[Morf]"; mes "Huey's been traveling"; mes "around, but last I heard, he"; - mes "was in Morroc. If you can"; + mes "was in Morocc. If you can"; mes "find him, he can complete"; mes "this pentagram for you. Well,"; mes "care now, and good luck."; @@ -748,7 +748,7 @@ payon,248,159,1 script Old Man#magum1 120,{ mes "If you really want to"; mes "finish that pentagram,"; mes "then find my youngest"; - mes "brother Huey in Morroc."; + mes "brother Huey in Morocc."; mes "He should help you out."; mes "I mean, if I did, then he will!"; close; @@ -1028,7 +1028,7 @@ morocc,248,159,4 script Young Man#magum1 86,{ mes "[Huey]"; mes "You know, I've traveled"; mes "to all sorts of places, but"; - mes "the heat here in Morroc"; + mes "the heat here in Morocc"; mes "is the worst I've ever"; mes "experienced! It's so humid"; mes "and uncomfortable here..."; diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 73334e72aa..24ee527798 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -36,13 +36,13 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{ mes "Greetings..."; mes "My name is Sir Chilias'Tyus."; mes "I've lived a long time here in"; - mes "Rune-Midgard and I've come"; + mes "Rune-Midgarts and I've come"; mes "to see and know a lot of things. Power, jealously, hardship..."; next; mes "[" + strcharinfo(0) + "]"; mes "So what exactly"; mes "brings you here to"; - mes "the middle of Morroc?"; + mes "the middle of Morocc?"; next; mes "[Sir Chilias'Tyus]"; mes "This land has grown corrupt"; @@ -334,13 +334,13 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{ mes "were searching for the"; mes "tablets pieces on your own,"; mes "so I managed to find this"; - mes "piece here in Morroc. But..."; + mes "piece here in Morocc. But..."; next; mes "[Sir Chilias'Tyus]"; mes "Why are they glowing like"; mes "this? In any case, we have"; mes "this piece I found here in"; - mes "Morroc, and the pieces you"; + mes "Morocc, and the pieces you"; mes "found in Prontera and Payon. There's one more left in Geffen."; specialeffect2 EF_HEAL2; specialeffect EF_HEAL2; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index aab49d309c..e249274db5 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -535,7 +535,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "Now, your first assignment"; mes "is to learn ^3131FFLevel 3 Owl's Eye^000000!"; if (checkre(0)) - mes "From Morroc, if you travel south, you can fight Condors for your training."; + mes "From Morocc, if you travel south, you can fight Condors for your training."; else mes "From Prontera, if you travel south, south and then west, you can fight Condors for your training."; next; @@ -549,7 +549,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "[Reidin Corse]"; if (checkre(0)) { mes "I'll send you to"; - mes "Morroc for now,"; + mes "Morocc for now,"; mes "so don't forget the"; mes "directions I gave you."; mes "Travel ^3131FFsouth^000000."; @@ -577,7 +577,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "Okay...!"; mes "Off you go!"; if (checkre(0)) { - mes "To Morroc!"; + mes "To Morocc!"; close2; warp "morocc",156,46; } else { @@ -1344,7 +1344,7 @@ pay_arche,84,139,3 script Seisner 4_F_JOB_HUNTER,{ mes "he can't stop its flight or change his target. That's why Archers need to be level headed and really careful in battle."; next; mes "[Seisner]"; - mes "Someday, I'd like to become a great Archer and use my skills for the good of Rune-Midgard."; + mes "Someday, I'd like to become a great Archer and use my skills for the good of Rune-Midgarts."; close; } } @@ -1669,7 +1669,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{ next; mes "[Arthail]"; mes "^3131FFEmperium^000000..."; - mes "There are a lot of ambitious people in Morroc that want one of those. Even in my hometown of Payon,"; + mes "There are a lot of ambitious people in Morocc that want one of those. Even in my hometown of Payon,"; mes "there are people clamoring to obtain one..."; next; mes "[Arthail]"; diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index 09a1161bcd..fc05dac8bf 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -681,7 +681,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{ mes "Let me tell you about"; mes "your mission. Recently,"; mes "something has happened in"; - mes "Morroc and the Thief Guild"; + mes "Morocc and the Thief Guild"; mes "is requesting our assistance."; next; mes "[Mana]"; @@ -697,9 +697,9 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{ mes "[Mana]"; mes "Great! Alright,"; mes "I'll send you straight"; - mes "to Morroc, then. Once you"; + mes "to Morocc, then. Once you"; mes "get there, go to the front"; - mes "of the Morroc Pyramid and"; + mes "of the Morocc Pyramid and"; mes "speak to Yierhan. Thanks~"; next; mes "[Mana]"; diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index 2af769fb38..ded6df26cd 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -794,7 +794,7 @@ prontera,247,129,3 script Jayon 4_M_03,{ callsub L_Potions, 400,10; else if (tu_merchant == 8) callsub L_Potions, 410,10; - mes "The Schwaltzvalt Republic..."; + mes "The Schwarzwald Republic..."; mes "It's a really interesting country. There's Juno and a few other places worth looking around. "; next; mes "[Jayon]"; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index 4c2e231a03..27ab9e4486 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -1137,7 +1137,7 @@ geffen,154,143,3 script Dequ'ee 734,{ mes "Alright! It looks like Bankley is the murderer! Although we can't trust this 100%, this evidence is pretty conclusive."; next; mes "[Dequ'ee]"; - mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!"; + mes "Hurry over to Morocc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!"; set tu_swordman, 19; changequest 8224,8225; if (checkre(3)) @@ -1956,7 +1956,7 @@ geffen,154,143,3 script Dequ'ee 734,{ mes "[Dequ'ee]"; mes "Didn't I ask you"; mes "to interrogate the"; - mes "suspects over in Morroc?"; + mes "suspects over in Morocc?"; mes "We need to finish this"; mes "investigation as soon"; mes "as possible!"; @@ -1976,7 +1976,7 @@ geffen,154,143,3 script Dequ'ee 734,{ mes "As for the victim, well, that's classified information. You understand, don't you?"; next; mes "[Dequ'ee]"; - mes "Now, I want you to go to Morroc and interrogate four suspects. Their names are ^5D478BMuetro^000000, ^5D478BGeil^000000, ^5D478BHans^000000"; + mes "Now, I want you to go to Morocc and interrogate four suspects. Their names are ^5D478BMuetro^000000, ^5D478BGeil^000000, ^5D478BHans^000000"; mes "and ^5D478BBankley^000000. It shouldn't be too difficult."; next; mes "[Dequ'ee]"; @@ -1991,7 +1991,7 @@ geffen,154,143,3 script Dequ'ee 734,{ next; mes "[Dequ'ee]"; mes "Oh wait..."; - mes "Morroc is a little far. Alright, I'll drop you off somewhere"; + mes "Morocc is a little far. Alright, I'll drop you off somewhere"; mes "near that city."; next; set tu_swordman, 14; diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt index b6de563d01..6353c5d73b 100644 --- a/npc/quests/first_class/tu_thief01.txt +++ b/npc/quests/first_class/tu_thief01.txt @@ -607,7 +607,7 @@ moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{ next; select("I'm here on behalf of 'Mana.'"); mes "[Yierhan]"; - mes "Right, you must be the help that Mana sent! You came just at the right time. You see, we found something weird in South Morroc."; + mes "Right, you must be the help that Mana sent! You came just at the right time. You see, we found something weird in South Morocc."; next; mes "[Yierhan]"; mes "Basically, we found traces of poison that were used in a fight. We were going to investigate it, but we've been swamped with all this other work."; @@ -618,7 +618,7 @@ moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{ next; mes "[Yierhan]"; mes "Anyway, head over to"; - mes "South Morroc since it seems to be a good place to start investigating. You'll see what we found right outside the South Morroc gate."; + mes "South Morocc since it seems to be a good place to start investigating. You'll see what we found right outside the South Morocc gate."; tu_magician01 = 8; close; } diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 01e9ff669b..a6a37c3a8f 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -28,7 +28,7 @@ prt_in,49,172,3 script Marianne#juice 53,{ set morison_meat,0; set MISC_QUEST,MISC_QUEST | 1; mes "[Housewife Marianne]"; - mes "Ah! Come to think of it, I heard they were making fruit juice somewhere. Now where was it... Payon Village, or Morroc?"; + mes "Ah! Come to think of it, I heard they were making fruit juice somewhere. Now where was it... Payon Village, or Morocc?"; close; } if (mother_marienu == 1) { diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index a3d5d8ddd2..5042e0e96f 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -2272,7 +2272,7 @@ kh_vila,44,126,0 script Map#khp1 111,{ if ((KHCottagePoem1 < 2) && (KielHyreQuest < 30)) { mes "^3355FFA magnificent world map,"; mes "detailing the Rune-Midgarts"; - mes "Kingdom, Schwaltzvalt Republic,"; + mes "Kingdom, Schwarzwald Republic,"; mes "as well as another country to the"; mes "west whose name is unfamiliar"; mes "to you, is pasted to this wall.^000000"; @@ -4887,7 +4887,7 @@ OnTouch: mes "[??????]"; mes "All you need to know it"; mes "that I'm a secret agent for"; - mes "the Schwaltzvalt Republic"; + mes "the Schwarzwald Republic"; mes "government. We're investigating"; mes "abnormal activity between Kiel"; mes "Hyre and the Rekenber Corporation."; @@ -5043,7 +5043,7 @@ OnTouch: mes "Great."; mes "I'm Agent Mitchell Layla."; mes "From here on, you're working"; - mes "for the Schwaltzvalt Republic!"; + mes "for the Schwarzwald Republic!"; set KielHyreQuest,52; close; } @@ -6686,7 +6686,7 @@ kh_kiehl02,50,52,4 script Kiehl#Original 902,{ set getvariableofnpc(.KHKilledBoss,"KiehlRoom"),0; cutin "kh_kiel01",2; mes "[Kiehl]"; - mes "Ah, Schwaltzvalt Republic"; + mes "Ah, Schwarzwald Republic"; mes "agents. Heh. I haven't had"; mes "this many guests before."; mes "Well, I guess this means"; diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt index 56b36a23a0..2f71ac5a21 100644 --- a/npc/quests/mage_solution.txt +++ b/npc/quests/mage_solution.txt @@ -8,7 +8,7 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Traders for Morroc Solution and Payon Solution, used in +//= Traders for Morocc Solution and Payon Solution, used in //= the Sage skill quests and the Pre-Renewal Mage job quest. //===== Additional Comments: ================================= //= 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 7bcf3acb7b..f956ba4637 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -189,7 +189,7 @@ alberta_in,173,76,4 script Monster Tamer#alb 125,{ aldeba_in,168,175,4 script Monster Tamer#alde 125,{ mes "[YuU]"; - mes "You must be looking for monster items! In making monster items, there is no monster tamer in Rune Midgard that's better than me."; + mes "You must be looking for monster items! In making monster items, there is no monster tamer in Rune-Midgarts that's better than me."; next; mes "[YuU]"; mes "I can make all sorts of neat things for your Cute Pet monster."; diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 010f24bb30..5b9fccd729 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -522,7 +522,7 @@ comodo,237,217,5 script Meruntei#1 732,{ mes "Oh! You brought all of them! Now I shall make you an Indian Headband of your very own."; next; mes "[Meruntei]"; - mes "Take this! The items you have brought will be very useful for continuing my work in spreading headbands around Rune-Midgard."; + mes "Take this! The items you have brought will be very useful for continuing my work in spreading headbands around Midgard."; delitem 5010,1; //Indian_Hair_Piece delitem 5049,1; //Stripe_Band delitem 7101,10; //Peco_Wing_Feather @@ -550,7 +550,7 @@ comodo,237,217,5 script Meruntei#1 732,{ mes "and ^FF000010,000 zeny!"; next; mes "[Meruntei]"; - mes "I will be using the items you've given me so I can continue my work in spreading Indian Headbands, and paying homage to the tribes of Rune-Midgard."; + mes "I will be using the items you've given me so I can continue my work in spreading Indian Headbands, and paying homage to the tribes of Midgard."; next; mes "[Meruntei]"; mes "^FF0000For your information, if you bring me any item that has a card inserted, or has been upgraded, the additional abilities of the item will disappear after I have used them. So please keep that in mind.^000000"; @@ -2438,7 +2438,7 @@ morocc,273,79,4 script Educated Traveller 99,{ mes "[Lee Hester]"; mes "Beautiful..."; mes "But insanely hot."; - mes "I live here, I should know. Still, nothing can beat the Morroc sunset."; + mes "I live here, I should know. Still, nothing can beat the Morocc sunset."; next; mes "[Lee Hester]"; mes "It's amazing how so many different animals can live in the desert. I've been spending some time researching the ways of animals, reading books in the Juno Library..."; @@ -2447,7 +2447,7 @@ morocc,273,79,4 script Educated Traveller 99,{ mes "Trying to figure out the Animal Kingdom's secrets of dealing with the heat."; next; mes "[Lee Hester]"; - mes "I hope you're having a good time here in Morroc. If you ever question the special abilities of animals, just think of the majestic Desert Wolf that's able to thrive in the harsh Morroc deserts."; + mes "I hope you're having a good time here in Morocc. If you ever question the special abilities of animals, just think of the majestic Desert Wolf that's able to thrive in the harsh Morocc deserts."; emotion ET_WRAP; close; } diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index d4e7890d54..de343d8aa0 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -2040,7 +2040,7 @@ gl_prison1,100,48,5 script Rybio#LhzHat 1201,{ mes "[Rybio]"; mes "Since Phendark's pretty big, and he's acting like a total wuss, you"; mes "you should probably get him to eat ^3131FF369 Dark Crystal Fragments^000000. Don't"; - mes "worry, you should be able to find those all over Rune-Midgard."; + mes "worry, you should be able to find those all over Midgard."; next; mes "[Rybio]"; mes "I dunno why a human"; @@ -2248,7 +2248,7 @@ airport,148,41,3 script Freight Manager#toast 852,{ mes "Einbroch, adventurer."; mes "I hope you enjoy your"; mes "travels here in the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; close; } } diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt index 767a90febf..bca87b94bf 100644 --- a/npc/quests/obb_quest.txt +++ b/npc/quests/obb_quest.txt @@ -18,7 +18,7 @@ //===== Additional Comments: ================================= //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.8 Added missing checkweights. [L0ne_W0lf] -//= 1.9 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf] +//= 1.9 Moved Morocc NPCs to Morocc Ruins. [L0ne_W0lf] //= 2.0 Removed unused "name" variable. [L0ne_W0lf] //============================================================ @@ -90,7 +90,7 @@ alberta,43,244,0 script Tourist#thai 99,{ mes "I wanted to give my girlfriend"; mes "some well baked cookies."; mes "Sadly, in my hometown of"; - mes "Morroc, we don't have fancy"; + mes "Morocc, we don't have fancy"; mes "foods like that."; next; mes "[Tourist]"; @@ -141,7 +141,7 @@ alberta,43,244,0 script Tourist#thai 99,{ mes "I wanted to give my girlfriend"; mes "some well baked cookies."; mes "Sadly, in my hometown of"; - mes "Morroc, we don't have fancy"; + mes "Morocc, we don't have fancy"; mes "foods like that."; next; mes "[Tourist]"; @@ -381,7 +381,7 @@ alberta,43,244,0 script Tourist#thai 99,{ mes "[Tourist]"; mes "Hmm, there is still one problem"; mes "left for me though...How do I"; - mes "get back home to Morroc??"; + mes "get back home to Morocc??"; mes "Well, if it can make my girl"; mes "happy..."; next; @@ -421,7 +421,7 @@ alberta,43,244,0 script Tourist#thai 99,{ next; mes "[Tourist]"; mes "Visit my pal ^649664Jacob^000000 in"; - mes "Morroc. Tell him that I"; + mes "Morocc. Tell him that I"; mes "introduced you. He knows"; mes "about a wise man..."; mes "Though, he isn't one"; @@ -491,7 +491,7 @@ alberta,43,244,0 script Tourist#thai 99,{ mes "[Tourist]"; mes "Hey, thanks a bunch for your"; mes "help....I ain't sure if I"; - mes "can make it back to Morroc"; + mes "can make it back to Morocc"; mes "in one piece..."; next; mes "[Tourist]"; @@ -504,7 +504,7 @@ alberta,43,244,0 script Tourist#thai 99,{ case 3: mes "[Tourist]"; mes "Hey, thanks a bunch for your"; - mes "help. Man...Morroc is a long"; + mes "help. Man...Morocc is a long"; mes "way off, isn't it? Aw nuts..."; mes "I guess if I was crazy"; mes "enough to come here because"; @@ -512,7 +512,7 @@ alberta,43,244,0 script Tourist#thai 99,{ next; mes "[Tourist]"; mes "I'm crazy enough to walk all"; - mes "way back to Morroc..."; + mes "way back to Morocc..."; mes "..."; mes "...unless..."; mes "You'll gimme a piggy-back ride?"; @@ -981,7 +981,7 @@ moc_ruins,105,62,4 script Jacob#thai 50,{ mes "I have something to tell you."; next; mes "[Jacob]"; - mes "When you go west from Morroc, and"; + mes "When you go west from Morocc, and"; mes "pass through a cave, you will"; mes "arrive at a town called Comodo."; next; diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt index cd31042b52..f185b7fe06 100644 --- a/npc/quests/partyrelay.txt +++ b/npc/quests/partyrelay.txt @@ -283,7 +283,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{ mes "[Ledrion]"; mes "I'm always working to make"; mes "a meaningful contribution"; - mes "to all of Rune Midgard, which"; + mes "to all of Rune-Midgarts, which"; mes "brings me to why I am here."; mes "There are many adventurers like you, but we have a problem."; next; @@ -378,7 +378,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{ mes "worthwhile for you, and it"; mes "would bring a greater sense"; mes "of solidarity and teamwork"; - mes "to Rune Midgard. It's win-win!"; + mes "to Rune-Midgarts. It's win-win!"; close; } } diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 36fa6ea43f..d2f0e2fbab 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -91,7 +91,7 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ - script Alliance Manager#prt_ -1,{ if (ep13_ryu == 13) { mes "[Alliance Manager]"; - mes "If we'd had the initiative over Schwartzvald, we could take advantage over them! But we lost the opportunity."; + mes "If we'd had the initiative over Schwarzwald, we could take advantage over them! But we lost the opportunity."; next; mes "[Alliance Manager]"; mes "Though we are allied with them, that's nothing more than a formality."; @@ -117,7 +117,7 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ next; mes "[Alliance Manager]"; mes "So, everything is going well?"; - mes "You're allied with Schwartzvald?"; + mes "You're allied with Schwarzwald?"; mes "They will join with you."; mes "I know this."; next; @@ -140,7 +140,7 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ mes "it secretly."; next; mes "[Alliance Manager]"; - mes "The Schwartzvald... they are all"; + mes "The Schwarzwald... they are all"; mes "snobs. I know what they did."; mes "They'll try to get what they can"; mes "with little or no work. I know"; @@ -177,10 +177,10 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ - script Member of Alliance#prt_ -1,{ if ((ep13_ryu == 12) || (ep13_ryu == 13)) { mes "[Member of Alliance]"; - mes "If we have absolute power, we wouldn't have to get along with Schwartzvald and Arunafeltz."; + mes "If we have absolute power, we wouldn't have to get along with Schwarzwald and Arunafeltz."; next; mes "[Member of Alliance]"; - mes "I don't know when Satan Morroc will attack us, and whether we're powerful enough to detect him."; + mes "I don't know when Satan Morocc will attack us, and whether we're powerful enough to detect him."; next; mes "[Member of Alliance]"; mes "We couldn't avoid cooperating with them. We don't have many choices left."; @@ -200,13 +200,13 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ if (ep13_ryu == 12) { mes "[Recruiter]"; mes "Why have you come again?"; - mes "You'd better go to Schwartzvald to register."; + mes "You'd better go to Schwarzwald to register."; next; mes "[Recruiter]"; mes "What? You came to here to convey a story? Go ahead."; next; mes "[Recruiter]"; - mes "Move to the side. There's a Manager who is dealing with all of us, and is involved in international relations here on Rune Midgard."; + mes "Move to the side. There's a Manager who is dealing with all of us, and is involved in international relations here on Midgard."; next; mes "[Recruiter]"; mes "Just talk to him."; @@ -250,7 +250,7 @@ prontera,163,53,3 script Promotional Staff#prt 100,{ mes "Nobody knows."; next; mes "[Recruiter]"; - mes "Only the brave, like you, deserve to go there. There will be many dangerous things around you, but you must explore it on behalf of Rune Midgard."; + mes "Only the brave, like you, deserve to go there. There will be many dangerous things around you, but you must explore it on behalf of Midgard."; next; mes "[Recruiter]"; mes "Hmm......"; @@ -822,7 +822,7 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{ next; mes "[Sikaiz]"; mes "All done."; - mes "Go to the field Officer of Schwartzvalt. He should be in the banquet hall of this building downstairs."; + mes "Go to the field Officer of Schwarzwald. He should be in the banquet hall of this building downstairs."; next; mes "[Sikaiz]"; mes "Only thing left for you is to go to the Officer to say that you are leaving now."; @@ -923,14 +923,14 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{ mes "Anyway, I promised to tell you about the three kingdoms... This is kind of a long story, so please listen carefully."; next; mes "[Sikaiz]"; - mes "The adventurers for Ash-vacuum! The alliance for the three kingdoms! Rune-Midgarts, Schwartzvalt, Arunafeltz!"; + mes "The adventurers for Ash-vacuum! The alliance for the three kingdoms! Rune-Midgarts, Schwarzwald, Arunafeltz!"; mes "Three kingdoms united for one thing!"; next; mes "[Sikaiz]"; mes "Frankly, there's a Dimensional Rift in the Sograt desert, so they can inspect it themselves, but it's not that good of a place to inspect the rift's magic well."; next; mes "[Sikaiz]"; - mes "We are a little bit better in magic, but not that much developed in science as compared with Schwartzvalt, and not as wise compared with Arunafeltz."; + mes "We are a little bit better in magic, but not that much developed in science as compared with Schwarzwald, and not as wise compared with Arunafeltz."; next; mes "[Sikaiz]"; mes "So we need to get help from other countries, because the Ash-vacuum is quite a profitable place. That is why we made the Alliance to get into the Ash-Vacuum."; @@ -948,7 +948,7 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{ mes "But the most valuable thing is the unity. Not each kingdom's interest. If we spoil the greatest plans, it's too regrettable."; next; mes "[Sikaiz]"; - mes "Though I belong to Schwartzvalt, I need to balance the three kingdoms, as a leader... so I can't support my kingdom too much over the others."; + mes "Though I belong to Schwarzwald, I need to balance the three kingdoms, as a leader... so I can't support my kingdom too much over the others."; next; mes "[Sikaiz]"; mes "Anyway, I believe that my friend can assist me well."; @@ -1027,11 +1027,11 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{ next; mes "[Sikaiz]"; mes "You're probably wondering how we got there..."; - mes "The answer lies with Satan Morroc."; + mes "The answer lies with Satan Morocc."; next; mes "[Sikaiz]"; mes "Can you imagine?"; - mes "Why did Satan Morroc"; + mes "Why did Satan Morocc"; mes "run away from there???"; mes "That's the important thing."; next; @@ -1223,7 +1223,7 @@ lhz_in01,128,249,1 script Member of Alliance#1 904,{ lhz_in01,136,245,1 script Member of Alliance#2 869,{ if (ep13_ryu > 19) { - mes "-You should probably head over to the dimensional rift next to Morroc and find the Guard there-"; + mes "-You should probably head over to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -1240,7 +1240,7 @@ lhz_in01,136,245,1 script Member of Alliance#2 869,{ lhz_in01,140,245,1 script Member of Alliance#3 85,{ if (ep13_ryu > 19) { - mes "-You're still here? You're a member of the alliance now so you should head to the dimensional rift next to Morroc and find the Guard there-"; + mes "-You're still here? You're a member of the alliance now so you should head to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -1257,7 +1257,7 @@ lhz_in01,140,245,1 script Member of Alliance#3 85,{ lhz_in01,136,249,1 script Member of Alliance#4 865,{ if (ep13_ryu > 19) { - mes "-I'm sure they'll settle their little dispute somehow. You should be heading to the dimensional rift next to Morroc and find the Guard there-"; + mes "-I'm sure they'll settle their little dispute somehow. You should be heading to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -1277,7 +1277,7 @@ lhz_in01,136,249,1 script Member of Alliance#4 865,{ lhz_in01,124,245,1 script Member of Alliance#5 932,{ if (ep13_ryu > 19) { - mes "-Maybe Munk is a better leader instead of Sakaiz. Anyways you should be heading to the dimensional rift next to Morroc and find the Guard there-"; + mes "-Maybe Munk is a better leader instead of Sakaiz. Anyways you should be heading to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -1294,7 +1294,7 @@ lhz_in01,124,245,1 script Member of Alliance#5 932,{ lhz_in01,136,241,3 script Member of Alliance#6 849,{ if (ep13_ryu > 19) { - mes "-I'm so bored!!! You should be heading to the dimensional rift next to Morroc and find the Guard there. It's probably less boring there than it is here-"; + mes "-I'm so bored!!! You should be heading to the dimensional rift next to Morocc and find the Guard there. It's probably less boring there than it is here-"; close; } mes "[Member of Alliance]"; @@ -1310,7 +1310,7 @@ lhz_in01,136,241,3 script Member of Alliance#6 849,{ lhz_in01,126,249,1 script Member of Alliance#7 930,{ if (ep13_ryu > 19) { - mes "-We haven't even started and we're already bickering. Just ignore the politics and head to the dimensional rift next to Morroc and find the Guard there-"; + mes "-We haven't even started and we're already bickering. Just ignore the politics and head to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -1321,7 +1321,7 @@ lhz_in01,126,249,1 script Member of Alliance#7 930,{ lhz_in01,122,245,1 script Member of Alliance#8 882,{ if (ep13_ryu > 19) { - mes "-You shouldn't stay around here and listen to all the complaining. You should be heading to the dimensional rift next to Morroc and find the Guard there-"; + mes "-You shouldn't stay around here and listen to all the complaining. You should be heading to the dimensional rift next to Morocc and find the Guard there-"; close; } mes "[Member of Alliance]"; @@ -3432,7 +3432,7 @@ mid_camp,166,248,4 script Sorcerer#ep13bs 937,{ next; mes "[Biolay]"; mes "I was just wandering"; - mes "around Morroc and"; + mes "around Morocc and"; mes "became faint. then"; mes "I found myself here."; next; @@ -3693,7 +3693,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{ mes "I'm Rumis Block, and"; mes "I'm working here on behalf of"; mes "the monsternomics academy"; - mes "from the Schwaltzvalt Republic."; + mes "from the Schwarzwald Republic."; mes "Botanist Terris Block is"; mes "my older twin brother."; next; @@ -3777,7 +3777,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{ next; mes "[Rumis Block]"; mes "Yes, I'm a monster scholar"; - mes "But I've been afraid of creatures even when I was on the Rune Midgard Continent..."; + mes "But I've been afraid of creatures even when I was on the Midgard Continent..."; next; mes "[Rumis Block]"; mes "No, but can't you see?"; @@ -3888,7 +3888,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{ mes "I... I see."; mes "I've heard about adventurers"; mes "that have made positive"; - mes "impacts on Rune Midgard."; + mes "impacts on Midgard."; mes "You're one of them, huh?"; next; mes "[Rumis Block]"; @@ -4013,7 +4013,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{ mes "the World Tree Yggdrasil?"; mes "Maybe it came along with"; mes "other creatures such as"; - mes "Satan Morroc and traversed"; + mes "Satan Morocc and traversed"; mes "through time and space."; next; mes "[Rumis Block]"; @@ -4201,7 +4201,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{ mes "I should make a brief report and then submit it to management. Hopefully, a new monster scholar after me will do a better job in actually studying them."; next; mes "[Rumis Block]"; - mes "There are many cold places in my country, the Schwaltzvalt Republic, but none are as cold as this place. This weather is freezing my senses, dulling my passion toward my studies."; + mes "There are many cold places in my country, the Schwarzwald Republic, but none are as cold as this place. This weather is freezing my senses, dulling my passion toward my studies."; mes "I shall go back home faster than anyone else in this camp. I'm tired of this world..."; next; mes "[Rumis Block]"; @@ -4997,10 +4997,10 @@ OnTouch_: next; mes "[United Research Official]"; mes "Oh! Hello there!"; - mes "You must be the adventurer from Rune Midgard."; + mes "You must be the adventurer from Midgard."; next; mes "[United Research Official]"; - mes "We've come all the way here to keep track of Satan Morroc, but... Now it seems that's not our priority anymore... Tsk,tsk..."; + mes "We've come all the way here to keep track of Satan Morocc, but... Now it seems that's not our priority anymore... Tsk,tsk..."; next; mes "[United Research Official]"; mes "Well, since our research group has been gathered in such haste, many of our members collide too often."; @@ -5023,7 +5023,7 @@ OnTouch_: mes "................."; next; mes "[United Research Official]"; - mes "Eh?! Oh, my... You really shouldn't. You must be extremely busy tracking down Satan Morroc!"; + mes "Eh?! Oh, my... You really shouldn't. You must be extremely busy tracking down Satan Morocc!"; next; mes "[United Research Official]"; mes "But... if you say so, could I really use your help? Hahaha."; @@ -5070,7 +5070,7 @@ OnTouch_: mes "Oh, by the way, did you get a rough idea of the atmosphere of this expedition?"; next; mes "[United Research Official]"; - mes "Normally, researchers just take their own instruments and find their own tracks of Satan Morroc."; + mes "Normally, researchers just take their own instruments and find their own tracks of Satan Morocc."; mes "They don't really need to cooperate with other members."; next; mes "[United Research Official]"; @@ -5138,25 +5138,25 @@ OnTouch_: mes "[United Research Official]"; mes "So, everyone's here."; mes "Let us begin our meeting."; - mes "First, I need to hear the report on the process of tracking Satan Morroc."; + mes "First, I need to hear the report on the process of tracking Satan Morocc."; next; mes "[Ryosen]"; - mes "Alright. I'm Ryosen from Rune-Midgarts. We're certain that Satan Morroc came to this place through the crack of dimension, however, we failed to find any traces within the area we inspected."; + mes "Alright. I'm Ryosen from Rune-Midgarts. We're certain that Satan Morocc came to this place through the crack of dimension, however, we failed to find any traces within the area we inspected."; next; mes "[Ryosen]"; - mes "The Tripartite Union is doing whatever it takes to track down Satan Morroc's whereabouts, but the research in Ash-Vacuum is very limited."; + mes "The Tripartite Union is doing whatever it takes to track down Satan Morocc's whereabouts, but the research in Ash-Vacuum is very limited."; next; mes "[Ryosen]"; mes "Supplies, reinforcements as wel as demanded goods are all insufficient, so we can't really go on."; next; mes "[Ryosen]"; - mes "I've heard the assassins took action in order to find the traces of Satan Morroc, but nothing's been reported so far."; + mes "I've heard the assassins took action in order to find the traces of Satan Morocc, but nothing's been reported so far."; next; mes "[Hue]"; - mes "I'm Hue from the Schwartzvalt Republic."; + mes "I'm Hue from the Schwarzwald Republic."; next; mes "[Hue]"; - mes "We're still researching on the crack of dimension that Satan Morroc has come through, and the false data research on the noise created when moving through the crack is currently being corrected."; + mes "We're still researching on the crack of dimension that Satan Morocc has come through, and the false data research on the noise created when moving through the crack is currently being corrected."; next; mes "[Hue]"; mes "The real cause of this problem has yet to be found, which makes it hard for us to provide any reinforcements or other supplies."; @@ -5165,7 +5165,7 @@ OnTouch_: mes "Ok. I see. How's it going with the research on Ash-Vacuum?"; next; mes "[Hansenne]"; - mes "Hi, I'm Hansenne from Arunafeltz. We have conclused that his world of Ash-Vacuum is nothing related to the continent of Rune Midgard, as it is placed in a totally indipendent world dimension."; + mes "Hi, I'm Hansenne from Arunafeltz. We have conclused that his world of Ash-Vacuum is nothing related to the continent of Midgard, as it is placed in a totally indipendent world dimension."; next; mes "[Hansenne]"; mes "The enviroment of the fields on the East and West where we can work on the research has nothing in common with the enviroment within the boundrary of the Tripartite Union's army post."; @@ -5174,7 +5174,7 @@ OnTouch_: mes "I also have been reported that the ecosystem in the researched are is different."; next; mes "[Hansenne]"; - mes "We could not go further with the research on the ecosystem due to some violent living creatures which have never been found on the Rune Midgard continent."; + mes "We could not go further with the research on the ecosystem due to some violent living creatures which have never been found on the Midgard continent."; next; mes "[United Research Official]"; mes "So... All in all, nothing has been clearly found. Any problems among the members of the United Research Group?"; @@ -5260,7 +5260,7 @@ OnTouch_: mes "This cake was just fine before that evil thing appeared, and there were only 4 of us here!"; next; mes "[Ryosen]"; - mes "One of you must be guilty of ruining my Rune-Midgart Strawberry Cake!!!"; + mes "One of you must be guilty of ruining my Rune-Midgarts' Strawberry Cake!!!"; next; mes "[Ryosen]"; mes "I can't help checking your hands! This must be a fingerprint! It's loud and clear!! Hmm, I bet this is the mark of an index finger!"; @@ -5270,7 +5270,7 @@ OnTouch_: next; mes "[Ryosen]"; mes "Whatttttt!? Only a cake????"; - mes "Aha, yeah, I just remembered. You people from Schwartzvalt don't ever appreciate food at all, right?"; + mes "Aha, yeah, I just remembered. You people from Schwarzwald don't ever appreciate food at all, right?"; next; mes "[Ryosen]"; mes "Especially when the food is NOT yours, huh? That's why you people sneak a taste of other people's food like my strawberry cake!!!"; @@ -5529,7 +5529,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "Anyway, who are you? This place is restricted."; next; mes "[Ryosen]"; - mes "Ah! You must be the one who came to help us track down that Satan Morroc, the bastard who made the giant hole and then was gone like the wind."; + mes "Ah! You must be the one who came to help us track down that Satan Morocc, the bastard who made the giant hole and then was gone like the wind."; next; mes "[Ryosen]"; mes "Ugh. I should watch my mouth."; @@ -5537,29 +5537,29 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ next; mes "[Ryosen]"; mes "How about having some tea here?"; - mes "It's Rafflesia tea from Schwartzvalt. Don't even expect taste, it's awful... But what can I do? It's the only thing I've got..."; + mes "It's Rafflesia tea from Schwarzwald. Don't even expect taste, it's awful... But what can I do? It's the only thing I've got..."; set ep13_1_rhea,2; close; } else if (ep13_1_rhea == 2) { mes "[Ryosen]"; - mes "You must have heard about this, but this is the place where Satan Morroc landed through the crack of dimension."; + mes "You must have heard about this, but this is the place where Satan Morocc landed through the crack of dimension."; next; mes "[Ryosen]"; - mes "As you see, this seems like a totally different world. It's nothing like the continent of Rune Midgard, though we haven't found any concrete evidence. We decided to call this place Ash-Vacuum."; + mes "As you see, this seems like a totally different world. It's nothing like the continent of Midgard, though we haven't found any concrete evidence. We decided to call this place Ash-Vacuum."; next; mes "[Ryosen]"; - mes "We're doing everything we can, to track down Satan Morroc, but all those researchers from different countries couldn't help but wonder what this place really is."; + mes "We're doing everything we can, to track down Satan Morocc, but all those researchers from different countries couldn't help but wonder what this place really is."; next; mes "[Ryosen]"; mes "Well, so we're all interested in one thing. However, the real problem lies on our structure of the group."; next; mes "[Ryosen]"; - mes "Three different countries united to take down the comon enemy, Satan Morroc, byt they eventually started to gather and keep the information to themselves."; + mes "Three different countries united to take down the comon enemy, Satan Morocc, byt they eventually started to gather and keep the information to themselves."; next; mes "[Ryosen]"; mes "So... frankly speaking..."; - mes "Tracking Satan Morroc is not or major concern anymore. Our expedition was formed in such hase that so may things can cause problems in this group."; + mes "Tracking Satan Morocc is not or major concern anymore. Our expedition was formed in such hase that so may things can cause problems in this group."; next; mes "[Ryosen]"; mes "People don't believe other members of the group except for the ones from their own countries. They're all so sensitive that every little thing hits a nerve."; @@ -5585,7 +5585,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "Oh, well... Maybe the same thing's happening at other offices. People from other countries might have hidden some important information behind my back."; next; mes "[Ryosen]"; - mes "Whatever... Could you deliver this document to the Schwartzvalt and Arunafeltz researchers?"; + mes "Whatever... Could you deliver this document to the Schwarzwald and Arunafeltz researchers?"; next; if(select("Why me?:Alright.") == 1) { mes "[Ryosen]"; @@ -5597,39 +5597,39 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "No one in our research group wants to visit the offices of the other countries!"; next; mes "[Ryosen]"; - mes "Ok, now, please deliver the file to Hue and Hansenne. Hue's in charge of Schwartzvalt's documents and Hansenne's in chare of Arunafeltz's."; + mes "Ok, now, please deliver the file to Hue and Hansenne. Hue's in charge of Schwarzwald's documents and Hansenne's in chare of Arunafeltz's."; next; mes "[Ryosen]"; mes "The file contains the brief introduction and the schedule of the meesting."; next; mes "[Ryosen]"; - mes "For your information, you should go see Hue at the Schwartzvalt's office first. Otherwise, he'll be whining about it."; + mes "For your information, you should go see Hue at the Schwarzwald's office first. Otherwise, he'll be whining about it."; next; mes "[Ryosen]"; mes "You must check if they read and understand correctly after delivering it. Don't forget to get them to sign at the bottom of the page, just in case."; next; mes "[Ryosen]"; mes "Go on now."; - mes "Just so you know, today's Desert Day. Rune Midgard is sending some desserts through the crack of dimension, regularly."; + mes "Just so you know, today's Desert Day. Midgard is sending some desserts through the crack of dimension, regularly."; next; mes "[Ryosen]"; - mes "Rune Midgard's desserts are definitely the world's best."; + mes "Midgard's desserts are definitely the world's best."; next; mes "[Ryosen]"; mes "The only thing we enjoy here is that dessert we receive, once a week."; next; mes "[Ryosen]"; - mes "Schwartzvalt's Pineapple Jubilee is just awful. It tastes something like rusty steel."; + mes "Schwarzwald's Pineapple Jubilee is just awful. It tastes something like rusty steel."; next; mes "[Ryosen]"; mes "Arunafeltz's Desert Sandwich is nothing better than that. I think that sandwich's made of some old meat, otherwise, we wouldn't have been food poisoned so often!"; next; mes "[Ryosen]"; - mes "But, Rune-Midgart's Strawberry Cake! It's the best."; + mes "But, Rune-Midgarts' Strawberry Cake! It's the best."; next; mes "[Ryosen]"; mes "Nice and soft spongecake covered with sweet-tasting whipped cream, lots of fresh strawberries on top!"; - mes "Rune-Midgart's top chef, Charles Orleans makes it himself!!!"; + mes "Rune-Midgarts' top chef, Charles Orleans makes it himself!!!"; next; mes "[Ryosen]"; mes "Hurry, you must hurry up, or you won't be able to taste this wonderful cake!"; @@ -5649,7 +5649,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "Hurry up and deliver the document to Hue and Hansenne!"; next; mes "[Ryosen]"; - mes "Don't forget! Schwartzvalt's Hue must get it first, otherwise, he'll nag us like crazy."; + mes "Don't forget! Schwarzwald's Hue must get it first, otherwise, he'll nag us like crazy."; next; mes "[Ryosen]"; mes "And you must get the document signed at the bottom before you bring it back."; @@ -5910,7 +5910,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "Could you go see the Official in my stead and set up a meeting?"; next; mes "[Ryosen]"; - mes "Oh! And... Here's Rune-Midgart's fresh strawberry cake. This is for you. I'm so sorry I haven't even offered you a piece. I was so distracted with stress, I think."; + mes "Oh! And... Here's Rune-Midgarts' fresh strawberry cake. This is for you. I'm so sorry I haven't even offered you a piece. I was so distracted with stress, I think."; next; mes "[Ryosen]"; mes "Thank you so much for everything you've done. And... pleade don't forget to do me this last favor, going to the Official and setting up a meeting."; @@ -5951,7 +5951,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "I heard you can get this thing from a monster named, 'Cornus' found in the fields."; next; mes "[Ryosen]"; - mes "Or... do you have any ^0000ffMystic Horns^000000 with you? Of course, I'm not saying that I want it for free. If you'd give me ^0000ff2 Mystic Horns^000000, I'd give you my Rune-Midgart's Strawberry Cake."; + mes "Or... do you have any ^0000ffMystic Horns^000000 with you? Of course, I'm not saying that I want it for free. If you'd give me ^0000ff2 Mystic Horns^000000, I'd give you my Rune-Midgarts' Strawberry Cake."; next; switch(select("I haven't seen such a thing.:Oh, ok, I'll give you!")) { case 1: @@ -5967,7 +5967,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "Huh?"; next; mes "[Ryosen]"; - mes "You have Rune-Midgart's Strawberry Cake?"; + mes "You have Rune-Midgarts' Strawberry Cake?"; next; mes "[Ryosen]"; mes "How come you haven't had it yet?"; @@ -6105,11 +6105,11 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ if (.@shu_agree00 == 2) { mes "[Hue]"; mes "...Meeting Schedule, on the Xth day, from hh:mm to hh:mm..."; - mes "Location... Rune-Midgart's camp..."; - mes "Ha! I knew it. Rune-Midgart's camp again!"; + mes "Location... Rune-Midgarts' camp..."; + mes "Ha! I knew it. Rune-Midgarts' camp again!"; next; mes "[Hue]"; - mes "Objectives... to report on the researching progress of tracking Satan Morroc and the Ash-Vacuum!"; + mes "Objectives... to report on the researching progress of tracking Satan Morocc and the Ash-Vacuum!"; next; mes "[Hue]"; mes "Having some time to get to know each other??? Haaaaa!"; @@ -6177,7 +6177,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ mes "Whew... I can't even stand looking at it! Oh just, give it to me!"; next; mes "[Hue]"; - mes "Too bad I'm not in Schwartzvalt. I could use our document restoring machine back at home... Ugh! Now I gotta do everything manually."; + mes "Too bad I'm not in Schwarzwald. I could use our document restoring machine back at home... Ugh! Now I gotta do everything manually."; next; mes "[Hue]"; mes "Hmmm. It's completely soaked. I Should dry this thing first and iron these crumples. Then, I should restore the texts."; @@ -6307,11 +6307,11 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ mes "Oh, I'm so embarrassed to see him face to face. Or.. how about..."; next; mes "[Hue]"; - mes "Here, this is the Rune-Midgart's report I took with me when everything went messy in the meeting room. Could you please give this to Ryosen?"; + mes "Here, this is the Rune-Midgarts' report I took with me when everything went messy in the meeting room. Could you please give this to Ryosen?"; next; mes "[Hue]"; mes "I'm sorry to ask you this but..."; - mes "Could you? For this, I'll give you some Schwartzvalt's Pineapple Jubilee."; + mes "Could you? For this, I'll give you some Schwarzwald's Pineapple Jubilee."; next; mes "[Hue]"; mes "Please give this report to Ryosen."; @@ -6327,7 +6327,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ mes "Oh, I'm so embarrassed to see him face to face. Or.. how about..."; next; mes "[Hue]"; - mes "Here, this is the Rune-Midgart's report I took with me when everything went messy in the meeting room. Could you please give this to Ryosen?"; + mes "Here, this is the Rune-Midgarts' report I took with me when everything went messy in the meeting room. Could you please give this to Ryosen?"; next; mes "[Hue]"; mes "I'm sorry to ask you this but..."; @@ -6348,7 +6348,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ next; mes "[Hue]"; mes "Could you bring ^0000ffFur^000000 if you get some? I'm not asking it for free."; - mes "I'll give you my Pineapple Jubilee from Schwartzvalt, if you bring me ^0000ff2 Furs^000000."; + mes "I'll give you my Pineapple Jubilee from Schwarzwald, if you bring me ^0000ff2 Furs^000000."; next; switch(select("I don't have any, right now.:Oh, I'll give you Fur.")) { case 1: @@ -6364,7 +6364,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ mes "Ah, oh my."; next; mes "[Hue]"; - mes "You already have the Pineapple Jubilee from Schwartzvalt!"; + mes "You already have the Pineapple Jubilee from Schwarzwald!"; next; mes "[Hue]"; mes "I think you should drin that thing fast. Otherwise, all the ice will melt and it'll taste like some kinda medicine!"; @@ -6471,7 +6471,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "An invitation to the meeting?"; next; mes "[Hansenne]"; - mes "Hmm, Ryosen from Rune-Midgarts made it and... Hue from Schwartzvalt agreed to sign it too?"; + mes "Hmm, Ryosen from Rune-Midgarts made it and... Hue from Schwarzwald agreed to sign it too?"; next; mes "[Hansenne]"; mes "Hmmm, that's not funny at all."; @@ -6526,13 +6526,13 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "Meeting Schedule, shmeating schedule... Beating Schedule!!"; next; mes "[Hansenne]"; - mes "Location... Rune-Midgart's camp!"; + mes "Location... Rune-Midgarts' camp!"; mes "Rude-Midgard's camp!?!?"; mes "Are they camping in that place??"; mes "Haha, hahaha, hahahahahahahahaha."; next; mes "[Hansenne]"; - mes "Objectives... to report on the researching progress of tracking Satan Morroc and of the Ash-Vacuum!"; + mes "Objectives... to report on the researching progress of tracking Satan Morocc and of the Ash-Vacuum!"; next; mes "[Hansenne]"; mes "Ash-Vacuum!"; @@ -6680,7 +6680,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "Hmmmmm, but then... I'm afraid Ryosen would explode when he sees this! Boom!!!"; next; mes "[Hansenne]"; - mes "Schwartzvalt people have some talent in restoring things like this... Why don't you ask Hue to restore this?"; + mes "Schwarzwald people have some talent in restoring things like this... Why don't you ask Hue to restore this?"; next; mes "[Hansenne]"; mes "He'd scream so hard and the windows might break. But he'll do it."; @@ -6707,7 +6707,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "Hmmmmm, it's all screwed up. I'm afraid Ryosen would explode when he sees this! Boom!!!"; next; mes "[Hansenne]"; - mes "Schwartzvalt people have some talent in restoring things like this... Why don't you ask Hue to restore this?"; + mes "Schwarzwald people have some talent in restoring things like this... Why don't you ask Hue to restore this?"; next; mes "[Hansenne]"; mes "He'd scream so hard and the windows might break. But he'll do it."; @@ -7776,7 +7776,7 @@ function Catwarp; } } else if ((ep13_yong1 > 89) && (ep13_yong1 < 100)) { - switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morroc -> 4765z:Cancel")) { + switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morocc -> 4765z:Cancel")) { case 1: Catwarp(4765,1); case 2: Catwarp(4765,2); case 3: Catwarp(4765,3); @@ -7787,7 +7787,7 @@ function Catwarp; } } else if (ep13_yong1 > 99) { - switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morroc -> 4590z:Al De Baran -> 4590z:Cancel")) { + switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morocc -> 4590z:Al De Baran -> 4590z:Cancel")) { case 1: Catwarp(4590,1); case 2: Catwarp(4590,2); case 3: Catwarp(4590,3); @@ -7858,7 +7858,7 @@ function Catwarp; mes "Please remember, you can't come back easily once you move to Midgard."; next; if ((ep13_yong1 > 99) && (ep13_yong1 < 200)) { - switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morroc -> 4590z:Al De Baran -> 4590z:Cancel")) { + switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morocc -> 4590z:Al De Baran -> 4590z:Cancel")) { case 1: Catwarp(4590,1); case 2: Catwarp(4590,2); case 3: Catwarp(4590,3); @@ -7870,7 +7870,7 @@ function Catwarp; } } else if ((ep13_yong1 > 199) && (ep13_yong1 < 250)) { - switch(select("Alberta -> 4170z:Prontera -> 4170z:Izlude -> 4170z:Geffen -> 4170z:Payon -> 4170z:Morroc -> 4170z:Al De Baran -> 4170z:Juno -> 4170z:Cancel")) { + switch(select("Alberta -> 4170z:Prontera -> 4170z:Izlude -> 4170z:Geffen -> 4170z:Payon -> 4170z:Morocc -> 4170z:Al De Baran -> 4170z:Juno -> 4170z:Cancel")) { case 1: Catwarp(4170,1); case 2: Catwarp(4170,2); case 3: Catwarp(4170,3); @@ -7883,7 +7883,7 @@ function Catwarp; } } else if ((ep13_yong1 > 249) && (ep13_yong1 < 300)) { - switch(select("Alberta -> 4025z:Prontera -> 4025z:Izlude -> 4025z:Geffen -> 4025z:Payon -> 4025z:Morroc -> 4025z:Al De Baran -> 4025z:Juno -> 4025z:Einbroch -> 4025z:Cancel")) { + switch(select("Alberta -> 4025z:Prontera -> 4025z:Izlude -> 4025z:Geffen -> 4025z:Payon -> 4025z:Morocc -> 4025z:Al De Baran -> 4025z:Juno -> 4025z:Einbroch -> 4025z:Cancel")) { case 1: Catwarp(4025,1); case 2: Catwarp(4025,2); case 3: Catwarp(4025,3); @@ -7897,7 +7897,7 @@ function Catwarp; } } else if (ep13_yong1 > 299) { - switch(select("Alberta -> 3970z:Prontera -> 3970z:Izlude -> 3970z:Geffen -> 3970z:Payon -> 3970z:Morroc -> 3970z:Al De Baran -> 3970z:Juno -> 3970z:Einbroch -> 3970z:Lighthalzen -> 3970z:Cancel")) { + switch(select("Alberta -> 3970z:Prontera -> 3970z:Izlude -> 3970z:Geffen -> 3970z:Payon -> 3970z:Morocc -> 3970z:Al De Baran -> 3970z:Juno -> 3970z:Einbroch -> 3970z:Lighthalzen -> 3970z:Cancel")) { case 1: Catwarp(3970,1); case 2: Catwarp(3970,2); case 3: Catwarp(3970,3); @@ -8488,7 +8488,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal + ep13_start); if ((ep13_1_edq == 0) && (.@start > 115)) { mes "[Hibba Agip]"; - mes "*Sigh* Look at me, I used to command the desert of Morroc, but I've been deployed to a world that only God knows where..."; + mes "*Sigh* Look at me, I used to command the desert of Morocc, but I've been deployed to a world that only God knows where..."; next; mes "[Staff Officer Abidal]"; mes "Come on'that's not ture. In fact, you used to be an official of a small town, and have been promoted to the commander of the expedition."; @@ -8571,7 +8571,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ mes "I must say that I'm quite impressed."; next; mes "[Hibba Agip]"; - mes "As you know by now, I have to send out an expedition report to the national leaders of the Rune Midgard continent, and I need someone that I can trust."; + mes "As you know by now, I have to send out an expedition report to the national leaders of the Midgard continent, and I need someone that I can trust."; next; mes "[Hibba Agip]"; mes "I'd go if I could, but my duty is to command, and my instructor over there is too dense. He'll embarrass me by acting stupid in front of the national leaders."; @@ -8581,16 +8581,16 @@ mid_campin,90,121,5 script Hibba Agip 459,{ mes "Don't you think you're exaggerating?"; next; mes "[Hibba Agip]"; - mes "Hmm... Anyways, this is not a difficult mission. All you have to do is deliver this expedition report to officials of three countries of Rune Midgard. Simple right?"; + mes "Hmm... Anyways, this is not a difficult mission. All you have to do is deliver this expedition report to officials of three countries of Midgard. Simple right?"; next; getitem 11012,1; //Expedition_Report set ep13_1_edq,3; changequest 3086,3087; mes "[Hibba Agip]"; - mes "The officials are ^0000FFMinister Laur^000000 of the Rune-Midgart's Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz, and ^0000FFGerhart^000000 of the Schwatzvalt Republic."; + mes "The officials are ^0000FFMinister Laur^000000 of the Rune-Midgarts' Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz, and ^0000FFGerhart^000000 of the Schwatzvalt Republic."; next; mes "[Hibba Agip]"; - mes "A messenger, who will inform the official of your arrival, is waiting for you at the time-space gap to RUne Midgard. You'd better find him before you leave."; + mes "A messenger, who will inform the official of your arrival, is waiting for you at the time-space gap to Midgard. You'd better find him before you leave."; next; mes "[Hibba Agip]"; mes "Since the officials are busy attending to national matters, they won't meet you unless they're informed of your arrival beforehand. I doubt those pretentious guys would even want to see me."; @@ -8809,7 +8809,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ mes "It looks alright. I don't have to read this thoroughly because I trust Abidal."; next; mes "[Hibba Agip]"; - mes "Now, let's go back to your original mission. I'd like you to deliver this to the national leaders of the three countries of Rune Midgard."; + mes "Now, let's go back to your original mission. I'd like you to deliver this to the national leaders of the three countries of Midgard."; next; getitem 11012,3; //Expedition_Report mes "[Hibba Agip]"; @@ -8820,7 +8820,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ mes "Of course, you can't see them because they're undercover soldiers under my direct command. Hahaha!"; next; mes "[Hibba Agip]"; - mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwaltzvalt Republic."; + mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune-Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwarzwald Republic."; next; mes "[Hibba Agip]"; mes "Make sure to deliver the report to them without fail. Come back in one piece, alright?"; @@ -8829,7 +8829,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ } else if ((ep13_1_edq == 9) && (countitem(11012) == 3)) { mes "[Hibba Agip]"; - mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwaltzvalt Republic."; + mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune-Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwarzwald Republic."; next; mes "[Hibba Agip]"; mes "Make sure to deliver the report to them without fail. Come back in one piece, alright?"; @@ -8843,7 +8843,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ delitem 11012,countitem(11012); //Expedition_Report getitem 11012,3; //Expedition_Report mes "[Hibba Agip]"; - mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwaltzvalt Republic."; + mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune-Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwarzwald Republic."; next; mes "[Hibba Agip]"; mes "Make sure to deliver the report to them without fail. Come back in one piece, alright?"; @@ -8852,7 +8852,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ } else if (ep13_1_edq > 100) { mes "[Hibba Agip]"; - mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwaltzvalt Republic."; + mes "Let me remind you again. The officials are these three people: ^0000FFMinister Laur^000000 of the Rune-Midgarts Kingdom, ^0000FFPriest Nuria^000000 of Arunafeltz and ^0000FFGerhart^000000 of the Schwarzwald Republic."; next; mes "[Hibba Agip]"; mes "Make sure to deliver the report to them without fail. Come back in one piece, alright?"; @@ -9205,7 +9205,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ } else { mes "[Hibba Agip]"; - mes "*Sigh* Look at me, I used to command the desert of Morroc, but I've been deployed to a world that only God knows where..."; + mes "*Sigh* Look at me, I used to command the desert of Morocc, but I've been deployed to a world that only God knows where..."; next; mes "[Staff Officer Abidal]"; mes "Come on, that's not true. In fact, you used to be an official of a small town, and have been promoted to the commander of the expedition. Your success is almost too good to be true."; @@ -9245,7 +9245,7 @@ mid_campin,94,118,3 script Staff Officer Abidal 755,{ switch(select("Midgard Expedition Introduction:Midgard Expedition's Achievement:Situation in the Ash-Vacuum:Quit")) { case 1: mes "[Staff Officer Abidal]"; - mes "The Midgard Expedition is conducted by a group of explorers from the three countries of Rune Midgard and the Mercenary Association. We're here to explore the Ash-Vacuum."; + mes "The Midgard Expedition is conducted by a group of explorers from the three countries of Midgard and the Mercenary Association. We're here to explore the Ash-Vacuum."; next; mes "[Staff Officer Abidal]"; mes "Command Hibba Agip behind me is our commander. He may appear unreliable, but he has extensive knowledge and experience in exploration."; @@ -9311,7 +9311,7 @@ mid_campin,94,118,3 script Staff Officer Abidal 755,{ mes "Thank you so much. I had a good feeling about you, and I was so sure that you'd be willing to help."; next; mes "[Staff Officer Abidal]"; - mes "Let's cut to the chase. The mission is simple, deliver our expedition report to the three countries of Rune Midgard."; + mes "Let's cut to the chase. The mission is simple, deliver our expedition report to the three countries of Midgard."; next; mes "[Staff Officer Abidal]"; mes "But I have to tell you... We sent out three adventurers on this mission before you, and they all dissapeared. Please don't disclose this information to anyone."; @@ -10175,10 +10175,10 @@ spl_fild03,172,71,3 duplicate(Expedition Scout#1) Expedition Scout#4 707 close; } else { - mes "I'm Laur, the aide of the Home Minister of the Rune Midgarts Kingdom. Do you have any business with me?"; + mes "I'm Laur, the aide of the Home Minister of the Rune-Midgarts Kingdom. Do you have any business with me?"; next; mes "[Laur]"; - mes "Can you sense the great disorder occuring on the Midgard Continent and the Rune-Midgart's Kingdom?"; + mes "Can you sense the great disorder occuring on the Midgard Continent and the Rune-Midgarts' Kingdom?"; next; mes "[Laur]"; mes "Still, there always a silver lining, no matter how dangerous this world may become."; @@ -10633,7 +10633,7 @@ mid_campin,68,185,3 script Pursuit Party Leader#1 803,{ } else if (mao_morocc2 == 30) { mes "[Echinacea]"; - mes "I'm in charge of tracing the wavelength from the Rune Midgard Continent,"; + mes "I'm in charge of tracing the wavelength from the Midgard Continent,"; mes "and the south camp is tracing it in this area."; next; mes "[Echinacea]"; @@ -10649,7 +10649,7 @@ mid_campin,68,185,3 script Pursuit Party Leader#1 803,{ next; mes "[Echinacea]"; mes "Oh, is that the case? I see."; - mes "That means.. The man called Rayan isn't on the Rune Midgard Continent or in this Ash Vacuum."; + mes "That means.. The man called Rayan isn't on the Midgard Continent or in this Ash Vacuum."; next; mes "[Echinacea]"; mes "He must be somewhere else."; @@ -10913,15 +10913,15 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ mes "......"; mes "I don't know if Echinacea told you this already, but we are here"; mes "to follow the traces of Satan Morocc."; - mes "Some of us are here in the Ash Vacuum, and the rest are on the Rune Midgard Continent."; + mes "Some of us are here in the Ash Vacuum, and the rest are on the Midgard Continent."; next; mes "[Mr. Kidd]"; - mes "We exchange information with our colleagues in Morroc on a regular basis, but we haven't heard from them for a while."; + mes "We exchange information with our colleagues in Morocc on a regular basis, but we haven't heard from them for a while."; mes "How'd you like to go gather some information for me?"; mes "It should be simple, so you I hope you'll be able to handle this."; next; mes "[Mr. Kidd]"; - mes "At Southwest Morroc, you'll find an underground tavern."; + mes "At Southwest Morocc, you'll find an underground tavern."; mes "Go find ^4d4dffRin^000000."; mes "Tell her I've sent you, and she'll take care of you."; set mao_morocc2,4; @@ -10958,17 +10958,17 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ mes "I don't know if Echinacea told you this already, but we are here to follow the traces of Satan Morocc."; next; mes "[Mr. Kidd]"; - mes "Some of us are here in the Ash Vacuum, and the rest are on the Rune Midgard Continent."; + mes "Some of us are here in the Ash Vacuum, and the rest are on the Midgard Continent."; next; mes "[Mr. Kidd]"; - mes "We exchange information with our colleagues in Morroc on a regular basis, but we haven't heard from them for a while."; + mes "We exchange information with our colleagues in Morocc on a regular basis, but we haven't heard from them for a while."; next; mes "[Mr. Kidd]"; mes "How'd you like to go gather some information for me?"; mes "It should be simple, so you I hope you'll be able to handle this."; next; mes "[Mr. Kidd]"; - mes "At Southwest Morroc, you'll find an underground tavern."; + mes "At Southwest Morocc, you'll find an underground tavern."; mes "Go find ^4d4dffRin^000000."; mes "Tell her I've sent you, and she'll take care of you."; set mao_morocc2,4; @@ -10979,7 +10979,7 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ cutin "mocseal_kid01",2; mes "[Mr. Kidd]"; mes "Let me explain one more time."; - mes "Go speak to Rin in an underground tavern at Southwest Morroc."; + mes "Go speak to Rin in an underground tavern at Southwest Morocc."; mes "You won't miss the tavern if you look for a boy named Jack standing out the front."; close2; } @@ -11059,7 +11059,7 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ } else { mes "[" + strcharinfo(0) + "]"; - mes "(I was supposed to give him the 'Morroc Pursuit Journal' and a 'Bloody Crystal of the Darkness'..."; + mes "(I was supposed to give him the 'Morocc Pursuit Journal' and a 'Bloody Crystal of the Darkness'..."; mes "Err? Where have they gone? I need to find them.)"; close2; } @@ -11223,9 +11223,9 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ next; cutin "moc2_kid04",2; mes "[Mr. Kidd]"; - mes ".Alright, then. Would you rather capture reincarnations of Morroc and collect their remnants?"; + mes ".Alright, then. Would you rather capture reincarnations of Morocc and collect their remnants?"; mes "Scholars suspect the recent space-time phenomenon has been caused by the 'Bloody Crystals of the Darkness,'"; - mes "so they want to study the crystals, which they believe are remnants of the of Morroc's reincarnations."; + mes "so they want to study the crystals, which they believe are remnants of the of Morocc's reincarnations."; next; mes "[Mr. Kidd]"; mes "That sounds way more dangerous, doesn't it? Go check that place out instead."; @@ -12921,7 +12921,7 @@ que_job01,84,17,3 script Rin#moc_room2_1 885,{ mes "[Rin]"; mes "..This is...it."; mes "You can feel the evil spirit just by looking at it."; - mes "This...there's no doubt. It's the same kind of crystal as the ones found on Satan Morroc and his minions."; + mes "This...there's no doubt. It's the same kind of crystal as the ones found on Satan Morocc and his minions."; next; cutin "moc2_rin04",2; mes "[Rin]"; @@ -13778,7 +13778,7 @@ OnTouch: mes "It sounds like they're having a serious dispute.-"; next; mes "[" + strcharinfo(0) + "]"; - mes "...Rayan? ...Morroc? ...Resurrect...?"; + mes "...Rayan? ...Morocc? ...Resurrect...?"; mes "I have no idea what they're talking about. Why are they fighting?"; next; mes "[Rayan]"; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 45484738c3..854ac92c4c 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -219,7 +219,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ } } else if ((ep13_yong1 > 89) && (ep13_yong1 < 100)) { - switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morroc -> 4765z:Cancel")) { + switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morocc -> 4765z:Cancel")) { case 1: Catwarp(4765,1); case 2: Catwarp(4765,2); case 3: Catwarp(4765,3); @@ -230,7 +230,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ } } else if (ep13_yong1 > 99) { - switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morroc -> 4590z:Al De Baran -> 4590z:Cancel")) { + switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morocc -> 4590z:Al De Baran -> 4590z:Cancel")) { case 1: Catwarp(4590,1); case 2: Catwarp(4590,2); case 3: Catwarp(4590,3); @@ -300,7 +300,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ mes "With " + ep13_yong1 + " credit points, we offer the following warp services. Please remember, you can't come back easily once you move to Midgard."; next; if ((ep13_yong1 > 99) && (ep13_yong1 < 200)) { - switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morroc -> 4590z:Al De Baran -> 4590z:Cancel")) { + switch(select("Alberta -> 4590z:Prontera -> 4590z:Izlude -> 4590z:Geffen -> 4590z:Payon -> 4590z:Morocc -> 4590z:Al De Baran -> 4590z:Cancel")) { case 1: Catwarp(4590,1); case 2: Catwarp(4590,2); case 3: Catwarp(4590,3); @@ -312,7 +312,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ } } else if ((ep13_yong1 > 199) && (ep13_yong1 < 250)) { - switch(select("Alberta -> 4170z:Prontera -> 4170z:Izlude -> 4170z:Geffen -> 4170z:Payon -> 4170z:Morroc -> 4170z:Al De Baran -> 4170z:Juno -> 4170z:Cancel")) { + switch(select("Alberta -> 4170z:Prontera -> 4170z:Izlude -> 4170z:Geffen -> 4170z:Payon -> 4170z:Morocc -> 4170z:Al De Baran -> 4170z:Juno -> 4170z:Cancel")) { case 1: Catwarp(4170,1); case 2: Catwarp(4170,2); case 3: Catwarp(4170,3); @@ -326,7 +326,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ close; } else if ((ep13_yong1 > 249) && (ep13_yong1 < 300)) { - switch(select("Alberta -> 4025z:Prontera -> 4025z:Izlude -> 4025z:Geffen -> 4025z:Payon -> 4025z:Morroc -> 4025z:Al De Baran -> 4025z:Juno -> 4025z:Einbroch -> 4025z:Cancel")) { + switch(select("Alberta -> 4025z:Prontera -> 4025z:Izlude -> 4025z:Geffen -> 4025z:Payon -> 4025z:Morocc -> 4025z:Al De Baran -> 4025z:Juno -> 4025z:Einbroch -> 4025z:Cancel")) { case 1: Catwarp(4025,1); case 2: Catwarp(4025,2); case 3: Catwarp(4025,3); @@ -341,7 +341,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{ close; } else if (ep13_yong1 > 299) { - switch(select("Alberta -> 3970z:Prontera -> 3970z:Izlude -> 3970z:Geffen -> 3970z:Payon -> 3970z:Morroc -> 3970z:Al De Baran -> 3970z:Juno -> 3970z:Einbroch -> 3970z:Lighthalzen -> 3970z:Cancel")) { + switch(select("Alberta -> 3970z:Prontera -> 3970z:Izlude -> 3970z:Geffen -> 3970z:Payon -> 3970z:Morocc -> 3970z:Al De Baran -> 3970z:Juno -> 3970z:Einbroch -> 3970z:Lighthalzen -> 3970z:Cancel")) { case 1: Catwarp(3970,1); case 2: Catwarp(3970,2); case 3: Catwarp(3970,3); @@ -3519,7 +3519,7 @@ OnTimer300000: // Otherworld language :: ep13_2_rhea //============================================================ -mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{ +mid_camp,197,237,3 script Schwarzwald Mechanic#1 869,{ if( !checkweight(2782,1)) { // Custom weight check. mes "[Mechanic Engineer Dorance]"; mes "It looks like you're carrying too many things."; @@ -3535,7 +3535,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{ mes "I don't know if it is a legend based on truth or not... but something like that would come in pretty handy."; next; mes "[Mechanic Engineer Dorance]"; - mes "Outside of the Expedition Camp, There's a race of animals which uses a mysterious language not used in Rune Midgard."; + mes "Outside of the Expedition Camp, There's a race of animals which uses a mysterious language not used in Midgard."; next; mes "[Mechanic Engineer Dorance]"; mes "We don't know if they are friend or foe, but it will be much easier for our research here if we could find out."; @@ -3551,7 +3551,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{ } else if ((ep13_2_rhea > 0) && (ep13_2_rhea < 7)) { mes "[Mechanic Engineer Dorance]"; - mes "Outside of the Expedition Camp, There's a race who uses a mysterious language which is not used in Rune Midgard"; + mes "Outside of the Expedition Camp, There's a race who uses a mysterious language which is not used in Midgard"; next; mes "[Mechanic Engineer Dorance]"; mes "We don't know if they are friend or foe, one thing for sure is it will be more easier for our research here."; @@ -3590,7 +3590,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{ mes "Sigh... Anyways, If there's any way to store an enormous amount of data, I should be able to make a very-small portable translator."; next; mes "[Mechanic Engineer Dorance]"; - mes "I heard that by using a Magical Spell of Rune-Midgart, you can transpose data to a magical power and lock it into a gem... I'd like some suggestions from the Rune-Midgarts Magician."; + mes "I heard that by using a Magical Spell of Rune-Midgarts, you can transpose data to a magical power and lock it into a gem... I'd like some suggestions from the Rune-Midgarts Magician."; next; mes "[Mechanic Engineer Dorance]"; mes "Would you be kind to ask them for help?"; @@ -3610,7 +3610,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{ mes "Sigh... Anyways, If there's any way to store an enormous amount of data, I could be able to make a very-small portable translator."; next; mes "[Mechanic Engineer Dorance]"; - mes "I heard that by using the Magical Spell of Rune Midgarts, you could transpose a data to a magical power and lock it into a gem....I'd like to get some suggestion from the Magician of Rune Midgarts."; + mes "I heard that by using the Magical Spell of Rune-Midgarts, you could transpose a data to a magical power and lock it into a gem....I'd like to get some suggestion from the Magician of Rune-Midgarts."; next; mes "[Mechanic Engineer Dorance]"; mes "Would you be kind to ask them for help?"; @@ -3817,7 +3817,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ mes "And...don't you think the reason man like me is here is that there's a predictable cause?"; next; mes "[Linguist Dictionary]"; - mes "From what I heard, you've done much for the Midgarts Alliance Research Group."; + mes "From what I heard, you've done much for the Midgard Alliance Research Group."; mes "And while you were helping us, I believe you've seen and visited many places here in the other world."; next; mes "[Linguist Dictionary]"; @@ -4036,7 +4036,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ mes "According to the Expedition Camp's investigation, there is a different ethnic race that is similar to fairy's, along with a different ethnic race that is similar to giants."; next; mes "[Linguist Dictionary]"; - mes "It is said that they are using a language that cannot be understood by people from Midgart... ...Although we all say this, nobody is able to remember their conversation / words."; + mes "It is said that they are using a language that cannot be understood by people from Midgard... ...Although we all say this, nobody is able to remember their conversation / words."; next; mes "[Linguist Dictionary]"; mes "A New language!!! As a linguist, I cannot sit here. But outside, there are many different monsters, as a scholar, it is too dangerous to go outside."; @@ -4111,10 +4111,10 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ } else if ((ep13_2_rhea > 3) && (ep13_2_rhea < 6)) { mes "[Linguist Dictionary]"; - mes "I heard that ^0000ffRune Midgarts Magician^000000 knows a way to conduct a research from a sample of language, would you go see him and ask him to help me?"; + mes "I heard that ^0000ffRune-Midgarts Magician^000000 knows a way to conduct a research from a sample of language, would you go see him and ask him to help me?"; next; mes "[Linguist Dictionary]"; - mes "The ^0000ff Rune Midgarts Magician^000000 is wandering inside of the Expedition Camp."; + mes "The ^0000ff Rune-Midgarts Magician^000000 is wandering inside of the Expedition Camp."; next; mes "[Linguist Dictionary]"; mes "It's difficult to continue this research without some more samples of language. Please do my favor."; @@ -4138,7 +4138,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ mes "How are we going to put together this tremendous data and make it into a portable translator... I just can't figure out how."; next; mes "[Linguist Dictionary]"; - mes "I wonder what the Mechanic Engineer from the Schwaltzvalt Republic would think... Would you be kind to go ask him?"; + mes "I wonder what the Mechanic Engineer from the Schwarzwald Republic would think... Would you be kind to go ask him?"; completequest 8247; setquest 8248; set ep13_2_rhea,7; @@ -4149,7 +4149,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ mes "Just how are we going to put together these tremendous data and make it into a portable translator...I just can't figure out how."; next; mes "[Linguist Dictionary]"; - mes "I wonder what the Mechanic Engineer from the Republic of Schwartzwalt would think...Would you be kind to go ask him?"; + mes "I wonder what the Mechanic Engineer from the Republic of Schwarzwald would think...Would you be kind to go ask him?"; close; } else if (ep13_2_rhea > 12) { @@ -4184,13 +4184,13 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{ } } -mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ +mid_camp,147,256,3 script Rune-Midgarts Magician#1 735,{ if (ep13_2_rhea < 4) { mes "[Magician Whisper]"; mes "To store a tremendous amount of information, well, it's impossible with existing technology."; next; mes "[Magician Whisper]"; - mes "Ancient Rune Midgarts Kingdom used a some kind of magic onto a magical gem to store large information...Using a gem as a storage..."; + mes "Ancient Rune-Midgarts Kingdom used a some kind of magic onto a magical gem to store large information...Using a gem as a storage..."; next; mes "[Magician Whisper]"; mes "Oh, pardon me, you have such a comfortable atmosphere and I involuntarily spoke to you. Who might you be?"; @@ -4348,7 +4348,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ mes "Of course it is a piece of cake to turn data into magical power and put'em into a gem...Most important thing is, I don't know if there's a jewl that has enough storage space to store that much of data..."; next; mes "[Magician Whisper]"; - mes "I heard that cold side of a field outside of the Expedition Camp, ^0000ff Mysterious Ore that can't be found in the Midgart."; + mes "I heard that cold side of a field outside of the Expedition Camp, ^0000ff Mysterious Ore that can't be found in the Midgard."; next; mes "[Magician Whisper]"; mes "Only if we could find that ore, it would make this work much easier... What do you think about that? Do you think you could go and find one for me?"; @@ -4380,7 +4380,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ mes "[Magician Whisper]"; mes "Lumos Nox Densaugeo Dissendium Diffindo Engorgio Mobiliarbus Expecto patronum!!!!"; next; - specialeffect EF_FLASHER; // 99 : "Rune Midgarts Magician#ep132_rhea03" EF_FLASHER + specialeffect EF_FLASHER; // 99 : "Rune-Midgarts Magician#ep132_rhea03" EF_FLASHER emotion ET_SURPRISE; mes "[Magician Whisper]"; mes "Wow!!! Th, This is unbelievable!"; @@ -4399,7 +4399,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ } else { mes "[Magician Whisper]"; - mes "I heard that the cold side of the field outside of the Expedition Camp has a Unidentified Mineral that can't be found in Rune Midgard."; + mes "I heard that the cold side of the field outside of the Expedition Camp has a Unidentified Mineral that can't be found in Midgard."; next; mes "[Magician Whisper]"; mes "Only if we could find that ore, it would make this work much easier... What do you think about that? Do you think you could go and find one for me?"; @@ -4419,11 +4419,11 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ next; mes "[Magician Whisper]"; mes "I've just finished infusing the magical power."; - mes "From now on, it's up to the Mechanic Engineer from Schwartzwalt to combined this gem with a machine to make it work as a real-time translator."; + mes "From now on, it's up to the Mechanic Engineer from Schwarzwald to combined this gem with a machine to make it work as a real-time translator."; next; mes "[Magician Whisper]"; mes "I will ask you one last favor."; - mes "Please deliver this crafted gem to the Mechanic Engineer from Schwartzwalt."; + mes "Please deliver this crafted gem to the Mechanic Engineer from Schwarzwald."; next; mes "[Magician Whisper]"; mes "I'm really sorry to ask you so many favors..., Ah...I've used up too much magical power...I should rest for a while."; @@ -4444,7 +4444,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{ } else if (ep13_2_rhea == 11) { mes "[Magician Whisper]"; - mes "Please deliver this crafted gem to the Mechanic Engineer from Schwartzwalt."; + mes "Please deliver this crafted gem to the Mechanic Engineer from Schwarzwald."; next; mes "[Magician Whisper]"; mes "I'm really sorry to ask you so many favors..., Ah...I've used up too much magical power...I should rest for a while."; @@ -4740,7 +4740,7 @@ man_in01,372,221,5 script Scientist#lifeguard 449,{ case 2: setarray .@rand_dayq$[0],"Abyss Lake","5","3"; break; case 3: setarray .@rand_dayq$[0],"Thor Volcano","5","4"; break; } - mes "Recently, someone who came from Schwaltzvalt gave me a small mineral as a gift from his home town when he saw our study of Bradium."; + mes "Recently, someone who came from Schwarzwald gave me a small mineral as a gift from his home town when he saw our study of Bradium."; next; mes "[Dr. Lifeguard]"; mes "I can't say for sure until now,"; @@ -4761,7 +4761,7 @@ man_in01,372,221,5 script Scientist#lifeguard 449,{ mes "examination."; next; mes "[Dr. Lifeguard]"; - mes "You said you're from Rune Midgard, right? Do you think you can bring me a little bit more of that mineral.."; + mes "You said you're from Midgard, right? Do you think you can bring me a little bit more of that mineral.."; next; mes "[Dr. Lifeguard]"; mes "He said it's from"; @@ -5483,7 +5483,7 @@ spl_in01,30,324,3 script High Laphine#grenouille 446,{ erasequest 2186; set ep13_2_tre1,0; mes "[Grenouille]"; - mes "I've heard that some strangers from Rune Midgard are around here, it must be you."; + mes "I've heard that some strangers from Midgard are around here, it must be you."; mes "I'm Grenouille, a scientist."; next; mes "[Grenouille]"; @@ -5667,7 +5667,7 @@ spl_in01,30,324,3 script High Laphine#grenouille 446,{ mes "Thanks for your help."; mes "This is my reward for you."; mes "I hope this will be helpful to you."; - mes "If you have something to talk to me about, come to me whenever. Nice to meet you, human from Rune Midgard."; + mes "If you have something to talk to me about, come to me whenever. Nice to meet you, human from Midgard."; set ep13_2_tre1,6; changequest 2185,2186; getitem 6081,3; //Splendide_Coin diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index 179ceb01a1..0ad2290800 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -93,7 +93,7 @@ airplane,47,61,7 script Crewman 4_M_ZONDAOYAJI,{ mes "[Kain Himere]"; mes "You know, scientific research"; mes "has made living easier and more"; - mes "comfortable in the Schwaltzvalt"; + mes "comfortable in the Schwarzwald"; mes "Republic, much in the way magic"; mes "research has changed life in the Rune-Midgarts Kingdom."; } @@ -2106,7 +2106,7 @@ airplane,236,163,5 script Airship Captain#03 4_M_REINDEER,{ next; mes "[Ferlock]"; mes "Haha, you must be surprised by this, huh? As you see, this book is a magic book which you do not need to turn the pages to find a specific page."; - mes "Well, this is how we, Schwaltzvalt Republicans adopt magic in their lives."; + mes "Well, this is how we, Schwarzwald Republicans adopt magic in their lives."; next; mes "[Ferlock]"; mes "My old friend has given me this....well, it is not important at this moment anyways."; @@ -2303,7 +2303,7 @@ airplane,236,163,5 script Airship Captain#03 4_M_REINDEER,{ mes "specializes in international"; mes "flights and suffers from the"; mes "Gremlin invasions, so we are"; - mes "guessing the attackers are from outside the Schwaltzvalt Republic."; + mes "guessing the attackers are from outside the Schwarzwald Republic."; next; mes "[Ferlock]"; mes "In any case, that is all"; @@ -2727,7 +2727,7 @@ airplane,236,63,4 script Hallen 4_M_KID1,{ mes "[Hallen]"; mes "The great Sage Varmunt..."; mes "It's a pretty well known"; - mes "legend in the Schwaltzvalt"; + mes "legend in the Schwarzwald"; mes "Republic. Anyway, for my"; mes "project, I wanted to learn"; mes "more about these Airships."; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 0cae4fc565..488ce900ee 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -1142,7 +1142,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 120,{ mes "After we made camp on shore and explored the island, we learned something quite remarkable."; next; mes "[Gotanblue]"; - mes "There was a man who had actually made it to Turtle Island before us. His records, however, never reached Rune-Midgard. He was a great swordmaster known simply as ^3355FFOne^000000."; + mes "There was a man who had actually made it to Turtle Island before us. His records, however, never reached Rune-Midgarts. He was a great swordmaster known simply as ^3355FFOne^000000."; next; mes "[Gotanblue]"; mes "According to his records, he had traveled alone to find Turtle Island and made it by himself. But we couldn't find any sign of him anywhere..."; @@ -1175,7 +1175,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 120,{ mes "As we struggled with the fog, we lost our comrades one by one. In the end, Jornadan, the drunken old man you met, and myself were the only ones who were able to return home to Alberta."; next; mes "[Gotanblue]"; - mes "We were the only ones who did not give in to despair, and doggedly held onto our hopes. Still, it was by pure luck that we found a way back to Rune-Midgard."; + mes "We were the only ones who did not give in to despair, and doggedly held onto our hopes. Still, it was by pure luck that we found a way back to Rune-Midgarts."; next; mes "[Gotanblue]"; mes "Well, that's my story. You know, if you want to learn more about Turtle Island, why don't you speak to the scholar on the eastern port of Alberta?"; @@ -1397,7 +1397,7 @@ alberta,246,117,4 script Voyage log#tur 111,{ next; mes "[Voyage Log]"; mes "XO / X date"; - mes "Well, it wasn't exactly like the bananas we have in Rune-Midgard, but it was very similar."; + mes "Well, it wasn't exactly like the bananas we have in Rune-Midgarts, but it was very similar."; next; mes "[Voyage Log]"; mes "O / O date"; diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 122ba8d775..cdaa36c65a 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -23,7 +23,7 @@ aldeba_in,152,166,4 script Trader#01 86,{ mes "I, the enigmatic and debonair 'Trader?'"; next; mes "[Trader]"; - mes "Traveling about the Rune-Midgard Continent, with all of his wonderful hats? Nobody knows..."; + mes "Traveling about the Midgard Continent, with all of his wonderful hats? Nobody knows..."; next; mes "[Trader]"; mes "For what purpose do I collect and trade these hats from all around the world? Choose a hat, get closer to unraveling the mystery..."; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index e58bc74662..3f65cb52f2 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -52,7 +52,7 @@ amatsu,223,236,3 script Publisher#ama 763,{ mes "[Publisher]"; mes "Eh~!? How can you not know about"; mes "Momotaro? Don't they have this"; - mes "tale in Rune-Midgard?? Well..."; + mes "tale in Midgard?? Well..."; mes "Let me tell you the story."; next; mes "[Publisher]"; @@ -1324,7 +1324,7 @@ amatsu,112,164,4 script Gate Soldier#ama1 767,{ amatsu,119,164,4 script Gate Soldier#ama2 767,{ mes "[Gate Soldier]"; - mes "Are you from Rune-Midgard?"; + mes "Are you from Midgard?"; mes "Welcome to Amatsu."; mes "Visit our lord in Chun-Su-Gak"; mes "when you go in."; @@ -1489,7 +1489,7 @@ ama_in02,170,62,4 script Soldier#ama2 767,{ } mes "[Gate Soldier]"; mes "The lord announced that"; - mes "he grants guests from Rune-Midgard the right to go anywhere."; + mes "he grants guests from Midgard the right to go anywhere."; mes "You don't need me to issue you a Transit Permit."; close; case 2: @@ -1517,7 +1517,7 @@ ama_in02,37,157,4 script Soldier#ama3 767,{ mes "lately. How do I say it..."; mes "Their faces are gloomy and"; mes "some of them are no longer around."; - mes "Have they gone to Rune-Midgard??"; + mes "Have they gone to Midgard??"; next; mes "[Saburo]"; mes "In this job, I encounter"; @@ -1540,7 +1540,7 @@ ama_in02,32,51,6 script Soldier#ama4 767,{ next; mes "[Shiro]"; mes "That quack's cold medicine"; - mes "is useless! I should never have trusted people from Rune-Midgard!"; + mes "is useless! I should never have trusted people from Midgard!"; mes "*Cough, Cough*..."; next; mes "[Shiro]"; @@ -1800,7 +1800,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 768,{ mes "They disappointed me."; next; mes "[Ishida Yoshinaga]"; - mes "You, who hail from Rune-Midgard,"; + mes "You, who hail from Midgard,"; mes "may be able to cure my mother's disease. I will reward you well if you succeed..."; next; set event_amatsu,2; @@ -1907,7 +1907,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 768,{ next; mes "[Ishida Yoshinaga]"; mes "Because you carry with you"; - mes "knowledge from Rune-Midgard,"; + mes "knowledge from Midgard,"; mes "I have faith in your ability."; close; } diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index e94f5e5472..30caa74da0 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -271,7 +271,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{ next; mes "[Powerful-Looking Woman]"; mes "Let me introduce myself."; - mes "My name is Shuda, I've lived in Ayotaya all my life. Since you don't have anything to do, I have"; + mes "My name is Shuda, I've lived in Ayothaya all my life. Since you don't have anything to do, I have"; mes "a favor to ask of you."; next; mes "[Shuda]"; @@ -350,7 +350,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{ mes "[Shuda]"; mes "And her savior"; mes "would be known as"; - mes "the hero of Ayotaya."; + mes "the hero of Ayothaya."; next; mes "[" +strcharinfo(0)+ "]"; mes " ...Say what?!"; @@ -411,7 +411,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{ next; mes "[Powerful-Looking Woman]"; mes "^666666Stupid tourists, running"; - mes "around all over Ayotalla,"; + mes "around all over Ayothaya,"; mes "pestering and bothering"; mes "beautiful girls like me...^000000"; close; @@ -1157,7 +1157,7 @@ ayothaya,193,171,3 script Old Man#02 842,{ mes "[Tham]"; emotion ET_SURPRISE; mes "Oh, aren't you"; - mes "from Rune-Midgard?"; + mes "from Midgard?"; mes "Hello there~"; next; mes "[Tham]"; @@ -1172,7 +1172,7 @@ ayothaya,193,171,3 script Old Man#02 842,{ mes "Ah! I think, in his intense fear, he was screaming something about some kind of '^FF0000Shuda^000000,' or whatever. But what could it possibly mean?"; next; mes "[Tham]"; - mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayotaya."; + mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayothaya."; set thai_find,4; changequest 12031,12032; close; @@ -1181,7 +1181,7 @@ ayothaya,193,171,3 script Old Man#02 842,{ if (.@randayo < 5) { mes "[Tham]"; mes "Oh hello~"; - mes "I can tell from your clothes that you must be from Rune-Midgard."; + mes "I can tell from your clothes that you must be from Midgard."; next; mes "[Tham]"; mes "Recently, it seems that"; @@ -1194,7 +1194,7 @@ ayothaya,193,171,3 script Old Man#02 842,{ mes "Ah..."; mes "While you're here,"; mes "why don't you taste some"; - mes "authentic Ayotayan cuisine"; + mes "authentic Ayothaya cuisine"; mes "for yourself?"; next; mes "[Tham]"; @@ -1204,7 +1204,7 @@ ayothaya,193,171,3 script Old Man#02 842,{ mes "restaurants around here."; next; mes "[Tham]"; - mes "Anyway, I'm sure that you'll like it. I hope that you come visit Ayotaya as often as you can~"; + mes "Anyway, I'm sure that you'll like it. I hope that you come visit Ayothaya as often as you can~"; close; } else if (.@randayo > 4 && .@randayo < 7) { mes "[Tham]"; @@ -1219,10 +1219,10 @@ ayothaya,193,171,3 script Old Man#02 842,{ } else { mes "[Tham]"; mes "Oh hello~"; - mes "I can tell from your clothes that you must be from Rune-Midgard."; + mes "I can tell from your clothes that you must be from Midgard."; next; mes "[Tham]"; - mes "I hope that you enjoy your stay here, and that you come visit Ayotaya as often as you can~"; + mes "I hope that you enjoy your stay here, and that you come visit Ayothaya as often as you can~"; close; } } @@ -1849,7 +1849,7 @@ ayo_fild01,129,197,0 script Puraim#thai1 842,{ mes "have a holy spirit. Still, be careful. You might not want to go to the 2nd underground level of the ruins."; next; mes "[Puraim]"; - mes "As you Rune-Midgardians"; + mes "As you Midgardians"; mes "say, 'curiousity killed the cat.'"; mes "Anyway, go for it!"; next; @@ -2110,9 +2110,9 @@ ayothaya,196,265,3 script Einon#ayo 842,{ mes "of this village is?"; next; mes "[Einon]"; - mes "Ayotaya is world famous"; + mes "Ayothaya is world famous"; mes "for its regional cuisine, but"; - mes "out of all Ayotayan dishes,"; + mes "out of all Ayothayan dishes,"; mes "'^3131FFTom Yum Goong^000000' is the best."; next; mes "[Einon]"; @@ -2165,7 +2165,7 @@ ayothaya,196,265,3 script Einon#ayo 842,{ close; } mes "[Einon]"; - mes "Golden Ayotaya..."; + mes "Golden Ayothaya..."; mes "Although I've grown"; mes "up in this village,"; mes "I still think my village"; @@ -2497,7 +2497,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{ mes "Thank you for all the trouble that you have been though to get these ingredients. It would make me happy if you shared Tom Yum Goong with your friends."; next; mes "[Mali the Spicy]"; - mes "Share the flavor of Ayotaya, and let them know how beautiful our land is. It was good to see you, take care now~"; + mes "Share the flavor of Ayothaya, and let them know how beautiful our land is. It was good to see you, take care now~"; close; } mes "[Mali the Spicy]"; @@ -3047,7 +3047,7 @@ ayothaya,213,94,7 script Merchant#ayo 841,{ mes "it has a very strong flavor. It's also hot and spicy, so you should be careful when you eat one."; next; mes "[Merchant Thongdum]"; - mes "The people of Ayotaya enjoy sensational food with distinct, spicy flavors. In Ayotayan cuisine, we use things like Chilis, garlic, ginger and cilantro."; + mes "The people of Ayothaya enjoy sensational food with distinct, spicy flavors. In Ayothayan cuisine, we use things like Chilis, garlic, ginger and cilantro."; next; mes "[Merchant Thongdum]"; mes "I'm selling Chilis,"; diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index 4d67eb93e8..75c5a4aa54 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -385,7 +385,7 @@ comodo,273,137,4 script Traveler#head 702,{ else { mes "[Isac Mari]"; mes "Grief for Greed..."; - mes "There's a tale of an honest Merchant that lived in Morroc long ago who had a quarrel with a bad guild."; + mes "There's a tale of an honest Merchant that lived in Morocc long ago who had a quarrel with a bad guild."; next; mes "[Isac Mari]"; mes "Because the honest Merchant was not cheating people by his prices, his street stall was attacked by the bad guild and all his goods were taken."; @@ -2101,11 +2101,11 @@ aldebaran,44,53,4 script Meteurengut#cmd 64,{ mes "that artifact, and its secrets"; mes "are as well guarded as that of"; mes "the Slate of Muriniel. However,"; - mes "I do know that a man in Morroc can create the Book of the Lamb..."; + mes "I do know that a man in Morocc can create the Book of the Lamb..."; next; mes "[Meteurengut]"; mes "If that man is still in"; - mes "Morroc, then he will probably"; + mes "Morocc, then he will probably"; mes "recognize the subtle emanation"; mes "of the Awakening Stone and the"; mes "Slate of Muriniel from you. Best of luck to you, adventurer..."; @@ -2131,7 +2131,7 @@ aldebaran,44,53,4 script Meteurengut#cmd 64,{ mes "[Meteurengut]"; mes "All I can tell you is that"; mes "there should be a man in"; - mes "Morroc that can create it"; + mes "Morocc that can create it"; mes "for you. A man like that can"; mes "sense the Slate of Muriniel,"; mes "so he may call out to you..."; @@ -2461,7 +2461,7 @@ comodo,232,87,4 script Won#cmd 106,{ mes "The first Sage that you"; mes "must visit is ^3355FFSage Yklah^000000"; mes "in the city of ^3355FFJuno^000000 in the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; mes "Your quest to obtain a"; mes "doomed sword isn't over yet..."; break; @@ -2477,7 +2477,7 @@ comodo,232,87,4 script Won#cmd 106,{ mes "The first Sage that you"; mes "must visit is ^3355FFSage Yklah^000000"; mes "in the city of ^3355FFJuno^000000 in the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; mes "Your quest to obtain a"; mes "doomed sword isn't over yet..."; break; diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index e988284eef..93947c5193 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -31,7 +31,7 @@ //= 1.5 Fixed double levelup bug [Lupus] //= 1.5.1 Fixed exploit [KarLaeda] //= 1.5.2 Updated Shino Quest to leave no grabage vars [Lupus] -//= 1.5.3 Fixed some typos regarding Schwartzvalt Trilogy [SinSloth] +//= 1.5.3 Fixed some typos regarding Schwarzwald Trilogy [SinSloth] //= 1.6 Updated Laboratory Entrance regarding Heart Fragment quest. [SinSloth] //= 1.7 Changed the laboratory entrance checking to prevent players //= from being stuck in the quest. [SinSloth] @@ -888,7 +888,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 85,{ mes "and this is my forge~! I am"; mes "the most elegant Blacksmith"; mes "and the best chef here in the"; - mes "Schwaltzvalt Republic~"; + mes "Schwarzwald Republic~"; next; mes "[Uwe]"; mes "Cooking is probably one"; @@ -1008,7 +1008,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 85,{ mes "Well, not just anyone can"; mes "bake delicious cakes, even"; mes "if they had the best oven in"; - mes "in the Schwaltzvalt Republic."; + mes "in the Schwarzwald Republic."; mes "And a child with all the tools"; mes "couldn't put a sword together."; next; @@ -3028,7 +3028,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 85,{ mes "and this is my forge~! I am"; mes "the most elegant Blacksmith"; mes "and the best chef here in the"; - mes "Schwaltzvalt Republic~"; + mes "Schwarzwald Republic~"; next; mes "[Uwe]"; mes "So, how can"; @@ -5758,7 +5758,7 @@ OnTouch_: break; case 7: set .@word1$,"I'm the King of All Weirdos! Now you know of my true power. Obey~!"; - set .@word2$,"0uNflAPPaBLe LoVaBLe SeCreTs AnD BoWLiNg aGaINST tHe KarMA of YoUtH"; + set .@word2$,"uNflAPPaBLe LoVaBLe SeCreTs AnD BoWLiNg aGaINST tHe KarMA of YoUtH"; mes "^3CBCBC"+.@word1$+"^000000"; next; input .@input1$; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 40cd630292..504a3e4b3d 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Quest NPCs related to Gonryun +//= Quest NPCs related to Kunlun //===== By: ================================================== //= KarLaeda //===== Current Version: ===================================== @@ -2559,7 +2559,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{ mes "Soon after, she started to suffer"; mes "from a serious illness. I've met"; mes "doctors from all around"; - mes "Rune-Midgard..."; + mes "Midgard..."; next; mes "[Aumgarl]"; mes "But not one of them could"; diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 600462fae5..8152bb93d7 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -104,7 +104,7 @@ hu_in01,387,245,0 script Allen Schuwell 849,2,2,{ next; mes "[Allen]"; mes "But you... I can count on you."; - mes "Even in Lighthazlen, I'd never"; + mes "Even in Lighthalzen, I'd never"; mes "find anyone as dependable as"; mes "you. This time, I've decided to"; mes "discipline my degenerate son."; @@ -2313,7 +2313,7 @@ hu_in01,256,40,3 script Herico 897,{ next; mes "[Herico]"; mes "Yes, you are right."; - mes "For the longest time, Schwaltzvalt Republic had had"; + mes "For the longest time, Schwarzwald Republic had had"; mes "^3131FFMercenary Soldiers^000000 who exchanged their lives"; mes "with the good money, and they used to take care of"; mes "all the dirty jobs in the past."; @@ -2600,7 +2600,7 @@ hu_in01,256,40,3 script Herico 897,{ mes "I am thinking about ^3131FFdestroying Regenschirm^000000."; next; mes "[Herico]"; - mes "Rekenber has become as powerful as this Schwaltzvalt Republic."; + mes "Rekenber has become as powerful as this Schwarzwald Republic."; mes "I don't think that I could destroy the entire corporation."; mes "But even if I could, it could also lead to the fall of my country,"; mes "because that's who big Rekenber means to this country."; @@ -2853,7 +2853,7 @@ hu_in01,256,40,3 script Herico 897,{ getitem 12044,1; //Herb Marinade Beef break; case 2: - getitem 12049,1; //Morroc Fruit Wine + getitem 12049,1; //Morocc Fruit Wine break; case 3: getitem 12059,1; //Lutie Cold Noodle @@ -2974,7 +2974,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{ mes "Oh yes, do you know what? \"Commutative contract\"."; next; mes "[Enquro Carson]"; - mes "I heard of a private pub in Morroc,"; + mes "I heard of a private pub in Morocc,"; mes "a city of Rune-Midgarts Kingdom"; mes "that is not open to the public."; mes "People keep talking about the pub's best drink,"; @@ -2995,7 +2995,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{ } else if (hg_tre == 46) { if (!countitem(12112) || !countitem(12113)) { mes "[Enquro Carson]"; - mes "I heard of a private pub in Morroc,"; + mes "I heard of a private pub in Morocc,"; mes "a city of Rune-Midgarts Kingdom"; mes "that is not open to the public."; mes "People keep talking about the pub's best drink,"; @@ -3021,7 +3021,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{ mes "^3131FFWintzil Trony^000000,"; mes "the last mercenary soldier for the last time in..."; mes "^FF0000Hugel^000000. Wait, Hugel?"; - mes "Isn't that the small country at the corner of Schwaltzvalt Republic?"; + mes "Isn't that the small country at the corner of Schwarzwald Republic?"; next; mes "["+strcharinfo(0)+"]"; mes "What? Hugel?"; @@ -3371,9 +3371,9 @@ hu_in01,317,312,0 script Book 111,{ mes "- You started reading the 8th page. -"; next; mes "Date: **month **day"; - mes "Our leader became desperate, so he sent a request to Schwaltzvalt Republic for ^3131FFa cease-fire agreement^000000."; + mes "Our leader became desperate, so he sent a request to Schwarzwald Republic for ^3131FFa cease-fire agreement^000000."; mes "I guess that he was frightened by guardians around the Varmunt mansion."; - mes "Sadly, Schwaltzvalt Republic declined our request without hesitation."; + mes "Sadly, Schwarzwald Republic declined our request without hesitation."; mes "They stated through their reponse that ^FF0000they would not tolerate this kind of unacceptable rebellion by any means,"; mes "and thus, they would take strong action against the rebellion this time.^000000."; mes "I guess that the government is determined to eliminate us, the mercenary soldiers through this event."; @@ -3391,7 +3391,7 @@ hu_in01,317,312,0 script Book 111,{ next; mes "Date: **month **day"; mes "It has been a while since I wrote a journal last time."; - mes "I am in Hugel, a small town at the border of Schwaltzvalt Republic."; + mes "I am in Hugel, a small town at the border of Schwarzwald Republic."; mes "Because of the locational penalty, people of this town seldom see outsiders, and if they see one, they treate them warmheartedly."; mes "Although I didn't have a time to write a journal that time, the last fight in the Varmunt mansion turned out to be our miserable defeat...as I was worried."; mes "I was told that Sage Varmunt disappeared after the fight, and all of his documents were taken by Rekenber."; @@ -5479,7 +5479,7 @@ hu_in01,15,372,3 script Cellette Lavit 74,{ mes "of a cult following, and it's"; mes "not widely popularized, but I'm"; mes "sure that it'll be considered"; - mes "representative of Schwaltzvalt"; + mes "representative of Schwarzwald"; mes "Republic cuisine someday."; next; mes "[Cellette]"; @@ -6271,9 +6271,9 @@ yuno,111,156,3 script Euslan 90,{ mes "[Euslan]"; mes "^333333*Cough*^000000 Oh, right..."; mes "My fiancee was planning on"; - mes "searching the Schwaltzvalt"; + mes "searching the Schwarzwald"; mes "Republic, so maybe the crewmen"; - mes "on the Schwaltzvalt Republic domestic flights might know him."; + mes "on the Schwarzwald Republic domestic flights might know him."; next; mes "[Euslan]"; mes "If you manage to find"; @@ -6340,9 +6340,9 @@ yuno,111,156,3 script Euslan 90,{ mes "[Euslan]"; mes "^333333*Cough*^000000 Oh, right..."; mes "My fiancee was planning on"; - mes "searching the Schwaltzvalt"; + mes "searching the Schwarzwald"; mes "Republic, so maybe the crewmen"; - mes "on the Schwaltzvalt Republic domestic flights might know him."; + mes "on the Schwarzwald Republic domestic flights might know him."; next; mes "[Euslan]"; mes "If you manage to find"; @@ -6705,7 +6705,7 @@ odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ mes "[Thierry]"; mes "Of course, I only told Euslan"; mes "that I'd be looking around the"; - mes "Schwaltzvalt Republic... If she"; + mes "Schwarzwald Republic... If she"; mes "knew I was at the Odin Shrine,"; mes "she'd worry too much about me."; next; @@ -8155,7 +8155,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "we have absolutely nothing to"; mes "give you. But you'd be doing"; mes "a great service your country,"; - mes "the Rune-Midgart's Kingdom."; + mes "the Rune-Midgarts' Kingdom."; next; cutin "hu_laura04.bmp",2; mes "[Laura]"; @@ -8192,7 +8192,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "more funding, we'd have more"; mes "than a cheesy recruitment ad,"; mes "and some professional staff"; - mes "like those rich Schwaltzvalt"; + mes "like those rich Schwarzwald"; mes "Republic boys in the next room!"; next; cutin "hu_laura02.bmp",2; @@ -8260,7 +8260,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "Sorry, let me introduce"; mes "myself. I'm Laura Laurence,"; mes "the leader of the Odin Shrine"; - mes "expedition for the Rune Midgarts Kingdom. Ashe Milton is my"; + mes "expedition for the Rune-Midgarts Kingdom. Ashe Milton is my"; mes "assistant for this excavation."; next; emotion ET_SMILE, getnpcid(0, "Ashe"); @@ -8300,7 +8300,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "[Laura]"; mes "Basically, I want you"; mes "to spy on that snobby girl,"; - mes "Alex of the Schwaltzvalt"; + mes "Alex of the Schwarzwald"; mes "Republic office, and report"; mes "what she's actually doing to me."; next; @@ -8402,7 +8402,7 @@ hu_in01,14,11,4 script Laura 70,{ cutin "hu_laura01.bmp",2; mes "[Laura]"; mes "Oh, those are the"; - mes "Schwartzvalt Republic"; + mes "Schwarzwald Republic"; mes "representatives for this"; mes "Odin Shrine expedition."; mes "Personally, I think they're"; @@ -8546,7 +8546,7 @@ hu_in01,14,11,4 script Laura 70,{ cutin "hu_laura02.bmp",2; mes "[Laura]"; mes "What do you think those"; - mes "Schwaltzvalt snobs are doing?"; + mes "Schwarzwald snobs are doing?"; mes "They must think this project"; mes "is an excuse for them to relax"; mes "and slack off! They can afford to, obviously. Hmpf! Rich people!"; @@ -8660,7 +8660,7 @@ hu_in01,14,11,4 script Laura 70,{ cutin "hu_laura02.bmp",2; mes "[Laura]"; mes "I wonder how much progress"; - mes "those pampered Schwaltzvalt"; + mes "those pampered Schwarzwald"; mes "snobs actually made. They've"; mes "got the funds, so they could"; mes "actually be further ahead"; @@ -8690,7 +8690,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "[Laura]"; mes "Basically, I want you"; mes "to spy on that snobby girl,"; - mes "Alex of the Schwaltzvalt"; + mes "Alex of the Schwarzwald"; mes "Republic office, and report"; mes "what she's actually doing to me."; next; @@ -8743,7 +8743,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "Frankly, I know I'm paying"; mes "you nothing to be spy, but"; mes "please tell me what you"; - mes "learned about the Schwaltzvalt"; + mes "learned about the Schwarzwald"; mes "Republic Research Team."; next; switch(select("Giantes:Ymir's Heart:Nothing")) { @@ -8819,7 +8819,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "brand, isn't it? Yeah,"; mes "it's popular amongst"; mes "the trendy crowd in the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; next; cutin "hu_laura01.bmp",2; mes "[Laura]"; @@ -8843,7 +8843,7 @@ hu_in01,14,11,4 script Laura 70,{ mes "I want you to check the"; mes "inner island, and see"; mes "what you can find while"; - mes "I investigate the Schwaltzvalt"; + mes "I investigate the Schwarzwald"; mes "Research Team. I'm sorry, but"; mes "you're the only one I can ask."; set hg_odin,20; @@ -9032,7 +9032,7 @@ hu_in01,16,20,4 script Ashe 95,{ case 4: mes "[Ashe]"; mes "Hm? You've decided to"; - mes "help the Schwaltzvalt Team?"; + mes "help the Schwarzwald Team?"; mes "That's fine, but I'm afraid"; mes "Ms. Laurence may be a little"; mes "upset by that. Well, it's fine"; @@ -9313,7 +9313,7 @@ hu_in01,162,85,4 script Ashe#2 95,{ mes "Um, I've got a favor"; mes "of my own to ask you."; mes "Would you please bring"; - mes "this file to Morroc? Just"; + mes "this file to Morocc? Just"; mes "bring it to my comrade"; mes "over at the South Gate."; next; @@ -9328,14 +9328,14 @@ hu_in01,162,85,4 script Ashe#2 95,{ changequest 11007,11008; mes "[Ashe]"; mes "Don't worry, my comrade"; - mes "at Morroc's South Gate will"; + mes "at Morocc's South Gate will"; mes "explain everything once you"; mes "find him. Please hurry!"; close; } else if (hg_odin == 59) { mes "[Ashe]"; mes "Don't worry, my comrade"; - mes "at Morroc's South Gate will"; + mes "at Morocc's South Gate will"; mes "explain everything once you"; mes "find him. Please hurry, and"; mes "find him as soon as you can!"; @@ -9354,7 +9354,7 @@ OnTouch_: mes "Um, I've got a favor"; mes "of my own to ask you."; mes "Would you please bring"; - mes "this file to Morroc? Just"; + mes "this file to Morocc? Just"; mes "bring it to my comrade"; mes "over at the South Gate."; next; @@ -9368,7 +9368,7 @@ OnTouch_: set hg_odin,59; mes "[Ashe]"; mes "Don't worry, my comrade"; - mes "at Morroc's South Gate will"; + mes "at Morocc's South Gate will"; mes "explain everything once you"; mes "find him. Please hurry!"; close; @@ -9465,7 +9465,7 @@ OnTouch_: mes "organization that's scattered"; mes "now, but some of the members"; mes "are still active. Just consider us enemies of Rekenber Corporation"; - mes "in the Schwaltzvalt Republic."; + mes "in the Schwarzwald Republic."; next; mes "[???]"; mes "Everything you saw and"; @@ -9477,7 +9477,7 @@ OnTouch_: next; mes "[???]"; mes "The people of Rune-Midgarts"; - mes "and Schwaltzvalt Republic still"; + mes "and Schwarzwald Republic still"; mes "don't know what's going on."; mes "A lot of people are just being"; mes "used... Like that one lady,"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index efbfd9e0c6..9fe6b9c998 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -359,7 +359,7 @@ function Func_JupHist; mes "read something? There are"; mes "many books that cover some"; mes "interesting topics, like the"; - mes "Schwaltzvalt economy..."; + mes "Schwarzwald economy..."; next; mes "[Fayruz]"; mes "Oh, in any case, please"; @@ -744,7 +744,7 @@ function Func_JupHist { mes "[Fayruz]"; mes "Just recently, I saw"; mes "him with his sister, my"; - mes "friend from Morroc. It's"; + mes "friend from Morocc. It's"; mes "weird to think that I'd have"; mes "these feelings for him after"; mes "all this time, isn't it? Oh...!"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index e49827083b..57118da504 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -199,7 +199,7 @@ lighthalzen,341,224,3 script Fishbone 4_M_LGTGUARD,{ mes "[Fishbone]"; mes "Anyway, good luck in"; mes "whatever it is you're doing"; - mes "here in Lighthazlen. Oh, and"; + mes "here in Lighthalzen. Oh, and"; mes "be real careful! Something"; mes "shadier than me is going"; mes "on in this big city~"; @@ -5314,7 +5314,7 @@ lhz_in01,27,247,5 script Representative#li_02 1_F_LIBRARYGIRL,{ mes "Rekenber was established"; mes "400 years ago, around the"; mes "same time as the foundation"; - mes "of the Schwaltzvalt Republic."; + mes "of the Schwarzwald Republic."; next; mes "[Representative]"; mes "We began as the ''Zent Zerter"; @@ -5450,7 +5450,7 @@ lhz_in01,25,251,3 script Rekenber Guidebook#li HIDDEN_NPC,{ mes "^3131FF#The Vision^000000"; mes "In the pursuit of knowledge,"; mes "Rekenber will search the"; - mes "Rune-Midgart continent for"; + mes "Rune-Midgarts continent for"; mes "ancient relics. We hope to make"; mes "significant scientific progress by learning the secrets of the past."; next; @@ -5459,7 +5459,7 @@ lhz_in01,25,251,3 script Rekenber Guidebook#li HIDDEN_NPC,{ mes "improve current technologies"; mes "to provide more convenient"; mes "and affordable services in"; - mes "the Schwaltzvalt Republic."; + mes "the Schwarzwald Republic."; next; mes "^3131FF#The Commitment^000000"; mes "Although magic and the"; @@ -5724,7 +5724,7 @@ lhz_in01,286,226,3 script Secretary Slierre#li 4_F_ZONDAGIRL,{ mes "biggest contributer of the"; mes "Regenschirm Laboratory."; mes "Their work will benefit the"; - mes "entire Rune-Midgard continent, hence our highly involved support."; + mes "entire Midgard continent, hence our highly involved support."; next; mes "[Sueii Slierre]"; mes "A representative at the"; @@ -6228,7 +6228,7 @@ lhz_in01,269,114,3 script A File#li-1 HIDDEN_NPC,{ close; } -// President Quest, a.k.a. Schwartzvalt Triology Quest +// President Quest, a.k.a. Schwarzwald Triology Quest //============================================================ lighthalzen,179,170,4 script Ordinary Man 4W_M_02,{ @@ -7115,7 +7115,7 @@ yuno_fild04,165,245,4 script Dismal Guy 4_M_ORIENT02,{ mes "Rekenber Corporation is"; mes "our sworn enemy. Did you"; mes "know that it basically controls"; - mes "the Schwaltzvalt Republic?"; + mes "the Schwarzwald Republic?"; next; mes "[Gushaar]"; mes "They're so powerful, they"; @@ -7136,12 +7136,12 @@ yuno_fild04,165,245,4 script Dismal Guy 4_M_ORIENT02,{ mes "The ultimate goal of our"; mes "group, ''Secret Wing,'' is to"; mes "establish true independence"; - mes "in the Schwaltzvalt Republic"; + mes "in the Schwarzwald Republic"; mes "by destroying Rekenber Corporation."; next; mes "[Gushaar]"; mes "Fortunately, the new president"; - mes "of the Schwaltzvalt Republic,"; + mes "of the Schwarzwald Republic,"; mes "Mr. Weierstrass, is sympathetic"; mes "to our cause. He is working with us to bring about a revolution and"; mes "overthrow Rekenber Corporation."; @@ -7257,7 +7257,7 @@ yuno_pre,69,20,4 script Secretary#1 4_F_LGTGIRL,{ mes "I'm the personal"; mes "secretary to the"; mes "president of the"; - mes "Schwartzvalt Republic,"; + mes "Schwarzwald Republic,"; mes "if that's what you mean."; close; } @@ -7677,7 +7677,7 @@ L_Mission: mes "exist to create money, but"; mes "the Rekenber Corporation"; mes "is much more nefarious."; - mes "They actually want to dominate the entire Rune-Midgard continent."; + mes "They actually want to dominate the entire Midgard continent."; next; mes "[Karl]"; mes "In fact, the chairman of"; @@ -7701,7 +7701,7 @@ L_Mission: mes "''Secret Wing's'' only"; mes "goal is to destroy the"; mes "Rekenber Corporation in"; - mes "order to break the Schwaltzvalt Republic free from its oppression."; + mes "order to break the Schwarzwald Republic free from its oppression."; next; mes "[Karl]"; mes "Of course, we realize"; @@ -8128,9 +8128,9 @@ L_Mission: mes "I hope you continue"; mes "to keep up the good"; mes "work, not only for the"; - mes "sake of the Schwaltzvalt"; + mes "sake of the Schwarzwald"; mes "Republic, but for peace"; - mes "on all of Rune-Midgard."; + mes "on all of Midgard."; close2; cutin "",255; end; @@ -8486,7 +8486,7 @@ L_Mission: next; mes "[Karl]"; mes "I have had my men to gather some information and learned that Regenschrim had stopped operating now."; - mes "You have done well for the Schwaltzvalt Republic."; + mes "You have done well for the Schwarzwald Republic."; close2; cutin "",255; end; @@ -9176,7 +9176,7 @@ lhz_fild01,66,219,4 script Mysterious Woman 4_F_AGENTKAFRA,{ mes "Good, you're back."; mes "Listen, all members of"; mes "Secret Wing need to leave"; - mes "the Schwaltzvalt Republic"; + mes "the Schwarzwald Republic"; mes "immediately! We've been"; mes "severely compromised..."; next; @@ -9225,7 +9225,7 @@ lhz_fild01,66,219,4 script Mysterious Woman 4_F_AGENTKAFRA,{ mes "Still, aside from a few"; mes "agents, almost all of Secret"; mes "Wing must pull out of the"; - mes "Schwaltzvalt Republic for"; + mes "Schwarzwald Republic for"; mes "now so that we can live to"; mes "fight another day."; next; @@ -9930,7 +9930,7 @@ lhz_in01,184,52,0 script Area 1-7 HIDDEN_NPC,{ mes "[Classified Info]"; mes "^8C1717Karl Weierstrass has"; mes "been a long distinguished"; - mes "politician in the Schwaltzvalt"; + mes "politician in the Schwarzwald"; mes "Republic and was elected as"; mes "its president in the year 984.^000000"; next; @@ -10015,7 +10015,7 @@ lhz_in01,184,46,0 script Area 3-2 HIDDEN_NPC,{ mes "3rd Security Team has alrady"; mes "placed secret agents in key"; mes "strategic locations within"; - mes "the Schwaltzvalt Republic.^000000"; + mes "the Schwarzwald Republic.^000000"; next; mes "^3355FFThis file is very intriguing,"; mes "but it doesn't really cover"; @@ -11273,7 +11273,7 @@ airplane_01,96,48,3 script Man#Lyozien 4_M_LGTMAN,{ mes "So you spoke to"; mes "Mr. Ahman already?"; mes "Good, good. Now we can"; - mes "go back to the Schwaltzvalt"; + mes "go back to the Schwarzwald"; mes "Republic for our next job."; next; mes "[Lyozien]"; @@ -11637,7 +11637,7 @@ OnStop: mes "Oh, it's you again."; mes "Shouldn't you be getting"; mes "on the Airship and heading"; - mes "back to the Schwaltzvalt"; + mes "back to the Schwarzwald"; mes "Republic? There are more"; mes "deliveries in queue, you know."; close; @@ -11990,11 +11990,11 @@ airplane_01,10,10,3 script #LyozienSwitch HIDDEN_NPC,{ //= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus] //= 3.0 Added Cursed Spirit Quest. [SinSloth] //= Moved a book non-related to Lighthalzen quests. -//= 3.1 Added Schwartzvalt Trilogy Quest. [SinSloth] +//= 3.1 Added Schwarzwald Trilogy Quest. [SinSloth] //= 3.2 Updated some NPCs regarding Hugel Rebellion Quest. [SinSloth] //= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf] //= reference to it in the Aegis script. -//= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth] +//= 3.3 Fixed a wrong negative value checking in Schwarzwald Trilogy quest. [SinSloth] //= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth] //= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf] //= Added cutins for "Maku" npc, and changed "set HP" to percentheal. diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 337cd49bd1..7bbab4f457 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Quest NPCs related to Louyang +//= Quest NPCs related to Luoyang //===== By: ================================================== //= Evera and The rAthena Dev Team //===== Current Version: ===================================== @@ -121,7 +121,7 @@ lou_in02,76,181,3 script Employee#2 822,2,2,{ mes "Sorry for making you wait. If you wish to rest, please go upstairs."; next; mes "[Huang Jia Xian]"; - mes "Recently, many tourists are visiting Louyang and although business is great, we're now"; + mes "Recently, many tourists are visiting Luoyang and although business is great, we're now"; mes "busier than ever."; next; mes "[Huang Jia Xian]"; @@ -310,7 +310,7 @@ lou_in02,62,183,3 script Chef#1-2 820,2,2,{ mes "My family has served food to Lord Bai Long for a long time. This restaurant is own by my family and I am the successor."; next; mes "[Wang Shi Long]"; - mes "Every dish my family cooks is counted among the most delicious food in Louyang."; + mes "Every dish my family cooks is counted among the most delicious food in Luoyang."; next; mes "[Wang Shi Long]"; mes "Our Dragon Soup won especially high praise from our Lord Bai Long."; @@ -319,7 +319,7 @@ lou_in02,62,183,3 script Chef#1-2 820,2,2,{ mes "I'm also proud to tell you that my family only uses the freshest, highest quality ingredients for our dishes."; next; mes "[Wang Shi Long]"; - mes "We have been popular in Louyang for hundreds and hundreds of years because of the quality of our gourmet food."; + mes "We have been popular in Luoyang for hundreds and hundreds of years because of the quality of our gourmet food."; next; mes "[Wang Shi Long]"; mes "Recently, though, I've had a bad feeling that someone is trying to take over our restaurant..."; @@ -360,7 +360,7 @@ lou_in02,62,183,3 script Chef#1-2 820,2,2,{ mes "I'm also proud to say that we cook with only the freshest and highest quality ingredients."; next; mes "[Wang Shi Long]"; - mes "We've always been popular in Louyang for hundreds and hundreds of years because of our high quality gourmet cuisine."; + mes "We've always been popular in Luoyang for hundreds and hundreds of years because of our high quality gourmet cuisine."; next; mes "[Wang Shi Long]"; mes "In this dry and hot weather,"; @@ -456,7 +456,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{ next; mes "[Jiu Lian Bu]"; mes "No offense, but I'm upset"; - mes "at the sheer number of tourists coming over to Louyang. Sure, I can understand that our town is attractive and has beautiful sights."; + mes "at the sheer number of tourists coming over to Luoyang. Sure, I can understand that our town is attractive and has beautiful sights."; next; mes "[Jiu Lian Bu]"; mes "But I just can't stand crowds of people. People gather like sheep"; @@ -464,11 +464,11 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{ next; mes "[Jiu Lian Bu]"; mes "Speaking of which, there's even"; - mes "a place in Louyang that's just like that. Man, I hate that restaurant!"; + mes "a place in Luoyang that's just like that. Man, I hate that restaurant!"; next; if (select("What restaurant?:Ignore him.") == 1) { mes "[Jiu Lian Bu]"; - mes "West of Louyang, there's"; + mes "West of Luoyang, there's"; mes "a restaurant built on a pond. It's been around for a long time, selling food for ridiculous prices!"; next; mes "[Jiu Lian Bu]"; @@ -510,7 +510,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{ mes "see things my way!"; next; mes "[Jiu Lian Bu]"; - mes "Okay, the restaurant is at the West side of Louyang. But you gotta be careful. The workers there watch over that broth like freakin' hawks!"; + mes "Okay, the restaurant is at the West side of Luoyang. But you gotta be careful. The workers there watch over that broth like freakin' hawks!"; next; mes "[Jiu Lian Bu]"; mes "When you finally steal the broth, make sure you bring it without spilling any. Okay? Good luck~"; @@ -615,7 +615,7 @@ lou_fild01,175,173,3 script Jiu Lian Bu#1-2 819,{ mes "So..."; mes "Whaddya think?"; mes "Prettiest place"; - mes "in Louyang, isn't it?"; + mes "in Luoyang, isn't it?"; next; mes "[Jiu Lian Bu]"; mes "Whenever I'm depressed"; @@ -953,7 +953,7 @@ lou_in02,80,173,3 script Li Min#lou 746,{ } mes "[Li Min]"; mes "Well, I don't really"; - mes "live here in Louyang."; + mes "live here in Luoyang."; mes "Still, I come here often"; mes "enough to visit."; next; @@ -1497,7 +1497,7 @@ lou_in02,265,69,5 script Doctor#lyang 814,{ mes "Hahaha..."; mes "I hope you enjoy"; mes "your visit here"; - mes "in Louyang."; + mes "in Luoyang."; close; } @@ -1569,7 +1569,7 @@ lou_in02,248,166,2 script Tool Shop Master#lou 824,{ } else if (ch_par == 3) { mes "[Wang Chuiyi]"; - mes "I can't understand why outsiders continue to travel here to Louyang despite the weather. I'm also getting tired of keeping my business here. Sooner or later,"; + mes "I can't understand why outsiders continue to travel here to Luoyang despite the weather. I'm also getting tired of keeping my business here. Sooner or later,"; mes "I may have to leave."; close; } @@ -1580,7 +1580,7 @@ lou_in02,248,166,2 script Tool Shop Master#lou 824,{ } else if (ch_par < 10) { mes "[Wang Chuiyi]"; - mes "I can't understand why outsiders continue to travel here to Louyang despite the weather. I'm also getting tired of keeping my business here. Sooner or later,"; + mes "I can't understand why outsiders continue to travel here to Luoyang despite the weather. I'm also getting tired of keeping my business here. Sooner or later,"; mes "I may have to leave."; close; } @@ -1837,13 +1837,13 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{ mes "a pain. Oh? You look like a tourist. Are you enjoying your stay?"; next; mes "[Jin Chiyuan]"; - mes "Although we've been having bad weather recently, there are many good places to visit in Louyang."; + mes "Although we've been having bad weather recently, there are many good places to visit in Luoyang."; mes "I hope you have a good time."; close; } else if (ch_par < 9) { mes "[Jin Chiyuan]"; - mes "Hm? A Rune-Midgardian?"; + mes "Hm? A Midgardian?"; mes "Now, how may I help you?"; next; if (select("I need a document.:I just dropped by.") == 1) { @@ -1886,7 +1886,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{ next; mes "[Jin Chiyuan]"; mes "^666666*Whispers*^000000"; - mes "^333333When you go up stairs, another officer will give you the document you want.^000000 ^666666*Ahem*^000000 Louyang thanks you!"; + mes "^333333When you go up stairs, another officer will give you the document you want.^000000 ^666666*Ahem*^000000 Luoyang thanks you!"; set Zeny, Zeny-.@input; if (ch_par == 5) { set ch_par,11; @@ -1960,7 +1960,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{ mes "[Jin Chiyuan]"; mes "Hahahaha..."; mes "Take care,"; - mes "Rune-Midgardian."; + mes "Midgardian."; } else if (ch_par == 15) { mes "[Jin Chiyuan]"; @@ -1969,7 +1969,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{ mes "didn't you?"; mes "Hahaha..."; mes "Enjoy your stay"; - mes "in Louyang!"; + mes "in Luoyang!"; emotion ET_SMILE; close; } @@ -2668,9 +2668,9 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "[Nagash Arses]"; mes "Are you asking me"; mes "about my hometown...?"; - mes "As a Rune-Midgardian,"; + mes "As a Midgardian,"; mes "I'm sure you've at least"; - mes "heard of Morroc..."; + mes "heard of Morocc..."; next; mes "[Nagash Arses]"; mes "A city built in the middle of the desert, its founders had to combat the harsh and unforgiving forces of nature everyday."; @@ -2683,13 +2683,13 @@ lou_in02,123,39,4 script Poison King#lou 824,{ next; if (ch_poison == 2) { mes "[Nagash Arses]"; - mes "Ah~ I miss Morroc, my hometown."; + mes "Ah~ I miss Morocc, my hometown."; mes "I used to be a member of the Assassin organization known as the 'Canine of Desert.' Long ago, I was their poison expert."; next; - switch(select("Tell him news of Morroc.:Info about 'Canine of Desert'.:Just listen.")) { + switch(select("Tell him news of Morocc.:Info about 'Canine of Desert'.:Just listen.")) { case 1: mes "[Nagash Arses]"; - mes "Hm? Do you have recent news of Morroc?"; + mes "Hm? Do you have recent news of Morocc?"; next; mes "["+strcharinfo(0)+"]"; mes "Yeah, I've got some news you might be interested in."; @@ -2784,10 +2784,10 @@ lou_in02,123,39,4 script Poison King#lou 824,{ next; mes "[Nagash Arses]"; mes "I was floated helplessly on the ocean and somehow managed"; - mes "to arrive here, in Louyang. That was forty years ago."; + mes "to arrive here, in Luoyang. That was forty years ago."; next; mes "[Nagash Arses]"; - mes "It seemed that my arrival was rather timely. Louyang was intruded by huge mobs of dangerous monsters that were even able to infiltrate the Castle of the Dragon."; + mes "It seemed that my arrival was rather timely. Luoyang was intruded by huge mobs of dangerous monsters that were even able to infiltrate the Castle of the Dragon."; next; mes "[Nagash Arses]"; mes "Since I was one of the best Assassins of the 'Canine of Desert,' I did far more than my share of monster killing."; @@ -2816,7 +2816,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "to put poison on weapons."; next; mes "[Nagash Arses]"; - mes "I even learned martial arts in Louyang, and combined that"; + mes "I even learned martial arts in Luoyang, and combined that"; mes "knowledge with my poison expertise to create my own unique fighting style."; next; mes "[Nagash Arses]"; @@ -2830,7 +2830,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ } else { mes "[Nagash Arses]"; - mes "Ah, Morroc."; + mes "Ah, Morocc."; mes "That name brings"; mes "back memories of"; mes "being an Assassin"; @@ -2839,9 +2839,9 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "[Nagash Arses]"; mes "^666666*Sigh...*^000000"; mes "I wish I could see"; - mes "Morroc just once before I die."; + mes "Morocc just once before I die."; next; - if (select("Tell him news of Morroc.:Ask about 'Canine of Desert.'") == 1) { + if (select("Tell him news of Morocc.:Ask about 'Canine of Desert.'") == 1) { mes "[Nagash Arses]"; mes "Hm...?"; mes "Is there anything"; @@ -2849,7 +2849,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ next; mes "["+strcharinfo(0)+"]"; mes "I have news"; - mes "of Morroc..."; + mes "of Morocc..."; input .@input$; mes "["+strcharinfo(0)+"]"; mes ""+.@input$+""; @@ -2943,7 +2943,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "this? Life used to be good."; next; mes "[Nagash Arses]"; - mes "As I told you, I distinguished myself in the battles with monsters. I was rewarded with Louyang citizenship and given"; + mes "As I told you, I distinguished myself in the battles with monsters. I was rewarded with Luoyang citizenship and given"; mes "gifts of money."; next; mes "[Nagash Arses]"; @@ -2984,7 +2984,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ next; } mes "[Nagash Arses]"; - mes "We managed to eliminate every monster that was wandering around Louyang. At the time, we were the only people brave enough to take on this sort of task."; + mes "We managed to eliminate every monster that was wandering around Luoyang. At the time, we were the only people brave enough to take on this sort of task."; next; mes "[Nagash Arses]"; mes "Unfortunately, other martial arts organizations grew envious of our success, insisting that we were dishonorable for using poison to attack our enemies."; @@ -3005,7 +3005,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "martial arts."; next; mes "[Nagash Arses]"; - mes "Even to this day, the police are hounding after me. I really want to tell the lord of Louyang that I'm innocent, but it may be"; + mes "Even to this day, the police are hounding after me. I really want to tell the lord of Luoyang that I'm innocent, but it may be"; mes "too late now..."; set ch_poison,4; close; @@ -3191,7 +3191,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ close; } mes "^3355FFYou tell Nagash Arses how"; - mes "Song Zhi Du created this Deadly Poison Bottle and his plan to get his revenge on the lord of Louyang.^000000"; + mes "Song Zhi Du created this Deadly Poison Bottle and his plan to get his revenge on the lord of Luoyang.^000000"; next; mes "[Nagash Arses]"; mes "^666666*Sigh...*^000000"; @@ -3285,7 +3285,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "Please, I beg you."; mes "For my sake, as well"; mes "as that of my disciple,"; - mes "Louyang's leader must live..."; + mes "Luoyang's leader must live..."; set ch_poison,16; changequest 11078,11079; close; @@ -3392,7 +3392,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "^3355FFHe looks tired"; mes "for some reason,"; mes "as if he's thinking"; - mes "of Morroc, his hometown.^000000"; + mes "of Morocc, his hometown.^000000"; next; mes "^3355FFYou reflect on when he gave you his remaining strength and remember that he told you that he used to be one of the greatest Assassins...^000000"; next; @@ -3499,7 +3499,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ close; } mes "[Song Zhi Du]"; - mes "Huh. I see. Well, thank you for your trouble once again. I hope you have a good time in Louyang."; + mes "Huh. I see. Well, thank you for your trouble once again. I hope you have a good time in Luoyang."; close; } else if (ch_par > 9 && ch_poison == 5) { @@ -3682,7 +3682,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ next; mes "[Song Zhi Du]"; mes "All that's left is to create this poison, and then to get the"; - mes "lord of Louyang to drink it..."; + mes "lord of Luoyang to drink it..."; close; } mes "[Song Zhi Du]"; @@ -3725,7 +3725,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ mes "Would you bring me the"; mes "box from the firecracker"; mes "lady at the entrance"; - mes "to Louyang? Thanks"; + mes "to Luoyang? Thanks"; mes "in advance."; close; } @@ -3777,7 +3777,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ mes "Would you bring me the"; mes "box from the firecracker"; mes "lady at the entrance"; - mes "to Louyang? Thanks"; + mes "to Luoyang? Thanks"; mes "in advance."; close; } @@ -3897,7 +3897,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ mes "[Song Zhi Du]"; mes "Hahahaha...!"; mes "Now, time has come."; - mes "With this poison, Louyang's"; + mes "With this poison, Luoyang's"; mes "lord will be cast into hell!"; next; mes "[Song Zhi Du]"; @@ -3930,7 +3930,7 @@ lou_in02,253,45,0 script Employee#poison 822,{ mes "I want you to put this poison some place where Lord Bai Long might stay. But be careful, the castle has a lot of security."; next; mes "[Song Zhi Du]"; - mes "Still, you're an adventurer from Rune-Midgard. You've probably had challenges like this before, so I'm sure you'll find a way."; + mes "Still, you're an adventurer from Midgard. You've probably had challenges like this before, so I'm sure you'll find a way."; next; mes "[Song Zhi Du]"; mes "Anyway, I'm sure my master"; @@ -4107,17 +4107,17 @@ lou_fild01,224,348,0 script Lady#delivery 817,{ if (rand(1,10) > 5) { mes "[Lady]"; mes "You're at the"; - mes "entrance of Louyang."; + mes "entrance of Luoyang."; mes "I hope you enjoy"; mes "your stay here~"; emotion ET_CHUP; close; } mes "[Lady]"; - mes "You're at the entrance of Louyang."; + mes "You're at the entrance of Luoyang."; next; mes "[Lady]"; - mes "Louyang is well known"; + mes "Luoyang is well known"; mes "for its various firecrackers."; mes "Would you like to see one?"; next; @@ -4215,7 +4215,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{ if (rand(1,10) > 5) { mes "[Lady]"; mes "You're at the"; - mes "entrance of Louyang."; + mes "entrance of Luoyang."; mes "I hope you have a good time~"; emotion ET_CHUP; close; @@ -4223,10 +4223,10 @@ lou_fild01,224,348,0 script Lady#delivery 817,{ mes "[Lady]"; mes "You're at the"; mes "entrance of"; - mes "Louyang."; + mes "Luoyang."; next; mes "[Lady]"; - mes "Louyang is well known"; + mes "Luoyang is well known"; mes "for its various firecrackers."; mes "Would you like to see one?"; next; @@ -4301,7 +4301,7 @@ lou_in01,114,163,0 script Trap#lou_in4 -1,6,1,{ OnTouch_: if (ch_poison == 12 || ch_poison == 16) { mes "[Soldier]"; - mes "Hold it right there, Rune-Midgardian!"; + mes "Hold it right there, Midgardian!"; next; mes "^3355FFYou run as fast as you can before the soldiers can catch you.^000000"; close2; @@ -4344,7 +4344,7 @@ louyang,217,278,0 script #lou_path 111,{ lou_in01,107,163,0 script #lou_drink1 111,{ if (ch_poison == 12) { - mes "^3355FFYou found a drink bottle that's possibly owned by Bai Long, lord of Louyang.^00000"; + mes "^3355FFYou found a drink bottle that's possibly owned by Bai Long, lord of Luoyang.^00000"; next; mes "^3355FFYou put the deadly poison into the bottle.^000000"; delitem 678,1; //Poison_Bottle @@ -4370,7 +4370,7 @@ lou_in01,107,163,0 script #lou_drink1 111,{ mes "^3355FFMaybe if you found some kind of empty bottle and filled it with something, like Sticky Mucus...^000000"; close; } - mes "^3355FFYou found a drink bottle. It's fancy enough that the only possible owner could be Bai Long, lord of Louyang.^000000"; + mes "^3355FFYou found a drink bottle. It's fancy enough that the only possible owner could be Bai Long, lord of Luoyang.^000000"; close; } @@ -4413,16 +4413,16 @@ lou_in01,99,158,4 script Lord#bailong 821,{ else { mes "[Lord Bai Long]"; mes "Hahahaha!"; - mes "Welcome to Louyang!"; + mes "Welcome to Luoyang!"; next; mes "[Lord Bai Long]"; - mes "Louyang is such a great city."; + mes "Luoyang is such a great city."; mes "We've protected this land for forty years from the invasions of evil creatures!"; next; mes "[Lord Bai Long]"; mes "I hope you enjoy"; mes "your stay here,"; - mes "Rune-Midgardian!"; + mes "Midgardian!"; next; if (ch_poison == 18) { mes "^3355FFYou give Nagash Arses' Journal"; @@ -4479,7 +4479,7 @@ lou_in01,99,158,4 script Lord#bailong 821,{ mes "Oh, I didn't realize you were still there... Listening to me."; next; mes "[Lord Bai Long]"; - mes "I'm sorry, I was just talking to myself. I hope you have a good time while staying here in Louyang."; + mes "I'm sorry, I was just talking to myself. I hope you have a good time while staying here in Luoyang."; close; } } @@ -4502,7 +4502,7 @@ lou_in01,111,151,4 script Soldier#bailong1 825,{ mes "much different."; next; mes "[Soldier]"; - mes "Supposedly, monsters used to intrude Louyang all the time! Heh, but that's just a rumor. Still, there are a bunch of rumors going around that I'm curious about..."; + mes "Supposedly, monsters used to intrude Luoyang all the time! Heh, but that's just a rumor. Still, there are a bunch of rumors going around that I'm curious about..."; close; } @@ -4583,7 +4583,7 @@ lou_in01,99,144,4 script Soldier#bailong4 825,{ mes "guy beside of me."; next; mes "[Soldier]"; - mes "I hope you have a good time while you're staying here in Louyang!"; + mes "I hope you have a good time while you're staying here in Luoyang!"; close; } @@ -4598,10 +4598,10 @@ lou_in02,77,37,7 script Hermit 824,{ mes "nothing we cannot do."; next; mes "[Sun Mao]"; - mes "Will you lend us your power, and help us build a better future? Will you join our movement for social reform in Louyang?"; + mes "Will you lend us your power, and help us build a better future? Will you join our movement for social reform in Luoyang?"; next; mes "[Sun Mao]"; - mes "It doesn't matter if you're a local or a foreigner. So long as we share the same goal of creating a better Louyang, where everyone is treated as an equal."; + mes "It doesn't matter if you're a local or a foreigner. So long as we share the same goal of creating a better Luoyang, where everyone is treated as an equal."; next; mes "[Sun Mao]"; mes "My name..."; @@ -4611,7 +4611,7 @@ lou_in02,77,37,7 script Hermit 824,{ switch(select("What am I supposed to do?:I will join you!:Well, I'm just another tourist...")) { case 1: mes "[Sun Mao]"; - mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Louyang, and even the world!"; + mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Luoyang, and even the world!"; next; mes "[Sun Mao]"; mes "However, we currently do not have the manpower to carry out the plans we have laid out. We've been lucky the lord hasn't found us out yet."; @@ -4639,7 +4639,7 @@ lou_in02,77,37,7 script Hermit 824,{ set QL_REVOL,1; mes "[Sun Mao]"; mes strcharinfo(0)+ "...!"; - mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!"; + mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Luoyang's future!"; next; getpartymember(getcharid(1)); set @partymember,$@partymembercount; @@ -4651,7 +4651,7 @@ lou_in02,77,37,7 script Hermit 824,{ mes "However, as to not arouse suspicion, bring only one new recruit at a time. Also, we suggest not to bring a friend in a party with you."; next; mes "[Sun Mao]"; - mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Louyang!"; + mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Luoyang!"; close; } mes "[Sun Mao]"; @@ -4730,7 +4730,7 @@ lou_in02,77,37,7 script Hermit 824,{ mes "At long last, there are eight of you. Now, I believe there is among manpower amongst you to carry out this mission. Please listen carefully."; next; mes "[Sun Mao]"; - mes "The martial arts organizations of Louyang, as you may well know, have been divided between those that fight for justice, and those that serve evil purposes."; + mes "The martial arts organizations of Luoyang, as you may well know, have been divided between those that fight for justice, and those that serve evil purposes."; next; mes "[Sun Mao]"; mes "Recently, some of the evil organizations have conspired with corrupt government officials in the interest to expand their power."; @@ -4742,7 +4742,7 @@ lou_in02,77,37,7 script Hermit 824,{ mes "Without him, we cannot continue the gunpowder research, or produce the gunpowder we'll need for our movement. We must contact him so that he may make gunpowder for us."; next; mes "[Sun Mao]"; - mes "Unfortunately, many of us cannot contact him, as our identities are known to the officials. However, since you are new recruits, as well as Rune-Midgardians, they will not know how you are."; + mes "Unfortunately, many of us cannot contact him, as our identities are known to the officials. However, since you are new recruits, as well as Midgardians, they will not know how you are."; next; mes "[Sun Mao]"; mes "Your mission will be to deliver these chemicals to our comrade Hao Chenryu who is held captive by the government."; @@ -4875,11 +4875,11 @@ lou_in01,43,147,3 script Gunpowder Expert 750,{ mes "Are you?"; next; mes "[Hao Chenryu]"; - mes "I only trust my comrades in the cause for Louyang, so leave me alone. Death before oppression! Freedom for Louyang!"; + mes "I only trust my comrades in the cause for Luoyang, so leave me alone. Death before oppression! Freedom for Luoyang!"; close; } else if (@partymember != 8) { mes "[Hao Chenryu]"; - mes "Mao told me that eight Rune-Midgardians"; + mes "Mao told me that eight Midgardians"; mes "would be coming."; mes "But what happened?"; mes "I'm confused..."; @@ -4961,7 +4961,7 @@ lou_in01,45,138,3 script Soldier#1 825,{ next; mes "[Soldier]"; mes "You're not allowed to bring any gunpowder out of here. Now go"; - mes "and put it back, Rune-Midgardian! Move!"; + mes "and put it back, Midgardian! Move!"; close; } mes "[Soldier]"; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index d0271dfc46..702ea24e8e 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Quest NPCs related to Morroc +//= Quest NPCs related to Morocc //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== @@ -11,12 +11,12 @@ //= - Stop Post //= - Binoculars Quest //= - Assassin Pub NPCs/supporting quest NPCS. [Disabled] -//= - Resurrection of Satan Morroc +//= - Resurrection of Satan Morocc //= - The Crow of the Fate //= - Succession of the Prince //===== Additional Comments: ================================= //= 1.1 Fixed exploits [Lupus] -//= 1.2 Added Dandelion's Request / Morroc Invasion quest. [SinSloth] +//= 1.2 Added Dandelion's Request / Morocc Invasion quest. [SinSloth] //= 1.3 Updated dialogs from Binoculars Quest. [Samuray22] //= 1.3a added GM lvl check as in other invansion quests [Lupus] //= 1.4 Fixed a small bug in Dandelion's Request. [SinSloth] @@ -35,14 +35,14 @@ //= Moved Dandelion's Request to a it's own file. //= Added support NPCs required to finish Gaebolg quest. //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf] -//= 2.6 Added quest log commands for Resurrection of Satan Morroc. [L0ne_W0lf] +//= 2.6 Added quest log commands for Resurrection of Satan Morocc. [L0ne_W0lf] //= Added the two remaining episode 12.1 quests. -//= Updated Satan Morroc Quest to allow peopel who have +//= Updated Satan Morocc Quest to allow peopel who have //= finished it to return to the previous map. //= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf] //= 2.8 Disabled Assassin bar pub NPCs, as they are included in the 13.1 quests file. [L0ne_W0lf] //= 2.9 Fixed player dying/logging out during conversation could prevent -//= summoning of Satan Morroc until server reboot. [Gepard] +//= summoning of Satan Morocc until server reboot. [Gepard] //= 3.0 Updated RE/Pre-RE EXP. [Euphy] //= 3.1 Updated to match the latest official scripts. [Euphy] //= 3.2 Added GM management NPC and variable $@re_moc_time$. [Euphy] @@ -166,7 +166,7 @@ } } -// Morroc Assassin Guild Bar [Disabled] +// Morocc Assassin Guild Bar [Disabled] // ============================================================ /* morocc,43,108,5 script Sharp-Looking Kid#dan_07 82,{ @@ -889,7 +889,7 @@ que_job01,70,84,1 script Girl#moc_ex002 882,{ close; } -// Resurrection of Satan Morroc +// Resurrection of Satan Morocc // ============================================================ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ if ((rebirth_moc_edq == 0) && (rebirth_moc_edq < 4)) { @@ -902,23 +902,23 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ close; case 2: mes "[Continental Guard]"; - mes "Didn't you know? Satan Morroc has resurrected and broke out of Morroc Village where he was confined."; + mes "Didn't you know? Satan Morocc has resurrected and broke out of Morocc Village where he was confined."; next; mes "[Continental Guard]"; mes "His resurrection has caused irreparable damage to the village and to the desert around it, and now he has moved to the Sograt Desert."; next; mes "[Continental Guard]"; - mes "We are here to carry out the orders of the Prontera Kingdom by preventing commoners, aside from the members of the Morroc Subjugation, from accessing the area."; + mes "We are here to carry out the orders of the Prontera Kingdom by preventing commoners, aside from the members of the Morocc Subjugation, from accessing the area."; next; mes "[Continental Guard]"; - mes "If you'd like to know more information, I suggest that you speak to the Continental Guard in charge of the accident site in Morroc Village."; + mes "If you'd like to know more information, I suggest that you speak to the Continental Guard in charge of the accident site in Morocc Village."; next; switch(select("End Conversation:Ask About Guard's Location")) { case 1: close; case 2: mes "[Continental Guard]"; - mes "The guard that you want to talk to is at a camp built in the center of Morroc Village."; + mes "The guard that you want to talk to is at a camp built in the center of Morocc Village."; next; mes "[Continental Guard]"; mes "If you'd like, I can send you there directly."; @@ -930,7 +930,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ close; case 2: mes "[Continental Guard]"; - mes "Great. I'll send you to Morroc Village's accident site shortly."; + mes "Great. I'll send you to Morocc Village's accident site shortly."; close2; warp "morocc",160,61; end; @@ -943,7 +943,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ mes "No commoners are allowed in the area beyond this point."; mes "This place is extremely dangerous so you are restricted from entering."; next; - switch(select("Cancel Conversation:Enter the Field to Investigate:Move to Morroc's Accident Site")) { + switch(select("Cancel Conversation:Enter the Field to Investigate:Move to Morocc's Accident Site")) { case 1: close; case 2: @@ -991,7 +991,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ } else { mes "[Continental Guard]"; - mes "We've received orders from Headquarters to block access to this area since an unusual space-time phenomenon has been detected from the Morroc field."; + mes "We've received orders from Headquarters to block access to this area since an unusual space-time phenomenon has been detected from the Morocc field."; next; mes "[Continental Guard]"; mes "We need to wait until the phenomenon is over, and then we'll let you proceed with your investigation."; @@ -999,7 +999,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ } case 3: mes "[Continental Guard]"; - mes "Great. I'll send you to Morroc Village's accident site shortly."; + mes "Great. I'll send you to Morocc Village's accident site shortly."; close2; warp "morocc",160,61; end; @@ -1017,7 +1017,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ set .@onlinemembers,.@onlinemembers + 1; } } - switch(select("Enter the First Field to Investigate:Enter the Second Field to Investigate:Return to Morroc's Accident Site:Cancel Conversation")) { + switch(select("Enter the First Field to Investigate:Enter the Second Field to Investigate:Return to Morocc's Accident Site:Cancel Conversation")) { case 1: if ((.@onlinemembers > 1) && (countitem(7826) > 0)) { mes "[Continental Guard]"; @@ -1086,7 +1086,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ } case 3: mes "[Continental Guard]"; - mes "Great. I'll send you to Morroc Village's accident site shortly."; + mes "Great. I'll send you to Morocc Village's accident site shortly."; close2; warp "morocc",160,61; end; @@ -1126,63 +1126,63 @@ moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707,3,3 mes "Good day, "+ strcharinfo(0) +". We don't have the luxury of time in this dire situation so I'll try to make this quick."; next; mes "[Continental Guard Messenger]"; - mes "I'm a messenger dispatched here to " + .@area$ + " from the Morroc Continental Guard Headquarters. My duty is to deliver this important message to as many renowned adventurers as I can. I'm glad that I was finally able to find you, "+ strcharinfo(0) +"."; + mes "I'm a messenger dispatched here to " + .@area$ + " from the Morocc Continental Guard Headquarters. My duty is to deliver this important message to as many renowned adventurers as I can. I'm glad that I was finally able to find you, "+ strcharinfo(0) +"."; next; - select("Morroc Continental Guard Headquarters?"); + select("Morocc Continental Guard Headquarters?"); mes "[Continental Guard Messenger]"; mes "Time's running out, so I can only give you a brief explanation."; next; mes "[Continental Guard Messenger]"; - mes "Satan Morroc, the heinous demon imprisoned deep in Morroc's underground for centuries, has resurrected and broken free."; + mes "Satan Morocc, the heinous demon imprisoned deep in Morocc's underground for centuries, has resurrected and broken free."; next; mes "[Continental Guard Messenger]"; - mes "The revival of Satan Morroc has completely devastated Morroc Village and the area surrounding it."; + mes "The revival of Satan Morocc has completely devastated Morocc Village and the area surrounding it."; next; mes "[Continental Guard Messenger]"; - mes "All of the death and suffering... Anywhere else must seem like heaven compared to what's happening in and around Morroc."; + mes "All of the death and suffering... Anywhere else must seem like heaven compared to what's happening in and around Morocc."; next; mes "[Continental Guard Messenger]"; - mes "The Morroc Continental Guard was immediately organized to fight Satan Morroc and bring relief to this dire situation. I'm here to inform everyone in the Rune-Midgarts Kingdom about this catastrophe."; + mes "The Morocc Continental Guard was immediately organized to fight Satan Morocc and bring relief to this dire situation. I'm here to inform everyone in the Rune-Midgarts Kingdom about this catastrophe."; next; mes "[Continental Guard Messenger]"; - mes "We need your help, "+ strcharinfo(0) +". We need reputable adventurers like you to seal away Satan Morroc once again."; + mes "We need your help, "+ strcharinfo(0) +". We need reputable adventurers like you to seal away Satan Morocc once again."; next; mes "[Continental Guard Messenger]"; - mes "For more information, please speak to the captain of the Morroc Continental Guard. He is waiting for you, "+ strcharinfo(0) +"."; + mes "For more information, please speak to the captain of the Morocc Continental Guard. He is waiting for you, "+ strcharinfo(0) +"."; next; mes "[Continental Guard Messenger]"; - mes "The Continental Guard Headquarters is located near the center palace of Morroc, so please go speak to the chief as soon as you can."; + mes "The Continental Guard Headquarters is located near the center palace of Morocc, so please go speak to the chief as soon as you can."; close; } else { mes "[Continental Guard Messenger]"; - mes "I'm a messenger from the Morroc Continental Guards Headquarters, and I've come here to " + .@area$ + " with an urgent message for everyone here in Rune-Midgarts Kingdom."; + mes "I'm a messenger from the Morocc Continental Guards Headquarters, and I've come here to " + .@area$ + " with an urgent message for everyone here in Rune-Midgarts Kingdom."; next; - select("Morroc Continental Guard Headquarters?"); + select("Morocc Continental Guard Headquarters?"); mes "[Continental Guard Messenger]"; mes "Time's running out, so I can only give you a brief explanation."; next; mes "[Continental Guard Messenger]"; - mes "Satan Morroc, the heinous demon imprisoned deep in Morroc's underground for centuries, has resurrected and broken free."; + mes "Satan Morocc, the heinous demon imprisoned deep in Morocc's underground for centuries, has resurrected and broken free."; next; mes "[Continental Guard Messenger]"; - mes "The revival of Satan Morroc has completely devastated Morroc Village and the area surrounding it."; + mes "The revival of Satan Morocc has completely devastated Morocc Village and the area surrounding it."; next; mes "[Continental Guard Messenger]"; - mes "All of the death and suffering... Anywhere else must seem like heaven compared to what's happening in and around Morroc."; + mes "All of the death and suffering... Anywhere else must seem like heaven compared to what's happening in and around Morocc."; next; mes "[Continental Guard Messenger]"; - mes "The Morroc Continental Guard was immediately organized to fight Satan Morroc and bring relief to this dire situation. I'm here to inform everyone in the Rune-Midgarts Kingdom about this catastrophe."; + mes "The Morocc Continental Guard was immediately organized to fight Satan Morocc and bring relief to this dire situation. I'm here to inform everyone in the Rune-Midgarts Kingdom about this catastrophe."; next; mes "[Continental Guard Messenger]"; - mes "Part of my duty is to help recruit adventurers from around the world to help drive Satan Morroc back into confinement. It won't be easy, but he was defeated once before. Satan Morroc can be sealed away again."; + mes "Part of my duty is to help recruit adventurers from around the world to help drive Satan Morocc back into confinement. It won't be easy, but he was defeated once before. Satan Morocc can be sealed away again."; next; mes "[Continental Guard Messenger]"; - mes "At least 70% of Morroc Village was destroyed by the fallout of Satan Morroc's resurrection."; + mes "At least 70% of Morocc Village was destroyed by the fallout of Satan Morocc's resurrection."; next; mes "[Continental Guard Messenger]"; - mes "The desert around Morroc has also turned into a land of death after it was claimed by Satan Morroc and his powerful doppelgangers and underlings."; - mes "So heed my warning, stay away from the Morroc area unless you're on a mission organized by the Morroc Continental Guard."; + mes "The desert around Morocc has also turned into a land of death after it was claimed by Satan Morocc and his powerful doppelgangers and underlings."; + mes "So heed my warning, stay away from the Morocc area unless you're on a mission organized by the Morocc Continental Guard."; close; } @@ -1219,18 +1219,18 @@ aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 } else if (rebirth_moc_edq == 0) { mes "[Continental Guard Official]"; - mes "Welcome to the Morroc Subjugation Information Center. How may I help you?"; + mes "Welcome to the Morocc Subjugation Information Center. How may I help you?"; next; switch(select("What is this place for?:I'm here to volunteer.:Tell me about the village situation.")) { case 1: mes "[Continental Guard Official]"; - mes "I'm stationed here to assist adventurers who wish to volunteer and help the Continental Guard fight Satan Morroc."; + mes "I'm stationed here to assist adventurers who wish to volunteer and help the Continental Guard fight Satan Morocc."; next; mes "[Continental Guard Official]"; - mes "I am sure you are already aware that Satan Morroc's revival threatens the peace of the Rune-Midgarts kingdom, and if Satan Morroc is allowed to roam free, it will devour the entire world."; + mes "I am sure you are already aware that Satan Morocc's revival threatens the peace of the Rune-Midgarts kingdom, and if Satan Morocc is allowed to roam free, it will devour the entire world."; next; mes "[Continental Guard Official]"; - mes "The Continental Guard is currently planning an array of countermeasures to suppress Satan Morroc under the order of the kingdom."; + mes "The Continental Guard is currently planning an array of countermeasures to suppress Satan Morocc under the order of the kingdom."; next; mes "[Continental Guard Official]"; mes "If you have been invited by our messenger, or are confident in your skills, we encourage you to volunteer for the Continental Guards and bring peace back to this continent."; @@ -1254,7 +1254,7 @@ aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 mes "I applaud you for your courage, but you will need more than just courage to help us."; next; mes "[Continental Guard Official]"; - mes "Satan Morroc is most powerful evil that exists in the mortal world. Snuffing out your life would be so trivial to him."; + mes "Satan Morocc is most powerful evil that exists in the mortal world. Snuffing out your life would be so trivial to him."; next; mes "[Continental Guard Official]"; mes "I strongly recommend that you just think about your own safety for now. When the final battle comes, I am sure that no place will be safe."; @@ -1262,7 +1262,7 @@ aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 } case 3: mes "[Continental Guard Official]"; - mes "As you can see, the situation can't be worse. The village and the surrounding area were irreparably damaged by Satan Morroc's resurrection."; + mes "As you can see, the situation can't be worse. The village and the surrounding area were irreparably damaged by Satan Morocc's resurrection."; next; mes "[Continental Guard Official]"; mes "Since the kingdom has dispatched Continental Guard Messengers everywhere, many able adventurers have flocked to this place, but... I'm afraid they still might not be enough to defeat the demon."; @@ -1282,7 +1282,7 @@ aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 morocc,159,113,3 script Chief Balrog 752,{ if (rebirth_moc_edq == 0) { mes "[Chief Balrog]"; - mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morroc in order to suppress Satan Morroc... We'll need all the strength and luck we can gather."; + mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morocc in order to suppress Satan Morocc... We'll need all the strength and luck we can gather."; next; mes "[Chief Balrog]"; mes "I'm sorry, but I'm too busy checking through all these applications for future Continental Guards to greet you adventurers one by one."; @@ -1293,7 +1293,7 @@ morocc,159,113,3 script Chief Balrog 752,{ } else if (rebirth_moc_edq == 1) { mes "[Chief Balrog]"; - mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morroc in order to suppress Satan Morroc... We'll need all the strength and luck we can gather."; + mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morocc in order to suppress Satan Morocc... We'll need all the strength and luck we can gather."; next; mes "[Chief Balrog]"; mes "It looks like you have business with me. Please make it brief since I don't have a lot of time on my hands. There's lots of things I need to take care of..."; @@ -1301,17 +1301,17 @@ morocc,159,113,3 script Chief Balrog 752,{ switch(select("Ask about Continental Guards:I want to join the Continental Guard.:End Conversation")) { case 1: mes "[Chief Balrog]"; - mes "The damage that Satan Morroc's resurrection has caused is obvious just by taking a look around this area."; + mes "The damage that Satan Morocc's resurrection has caused is obvious just by taking a look around this area."; mes "What's scary is that all this was caused just by breaking out from it's prison. Just think of the damage it could do if it was left to roam around freely..."; next; mes "[Chief Balrog]"; - mes "Morroc Village is completely devastated, and Satan Morroc has now claimed possession of the Sograt Desert."; + mes "Morocc Village is completely devastated, and Satan Morocc has now claimed possession of the Sograt Desert."; next; mes "[Chief Balrog]"; - mes "I've no doubt that if left unchecked, Satan Morroc will take over the entire Midgart Continent. We've got to stop him right now before the entire world suffers."; + mes "I've no doubt that if left unchecked, Satan Morocc will take over the entire Midgard Continent. We've got to stop him right now before the entire world suffers."; next; mes "[Chief Balrog]"; - mes "That's why the kingdom has ordered us elite soldiers to form the Continental Guard, and recruit reputable adventurers around the world so that we can make a united stand against Satan Morroc."; + mes "That's why the kingdom has ordered us elite soldiers to form the Continental Guard, and recruit reputable adventurers around the world so that we can make a united stand against Satan Morocc."; next; mes "[Chief Balrog]"; mes "Of course, it'll be incredibly difficult... We'll need to make sacrifices... I'm not even sure if we can win. Still, the fate of the world is at stake, and we've got to do something. Dark times have truly fallen upon us..."; @@ -1325,10 +1325,10 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "What was your name? " + strcharinfo(0) + "? Oh yes, I've heard of you."; next; mes "[Chief Balrog]"; - mes "Hmm, it occurs to me that you don't understand the danger involved in all this. Do you have any idea how powerful Satan Morroc is?"; + mes "Hmm, it occurs to me that you don't understand the danger involved in all this. Do you have any idea how powerful Satan Morocc is?"; next; mes "[Chief Balrog]"; - mes "You won't be able to help us if you don't fully understand the risks. I've seen thousands of foolhardy adventurers throw their lives away by thinking they could defeat Satan Morroc with their own strength."; + mes "You won't be able to help us if you don't fully understand the risks. I've seen thousands of foolhardy adventurers throw their lives away by thinking they could defeat Satan Morocc with their own strength."; next; mes "[Chief Balrog]"; mes "We are facing a threat that will determine the world's future, and fools that can't work in a team will be liabilities, not assets."; @@ -1344,7 +1344,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "Look, I understand your enthusiasm, but you're mistaken if you think you can help us. I don't have time to fully explain the danger that we're all facing."; next; mes "[Chief Balrog]"; - mes "Satan Morroc is nothing like the monsters you may have encountered. At best you'll throw your life away, but there's the chance that you might get one of my men killed by your mistakes and incompetence. I can't have that!"; + mes "Satan Morocc is nothing like the monsters you may have encountered. At best you'll throw your life away, but there's the chance that you might get one of my men killed by your mistakes and incompetence. I can't have that!"; next; mes "[Chief Balrog]"; mes "Please understand that this is for your own good. Fight some Porings or whatever else might be a good match for your level."; @@ -1357,7 +1357,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "Sigh... Why are you so persistent? Can't you understand that no means no? Let me say this one more time."; next; mes "[Chief Balrog]"; - mes "We're too busy fighting Satan Morroc to watch after rookies like you. You'd just be throwing your life away."; + mes "We're too busy fighting Satan Morocc to watch after rookies like you. You'd just be throwing your life away."; next; mes "[Chief Balrog]"; mes "Stop bothering me. You'd be nothing but a burden."; @@ -1379,7 +1379,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "Interesting. You have my attention. Alright, I guess it's only fair that I acknowledge your strength if you can handle something for me."; next; mes "[Chief Balrog]"; - mes "The Continental Guard has been on full alert around this village and the desert. We need to be prepared in case Satan Morroc storms our defenses."; + mes "The Continental Guard has been on full alert around this village and the desert. We need to be prepared in case Satan Morocc storms our defenses."; next; mes "[Chief Balrog]"; mes "Soldiers need firewood to keep the bonfires burning all night, but we've been suffering a firewood shortage."; @@ -1408,10 +1408,10 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "What? How can you even think of joining us when you don't have any real skills to offer?"; next; mes "[Chief Balrog]"; - mes "I guarantee that you'd just drag my soldiers down with you. You'd only be a threat to Satan Morroc in your dreams. Just give it up."; + mes "I guarantee that you'd just drag my soldiers down with you. You'd only be a threat to Satan Morocc in your dreams. Just give it up."; next; mes "[Chief Balrog]"; - mes "You won't be able to help us if you don't fully understand the risks. I've seen thousands of foolhardy adventurers throw their lives away by thinking they could defeat Satan Morroc with their own strength."; + mes "You won't be able to help us if you don't fully understand the risks. I've seen thousands of foolhardy adventurers throw their lives away by thinking they could defeat Satan Morocc with their own strength."; next; mes "[Chief Balrog]"; mes "We are facing a threat that will determine the world's future, and fools that can't work in a team will be liabilities, not assets."; @@ -1448,7 +1448,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "I didn't think you would accept me so easily. I'm ready. Ask me whatever you want."; next; mes "[Chief Balrog]"; - mes "Ah, I've got an idea. Now, because this is an allied operation, we've accepted some mercenary soldiers from the Schwaltzvalt Republic to join the Continental Guard."; + mes "Ah, I've got an idea. Now, because this is an allied operation, we've accepted some mercenary soldiers from the Schwarzwald Republic to join the Continental Guard."; next; mes "[Chief Balrog]"; mes "These mercenaries have never seen the desert, and they're having trouble carrying out operations in the heat, dry air, and sandstorms. It's not their fault, but they could use a little help since they're out of their element."; @@ -1465,7 +1465,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "I knew that'd be too tough for you. I'm glad you finally realized your limits before it was too late. It takes wisdom to recognize your weakness."; next; mes "[Chief Balrog]"; - mes "You'd better pack up and return where you came from. You want to be far away from here when Satan Morroc attacks."; + mes "You'd better pack up and return where you came from. You want to be far away from here when Satan Morocc attacks."; close; case 2: mes "[Chief Balrog]"; @@ -1516,10 +1516,10 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "Welcome to the Continental Guard, my friend. Are you ready to risk your life for the sake of peace in the world?"; next; mes "[Chief Balrog]"; - mes "Your mission from here on will be simple, but extremely difficult: you will join the rest of the Continental Guard to keep Satan Morroc from fully reviving its true power."; + mes "Your mission from here on will be simple, but extremely difficult: you will join the rest of the Continental Guard to keep Satan Morocc from fully reviving its true power."; next; mes "[Chief Balrog]"; - mes "My soldiers are risking their lives to fight Morroc's doppelgangers and underlings in order to make it safer for their comrades to travel to Morroc's lair."; + mes "My soldiers are risking their lives to fight Morocc's doppelgangers and underlings in order to make it safer for their comrades to travel to Morocc's lair."; next; mes "[Chief Balrog]"; mes "It looks like your help could be useful after all. It's time for you to pitch in. Good luck."; @@ -1541,41 +1541,41 @@ morocc,159,113,3 script Chief Balrog 752,{ switch(select("Yes:No")) { case 1: mes "[Chief Balrog]"; - mes "I'm going to tell you some basic information about fighting Satan Morroc as a member of the Continental Guard."; + mes "I'm going to tell you some basic information about fighting Satan Morocc as a member of the Continental Guard."; next; mes "[Chief Balrog]"; - mes "Do you remember what Morroc was like before this happened? You would if you've been here before."; + mes "Do you remember what Morocc was like before this happened? You would if you've been here before."; next; mes "[Chief Balrog]"; - mes "Right now, all of Morroc's entrances and the outer fields leading to other villages are currently under our control."; + mes "Right now, all of Morocc's entrances and the outer fields leading to other villages are currently under our control."; next; mes "[Chief Balrog]"; - mes "The main reason for this is because Satan Morroc has been sighted in Sograt Desert, but there's another important reason."; + mes "The main reason for this is because Satan Morocc has been sighted in Sograt Desert, but there's another important reason."; next; mes "[Chief Balrog]"; - mes "Satan Morroc's power has been causing unnatural gaps in our time-space continuum. The gaps are isolated to this area for now, but we can't be sure if they'll spread."; + mes "Satan Morocc's power has been causing unnatural gaps in our time-space continuum. The gaps are isolated to this area for now, but we can't be sure if they'll spread."; next; mes "[Chief Balrog]"; mes "Due to the time-space gaps, Sograt Desert's terrain has changed, and some parts of the desert have disappeared."; next; mes "[Chief Balrog]"; - mes "Furthermore, the situation's gotten worse since Satan Morroc's doppelgangers started appearing, and other monsters have become influenced by its power."; + mes "Furthermore, the situation's gotten worse since Satan Morocc's doppelgangers started appearing, and other monsters have become influenced by its power."; next; mes "[Chief Balrog]"; mes "That's all we know so far. If you go out, you'll see what I mean... You may even see horrors that we haven't discovered yet. If you need more information, please speak to the Continental Official."; next; mes "[Chief Balrog]"; - mes "Please do your best to hold back Satan Morroc. Don't forget that the future of the continent is in our hands. Dismissed."; + mes "Please do your best to hold back Satan Morocc. Don't forget that the future of the continent is in our hands. Dismissed."; close; case 2: mes "[Chief Balrog]"; - mes "I see. Keep up your good work in fighting Satan Morroc. Don't forget that the future of the continent is in our hands."; + mes "I see. Keep up your good work in fighting Satan Morocc. Don't forget that the future of the continent is in our hands."; close; } } else if (rebirth_moc_edq == 5) { mes "[Chief Balrog]"; - mes "Wah... What? Did you really defeat Satan Morroc?"; + mes "Wah... What? Did you really defeat Satan Morocc?"; next; mes "[Chief Balrog]"; mes "How? Do you have any proof of your victory?"; @@ -1589,7 +1589,7 @@ morocc,159,113,3 script Chief Balrog 752,{ } else if (rebirth_moc_edq == 6) { mes "[Chief Balrog]"; - mes "What? Did you really defeat Satan Morroc?"; + mes "What? Did you really defeat Satan Morocc?"; next; mes "[Chief Balrog]"; mes "How? Do you have any proof of your victory?"; @@ -1599,13 +1599,13 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "Is... Isn't this?"; next; mes "[Chief Balrog]"; - mes "Wow... I think this is really the skin of Satan Morroc. Congratulations, soldier. You just saved this world and people from being consumed by destruction and evil."; + mes "Wow... I think this is really the skin of Satan Morocc. Congratulations, soldier. You just saved this world and people from being consumed by destruction and evil."; next; mes "[Chief Balrog]"; - mes "I guess you seriously wounded Satan Morroc, and it retreated to a time-space gap. No doubt it's trying to recoup its strength."; + mes "I guess you seriously wounded Satan Morocc, and it retreated to a time-space gap. No doubt it's trying to recoup its strength."; next; mes "[Chief Balrog]"; - mes "My only regret is that we can't pursue Morroc beyond this dimension. I'm glad, however, that you defeated Satan Morroc and kept it from regaining its full strength. For now, anyway..."; + mes "My only regret is that we can't pursue Morocc beyond this dimension. I'm glad, however, that you defeated Satan Morocc and kept it from regaining its full strength. For now, anyway..."; next; mes "[Chief Balrog]"; mes "Our researchers might be able to learn some important new facts from this piece of skin... We need to learn all we can about that monster if peace is to be possible in our world's future."; @@ -1613,14 +1613,14 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "[Chief Balrog]"; mes "Once again, I thank you for your distinguished service on behalf of the Continental Guard and the Rune-Midgarts Kingdom. I'll report your great achievement to His Majesty right away."; next; - delitem 7820,1; //Morroc_Skin + delitem 7820,1; //Morocc_Skin getexp (checkre(3))?200000:2000000,0; set rebirth_moc_edq,7; changequest 3055,3056; mes "[Chief Balrog]"; mes "I've prepared a few things to give as a reward for you. Let's see... I have three items. Which one do you like to receive?"; next; - switch(select("1. Seal of Continental Guard:2. Morroc Charm Stone:3. Morroc Ring")) { + switch(select("1. Seal of Continental Guard:2. Morocc Charm Stone:3. Morocc Ring")) { case 1: mes "[Chief Balrog]"; mes "The Seal of Continental Guard is an extremely valuable reward given directly from the kingdom court. It is a symbol of strength."; @@ -1636,11 +1636,11 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "[Chief Balrog]"; mes "Great, then I'll reward you with the Seal of Continental Guard. Congratulations."; next; - getitem 2730,1; //Morroc_Seal + getitem 2730,1; //Morocc_Seal set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1655,24 +1655,24 @@ morocc,159,113,3 script Chief Balrog 752,{ } case 2: mes "[Chief Balrog]"; - mes "The Morroc Charm Stone is an extremely valuable reward given directly from the kingdom court, and it is a symbol of prosperity and mana."; + mes "The Morocc Charm Stone is an extremely valuable reward given directly from the kingdom court, and it is a symbol of prosperity and mana."; next; mes "[Chief Balrog]"; mes "The accessory's options are: ^0000FF MSP+50, -1% Casting Speed^000000."; next; mes "[Chief Balrog]"; - mes "Do you really want a Morroc Charm Stone?"; + mes "Do you really want a Morocc Charm Stone?"; next; switch(select("1. Yes.:2. No.")) { case 1: mes "[Chief Balrog]"; - mes "Great, then I'll reward you with a Morroc Charm Stone. Congratulations."; + mes "Great, then I'll reward you with a Morocc Charm Stone. Congratulations."; next; - getitem 2731,1; //Morroc_Charm_Stone + getitem 2731,1; //Morocc_Charm_Stone set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1687,24 +1687,24 @@ morocc,159,113,3 script Chief Balrog 752,{ } case 3: mes "[Chief Balrog]"; - mes "The Morroc Ring is an extremely valuable reward given directly from the kingdom court that symbolizes critical power."; + mes "The Morocc Ring is an extremely valuable reward given directly from the kingdom court that symbolizes critical power."; next; mes "[Chief Balrog]"; mes "The accessory's option is: ^0000FF CRI + 5^000000."; next; mes "[Chief Balrog]"; - mes "Do you really want a Morroc Ring?"; + mes "Do you really want a Morocc Ring?"; next; switch(select("1. Yes.:2. No.")) { case 1: mes "[Chief Balrog]"; - mes "Great, then I'll reward you with a Morroc Ring. Congratulations."; + mes "Great, then I'll reward you with a Morocc Ring. Congratulations."; next; - getitem 2732,1; //Morroc_Ring + getitem 2732,1; //Morocc_Ring set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1732,7 +1732,7 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "[Chief Balrog]"; mes "I've prepared a few things to give as a reward for you. Let's see... I have three items. Which one do you like to receive?"; next; - switch(select("1. Seal of Continental Guard:2. Morroc Charm Stone:3. Morroc Ring")) { + switch(select("1. Seal of Continental Guard:2. Morocc Charm Stone:3. Morocc Ring")) { case 1: mes "[Chief Balrog]"; mes "The Seal of Continental Guard is an extremely valuable reward given directly from the kingdom court. It is a symbol of strength."; @@ -1748,11 +1748,11 @@ morocc,159,113,3 script Chief Balrog 752,{ mes "[Chief Balrog]"; mes "Great, then I'll reward you with the Seal of Continental Guard. Congratulations."; next; - getitem 2730,1; //Morroc_Seal + getitem 2730,1; //Morocc_Seal set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1767,24 +1767,24 @@ morocc,159,113,3 script Chief Balrog 752,{ } case 2: mes "[Chief Balrog]"; - mes "The Morroc Charm Stone is an extremely valuable reward given directly from the kingdom court, and it is a symbol of prosperity and mana."; + mes "The Morocc Charm Stone is an extremely valuable reward given directly from the kingdom court, and it is a symbol of prosperity and mana."; next; mes "[Chief Balrog]"; mes "The accessory's options are: ^0000FF MSP+50, -1% Casting Speed^000000."; next; mes "[Chief Balrog]"; - mes "Do you really want a Morroc Charm Stone?"; + mes "Do you really want a Morocc Charm Stone?"; next; switch(select("1. Yes.:2. No.")) { case 1: mes "[Chief Balrog]"; - mes "Great, then I'll reward you with a Morroc Charm Stone. Congratulations."; + mes "Great, then I'll reward you with a Morocc Charm Stone. Congratulations."; next; - getitem 2731,1; //Morroc_Charm_Stone + getitem 2731,1; //Morocc_Charm_Stone set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1799,24 +1799,24 @@ morocc,159,113,3 script Chief Balrog 752,{ } case 3: mes "[Chief Balrog]"; - mes "The Morroc Ring is an extremely valuable reward given directly from the kingdom court that symbolizes critical power."; + mes "The Morocc Ring is an extremely valuable reward given directly from the kingdom court that symbolizes critical power."; next; mes "[Chief Balrog]"; mes "The accessory's option is: ^0000FF CRI + 5^000000."; next; mes "[Chief Balrog]"; - mes "Do you really want a Morroc Ring?"; + mes "Do you really want a Morocc Ring?"; next; switch(select("1. Yes.:2. No.")) { case 1: mes "[Chief Balrog]"; - mes "Great, then I'll reward you with a Morroc Ring. Congratulations."; + mes "Great, then I'll reward you with a Morocc Ring. Congratulations."; next; - getitem 2732,1; //Morroc_Ring + getitem 2732,1; //Morocc_Ring set rebirth_moc_edq,8; completequest 3056; mes "[Chief Balrog]"; - mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morroc will return someday soon."; + mes "I hope you keep in mind that our battle is far from over. Our enemy is the king of demons... I fear that Satan Morocc will return someday soon."; next; mes "[Chief Balrog]"; mes "Enjoy your victory, but be ever watchful and vigilant. I will always be here to help and reward you for your service."; @@ -1833,10 +1833,10 @@ morocc,159,113,3 script Chief Balrog 752,{ } else if (rebirth_moc_edq == 8) { mes "[Chief Balrog]"; - mes "I've heard that the kingdom is planning to send out a large group of researchers to investigate the other world to which Satan Morroc has escaped."; + mes "I've heard that the kingdom is planning to send out a large group of researchers to investigate the other world to which Satan Morocc has escaped."; next; mes "[Chief Balrog]"; - mes "That means it's time for both of us -- you and I -- to get to work. Who knows when Morroc will return to plague us?"; + mes "That means it's time for both of us -- you and I -- to get to work. Who knows when Morocc will return to plague us?"; next; mes "[Chief Balrog]"; mes "Please keep up the good work, and don't forget that the future of the continent and the kingdom relies on us."; @@ -1844,7 +1844,7 @@ morocc,159,113,3 script Chief Balrog 752,{ } else { mes "[Chief Balrog]"; - mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morroc in order to suppress Satan Morroc... We'll need all the strength and luck we can gather."; + mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morocc in order to suppress Satan Morocc... We'll need all the strength and luck we can gather."; next; mes "[Chief Balrog]"; mes "I'm sorry, but I'm too busy checking through all these applications for future Continental Guards to greet you adventurers one by one."; @@ -1880,15 +1880,15 @@ OnEnable: end; OnTimer5000: - mapannounce "moc_fild21","Satan Morroc: I'm very impressed by you weaklings.",bc_map,"0xFFFF00"; + mapannounce "moc_fild21","Satan Morocc: I'm very impressed by you weaklings.",bc_map,"0xFFFF00"; end; OnTimer15000: - mapannounce "moc_fild21","Satan Morroc: You may as well deal with all your regrets now. I shall snuff out your life soon!",bc_map,"0xFFFF00"; + mapannounce "moc_fild21","Satan Morocc: You may as well deal with all your regrets now. I shall snuff out your life soon!",bc_map,"0xFFFF00"; end; OnTimer25000: - mapannounce "moc_fild21","Satan Morroc: It's only a matter of time until I get you, you worthless insects. Just a little while longer...",bc_map,"0xFFFF00"; + mapannounce "moc_fild21","Satan Morocc: It's only a matter of time until I get you, you worthless insects. Just a little while longer...",bc_map,"0xFFFF00"; stopnpctimer; end; @@ -1928,12 +1928,12 @@ OnEnable: moc_fild21,177,239,0 script Time-Space Gap#edq 844,1,1,{ if ((rebirth_moc_edq == 4) && ($@re_moc == 3)) { - mes "The time-space gap's frightening darkness seems to dissipate as Satan Morroc fades away."; + mes "The time-space gap's frightening darkness seems to dissipate as Satan Morocc fades away."; next; mes "You can see the fragments floating in the gap, and the radiating lights are now slowing their movement."; next; mes "You stretch your hand and pick up a lusterless fragment."; - getitem 7820,1; //Morroc_Skin + getitem 7820,1; //Morocc_Skin set rebirth_moc_edq,6; changequest 3053,3055; close; @@ -1978,7 +1978,7 @@ OnInit: OnEnable: enablenpc "Satan Summon#edq"; initnpctimer; - monster "moc_fild21",177,217,"Satan Morroc",1916,1,"Satan Summon#edq::OnMyMobDead"; + monster "moc_fild21",177,217,"Satan Morocc",1916,1,"Satan Summon#edq::OnMyMobDead"; end; OnDisable: @@ -2010,7 +2010,7 @@ OnTimer5415000: end; } -sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 971,{ +sec_in02,14,43,5 script Morocc GlobalVar Admin::MoroccAdmin_sec 971,{ callfunc "F_GM_NPC"; mes "[Helper]"; mes "Please enter the password and # button."; @@ -2022,39 +2022,39 @@ sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 971,{ } else { mes "[Helper]"; mes "Hello. I am a post office."; - mes "I am currently checking Morroc status."; + mes "I am currently checking Morocc status."; next; mes "============="; mes "Current State"; mes "============="; - mes "^3131FF^000000"; + mes "^3131FF^000000"; if ($@re_moc == 0) { - mes "Reset. Enable to summon Morroc."; + mes "Reset. Enable to summon Morocc."; mes "^3131FF^000000"; mes "Enable to enter to moc_fild21 field."; } else if ($@re_moc == 1) { - mes "^3131FF^000000"; + mes "^3131FF^000000"; mes "Some warrior entered after the reset. However, the warrior hasn't started the quest yet."; - mes "The warrior who has rebirth_moc_edq 4 and 7 is now enabled to summon Morroc."; + mes "The warrior who has rebirth_moc_edq 4 and 7 is now enabled to summon Morocc."; mes "^3131FF^000000"; mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21."; } else if ($@re_moc == 2) { - mes "^3131FF^000000"; - mes "Morroc has been summoned. After 90 minutes has passed, it will revert back to reset status."; + mes "^3131FF^000000"; + mes "Morocc has been summoned. After 90 minutes has passed, it will revert back to reset status."; mes "^3131FF^000000"; mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21."; } else if ($@re_moc == 3) { - mes "^3131FF^000000"; - mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec)."; + mes "^3131FF^000000"; + mes "Morocc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec)."; mes "After 6 hours later since the death time, it will be reset."; mes "The warriors whom has remained in the field can continue the quest via Time Space Gap."; mes "^3131FF^000000"; mes "Disabled to enter to moc_fild21 from outside of the field."; } else { - mes "^3131FF^000000"; - mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec)."; + mes "^3131FF^000000"; + mes "Morocc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec)."; mes "After 6 hours later since the death time, it will be reset."; - mes "It has been already passed 30 minutes after Morroc's death, so warriors can not continue the quest even if they click the Time Space Gap."; + mes "It has been already passed 30 minutes after Morocc's death, so warriors can not continue the quest even if they click the Time Space Gap."; mes "^3131FF^000000"; mes "Disabled to enter to moc_fild21 from outside of the field."; } @@ -2078,15 +2078,15 @@ sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 971,{ mes "Time-Space Gap NPC is disappeared."; mes "6 hours term timer is stopped."; donpcevent "Satan Summon#edq::OnDisable"; - mes "Morroc 90 minutes survival timer is stopped."; - mes "Morroc is being killed."; + mes "Morocc 90 minutes survival timer is stopped."; + mes "Morocc is being killed."; mes "Now, Continental Guards will let players enter."; } close; } } } -moc_fild21,5,5,5 duplicate(MorrocAdmin_sec) Morroc GlobalVar Admin::MorrocAdmin_moc 971 +moc_fild21,5,5,5 duplicate(MoroccAdmin_sec) Morocc GlobalVar Admin::MoroccAdmin_moc 971 // The Crow of the Fate // ============================================================ @@ -2097,9 +2097,9 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ close; } if (barmunt_crow == 0) { - mes "^660000Morroc, the City of the Desert, has been completely devastated by Satan Morroc.^000000"; + mes "^660000Morocc, the City of the Desert, has been completely devastated by Satan Morocc.^000000"; next; - mes "^660000The people of Morroc were resilient enough to endure the region's harsh weather, but their toughness to the weather could not prepare them enough as they witnessed the destruction brought down upon the city by Satan Morroc.^000000"; + mes "^660000The people of Morocc were resilient enough to endure the region's harsh weather, but their toughness to the weather could not prepare them enough as they witnessed the destruction brought down upon the city by Satan Morocc.^000000"; next; mes "^660000This man, who looks as dry and thin as a fish dried up under the sun, still has a smile that reminds you of a benevolent god, and is touching a book in his hand.^000000"; next; @@ -2110,7 +2110,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ mes "Ah... Mammi..."; next; mes "[Book-Touching Man]"; - mes "Your healthy golden skin is glowing under the blessed sunlight of Morroc."; + mes "Your healthy golden skin is glowing under the blessed sunlight of Morocc."; next; emotion ET_CRY; mes "[Book-Touching Man]"; @@ -2136,7 +2136,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ next; emotion ET_HUK; mes "[Book-Touching Man]"; - mes "What? Don't you know Mammi, one of the three greatest Rune-Midgart's idols?"; + mes "What? Don't you know Mammi, one of the three greatest Rune-Midgarts' idols?"; next; emotion ET_OHNO; mes "[Book-Touching Man]"; @@ -2149,12 +2149,12 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ mes "She always carries books with her despite her hectic schedule. That alone should tell you that she's more intelligent than all the others! Ah... Mammi..."; next; mes "[Book-Touching Man]"; - mes "She even mentioned in an interview in 'Morroc Times' that she wants to meet a man that loves books."; + mes "She even mentioned in an interview in 'Morocc Times' that she wants to meet a man that loves books."; next; emotion ET_COOL; mes "[Book-Touching Man]"; mes "That means... She's waiting for someone like me. Hehehe!"; - mes "You see, every book in Rune-Midgart's Library has the name Benjamin written on them... That's me!"; + mes "You see, every book in Rune-Midgarts' Library has the name Benjamin written on them... That's me!"; next; mes "^660000This Benjamin seems to be a huge fan of a female celebrity called Mammi. He didn't shut his mouth and worshipped her beauty for a while, but then he suddenly stopped and looked depressed.^000000"; next; @@ -2162,12 +2162,12 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ mes "I have a problem...."; next; mes "[Benjamin]"; - mes "My Mammi said that she's fallen in love with a book written by ^FF0000'Oliver Hilpert'^000000 of Schwaltzvalt: ^FF0000'The Crow of the Fate,'^000000 but I didn't have a chance of even looking at it!"; + mes "My Mammi said that she's fallen in love with a book written by ^FF0000'Oliver Hilpert'^000000 of Schwarzwald: ^FF0000'The Crow of the Fate,'^000000 but I didn't have a chance of even looking at it!"; next; mes "^660000The Crow of the Fate^000000?"; next; mes "[Benjamin]"; - mes "Unless you're blind, you know how terrible Morroc is nowadays."; + mes "Unless you're blind, you know how terrible Morocc is nowadays."; next; mes "[Benjamin]"; mes "I really need to read that book and tell her that I'm here for her, but I don't even have the time to regain my breath because of this situation in our hands!"; @@ -2191,7 +2191,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ next; mes "[Benjamin]"; mes "You look bored. You must be waiting for someone to give you something to do!"; - mes "Help me connect with Mammi. Who knows? I may let you have a conversation with Mammi, whom everyone in Rune-Midgart adores."; + mes "Help me connect with Mammi. Who knows? I may let you have a conversation with Mammi, whom everyone in Rune-Midgarts adores."; next; mes "^660000Didn't you just call me an adventurer that runs around on meaningless errands for others...?^000000"; next; @@ -2208,7 +2208,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ else { mes "[Benjamin]"; mes "If you help me, I'll show you a limited picture book edition of Mammi... Once. Hehehehe."; - mes "So, aren't you interested in looking at another girl's pictures? Umm, if you want, I can introduce you to a handsome guard in Morroc..."; + mes "So, aren't you interested in looking at another girl's pictures? Umm, if you want, I can introduce you to a handsome guard in Morocc..."; mes "What do you say? You do want to help me, right?"; next; } @@ -2260,24 +2260,24 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ mes "Gosh, it's you. What took you so long? Wasn't Prontera Library, like, five minutes away?"; next; mes "["+ strcharinfo(0) +"]"; - mes "Ahchoo! Thanks to you, I couldn't find it from the library. So I travelled all the way up to Schwaltzvalt... Ahchoo!"; + mes "Ahchoo! Thanks to you, I couldn't find it from the library. So I travelled all the way up to Schwarzwald... Ahchoo!"; specialeffect2 EF_VENOMDUST; next; mes "^660000Feeling angry at him, you exaggerated a fit of sneezing which you have had for quite a while.^000000"; next; mes "[Benjamin]"; mes "Oh... you did?"; - mes "Hehehe, you're more reliable than I thought. Thanks for the book... Wait, does that mean I have to go up to Schwaltzvalt to return this? Man!"; + mes "Hehehe, you're more reliable than I thought. Thanks for the book... Wait, does that mean I have to go up to Schwarzwald to return this? Man!"; next; mes "[Benjamin]"; mes "...No, I can do anything as long as it's for Mammi. Heh heh, you're a kind adventurer. Thanks."; - mes "Was it cold up there? I guess it is since Schwaltzvalt is located up north from here."; + mes "Was it cold up there? I guess it is since Schwarzwald is located up north from here."; next; mes "["+ strcharinfo(0) +"]"; mes ".................."; next; mes "[Benjamin]"; - mes "Let me think. If this book is not yet available in Prontera Library, it must mean that not many people of Rune-Midgart have read this book."; + mes "Let me think. If this book is not yet available in Prontera Library, it must mean that not many people of Rune-Midgarts have read this book."; next; mes "[Benjamin]"; mes "Grrrr... Mammi! Here I am, following your noble tastes to read such a rare book! Mammi...!"; @@ -2415,7 +2415,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ prt_in,179,92,3 script Library Curator#garas 57,{ if (barmunt_crow == 0) { mes "[Curator Guys]"; - mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgart Kingdom categorized by dungeon, to help our readers find them easily."; + mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgarts Kingdom categorized by dungeon, to help our readers find them easily."; mes "We also have many essential books for adventurers. Why don't you take a look?"; next; mes "[Curator Guys]"; @@ -2425,7 +2425,7 @@ prt_in,179,92,3 script Library Curator#garas 57,{ } else if (barmunt_crow == 1) { mes "[Curator Guys]"; - mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgart Kingdom categorized by dungeon, to help our readers find them easily."; + mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgarts Kingdom categorized by dungeon, to help our readers find them easily."; mes "We also have many essential books for adventurers. Why don't you take a look?"; next; switch(select("Search books.:Look around the library.")) { @@ -2504,12 +2504,12 @@ prt_in,179,92,3 script Library Curator#garas 57,{ next; mes "[Curator Guys]"; mes "Haha... But I have bad news for you."; - mes "The book has become so popular that you can't even find it from Schwaltzvalt, the author's country."; + mes "The book has become so popular that you can't even find it from Schwarzwald, the author's country."; mes "We tried to get a hold of the book, but it was too late. It'll take a while for the next editon to be published, so why don't you read a different book for now?"; next; mes "[Curator Guys]"; mes "If you are not busy and really want to read the book, I have a suggestion: try Juno Library."; - mes "You can find every book published in Schwaltzvalt from the library. Chances are, you'll find it there."; + mes "You can find every book published in Schwarzwald from the library. Chances are, you'll find it there."; next; mes "[Curator Guys]"; mes "Well, Juno is quite far from here, but if you're really enthusiastic about reading such a popular book, it should be worthwile."; @@ -2527,13 +2527,13 @@ prt_in,179,92,3 script Library Curator#garas 57,{ } else if (barmunt_crow == 2) { mes "[Curator Guys]"; - mes "^3131FFThe Crow of the Fate^000000 was sold out even before we got a hold of one copy. You won't be able to find the book anywhere in the Rune-Midgart Kingdom."; + mes "^3131FFThe Crow of the Fate^000000 was sold out even before we got a hold of one copy. You won't be able to find the book anywhere in the Rune-Midgarts Kingdom."; mes "If you really want to read the book, you should try Juno Library."; close; } else { mes "[Curator Guys]"; - mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgart Kingdom, categorized by dungeon to help the readers find them easily."; + mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgarts Kingdom, categorized by dungeon to help the readers find them easily."; mes "We also have many essential books for adventurers. Why don't you take a look?"; next; mes "[Curator Guys]"; @@ -2926,7 +2926,7 @@ OnTouch: mes "Phew... I guess I had a dream or something... Ahchoo!"; specialeffect2 EF_VENOMDUST; next; - mes "^660000It was an indescribable dream: a burning laboratory in an unknown place in Schwaltzvalt."; + mes "^660000It was an indescribable dream: a burning laboratory in an unknown place in Schwarzwald."; mes "You tried to think hard, but could not figure out what the dream meant.^000000"; next; mes "^660000You carefully opened the book again, but nothing happened.^000000"; @@ -3076,7 +3076,7 @@ yuno_in04,117,102,3 script Old News Scrapbook 844,{ mes "and she is fighting against a group of evil villains"; mes "that are contaminating nature so that she can purify the water."; mes "This book will be soon selected as an essential academic book of"; - mes "the Schwaltzvalt Republic for"; + mes "the Schwarzwald Republic for"; mes "promoting morality and"; mes "promoting environmental protection throughout the nation."; mes " "; @@ -3152,7 +3152,7 @@ yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{ next; mes "["+ strcharinfo(0) +"]"; mes "Haha, thanks."; - mes "You know, in Morroc... Ahchoo! ...There's someone who's as big a fan of Mammi's as you... Ahchoo! So why don't you go meet him?"; + mes "You know, in Morocc... Ahchoo! ...There's someone who's as big a fan of Mammi's as you... Ahchoo! So why don't you go meet him?"; next; mes "["+ strcharinfo(0) +"]"; mes "I got that book from him as a gift. He may have more rare books of her... Ahchoo!"; @@ -3437,7 +3437,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{ mes "Lady Mammi!"; emotion ET_BIGTHROB; next; - mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morroc insists to be one of the three greatest idols in the Rune-Midgart Kingdom. That must be why Oliver is squealing in delight.^000000"; + mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morocc insists to be one of the three greatest idols in the Rune-Midgarts Kingdom. That must be why Oliver is squealing in delight.^000000"; emotion ET_THINK, playerattached(); next; mes "["+ strcharinfo(0) +"]"; @@ -3483,7 +3483,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{ mes "It's shocking to see you unimpressed by the beauty of Lady Mammi,"; mes "but it is more shocking that God has given such a rare picture book of her"; mes "to someone like you who does not appreciate its value!"; - mes "I flew over to the Rune-Midgart Kingdom on the earliest airship"; + mes "I flew over to the Rune-Midgarts Kingdom on the earliest airship"; mes "to get this book on the day it was released, but the books were sold out. The person right in front of me got the last one!"; next; mes "["+ strcharinfo(0) +"]"; @@ -3522,7 +3522,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{ next; mes "["+ strcharinfo(0) +"]"; mes "Haha, thanks."; - mes "You know, in Morroc... Ahchoo! ...There's someone who's as big a fan of Mammi's as you... Ahchoo! So why don't you go meet him?"; + mes "You know, in Morocc... Ahchoo! ...There's someone who's as big a fan of Mammi's as you... Ahchoo! So why don't you go meet him?"; next; mes "["+ strcharinfo(0) +"]"; mes "I got that book from him as a gift. He may have more rare books of her... Ahchoo!"; @@ -3706,7 +3706,7 @@ que_ba,53,232,0 script #garas_f_yume 139,1,1,{ OnTouch: if (barmunt_crow == 5) { //GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0 - mes "^660000Suddenly a flash of light stung your eyes. A few seconds later, you opened your eyes and found that you were somewhere in Schwaltzvalt.^000000"; + mes "^660000Suddenly a flash of light stung your eyes. A few seconds later, you opened your eyes and found that you were somewhere in Schwarzwald.^000000"; next; mes "^660000And you aren't alone: you can now clearly see the man and woman that escaped the laboratory.^000000"; next; @@ -4225,14 +4225,14 @@ cave,22,186,3 script Monsterous Man#zid 999,{ next; mes "^660000Zid turned his head away from you. You're still not sure if all of this is really happening. It's all so surreal...^000000"; next; - mes "^660000Frustrated by the conversation with Zid, you have decided to go back to Morroc and forget everything.^000000"; + mes "^660000Frustrated by the conversation with Zid, you have decided to go back to Morocc and forget everything.^000000"; set barmunt_crow,10; changequest 2066,2067; close; } else if (barmunt_crow == 10) { mes "Zid seemed to have lost his interest in the book."; - mes "You have decided to deliver the book to Benjamin of Morroc."; + mes "You have decided to deliver the book to Benjamin of Morocc."; close; } else { diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 0b574816e6..3144a97803 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -301,7 +301,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ next; mes "[Mr. Ibanoff]"; mes "When I adventured around"; - mes "Rune Midgarts, maybe it was"; + mes "Rune-Midgarts, maybe it was"; mes "well before you were born."; mes "Ah... I miss those days..."; next; @@ -6353,7 +6353,7 @@ mosk_fild02,198,252,3 script Sage#rus01 4_M_SAGE_C,{ next; select("Show him a Poring Card"); mes "["+ strcharinfo(0) +"]"; - mes "This is a card of one of the monsters that inhabit the Rune Midgard continent."; + mes "This is a card of one of the monsters that inhabit the Midgard continent."; next; if (!countitem(4001)) { mes "[Sage]"; @@ -8418,7 +8418,7 @@ OnTouch_: } } else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) { mes "[Lusalka's Voice]"; - mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings."; + mes "His name is 'Igor'.. He has gone to the capital of Rune-Midgarts. Give him my golden earrings."; next; mes "[Lusalka's Voice]"; mes "And please, tell him to stop suffering and to be happy. This is my request."; @@ -8511,11 +8511,11 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "If so, you came here from another continent, not Moscovia...?"; next; mes "["+ strcharinfo(0) +"]"; - mes "I'm from Rune Midgarts."; + mes "I'm from Rune-Midgarts."; next; mes "[Lusalka]"; mes "...Rune... Midgarts..."; - mes "A few days ago, my lover left for Rune Midgarts.. Can you find him for me? I want to talk with him..."; + mes "A few days ago, my lover left for Rune-Midgarts.. Can you find him for me? I want to talk with him..."; next; mes "[Lusalka]"; mes "...I don't know why but, I can't remember how I became Lusalka. When I woke up, I was lying down on the bottom of the river."; @@ -8530,7 +8530,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "I suffered seeing him grieve, but wasn't able to meet him. Ordinary people are killed immediately when they see Lusalka's stare..."; next; mes "[Lusalka]"; - mes "I saw him coming to the marsh everyday and heard him mourning. And his assurance to go to Rune Midgarts."; + mes "I saw him coming to the marsh everyday and heard him mourning. And his assurance to go to Rune-Midgarts."; next; mes "[Lusalka]"; mes "Adventurer, can you find him for me? I can't leave this marsh. Please, find him for me?"; @@ -8548,11 +8548,11 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "Where can I find him?"; next; mes "[Lusalka]"; - mes "The night when he left, he said that he would go to the capital of Rune Midgarts. I am not sure if he is still there..."; + mes "The night when he left, he said that he would go to the capital of Rune-Midgarts. I am not sure if he is still there..."; next; if(select("Ok, I will do it:I don't think I can do it...") == 2) { mes "["+ strcharinfo(0) +"]"; - mes "Rune Midgarts is large! I don't think I can do it."; + mes "Rune-Midgarts is large! I don't think I can do it."; next; mes "["+ strcharinfo(0) +"]"; mes "There's nothing we can do. Just give it up."; @@ -8575,7 +8575,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ close; } else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) { mes "[Lusalka]"; - mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings."; + mes "His name is 'Igor'.. He has gone to the capital of Rune-Midgarts. Give him my golden earrings."; next; mes "[Lusalka]"; mes "And please, tell him to stop suffering and to be happy. This is my request."; @@ -8699,7 +8699,7 @@ OnInit: prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ if (rhea_rus_main < 8) { mes "[A Wanderer from a strange land]"; - mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!"; + mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune-Midgarts Kingdom!"; next; mes "[A Wanderer from a strange land]"; mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home."; @@ -8707,7 +8707,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ } else if (rhea_rus_main == 8) { if (rhea_rus_hair < 3) { mes "[A Wanderer from a strange land]"; - mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!"; + mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune-Midgarts Kingdom!"; next; mes "[A Wanderer from a strange land]"; mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home."; @@ -8719,7 +8719,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ close; } mes "[A Wanderer from a strange land]"; - mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!"; + mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune-Midgarts Kingdom!"; next; mes "[A Wanderer from a strange land]"; mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home."; @@ -8798,22 +8798,22 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ } //---------------------------------------------------------------------------- -// Morroc Villager (Lusalka's Hair) +// Morocc Villager (Lusalka's Hair) //---------------------------------------------------------------------------- -morocc,165,82,0 script Morroc Villager#rus25 1_M_02,{ +morocc,165,82,0 script Morocc Villager#rus25 1_M_02,{ if (rhea_rus_main < 8) { - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "But natives, like me, can tell the difference."; close; } else if (rhea_rus_main == 8) { if (rhea_rus_hair < 4) { - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "But natives, like me, can tell the difference."; close; } else if (rhea_rus_hair == 4) { @@ -8822,49 +8822,49 @@ morocc,165,82,0 script Morroc Villager#rus25 1_M_02,{ mes "...Hmm, did I forget to wear something...?"; close; } - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "But natives, like me, can tell the difference."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "As I was saying, I like this village. The desert is hot and Kafra staff is even hotter!!! *hack* *cough*!!"; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Ah, but don't get me wrong! I'm not coughing because of the Kafra Staffers. It's uhh the heat, it's getting to me... ya..."; next; mes "["+ strcharinfo(0) +"]"; mes "................................"; mes "The hell you talking about..? I'm looking for someone."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "I see so many adventurers around here, how can I remember everybody? Got any descriptions of this someone..? Or traits..? anything to help me remember."; next; mes "["+ strcharinfo(0) +"]"; mes "Hmm... I don't know how he looks like but he is from a land called Moscovia."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Ah, are you talking about a guy that's always sad and dresses funny? I figured his accent wasn't from around here..."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "He was here a coupla days ago but he left to see the Pyramid. I never saw him after that. I said it would be dangerous but he went anyways."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Yep that's gotta be who you're looking for. I can see his gloomy face right now... that poor sad man."; rhea_rus_hair = 5; // changequest 8151,8152; close; } else if (rhea_rus_hair > 4 && rhea_rus_hair < 7) { - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "He was here a coupla days ago but he left to see the Pyramid. I never saw him after that. I said it would be dangerous but he went anyways."; next; - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Yep that's gotta be who you're looking for. I can see his gloomy face right now... that poor sad man."; close; } } - mes "[Morroc Villager]"; + mes "[Morocc Villager]"; mes "Many travellers in the village and I feel fun to see them. Even though I am here, I feel like that I travel all around the world?"; close; } diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index db9a90c50f..adcf6be54b 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -2274,16 +2274,16 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ emotion ET_THINK; mes "[Foreign Merchant]"; mes "I heard that I could make"; - mes "a killing in Morroc, which is"; + mes "a killing in Morocc, which is"; mes "why I moved my business here."; mes "But it looks like the weather"; mes "is going to kill me first!"; next; - select("How did you hear of Morroc?"); + select("How did you hear of Morocc?"); emotion ET_THINK; mes "[Foreign Merchant]"; mes "I... I just told you."; - mes "I heard that Morroc is"; + mes "I heard that Morocc is"; mes "full customers willing to"; mes "buy things at premium prices."; mes "Ugh, but it's a burning hell!"; @@ -2304,7 +2304,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "sell some sweet, heavenly"; mes "drink around here? You know,"; mes "near the pond in the middle"; - mes "of Morroc? Before I leave,"; + mes "of Morocc? Before I leave,"; mes "I want to taste that drink..."; set aru_em,1; setquest 2129; @@ -2314,7 +2314,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "[Foreign Merchant]"; mes "Say, isn't there a wandering"; mes "drink merchant near the pond"; - mes "in the middle of Morroc. Oh,"; + mes "in the middle of Morocc. Oh,"; mes "what I would do to have that"; mes "delicious drink he's selling..."; next; @@ -2419,7 +2419,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "[Foreign Merchant]"; mes "Well, I'm already here."; mes "I guess I may as well go"; - mes "sightseeing around Morroc."; + mes "sightseeing around Morocc."; mes "*Pant Pant* But it's so hot!"; close; } @@ -3079,9 +3079,9 @@ OnTouch: mes "Write a report about the"; mes "tests conducted by the"; mes "moderates in Arunafeltz and"; - mes "the Schwaltzvalt Republic,"; + mes "the Schwarzwald Republic,"; mes "and their relationship with"; - mes "that Schwaltzvalt Corporation."; + mes "that Schwarzwald Corporation."; next; mes "[Zhed]"; mes "I'll get it done immediately,"; @@ -4848,7 +4848,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "[Ibrahim]"; mes "Heh, it sounds like almost"; mes "anyone who's anyone in"; - mes "Morroc knows who you are."; + mes "Morocc knows who you are."; mes "Pleasure to make your"; mes "acquaintance~"; close; @@ -4981,7 +4981,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ if ((treasure_nd > 10) && (BaseLevel > 65)) { mes "[Ibrahim]"; mes "Ah, I hear from a friend"; - mes "in Morroc that you happened"; + mes "in Morocc that you happened"; mes "to obtain the Unlucky Emerald."; mes "I'm sure it's one of the Four"; mes "Cursed Jewels. You wouldn't"; @@ -5066,7 +5066,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "[Ibrahim]"; mes "I heard that you obtained"; mes "the Unlucky Emerald from"; - mes "a friend in Morroc. Let me"; + mes "a friend in Morocc. Let me"; mes "warn you that you might not"; mes "be strong enough to handle"; mes "its power. Be careful."; @@ -6633,7 +6633,7 @@ prontera,148,326,3 script Chief Officer#edq 734,{ mes "That damned Z Gang seems"; mes "to be in the center of all the"; mes "crime that's happening in"; - mes "Rune-Midgard. They caused"; + mes "Rune-Midgarts. They caused"; mes "a riot in Geffen by spreading"; mes "rumors about ghosts..."; next; @@ -6743,7 +6743,7 @@ prt_in,168,18,1 script Valdes 65,2,2,{ next; mes "[Valdes]"; mes "Heh, I just ran out of wine!"; - mes "Gimme, um, ^0000FFMorroc Fruit Wine^000000!"; + mes "Gimme, um, ^0000FFMorocc Fruit Wine^000000!"; mes "5 bottles! Then... Maybe..."; mes "I'll tell you want you really"; mes "wanna know. Heh heh~ ^666666*Hic!*^000000"; @@ -6846,7 +6846,7 @@ prt_in,168,18,1 script Valdes 65,2,2,{ mes "You stinkface!"; mes "Where's my wine?!"; mes "My ^0000FF5 bottles of"; - mes "Morroc Fruit Wine^000000?!"; + mes "Morocc Fruit Wine^000000?!"; mes "I'm not gonna talk"; mes "to you without it!"; close; @@ -7089,12 +7089,12 @@ in_rogue,359,116,3 script Marybell 747,{ mes "Oh, and one more thing..."; mes "I hear that they're trying"; mes "to secretly recruit more"; - mes "gang members in Morroc."; + mes "gang members in Morocc."; mes "The nerve of those guys...!"; next; mes "[Marybell]"; mes "It might be a good idea"; - mes "for you to go to Morroc"; + mes "for you to go to Morocc"; mes "and check it out. Good"; mes "luck finding those Z Gang"; mes "guys. And take care!"; @@ -7120,7 +7120,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "Oh, and one more thing..."; mes "I hear that they're trying"; mes "to secretly recruit more"; - mes "gang members in Morroc."; + mes "gang members in Morocc."; mes "The nerve of those guys...! "; next; mes "[Marybell]"; @@ -7213,7 +7213,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "Even so, we're definitely"; mes "sure that it's around the"; mes "secret path to the South"; - mes "Morroc underground. Um,"; + mes "Morocc underground. Um,"; mes "but we can't let you come"; mes "with the Rogue Guild."; next; @@ -7233,7 +7233,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "We're definitely sure"; mes "that the Z Gang's hideout"; mes "is near the secret path"; - mes "to the South Morroc"; + mes "to the South Morocc"; mes "underground. You"; mes "know where that is?"; next; @@ -8139,7 +8139,7 @@ moc_ruins,90,67,3 script Suspicious Man#1 4W_M_03,4,4,{ mes "[Z Gang Informer]"; mes "..............................."; mes "Their secret hideout is in"; - mes "South Morroc, and you can't"; + mes "South Morocc, and you can't"; mes "enter the place without the"; mes "secret password."; next; @@ -9046,7 +9046,7 @@ morocc,143,63,3 script Ragged Man#nd 929,{ case 1: mes "[Ragged Man]"; mes "I was so sure I could find"; - mes "the treasure here in Morroc"; + mes "the treasure here in Morocc"; mes "when I first started... I did"; mes "all my research and prep work."; mes "But after hiring teams of other"; @@ -9455,7 +9455,7 @@ morocc,102,298,3 script Man#zgang 98,{ next; mes "[Man]"; mes "The treasure is buried"; - mes "south of Morroc. Use the"; + mes "south of Morocc. Use the"; mes "south gate to leave town,"; mes "and then head to the next"; mes "field to the south. From"; @@ -9757,7 +9757,7 @@ comodo,339,224,3 script Man in Hiding#nd 881,{ mes "[" + strcharinfo(0) + "]"; mes "What? No, it's not like"; mes "that. I met this treasure"; - mes "hunter in Morroc that said"; + mes "hunter in Morocc that said"; mes "I could find you around here."; next; mes "[Man in Hiding]"; @@ -9888,7 +9888,7 @@ moc_fild18,108,116,0 script #treasure 844,{ } else if (treasure_nd == 6) { mes "^3355FFThat Treasure Hunter in"; - mes "Morroc must know something"; + mes "Morocc must know something"; mes "about the chest's magical"; mes "protection. It might be"; mes "a good idea to ask him.^000000"; @@ -11411,24 +11411,24 @@ OnTouch: // Rogue Guild Investigation //============================================================ -prontera,163,204,3 script Man from Morroc 99,{ +prontera,163,204,3 script Man from Morocc 99,{ if (rumour_nd == 0) { - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "Ah, it's very nice and"; mes "refreshing to be near this"; mes "fountain. It's much cooler"; - mes "here than back in Morroc."; + mes "here than back in Morocc."; next; - switch(select("Nice day today, huh?:How's Morroc lately?")) { + switch(select("Nice day today, huh?:How's Morocc lately?")) { case 1: - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "Oh, yes. It's a wonderful"; mes "day! Prontera is so sunny"; mes "and cool. No wonder so"; mes "many people live over here!"; close; case 2: - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "You're an adventurer, and"; mes "you haven't heard the crazy"; mes "rumors spreading all over"; @@ -11438,7 +11438,7 @@ prontera,163,204,3 script Man from Morroc 99,{ next; } select("What crazy rumors?"); - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "Uh... Rogue agents!"; mes "They're all over the place!"; mes "Why don't you talk to some"; @@ -11449,7 +11449,7 @@ prontera,163,204,3 script Man from Morroc 99,{ close; } else if (rumour_nd == 1) { - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "Shouldn't you be"; mes "looking for a Rogue"; mes "agent to talk to?"; @@ -11460,7 +11460,7 @@ prontera,163,204,3 script Man from Morroc 99,{ } else if (rumour_nd > 1) { if (zdan_edq > 12) { - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "So the Z Gang was what"; mes "those crazy rumors were"; mes "all about. Good to hear"; @@ -11468,7 +11468,7 @@ prontera,163,204,3 script Man from Morroc 99,{ close; } else { - mes "[Morroc Traveler]"; + mes "[Morocc Traveler]"; mes "Hey, uh..."; mes "I'm just trying to"; mes "relax on my vacation."; @@ -12861,7 +12861,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ } mes "[Agent]"; mes "Anyway, you've got one"; - mes "last place to go, Morroc."; + mes "last place to go, Morocc."; mes "Check in with the Rogue"; mes "agent over there, will you?"; mes "Oh, and take this food"; @@ -12896,7 +12896,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ next; mes "[Agent]"; mes "Hey, be safe on your"; - mes "way to Morroc, alright?"; + mes "way to Morocc, alright?"; mes "Good luck finding that"; mes "Rogue agent over there."; mes "Oh, and mum's the word"; @@ -12917,7 +12917,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ mes "[Agent]"; mes "Oh, hey, you're back?"; mes "Weren't you already on"; - mes "your way to Morroc?"; + mes "your way to Morocc?"; close; } else if (rumour_nd == 22) { @@ -12987,7 +12987,7 @@ morocc,116,39,3 script Rogue Guild Agent#nd4 779,{ mes "[Agent]"; mes "Anyway, that gang is"; mes "drawing a lot of flak"; - mes "to Morroc. I mean, they"; + mes "to Morocc. I mean, they"; mes "kind of live here, so..."; next; mes "[Agent]"; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 598493627f..5de8d2383e 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -84,7 +84,7 @@ prt_in,88,105,2 script Recruiter 105,{ mes "The Prontera Culvert is infested with all kinds of filthy vermin!"; next; mes "[Recruiter]"; - mes "Due to the serious risk of water contamination, and the safety of Rune-Midgardians, the Culvert has been quarantined by royal decree."; + mes "Due to the serious risk of water contamination, and the safety of Rune-Midgartsians, the Culvert has been quarantined by royal decree."; next; mes "[Recruiter]"; mes "Needless to say, this has caused shortages in the water supply in our kingdom. Indeed, such a crisis in these dark times..."; @@ -726,13 +726,13 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "[Historian]"; mes "I might have it mentioned before, but my name is Karlomoff and"; mes "I work in the Rekenber Historical Research as its 1st scholar. We"; - mes "recently finished our project on the Schwaltzvalt Republic."; + mes "recently finished our project on the Schwarzwald Republic."; next; mes "[Historian]"; mes "Now, we're trying to learn"; mes "more about the Rune-Midgarts"; mes "Kingdom's history. We believe"; - mes "it's linked to our Schwaltzvalt"; + mes "it's linked to our Schwarzwald"; mes "Republic because they share the"; mes "continent. Makes sense, right?"; next; @@ -742,7 +742,7 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "research of Rune-Midgarts will"; mes "shed some new light on our"; mes "current understanding of the"; - mes "Schwaltzvalt Republic's past."; + mes "Schwarzwald Republic's past."; next; mes "[Historian]"; mes "Including myself, there are"; @@ -757,7 +757,7 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "Midgarts may not know it, but"; mes "the Rekenber Corporation has"; mes "unofficial control over our"; - mes "Schwaltzvalt Republic. Some"; + mes "Schwarzwald Republic. Some"; mes "hate it, others don't care."; next; mes "[Historian]"; @@ -849,7 +849,7 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "the Rune-Midgarts Kingdom?"; mes "If so, then I have a favor to"; mes "ask you. Would you please"; - mes "deliver this report I've written to my colleague in Morroc?"; + mes "deliver this report I've written to my colleague in Morocc?"; next; mes "[Historian]"; mes "It would be a great help"; @@ -866,7 +866,7 @@ yuno,311,195,3 script Historian#prt01 754,{ else if (prt_curse == 6) { mes "[Historian]"; mes "Please find my colleague,"; - mes "Rodafrian, in Morroc and"; + mes "Rodafrian, in Morocc and"; mes "deliver my report to her."; mes "You should be able to find"; mes "her there doing research."; @@ -954,7 +954,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ mes "have to be so hot? This"; mes "can't be good for my skin..."; mes "Ooh, I wish I were back home"; - mes "in the Schwaltzvalt Republic~"; + mes "in the Schwarzwald Republic~"; emotion ET_CRY; next; mes "[Historian Rodafrian]"; @@ -999,21 +999,21 @@ morocc_in,45,126,3 script Historian#prt02 702,{ next; mes "[Historian Rodafrian]"; mes "Right now, I'm spending"; - mes "time in Morroc to visit the"; + mes "time in Morocc to visit the"; mes "Sphinx and Pyramids and see"; mes "if I can excavage some relics."; mes "Hopefully I can uncover some new historical evidence that way."; next; mes "[Historian Rodafrian]"; mes "If you're interested in"; - mes "learning more about Morroc's"; + mes "learning more about Morocc's"; mes "history, please go ahead and"; mes "talk to my assistance. He's very passionate about studying this"; mes "town's culture and background."; next; mes "[Historian Rodafrian]"; mes "Actually, the people of"; - mes "Morroc also appreciate their"; + mes "Morocc also appreciate their"; mes "town's history, and pass down"; mes "songs about ancient times"; mes "through the generations. Let's"; @@ -1234,7 +1234,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ mes "greatly appreciated by the"; mes "Rekenber Historical Research"; mes "Group. But first, I need to"; - mes "finish this Morroc project..."; + mes "finish this Morocc project..."; next; mes "[Historian Rodafrian]"; mes "Anyway, keep this information"; @@ -1342,7 +1342,7 @@ S_GiveName: mes "Ah "+strcharinfo(0)+", eh?"; mes "Do you mind if I ask you a favor? I really need to verify the true"; mes "lyrics for this song. However,"; - mes "I need to stay here in Morroc"; + mes "I need to stay here in Morocc"; mes "to complete my research."; next; mes "[Historian Rodafrian]"; @@ -2127,7 +2127,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{ next; mes "^3355FFNow, you can return to"; mes "Rodafrian, the historian"; - mes "stationed in Morroc.^000000"; + mes "stationed in Morocc.^000000"; set prt_curse,55; changequest 18049,18051; } @@ -2529,7 +2529,7 @@ prt_church,185,106,3 script Father Bamph 60,{ mes "[Father Bamph]"; mes "Brave adventurer, would"; mes "you please visit the Assassin"; - mes "Guild in Morroc and see if you"; + mes "Guild in Morocc and see if you"; mes "can learn anything about how"; mes "we can verify whether poison"; mes "was used to kill the princes?"; @@ -2543,7 +2543,7 @@ prt_church,185,106,3 script Father Bamph 60,{ mes "learn anything about testing"; mes "for the use of poison from"; mes "a member of the Assassin"; - mes "Guild in Morroc."; + mes "Guild in Morocc."; close; } else if (prt_curse == 31) { @@ -3296,7 +3296,7 @@ prt_church,24,111,5 script #prince3 887,{ mes "[Father Biscuss]"; mes "I say, you go straight to"; mes "the experts. Someone in the"; - mes "^FF0000Assassin Guild in Morroc^000000"; + mes "^FF0000Assassin Guild in Morocc^000000"; mes "ought to know. I hear they"; mes "can make poison that can kill"; mes "a man with just one drop!"; @@ -3399,7 +3399,7 @@ moc_fild16,201,295,5 script Assassin Guildsman#poiso 884,{ mes "There is an"; mes "Assassin's Private Pub"; mes "in the 7 o'clock direction"; - mes "in Morroc. Go find someone"; + mes "in Morocc. Go find someone"; mes "named ^3131FFMarjana^000000 inside."; set prt_curse,24; changequest 18040,18041; @@ -3509,7 +3509,7 @@ que_job01,10,16,5 script Marjana#poison 885,{ mes "make those snake scale"; mes "marks... Some of them can't"; mes "even be found here on the"; - mes "Rune-Midgard continent."; + mes "Midgard continent."; next; mes "[Marjana]"; mes "We're running out of time."; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 04318a6c45..80b3b468e4 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -1799,7 +1799,7 @@ ra_in01,235,194,5 script Katinshuell 931,{ if (.@input$ == "Lighthalzen") { mes "[Katinshuell]"; mes "Lighthalzen...?"; - mes "a city in the Schwaltzvalt"; + mes "a city in the Schwarzwald"; mes "Republic. That, and it's"; mes "a tough place to live in."; mes "That's all I really know..."; @@ -5462,7 +5462,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "An imitation of Ymir's"; mes "Heart? I think I know of"; mes "a famous scientist from the"; - mes "Schwartzvalt Republic that"; + mes "Schwarzwald Republic that"; mes "was working on that! Let's"; mes "see, his name was..."; next; @@ -5495,7 +5495,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "I'm not sure what happened"; mes "to Varmunt. All I know was that"; mes "something serious happened"; - mes "in the Schwaltzvalt Republic,"; + mes "in the Schwarzwald Republic,"; mes "and that he disappeared in"; mes "the fiasco. It's strange..."; next; @@ -5536,7 +5536,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "are trying to recreate Ymir's"; mes "Heart at research centers"; mes "in the Holy Ground and the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; next; mes "[High Priest Zhed]"; mes "The hard-liners are"; @@ -6121,7 +6121,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "priests started being absent"; mes "from their offices. Many of"; mes "them were invited over to"; - mes "the Schwaltzvalt Republic..."; + mes "the Schwarzwald Republic..."; next; mes "[High Priest Zhed]"; mes "Regardless, I know for"; @@ -6219,13 +6219,13 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "I'm glad that everything"; mes "turned out great. Your"; mes "help was truly a blessing."; - mes "Although Schwaltzvalt will"; + mes "Although Schwarzwald will"; mes "continue their plans without"; mes "us, we've slowed them down."; next; mes "[High Priest Zhed]"; mes "Yes, without our support,"; - mes "Schwaltzvalt won't have"; + mes "Schwarzwald won't have"; mes "any excuse to continue"; mes "their dangerous research"; mes "for a little while, at least."; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 526929c21a..a7dd912efd 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -44,12 +44,12 @@ um_in,39,122,5 script Utan Chief 784,{ if (event_umbala == 0) { mes "[Karkatan]"; - mes "Huh huh, a Rune-Midgardian."; + mes "Huh huh, a Rune-Midgartsian."; mes "I guess this is your first"; mes "visit to my village, isn't it?"; next; mes "[Karkatan]"; - mes "Everyone from Rune-Midgard"; + mes "Everyone from Rune-Midgarts"; mes "that I've met had the same"; mes "same expression on their"; mes "face as you do right now"; @@ -78,7 +78,7 @@ um_in,39,122,5 script Utan Chief 784,{ next; mes "[Karkatan]"; mes "Anyhow, I learned many things"; - mes "about Rune-Midgardian culture"; + mes "about Rune-Midgartsian culture"; mes "and language."; next; mes "[Karkatan]"; @@ -120,7 +120,7 @@ um_in,39,122,5 script Utan Chief 784,{ next; mes "[Karkatan]"; mes "There are still some villagers"; - mes "who are very naive about Rune-Midgardians."; + mes "who are very naive about Rune-Midgartsians."; mes "Usually, they fear encounters"; mes "with your people and will"; mes "hide themselves."; @@ -305,7 +305,7 @@ um_in,39,122,5 script Utan Chief 784,{ mes "[Karkatan]"; mes "Hmmmm...."; mes "It would be good to have a mask"; - mes "that was made in Rune-Midgard..."; + mes "that was made in Rune-Midgarts..."; next; mes "[Karkatan]"; mes "I wish to have ^3377FF1 Mr. Smile^000000."; @@ -323,7 +323,7 @@ um_in,39,122,5 script Utan Chief 784,{ mes "always wished that I could have"; mes "this mask! This is truly an"; mes "honor! Thank you, adventurer"; - mes "from Rune-Midgard."; + mes "from Rune-Midgarts."; next; mes "[Karkatan]"; mes "I will tell Puchuchartan that I"; @@ -388,14 +388,14 @@ um_in,44,71,2 script Utan Shaman 782,{ case 3: mes "[Puchuchartan]"; mes "I did not expect that even"; - mes "more of you Rune-Midgardians"; + mes "more of you Rune-Midgartsians"; mes "would find my village. I am"; mes "afraid that Mother Earth may"; mes "be caused suffering because"; mes "of this..."; next; mes "[Puchuchartan]"; - mes "You Rune-Midgardians are a very"; + mes "You Rune-Midgartsians are a very"; mes "evil tribe...always accomplishing"; mes "your goals whether the means are"; mes "foul or fair, never hesitating to"; @@ -408,7 +408,7 @@ um_in,44,71,2 script Utan Shaman 782,{ mes "will affect our future..."; next; mes "[Puchuchartan]"; - mes "No one from Rune-Midgard has "; + mes "No one from Rune-Midgarts has "; mes "visited me without some purpose"; mes "and I do not think that you"; mes "are an exception."; @@ -473,7 +473,7 @@ um_in,44,71,2 script Utan Shaman 782,{ } next; mes "[Puchuchartan]"; - mes "Rune-Midgardian who has asked for"; + mes "Rune-Midgartsian who has asked for"; mes "my help...Although I am not sure"; mes "if you really need my power, I"; mes "will try to provide my assistance."; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index dfeb00b03a..03ed6b3ef5 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -588,7 +588,7 @@ ve_in02,54,49,2 script Factory Worker#ve1 943,{ mes "[Bahed]"; mes "Then, all of a sudden,"; mes "these people from--I guess"; - mes "it was Schwaltzvalt--came"; + mes "it was Schwarzwald--came"; mes "and bought a lot of these"; mes "stones. Later, they even built"; mes "this factory to process them!"; @@ -865,7 +865,7 @@ prt_church,89,108,6 script Bard#sch 741,{ mes "I guess the best thing"; mes "to do for now is to find"; mes "my friend in a prison in"; - mes "^FF0000Morroc^000000, and see what"; + mes "^FF0000Morocc^000000, and see what"; mes "you can do to help him.."; set que_sch,4; close; @@ -887,7 +887,7 @@ prt_church,89,108,6 script Bard#sch 741,{ mes "[Lasda]"; mes "I still can't believe"; mes "Vitre is being held"; - mes "in prison in Morroc. I mean,"; + mes "in prison in Morocc. I mean,"; mes "what could have happened?"; mes "I hope you can help him..."; close; @@ -1037,7 +1037,7 @@ morocc,53,87,7 script Prison Ward#sch 707,{ mes "Thanks for the Fried"; mes "Monkey Tails~ Alright,"; mes "go talk to ^FF0000Sir Krieg^000000 in"; - mes "Morroc Castle. Get his"; + mes "Morocc Castle. Get his"; mes "approval, and I'll let you in."; delitem 12066,1; //Luk_Dish01 set que_sch,7; @@ -1116,7 +1116,7 @@ morocc_in,79,163,0 script Public Security Officer 748,{ if (que_sch < 7) { mes "[Krieg]"; mes "I'm in charge of public"; - mes "security here in Morroc."; + mes "security here in Morocc."; mes "Lately, there have been"; mes "more incidents disturbing"; mes "the public peace and"; @@ -1443,7 +1443,7 @@ ra_in01,58,389,0 script Guant Prisoner#sch 929,{ close; } -// Escort Dancers to Schwaltzvalt Republic +// Escort Dancers to Schwarzwald Republic job_duncer,93,106,6 script Dance Instructor#sch 892,{ if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; @@ -1514,7 +1514,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 892,{ mes "I want you to do me a favor."; next; mes "[Hianna]"; - mes "The Schwaltzvalt Republic"; + mes "The Schwarzwald Republic"; mes "requested me to send some"; mes "Dancers for some party, but"; mes "I don't have enough guards"; @@ -1524,7 +1524,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 892,{ mes "[Hianna]"; mes "If you act as bodyguard"; mes "to my Dancers on the way"; - mes "to the Schwaltzvalt Republic,"; + mes "to the Schwarzwald Republic,"; mes "I'll lend you my Megaphone"; mes "once you come back. So..."; mes "How does that sound?"; @@ -1535,7 +1535,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 892,{ mes "Okay, the Dancers are"; mes "waiting are the entrance,"; mes "so bring them over to the"; - mes "Schwaltzvalt Republic as"; + mes "Schwarzwald Republic as"; mes "soon as you're ready."; set que_sch,12; close; @@ -1601,7 +1601,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 892,{ mes "[Hianna]"; mes "Thanks for escorting"; mes "my Dancers over to the"; - mes "Schwaltzvalt Republic."; + mes "Schwarzwald Republic."; mes "Anything I can help"; mes "you with today?"; next; @@ -1803,7 +1803,7 @@ airplane,75,53,0 script Cheerful Dancer#sch2 724,{ mes "I've performed at many"; mes "venues, but this is the"; mes "frist time I'll be dancing"; - mes "in the Schwaltzvalt Republic."; + mes "in the Schwarzwald Republic."; mes "This is also my first time on"; mes "an airship. How exciting!"; close; @@ -1826,7 +1826,7 @@ airplane,79,55,2 script Mature Looking Dancer#s2 724,{ else if (que_sch == 13) { mes "[Dancer]"; mes "This is the first time that"; - mes "the Schwaltzvalt Republic"; + mes "the Schwarzwald Republic"; mes "requested a performance"; mes "from us. Isn't that amazing?"; mes "I guess we earned a reputation"; @@ -2589,12 +2589,12 @@ comodo,135,299,0 script Young Man#sch2 809,{ mes "No, they're too weak! His"; mes "steps now head to the group"; mes "of evil men trying to revive"; - mes "Satan Morroc. I mean, come on!"; + mes "Satan Morocc. I mean, come on!"; next; mes "[Nosdan]"; mes "Sad news from an old comrade,"; mes "the evil group discovered..."; - mes "Time to stop Satan Morroc's"; + mes "Time to stop Satan Morocc's"; mes "revival~ La la la la la la la"; mes "la la la la la la la la la la"; mes "la la la la la la la la la la"; @@ -2622,12 +2622,12 @@ comodo,135,299,0 script Young Man#sch2 809,{ mes "No, they're too weak! His"; mes "steps now head to the group"; mes "of evil men trying to revive"; - mes "Satan Morroc. I mean, come on!"; + mes "Satan Morocc. I mean, come on!"; next; mes "[Nosdan]"; mes "Sad news from an old comrade,"; mes "the evil group discovered..."; - mes "Time to stop Satan Morroc's"; + mes "Time to stop Satan Morocc's"; mes "revival~ La la la la la la la"; mes "la la la la la la la la la la"; mes "la la la la la la la la la la"; @@ -6973,7 +6973,7 @@ OnTouch: mes "^3355FFPeople are carrying"; mes "many heavy wooden boxes"; mes "imprinted with the stamp"; - mes "of the Schwaltzvalt Republic."; + mes "of the Schwarzwald Republic."; mes "These must contain military"; mes "supplies for the camp.^000000"; next; diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index 0941fc057f..40eae5743a 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -878,7 +878,7 @@ yuno,261,99,4 script Sage Yklah#juno 735,{ mes "Return once you have obtained those items, and we will speak of the doomed sword again."; next; mes "[Yklah]"; - mes "For your information, you can obtain the claw of desert wolf from the Morroc desert, and the tooth of bat can be found in most caves around the world."; + mes "For your information, you can obtain the claw of desert wolf from the Morocc desert, and the tooth of bat can be found in most caves around the world."; next; mes "[Yklah]"; mes "Lastly, the piece of egg shell can be found from solid egg monsters in the Payon cave."; @@ -898,7 +898,7 @@ yuno,261,99,4 script Sage Yklah#juno 735,{ mes "Return once you have obtained those items, and we will speak of the doomed sword again."; next; mes "[Yklah]"; - mes "For your information, you can obtain the claw of desert wolf from the Morroc desert, and the tooth of bat can be found in most caves around the world."; + mes "For your information, you can obtain the claw of desert wolf from the Morocc desert, and the tooth of bat can be found in most caves around the world."; next; mes "[Yklah]"; mes "Lastly, the piece of egg shell can be found from solid egg monsters in the Payon cave."; @@ -1057,7 +1057,7 @@ yuno,213,298,4 script Sage Esklah#juno 735,{ mes "Heh, you don't look like much. But even though you're ordinary looking, you possess the legendary item!"; next; mes "[Esklah]"; - mes "Only a few people in Rune-Midgard's history have been chosen to use the ^3355FFStamp of Muriniel.^000000"; + mes "Only a few people in Midgard's history have been chosen to use the ^3355FFStamp of Muriniel.^000000"; next; mes "[Esklah]"; mes "However, it's my job to test whether or not you are truly qualified to possess it."; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index e558f453a8..f7dc5aa578 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -198,7 +198,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ next; mes "[Nelliorde]"; cutin "god_nelluad02",2; - mes "I'm talking about the Assassin Guild. Supposedly, it's hidden behind a sandstorm in the Morroc Desert!"; + mes "I'm talking about the Assassin Guild. Supposedly, it's hidden behind a sandstorm in the Morocc Desert!"; if (Class == Job_Assassin || Class == Job_Assassin_Cross) { mes "But you should know what I am talking about! So when are you gonna take me to the guild, eh?"; } @@ -266,7 +266,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ mes "you this time...? Ah yes, I've got it. Let me tell you about one of my own adventures. It was a pretty amazing experience."; next; mes "[Nelliorde]"; - mes "I went to Morroc, the city of the desert. On my way there, I became exhausted from the heat. Luckily, I found a hole beneath the shadows and climbed in to rest."; + mes "I went to Morocc, the city of the desert. On my way there, I became exhausted from the heat. Luckily, I found a hole beneath the shadows and climbed in to rest."; next; mes "[Nelliorde]"; mes "Oh my God..."; @@ -295,7 +295,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ next; cutin "god_nelluad01",2; mes "[Nelliorde]"; - mes "Anyway, the fortress of Sandaruman is on the way to Paros Lighthouse. I remember Serutero, a guy I met in south Morroc, telling me about its scenic beauty."; + mes "Anyway, the fortress of Sandaruman is on the way to Paros Lighthouse. I remember Serutero, a guy I met in south Morocc, telling me about its scenic beauty."; next; mes "[Nelliorde]"; mes "I was so excited"; @@ -472,7 +472,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ mes "you this time...? Ah yes, I've got it. Let me tell you about one of my own adventures. It was a pretty amazing experience."; next; mes "[Nelliorde]"; - mes "I went to Morroc, the city of the desert. On my way there, I became exhausted from the heat. Luckily, I found a hole beneath the shadows and climbed in to rest."; + mes "I went to Morocc, the city of the desert. On my way there, I became exhausted from the heat. Luckily, I found a hole beneath the shadows and climbed in to rest."; next; mes "[Nelliorde]"; mes "Oh my God..."; @@ -502,7 +502,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ next; cutin "god_nelluad01",2; mes "[Nelliorde]"; - mes "Anyway, the fortress of Sandaruman is on the way to Paros Lighthouse. I remember Serutero, a guy I met in south Morroc, telling me about its scenic beauty."; + mes "Anyway, the fortress of Sandaruman is on the way to Paros Lighthouse. I remember Serutero, a guy I met in south Morocc, telling me about its scenic beauty."; next; mes "[Nelliorde]"; mes "I was so excited"; @@ -726,7 +726,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{ mes "to see in the desert."; next; mes "[Nelliorde]"; - mes "I'm talking about the Assassin Guild. Supposedly, it's hidden behind a sandstorm in the Morroc"; + mes "I'm talking about the Assassin Guild. Supposedly, it's hidden behind a sandstorm in the Morocc"; if ((Class == Job_Assassin) || (Class == Job_Assassin_Cross)) { mes "Desert! But you should know what I am talking about! So when are you gonna take me to the guild, eh?"; } @@ -1194,7 +1194,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ mes "I hope we'll be"; mes "able to learn what"; mes "the goddess Freya has"; - mes "left behind in Rune-Midgard..."; + mes "left behind in Midgard..."; set god_brising,40; close; case 2: @@ -1213,7 +1213,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ mes "I hope we'll be"; mes "able to learn what"; mes "the goddess Freya has"; - mes "left behind in Rune-Midgard..."; + mes "left behind in Midgard..."; set god_brising,40; close; } diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index 4cf0d5650f..d6927111ab 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -66,7 +66,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 826,{ mes "disappeared after the war 1,000 years ago. Somehow, I can no longer find the way through the Yggdrasil Tree that will take me back..."; next; mes "[Dwarf Grunburti]"; - mes "I'm stuck here in Rune-Midgard."; + mes "I'm stuck here in Midgard."; mes "At least I was fortunate enough to find this cave. We Dwarves are most cozy living underground, after all."; close; case 3: diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt index 8ab7c6133d..26d298c5fc 100644 --- a/npc/quests/seals/megingard_seal.txt +++ b/npc/quests/seals/megingard_seal.txt @@ -1362,7 +1362,7 @@ prt_in,172,106,0 script Librarian#megin 833,{ next; mes "^663300[Keyword: ^996633"+.@input$+"^663300]"; mes "Current location:"; - mes "^996633Inn, Morroc^663300.^000000"; + mes "^996633Inn, Morocc^663300.^000000"; close2; } else if (compare(.@input$,"jack_o") == 1) { @@ -3096,7 +3096,7 @@ niflheim,109,254,0 script Egnigem 796,{ mes "I've never known why the King Tristram III ordered the research of godly artifacts. It also bothers me that Rebarev Doug is in charge of Megingjard's research. There must be some reason."; next; mes "[Egnigem]"; - mes "In any case, for the sake of Rune-Midgard, it will be your responsibility to find the answers."; + mes "In any case, for the sake of Midgard, it will be your responsibility to find the answers."; next; mes "[Egnigem]"; mes "There's not much a dead man"; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 267045b986..bfeeaab0d7 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -33,7 +33,7 @@ prontera,124,297,3 script Tialfi 706,{ cutin "god_tialpi01",2; mes "[Tialfi]"; mes "Hmmm..."; - mes "I can feel a strange force growing stronger and stronger, somewhere in Rune-Midgard."; + mes "I can feel a strange force growing stronger and stronger, somewhere in Midgard."; next; mes "[Tialfi]"; mes "Can you feel it?"; @@ -383,7 +383,7 @@ prt_fild01,196,47,3 script Roskva 703,{ mes "can be found to the East."; next; mes "[Roskva]"; - mes "Travel in a clock wise direction around Rune-Midgard and seek out the other Dwarves in order. Your final destination will be to the North."; + mes "Travel in a clock wise direction around Midgard and seek out the other Dwarves in order. Your final destination will be to the North."; next; mes "[Roskva]"; mes "If you happen to speak to them in the wrong order, please go talk to my brother Tialfi again."; @@ -402,7 +402,7 @@ prt_fild01,196,47,3 script Roskva 703,{ mes "can be found to the North."; next; mes "[Roskva]"; - mes "Travel in a counter clock wise direction around Rune-Midgard and seek out the other Dwarves in order. Your final destination will be to the East."; + mes "Travel in a counter clock wise direction around Midgard and seek out the other Dwarves in order. Your final destination will be to the East."; next; mes "[Roskva]"; mes "If you happen to speak to them in the wrong order, please go talk to my brother Tialfi again."; diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index 3e6fc4ed4e..fce5b0fbac 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -66,10 +66,10 @@ moc_ruins,118,99,5 script Roberto 88,{ close; } mes "[Roberto]"; - mes "An archer in Morroc!?"; + mes "An archer in Morocc!?"; mes "Nice to see you! Meeting a fellow"; mes "archer in a place like this! *sniffsniff*!"; - mes "I came alone to Morroc.."; + mes "I came alone to Morocc.."; mes "but I was a newcomer, and the pressure... waaah~"; mes "I was very lonely~"; next; diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt index f1f2c9eb21..66e8b08526 100644 --- a/npc/quests/skills/novice_skills.txt +++ b/npc/quests/skills/novice_skills.txt @@ -388,7 +388,7 @@ prt_castle,175,146,4 script Nursing Instructor 50,{ mes "Do you even know how we get these"; mes "precious bandages ?"; mes "They come from a powerful monster"; - mes "that is found in the pyramids of Morroc."; + mes "that is found in the pyramids of Morocc."; next; mes "[Dread Lord]"; mes "The monster is some sort of mummy."; diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt index bb126f72c5..e402d70e37 100644 --- a/npc/quests/skills/priest_skills.txt +++ b/npc/quests/skills/priest_skills.txt @@ -179,7 +179,7 @@ prt_church,111,112,1 script Sister Linus 79,{ mes "Well, a few months ago,"; mes "she went on a mission to"; mes "^3131FFLighthalzen^000000, a city in the"; - mes "Schwaltzvalt Republic. I was"; + mes "Schwarzwald Republic. I was"; mes "just worried since I haven't"; mes "heard from her in a while."; next; diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 669d7ada73..d4d23b6b49 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -379,7 +379,7 @@ yuno_in03,176,24,3 script Mischna 755,{ mes "[Mishuna]"; mes "^FF000020 "+.@ReqItem$[.@i]+"^000000,"; mes "^FF00001 Payon Solution^000000 and"; - mes "^FF00001 Morroc Solution^000000. Please"; + mes "^FF00001 Morocc Solution^000000. Please"; mes "return to me once you have"; mes "all the materials ready."; set SAG_SK, 10 * (.@i+1); //10,20,30,40 @@ -410,7 +410,7 @@ yuno_in03,176,24,3 script Mischna 755,{ mes "[Mishuna]"; mes "^ff000020 "+.@ReqItem$[.@i]+"^000000,"; mes "^ff00001 Payon Solution^000000 and"; - mes "^ff00001 Morroc Solution^000000. Please"; + mes "^ff00001 Morocc Solution^000000. Please"; mes "don't forget and have the"; mes "materials ready for the next"; mes "time you see me, alright?"; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index dde7774556..b7a1d19682 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -444,7 +444,7 @@ payon,91,77,3 script Bag Seller 99,{ case 0: mes "[RuRumuni]"; mes "There is a thief guild in the"; - mes "area of Morroc. I know one there"; + mes "area of Morocc. I know one there"; mes "that sends me thieves in need"; mes "of items I make such as a"; mes "^3355FF' Leather Bag of Infinity '^000000."; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 1497eb2339..e85821aa39 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -1216,7 +1216,7 @@ tha_t05,62,179,0 script Brilliant Statue#tt3 111,3,3,{ mes "during a millennium war.^000000"; next; mes ".........It's not clearly shown......"; - mes "^b22222...Morroc has gone through this gate"; + mes "^b22222...Morocc has gone through this gate"; mes "from the magical world into the Midgard continent after the millennium war terminated..."; next; mes "^b22222The question is that when she come up here, the Satan appears at the same time..."; @@ -1457,7 +1457,7 @@ tha_t06,226,230,0 script Brilliant Statue#tt4 111,3,3,{ mes "This tower used to be"; mes "a gate to summon demons ages ago."; mes "And the last visitor was"; - mes "the infamous Satan Morroc."; + mes "the infamous Satan Morocc."; next; mes "^b22222As I followed her trail"; mes "I realized that her spells"; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 7be37e9b90..faffd4412d 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -66,7 +66,7 @@ OnInit: prontera,147,305,0 duplicate(TheSign) Sign#prontera 111 geffen,168,175,0 duplicate(TheSign) Sign#geffen 111 -morocc,168,265,0 duplicate(TheSign) Sign#morroc 111 +morocc,168,265,0 duplicate(TheSign) Sign#morocc 111 payon,160,183,0 duplicate(TheSign) Sign#payon 111 aldebaran,54,223,0 duplicate(TheSign) Sign#aldebaran 111 alberta,35,241,0 duplicate(TheSign) Sign#alberta 111 @@ -137,7 +137,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "[Metz]"; mes "Now, the first person"; mes "you must visit is ^FF0000Arian^000000"; - mes "in Morroc. Please speak"; + mes "in Morocc. Please speak"; mes "to him and he'll give you"; mes "all the details about his"; mes "examination... I hope."; @@ -160,7 +160,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ case 3: mes "Hm...?"; mes "Shouldn't you leave"; - mes "for Morroc to see Arian?"; + mes "for Morocc to see Arian?"; mes "You better hurry in case"; mes "somebody else applies"; mes "for this little job."; @@ -306,7 +306,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "His name is"; mes "^FF0000Engel Howard^000000,"; mes "a legendary Blacksmith"; - mes "in Rune-Midgard. I don't"; + mes "in Midgard. I don't"; mes "know where he is, but maybe"; mes "his family in Geffen may know."; next; @@ -635,7 +635,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "Fascinating..."; mes "This was made with"; mes "a material outside of"; - mes "Rune-Midgard! See this"; + mes "Midgard! See this"; mes "blue lens? That must be"; mes "its incredible power source!"; next; @@ -656,7 +656,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "one person who can"; mes "handle working with"; mes "this: Engel Howard,"; - mes "Rune-Midgard's best"; + mes "Midgard's best"; mes "Blacksmith."; set sign_q,139; set sign_sq,0; @@ -2195,7 +2195,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "[Daewoon]"; mes "Anyway, I'm sure you're"; mes "aware of the War of Emperium"; - mes "in which mighty guilds all across Rune-Midgard battle for guild castle dominion. It's actually quite popular, really."; + mes "in which mighty guilds all across Midgard battle for guild castle dominion. It's actually quite popular, really."; next; mes "[Daewoon]"; mes "Now imagine that both of us"; @@ -4300,7 +4300,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ mes "that looks different"; mes "than all the others."; next; - if (select("Prontera Hollgrehenn:Prontera Doll Merchant:Izlude Meat Merchant:Morroc Meat Merchant") == 3) set .@user_p,.@user_p+1; + if (select("Prontera Hollgrehenn:Prontera Doll Merchant:Izlude Meat Merchant:Morocc Meat Merchant") == 3) set .@user_p,.@user_p+1; break; case 2: mes "[Aaron]"; @@ -5710,7 +5710,7 @@ alberta_in,154,171,5 script Maid#s10 758,{ mes "to. Hm, I wonder. Do you"; mes "think he could have been"; mes "heading towards the"; - mes "Schwaltzvalt Republic?"; + mes "Schwarzwald Republic?"; close; } else if (sign_q < 42) { @@ -6675,7 +6675,7 @@ alberta,43,49,5 script Poor-looking Merchant 89,{ mes "Under Bakerlan's guidance,"; mes "their estate has grown to be"; mes "one of the richest in Alberta,"; - mes "if not all of Rune-Midgard..."; + mes "if not all of Rune-Midgarts..."; close; case 2: mes "[Machen]"; @@ -8303,10 +8303,10 @@ himinn,48,86,5 script Valkyrie#sign 811,{ } else if ((sign_q == 129) || (sign_q == 130)) { mes "Welcome back."; - mes "Not only have you passed the trials that the gods have set for you, you have tested your courage in the realm of the dead and protected Rune-Midgard from attack."; + mes "Not only have you passed the trials that the gods have set for you, you have tested your courage in the realm of the dead and protected Midgard from attack."; next; mes "[Valkyrie Sandra]"; - mes "I'm pleased to announce that the gods have been watching you and decided to invite you to Valhalla. However, Rune-Midgard still has great need of you."; + mes "I'm pleased to announce that the gods have been watching you and decided to invite you to Valhalla. However, Midgard still has great need of you."; next; mes "[Valkyrie Sandra]"; mes "As a symbol of this promise to invite you to Valhalla, you shall be rewarded with 'The Sign' which will show all others that you are a great warrior whose courage was tested by the gods themselves."; @@ -8478,11 +8478,11 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "back, so summoning Dark Lord is"; mes "my last chance."; next; - select("But if Dark Lord comes to Rune-Midgard..."); + select("But if Dark Lord comes to Midgard..."); mes "[Serin]"; mes "Oh, I'm pretty sure of"; mes "what will happen if Dark Lord"; - mes "enters the realm of the living. He'll destroy Rune-Midgard and bring death to thousands and thousands of people."; + mes "enters the realm of the living. He'll destroy Midgard and bring death to thousands and thousands of people."; next; mes "[Serin]"; mes "So if I came back to life"; @@ -8510,7 +8510,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "my sake? You do understand"; mes "that you'll be failing the ordeals set before you by the gods..."; next; - switch(select("I changed my mind for Rune-Midgard.:I do, and it's alright...")) { + switch(select("I changed my mind for Midgard.:I do, and it's alright...")) { case 1: mes "[Serin]"; mes "..."; @@ -8534,7 +8534,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "[Serin]"; mes "The least I can"; mes "do is send you back"; - mes "to Rune-Midgard and"; + mes "to Midgard and"; mes "ask the Dark Lord to spare"; mes "you. Thank you so much..."; set sign_q,200; @@ -8633,7 +8633,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "to stop me, I still don't wish"; mes "to take your life. I understand"; mes "that you've merely trying to"; - mes "protect your Rune-Midgard."; + mes "protect your Midgard."; next; mes "[Serin]"; mes "However..."; @@ -8672,7 +8672,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "to stop me, I still don't wish"; mes "to take your life. I understand"; mes "that you've merely trying to"; - mes "protect your Rune-Midgard."; + mes "protect your Midgard."; next; mes "[Serin]"; mes "However..."; @@ -8762,11 +8762,11 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "back, so summoning Dark Lord is"; mes "my last chance."; next; - select("But if Dark Lord comes to Rune-Midgard..."); + select("But if Dark Lord comes to Midgard..."); mes "[Serin]"; mes "Oh, I'm pretty sure of"; mes "what will happen if Dark Lord"; - mes "enters the realm of the living. He'll destroy Rune-Midgard and bring death to thousands and thousands of people."; + mes "enters the realm of the living. He'll destroy Midgard and bring death to thousands and thousands of people."; next; mes "[Serin]"; mes "So if I came back to life"; @@ -8797,7 +8797,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "my sake? You do understand"; mes "that you'll be failing the ordeals set before you by the gods..."; next; - switch(select("I changed my mind for Rune-Midgard.:I do, and it's alright...")) { + switch(select("I changed my mind for Midgard.:I do, and it's alright...")) { case 1: set sign_q,125; close; @@ -8805,7 +8805,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "[Serin]"; mes "The least I can"; mes "do is send you back"; - mes "to Rune-Midgard and"; + mes "to Midgard and"; mes "ask the Dark Lord to spare"; mes "you. Thank you so much..."; set sign_q,200; @@ -8975,7 +8975,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "to stop me, I still don't wish"; mes "to take your life. I understand"; mes "that you've merely trying to"; - mes "protect your Rune-Midgard."; + mes "protect your Midgard."; next; mes "[Serin]"; mes "However..."; @@ -9022,7 +9022,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "to stop me, I still don't wish"; mes "to take your life. I understand"; mes "that you've merely trying to"; - mes "protect your Rune-Midgard."; + mes "protect your Midgard."; next; mes "[Serin]"; mes "However..."; @@ -9374,7 +9374,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "I have no idea how,"; mes "but it seems like Angrboda"; mes "has been sealed away in the"; - mes "world of Rune-Midgard..."; + mes "world of Midgard..."; emotion ET_THINK; set sign_q,94; close; @@ -9611,27 +9611,27 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ next; mes "[Serin]"; mes "Now, sometimes Dark Lord can"; - mes "enter the world of Rune-Midgard, but only in a manifestation that represents just a small portion"; + mes "enter the world of Midgard, but only in a manifestation that represents just a small portion"; mes "of his full power."; next; mes "[Serin]"; - mes "You see, it takes too much energy to travel from the Realm of Fiends to Rune-Midgard. And since the life force in Rune-Midgard conflicts with his powers, Dark Lord can't reach your world directly."; + mes "You see, it takes too much energy to travel from the Realm of Fiends to Midgard. And since the life force in Midgard conflicts with his powers, Dark Lord can't reach your world directly."; next; select("Wouldn't Lady Hell stop him?"); mes "[Serin]"; mes "Well, Dark Lord only wants"; - mes "Rune-Midgard, so the Queen of the Dead doesn't feel threatened about her control of Niflheim."; + mes "Midgard, so the Queen of the Dead doesn't feel threatened about her control of Niflheim."; next; mes "[Serin]"; mes "In fact, I'm sure she's aware"; - mes "that Dark Lord will cause thousands of deaths in Rune-Midgard, meaning that there would be thousands more souls for her to rule over. So it's not to her advantage to stop him."; + mes "that Dark Lord will cause thousands of deaths in Midgard, meaning that there would be thousands more souls for her to rule over. So it's not to her advantage to stop him."; next; select("Then what should we do...?"); mes "[Serin]"; mes "No matter what the cost,"; mes "we've got to stop her from"; mes "summoning Dark Lord in order"; - mes "to protect Rune-Midgard from"; + mes "to protect Midgard from"; mes "total annihiliation."; next; mes "[Serin]"; @@ -10101,7 +10101,7 @@ que_sign01,122,141,4 script Witch#s 792,{ next; mes "[Kirkena]"; mes "Sometimes Dark Lord can"; - mes "cross over into Rune-Midgard,"; + mes "cross over into Midgard,"; mes "but traveling from his world into"; mes "ours takes vast amounts of energy. Also the life force in your world conflicts with his dark powers."; next; @@ -10109,7 +10109,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "Now, if Dark Lord were"; mes "summoned into Niflheim,"; mes "he would have easy access"; - mes "to Rune-Midgard and the use"; + mes "to Midgard and the use"; mes "of all of his destructive power."; next; mes "[Kirkena]"; @@ -10124,7 +10124,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "favor with Lady Hell, she"; mes "will probably not stop Dark"; mes "Lord's approach. Dark Lord"; - mes "only wants Rune-Midgard."; + mes "only wants Midgard."; next; mes "[Kirkena]"; mes "Now that I think about"; @@ -10765,7 +10765,7 @@ que_sign01,45,227,4 script Queen of the Dead 856,{ next; mes "[Lady Hell]"; mes "^8C1717Do not fear me,"; - mes "hero of Rune-Midgard."; + mes "hero of Midgard."; mes "You have won the favor"; mes "of the Queen of the Dead"; mes "and may ask me of any"; @@ -11252,7 +11252,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ next; mes "[Laichin]"; mes "Yeah, those guys were pretty"; - mes "gangster about it. I mean, they took her soul, broke it in four pieces and stashed them in the deepest hole in Rune-Midgard!"; + mes "gangster about it. I mean, they took her soul, broke it in four pieces and stashed them in the deepest hole in Midgard!"; next; mes "[Laichin]"; mes "Sure, she was a giant, but"; @@ -11271,7 +11271,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ mes "[Laichin]"; mes "What...? I just said,"; mes "the deepest underground"; - mes "place in Rune-Midgard."; + mes "place in Midgard."; mes "It's a dangerous joint"; mes "protected by gangs"; mes "of monsters."; diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index bfc36915a7..3bd35af8e0 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -875,7 +875,7 @@ OnTouch: emotion ET_PROFUSELY_SWEAT; next; mes "[Daddy]"; - mes "She's gotten lost in Louyang, Amatsu, Moscovia, Brasilis, Kunlun,"; + mes "She's gotten lost in Luoyang, Amatsu, Moscovia, Brasilis, Kunlun,"; mes "and in Ayothaya..."; emotion ET_PROFUSELY_SWEAT; next; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 2974013706..2660f7b0d8 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -35,10 +35,10 @@ case 2: mes "Why don't you go to ^A2314BMalangdo^000000? That place is better than Geffen, where there are only crowds of simple honest wizards."; break; case 3: mes "The fresh air of Payon is not bad, but why don't you go better place like the heaven of the cats, ^A2314BMalangdo^000000?"; break; case 4: mes .@s$+"The beautiful and quiet place is better than Aldebaran, where it's so noisy with the tick-tock sound of the clock."; break; - case 5: mes .@s$+"The beautiful and quiet place is better than Morroc, with its heat and sandstorms."; break; - case 6: mes .@s$+"The beautiful place is better than Yuno, which is full of books and headaches."; break; + case 5: mes .@s$+"The beautiful and quiet place is better than Morocc, with its heat and sandstorms."; break; + case 6: mes .@s$+"The beautiful place is better than Juno, which is full of books and headaches."; break; case 7: mes .@s$+"The complex place is better than Rachel, where it's too horribly quiet."; break; - case 8: mes .@s$+"The safe place is better than Lighthanlzen, which is too dangerous."; break; + case 8: mes .@s$+"The safe place is better than Lighthalzen, which is too dangerous."; break; case 9: mes .@s$+"The smell of this sea place is better than Mora, which is full of a grassy smell."; break; } next; diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt index 6e4eac34ea..25116040f2 100644 --- a/npc/re/guides/guides_alberta.txt +++ b/npc/re/guides/guides_alberta.txt @@ -168,7 +168,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{ case 3: mes "[Alberta Guide]"; mes "You can use the "+F_Navi("Southern Dock","alberta,245,86"); - mes "to go to ^0000FFTurtle Island^000000, ^0000FFBrasilis^000000, ^0000FFAmatsu^000000, ^0000FFKunlun^000000, ^0000FFMoscovia^000000, ^0000FFLouyang^000000, or ^0000FFAyothaya^000000."; + mes "to go to ^0000FFTurtle Island^000000, ^0000FFBrasilis^000000, ^0000FFAmatsu^000000, ^0000FFKunlun^000000, ^0000FFMoscovia^000000, ^0000FFLuoyang^000000, or ^0000FFAyothaya^000000."; mes .@str$; viewpoint 1,245,86,15,0xFF0000; next; diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index db8dc8a07c..71a6e728f7 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -24,7 +24,7 @@ dicastes01,189,191,5 script Traveler Ichack#info 481,2,2,{ mes "There was someone in the expedition team claiming that he was the first, but it WAS me. That's right."; next; mes "[Traveler Ichack]"; - mes "That's why I will provide a service to guide adventurers from Rune-Midgard."; + mes "That's why I will provide a service to guide adventurers from Midgard."; mes "What would you like to know?"; F_Navi("[Traveler Ichack]"); next; diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt index 67ccd2d433..62a590d14e 100644 --- a/npc/re/guides/guides_hugel.txt +++ b/npc/re/guides/guides_hugel.txt @@ -179,7 +179,7 @@ hugel,187,172,6 script Guide Rich King#hugel 414,{ next; mes "[Rich King]"; mes "This is ^8B4513Hugel^000000"; - mes "in the Schwaltzvalt Republic."; + mes "in the Schwarzwald Republic."; mes "You are very honored to receive guidance from a great person like me."; F_Navi("[Rich King]"); next; diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index 11f728f1fb..e93e5e977d 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -8,7 +8,7 @@ //= 1.2 Navigation system update. [Euphy] //============================================================ -lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ +lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthalzen 852,{ cutin "ein_soldier",2; mes "[Lighthalzen Guide]"; mes "Welcome to ^8B4513Lighthalzen^000000,"; @@ -175,7 +175,7 @@ L_Mark: mes "Would you like to check any other locations?"; return; } -lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 852 -lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 852 -lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 852 -lighthalzen,247,82,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz05 852 +lighthalzen,220,310,3 duplicate(GuideLighthalzen) Lighthalzen Guide#lhz02 852 +lighthalzen,154,100,5 duplicate(GuideLighthalzen) Lighthalzen Guide#lhz03 852 +lighthalzen,307,224,3 duplicate(GuideLighthalzen) Lighthalzen Guide#lhz04 852 +lighthalzen,247,82,3 duplicate(GuideLighthalzen) Lighthalzen Guide#lhz05 852 diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt index 43623280f1..5fea20f55d 100644 --- a/npc/re/guides/guides_louyang.txt +++ b/npc/re/guides/guides_louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Guide +//= Luoyang Guide //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== @@ -8,15 +8,15 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Guide for the city of Louyang. +//= Guide for the city of Luoyang. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Navigation system update. [Euphy] //============================================================ -louyang,224,104,4 script Louyang Guide#01louyang 818,{ +louyang,224,104,4 script Luoyang Guide#01louyang 818,{ mes "[Representative]"; - mes "Welcome to ^8B4513Louyang^000000,"; + mes "Welcome to ^8B4513Luoyang^000000,"; mes "an ancient land with"; mes "a history full of tales"; mes "of bravery."; @@ -25,7 +25,7 @@ louyang,224,104,4 script Louyang Guide#01louyang 818,{ mes "We now provide an ocean lane to accomodate foreign travelers and intercultural exchange from which all can benefit."; next; mes "[Representative]"; - mes "^8B4513Louyang^000000 is famous for"; + mes "^8B4513Luoyang^000000 is famous for"; mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay."; F_Navi("[Representative]"); set .@str$,"Is there anything else I can do for you?"; @@ -66,7 +66,7 @@ louyang,224,104,4 script Louyang Guide#01louyang 818,{ mes "You will see"; mes "marvelous weapons forged"; mes "by the well-experienced"; - mes "Blacksmiths of Louyang."; + mes "Blacksmiths of Luoyang."; mes .@str$; viewpoint 1,145,172,3,0xFF1493; break; diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt index 913bc6127f..58dad5f542 100644 --- a/npc/re/guides/guides_morroc.txt +++ b/npc/re/guides/guides_morroc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Guides +//= Morocc Guides //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== @@ -8,20 +8,20 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Guides for the city of Morroc and Morroc Ruins. +//= Guides for the city of Morocc and Morocc Ruins. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] //============================================================ -morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ +morocc,153,286,6 script Guide#01morocc::GuideMorocc 707,{ cutin "moc_soldier",2; - mes "[Morroc Guide]"; - mes "Welcome to ^8B4513Morroc^000000,"; + mes "[Morocc Guide]"; + mes "Welcome to ^8B4513Morocc^000000,"; mes "the Desert Town."; mes "Do you need help navigating the town?"; - F_Navi("[Morroc Guide]"); + F_Navi("[Morocc Guide]"); next; while (1) { switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) { @@ -30,7 +30,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ while (.@loop) { switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) { case 1: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The "+F_Navi("Thief Guild","morocc,26,294","^B9062F")+" is located"; mes "inside the ^B9062FPyramids^000000"; mes "that is near the ^B9062FOasis^000000."; @@ -39,7 +39,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 2: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The "+F_Navi("Sphinx Dungeon","morocc,26,164","^0000FF")+" is"; mes "right outside the western gate."; mes "Would you like to check any other locations?"; @@ -47,7 +47,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Let me mark the entrance to the "+F_Navi("Oasis","morocc,26,294","^FF5400"); mes "on your mini-map."; mes "Would you like to check any other locations?"; @@ -65,7 +65,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 6: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Currently the "+F_Navi("Inn","morocc,273,269","^800080"); mes "has been shut down until further notice,"; mes "but I'll mark its location"; @@ -101,7 +101,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The "+F_Navi("Dye Maker","morocc,273,269","^7F3300")+" is"; mes "currently staying"; mes "on the 1st floor of the Inn."; @@ -112,7 +112,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 4: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes F_Navi("Seiyablem","morocc,51,41","^800080"); mes "is a technician"; mes "who can create ^0000FFslots^000000 on weapons and armors,"; @@ -129,7 +129,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ } break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Sure, I'll remove all marks from your mini-map."; mes "Is there anything else I can do for you?"; viewpoint 2,1,1,0,0xFFFF00; @@ -147,7 +147,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 4: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Be safe on your travels."; close2; cutin "moc_soldier",255; @@ -156,33 +156,33 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ } end; L_Mark: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Let me mark the location of the"; mes getarg(0); mes "on your mini-map."; mes "Would you like to check any other locations?"; return; } -morocc,154,38,6 duplicate(GuideMorroc) Guide#02morocc 707 -morocc,296,213,4 duplicate(GuideMorroc) Guide#03morocc 707 -morocc,28,170,5 duplicate(GuideMorroc) Guide#04morocc 707 +morocc,154,38,6 duplicate(GuideMorocc) Guide#02morocc 707 +morocc,296,213,4 duplicate(GuideMorocc) Guide#03morocc 707 +morocc,28,170,5 duplicate(GuideMorocc) Guide#04morocc 707 moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ cutin "moc_soldier",2; - mes "[Morroc Guide]"; - mes "Welcome to ^8B4513Morroc^000000,"; + mes "[Morocc Guide]"; + mes "Welcome to ^8B4513Morocc^000000,"; mes "the Desert Town."; mes "Do you need help navigating the town?"; - F_Navi("[Morroc Guide]"); + F_Navi("[Morocc Guide]"); next; while (1) { switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) { case 1: set .@loop,1; while (.@loop) { - switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) { + switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morocc Entrance ]:Previous Menu")) { case 1: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The "+F_Navi("Thief Guild","moc_ruins,56,161","^B9062F")+" is located"; mes "inside the ^B9062FPyramids^000000."; mes "Let me mark its location"; @@ -192,7 +192,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ next; break; case 2: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "The "+F_Navi("Sphinx Dungeon","moc_ruins,71,19","^0000FF"); mes "is outside the south entrance of this Oasis."; mes "Would you like to check any other locations?"; @@ -200,8 +200,8 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ next; break; case 3: - mes "[Morroc Guide]"; - mes F_Navi("Morroc","moc_ruins,158,40","^FF5400")+" is"; + mes "[Morocc Guide]"; + mes F_Navi("Morocc","moc_ruins,158,40","^FF5400")+" is"; mes "right outside the southeast entrance of this Oasis."; mes "Let me mark its location"; mes "on your mini-map."; @@ -225,7 +225,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ next; break; case 2: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Let me mark the location of the"; mes F_Navi("Northern Tool Dealer","moc_ruins,92,128","^800080"); mes "and "+F_Navi("Southern Tool Dealer","moc_ruins,114,63","^800080"); @@ -256,7 +256,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ next; break; case 7: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes F_Navi("Leablem","moc_ruins,154,86","^7F3300"); mes "is a technician"; mes "who can create ^0000FFslots^000000 on weapons and armors,"; @@ -273,7 +273,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ } break; case 3: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Sure, I'll remove all marks from your mini-map."; mes "Is there anything else I can do for you?"; viewpoint 2,1,1,0,0xFFFF00; @@ -291,7 +291,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ next; break; case 4: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Be safe on your travels."; close2; cutin "moc_soldier",255; @@ -300,7 +300,7 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ } end; L_Mark: - mes "[Morroc Guide]"; + mes "[Morocc Guide]"; mes "Let me mark the location of the"; mes getarg(0); mes "on your mini-map."; diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index fc40d521d7..4c64280ab7 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -1394,7 +1394,7 @@ malangdo,218,123,1 script Namis#invest 545,4,4,{ case 5: callsub L_Check,"5 Gemstones",7300,5,"Something useful for a change. The ore will end up as nice pieces of jewelry.",.@event1$[.@i]; case 6: callsub L_Check,"5 Heroic Emblems",968,5,"Good, good. This is the kind of name I wanted!",.@event1$[.@i]; case 7: callsub L_Check,"3 Taeguk Plates",7169,3,"Taking in something like this, maybe they're up to something dangerous.",.@event1$[.@i]; - case 8: callsub L_Check,"3 Broken Pharaoh Symbols and 3 Tutankhamen's Masks",7113,3,"I hear the pyramids are in Morroc, but I've never been there. Some humans call it Morco.",.@event1$[.@i],7114,3; + case 8: callsub L_Check,"3 Broken Pharaoh Symbols and 3 Tutankhamen's Masks",7113,3,"I hear the pyramids are in Morocc, but I've never been there. Some humans call it Morco.",.@event1$[.@i],7114,3; case 9: callsub L_Check,"2 Pocket Watches",7513,2,"Those lazy merchants, why do they need pocket watches they don't even use?",.@event1$[.@i]; case 10: callsub L_Check,"3 Young Twigs",7018,3,"Mellow Island has a climate like with where we cats used to live. But the trees die out sometimes due to it being an island.",.@event1$[.@i]; case 11: callsub L_Check,"5 Rossata Pieces",7211,5,"I guess they collect these because humans have them, but what's the use of researching ancient languages?",.@event1$[.@i]; diff --git a/npc/re/instances/DevilTower.txt b/npc/re/instances/DevilTower.txt index 19dfae549c..a84e9cc655 100644 --- a/npc/re/instances/DevilTower.txt +++ b/npc/re/instances/DevilTower.txt @@ -1394,7 +1394,7 @@ OnTimer7000: else { mes "[Lucile]"; mes "The collision of those two powers is too much to handle."; - mes "It could have influenced the south of Rune Midgard."; + mes "It could have influenced the south of Rune-Midgarts."; } next; if (select( "Follow.", "Stop." ) == 2) { @@ -1481,8 +1481,8 @@ OnTimer9000: select("Where are they?"); unittalk getcharid(3), "" + strcharinfo(0) + " : Where are they?"; mes "[Young Girl]"; - mes "They are in Morroc castle. My father is a knight."; - npctalk "They are in Morroc castle. My father is a knight."; + mes "They are in Morocc castle. My father is a knight."; + npctalk "They are in Morocc castle. My father is a knight."; next; mes "[Young Girl]"; mes "It seems like something is happening, I hear strange noises downstairs."; @@ -1723,7 +1723,7 @@ OnMobDead: 1@tnm3,97,48,3 script Loki#tnmloki01 4_M_ROKI2,{ if ('devil_tower == 12) { 'devil_tower = 13; - donpcevent instance_npcname("#morroc_lord_talk") + "::OnStart"; + donpcevent instance_npcname("#morocc_lord_talk") + "::OnStart"; end; } mes "[Loki]"; @@ -1733,13 +1733,13 @@ OnMobDead: 1@tnm3,94,51,4 duplicate(Officer Heim#heim0) Young Girl#tnm04 4_F_DST_CHILD -1@tnm2,1,1,0 script #morroc_lord_talk HIDDEN_WARP_NPC,{ +1@tnm2,1,1,0 script #morocc_lord_talk HIDDEN_WARP_NPC,{ end; OnStart: - enablenpc instance_npcname("#morroc_lord_talk"); - 'morroc$ = instance_npcname("Morocc Lord Knight#mocl"); + enablenpc instance_npcname("#morocc_lord_talk"); + 'Morocc$ = instance_npcname("Morocc Lord Knight#mocl"); 'loki$ = instance_npcname("Loki#tnmloki01"); - npctalk "Morocc Lord Knight: So.. the rat was an assassin? You came here to die?", 'morroc$; + npctalk "Morocc Lord Knight: So.. the rat was an assassin? You came here to die?", 'Morocc$; initnpctimer; end; OnTimer3000: @@ -1749,16 +1749,16 @@ OnTimer6000: npctalk "Loki: My mission brought me here to bury it again.", 'loki$; end; OnTimer9000: - npctalk "Morocc Lord Knight: Really.. the Assassin guild who I thought was on a mission to balance power in the world.", 'morroc$; + npctalk "Morocc Lord Knight: Really.. the Assassin guild who I thought was on a mission to balance power in the world.", 'Morocc$; end; OnTimer12000: - npctalk "Morocc Lord Knight: Resurrecting the demon would bring balance! Even the mightiest become slaves to a god..", 'morroc$; + npctalk "Morocc Lord Knight: Resurrecting the demon would bring balance! Even the mightiest become slaves to a god..", 'Morocc$; end; OnTimer15000: - npctalk "Morocc Lord Knight: The gods have their own plans. Do you know what the gods plan for you or I?", 'morroc$; + npctalk "Morocc Lord Knight: The gods have their own plans. Do you know what the gods plan for you or I?", 'Morocc$; end; OnTimer18000: - npctalk "Morocc Lord Knight: They want this world to only be in their image. Where do we fit into that?!", 'morroc$; + npctalk "Morocc Lord Knight: They want this world to only be in their image. Where do we fit into that?!", 'Morocc$; end; OnTimer20000: npctalk "Loki: Shut up!", 'loki$; @@ -1770,7 +1770,7 @@ OnTimer25000: npctalk "Loki: That is my mission!", 'loki$; end; OnTimer28000: - npctalk "Morocc Lord Knight: So all you want is to finish your damn mission?..", 'morroc$; + npctalk "Morocc Lord Knight: So all you want is to finish your damn mission?..", 'Morocc$; end; OnTimer31000: npctalk "Loki: *Grins* Of course!!", 'loki$; @@ -1794,7 +1794,7 @@ OnTimer36500: npctalk "!!!", 'loki$; end; OnTimer38500: - npctalk "Morocc Lord Knight: Oh no.. They should have sent better than you, Mr. Assassin, for this mission.", 'morroc$; + npctalk "Morocc Lord Knight: Oh no.. They should have sent better than you, Mr. Assassin, for this mission.", 'Morocc$; end; OnTimer41500: npctalk "Young Girl: Something is wrong....", instance_npcname("Young Girl#tnm04"); @@ -1803,15 +1803,15 @@ OnTimer44500: npctalk "Young Girl: My Papa would never act this way.. Ugh..", instance_npcname("Young Girl#tnm04"); end; OnTimer47500: - npctalk "Morocc Lord Knight: Human.. To do such a stupid thing.. a sacrifice.", 'morroc$; + npctalk "Morocc Lord Knight: Human.. To do such a stupid thing.. a sacrifice.", 'Morocc$; end; OnTimer50500: - npctalk "Morocc Lord Knight: You know, the truth is, that it is useless.", 'morroc$; + npctalk "Morocc Lord Knight: You know, the truth is, that it is useless.", 'Morocc$; end; OnTimer53500: - npctalk "Morocc Lord Knight: Gwuaaa hahahaha. You stupid humans I will kill you all as sacrifices for the demon!!", 'morroc$; - specialeffect EF_COUPLECASTING,AREA, 'morroc$; - specialeffect EF_VOLCANO,AREA, 'morroc$; + npctalk "Morocc Lord Knight: Gwuaaa hahahaha. You stupid humans I will kill you all as sacrifices for the demon!!", 'Morocc$; + specialeffect EF_COUPLECASTING,AREA, 'Morocc$; + specialeffect EF_VOLCANO,AREA, 'Morocc$; end; OnTimer54500: npctalk "Loki:... tsk! useless....!", 'loki$; @@ -1821,7 +1821,7 @@ OnTimer55500: mapwarp 'map_tnm3$, 'map_tnm3$,136,62;// todo area 1x1 'devil_tower = 13; stopnpctimer; - disablenpc instance_npcname("#morroc_lord_talk"); + disablenpc instance_npcname("#morocc_lord_talk"); disablenpc instance_npcname("Morocc Lord Knight#mocl"); disablenpc instance_npcname("Loki#tnmloki01"); disablenpc instance_npcname("Young Girl#tnm04"); @@ -2198,7 +2198,7 @@ OnInstanceInit: // Boss disablenpc instance_npcname("Morocc Lord Knight#mocl"); - disablenpc instance_npcname("#morroc_lord_talk"); + disablenpc instance_npcname("#morocc_lord_talk"); disablenpc instance_npcname("Loki#tnmloki01"); disablenpc instance_npcname("Young Girl#tnm04"); disablenpc instance_npcname("Loki#tnmloki02"); diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index cc8c03603b..b4bdc003e9 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -179,7 +179,7 @@ OnTouch: mes "We couldn't communicate with them either, and one of them seemed furious after looking around and finding out that its fellows are defeated."; next; mes "[" + strcharinfo(0) + "]"; - mes "They look as if they are incarnation of Morroc."; + mes "They look as if they are incarnation of Morocc."; mes "Is the King of Domons after the Orb?"; mes "Or is it just a coincidence?"; next; @@ -366,7 +366,7 @@ OnMyMobDead: select("I fought with monsters."); cutin "hisie03",0; mes "[Hisie]"; - mes "Monsters? Subordinates of Morroc?"; + mes "Monsters? Subordinates of Morocc?"; mes "What you were trying to kill were our soldiers, the Laphines!!"; mes "What on earth happened there?"; npcskill "AL_HEAL",9,99,80; @@ -387,7 +387,7 @@ OnMyMobDead: next; cutin "",255; mes "[Loki]"; - mes "Shenime is one of the subordinates of Morroc."; + mes "Shenime is one of the subordinates of Morocc."; mes "His power enbales him to control another person directly or mentally influence that person indirectly through a part of his body."; next; select("Now that I think about it..."); @@ -455,7 +455,7 @@ OnMyMobDead: cutin "",255; mes "[Loki]"; mes "Don't worry about us."; - mes "Our target is Morroc, the King of Demons."; + mes "Our target is Morocc, the King of Demons."; mes "It's good enough that we found an evidence here."; next; cutin "hisie01",0; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 6365c1af3b..e328308090 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -825,11 +825,11 @@ mora,48,152,3 script Sharp Eyed Man 512,{ } else if (ep14_1_mistwoods == 4) { mes "[Loki]"; mes "Nydhogg was one of the guardians of the World Tree."; - mes "But he abandoned his duties as a guardian when he gave in to Morroc's temptation."; + mes "But he abandoned his duties as a guardian when he gave in to Morocc's temptation."; next; mes "[Loki]"; - mes "Some fools performed a ritual to break the seal that held Morroc."; - mes "But the ritual didn't work right. The servant of Morroc failed to break the seal."; + mes "Some fools performed a ritual to break the seal that held Morocc."; + mes "But the ritual didn't work right. The servant of Morocc failed to break the seal."; next; mes "[Loki]"; mes "But the seal is so weak that it can break open any time."; @@ -844,12 +844,12 @@ mora,48,152,3 script Sharp Eyed Man 512,{ mes "As the World Tree became unstable, the influence it had on the seal grew weak."; next; mes "[Loki]"; - mes "And Morroc broke himself free from the seal."; + mes "And Morocc broke himself free from the seal."; mes "Although it seems like he used most of his powers just to break the seal..."; next; mes "[Nydhogg the Guardian]"; mes "It's all my fault."; - mes "I couldn't break free from Morroc's temptation."; + mes "I couldn't break free from Morocc's temptation."; mes "For too... too long..."; next; mes "[Nydhogg the Guardian]"; @@ -879,7 +879,7 @@ mora,48,152,3 script Sharp Eyed Man 512,{ next; mes "[Nydhogg the Guardian]"; mes "...Oh, yes. It's late, but I have to fulfill my duties as a guardian."; - mes "Now I know. I'll destroy Morroc with my own hands."; + mes "Now I know. I'll destroy Morocc with my own hands."; mes "I will fulfill my duties as a guardian."; next; switch(select("You're not alone.:Those are very important duties.")) { @@ -923,7 +923,7 @@ mora,48,152,3 script Sharp Eyed Man 512,{ mes "We may meet again."; next; mes "[Loki]"; - mes "The day when Morroc reveals his despicable nature..."; + mes "The day when Morocc reveals his despicable nature..."; mes "I will be waiting for him."; close; } diff --git a/npc/re/instances/NightmarishJitterbug.txt b/npc/re/instances/NightmarishJitterbug.txt index 37cbb5c2f8..246fe772be 100644 --- a/npc/re/instances/NightmarishJitterbug.txt +++ b/npc/re/instances/NightmarishJitterbug.txt @@ -1414,8 +1414,8 @@ OnTouch_: jitterbug_options &= ~1; unittalk getcharid(3), "" + strcharinfo(0) + " : I like Aigu's single, Only I Didn't Know about the Card Album."; mes "[Newoz]"; - mes "Aigu is the Rune-Midgart's hottest singer at this moment!"; - npctalk "Newoz: Aigu is the Rune-Midgart's hottest singer at this moment!"; + mes "Aigu is the Rune-Midgarts' hottest singer at this moment!"; + npctalk "Newoz: Aigu is the Rune-Midgarts' hottest singer at this moment!"; break; case 3: jitterbug_options |= 1; diff --git a/npc/re/instances/RitualOfBlessing.txt b/npc/re/instances/RitualOfBlessing.txt index 38c1434e0d..d3002de0ff 100644 --- a/npc/re/instances/RitualOfBlessing.txt +++ b/npc/re/instances/RitualOfBlessing.txt @@ -77,7 +77,7 @@ OnEvent: npctalk "Roegenburg", instance_npcname("Wolf Roegenburg#wolf01"); npctalk "Roegenburg", instance_npcname("Helmut Roegenburg#helmu"); npctalk "Roegenburg", instance_npcname("Agnes Roegenburg#agnes0_1"); - mapannounce instance_mapname("2@mir"), "Kronecker: On the behalf of the seven royal families supporting Rune Midgarts,", bc_map,0xFF99; + mapannounce instance_mapname("2@mir"), "Kronecker: On the behalf of the seven royal families supporting Rune-Midgarts,", bc_map,0xFF99; mapannounce instance_mapname("2@mir"), "Kronecker: Here is the new representative appointed", bc_map,0xFF99; mapannounce instance_mapname("2@mir"), "Kronecker: The blessing star light may reach the glory of the earth...", bc_map,0xFF99; sleep 10000; @@ -629,7 +629,7 @@ OnTimer12000: next; select("Terra Gloria?"); mes "[Kronecker]"; - mes "It is the crown passed down in the palace of Rune Midgarts."; + mes "It is the crown passed down in the palace of Rune-Midgarts."; mes "It means more than an ordinary crown."; next; mes "[Kronecker]"; diff --git a/npc/re/instances/SarahAndFenrir.txt b/npc/re/instances/SarahAndFenrir.txt index 36285cdcd4..2d04bedc0f 100644 --- a/npc/re/instances/SarahAndFenrir.txt +++ b/npc/re/instances/SarahAndFenrir.txt @@ -17,7 +17,7 @@ dali02,97,142,3 script Professor Bernhard#a1 4_LGTSCIENCE,{ switch( isbegin_quest(9335) ) { case 0:// First time doing instance mes "[Professor Bernhard]"; - mes "I would say I am Professor Bernhard, the best weapons researcher in Schwaltzvalt."; + mes "I would say I am Professor Bernhard, the best weapons researcher in Schwarzwald."; next; mes "[Professor Bernhard]"; mes "After endless research I have created various weapons, but I felt something was missing so I found the ancient texts."; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index bfcb32d060..eb5794ba31 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -276,14 +276,14 @@ umbala,139,227,3 script Priest#arch 60,{ next; mes "[Priest Dayan]"; mes "That big tree is called The ^3131FFYggdrasil^000000."; - mes "That tree was created from Ymir's body after Odin created the world as you know it, Rune-Midgard."; + mes "That tree was created from Ymir's body after Odin created the world as you know it, Midgard."; next; mes "[Priest Dayan]"; mes "A fountain pours out from the end of Yggdrasil's roots that spread to every world."; next; mes "[Priest Dayan]"; mes "The roots head to Niflheim where you can find the Hvergelmir spring."; - mes "In Rune-Midgard there is Mimir's spring."; + mes "In Midgard there is Mimir's spring."; mes "And in Asgard, the world of the Gods, there is the Word spring."; next; mes "[Priest Dayan]"; @@ -396,7 +396,7 @@ umbala,139,227,3 script Priest#arch 60,{ mes "Now, there is a place you should go to."; next; mes "[Priest Dayan]"; - mes "That place is Hugel in Schwaltzvalt."; + mes "That place is Hugel in Schwarzwald."; mes "There is a Nun praying there named Vinue,"; mes "she is a true minister who prays for the suffering people in the world."; mes "But the last time I saw her she seemed sad."; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 24fe9311c0..37e124716a 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -110,7 +110,7 @@ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ mes "Hmm..."; next; mes "[Ahcart]"; - mes "Of course, a chapter of the assassin guild is not only in Morroc. If you have a chance to go there, visit there."; + mes "Of course, a chapter of the assassin guild is not only in Morocc. If you have a chance to go there, visit there."; mes "I think you might go there."; set job_3rd_gc, 1; close; @@ -251,7 +251,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{ } next; mes "[Daora]"; - mes "I'm not sure that you already know or not, but we are selling special Morroc liquor."; + mes "I'm not sure that you already know or not, but we are selling special Morocc liquor."; mes "Which one do you want?"; next; switch(select("Tropical Sograt:Vermilion on the Beach:No thanks!:......")) { @@ -807,7 +807,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{ } next; mes "[Daora]"; - mes "I'm not sure that you already know or not, but we are selling special liquor of Morroc."; + mes "I'm not sure that you already know or not, but we are selling special liquor of Morocc."; mes "Which one do you want?"; next; switch(select("Tropical Sograt:Vermilion the beach:No thanks!")) { @@ -1076,7 +1076,7 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 894,{ next; mes "[Mayshell]"; mes "Don't forget."; - mes "And the task you did is related to Rachel, Rune-Midgard, and our assassin guild."; + mes "And the task you did is related to Rachel, Rune-Midgarts, and our assassin guild."; mes "So the others should not be known. Of course, you are included, so please forget everything."; close; } else if (job_3rd_gc == 20) { diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 71bcc55e6d..194445741c 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -187,7 +187,7 @@ yuno,129,156,3 script Chainheart 923,{ mes "and you don't need to rely on something that's uncertain and unstable as magic, so what can be better than this."; next; mes "[Chainheart]"; - mes "The person who invented magic machinery is Franklson, a scholar from the Schwaltzvalt Republic."; + mes "The person who invented magic machinery is Franklson, a scholar from the Schwarzwald Republic."; next; mes "[Chainheart]"; mes "Franklson discovered an ancient machine in the ^FF0000Ruins of Juperos^000000 and fused it with the power of magic, and that was the beginning."; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index db50934507..0ef1228892 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -767,7 +767,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{ mes "Therefore, jobs such as Wizard and Sage have come out and the magic became their own sacred field."; next; mes "[Rune Knight, Renoa]"; - mes "The leader of the Rune Knights, Beljeve, is known to have been in touch with the fairies even before the dimensional door of the Ash-Vacuum was made when Satan Morroc resurrected."; + mes "The leader of the Rune Knights, Beljeve, is known to have been in touch with the fairies even before the dimensional door of the Ash-Vacuum was made when Satan Morocc resurrected."; next; mes "[Rune Knight, Renoa]"; mes "I heard a story from the magical scholars about the technology that can substantialize the essence of magic. I began a study to substantialize it to a rune by getting their help."; @@ -782,7 +782,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{ mes "So for the second test, you need to visit the Laphine magical scholars who had given the direct help to the birth of Rune Knights at Ash-Vacuum."; next; mes "[Rune Knight, Renoa]"; - mes "Find the sage, Serpeone who's been studying and helping the Rune Knights who are out in the Rune-Midgard's camp at Ash-Vacuum."; + mes "Find the sage, Serpeone who's been studying and helping the Rune Knights who are out in the Midgard's camp at Ash-Vacuum."; next; mes "[Rune Knight, Renoa]"; mes "The sage has already been in touch with us for a long time so you don't need to worry about understanding Serpeone's language."; @@ -794,7 +794,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{ changequest 3206,3207; close; } else if (job_rune_edq > 11 && job_rune_edq < 14) { - mes "If you are ready I'll open the way to the sage, Serpeone who's in the Rune-Midgard post at Ash-Vacuum. Are you prepared?"; + mes "If you are ready I'll open the way to the sage, Serpeone who's in the Midgard post at Ash-Vacuum. Are you prepared?"; next; switch(select("Yes, I am prepared.:Not yet.")) { case 1: @@ -802,16 +802,16 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{ mes "Good. Then I'll send you there now. But, there's one thing I need to tell you."; next; mes "[Rune Knight, Renoa]"; - mes "You will be sent to the Ash-Vacuum. The people dispatched to the Rune-Midgard post are certified adventurers and officials."; + mes "You will be sent to the Ash-Vacuum. The people dispatched to the Midgard post are certified adventurers and officials."; next; mes "[Rune Knight, Renoa]"; mes "Beljeve has an agreement with the other alliance countries that the free behavior of our Rune Knights is guaranteed but..."; next; mes "[Rune Knight, Renoa]"; - mes "If you want to move freely through all of Ash-Vacuum, you'll have to go through the normal route which is acquiring qualification with the Rune-Midgard alliance. It has nothing to do with us."; + mes "If you want to move freely through all of Ash-Vacuum, you'll have to go through the normal route which is acquiring qualification with the Midgard alliance. It has nothing to do with us."; next; mes "[Rune Knight, Renoa]"; - mes "The agreement only allows us to send candidates to the Rune-Midgard camp and nowhere else."; + mes "The agreement only allows us to send candidates to the Midgard camp and nowhere else."; next; mes "[Rune Knight, Renoa]"; mes "Good luck."; @@ -1057,7 +1057,7 @@ job3_rune01,43,44,1 script The Principles of Runes 844,{ switch(select("The principle use of Runes:The types of Runes:Stop Reading")) { case 1: set .@book1,1; - mes "A rune is a kind of symbol that's been used on the Rune-Midgard continent since ancient times. Up until now it has only been used by occult circles."; + mes "A rune is a kind of symbol that's been used on the Midgard continent since ancient times. Up until now it has only been used by occult circles."; next; mes "Runes are used as a symbol system, however, by the story handed down orally, it's known to be used for fortune-telling or used to draw out the human sub consciousness."; next; @@ -1254,7 +1254,7 @@ OnTouch: mes "- Whispers of the sage Serpeone are delivered to my mind. -"; next; mes "[Sage Serpeone]"; - mes "Until you become an honorable Rune Knight I cannot help you control your powers in Rune-Midgard."; + mes "Until you become an honorable Rune Knight I cannot help you control your powers in Midgard."; next; mes "[Sage Serpeone]"; mes "Please understand this and be devoted to this test."; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index 21a8e63ae2..44b1b1152f 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -30,13 +30,13 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{ mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations."; next; mes "[Alchemist Union Member]"; - mes "They have spread to all corners of Rune-Midgart and were active in many fields like sciences or special item production methods."; + mes "They have spread to all corners of Midgard and were active in many fields like sciences or special item production methods."; next; mes "[Alchemist Union Member]"; mes "We call the members of our new union ^3131FF'Geneticists'^000000."; next; mes "[Alchemist Union Member]"; - mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Rune-Midgart."; + mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Midgard."; next; mes "[Alchemist Union Member]"; mes "It looks like you are an expert in this field, how about meeting other geneticists?"; @@ -82,13 +82,13 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{ mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations."; next; mes "[Alchemist Union Member]"; - mes "They have spread to all corners of Rune-Midgart and were active in many fields like sciences or special item production methods."; + mes "They have spread to all corners of Midgard and were active in many fields like sciences or special item production methods."; next; mes "[Alchemist Union Member]"; mes "We call the members of our new union ^3131FF'Geneticists'^000000."; next; mes "[Alchemist Union Member]"; - mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Rune-Midgard."; + mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Midgard."; close; } @@ -121,21 +121,21 @@ job3_gen01,25,58,3 script Devries#gen 865,{ next; select("Why do you talk like that?"); mes "[Devries]"; - mes "'Cause I'm from Rune-Midgart!"; - mes "Have you ever been to Rune-Midgart? Everyone in Rune-Midgart speaks like this."; + mes "'Cause I'm from Rune-Midgarts!"; + mes "Have you ever been to Rune-Midgarts? Everyone in Rune-Midgarts speaks like this."; next; - switch(select("Impossible?!:I'm also from Rune-Midgart.")) { + switch(select("Impossible?!:I'm also from Rune-Midgarts.")) { case 1: mes "[Devries]"; mes "Impossible?"; - mes "Do you come from a Rune-Midgart village?"; + mes "Do you come from a Rune-Midgarts village?"; mes "My village is very big, everyone there speaks like this."; break; case 2: emotion ET_THROB; mes "[Devries]"; mes "Really! That's why I felt some kind of familiar atmosphere around you."; - mes "Meeting a hometown person in Schwaltzvalt, it's my pleasure to meet you!"; + mes "Meeting a hometown person in Schwarzwald, it's my pleasure to meet you!"; break; } next; @@ -601,7 +601,7 @@ job3_gen01,83,72,3 script Delivery Box#generic 111,{ } case 2: mes "[From: Rune-Midgarts Kingdom, Prontera, Charles Orleans]"; - mes "[Recipient: Schwaltzvalt Republic, Lighthalzen, Devries]"; + mes "[Recipient: Schwarzwald Republic, Lighthalzen, Devries]"; close; case 3: mes "You do nothing."; diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index 0199b054a5..c58894a807 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -1559,7 +1559,7 @@ comodo,159,316,4 script Woman Roasting Meat 701,{ mes "Finally, he became exhausted and he wanted to go somewhere quiet."; next; mes "[Woman Roasting Meat]"; - mes "I told him that there was a quiet place near Morroc, and he left."; + mes "I told him that there was a quiet place near Morocc, and he left."; next; mes "[Woman Roasting Meat]"; mes "I regret that."; @@ -1571,7 +1571,7 @@ comodo,159,316,4 script Woman Roasting Meat 701,{ close; } else if (job_min == 20) { mes "Where is the quiet place?"; - mes "Well I'm not sure but there is a mysterious building in south-eastern part of Morroc."; + mes "Well I'm not sure but there is a mysterious building in south-eastern part of Morocc."; next; mes "[Woman Roasting Meat]"; mes "I heard that some mysterious people gather there."; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 051943130f..f1cc02c6ee 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -440,7 +440,7 @@ izlude,198,213,3 script Captain Carocc#iz 4_M_REINDEER,5,5,{ select("You mean the Academy?"); mes "[Carocc]"; mes "Yes! It's called the ^4d4dffRoyal Criatura Academy^000000."; - mes "Founded by the Rune Midgard lineage to help out new adventurers."; + mes "Founded by the Rune-Midgarts lineage to help out new adventurers."; next; mes "[Carocc]"; mes "A friend of mine works there, so I'll give you the introduction to him."; @@ -1217,7 +1217,7 @@ izlude,120,207,4 script Information Staff#0 8W_SOLDIER,{ case 3: mes "[Information Staff]"; mes "To the southeast, the [Airship]izlude,206,75,"; - mes "will be connected with the Capital of the republic of Schwarzwald -^8B4513 Yuno^000000, and"; + mes "will be connected with the Capital of the republic of Schwarzwald -^8B4513 Juno^000000, and"; mes "The capital of the Arunapeltsdom -^8B4513 Rachel ^000000."; mes "Do you need additional directions?"; viewpoint 1, 210, 73, 2, 0xFF0A82; @@ -1483,7 +1483,7 @@ izlude,120,207,4 script Information Staff#0 8W_SOLDIER,{ case 3: mes "[Information Staff]"; mes "To the southeast, the [Airship]izlude,206,75,"; - mes "will be connected with the Capital of the republic of Schwarzwald -^8B4513 Yuno^000000, and"; + mes "will be connected with the Capital of the republic of Schwarzwald -^8B4513 Juno^000000, and"; mes "The capital of the Arunapeltsdom -^8B4513 Rachel ^000000."; mes "Do you need additional directions?"; viewpoint 1, 210, 73, 2, 0xFF0A82; @@ -2236,7 +2236,7 @@ iz_ac01,59,43,3 script Therapist#ac 4_M_6THPRIN1,{ } else { mes "[Therapist]"; mes "I already let you know about the basic medical botany."; - mes "By the way, there is something called a ^4d4dffShining Plant^000000 here on Rune Midgard."; + mes "By the way, there is something called a ^4d4dffShining Plant^000000 here on Midgard."; next; mes "[Therapist]"; mes "Nobody knows which herb comes out from this plant."; @@ -2664,13 +2664,13 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{ switch(select("What's on the 1st floor", "What's on the 2nd floor", "Explanation about towns", "End Conversation")) { case 1: mes "[Receptionist]"; - mes "The first floor is equipped with instructors that give you lessons on how the world works here in Rune Midgard."; + mes "The first floor is equipped with instructors that give you lessons on how the world works here in Midgard."; next; mes "[Receptionist]"; mes "First of all, at the dispensary, you can learn how to recover your physical strength and learn a skill to heal your HP"; next; mes "[Receptionist]"; - mes "At the armory, you can get simple training about battling monsters in Rune Midgard."; + mes "At the armory, you can get simple training about battling monsters in Midgard."; next; mes "[Receptionist]"; mes "At the cafeteria, you can practice cooking and and will learn its many benefits."; @@ -3064,7 +3064,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "Want to know what I mean?"; next; mes "[Mainz]"; - mes "There are various kinds of monsters on the Rune Midgard continent. And some of them can poison you or put you in abnormal conditions."; + mes "There are various kinds of monsters on the Midgard continent. And some of them can poison you or put you in abnormal conditions."; next; mes "[Mainz]"; mes "Usually, anybody is too embarrassed to admit being poisoned without knowing. I just did it on purpose to let you have the experience in case it happens out in the real world."; @@ -3074,7 +3074,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ emotion ET_OTL; next; mes "[Mainz]"; - mes "As an apology, I would like to inform you of several abnormal statuses you might experience in the Rune Midgard Continent."; + mes "As an apology, I would like to inform you of several abnormal statuses you might experience in the Midgard Continent."; next; mes "[Mainz]"; mes "Don't decline it! Being ready to learn so speak to me again."; @@ -3457,7 +3457,7 @@ izlude,115,181,5 script Shop Helper#iz 4_F_KHELLISIA,{ } mes "[Shop Helper Leonie]"; mes "Wise choise."; - mes "Rune Midgard has many shops and many variety of currencies."; + mes "Midgard has many shops and many variety of currencies."; mes "So you need to listen to me well to use them accordingly."; setquest 1237; close; @@ -3890,7 +3890,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ next; emotion ET_BEST; mes "[Dacquoise]"; - mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; + mes "I am Dacquoise, the pupil of the legendary chef of Rune-Midgarts, ^0000cdCharles Orleans^000000."; next; emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; @@ -4354,7 +4354,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ } else { emotion ET_BEST; mes "[Dacquoise]"; - mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; + mes "I am Dacquoise, the pupil of the legendary chef of Rune-Midgarts, ^0000cdCharles Orleans^000000."; next; emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; @@ -4578,7 +4578,7 @@ iz_ac01,59,83,3 script Battle Instructor#08 4_M_NOV_HUNT,{ } if (checkquest(11341,HUNTING) < 2) { mes "[Battle Instructor Subino]"; - mes "^ff0000Fabre^000000 is the most common bug which is usually seen in Rune Midgard Kingdom.."; + mes "^ff0000Fabre^000000 is the most common bug which is usually seen in Rune-Midgarts Kingdom.."; mes "It is a worm but it is very popular because it looks cute."; next; mes "[Battle Instructor Subino]"; @@ -5016,7 +5016,7 @@ new_1-3,92,169,5 script Adept Adventurer#new_1-3 4_M_JOB_BLACKSMITH,{ mes "Would you look at that...Porings growing in the garden of the closed Criatura Academy like little Jelly Babies."; next; mes "[Adept Adventurer]"; - mes "Not all monsters in Rune Midgards are our for your blood, just most of them."; + mes "Not all monsters in Midgard are our for your blood, just most of them."; next; mes "[Adept Adventurer]"; mes "Take a look at that, looks like that ^3131FFPoring^000000 has something to say to you"; @@ -5137,7 +5137,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ mes "The Little Porings aren't bad'uns, they've just not been to the outside world."; next; mes "[Poring]"; - mes "If this keeps up, all of the Porings in Rune Midgard'll be under the sway of Ghostring."; + mes "If this keeps up, all of the Porings in Midgard will be under the sway of Ghostring."; next; if (select("Can I help you?", "Too bad.") == 2) { mes "[Poring]"; @@ -5266,7 +5266,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ next; mes "[Poring]"; mes "Oi, Little Poring."; - mes "I look forward to seeing you once you've explored Rune Midgards!"; + mes "I look forward to seeing you once you've explored Midgard!"; mes "Cheers mate."; completequest 2298; if (Class == Job_Novice) @@ -5385,7 +5385,7 @@ iz_ac01,95,46,5 script Kafra Guide Trainer#ac 4_F_KAFRA1,{ break; case 3: mes "[Kafra Guide Trainer]"; - mes "Teleport service is a service that sends you to various locations throughout Rune Midgard."; + mes "Teleport service is a service that sends you to various locations throughout Midgard."; next; mes "[Kafra Guide Trainer]"; mes "Different Kafra Employees have different teleport locations to send you to so you need to talk to them to find out where they're teleporting to."; @@ -6570,7 +6570,7 @@ iz_ac02,149,43,3 script Ragie#ac 1_M_BARD,{ mes "A beautiful Wanderer from Comodo at the age of 20. Not only Midgard but also wherever her wandering troupe goes, a fan club follows."; next; mes "[Ragie]"; - mes "I am ^FF0000Ragie^000000 in charge with the Rune Midgard branch head of Igoo's informal fan club! As Igoo has gone to the 2nd world, I am taking a rest for a while. But she will be back soon."; + mes "I am ^FF0000Ragie^000000 in charge with the Rune-Midgarts branch head of Igoo's informal fan club! As Igoo has gone to the 2nd world, I am taking a rest for a while. But she will be back soon."; next; mes "[Ragie]"; mes "As I am still a low level of adventurer, I haven't followed her to the 2nd world... See! I will make great efforts and follow her everywhere."; @@ -10453,7 +10453,7 @@ iz_ac02,52,136,3 script Guest Lecturer Mayssel#0 4_F_MAYSEL,{ next; cutin "gc_mayssel01.bmp", 1; mes "[Mayssel]"; - mes "If you are ready, I will send you to the deserts of Morroc to embrace the shadows."; + mes "If you are ready, I will send you to the deserts of Morocc to embrace the shadows."; mes "The journey will be both strange and challenging."; next; if (select("At once please.", "I need more time.") == 2) { @@ -10464,7 +10464,7 @@ iz_ac02,52,136,3 script Guest Lecturer Mayssel#0 4_F_MAYSEL,{ end; } mes "[Mayssel]"; - mes "^4d4dffFind the Pyramid^000000 in the ^4d4dffNorthwest^000000 of Morroc."; + mes "^4d4dffFind the Pyramid^000000 in the ^4d4dffNorthwest^000000 of Morocc."; close2; cutin "", 255; warp "morocc", 30, 290; @@ -12539,7 +12539,7 @@ izlude,153,126,1 script Refinery Owner Han#iz 4_M_02,{ .@jerun_tutorial = isbegin_quest(5153) + isbegin_quest(5154) + isbegin_quest(5155) + isbegin_quest(5156); if (.@jerun_tutorial == 0) { mes "[Refinery Owner Han]"; - mes "Hello? My name is Han to lead the next generation of refining culture in Rune Midguard."; + mes "Hello? My name is Han to lead the next generation of refining culture in Rune-Midgarts."; next; mes "[Refinery Owner Han]"; mes "Entering this market lately, if I don't have old customers, it is not easy to operate. So, I do the advertising by myself."; @@ -13863,7 +13863,7 @@ izlude,96,125,7 script Enchanter Mounds#iz 4_CAT_SAILOR2,{ mes "Socket enchant is the skill to make card slots appear in Weapon or Armor."; next; mes "[Mounds]"; - mes "When you meet the Seyablem and Leyablem brothers around the towns of Rune Midgard they can help you with this service."; + mes "When you meet the Seyablem and Leyablem brothers around the towns of Rune-Midgarts they can help you with this service."; next; mes "[Mounds]"; mes "If they fail to put a new slot in your item say farewell to it..."; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 8cee1e6163..d77827c9c5 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -167,7 +167,7 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 90 mes "Ok, You want to start right away."; mes "Which Town do you want to start at?"; next; - set .@select, select("Prontera:Morroc:Geffen:Payon:Alberta:Izlude"); + set .@select, select("Prontera:Morocc:Geffen:Payon:Alberta:Izlude"); mes "[Sprakki]"; mes "I see."; mes "Go ahead and grow stronger! Look toward a brighter future ahead of you."; @@ -777,7 +777,7 @@ new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96 mes "[Kafra Employee]"; mes "Hello."; mes "I've been dispatched by the Kafra Head Office to help trainees."; - mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Rune-Midgard continent."; + mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Midgard continent."; mes "It's important for you adventurers to be close with us."; next; mes "[Kafra Employee]"; @@ -829,7 +829,7 @@ new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96 mes "^4d4dffProntera is the Capital City of the Rune-Midgarts Kingdom, and right next to it is Izlude^000000."; next; mes "[Kafra Employee]"; - mes "^4d4dffMorroc is the Desert City, you can change your job to Thief and Assassin^000000 here."; + mes "^4d4dffMorocc is the Desert City, you can change your job to Thief and Assassin^000000 here."; mes "^4d4dffPayon is the Village in the Mountains, and it is close to the Archer Village^000000."; mes "^4d4dffGeffen is the City of Magic. Go there if you want to become a Mage.^000000"; next; @@ -838,7 +838,7 @@ new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96 mes "Also, if you are trying to take a boat to go somewhere, you have to go through Alberta first."; mes "Select the town you want to teleport to."; next; - switch(select("Prontera:Morroc:Payon:Alberta:Geffen")) { + switch(select("Prontera:Morocc:Payon:Alberta:Geffen")) { case 1: mes "[Kafra Employee]"; mes "Rune-Midgarts' Capital, Prontera."; @@ -851,7 +851,7 @@ new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96 end; case 2: mes "[Kafra Employee]"; - mes "The Desert City, Morroc..."; + mes "The Desert City, Morocc..."; mes "It has lost it's former glory..."; mes "Do not lose the dream in your heart right now."; callfunc "F_NvErase"; @@ -872,7 +872,7 @@ new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96 case 4: mes "[Kafra Employee]"; mes "The Port City, Alberta."; - mes "Main city for all trades on the Rune-Midgard continent."; + mes "Main city for all trades on the Midgard continent."; mes "If you want to experience other civilizations, you have to visit Alberta first."; callfunc "F_NvErase"; close2; @@ -1020,7 +1020,7 @@ new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 117 } else if (job_novice_q == 9) { mes "[Cool Event Corp. Staff]"; mes "Hello."; - mes "We are working hard to provide events on Rune-Midgard similar to the Kafra services."; + mes "We are working hard to provide events on Midgard similar to the Kafra services."; next; mes "[Cool Event Corp. Staff]"; mes "Our staff is here to support you with [storage], [save] and [teleport service]."; @@ -1253,7 +1253,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105 mes "I guess you have made up your mind, huh?"; mes "Well, where do you want to go?"; next; - switch(select("Prontera:Morroc:Payon:Alberta:Geffen:Cancel")) { + switch(select("Prontera:Morocc:Payon:Alberta:Geffen:Cancel")) { case 1: mes "[Brade]"; mes "Prontera, the Capital city of the Rune-Midgarts Kingdom."; @@ -1265,7 +1265,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105 end; case 2: mes "[Brade]"; - mes "The Desert Town, Morroc..."; + mes "The Desert Town, Morocc..."; mes "There's lots of hidden stories within that town."; mes "Take care."; callfunc "F_NvErase"; @@ -1807,7 +1807,7 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118 if (Zeny >= 300) { mes "[Merchant Guildsman]"; mes "Excellent!"; - mes "Zeny is the currency of Rune-Midgard."; + mes "Zeny is the currency of Midgard."; mes "You can make zeny by selling loot as well as through making smart business decisions."; next; mes "[Merchant Guildsman]"; @@ -1825,7 +1825,7 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118 close; } else { mes "[Merchant Guildsman]"; - mes "Zeny is the currency of Rune-Midgard."; + mes "Zeny is the currency of Midgard."; mes "You can make zeny by selling loot as well as through making smart business decisions."; next; mes "[Merchant Guildsman]"; @@ -2179,7 +2179,7 @@ new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 57 if (BaseLevel < 10) { mes "[Eden Group Officer]"; mes "Hello, I am a representative of the Eden Group."; - mes "We are here to assist adventurers in Rune Midgard."; + mes "We are here to assist adventurers in Midgard."; next; mes "[Eden Group Officer]"; mes "We have agents all over the world waiting to send you to our secret headquarters where you can get some useful quests."; @@ -2230,7 +2230,7 @@ new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 57 callsub S_Warp,"alberta",115,57,116,58; case 5: mes "[Eden Group Officer]"; - mes "Geffen, is known as the Magical City of Rune Midgard."; + mes "Geffen, is known as the Magical City of Rune-Midgarts."; mes "I will send you near the Fountains."; mes "Goddess Freya bless you."; callsub S_Warp,"geffen",118,36,128,66; @@ -2241,22 +2241,22 @@ new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 57 } case 2: mes "[Eden Group Officer]"; - mes "Prontera is the main capital of the Rune-Midgard Kingdom. Here you will find Merchants selling their items and is a favorite gathering point of adventurers."; + mes "Prontera is the main capital of the Rune-Midgarts Kingdom. Here you will find Merchants selling their items and is a favorite gathering point of adventurers."; next; mes "[Eden Group Officer]"; mes "The Acolyte Guild is here at the Prontera Church located to the northwest. The Swordman Guild can be found at Izlude, a town just southeast of Prontera."; next; mes "[Eden Group Officer]"; - mes "Morocc is a city located in the desert that was recently destroyed due to an evil monster named Satan Morroc. The Thief Guild has been working to restore it to it's former glory."; + mes "Morocc is a city located in the desert that was recently destroyed due to an evil monster named Satan Morocc. The Thief Guild has been working to restore it to it's former glory."; next; mes "[Eden Group Officer]"; mes "Payon is where the Archer Guild has made it's home. You can also find the Kafra Shop Employees selling their Item Mall items near the center of this city."; next; mes "[Eden Group Officer]"; - mes "Alberta is the trading hub of Rune Midgard. The Merchant Guild is located here and the docks have ships that will take you to different island cities."; + mes "Alberta is the trading hub of Rune-Midgarts. The Merchant Guild is located here and the docks have ships that will take you to different island cities."; next; mes "[Eden Group Officer]"; - mes "Geffen is known as the magical city of Rune Midgard. The Mage Guild is located here and research for new magic is always being conducted at their headquarters."; + mes "Geffen is known as the magical city of Rune-Midgarts. The Mage Guild is located here and research for new magic is always being conducted at their headquarters."; next; mes "[Eden Group Officer]"; mes "If you wish to be sent directly to the Job Guilds, then speak to the Job Guides and tell them that you want to change your job."; @@ -2518,7 +2518,7 @@ function script F_NvErase { mes "You have chosen"; mes "to become a Thief."; mes "You will be sent to"; - mes "the town of Morroc."; + mes "the town of Morocc."; next; mes "[Hanson]"; mes "The Thief guild is in the underground 1st floor of a pyramid which is North-West of town. Please remember this."; @@ -2571,7 +2571,7 @@ function script F_NvErase { mes "[Hanson]"; mes "To what town do you want to go?"; next; - callsub L_Warp, select("Prontera:Geffen:Morroc:Payon:Alberta:Never mind"); + callsub L_Warp, select("Prontera:Geffen:Morocc:Payon:Alberta:Never mind"); end; } } else { @@ -2579,7 +2579,7 @@ function script F_NvErase { mes "You have received all the supplies."; mes "To what town do you want to go?"; next; - callsub L_Warp, select("Prontera:Geffen:Morroc:Payon:Alberta"); + callsub L_Warp, select("Prontera:Geffen:Morocc:Payon:Alberta"); end; } end; @@ -2634,7 +2634,7 @@ L_Warp: warp "geffen",122,65; end; case 3: - mes "I will send you to Morroc, the Desert Town."; + mes "I will send you to Morocc, the Desert Town."; close2; savepoint "morocc",150,99,1,1; warp "morocc",155,110; diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 348cd9628c..b8d250076d 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -359,7 +359,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ next; mes "If you don't... Remember last time you %$&*@*&%$..."; mes "- The letter is crumpled, so you can't read more. -"; - mes "I'm still in the Schwaltzvalt Republic."; + mes "I'm still in the Schwarzwald Republic."; mes "~ Nudor"; next; mes "- You get an uneasy feeling from reading this letter. -"; diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt index 48393a6cbe..38ab5dd66d 100644 --- a/npc/re/merchants/advanced_refiner.txt +++ b/npc/re/merchants/advanced_refiner.txt @@ -16,7 +16,7 @@ malangdo,221,174,6 script Holink#mal_cash 559,{ mes "[Holink]"; mes "I am the meow~ Blacksmith Holink~"; mes "Master of refining, Holink~"; - mes "I am the special cat Holink who learned from Morroc~"; + mes "I am the special cat Holink who learned from Morocc~"; mes "My daughter is so proud of me, Holink~"; mes "What should Holink~ refine today?"; next; diff --git a/npc/re/merchants/bio4_reward.txt b/npc/re/merchants/bio4_reward.txt index 548a8c5275..9a363a4f26 100644 --- a/npc/re/merchants/bio4_reward.txt +++ b/npc/re/merchants/bio4_reward.txt @@ -30,7 +30,7 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ switch(rand(1,2)) { case 1: mes "[Weird old man]"; - mes "I was on the way to visit my son who lives in Rune Midgard. It's really far away, so I took the airplane, and.."; + mes "I was on the way to visit my son who lives in Rune-Midgarts. It's really far away, so I took the airplane, and.."; next; mes "[Weird old man]"; mes "those young people...so noisy.... I was standing but none of them offered me a seat..and they were just talking loudly which bothered everyone."; @@ -50,7 +50,7 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ break; case 2: mes "[Weird old man]"; - mes "I was on the way to visit my son who lives in Rune Midgard. It's really far away, so I took the airplane, and.."; + mes "I was on the way to visit my son who lives in Rune-Midgarts. It's really far away, so I took the airplane, and.."; next; mes "[Weird old man]"; mes "those young people...so noisy.... I was standing but none of them offered me a seat..and they were just talking loudly which bothered everyone."; diff --git a/npc/re/merchants/cash_trader-idRO.txt b/npc/re/merchants/cash_trader-idRO.txt index 15df787b3c..3c6b52a746 100644 --- a/npc/re/merchants/cash_trader-idRO.txt +++ b/npc/re/merchants/cash_trader-idRO.txt @@ -197,7 +197,7 @@ ayothaya,212,171,5 duplicate(idRO_kafra) Kafra Shop#ayo 721 ayothaya,212,172,5 duplicate(idRO_kafra2) Kafra Shop 2#ayo 80 ayothaya,212,175,5 duplicate(idRO_rental) Rental Shop#ayo 874 -// Louyang +// Luoyang //============================================================ louyang,208,102,3 duplicate(idRO_kafra) Kafra Shop#lou 721 louyang,207,102,3 duplicate(idRO_kafra2) Kafra Shop 2#lou 80 @@ -253,7 +253,7 @@ morocc,164,261,3 duplicate(idRO_acc) Acc and Kartu#moc 721 morocc,164,263,3 duplicate(idRO_acc2) Acc and Kartu 2#moc 80 morocc,152,261,3 duplicate(idRO_rental) Rental Shop#moc 874 -// Gonryun +// Kunlun //============================================================ gonryun,156,122,3 duplicate(idRO_kafra) Kafra Shop#gon 721 gonryun,155,122,3 duplicate(idRO_kafra2) Kafra Shop 2#gon 80 diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index 1478980379..6aeb0f0b77 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -62,7 +62,7 @@ mes "Hehe, the ^FF82FF'17 Carat Diamond'^000000 you see right now"; mes "is one of the highest quality 17 carat diamonds."; mes "Comparing it to any pea-sized, colorless rock you may have"; - mes "dug up from Morroc is unspeakable!"; + mes "dug up from Morocc is unspeakable!"; emotion ET_HUK; next; diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 94b43edc99..2de5d482f5 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -99,7 +99,7 @@ mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:- mora,138,110,4 shop Mora Chef 518,11519:-1 //======================================================= -// Morroc +// Morocc //======================================================= morocc,156,76,4 shop Butcher#moc1 58,517:-1 moc_ruins,91,128,4 shop Tool Dealer#moc1 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,713:-1,23280:-1,601:-1,602:-1,23288:-1,1065:-1 diff --git a/npc/re/mobs/championmobs.txt b/npc/re/mobs/championmobs.txt index 3b0f0ce45a..06366fbe3e 100644 --- a/npc/re/mobs/championmobs.txt +++ b/npc/re/mobs/championmobs.txt @@ -149,9 +149,9 @@ ve_fild04,0,0 monster Elusive Muscipular 2738,2,300000 moc_pryd03,0,0 monster Swift Mummy 2739,2,300000 moc_pryd02,0,0 monster Solid Mummy 2740,2,300000 moc_fild01,0,0 monster Muka Ringleader 2741,2,300000 -moc_fild22,0,0 monster Furious Incarnation of Morroc 2742,2,300000 -moc_fild21,0,0 monster Elusive Incarnation of Morroc 2743,2,300000 -moc_fild20,0,0 monster Swift Incarnation of Morroc 2744,2,300000 +moc_fild22,0,0 monster Furious Incarnation of Morocc 2742,2,300000 +moc_fild21,0,0 monster Elusive Incarnation of Morocc 2743,2,300000 +moc_fild20,0,0 monster Swift Incarnation of Morocc 2744,2,300000 ein_fild06,0,0 monster Solid Holden 2745,2,300000 ama_dun01,0,0 monster Miyabi Doll Ringleader 2746,2,300000 moc_prydn1,0,0 monster Furious Minorous 2747,2,300000 diff --git a/npc/re/mobs/dungeons/gon_dun.txt b/npc/re/mobs/dungeons/gon_dun.txt index fe2af41adc..207b13d029 100644 --- a/npc/re/mobs/dungeons/gon_dun.txt +++ b/npc/re/mobs/dungeons/gon_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Gonryun Dungeon Monster Spawn Script +//= Kunlun Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt index 45cafb979a..7d4f478f28 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Dungeon Monster Spawn Script +//= Luoyang Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== diff --git a/npc/re/mobs/fields/louyang.txt b/npc/re/mobs/fields/louyang.txt index b75a009985..96338b08a0 100644 --- a/npc/re/mobs/fields/louyang.txt +++ b/npc/re/mobs/fields/louyang.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Fields Monster Spawn Script +//= Luoyang Fields Monster Spawn Script //===== By: ================================================== //= Evera/Lorri //===== Current Version: ===================================== @@ -14,7 +14,7 @@ //============================================================ //================================================== -// lou_fild01 - Louyang Field +// lou_fild01 - Luoyang Field //================================================== lou_fild01,0,0 monster Mi Gao 1516,40,5000 lou_fild01,0,0 monster Mantis 1139,19,5000 diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt index 8c14e2a50a..95572a1c0f 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -9,11 +9,11 @@ //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] -//= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf] +//= 1.3 Added Morocc field 20, 21, and 22 spawns, as [L0ne_W0lf] //= 1.4 Updated spawns to reflect episode 12.1. [L0ne_W0lf] //= 1.5 Fixed Pheeroni spawn location. [Kisuka] -//= 1.6 Added Satan MOrroc static spawn. [L0ne_W0lf] -//= Added 30s spawn time for all Morroc Shadows. +//= 1.6 Added Satan Morocc static spawn. [L0ne_W0lf] +//= Added 30s spawn time for all Morocc Shadows. //= 1.7 Corrected MVP spawn variance. [L0ne_W0lf] //= 1.8 Updated to renewal spawns. [L0ne_W0lf] //============================================================ @@ -196,24 +196,24 @@ moc_fild18,325,272 monster Yellow Plant 1081,1,180000,90000 //================================================== // moc_fild20 - Sograt Desert - Continental Guard Quarantine //================================================== -moc_fild20,0,0 monster Incarnation of Morroc 1918,1,30000 -moc_fild20,0,0 monster Incarnation of Morroc 1919,1,30000 -moc_fild20,0,0 monster Incarnation of Morroc 1920,1,30000 -moc_fild20,0,0 monster Incarnation of Morroc 1921,1,30000 +moc_fild20,0,0 monster Incarnation of Morocc 1918,1,30000 +moc_fild20,0,0 monster Incarnation of Morocc 1919,1,30000 +moc_fild20,0,0 monster Incarnation of Morocc 1920,1,30000 +moc_fild20,0,0 monster Incarnation of Morocc 1921,1,30000 //================================================== // moc_fild21 - Dimensional Gorge //================================================== -moc_fild21,0,0 monster Incarnation of Morroc 1918,46,30000 -moc_fild21,0,0 monster Incarnation of Morroc 1919,46,30000 -moc_fild21,0,0 monster Incarnation of Morroc 1920,46,30000 -moc_fild21,0,0 monster Incarnation of Morroc 1921,34,30000 +moc_fild21,0,0 monster Incarnation of Morocc 1918,46,30000 +moc_fild21,0,0 monster Incarnation of Morocc 1919,46,30000 +moc_fild21,0,0 monster Incarnation of Morocc 1920,46,30000 +moc_fild21,0,0 monster Incarnation of Morocc 1921,34,30000 //================================================== // moc_fild22 - Dimensional Gorge //================================================== -moc_fild22,0,0 monster Incarnation of Morroc 1918,60,30000 -moc_fild22,0,0 monster Incarnation of Morroc 1919,60,30000 -moc_fild22,0,0 monster Incarnation of Morroc 1920,60,30000 -moc_fild22,0,0 monster Incarnation of Morroc 1921,25,10000 -moc_fild22,0,0,0,0 boss_monster Wounded Morroc 1917,1,43200000,600000,0 +moc_fild22,0,0 monster Incarnation of Morocc 1918,60,30000 +moc_fild22,0,0 monster Incarnation of Morocc 1919,60,30000 +moc_fild22,0,0 monster Incarnation of Morocc 1920,60,30000 +moc_fild22,0,0 monster Incarnation of Morocc 1921,25,10000 +moc_fild22,0,0,0,0 boss_monster Wounded Morocc 1917,1,43200000,600000,0 diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt index a636132a7b..0f6a529a0b 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Fields Monster Spawn Script +//= Juno Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== @@ -16,7 +16,7 @@ //= Mob quantity is custom. //= 1.5b Changed the spawn numbers a bit. [Poki#3] //= Thanks to Playtester and Emperium.org -//= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3] +//= 1.6 Fixed Juno Field 10. Mob amount sugested by Playtester [Poki#3] //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.8 Added kRO 10.1 spawns where they fit [Playtester] //= 1.9 More accurate spawns [Playtester] @@ -109,7 +109,7 @@ yuno_fild08,0,0 monster Green Plant 1080,10,180000,90000 yuno_fild08,0,0 monster Yellow Plant 1081,10,180000,90000 //================================================== -// yuno_fild09 - Schwaltzvalt Guards Camp +// yuno_fild09 - Schwarzwald Guards Camp //================================================== yuno_fild09,0,0 monster Grand Peco 1369,130,5000 yuno_fild09,0,0 monster Sleeper 1386,30,5000 diff --git a/npc/re/other/achievements.txt b/npc/re/other/achievements.txt index 4c1e2daf66..4254049108 100644 --- a/npc/re/other/achievements.txt +++ b/npc/re/other/achievements.txt @@ -77,7 +77,7 @@ gl_sew04,288,6,0 duplicate(ach_treasure#core) #gl_ach2::120125 HIDDEN_WARP_NPC,5 gl_knt02,126,235,0 duplicate(ach_treasure#core) #gl_ach3::120126 HIDDEN_WARP_NPC,5,5 gl_prison1,125,159,0 duplicate(ach_treasure#core) #gl_ach4::120127 HIDDEN_WARP_NPC,5,5 -// Gonryun Dungeon +// Kunlun Dungeon gon_dun03,167,232,0 duplicate(ach_treasure#core) #gon_ach1::120128 HIDDEN_WARP_NPC,5,5 // Istana @@ -86,7 +86,7 @@ dew_dun02,87,272,0 duplicate(ach_treasure#core) #dew_ach1::120119 HIDDEN_WARP_NP // Labyrinth prt_maze03,11,14,0 duplicate(ach_treasure#core) #maze_ach1::120140 HIDDEN_WARP_NPC,5,5 -// Louyang Dungeon +// Luoyang Dungeon lou_dun03,29,228,0 duplicate(ach_treasure#core) #lou_ach1::120134 HIDDEN_WARP_NPC,5,5 // Nogg Road @@ -265,7 +265,7 @@ ve_fild03,197,242,0 duplicate(ach_treasure#core) #ve_ach3::120087 HIDDEN_WARP_NP ve_fild04,288,279,0 duplicate(ach_treasure#core) #ve_ach4::120088 HIDDEN_WARP_NPC,5,5 ve_fild07,33,113,0 duplicate(ach_treasure#core) #ve_ach5::120089 HIDDEN_WARP_NPC,5,5 -// Yuno +// Juno yuno_fild01,284,138,0 duplicate(ach_treasure#core) #yuno_ach1::120052 HIDDEN_WARP_NPC,5,5 yuno_fild12,76,268,0 duplicate(ach_treasure#core) #yuno_ach2::120053 HIDDEN_WARP_NPC,5,5 yuno_fild02,142,191,0 duplicate(ach_treasure#core) #yuno_ach3::120054 HIDDEN_WARP_NPC,5,5 diff --git a/npc/re/other/adven_boards.txt b/npc/re/other/adven_boards.txt index 73b0679a00..f48f604108 100644 --- a/npc/re/other/adven_boards.txt +++ b/npc/re/other/adven_boards.txt @@ -855,10 +855,10 @@ moc_fild19,107,101,0 script Signposts#Sphinx 2_BULLETIN_BOARD,{ .@mo_board = callfunc( "F_AvenBoard", 1111,"Drainliar","Colonial bat that inhabits dark caves. It uses its big, sharp teeth to attack nearby creatures and sucks in blood. It's bigger than a Familiar.^000000", 1146,"Matyr","King's protector, gatekeeper. Dog is used as a medium to summon the gatekeeper using forbidden magic. Its body is covered in dark mist and it is very agile.", - 1178,"Zerom","Morroc natives were drafted to help with the construction of the Sphinx. They were cursed to become a monster and protect the Sphinx for all eternity.", - 1164,"Requiem","Morroc natives were drafted to help with the construction of the Sphinx. They were cursed to become a monster and protect the Sphinx for all eternity.", + 1178,"Zerom","Morocc natives were drafted to help with the construction of the Sphinx. They were cursed to become a monster and protect the Sphinx for all eternity.", + 1164,"Requiem","Morocc natives were drafted to help with the construction of the Sphinx. They were cursed to become a monster and protect the Sphinx for all eternity.", 1191,"Mimic","Adventurer's tips are needed.", - 1140,"Marduk","Augur of Morroc Natives. It controls cursed Morroc natives to protect King's Tomb.", + 1140,"Marduk","Augur of Morocc Natives. It controls cursed Morocc natives to protect King's Tomb.", 1154,"Pasana","Protector of the Pyramid. In order to continue to protect the now deceased king, it has willingly received the curse of the Pyramid.", 1149,"Minorous","Unknown creature living deep within the labyrinth. It is not on friendly term with Orcs, but they rarely come across each other. When it encounters a creature, it will chase down the target and attack with its giant hammer.", 1098,"Anubis","Adventurer's tips are needed.", @@ -2710,7 +2710,7 @@ tha_t01,156,78,0 duplicate(Guide#Thanatos1) Guide#Thanatos2 CLEAR_NPC prt_fild05,278,220,0 script Signpost#Culvert 2_BULLETIN_BOARD,{ while(1) { mes "[Prontera Culvert]"; - mes "Prontera Culvert can only be accessed by adventurers who have the permission from Rune Midgard Kingdrom."; + mes "Prontera Culvert can only be accessed by adventurers who have the permission from Rune-Midgarts Kingdom."; mes "-- Adventurer Group --"; next; if ((MISC_QUEST & 8) == 0) { @@ -2990,9 +2990,9 @@ gonryun,155,198,0 script Signpost#Kunlun Dungeon 2_BULLETIN_BOARD,{ } } -louyang,37,276,0 script Signpost#Louyang Dungeon 2_BULLETIN_BOARD,{ +louyang,37,276,0 script Signpost#Luoyang Dungeon 2_BULLETIN_BOARD,{ while(1) { - mes "[Louyang Dungeon]"; + mes "[Luoyang Dungeon]"; mes "In order for Adventurers to travel all over the world for a relaxing adventure, Information gathered from various adventurers are made public. Please provide information tips to the adventurer group to revise the information."; mes "-- Adventurer Group --"; next; @@ -3011,13 +3011,13 @@ louyang,37,276,0 script Signpost#Louyang Dungeon 2_BULLETIN_BOARD,{ 1513,"Mao Guai","Evil cat spirit in human clothing. It walks on two legs like a human and attacks with a fan in its hands.", 1518,"White Lady","This MVP monster lures nearby adventurers with its beauty. Some adventurers become enchanted by its scream." ); if (.@mo_board == 1) { - mes "[Louyang Dungeon]"; - mes "Louyang Dungeon is comprised of 3 floors and the monsters that appear here tend to overpower adventurers in mass numbers. Prepare before venturing into this dungeon."; + mes "[Luoyang Dungeon]"; + mes "Luoyang Dungeon is comprised of 3 floors and the monsters that appear here tend to overpower adventurers in mass numbers. Prepare before venturing into this dungeon."; next; while(1) { - switch( select( "Louyang Dungeon - Suei Long Gon","Louyang Dungeon - The Royal Tomb","Louyang Dungeon - Inside the Royal Tomb","Cancel" ) ) { + switch( select( "Luoyang Dungeon - Suei Long Gon","Luoyang Dungeon - The Royal Tomb","Luoyang Dungeon - Inside the Royal Tomb","Cancel" ) ) { case 1: - mes "[Louyang Dungeon - Suei Long Gon]"; + mes "[Luoyang Dungeon - Suei Long Gon]"; mes "------------ Monster ------------"; mes "Horong(66)"; mes "Grizzly(66)"; @@ -3029,7 +3029,7 @@ louyang,37,276,0 script Signpost#Louyang Dungeon 2_BULLETIN_BOARD,{ F_InfoBoard; continue; case 2: - mes "[Louyang Dungeon - The Royal Tomb]"; + mes "[Luoyang Dungeon - The Royal Tomb]"; mes "------------ Monster ------------"; mes "Mimic(56)"; mes "Munak(58)"; @@ -3039,7 +3039,7 @@ louyang,37,276,0 script Signpost#Louyang Dungeon 2_BULLETIN_BOARD,{ F_InfoBoard; continue; case 3: - mes "[Louyang Dungeon - Inside the Royal Tomb]"; + mes "[Luoyang Dungeon - Inside the Royal Tomb]"; mes "------------ Monster ------------"; mes "Zhu Po Long(82)"; mes "Green Maiden(82)"; diff --git a/npc/re/other/clans.txt b/npc/re/other/clans.txt index 2b0779ecda..e2d573e5b4 100644 --- a/npc/re/other/clans.txt +++ b/npc/re/other/clans.txt @@ -28,7 +28,7 @@ prontera,138,183,7 script Clan Helper 703,{ prt_in,33,114,5 script Raffam Oranpere 10058,{ cutin "laperm01.bmp", 2; mes "[Raffam Oranpere]"; - mes "Hi! I'm Raffam, master of the ^3131FFSword Clan^000000 in the Rune-Midgard Kingdom."; + mes "Hi! I'm Raffam, master of the ^3131FFSword Clan^000000 in the Rune-Midgarts Kingdom."; next; switch( select( "Clan Information:Join.:Leave." ) ){ case 1: diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt index ab3bd7553e..aacaf7cbd6 100644 --- a/npc/re/other/dimensional_gap.txt +++ b/npc/re/other/dimensional_gap.txt @@ -19,7 +19,7 @@ mid_camp,207,290,6 script Expedition Guide#01 4_M_EIN_SOLDIER,{ mes "A member of the Expedition team found these backdoor passages to get through the Dimensional Rifts."; next; mes "[Expedition Guide]"; - mes "This is like a Rune Midgard Alliance version of the Bifrost bridge so it can connect us to different parts of the New World."; + mes "This is like a Midgard Alliance version of the Bifrost bridge so it can connect us to different parts of the New World."; next; mes "[Expedition Guide]"; mes "Time and space is distorted in the Dimensional Gap. Not all passageways have been discovered so please be sure to use caution when entering an unverified area."; @@ -56,11 +56,11 @@ dali,137,87,4 script Allied Forces Soldier 4_M_MOCASS1,{ close; } -dali,122,60,4 script Morroc Soldier 4_M_MOC_SOLDIER,{ - mes "[Morroc Soldier]"; - mes "This dimensional rift is connected to ^0000FFMorroc^000000 back in Rune Midgard."; +dali,122,60,4 script Morocc Soldier 4_M_MOC_SOLDIER,{ + mes "[Morocc Soldier]"; + mes "This dimensional rift is connected to ^0000FFMorocc^000000 back in Midgard."; next; - mes "[Morroc Soldier]"; + mes "[Morocc Soldier]"; mes "This is the fastest gateway back to our world. The area is still destroyed but restoration efforts will soon be on the way."; close; } diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index afd8121ca5..a46608d451 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -63,7 +63,7 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ next; switch(select("Hornet Hunting:Condor Hunting:Grasshopper's Leg:Worm Tail Hunting:Spore Hunting:Pest Control:Muka Hunting:Familiar Hunting:Collect Feathers:Collect Poison Spores:Cancel")) { case 1: callsub L_Quest,11114,"Hornet Hunting"," - Hunt 10 ^4d4dff'Hornets'^000000 - "," - northwest of Prontera. - "; - case 2: callsub L_Quest,11115,"Condor Hunting"," - Hunt 20 ^4d4dff'Condors'^000000 - "," - south of Morroc. - "; + case 2: callsub L_Quest,11115,"Condor Hunting"," - Hunt 20 ^4d4dff'Condors'^000000 - "," - south of Morocc. - "; case 3: callsub L_Quest,11116,"Grasshopper's Leg"," - Hunt 10 ^4d4dff'Rockers'^000000 - "," - southwest of Prontera and - "," - bring 10 ^4d4dffGrasshopper's Legs^000000. - "; case 4: callsub L_Quest,11117,"Worm Tail Hunting"," - Hunt 20 ^4d4dff'Worm Tails'^000000 - "," - southeast of Payon.- "; case 5: callsub L_Quest,11118,"Spore Hunting"," - Hunt 30 ^4d4dff'Spores'^000000 - "," - around Payon. - "; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index fe571f1d33..6b88fc2b74 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -48,9 +48,9 @@ moc_para01,38,38,3 script Mission [26 - 40] 857,{ mes "- are on the board. -"; next; switch(select("Deliver an Insecticide:Deliver Honey:Deliver Blanket(Above Lv.35)")) { - case 1: callsub L_Quest,8271,0,"Deliver an Insecticide","Dieshin Man","Morroc Ruins","Get an 'Insecticide' from Dieshin Man and deliver it south east of Payon"; - case 2: callsub L_Quest,8272,0,"Deliver Honey","Dieshin Man","Morroc Ruins","Get 'Honey' from Dieshin Man and deliver it west of St. Capitolina Abbey"; - case 3: callsub L_Quest,8273,35,"Deliver Blanket","Dieshin Man","Morroc Ruins","Get Blankets from Dieshin Man and deliver to the field south of Lutie"; + case 1: callsub L_Quest,8271,0,"Deliver an Insecticide","Dieshin Man","Morocc Ruins","Get an 'Insecticide' from Dieshin Man and deliver it south east of Payon"; + case 2: callsub L_Quest,8272,0,"Deliver Honey","Dieshin Man","Morocc Ruins","Get 'Honey' from Dieshin Man and deliver it west of St. Capitolina Abbey"; + case 3: callsub L_Quest,8273,35,"Deliver Blanket","Dieshin Man","Morocc Ruins","Get Blankets from Dieshin Man and deliver to the field south of Lutie"; } case 3: mes "[Gathering Mission Board]"; @@ -131,9 +131,9 @@ geffen,103,42,5 script Sponiac 99,{ next; switch(select("Hunting Poison Spore:Hunting Smokie:Hunting Elder Willow:Hunting Coco:Hunting Thara Frog")) { case 1: callsub L_Quest,8266,"Hunting Poison Spore",1000,0,100,"You can find Poison Spores on the Geffen Dungeon 1F or northeast of Prontera. There are other spots but I'll leave it up to you to find out."; - case 2: callsub L_Quest,8267,"Hunting Smokie",1000,0,100,"You can find Smokies northeast and northwest of Geffen. Oh, also the field east of Ayotaya is good spot to find them."; + case 2: callsub L_Quest,8267,"Hunting Smokie",1000,0,100,"You can find Smokies northeast and northwest of Geffen. Oh, also the field east of Ayothaya is good spot to find them."; case 3: callsub L_Quest,8268,"Hunting Elder Willow",1000,100,110,"You can find Elder Willows northeast of Geffen, east of payon and southwest of Prontera."; - case 4: callsub L_Quest,8269,"Hunting Coco",1000,200,150,"You can find Cocos around the east of Payon, southwest of Prontera and the field east of Ayotaya."; + case 4: callsub L_Quest,8269,"Hunting Coco",1000,200,150,"You can find Cocos around the east of Payon, southwest of Prontera and the field east of Ayothaya."; case 5: callsub L_Quest,8270,"Hunting Thara Frog",1500,300,200,"You can find Thara Frogs in the Cave east of Comodo or on Turtle Island."; } end; @@ -559,7 +559,7 @@ payon,179,66,3 script Dashia 931,{ mes "You can get those items from 'Piere', 'Andre', 'Deniro', 'Vitata', 'Thief Bug', 'Female Thief Bug' and 'Male Thief Bug'."; next; mes "[Dashia]"; - mes "'Piere', 'Andre', 'Deniro' and 'Vitata' are in Ant Hell which is located near the Saint Darmain Fortress soutwest of Morroc."; + mes "'Piere', 'Andre', 'Deniro' and 'Vitata' are in Ant Hell which is located near the Saint Darmain Fortress soutwest of Morocc."; next; mes "[Dashia]"; mes "'Thief Bug', 'Female Thief Bug' and 'Male Thief Bug' are int he Prontere Culvert. To get there, you need to be a volunteer of the Prontera Culvert's punitive force."; @@ -588,10 +588,10 @@ payon,179,66,3 script Dashia 931,{ mes "You can get Yoyo Tails from 'Yoyo's', Acorn from 'Coco's' and Raccoon Leaf from 'Smokies'."; next; mes "[Dashia]"; - mes "You can find them easily around fields, but the field east of Ayothya is the best spot for hunting all 3 monsters."; + mes "You can find them easily around fields, but the field east of Ayothaya is the best spot for hunting all 3 monsters."; next; mes "[Dashia]"; - mes "To get to Ayotaya, you better go to 'Aibakthing' in Alberta and pay his fare."; + mes "To get to Ayothaya, you better go to 'Aibakthing' in Alberta and pay his fare."; break; case 5: callsub L_Quest,8278; diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index 801221207b..0927dd9ce0 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -154,7 +154,7 @@ L_Details: next; mes "Regarding the project, we need to research monster's reactions when they are wrapped with Rotten Bandages."; next; - mes "If you are interested, please hunt 30 Mummies and bring 30 Rotten Bandages. You can find them in the Pyramid West of Morroc."; + mes "If you are interested, please hunt 30 Mummies and bring 30 Rotten Bandages. You can find them in the Pyramid West of Morocc."; next; mes "Please confirm it to us after you complete the mission, then we will give you proper rewards."; next; @@ -165,7 +165,7 @@ L_Details: next; mes "Alligators have gone wild these days, they attack women and drunken people who hang out near the beach."; next; - mes "This is a very shameful situation for us, the most wonderful vacation spot in Rune-Midgard."; + mes "This is a very shameful situation for us, the most wonderful vacation spot in Rune-Midgarts."; next; mes "So, it would be very helpful if you hunt 30 Alligators to clean out this situation."; next; @@ -223,9 +223,9 @@ L_Details: mes "-- Payon town hall members --"; break; case 3256: - mes "This mission is assigned by the Morroc blacksmith Aragham."; + mes "This mission is assigned by the Morocc blacksmith Aragham."; next; - mes "Hello~~~~, Adventurers! This is Aragham, the hottest blacksmith in Morroc!"; + mes "Hello~~~~, Adventurers! This is Aragham, the hottest blacksmith in Morocc!"; next; mes "Anyway, I have a son named Aragam Junior, the cute one. Haha."; next; @@ -241,7 +241,7 @@ L_Details: next; mes "PS. Do not compare me with Hollgrehenn or Antonio!!!!"; next; - mes "-- The hottest blacksmith, Morroc blacksmith Aragham --"; + mes "-- The hottest blacksmith, Morocc blacksmith Aragham --"; break; case 3257: mes "This mission is assigned by an inventor Dorian from Izlude."; @@ -327,13 +327,13 @@ L_Details: mes "- Payon Cheese Dongja -"; break; case 3262: - mes "This mission is assigned by a gem dealer, Ibraham from Morroc."; + mes "This mission is assigned by a gem dealer, Ibraham from Morocc."; next; mes "A small beautiful flower in the barren desert... What an incredible scene it would be!"; next; mes "Planting flowers can make the world green and it will be so pretty everywhere."; next; - mes "I plan to plant strong flowers in the Morroc desert so the soil gets better."; + mes "I plan to plant strong flowers in the Morocc desert so the soil gets better."; next; mes "I need 40 Maneater Blossom from Flora, I know Maneater Blossom is an ugly flower, but still it is a plant."; next; @@ -341,7 +341,7 @@ L_Details: next; mes "Please confirm it to us after you complete the mission, then we will give you proper rewards."; next; - mes "-- Morroc Ibraham --"; + mes "-- Morocc Ibraham --"; break; case 3263: mes "This mission is assigned by the Payon blacksmith Antonio."; diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index eceaadae5f..8e63e08564 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -85,8 +85,8 @@ moc_para01,44,38,3 script Mission [71 - 85] 857,{ mes "- related to the Sphinx Dungeon -"; mes "- on this mission Board. -"; next; - set .@str1$,"The villagers of Morroc are worried by the increasing number of monsters in the Sphinx Dungeon. "; - set .@str2$,"- Meidi from Morroc -"; + set .@str1$,"The villagers of Morocc are worried by the increasing number of monsters in the Sphinx Dungeon. "; + set .@str2$,"- Meidi from Morocc -"; switch(select("Hunt Requiem:Hunt Marduk:Hunt Pasana")) { case 1: callsub L_Quest,10107,.@str1$+"Hunt 10 Requiems.",.@str2$; case 2: callsub L_Quest,10108,.@str1$+"Hunt 10 Marduks.",.@str2$; @@ -140,9 +140,9 @@ moc_para01,44,38,3 script Mission [71 - 85] 857,{ switch(select("Hunt Kikimora:Hunt Miyabi Doll:Hunt Mi Gao:Hunt Headless Mule:Hunt Tamruan:Gather Festival Masks for the Festival")) { case 1: callsub L_Quest,10121,.@str1$+"Hunt 15 Kikimoras in Moscovia!",.@str2$; case 2: callsub L_Quest,10122,.@str1$+"Hunt 15 Miyabi Dolls in Amatsu!",.@str2$; - case 3: callsub L_Quest,10123,.@str1$+"Hunt 15 Mi Gaos in Louyang!",.@str2$; + case 3: callsub L_Quest,10123,.@str1$+"Hunt 15 Mi Gaos in Luoyang!",.@str2$; case 4: callsub L_Quest,5055,"I know there are many terrifying monsters outside the city, but what terrifies me are these Headless Mules lurking around. I hope they will never venture into town. Hunt 15 Headless Mules!","- Mariana from Brasilis -"; - case 5: callsub L_Quest,5056,"Tamruans make a lot of noise. I don't mind in the morning but they keep me from falling asleep at night. I want to sleep. Hunt 15 Tamruans!","- Shaman Pumo from Ayotaya -"; + case 5: callsub L_Quest,5056,"Tamruans make a lot of noise. I don't mind in the morning but they keep me from falling asleep at night. I want to sleep. Hunt 15 Tamruans!","- Shaman Pumo from Ayothaya -"; case 6: callsub L_Quest,5057,"The Dumpling Childs stole all the masks that I had prepared for the festival. Try to get a hold of 30 masks! I'll owe you~","- SaYumMoon Chief of Kunlun -"; } } diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 8d71da8a05..109504ec50 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -131,13 +131,13 @@ moc_para01,48,175,3 script 86-90 Mission Board 857,{ next; switch(select("^0000FFBaba Yaga^000000:^0000FFYao Jun^000000:^0000FFFirelock Soldier^000000:^0000FFZipper Bear^000000")) { case 1: callsub L_Quest,4172,"Baba Yaga",72000,"","The witch Baba Yaga can be found in the outskirts of Moscovia."; - case 2: callsub L_Quest,4173,"Yao Jun",117000,"Çý±ºÄ«µå","There are human-like monsters that roam around the dungeon in Louyang."; + case 2: callsub L_Quest,4173,"Yao Jun",117000,"Çý±ºÄ«µå","There are human-like monsters that roam around the dungeon in Luoyang."; case 3: callsub L_Quest,4174,"Firelock Soldier",82000,"±¸½ÄÁ¶ÃѺ´Ä«µå","There are human-like monsters that roam around the dungeon in Amatsu.","s"; case 4: callsub L_Quest,4175,"Zipper Bear",120000,"ÁöÆÛº£¾îÄ«µå","There are bear monsters swarming in the Kunlun dungeon."; } case 4: mes "[86-90 Mission Board]"; - mes "Here is a list of random requests to hunt monsters in other regions of Rune Midgard."; + mes "Here is a list of random requests to hunt monsters in other regions of Midgard."; mes "Which monster will you hunt or have you finished hunting?"; next; switch(select("^0000FFGround Petite^000000:^0000FFRafflesia^000000:^0000FFVenomous^000000:^0000FFPitman^000000:^0000FFYellow Novus^000000")) { diff --git a/npc/re/quests/eden/eden_100_111.txt b/npc/re/quests/eden/eden_100_111.txt index 98238bfaaa..e05f53d7ef 100644 --- a/npc/re/quests/eden/eden_100_111.txt +++ b/npc/re/quests/eden/eden_100_111.txt @@ -37,7 +37,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ mes "You're not a mature enough adventurer. You should be at least base level 100. So basically at least a third class."; next; mes "[Gelkah]"; - mes "The request is from ^FF0000somewhere else^000000 other than Rune Midgard."; + mes "The request is from ^FF0000somewhere else^000000 other than Midgard."; } else if (BaseLevel < 111) { if (para_100lv01 == 0) { @@ -179,7 +179,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ } else { cutin "ij·µÄ«µå",3; //carat_card - mes "This request is from a merchant from Morroc who is somehow losing business from these monsters in Glastheim."; + mes "This request is from a merchant from Morocc who is somehow losing business from these monsters in Glastheim."; next; mes "[Gelkah]"; mes "Eden Group is aware that this is not a great reason but a request is a request. So please clear ^FF000030 Carat^000000 monsters inside of Glastheim castle."; @@ -204,7 +204,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ } else { cutin "¾ÆÅ©¶ó¿ì½ºÄ«µå",3; //arclouse_card - mes "Do you know there are beans used as food here in Rune Midgard? When an Arclouse rolls, it resembles a bean."; + mes "Do you know there are beans used as food here in Midgard? When an Arclouse rolls, it resembles a bean."; next; mes "[Gelkah]"; mes "Eden Group Headquarters wants to investigate the Arclouse as a possible mascot."; @@ -301,7 +301,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ } break; case 2: - mes "There are many requests coming through from the Rune Midgards Expedition."; + mes "There are many requests coming through from the Midgard Expedition."; next; if (select( "Hunting Quests","Trauma" ) == 1) { mes "[Gelkah]"; @@ -519,7 +519,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ } break; case 5: - mes "Here is a list of other requests from all over Rune Midgard."; + mes "Here is a list of other requests from all over Midgard."; next; switch( select( "Loli Ruri Hunting - Niflheim", "Medusa Hunting - Comodo", "Anubis Hunting - Sphinx" ) ) { mes "[Gelkah]"; @@ -1148,7 +1148,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ } else { mes "[Rohtert]"; - mes "One fine windy day, I was collecting flowers in west south of the Rune Midgard Allied Forces Post to fulfill an Eden Group request."; + mes "One fine windy day, I was collecting flowers in west south of the Midgard Allied Forces Post to fulfill an Eden Group request."; next; mes "[Rohtert]"; mes "Then that one suddenly showed up."; @@ -1196,7 +1196,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ mes "The fact that I am strong is more important than the number. Just go there and take the beast out."; next; mes "[Rohtert]"; - mes "You'll find it west of the Rune Midgard Allied Forces Post at the Ash Vacuum."; + mes "You'll find it west of the Midgard Allied Forces Post at the Ash Vacuum."; next; select("I guess I have no choice."); cutin "rote03",2; diff --git a/npc/re/quests/eden/eden_111_120.txt b/npc/re/quests/eden/eden_111_120.txt index d4a1ff54fe..17e3d13415 100644 --- a/npc/re/quests/eden/eden_111_120.txt +++ b/npc/re/quests/eden/eden_111_120.txt @@ -96,7 +96,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "Ah, that I do remember."; next; mes "[Mingmin]"; - mes "I am collecting information on the flora and fauna of Rune Midgard for the Eden Group."; + mes "I am collecting information on the flora and fauna of Midgard for the Eden Group."; next; mes "[Mingmin]"; mes "The intention is to scientifically catalog and itemize the dangers of the world. I do not like this idea personally."; @@ -487,7 +487,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "min01",0; if (select( "Take the request.", "Quit" ) == 1) { mes "[Mingmin]"; - mes "Please take care of them one by one. Those books contain precious history of Rune Midgard so I want to research them."; + mes "Please take care of them one by one. Those books contain precious history of Midgard so I want to research them."; callsub S_Quest,13076,13075; } } diff --git a/npc/re/quests/eden/eden_121_130.txt b/npc/re/quests/eden/eden_121_130.txt index 213281c1b2..072e80610d 100644 --- a/npc/re/quests/eden/eden_121_130.txt +++ b/npc/re/quests/eden/eden_121_130.txt @@ -629,7 +629,7 @@ moc_para01,17,77,5 script Aigu#1 4_F_IU,{ next; if (select( "Begin to search.", "Cancel." ) == 1) { mes "[Aigu]"; - mes "Thanatos tower is north of the Schwartzvalt Republic! It is not far from Juno or Hugel."; + mes "Thanatos tower is north of the Schwarzwald Republic! It is not far from Juno or Hugel."; callsub S_Quest,13115,13107;// Thanatos Tower Search } } diff --git a/npc/re/quests/eden/eden_131_140.txt b/npc/re/quests/eden/eden_131_140.txt index a57bced8ed..dfddfb163f 100644 --- a/npc/re/quests/eden/eden_131_140.txt +++ b/npc/re/quests/eden/eden_131_140.txt @@ -254,13 +254,13 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ } break; case 2: - mes "Do you know the story about Satan Morroc? I want to sing a song of their story even when time passes by."; + mes "Do you know the story about Satan Morocc? I want to sing a song of their story even when time passes by."; next; switch( select( "Angel Incarnation", "Black Nightmare Incarnation", "Ghost Incarnation" ) ) { mes "[Ragi]"; case 1: if (checkquest(13156,PLAYTIME) == 0) { - mes "A monster from Morroc has wings like an angel. Maybe, Satan Morocc wants to be an angel?"; + mes "A monster from Morocc has wings like an angel. Maybe, Satan Morocc wants to be an angel?"; next; mes "[Ragi]"; mes "Haha please do not mind. It is just joke of a story teller. Please give me another story next time."; @@ -327,7 +327,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ mes "This story should be spread out for weak adventurers like me! Because not everyone can be adventurer."; next; mes "[Ragi]"; - mes "Maybe, adventurers have a good merit to know this kind of story. So can you please look for these creatures near Morroc?"; + mes "Maybe, adventurers have a good merit to know this kind of story. So can you please look for these creatures near Morocc?"; } else if (checkquest(13159,HUNTING) == 2) { mes "Wow. There are so many stories coming to me! Thanks to you!"; diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index c8504d9eee..d577eb170f 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -62,7 +62,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ switch (select("What is Eden group?:Join the Eden Group.:Register new mission.:Search for missions.:Cancel.")) { case 1: mes "[Lime Evenor]"; - mes "Eden Group is a group that helps people who are suffering from distresses in Rune-Midgard."; + mes "Eden Group is a group that helps people who are suffering from distresses in Midgard."; next; mes "[Lime Evenor]"; mes "If people need help, we put up the case on the bulletin board and introduce it to our members who are eager to help those in need."; @@ -72,7 +72,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "Members do these missions for rewards."; next; mes "[Lime Evenor]"; - mes "If you are not too familiar with Rune-Midgard, this is a great way to explore the world."; + mes "If you are not too familiar with Midgard, this is a great way to explore the world."; mes "Or, if you are mature enough, you can travel the world and make new friends while doing missions. Your honorable name will be spread out among lands."; next; break; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 4932fd7445..47a2cfba09 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -22,7 +22,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 90,{ mes "[Aperture]"; mes "Hello there, adventurer."; - mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class."; + mes "I've been studying magic from all over Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class."; next; if (is_function("VIP_iRO_Acolyte")) @@ -48,7 +48,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 90,{ mes "I wish you goodluck on your journey."; next; - setarray .@towns$[0], "Prontera", "Izlude", "Geffen", "Payon", "Morroc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno", "Einbroch", "Lighthalzen", "Hugel", "Rachel"; + setarray .@towns$[0], "Prontera", "Izlude", "Geffen", "Payon", "Morocc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno", "Einbroch", "Lighthalzen", "Hugel", "Rachel"; setarray .@cost[0], 600, 600, 1200, 1200, 1200, 1800, 2200, 2200, 2200, 1800, 2200, 2200, 2200, 2200; set .@size, getarraysize(.@towns$); @@ -1063,7 +1063,7 @@ moc_para01,29,35,4 script Gramps#huntquests 866,{ mes "When you get to being my"; mes "age, you become bitter."; mes "Too long I've done nothing about the monsters that roam around"; - mes "Rune Midgard."; + mes "Midgard."; next; mes "[Gramps]"; mes "That's why I'm asking you wippersnappers to help"; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 04ede672e7..0660db22db 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -118,7 +118,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ mes "I will explain again please concentrate."; next; mes "[Boya]"; - mes "An oasis souteast of Morroc."; + mes "An oasis souteast of Morocc."; mes "There is a big dog in the center."; mes "The detailed story is written in the log, see?"; } @@ -228,7 +228,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ completequest 7141; } else if (para_suv01 < 21) { - mes "The training area is southwest of Morroc."; + mes "The training area is southwest of Morocc."; mes "Enter the Saint Darmain Fortress to reach it directly."; next; mes "[Boya]"; @@ -402,7 +402,7 @@ S_Quest1: mes "It's the most proper mission for your level."; next; mes "[Boya]"; - mes "^4d4dffThere is a desert town called Morroc."; + mes "^4d4dffThere is a desert town called Morocc."; mes "From there go south and then east. There is small oasis in the center of that field.^000000"; next; mes "[Boya]"; @@ -498,7 +498,7 @@ S_Quest2: mes "It's the most proper mission for your level."; next; mes "[Boya]"; - mes "Travel just southwest of Morroc City."; + mes "Travel just southwest of Morocc City."; mes "There you will find a hole in the ground to a cave called Anthell."; next; mes "[Boya]"; @@ -1240,8 +1240,8 @@ anthell01,29,264,5 script Eden Member Cloud#para06 899,{ case 3: mes "[Cloud]"; mes "Where you are?"; - mes "You are in Anth Hell southwest of Morroc."; - mes "Morroc is the closest city, northeast of here."; + mes "You are in Anth Hell southwest of Morocc."; + mes "Morocc is the closest city, northeast of here."; close; } } @@ -1994,7 +1994,7 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{ next; mes "[Michael]"; mes "To prepare for emergencies, we hav enough equipment and supplies for an entire army."; - mes "Frankly... we don't have a use for it now but in case soemthing happens like in Morroc."; + mes "Frankly... we don't have a use for it now but in case soemthing happens like in Morocc."; next; mes "[Michael]"; mes "Just take a look around and don't touch anything."; @@ -2608,7 +2608,7 @@ moc_para01,23,35,5 script Instructor Ur#2nd01 4_M_KNIGHT_BLACK,{ mes "Ah, this place should be good!"; mes "Do you know where Glast Heim is?"; mes "If it wasn't for that terrible accident, Glast Heim would still be"; - mes "the capital of Rune Midgard, not Prontera."; + mes "the capital of Rune-Midgarts, not Prontera."; next; mes "[Instructor Ur]"; mes "Anyways, that ancient castle is now full of undead monsters ."; @@ -2785,7 +2785,7 @@ moc_para01,23,35,5 script Instructor Ur#2nd01 4_M_KNIGHT_BLACK,{ else if (para_2nd01 < 20) callsub S_Direction,"Ice Dungeon"; else if (para_2nd01 < 29) { - mes "You have to travel very far to get to the ^4d4dffRune Midgard Expedition Camp^000000!"; + mes "You have to travel very far to get to the ^4d4dffMidgard Expedition Camp^000000!"; mes "If you want to stay there then earn your keep by doing missions. Got it?"; } close; diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index db9569eb8f..255d551c5f 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -499,7 +499,7 @@ moc_para01,34,178,3 script Tutorial Instructor 904,{ mes "Of course, in order to do this we are in need of some materials and there is a chance that it may fail, but that's the risk you're taking."; next; mes "[Tutorial Instructor]"; - mes "The people who do the ^006400SOCKET ENCHANT^000000 can be found in ^8B4513Prontera, Morroc, Payon,^000000. ^8B4513Rhitalzen^000000 is in the Refinery and ^0000FFSeiyablem^000000 and ^0000FFReiablem^000000 can be found near the entrance."; + mes "The people who do the ^006400SOCKET ENCHANT^000000 can be found in ^8B4513Prontera, Morocc, Payon,^000000. ^8B4513Rhitalzen^000000 is in the Refinery and ^0000FFSeiyablem^000000 and ^0000FFReiablem^000000 can be found near the entrance."; next; mes "[Tutorial Instructor]"; mes "The one who does ^006400HIDDEN SOCKET ENCHANT^000000 is found at the 6 o'clock location of ^8B4513Prontera^000000. Look for the ^0000FFCraftman Apprentice^000000."; @@ -1357,7 +1357,7 @@ L_Info: mes "Also, after you explore Memorial Dungeon, you cannot re-enter the same ^006400Memorial Dungeon^000000 for a certain period of time."; next; mes "[Memorial Dungeon Expert]"; - mes "Many ^006400Memorial Dungeon^000000s exist, but we will give you hints to help you find Memorial Dungeon in the world of Rune Midgard."; + mes "Many ^006400Memorial Dungeon^000000s exist, but we will give you hints to help you find Memorial Dungeon in the world of Midgard."; next; mes "[Memorial Dungeon Expert]"; mes "First, go to ^8B4513Alberta^000000 and find ^006400Captain Jansen^000000."; @@ -1537,7 +1537,7 @@ L_Info: mes "The map can be accessed by clicking on the button that says ^006400MAP^000000 on the upper left side of your screen."; next; mes "[Map Expert]"; - mes "When you click on the ^006400MAP^000000 button, a full sized map of Rune Midgards will take up your screen."; + mes "When you click on the ^006400MAP^000000 button, a full sized map of Midgard will take up your screen."; mes "When you ^0000FFHover your mouse over specific areas^000000, you can find out more things such as ^006400NAME^000000 and Area Details."; next; mes "[Map Expert]"; @@ -1558,7 +1558,7 @@ L_Info: mes "Or at the top right of the map, there is a ^006400X^000000 button. Click that and you will return to your normal game screen."; next; mes "[Map Expert]"; - mes "Currently, we cannot see places that are beyond Rune Midgards but it has been said that there are a lot of unknown worlds that exist in the beyond."; + mes "Currently, we cannot see places that are beyond Midgard but it has been said that there are a lot of unknown worlds that exist in the beyond."; next; return; } diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index 0b37031807..ccbe6cbb8d 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -1022,7 +1022,7 @@ que_house_s,13,52,3 script Open Book#01homun_s 111,{ next; mes "[Bookcase Notes]"; mes "He especially didn't like the fact that I was bound tightly to ^FF4800Homunculus^000000 research."; - mes "He didn't say such a thing when we studied together in ^8B4513Rune Midgarts^000000."; + mes "He didn't say such a thing when we studied together in ^8B4513Rune-Midgarts^000000."; next; mes "[Bookcase Notes]"; mes "One day, I'll show ^005DFFDe Bris^000000 my ^FF4800Homunculus^000000 research data."; diff --git a/npc/re/quests/newgears/2010_headgears.txt b/npc/re/quests/newgears/2010_headgears.txt index 15605ca5ec..81e9ae961d 100644 --- a/npc/re/quests/newgears/2010_headgears.txt +++ b/npc/re/quests/newgears/2010_headgears.txt @@ -931,7 +931,7 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 787,{ mes "to be a playing-alone expert!"; next; mes "[Alonie]"; - mes "The special training, to play alone in Louyang!"; + mes "The special training, to play alone in Luoyang!"; mes "For make it"; mes "the fruitful training,"; mes "Get around and kill"; diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index b1c11d891f..a5893cf769 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -77,7 +77,7 @@ moc_para01,41,169,3 script Reno#2012hat 64,{ switch(select("ECRA?:Quest to get Energy Crystals:Energy Crystal Buffs:Compress Energy Crystals:Exchange Crystals for Headgear:Random Gear for Crystals" + ((.@features_iRO)?":See Equipment List":""))) { case 1: mes "[Reno]"; - mes "ECRA is the institute that researches '^0000FFEnergy Crystals^000000' that shall be used as an alternative energy source in the Rune Midgart Kingdom, which suffers from a shortage of energy."; + mes "ECRA is the institute that researches '^0000FFEnergy Crystals^000000' that shall be used as an alternative energy source in the Rune-Midgarts Kingdom, which suffers from a shortage of energy."; next; select("The reason for doing this?"); mes "[Reno]"; diff --git a/npc/re/quests/quests_14_3.txt b/npc/re/quests/quests_14_3.txt index c568baba45..4536689bec 100644 --- a/npc/re/quests/quests_14_3.txt +++ b/npc/re/quests/quests_14_3.txt @@ -150,7 +150,7 @@ morocc,138,238,4 script Piled Rags#ep14bs 4_M_DIEMAN,{ mes "do you mean the ^0000FFoasis near the northwestern sphinx^000000?"; next; mes "[Tamarin]"; - mes "I've been in Morroc, but this is my first time inside the village."; + mes "I've been in Morocc, but this is my first time inside the village."; mes "I remember hearing that the place holds special water."; next; mes "[Tamarin]"; @@ -313,7 +313,7 @@ moc_ruins,106,140,4 script Tamarin#ep14bs_ru 4_M_TAMARIN,{ mes "My knees gave way and I rolled on my side. When I looked around, I was back at the ^0000FFDimensional Crack^000000 where my friends and I first arrived."; next; mes "[Tamarin]"; - mes "I came out through the ^0000FFMorroc Dimensional Teleporter^000000 and used every ounce of my energy to get to Morroc."; + mes "I came out through the ^0000FFMorocc Dimensional Teleporter^000000 and used every ounce of my energy to get to Morocc."; next; mes "[Tamarin]"; mes "Sigh..."; @@ -327,7 +327,7 @@ moc_ruins,106,140,4 script Tamarin#ep14bs_ru 4_M_TAMARIN,{ cutin "ep143_tasmi.bmp",2; next; mes "[Tamarin]"; - mes "Fortunately for me, with the ^0000FFMorroc restoration work^000000 underway, I shouldn't have a problem making money through some part-time jobs."; + mes "Fortunately for me, with the ^0000FFMorocc restoration work^000000 underway, I shouldn't have a problem making money through some part-time jobs."; next; if (select( "Tell him have safe travel.", "Tell him you want to tag along." ) == 1) { mes "[Tamarin]"; @@ -341,7 +341,7 @@ moc_ruins,106,140,4 script Tamarin#ep14bs_ru 4_M_TAMARIN,{ cutin "ep143_tasmi.bmp",2; next; mes "[Tamarin]"; - mes "I'll be in Morroc for a while, making some money and getting ready for another adventure. I hope I can see you again before I leave."; + mes "I'll be in Morocc for a while, making some money and getting ready for another adventure. I hope I can see you again before I leave."; close3; } mes "[Tamarin]"; @@ -536,11 +536,11 @@ ecl_in01,40,96,3 script Eclage Guard#143_6 4_M_FAIRYSOLDIER,{ next; mes "[Eclage Guard]"; mes "Many a warrior already left to the hideout."; - mes "So long as Morroc exists, Yggdrasil is not safe. I'm going to join the Expedition."; + mes "So long as Morocc exists, Yggdrasil is not safe. I'm going to join the Expedition."; close; case 2: mes "[Eclage Guard]"; - mes "It turns out Demon God ran from Morroc to hide out in our dimension."; + mes "It turns out Demon God ran from Morocc to hide out in our dimension."; mes "He has to be dealt with, either banished back to his realm or destroyed."; next; mes "[Eclage Guard]"; diff --git a/npc/re/quests/quests_15_1.txt b/npc/re/quests/quests_15_1.txt index 9239525cc2..cb25ff1e93 100644 --- a/npc/re/quests/quests_15_1.txt +++ b/npc/re/quests/quests_15_1.txt @@ -6535,7 +6535,7 @@ lhz_in01,270,257,4 script Rekenber Chairman#e152i 4_M_REKENBER,{ next; cutin "verus_ian01.bmp",2; mes "[Ian Atnad]"; - mes "I found myself in a motel room in Yuno when I came to."; + mes "I found myself in a motel room in Juno when I came to."; mes "I didn't even know how much time has passed."; next; cutin "verus_aures.bmp",0; @@ -6669,7 +6669,7 @@ lhz_in01,267,257,5 script Chief Secretary#e152i01 4_M_TATIO,{ cutin "ep15_tatio01.bmp",0; mes "[Tatio]"; mes "That is why you have that one week gap."; - mes "I took care of you for four days and sent you to the motel in Yuno."; + mes "I took care of you for four days and sent you to the motel in Juno."; next; cutin "ep15_tatio02.bmp",0; mes "[Tatio]"; diff --git a/npc/re/quests/quests_16_1.txt b/npc/re/quests/quests_16_1.txt index d896dcbe0e..7721fc6242 100644 --- a/npc/re/quests/quests_16_1.txt +++ b/npc/re/quests/quests_16_1.txt @@ -169,7 +169,7 @@ prontera,150,331,4 script Royal Guard#ep16_ect01 8W_SOLDIER,4,4,{ mes "Let me send a message for the Chamberlain to find you."; close; } - npctalk "Welcome to the glorious Prontera Palace in the heart of Rune Midgards!", "Royal Guard#ep16_ect01", bc_self;// Royal Guard#ep16_ect01 only + npctalk "Welcome to the glorious Prontera Palace in the heart of Rune-Midgarts!", "Royal Guard#ep16_ect01", bc_self;// Royal Guard#ep16_ect01 only end; OnTouch: @@ -294,7 +294,7 @@ prt_cas_q,26,30,3 script Chamberlain Bell#ep16_m 4_M_RUSMAN1,{ mes "There is a secret ritual passed down in the palace, which is held before the official coronation. The heir will be named the king upon passing the ritual."; next; mes "[Belle]"; - mes "Unless the heavens fall, the ritual will be finished safely, and Rune Midgards will meet the new king."; + mes "Unless the heavens fall, the ritual will be finished safely, and Rune-Midgarts will meet the new king."; next; select("What's it got to do with me?"); mes "[Belle]"; @@ -323,7 +323,7 @@ prt_cas_q,26,30,3 script Chamberlain Bell#ep16_m 4_M_RUSMAN1,{ mes "Since the late king passed away all of a sudden, the palace has been in a state of disorder."; next; mes "[Belle]"; - mes "Fortunately, Rune Midgards is supported by the seven royal families."; + mes "Fortunately, Rune-Midgarts is supported by the seven royal families."; mes "It is the time to welcome our new king."; next; npctalk "If Morocc hadn't been resurrected...", "", bc_self; @@ -1937,7 +1937,7 @@ prt_lib,80,79,3 script Kronecker G. Heine#ep16_1 HIDDEN_WARP_NPC,{ mes "Since it was made by crafting a small piece fallen from the heart..."; next; mes "[Kronecker]"; - mes "Should we negotiate with the cooperation in Schwaltzvalt?"; + mes "Should we negotiate with the cooperation in Schwarzwald?"; mes "Wait a minute."; mes "....."; next; @@ -2123,7 +2123,7 @@ prt_lib,85,82,5 script Ian Walther#ep16_lib01 HIDDEN_WARP_NPC,{ mes "However..."; next; mes "[Nyhill]"; - mes "I am a Heine, one of the seven royal families of Rune Midgards."; + mes "I am a Heine, one of the seven royal families of Rune-Midgarts."; mes "I didn't do such a thing on purpose."; next; mes "[Maximilian]"; @@ -4940,7 +4940,7 @@ prt_pri00,57,119,1 script Bigfoot#ep16wal 1_M_JOBGUIDER,{ mes "I heard that you saw a person of the Walther family in a foreign country. Where did you see him? How did you know that he was from the Walther family?"; next; mes "[Bigfoot]"; - mes "Oh, you wanted to know that. As you know, it is rare to see seafarer Walthers in other places of Rune Midgards, except Alberta and Prontera."; + mes "Oh, you wanted to know that. As you know, it is rare to see seafarer Walthers in other places of Rune-Midgarts, except Alberta and Prontera."; mes "They are good at hiding their identities other than those who are well known."; next; mes "[Bigfoot]"; @@ -5128,7 +5128,7 @@ veins,156,160,7 script K#ep16wal 4_M_RASWORD,{ mes "In fact I know nothing about his death myself. However, he ^0000cdsent me here with a mission^000000 before incident broke out."; next; mes "[K]"; - mes "When I was going to go back after completing the mission, he sent me a lot of money and a ^0000cdletter^000000. It said ^0000cdnot to return to Rune Midgards^000000."; + mes "When I was going to go back after completing the mission, he sent me a lot of money and a ^0000cdletter^000000. It said ^0000cdnot to return to Rune-Midgarts^000000."; next; mes "[" + strcharinfo(0) + "]"; mes "And then?"; @@ -5586,7 +5586,7 @@ prt_cas_q,19,85,4 script Kronecker G. Heine#ep16 4_EP16_GRANZ,{ mes "Although I feel reluctant to reveal somewhat embarrassing part of the royal family to you,"; next; mes "[Kronecker]"; - mes "It was the royal family of Rune Midgards who let you observe the ritual anyway."; + mes "It was the royal family of Rune-Midgarts who let you observe the ritual anyway."; mes "And you were the one who fought the intruders during the incident..."; next; mes "[Kronecker]"; @@ -5821,7 +5821,7 @@ prt_cas_q,90,186,5 script Maximilian Roegenburg#e 4_EP16_MAX,{ mes "Hello, adventurers. I am honored you have visited the ^0000cdRoegenburg^000000. I am ^0000cdMaximilian Roegenburg^000000."; next; mes "[Maximilian]"; - mes "We are one of seven royal families that found the kingdom and have work hard for Rune Midgards."; + mes "We are one of seven royal families that found the kingdom and have work hard for Rune-Midgarts."; next; mes "[Maximilian]"; mes "^0000cdHelmut Roegenburg^000000, the heir of our family, is supposed to participate in the royal assembly. How about seeing him?"; @@ -5861,7 +5861,7 @@ prt_cas_q,90,186,5 script Maximilian Roegenburg#e 4_EP16_MAX,{ } if (banquet_roegenburg_quest >= 2 && banquet_roegenburg_quest <= 6) { mes "[Maximilian]"; - mes "The Roegenburg is proud that we are descents of Wilhelm, the national hero, and contributed to the foundation and development of Rune Midgards Kingdom."; + mes "The Roegenburg is proud that we are descents of Wilhelm, the national hero, and contributed to the foundation and development of Rune-Midgarts Kingdom."; next; mes "[Maximilian]"; mes "Therefore, we hoped that the children could grow into decent adults, but they were raised without their parents' care and now they tend to behave rudely and act as they want."; @@ -5909,7 +5909,7 @@ prt_cas_q,90,186,5 script Maximilian Roegenburg#e 4_EP16_MAX,{ } if (banquet_roegenburg_quest == 9) { mes "[Maximilian]"; - mes "Please bring Helmut. He must be in the ^0000cdcheckpoint near the border with Schwaltzvalt^000000. He is responsible for the patrol party."; + mes "Please bring Helmut. He must be in the ^0000cdcheckpoint near the border with Schwarzwald^000000. He is responsible for the patrol party."; mes "Please."; close; } @@ -6610,7 +6610,7 @@ prt_cas_q,96,184,1 script Agnes Roegenburg#ep16lu 4_EP16_AGNES,{ mes "So I hired very skillful person who can make a dress and accessories, but the key is materials. I guess that you are very experienced and can get what I need."; next; mes "[Agnes]"; - mes "If I go out to get a dress, I may be the first princess in Rune Midgards who dies for a dress. So would you please save me from this situation?"; + mes "If I go out to get a dress, I may be the first princess in Rune-Midgarts who dies for a dress. So would you please save me from this situation?"; next; mes "[" + strcharinfo(0) + "]"; mes "Of course, I'll do my best to help you."; @@ -6882,7 +6882,7 @@ prt_cas_q,86,180,7 script Kalbern#ep16lug 4_M_RUSCHILD,{ mes "I am ^0000cdKalbern^000000 and a chamberlain of Helmut."; next; mes "[Kalbern]"; - mes "I served Helmut in a harsh front in the border area. Now I am in Prontera, the capital city of Rune Midgards and I cannot adapt to this situation"; + mes "I served Helmut in a harsh front in the border area. Now I am in Prontera, the capital city of Rune-Midgarts and I cannot adapt to this situation"; next; mes "[Kalbern]"; mes "I also lose my nerve when I see noble people and royal family in the palace."; @@ -6938,7 +6938,7 @@ prt_cas_q,96,186,3 script Wolf Roegenburg#ep16lug 4_EP16_WOLF,{ mes "To carry on the will of Wilhelm Roegenburg, a national hero, we, at the Roegenburg, are making lots of efforts to protect honor, justice and traditions."; next; mes "[Wolf]"; - mes "Since the foundation of Rune Midgards, lots of people from the Roegenburg have made contribution to the country and this is our pride."; + mes "Since the foundation of Rune-Midgarts, lots of people from the Roegenburg have made contribution to the country and this is our pride."; next; mes "[Wolf]"; mes "Currently ^0000cdHelmut Roegenburg^000000, who is an excellent candidate for the throne, is participating in the royal assembly. Did you see him?"; @@ -7225,7 +7225,7 @@ prt_cas_q,96,186,3 script Wolf Roegenburg#ep16lug 4_EP16_WOLF,{ mes "[I changed the rumor I got from children to a relatively softer version and told them.]"; next; mes "[" + strcharinfo(0) + "]"; - mes "These days everybody talks about the rumor. I think it will spread throughout Rune Midgards as well as Prontera."; + mes "These days everybody talks about the rumor. I think it will spread throughout Rune-Midgarts as well as Prontera."; next; mes "[Wolf]"; mes "The rumor is....very.... specific and malicious. It must be circulated on purpose by someone who knows the circumstances of my family."; @@ -7615,7 +7615,7 @@ prt_cas_q,96,186,3 script Wolf Roegenburg#ep16lug 4_EP16_WOLF,{ mes "Then, my job is to bring him."; next; mes "[Maximilian]"; - mes "Yes. He must be in the ^0000cdcheckpoint near the border with Schwaltzvalt^000000. He is responsible for the patrol party."; + mes "Yes. He must be in the ^0000cdcheckpoint near the border with Schwarzwald^000000. He is responsible for the patrol party."; next; mes "[Maximilian]"; mes "And when you come back, use this. You can return to Prontera instantly."; @@ -7836,7 +7836,7 @@ function script F_kids_roegenburg_quest { mes "That is easy. Now you little one. What do you need?"; next; mes "[Jin]"; - mes "I want a history book, which includes all history of Rune Midgards. It is in the royal library and I have never see it."; + mes "I want a history book, which includes all history of Rune-Midgarts. It is in the royal library and I have never see it."; next; mes "[Jin]"; mes "I know no one around me who can access the palace and book stores do not sell it. Please get it for me."; @@ -7848,7 +7848,7 @@ function script F_kids_roegenburg_quest { mes "Are you crazy? What do you think I am? Borrow it for me."; next; mes "[" + strcharinfo(0) + "]"; - mes "OK. ^0000cdHunting 33 Majoruroses, Getting 12 pieces of soft sick cloth an borrowing the history book on Rune Midgards from the royal library^000000. I'll be back soon."; + mes "OK. ^0000cdHunting 33 Majoruroses, Getting 12 pieces of soft sick cloth an borrowing the history book on Rune-Midgarts from the royal library^000000. I'll be back soon."; next; mes "[Harriet]"; mes "I will be waiting for you!"; @@ -8154,7 +8154,7 @@ prontera,271,70,3 script Kiddo#ep16lug01 4_M_MIKID,{ mes "How can you say that! You must have forgotten what you should bring."; next; mes "[Harriet]"; - mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune Midgards ^000000"; + mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune-Midgarts ^000000"; next; mes "[Harriet]"; mes "and hmm... ^0000cdkilling of 33 Majoruroses^000000 for Allen."; @@ -8234,7 +8234,7 @@ prontera,271,68,1 script Kiddo#ep16lug02 4_M_KID1,5,5,{ mes "Hey! You aren't, are you? You don't seem to be a such person. You forget what you should get, didn't you?"; next; mes "[Harriet]"; - mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune Midgards ^000000"; + mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune-Midgarts ^000000"; next; mes "[Harriet]"; mes "and hmm... ^0000cdkilling of 33 Majoruroses^000000 for Allen."; @@ -8306,7 +8306,7 @@ prontera,269,69,5 script Kiddo#ep16lug03 4_F_KID2,{ mes "Hey! You aren't, are you? You don't seem to be a such person. You forget what you should get, didn't you?"; next; mes "[Harriet]"; - mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune Midgards ^000000"; + mes "First, ^0000cd12 pieces of soft cloth^000000, ^0000cdhistory book on Rune-Midgarts ^000000"; next; mes "[Harriet]"; mes "and hmm... ^0000cdkilling of 33 Majoruroses^000000 for Allen."; @@ -8735,7 +8735,7 @@ prt_cas_q,93,74,4 script Po Richard#EP161GAM 4_M_6THPRIN1,{ mes "In fact, it was not your will to come here. I am pretty sure that you must have come here since the his nibs called you. I understand that."; next; mes "[Po Richard]"; - mes "Although the adventurers may care less about the palace affairs, the Richard family is in charge of the military force of Rune Midgards."; + mes "Although the adventurers may care less about the palace affairs, the Richard family is in charge of the military force of Rune-Midgarts."; next; emotion ET_QUESTION; mes "[Po Richard]"; @@ -9292,7 +9292,7 @@ prt_cas,82,240,3 script Lidion Geoborg#ep16_1 4_M_DOCTOR,{ mes "We, the Geoborg family, is one of the seven royal families, but we are the creme de la creme for producing the highest number of kings in the history."; next; mes "[Lidion Geoborg]"; - mes "In fact, we are settled in Prontera, the center of the Rune Midgards."; + mes "In fact, we are settled in Prontera, the center of the Rune-Midgarts."; next; mes "[Lidion Geoborg]"; mes "Despite the series of unfortunate events regarding the princes after the death of King Tristan III,"; @@ -10854,7 +10854,7 @@ prt_cas_q,95,9,5 script Jurgen Wigner#ep16wig 4_M_4THPRIN1,{ next; cutin "16jur_sim",0; mes "[Jurgen]"; - mes "Sorry about the difficult request. I guess I should go there myself. You may be able to see the news that the heir of the Wigner family has been crushed to death by his followers on Daily Rune Midgards tomorrow morning."; + mes "Sorry about the difficult request. I guess I should go there myself. You may be able to see the news that the heir of the Wigner family has been crushed to death by his followers on Daily Rune-Midgarts tomorrow morning."; next; mes "[Jurgen]"; mes "Or, the poor maid could be hospitalized by tomorrow. Anyway, I understand."; @@ -11714,7 +11714,7 @@ prt_cas,322,216,5 script Maid#ep16wig02 1_F_04,{ mes "Argh... My arms... Was there anyone else in the room?"; next; mes "[Maid]"; - mes "You must know what kind of family that is. It is the wealthiest family in Rune Midgards. Despite being a temporary residence, the room was decorated with so much care."; + mes "You must know what kind of family that is. It is the wealthiest family in Rune-Midgarts. Despite being a temporary residence, the room was decorated with so much care."; next; mes "[Maid]"; mes "All the gorgeous pieces of furniture and carpets... I have never seen tiger skin as white and huge as that one in there."; @@ -12665,13 +12665,13 @@ prt_cas,79,219,7 script Banquet Hall Guest#ep16_1 4_F_MALAYA,{ prt_cas,81,235,3 script Banquet Hall Guest#ep16_2 4_F_BRZ_WOMAN,{ mes "[Banquet Hall Guest]"; - mes "The Palace of Rune Midgards is so big and glamourous. It somewhat feels exotic too. It's been a long way, but I am glad to be here."; + mes "The Palace of Rune-Midgarts is so big and glamourous. It somewhat feels exotic too. It's been a long way, but I am glad to be here."; close; } prt_cas,87,231,5 script Banquet Hall Guest#ep16_3 4_M_TWTEAMAN,{ mes "[Banquet Hall Guest]"; - mes "I visited the Palace of Rune Midgards long time ago. It has changed a lot ever since. It has become much more glamourous and magnificent that I really enjoy being guided around this place."; + mes "I visited the Palace of Rune-Midgarts long time ago. It has changed a lot ever since. It has become much more glamourous and magnificent that I really enjoy being guided around this place."; close; } @@ -13033,10 +13033,10 @@ prt_cas,343,67,4 script Uptight Librarian#ep16l 1_F_LIBRARYGIRL,{ mes "What kind of book are you looking for?"; next; mes "[" + strcharinfo(0) + "]"; - mes "A book about history of Rune Midgards."; + mes "A book about history of Rune-Midgarts."; next; mes "[Uptight Librarian]"; - mes "Hm... history of Rune Midgards."; + mes "Hm... history of Rune-Midgarts."; mes "Are you going to borrow the book?"; next; mes "[" + strcharinfo(0) + "]"; @@ -13165,7 +13165,7 @@ prt_cas,343,67,4 script Uptight Librarian#ep16l 1_F_LIBRARYGIRL,{ next; mes "[Uptight Librarian]"; mes "I have been alone these days as no one has visited the library due to the banquet."; - mes "History of Rune Midgards."; + mes "History of Rune-Midgarts."; next; mes "[Uptight Librarian]"; mes "You can borrow it for one week. There is a fee for overdue books, but I was instructed to make you exempt from it"; @@ -13472,7 +13472,7 @@ OnTouch: // Exchanges and enchants npc prt_cas,165,255,7 script Commissary#ep16 4_M_JOB_KNIGHT2,{ mes "[Commissary Arner]"; - mes "You can exchange the Honor Marks given by the noble people of Rune Midgards as the token of trust with some valuable items of Prontera."; + mes "You can exchange the Honor Marks given by the noble people of Rune-Midgarts as the token of trust with some valuable items of Prontera."; next; switch( select( "Consumables", "Armors", "View item description" ) ) { case 1: @@ -14939,33 +14939,33 @@ prt_q,74,227,2 duplicate(Dead Villager#EP161DIE01) Dead Villager#EP161DIE19 4_M_ prt_q,45,146,8 duplicate(Dead Villager#EP161DIE01) Dead Villager#EP161DIE20 4_M_DIEMAN,2,2 prt_q,148,49,0 script Sign#EP161ETC12 2_BULLETIN_BOARD,{ - mes "[Prontera, the Capital of Rune Midgards Kingdom]"; + mes "[Prontera, the Capital of Rune-Midgarts Kingdom]"; mes "Welcome to Prontera"; - mes "in the heart of Rune Midgards!"; + mes "in the heart of Rune-Midgarts!"; mes "Prontera is located"; mes "in the center of the continent,"; mes "and it is famous as the busy city"; mes "of commerce and trade."; next; - mes "[Prontera, the Capital of Rune Midgards Kingdom]"; + mes "[Prontera, the Capital of Rune-Midgarts Kingdom]"; mes "There are major buildings including"; mes "the Prontera Palace where job change to Crusader is available;"; mes "Prontera Cathedral where job changes to Acolyte, Priest are available"; mes "and wedding ceremonies are held;"; mes "the Knight's Building, etc."; next; - mes "[Prontera, the Capital of Rune Midgards Kingdom]"; + mes "[Prontera, the Capital of Rune-Midgarts Kingdom]"; mes "There are many people and stores"; mes "as well so make sure to look around."; next; - mes "[Prontera, the Capital of Rune Midgards Kingdom]"; + mes "[Prontera, the Capital of Rune-Midgarts Kingdom]"; mes "Also, in the south east of the central fountain,"; mes "there is the historic Quadro Blacksmith's Workshop."; mes "Drop by the place if you want to get"; mes "your equipment"; mes "repaired."; next; - mes "[Prontera, the Capital of Rune Midgards Kingdom]"; + mes "[Prontera, the Capital of Rune-Midgarts Kingdom]"; mes "There is Izlude in the south east, Payon in the south, Geffen in the west and Al De Baran in the north."; close; } @@ -15696,7 +15696,7 @@ prt_pri00,51,116,8 script Ellond Lawrence#EP161ER 4_M_CRU,1,1,{ mes "Nothing particular. What you can imagine about the dungeon of the kingdom is all there is."; next; mes "[Ellond Lawrence]"; - mes "I was told it was made to lock up the menaces to peace and safety of Rune Midgards."; + mes "I was told it was made to lock up the menaces to peace and safety of Rune-Midgarts."; next; mes "[Ellond Lawrence]"; mes "Basically, it's strongly made, but..."; @@ -15718,7 +15718,7 @@ prt_pri00,51,116,8 script Ellond Lawrence#EP161ER 4_M_CRU,1,1,{ mes "This facility is so old and there is no document written about it. We just pass down what people say about it."; next; mes "[Ellond Lawrence]"; - mes "What's certain is that they were the culprit of the chaos created in Rune Midgards in the past."; + mes "What's certain is that they were the culprit of the chaos created in Rune-Midgarts in the past."; next; mes "[Ellond Lawrence]"; mes "Anyway, there is no document left about them ? for what they were charged or sentences confirmed against them."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index bd7bc0337e..0a1f32d05a 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -2108,7 +2108,7 @@ dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{ mes "The report robber is Cheshire."; mes "Cheshire is Ahat's servant and they are related to the crack."; mes "They are trying to hide something or someone at the crack"; - mes "and the crack was created by the evil lord Morroc!"; + mes "and the crack was created by the evil lord Morocc!"; next; mes "[" + strcharinfo(0) + "]"; mes "Ahat is the evil lord?"; @@ -2194,7 +2194,7 @@ dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{ mes "And tries to erase all traces found near the crack."; mes "And Ahat wants to eliminate..."; next; - if (select("Ahat himself.:Morroc because of the crack?") == 1) { + if (select("Ahat himself.:Morocc because of the crack?") == 1) { mes "[" + strcharinfo(0) + "]"; mes "Yes, Ahat might be a trace of himself."; mes "Saphas want to hide something that is why they hired me"; @@ -2202,19 +2202,19 @@ dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{ } else { mes "[" + strcharinfo(0) + "]"; - mes "A bit dramatic but we cannot rule out the evil lord Morroc."; - mes "Because the crack was created by the evil lord Morroc himself."; + mes "A bit dramatic but we cannot rule out the evil lord Morocc."; + mes "Because the crack was created by the evil lord Morocc himself."; } set .@yes, .@yes + 1; next; } else if (.@yes == 4) { mes "[" + strcharinfo(0) + "]"; - mes "Ahat and the crack and then Morroc.."; + mes "Ahat and the crack and then Morocc.."; mes "I can tell there is a relationship between them but I can't pinpoint it."; mes "And in the expedition's report..."; next; - if (select("Content of conflict between three countries.. :Content about evil lord Morroc..") == 1) { + if (select("Content of conflict between three countries.. :Content about evil lord Morocc..") == 1) { mes "[" + strcharinfo(0) + "]"; mes "There was something about the conflict between three countries.."; mes "But.. I don't think it all adds up?"; @@ -2223,7 +2223,7 @@ dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{ else { mes "[" + strcharinfo(0) + "]"; mes "Yes. There is a report from the tracking team led by Echinacea."; - mes "It was about the evil lord Morroc."; + mes "It was about the evil lord Morocc."; set .@yes, .@yes + 1; } next; @@ -3692,7 +3692,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ case 1: mes "[Shay]"; mes "What will it be?"; - mes "I have Tropical Sograt and Vermilion on the Beach flown in from Morroc."; + mes "I have Tropical Sograt and Vermilion on the Beach flown in from Morocc."; mes "A bit on the expensive side though."; next; if (select("Tropical Sorgrat - 2000z:Vermilion on the Beach - 2000z:Anything else?") == 3) { @@ -3969,7 +3969,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ mes "Because it is difficult to meet the minister."; next; mes "[Shay]"; - mes "The crack here must have been created when the crack in Morroc appeared."; + mes "The crack here must have been created when the crack in Morocc appeared."; mes "If he did it."; next; mes "[Shay]"; @@ -4077,7 +4077,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ next; select("Oh..no.."); mes "[Shay]"; - mes "When I was in Morroc."; + mes "When I was in Morocc."; mes "A colleague from the guild used to make chocolate stuff you see?"; mes "I thought it would be simple since he was making it."; next; @@ -7494,7 +7494,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 496,{ mes "However, we plan to spare no efforts on it."; next; mes "[Agent Geck]"; - mes "Human!! Did you know there is a huge hole near the Morroc village and nearby area?"; + mes "Human!! Did you know there is a huge hole near the Morocc village and nearby area?"; mes "They say you can travel to a new area through the hole!"; next; mes "[Agent Geck]"; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index a4e3be60c4..09d23fc2e1 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -7930,7 +7930,7 @@ ecl_in01,80,86,4 script Midgard Exploration#bok1 HIDDEN_NPC,{ mes "Seriously, human capability is...so disappointing. If they're wise enough, they'll use Warp-portal."; break; case 9: - mes "Morroc Village is known to be a place where Morroc, the king of demons, rests."; + mes "Morocc Village is known to be a place where Morocc, the king of demons, rests."; next; mes "Making waterways and lakes in the barren inhospitable desert...what an exceptional piece of work for humans."; next; @@ -8078,7 +8078,7 @@ ecl_in01,83,84,4 script Midgard Exploration#bok3 HIDDEN_NPC,{ mes "But aren't those entertainment facilities supposed to be in the center of a country?"; break; case 5: - mes "A city called Yuno is even floating in the sky! How incredible is this."; + mes "A city called Juno is even floating in the sky! How incredible is this."; next; mes "And there is a special reward for those who escape the maze: there is a place where rebirth is given."; next; @@ -8145,7 +8145,7 @@ ecl_in01,83,81,4 script Midgard Exploration#bok4 HIDDEN_NPC,{ case 2: mes "Places you can reach through Alberta are as follows."; next; - mes "A country of Gods, Amatsu, a place of refuge, Kunlun, Louyang where many martial art experts reside, Ayothaya in which a huge sculpture is present, and many others."; + mes "A country of Gods, Amatsu, a place of refuge, Kunlun, Luoyang where many martial art experts reside, Ayothaya in which a huge sculpture is present, and many others."; next; mes "I can see that more places would be available in the future as delegates from many other countries are arriving there more recently."; break; @@ -8329,7 +8329,7 @@ ecl_in01,82,79,4 script Magazine#02 HIDDEN_NPC,{ next; if (select("Keep reading.:Stop reading.") == 2) close; - mes "That cat introduced himself and told me that he studied in Morroc."; + mes "That cat introduced himself and told me that he studied in Morocc."; next; mes "Then he assured me that he could upgrade my +9 Violet Fear to +10 Violet Fear."; next; @@ -8359,7 +8359,7 @@ ecl_in01,82,79,4 script Magazine#02 HIDDEN_NPC,{ next; if (select("Keep reading.:Stop reading.") == 2) close; - mes "This is a story of 'Appearing in Morroc Chocheon****.'"; + mes "This is a story of 'Appearing in Morocc Chocheon****.'"; close; } @@ -8522,7 +8522,7 @@ ecl_in02,146,114,4 script Clever#pa0829 4_M_FAIRYSCHOLAR_DIRTY,{ mes "Hmm? Why? Do you have an interesting story?"; while (1) { next; - if (select("Try entertaining him.:Tell him about the journey until now.:Tell him about Rune Midgard.:Ask him what he wants to eat.") == 4) { + if (select("Try entertaining him.:Tell him about the journey until now.:Tell him about Midgard.:Ask him what he wants to eat.") == 4) { mes "[Clever]"; mes "Hmm. What do I want to eat? I have lots of things I want to eat. After all, I've been eating stale prison rice all this time. I had one thing in particular."; next; @@ -15269,7 +15269,7 @@ ecl_in03,41,90,3 script Mayor Jun Kardui#tl01 4_M_FARIYKING,{ mes "[Kardui]"; mes "Let's think about that later. "; mes "Anyway...I heard from Nydhog."; - mes "The Chief of Staff seemed to be manipulated by a subordinate of Morroc."; + mes "The Chief of Staff seemed to be manipulated by a subordinate of Morocc."; next; cutin "kardui02",2; mes "[Kardui]"; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 096737e7c5..3cf39b2d57 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -2703,21 +2703,21 @@ malangdo,190,167,7 script Portali#mal 546,{ mes "Where are you going without canned food...?"; close; } - switch(select("Rune-Midgarts:Schwaltzvalt Republic:Arunafeltz Kingdom")) { + switch(select("Rune-Midgarts:Schwarzwald Republic:Arunafeltz Kingdom")) { case 1: - switch(select("Prontera:Morroc:Alberta:Al De Baran:Payon:Geffen")) { + switch(select("Prontera:Morocc:Alberta:Al De Baran:Payon:Geffen")) { case 1: callsub L_Warp,"Prontera",4,"prontera",155,111; - case 2: callsub L_Warp,"Morroc",4,"morocc",159,255; + case 2: callsub L_Warp,"Morocc",4,"morocc",159,255; case 3: callsub L_Warp,"Alberta",4,"alberta",95,66; case 4: callsub L_Warp,"Al De Baran",4,"aldebaran",126,120; case 5: callsub L_Warp,"Payon",4,"payon",198,135; case 6: callsub L_Warp,"Geffen",4,"geffen",120,100; } case 2: - switch(select("Einbroch:Lighthalzen:Yuno:Hugel")) { + switch(select("Einbroch:Lighthalzen:Juno:Hugel")) { case 1: callsub L_Warp,"Einbroch",6,"einbroch",229,196; case 2: callsub L_Warp,"Lighthalzen",6,"lighthalzen",214,150; - case 3: callsub L_Warp,"Yuno",6,"yuno",157,220; + case 3: callsub L_Warp,"Juno",6,"yuno",157,220; case 4: callsub L_Warp,"Hugel",6,"hugel",95,121; } case 3: @@ -2733,8 +2733,8 @@ malangdo,190,167,7 script Portali#mal 546,{ case 3: mes "[Portali]"; mes "3 for Rune-Midgarts!"; - mes "6 for Schwaltzvalt, 5 for Arunafeltz."; - mes "Schwaltzvalt is the nation of prohibited magic, and Arunafeltz seems to have a curse!"; + mes "6 for Schwarzwald, 5 for Arunafeltz."; + mes "Schwarzwald is the nation of prohibited magic, and Arunafeltz seems to have a curse!"; close; } end; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index dc268c1405..25a0ca63d9 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -8945,7 +8945,7 @@ OnDisable: ma_fild01,211,200,6 script Tourist#pin02 775,{ mes "[Tourist]"; - mes "I heard of the 'Pintados Festival' and came all the way from Gonryun."; + mes "I heard of the 'Pintados Festival' and came all the way from Kunlun."; next; mes "[Tourist]"; mes "Just in case you might think otherwise, this is a mask on my face and not a tattoo."; @@ -9017,7 +9017,7 @@ ma_fild01,162,235,6 script Tourist#pin05 815,{ mes "They say the Pintados Festival will only be held for one week."; next; mes "[Tourist]"; - mes "I came from Louyang without knowing about the festival. Must be my lucky day."; + mes "I came from Luoyang without knowing about the festival. Must be my lucky day."; close; OnInit: if (!$malaya_pintados_00) diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index 1b6dbf50f8..6ee19e4b8a 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Quest NPCs +//= Morocc Quest NPCs //===== By: ================================================== //= Euphy //===== Current Version: ===================================== @@ -8,11 +8,11 @@ //= rAthena Project //===== Description: ========================================= //= [Official Conversion] -//= Quest NPCs related to Morroc. +//= Quest NPCs related to Morocc. //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.0a Gathered remaining dialogues. [Euphy] -//= 1.1 Added new warpers for Satan Morroc maps. [Euphy] +//= 1.1 Added new warpers for Satan Morocc maps. [Euphy] //============================================================ // Stop Post Quest @@ -23,7 +23,7 @@ morocc,152,167,4 duplicate(William) William#moc 89 // ============================================================ morocc,169,168,4 duplicate(Alchemist) Alchemist#moc 64 -// Resurrection of Satan Morroc +// Resurrection of Satan Morocc // ============================================================ - script Continental Guard#man -1,{ mes "[Continental Guard]"; diff --git a/npc/re/quests/quests_rockridge.txt b/npc/re/quests/quests_rockridge.txt index 62db5d642b..fd021b3cd0 100644 --- a/npc/re/quests/quests_rockridge.txt +++ b/npc/re/quests/quests_rockridge.txt @@ -5036,7 +5036,7 @@ rockrdg1,330,104,3 script Curt Snake#rockc05 10218,{ rockrdg1,299,82,3 script Tagliatelle#rockc07 4_DR_M_02,{ mes "[Tagliatelle]"; - mes "I love traveling. I had fun traveling in Pa-sta, and I'm determined to spend the rest of my life traveling in Rune Midgarts and other cities and villages that I can reach from the kingdom."; + mes "I love traveling. I had fun traveling in Pa-sta, and I'm determined to spend the rest of my life traveling in Rune-Midgarts and other cities and villages that I can reach from the kingdom."; next; mes "[Tagliatelle]"; mes "I like being in new places and talking to the residents. I can learn many things from the way they live."; diff --git a/npc/re/warps/dungeons/moc_pryd.txt b/npc/re/warps/dungeons/moc_pryd.txt index c8100960b3..bc2110cefe 100644 --- a/npc/re/warps/dungeons/moc_pryd.txt +++ b/npc/re/warps/dungeons/moc_pryd.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Pyramid Nightmare Warp Script +//= Morocc Pyramid Nightmare Warp Script //===== By: ================================================== //= Euphy //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Warp Points for Morroc Pyramid Nightmare Mode +//= Warp Points for Morocc Pyramid Nightmare Mode //===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt index d874e9d75e..a79f2246e8 100644 --- a/npc/re/warps/fields/morroc_fild.txt +++ b/npc/re/warps/fields/morroc_fild.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Field Warp Script +//= Morocc Field Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Warp Points for Morroc Fields +//= Warp Points for Morocc Fields //===== Additional Comments: ================================= //= 1.1 changed 'anthell' to @anthell [Lupus] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] @@ -115,6 +115,6 @@ moc_fild19,169,107,0 warp mocf004 1,4,morocc,27,164 moc_fild19,71,170,0 warp mocf018 8,2,moc_ruins,71,19 moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9 -// Satan Morroc Addition +// Satan Morocc Addition moc_fild21,26,196,0 warp mocf020 1,1,moc_fild20,349,179 moc_fild22,32,196,0 warp mocf021 1,1,moc_fild20,349,179 diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt index fc77e25d53..19b80bfa2c 100644 --- a/npc/re/warps/fields/yuno_fild.txt +++ b/npc/re/warps/fields/yuno_fild.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Field Warp Script +//= Juno Field Warp Script //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== @@ -7,14 +7,14 @@ //===== Compatible With: ===================================== //= rAthena Project; RO Episode 5+ //===== Description: ========================================= -//= Warp Points for Yuno Field +//= Warp Points for Juno Field //===== Additional Comments: ================================= -//= 1.1 - Updated for the new Yuno Fields +//= 1.1 - Updated for the new Juno Fields //= 1.2 New field update - Hugel Field by Sara - Version 1 //= 1.3 Renewal warp adjustments. //============================================================ -//= Yuno Field =============================================== +//= Juno Field =============================================== //yuno_fild01,286,368,0 warp yunfild01 1,1,yuno_fild02,294,26 //yuno_fild02,294,24,0 warp yunfild01-1 1,1,yuno_fild01,286,366 //yuno_fild01,70,378,0 warp yunfild02 1,1,yuno_fild02,70,25 @@ -29,7 +29,7 @@ yuno_fild04,375,150,0 warp yunfild05-1 1,1,yuno_fild03,22,155 yuno_fild04,231,288,0 warp yunfild-yun 1,1,yuno,158,17 yuno_fild03,32,139,0 warp yunfild-mag01 1,1,mag_dun01,126,68 -//= New Yuno Fields ========================================== +//= New Juno Fields ========================================== yuno_fild01,26,246,0 warp newjun01 1,1,yuno_fild12,373,239 yuno_fild12,375,239,0 warp newjun01a 1,1,yuno_fild01,28,246 yuno_fild12,23,338,0 warp newjun02 1,1,yuno_fild11,366,361 @@ -62,7 +62,7 @@ yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384 //yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 -//= Al de Baran <-> Yuno Connection ========================== +//= Al de Baran <-> Juno Connection ========================== aldebaran,140,244,0 warp alde-yunfild 1,1,yuno_fild01,208,19 yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242 diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf index 37c1e0f6fb..de878448a4 100644 --- a/npc/scripts_guild.conf +++ b/npc/scripts_guild.conf @@ -47,7 +47,7 @@ npc: npc/guild2/arug_cas02.txt npc: npc/guild2/arug_cas03.txt npc: npc/guild2/arug_cas04.txt npc: npc/guild2/arug_cas05.txt -// - Schwaltzvalt +// - Schwarzwald npc: npc/guild2/schg_cas01.txt npc: npc/guild2/schg_cas02.txt npc: npc/guild2/schg_cas03.txt diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt index 1cde1c3b9f..1124faa9a5 100644 --- a/npc/warps/cities/louyang.txt +++ b/npc/warps/cities/louyang.txt @@ -8,7 +8,7 @@ //= rAthena Project; RO Episode 6.0+ //===== Description: ========================================= //= [Official Conversion] -//= Warp Points for Louyang +//= Warp Points for Luoyang //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //============================================================ diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt index d27c3e2745..beed22878a 100644 --- a/npc/warps/cities/mid_camp.txt +++ b/npc/warps/cities/mid_camp.txt @@ -15,7 +15,7 @@ //= 1.1 Fixed a small bug by brianlew, bugreport:1824 [Brainstorm] //= 1.2 Corrected the observatory warp portal, thanks to Ziu. [brianluau] //= 1.3 Added warps, and also Updated warp positions. [L0ne_W0lf] -//= 1.4 Removed the warp from midgard camp to morroc field. [L0ne_W0lf] +//= 1.4 Removed the warp from midgard camp to Morocc field. [L0ne_W0lf] //= 1.5 Remove a warp. [Joseph] //============================================================ diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt index 3c79c2749f..b8d35dedb8 100644 --- a/npc/warps/cities/morroc.txt +++ b/npc/warps/cities/morroc.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Warp Script +//= Morocc Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.2) @@ -8,12 +8,12 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Warp Points for Morroc and Assassin Guild +//= Warp Points for Morocc and Assassin Guild //===== Additional Comments: ================================= //= 1.3 Updated warps for episode 12.1 [L0ne_W0lf] //============================================================ -//= Morroc City ============================================== +//= Morocc City ============================================== morocc,160,17,0 warp moc001 2,2,moc_fild12,159,378 //morocc,160,183,0 warp moc002 2,1,moc_castle,94,181 morocc,160,297,0 warp moc003 2,2,moc_fild07,198,25 @@ -68,14 +68,14 @@ morocc_in,86,117,0 warp moc23-1 3,1,morocc_in,86,98 morocc_in,93,123,0 warp moc11 1,3,morocc_in,109,123 morocc_in,93,95,0 warp moc10 1,3,morocc_in,109,95 -//= Morroc Ruins ============================================ +//= Morocc Ruins ============================================ moc_ruins,159,39,0 warp moc02-2 2,4,morocc,30,290 //moc_ruins,161,40,0 warp moc02-2 2,4,morocc,26,293 //moc_ruins,157,37,0 warp moc02-3 5,2,morocc,26,293 moc_ruins,54,161,0 warp moc006 2,3,moc_pryd01,192,9 moc_ruins,71,16,0 warp moc007 8,2,moc_fild19,71,167 -//= Morroc Castle =========================================== +//= Morocc Castle =========================================== //moc_castle,94,183,0 warp mocc001 2,1,morocc,160,185 //moc_castle,107,163,0 warp mocc01 2,3,moc_castle,124,163 //moc_castle,120,163,0 warp mocc01-1 2,3,moc_castle,103,163 diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index e6fa7d5968..dbc0422bd3 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Warp Script +//= Juno Warp Script //===== By: ================================================== //= Nana (1.0) //= Sara-chan (1.1) @@ -8,22 +8,22 @@ //===== Compatible With: ===================================== //= rAthena Project; RO Episode 5+ //===== Description: ========================================= -//= Warp Points for Yuno +//= Warp Points for Juno //===== Additional Comments: ================================= -//= 1.1 - Added Yuno Airport warps +//= 1.1 - Added Juno Airport warps //= 1.2 Moved all airports to Airplane Warps [Lupus] //= 1.3 Dr.Evil's yuno_05 warps update [Lupus] //= 1.4 optimized [Lupus] //= 1.5 Added Missing Juno warps [musashiden] //= 1.6 Corrected duplicate warps [Musashiden] //= 1.7 Yet another missing warp [Musashiden] -//= 1.8 Added Yuno Government Buildings warps -//= 1.9 Updated Yuno Government Buildings warps according -//= to Schwartzvalt Trilogy quest. [SinSloth] +//= 1.8 Added Juno Government Buildings warps +//= 1.9 Updated Juno Government Buildings warps according +//= to Schwarzwald Trilogy quest. [SinSloth] //= 2.0 Correct position of portals [JohnnyPlayy] //============================================================ -//= Yuno City ================================================ +//= Juno City ================================================ yuno,158,15,0 warp yun-yunfild 1,1,yuno_fild04,231,284 yuno,117,135,0 warp yun01 1,1,yuno_in01,116,37 yuno_in01,116,40,0 warp yun02 1,1,yuno,120,138 @@ -90,7 +90,7 @@ yuno_in05,196,194,0 warp yun62 1,1,yuno_in02,85,14 yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88 yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144 -// Yuno In05 (Entering Random Warps) ------------------------------------------- +// Juno In05 (Entering Random Warps) ------------------------------------------- yuno_in05,153,141,0 script #yun63 45,1,1,{ if (rand(2)) warp "yuno_in05",192,102; @@ -98,7 +98,7 @@ yuno_in05,153,141,0 script #yun63 45,1,1,{ warp "yuno_in05",145,82; end; } -// Yuno In05 (Random Warps - Cross Shaped) ------------------------------------- +// Juno In05 (Random Warps - Cross Shaped) ------------------------------------- yuno_in05,196,102,0 script #yun64 45,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",169,102; end; @@ -127,7 +127,7 @@ yuno_in05,181,91,0 script #yun67 45,1,1,{ warp "yuno_in05",176,48; end; } -// Yuno In05 (Random Warps - T-Shaped) ----------------------------------------- +// Juno In05 (Random Warps - T-Shaped) ----------------------------------------- yuno_in05,148,82,0 script #yun68 45,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",169,102; end; @@ -149,7 +149,7 @@ yuno_in05,136,71,0 script #yun70 45,1,1,{ case 2: warp "yuno_in05",176,48; end; } } -// Yuno In05 (Random Warps - Other) -------------------------------------------- +// Juno In05 (Random Warps - Other) -------------------------------------------- yuno_in05,16,188,0 script #yun71 45,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; @@ -171,7 +171,7 @@ yuno_in05,176,52,0 script #yun73 45,1,1,{ case 2: warp "yuno_in05",136,75; end; } } -// Yuno In05 (Destination - Room) ---------------------------------------------- +// Juno In05 (Destination - Room) ---------------------------------------------- yuno_in05,40,178,0 script #yun74 45,1,1,{ switch(rand(3)) { case 0: warp "yuno_in05",181,94; end; @@ -186,11 +186,11 @@ yuno_in05,47,186,0 script #yun75 45,1,1,{ case 2: warp "yuno_in05",136,75; end; } } -// Yuno In05 (Destination - Escaped Random Warps) ------------------------------ +// Juno In05 (Destination - Escaped Random Warps) ------------------------------ yuno_in05,31,167,0 warp yun76 1,1,yuno_in05,50,85 yuno_in05,50,88,0 warp yun77 1,1,yuno_in02,85,14 -// Yuno Government Buildings --------------------------------------------------- +// Juno Government Buildings --------------------------------------------------- yuno_pre,52,22,0 warp yungvn01 1,1,yuno_pre,37,23 yuno_pre,87,22,0 warp yungvn02 1,1,yuno_pre,102,22 yuno_pre,41,23,0 warp yungvn03 1,1,yuno_pre,56,22 diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt index b6f133678b..e59d51f3d4 100644 --- a/npc/warps/dungeons/in_sphinx.txt +++ b/npc/warps/dungeons/in_sphinx.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Sphinx Warp Script +//= Morocc Sphinx Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -12,7 +12,7 @@ //= 1.0 Split from combined warp file morroc_duns. [L0ne_W0lf] //============================================================ -//= Morroc Sphinx ============================================ +//= Morocc Sphinx ============================================ in_sphinx1,288,6,0 warp sphx001 5,1,moc_fild19,100,99 in_sphinx1,80,191,0 warp sphx01 2,1,in_sphinx2,149,81 in_sphinx2,149,77,0 warp sphx01-1 3,2,in_sphinx1,80,189 diff --git a/npc/warps/dungeons/lou_dun.txt b/npc/warps/dungeons/lou_dun.txt index 718dd9562a..598df8280e 100644 --- a/npc/warps/dungeons/lou_dun.txt +++ b/npc/warps/dungeons/lou_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Louyang Dungeon Warp Script +//= Luoyang Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -8,7 +8,7 @@ //= rAthena Project; RO Episode 6.0+ //===== Description: ========================================= //= [Official Conversion] -//= Warp Points for Louyang +//= Warp Points for Luoyang //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //============================================================ diff --git a/npc/warps/dungeons/mag_dun.txt b/npc/warps/dungeons/mag_dun.txt index b46229d892..8752269d74 100644 --- a/npc/warps/dungeons/mag_dun.txt +++ b/npc/warps/dungeons/mag_dun.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Yuno Dungeon Warp Script +//= Juno Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena Project; RO Episode 5+ //===== Description: ========================================= -//= Warp Points for Yuno Dungeon +//= Warp Points for Juno Dungeon //===== Additional Comments: ================================= //= No Comment! //============================================================ diff --git a/npc/warps/dungeons/moc_pryd.txt b/npc/warps/dungeons/moc_pryd.txt index a8ad658709..b475f35d99 100644 --- a/npc/warps/dungeons/moc_pryd.txt +++ b/npc/warps/dungeons/moc_pryd.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -//= Morroc Pyramid Warp Script +//= Morocc Pyramid Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== @@ -7,12 +7,12 @@ //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= -//= Warp Points for Morroc Pyramid +//= Warp Points for Morocc Pyramid //===== Additional Comments: ================================= //= 1.1 Moved Sphinx warps to unique file. [L0ne_W0lf] //============================================================ -//= Morroc Pyramid =========================================== +//= Morocc Pyramid =========================================== moc_pryd01,10,195,0 warp mocp01 5,2,moc_pryd02,10,192 moc_pryd01,195,9,0 warp mocp001 2,5,moc_ruins,60,161 moc_pryd01,90,109,0 warp mocp02 1,2,moc_prydb1,100,185 diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt index 1f837d24af..73455406bf 100644 --- a/npc/warps/guildcastles.txt +++ b/npc/warps/guildcastles.txt @@ -21,8 +21,8 @@ //= castle 1, 4 and 5 entrances are questionable, and will be updated //= as I get more information. //= 2.4b Corrected Warp points for Juno castles 1, 4 and 5. [L0ne_W0lf] -//= 2.5 Updated Schwaltzvalt warps and added Arunafeltz. [L0ne_W0lf] -//= 2.6 Fixed warp position between Juno and Schwaltzvalt Realm. [Gepard] +//= 2.5 Updated Schwarzwald warps and added Arunafeltz. [L0ne_W0lf] +//= 2.6 Fixed warp position between Juno and Schwarzwald Realm. [Gepard] //= 2.7 Updated WoE:FE warps. [Masao] //= 2.8 Prontera castle map changed in ep16.1 [Capuche] //============================================================ @@ -399,11 +399,11 @@ aldeg_cas05,156,231,0 warp aldeg-5-15_aldeg-5-16 1,1,aldeg_cas05,18,88 aldeg_cas05,14,88,0 warp aldeg-5-16_aldeg-5-15 1,1,aldeg_cas05,156,227 // Episode 12: WoE:SE -// Schwaltzvalt Guild Castles Map Connection +// Schwarzwald Guild Castles Map Connection yuno,13,126,0 warp schg001 1,1,sch_gld,351,89 sch_gld,354,89,0 warp schg002 1,1,yuno,16,126 -// Schwaltzvalt Castle Maps +// Schwarzwald Castle Maps schg_cas01,119,4,0 warp schg101 1,1,sch_gld,293,100 sch_gld,293,90,0 warp schg102 1,1,schg_cas01,119,8 schg_cas01,275,240,0 warp schg103 1,1,schg_cas01,120,7