Преглед на файлове

Fixed place names and other typos (#4475)

* Fixed common misspelled names from iRO and other typos.
Daegaladh преди 5 години
родител
ревизия
354c632732
променени са 100 файла, в които са добавени 921 реда и са изтрити 928 реда
  1. 1 1
      db/mob_chat_db.txt
  2. 6 6
      db/pre-re/achievement_db.yml
  3. 9 9
      db/pre-re/item_db.txt
  4. 5 5
      db/pre-re/item_trade.txt
  5. 4 4
      db/pre-re/mob_branch.txt
  6. 12 12
      db/pre-re/mob_db.txt
  7. 186 186
      db/pre-re/mob_skill_db.txt
  8. 1 1
      db/pre-re/produce_db.txt
  9. 8 8
      db/pre-re/quest_db.txt
  10. 6 6
      db/re/achievement_db.yml
  11. 14 14
      db/re/item_db.txt
  12. 4 4
      db/re/item_trade.txt
  13. 4 4
      db/re/mob_branch.txt
  14. 25 25
      db/re/mob_db.txt
  15. 239 239
      db/re/mob_skill_db.txt
  16. 1 1
      db/re/produce_db.txt
  17. 11 11
      db/re/quest_db.txt
  18. 1 1
      npc/airports/airships.txt
  19. 1 1
      npc/airports/einbroch.txt
  20. 3 3
      npc/airports/yuno.txt
  21. 5 5
      npc/cities/aldebaran.txt
  22. 3 3
      npc/cities/amatsu.txt
  23. 16 23
      npc/cities/ayothaya.txt
  24. 1 1
      npc/cities/comodo.txt
  25. 1 1
      npc/cities/einbech.txt
  26. 8 8
      npc/cities/geffen.txt
  27. 2 2
      npc/cities/gonryun.txt
  28. 1 1
      npc/cities/hugel.txt
  29. 1 1
      npc/cities/izlude.txt
  30. 2 2
      npc/cities/jawaii.txt
  31. 7 7
      npc/cities/lighthalzen.txt
  32. 15 15
      npc/cities/louyang.txt
  33. 66 66
      npc/cities/morocc.txt
  34. 2 2
      npc/cities/moscovia.txt
  35. 2 2
      npc/cities/payon.txt
  36. 2 2
      npc/cities/prontera.txt
  37. 1 1
      npc/cities/rachel.txt
  38. 8 8
      npc/cities/umbala.txt
  39. 1 1
      npc/cities/yuno.txt
  40. 3 3
      npc/custom/etc/airplane.txt
  41. 1 1
      npc/custom/etc/floating_rates.txt
  42. 5 5
      npc/custom/etc/morroc_raceway.txt
  43. 1 1
      npc/custom/etc/mvp_room.txt
  44. 22 22
      npc/custom/etc/quest_warper.txt
  45. 1 1
      npc/custom/events/holiday/valentinesdayexp.txt
  46. 4 4
      npc/custom/official/GeffenMagicTournament.txt
  47. 1 1
      npc/custom/quests/kahohorn.txt
  48. 2 2
      npc/custom/quests/sunglasses.txt
  49. 5 5
      npc/custom/quests/thq/THQS_QuestNPC.txt
  50. 1 1
      npc/custom/quests/thq/THQS_Quests.txt
  51. 1 1
      npc/custom/quests/umbalian_language.txt
  52. 18 18
      npc/custom/warper.txt
  53. 1 1
      npc/custom/woe_controller.txt
  54. 1 1
      npc/events/RWC_2011.txt
  55. 1 1
      npc/events/easter_2008.txt
  56. 1 1
      npc/events/event_skill_reset.txt
  57. 2 2
      npc/events/gdevent_sch.txt
  58. 1 1
      npc/events/god_se_festival.txt
  59. 1 1
      npc/events/halloween_2013.txt
  60. 4 4
      npc/events/nguild/nguild_flags.txt
  61. 1 1
      npc/events/valentinesday.txt
  62. 1 1
      npc/guild2/agit_main_se.txt
  63. 8 8
      npc/instances/EndlessTower.txt
  64. 5 5
      npc/instances/NydhoggsNest.txt
  65. 1 1
      npc/instances/OrcsMemory.txt
  66. 1 1
      npc/jobs/2-1/assassin.txt
  67. 14 14
      npc/jobs/2-1/blacksmith.txt
  68. 1 1
      npc/jobs/2-1/hunter.txt
  69. 4 4
      npc/jobs/2-1/knight.txt
  70. 5 5
      npc/jobs/2-1/priest.txt
  71. 1 1
      npc/jobs/2-1/wizard.txt
  72. 1 1
      npc/jobs/2-1a/HighWizard.txt
  73. 1 1
      npc/jobs/2-1a/WhiteSmith.txt
  74. 1 1
      npc/jobs/2-2/dancer.txt
  75. 6 6
      npc/jobs/2-2/rogue.txt
  76. 10 10
      npc/jobs/2-2/sage.txt
  77. 1 1
      npc/jobs/2-2a/Champion.txt
  78. 1 1
      npc/jobs/2-2a/Clown.txt
  79. 1 1
      npc/jobs/2-2a/Creator.txt
  80. 1 1
      npc/jobs/2-2a/Gypsy.txt
  81. 2 2
      npc/jobs/2-2a/Professor.txt
  82. 3 3
      npc/jobs/2-2e/SoulLinker.txt
  83. 1 1
      npc/jobs/novice/supernovice.txt
  84. 1 1
      npc/jobs/valkyrie.txt
  85. 2 2
      npc/kafras/dts_warper.txt
  86. 12 12
      npc/kafras/functions_kafras.txt
  87. 15 15
      npc/kafras/kafras.txt
  88. 2 2
      npc/mapflag/nomemo.txt
  89. 1 1
      npc/merchants/clothes_dyer.txt
  90. 2 2
      npc/merchants/icecream.txt
  91. 4 4
      npc/merchants/inn.txt
  92. 1 1
      npc/merchants/novice_exchange.txt
  93. 2 2
      npc/merchants/refine.txt
  94. 12 12
      npc/merchants/shops.txt
  95. 1 1
      npc/mobs/towns.txt
  96. 10 10
      npc/other/CashShop_Functions.txt
  97. 2 2
      npc/other/acolyte_warp.txt
  98. 1 1
      npc/other/auction.txt
  99. 2 2
      npc/other/books.txt
  100. 18 18
      npc/other/bulletin_boards.txt

+ 1 - 1
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!

+ 6 - 6
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

+ 9 - 9
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,,,,,,{},{},{}

+ 5 - 5
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

+ 4 - 4
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

+ 12 - 12
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

+ 186 - 186
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,,,,,,,

+ 1 - 1
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

+ 8 - 8
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"

+ 6 - 6
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

+ 14 - 14
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,{},{},{}

+ 4 - 4
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

+ 4 - 4
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

+ 25 - 25
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

+ 239 - 239
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,,,,
 

+ 1 - 1
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

+ 11 - 11
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"

+ 1 - 1
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;
 }
 

+ 1 - 1
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";

+ 3 - 3
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";

+ 5 - 5
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.";

+ 3 - 3
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]";

+ 16 - 23
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.";

+ 1 - 1
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]";

+ 1 - 1
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;
 }
 

+ 8 - 8
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:

+ 2 - 2
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]";

+ 1 - 1
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;

+ 1 - 1
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.";

+ 2 - 2
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";

+ 7 - 7
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;

+ 15 - 15
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]

+ 66 - 66
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]";

+ 2 - 2
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]";

+ 2 - 2
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~";

+ 2 - 2
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...";

+ 1 - 1
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";

+ 8 - 8
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]";

+ 1 - 1
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;

+ 3 - 3
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"; 

+ 1 - 1
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;
 }

+ 5 - 5
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!";

+ 1 - 1
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],

+ 22 - 22
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; }

+ 1 - 1
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!";

+ 4 - 4
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;

+ 1 - 1
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;
 }

+ 2 - 2
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;
 }

+ 5 - 5
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_

+ 1 - 1
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]";

+ 1 - 1
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;

+ 18 - 18
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.
 }

+ 1 - 1
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;

+ 1 - 1
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!";

+ 1 - 1
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]";

+ 1 - 1
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: ===================================== 

+ 2 - 2
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

+ 1 - 1
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]";

+ 1 - 1
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.";

+ 4 - 4
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 " ";

+ 1 - 1
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!";

+ 1 - 1
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 ]";

+ 8 - 8
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) 

+ 5 - 5
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;

+ 1 - 1
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;

+ 1 - 1
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...";

+ 14 - 14
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.";

+ 1 - 1
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;

+ 4 - 4
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.";

+ 5 - 5
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...";

+ 1 - 1
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?";

+ 1 - 1
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;

+ 1 - 1
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]";

+ 1 - 1
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,";

+ 6 - 6
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.";

+ 10 - 10
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.";

+ 1 - 1
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";

+ 1 - 1
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) {

+ 1 - 1
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";

+ 1 - 1
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";

+ 2 - 2
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) {

+ 3 - 3
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;

+ 1 - 1
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";

+ 1 - 1
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;

+ 2 - 2
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:

+ 12 - 12
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;
 	}
 

+ 15 - 15
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;

+ 2 - 2
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

+ 1 - 1
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.";

+ 2 - 2
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

+ 4 - 4
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;
 }
 */

+ 1 - 1
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!";

+ 2 - 2
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]
 //============================================================

+ 12 - 12
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]

+ 1 - 1
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

+ 10 - 10
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;

+ 2 - 2
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$);

+ 1 - 1
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]
 //============================================================

+ 2 - 2
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";

+ 18 - 18
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;

Някои файлове не бяха показани, защото твърде много файлове са промени