Some fixes regarding Sentences, and Alignment

Also, Fixed Bug#7504 -
http://hercules.ws/board/tracker/issue-7504-missing-monsters/?gopid=1929
1#entry19291
~Merged from rAthena

10 files changed, 202 insertions, 123 deletions

diff --git a/db/abra_db.txt b/db/abra_db.txt
index 41c1b6eae..2eb770abd 100644
--- a/db/abra_db.txt
+++ b/db/abra_db.txt
@@ -1,16 +1,17 @@
 // Hocus-Pocus (Abrakadabra) Castable Skills Database
 //
 // Structure of Database:
-// SkillID,DummyName,RequiredHocusPocusLevel,Rate
+//        SkillID,DummyName,RequiredHocusPocusLevel,Rate
 //
 // 01. SkillID                  Skill ID to be casted by hocus pocus.
 // 02. DummyName                Name of the skill (informative, not used by server).
 // 03. RequiredHocusPocusLevel  Minimum skill level of hocus pocus for the current skill to be selected.
-// 04. Rate                     Chance at which the skill is selected (1 = 0.01%, 10000 = 100%).
+// 04. Rate                     Chance at which a skill is selected (1 = 0.01%, 10000 = 100%).
 //
 // NOTE: The skill is picked at random from the entire database and then tested for rate. If it
-//       does not succeed at that rate, an another skill is picked and tested. This continues
+//       does not succeed at that rate, another skill is picked and tested. This continues
 //       until a skill succeeds.
+//====================================================
 
 //1,Basic Skill,1,0
 
diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
index 381d898e0..05bf5b270 100644
--- a/db/cashshop_db.conf
+++ b/db/cashshop_db.conf
@@ -7,8 +7,14 @@
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
 //=            http://hercules.ws/board/                        
-//====================================================
+//================= More Information =================
 //= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+//====================================================
+// This file handles the entire Cashshop. You can simply
+// add in any amount of items you like within each category.
+// Please keep in mind that the Cashshop does not work
+// with ragexere clients.
+//====================================================
 
 cash_shop: (
 {
diff --git a/db/elemental_skill_db.txt b/db/elemental_skill_db.txt
index a0852e5f3..aa0a428ef 100644
--- a/db/elemental_skill_db.txt
+++ b/db/elemental_skill_db.txt
@@ -1,55 +1,91 @@
 // Elemental Summons Skill Database
 //
 // Structure of Database:
-// ElementalID,SkillID,SkillLevel,ReqMode
+//        ElementalID,SkillID,SkillLevel,ReqMode
 //
 // Spirit Modes: 1 = Passive, 2 = Defensive, 4 = Aggressive
+//====================================================
 
+//================
 // EL_AGNI_S
+//================
 2114,8413,1,1	//EL_PYROTECHNIC,Pyrotechnic
 2114,8401,1,2	//EL_CIRCLE_OF_FIRE,Circle of Fire
 2114,8425,1,4	//EL_FIRE_ARROW,Fire Arrow
+
+//================
 // EL_AGNI_M
+//================
 2115,8414,1,1	//EL_HEATER,Heater
 2115,8402,1,2	//EL_FIRE_CLOAK,Fire Cloak
 2115,8426,1,4	//EL_FIRE_BOMB,Fire Bomb
+
+//================
 // EL_AGNI_L
+//================
 2116,8415,1,1	//EL_TROPIC,Tropic
 2116,8403,1,2	//EL_FIRE_MANTLE,Fire Mantle
 2116,8428,1,4	//EL_FIRE_WAVE,Fire Wave
+
+//================
 // EL_AQUA_S
+//================
 2117,8416,1,1	//EL_AQUAPLAY,Aqua Play
 2117,8404,1,2	//EL_WATER_SCREEN,Water Screen
 2117,8430,1,4	//EL_ICE_NEEDLE,Ice Needle
+
+//================
 // EL_AQUA_M
+//================
 2118,8417,1,1	//EL_COOLER,Cooler
 2118,8405,1,2	//EL_WATER_DROP,Water Drop
 2118,8431,1,4	//EL_WATER_SCREW,Water Screw
+
+//================
 // EL_AQUA_L
+//================
 2119,8418,1,1	//EL_CHILLY_AIR,Cool Air
 2119,8406,1,2	//EL_WATER_BARRIER,Water Barrier
 2119,8433,1,4	//EL_TIDAL_WEAPON,Tidal Weapon
+
+//================
 // EL_VENTUS_S
+//================
 2120,8419,1,1	//EL_GUST,Gust
 2120,8407,1,2	//EL_WIND_STEP,Wind Step
 2120,8434,1,4	//EL_WIND_SLASH,Wind Slasher
+
+//================
 // EL_VENTUS_M
+//================
 2121,8420,1,1	//EL_BLAST,Blast
 2121,8408,1,2	//EL_WIND_CURTAIN,Wind Curtain
 2121,8435,1,4	//EL_HURRICANE,Hurricane Rage
+
+//================
 // EL_VENTUS_L
+//================
 2122,8421,1,1	//EL_WILD_STORM,Wild Storm
 2122,8409,1,2	//EL_ZEPHYR,Zephyr
 2122,8437,1,4	//EL_TYPOON_MIS,Typhoon Missile
+
+//================
 // EL_TERA_S
+//================
 2123,8422,1,1	//EL_PETROLOGY,Petrology
 2123,8410,1,2	//EL_SOLID_SKIN,Solid Skin
 2123,8439,1,4	//EL_STONE_HAMMER,Stone Hammer
+
+//================
 // EL_TERA_M
+//================
 2124,8423,1,1	//EL_CURSED_SOIL,Cursed Soil
 2124,8411,1,2	//EL_STONE_SHIELD,Stone Shield
 2124,8440,1,4	//EL_ROCK_CRUSHER,Rock Launcher
+
+//================
 // EL_TERA_L
+//================
 2125,8424,1,1	//EL_UPHEAVAL,Upheaval
 2125,8412,1,2	//EL_POWER_OF_GAIA,Power of Gaia
 2125,8442,1,4	//EL_STONE_RAIN,Stone Rain
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 96dbd0c7a..f51fd8fc6 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -9,17 +9,22 @@
 //=            http://hercules.ws/board/                        
 //====================================================
 //= Hercules Map Zone Database [Ind/Hercules]
-//==
+//================ More Information ==================
+//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+//================ Description =======================
 //= A unlimited number of zones may be created, a zone
 //= may be used to create a set of disabled items, disabled skills
-//= and mapflags to be used by as many maps as one chooses,
-//= maps can be linked to a specific zone through the zone mapflag
-//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
-//== available types for 'disabled_skills':
+//= and mapflags to be used by as many maps as one chooses.
+//= Maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'.
+//====================================================
+//= Available types for 'disabled_skills':
 //= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
-//== More on
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
-//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+
+
 zones: (
 {
 	/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index a6eb10626..45aea7a20 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -8,7 +8,7 @@
 //=                                                  
 //=            http://hercules.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
 //================ Structure Example =================
 /*
 Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) 
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 96dbd0c7a..f51fd8fc6 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -9,17 +9,22 @@
 //=            http://hercules.ws/board/                        
 //====================================================
 //= Hercules Map Zone Database [Ind/Hercules]
-//==
+//================ More Information ==================
+//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+//================ Description =======================
 //= A unlimited number of zones may be created, a zone
 //= may be used to create a set of disabled items, disabled skills
-//= and mapflags to be used by as many maps as one chooses,
-//= maps can be linked to a specific zone through the zone mapflag
-//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
-//== available types for 'disabled_skills':
+//= and mapflags to be used by as many maps as one chooses.
+//= Maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'.
+//====================================================
+//= Available types for 'disabled_skills':
 //= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
-//== More on
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
-//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
+//====================================================
+
+
 zones: (
 {
 	/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 3cd90f201..28908c0e7 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -8,7 +8,7 @@
 //=                                                  
 //=            http://hercules.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
 //================ Structure Example =================
 /*
 Job_Name: { //Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) 
diff --git a/db/skill_changematerial_db.txt b/db/skill_changematerial_db.txt
index 35b123f66..72b2b1e17 100644
--- a/db/skill_changematerial_db.txt
+++ b/db/skill_changematerial_db.txt
@@ -1,85 +1,87 @@
 // Change Material Database
 //
 // Structure of Database:
-// ProductID,BaseRate,MakeAmount1,MakeAmountRate1...,MakeAmount5,MakeAmountRate5
-//
+//        ProductID,BaseRate,MakeAmount1,MakeAmountRate1,MakeAmount2,MakeAmountRate2
+//        MakeAmount3,MakeAmountRate3,MakeAmount4,MakeAmountRate4,MakeAmount5,MakeAmountRate5
+//====================================================
 // NOTE: 
 // Up to 5 ID/Amount pairs can be specified.
 // Rate = n/10%
+//====================================================
 
-703,4,800,2,200		// Hinalle 
-958,800,9,1000		// Horrendous_Mouth
-959,800,7,1000		// Rotten_Scale
-960,1000,6,800,9,200	// Nipper 
-961,800,3,1000		// Conch
-962,1000,4,800,6,200	// Tentacle 
-963,800,3,1000		// Sharp_Scale
-964,800,8,1000		// Crap_Shell
-967,800,4,1000		// Turtle_Shell
-968,800,5,1000		// Voucher_Of_Orcish_Hero
-970,800,9,1000		// Alchol
-971,800,5,1000		// Detrimindexta
-973,800,4,1000		// Counteragent
-974,1000,4,800,6,200	// Mixture 
-991,1000,1,500,1,500	// Crystal_Blue 
-992,1000,1,500,1,500	// Wind_Of_Verdure 
-999,1000,10,1000	// Steel
-1003,500,1,1000		// Coal
-1008,800,6,1000		// Frozen_Heart
-1009,800,4,1000		// Sacred_Marks
-1010,800,8,1000		// Phracon
-1011,800,4,1000		// Emveretarcon
-1012,800,3,1000		// Lizard_Scruff
-1013,9,800,13,200	// Colorful_Shell
-1014,4,800,6,200	// Jaws_Of_Ant
-1016,1000,7,800,10,200	// Rat_Tail 
-1019,800,2,1000		// Wooden_Block
-1020,1000,4,800,6,200	// Long_Hair 
-1021,800,4,1000		// Dokkaebi_Horn
-1022,1000,2,800,3,200	// Fox_Tail 
-1024,800,4,1000		// Chinese_Ink
-1025,800,8,1000		// Spiderweb
-1026,800,4,1000		// Acorn
-1030,800,2,1000		// Tiger_Footskin
-1033,1000,4,800,6,200	// Root_Of_Maneater 
-1034,1000,6,800,9,200	// Cobold_Hair 
-1035,1000,8,800,12,200	// Dragon_Canine 
-1037,800,6,1000		// Dragon_Train
-1038,1000,1,1000	// Petite_Dablofs_Horn 
-1040,1000,8,800,12,200	// Elder_Pixie's_Beard 
-1041,800,3,1000		// Lantern
-1042,800,6,1000		// Short_Leg
-1043,800,6,1000		// Nail_Of_Orc
-1045,800,8,1000		// Sacred_Masque
-1046,800,4,1000		// Tweezer
-1049,800,6,1000		// Skirt_Of_Virgin
-1050,800,3,1000		// Tendon
-1051,800,7,1000		// Detonator
-1053,1000,6,800,9,200	// Tooth_Of_Ancient_Fish 
-1056,800,8,1000		// Grit
-1058,800,5,1000		// Wing_Of_Moth
-1059,1000,5,1000	// Transparent_Cloth
-1061,80,2,1000		// Starsand_Of_Witch
-1061,1000,1,1000	// Starsand_Of_Witch
-1064,800,8,1000		// Reins
-1615,200,1,1000		// Bone_Wand
-2267,1000,1,1000	// Cigar
-2267,1000,1,1000	// Cigar
-7063,1000,1,200,1,200,1,100	// Soft_Feather
-7166,1000,2,1000	// Soft_Silk_Cloth
-13269,1000,5,500,2,250,1,100	// Boost500_To_Throw
-13270,1000,5,500,2,250,1,100	// Full_SwingK_To_Throw
-13271,1000,5,500,2,250,1,100	// Mana_Plus_To_Throw
-13272,1000,5,500,2,250,1,100	// Cure_Free_To_Throw
-13273,1000,5,500,2,250,1,100	// Stamina_Up_M_To_Throw
-13274,1000,5,500,2,250,1,100	// Digestive_F_To_Throw
-13275,1000,10,1000	// HP_Inc_PotS_To_Throw
-13276,1000,10,1000	// HP_Inc_PotM_To_Throw
-13277,1000,10,1000	// HP_Inc_PotL_To_Throw
-13278,1000,10,1000	// SP_Inc_PotS_To_Throw
-13279,1000,10,1000	// SP_Inc_PotM_To_Throw
-13280,1000,10,1000	// SP_Inc_PotL_To_Throw
-13281,1000,10,1000	// En_White_PotZ_To_Throw
-13282,1000,10,1000	// Vitata500_To_Throw
-13283,1000,10,1000	// En_Cel_Juice_To_Throw
+703,4,800,2,200                        // Hinalle 
+958,800,9,1000                         // Horrendous_Mouth
+959,800,7,1000                         // Rotten_Scale
+960,1000,6,800,9,200                   // Nipper 
+961,800,3,1000                         // Conch
+962,1000,4,800,6,200                   // Tentacle 
+963,800,3,1000                         // Sharp_Scale
+964,800,8,1000                         // Crap_Shell
+967,800,4,1000                         // Turtle_Shell
+968,800,5,1000                         // Voucher_Of_Orcish_Hero
+970,800,9,1000                         // Alchol
+971,800,5,1000                         // Detrimindexta
+973,800,4,1000                         // Counteragent
+974,1000,4,800,6,200                   // Mixture 
+991,1000,1,500,1,500                   // Crystal_Blue 
+992,1000,1,500,1,500                   // Wind_Of_Verdure 
+999,1000,10,1000                       // Steel
+1003,500,1,1000                        // Coal
+1008,800,6,1000                        // Frozen_Heart
+1009,800,4,1000                        // Sacred_Marks
+1010,800,8,1000                        // Phracon
+1011,800,4,1000                        // Emveretarcon
+1012,800,3,1000                        // Lizard_Scruff
+1013,9,800,13,200                      // Colorful_Shell
+1014,4,800,6,200                       // Jaws_Of_Ant
+1016,1000,7,800,10,200                 // Rat_Tail 
+1019,800,2,1000                        // Wooden_Block
+1020,1000,4,800,6,200                  // Long_Hair 
+1021,800,4,1000                        // Dokkaebi_Horn
+1022,1000,2,800,3,200                  // Fox_Tail 
+1024,800,4,1000                        // Chinese_Ink
+1025,800,8,1000                        // Spiderweb
+1026,800,4,1000                        // Acorn
+1030,800,2,1000                        // Tiger_Footskin
+1033,1000,4,800,6,200                  // Root_Of_Maneater 
+1034,1000,6,800,9,200                  // Cobold_Hair 
+1035,1000,8,800,12,200                 // Dragon_Canine 
+1037,800,6,1000                        // Dragon_Train
+1038,1000,1,1000                       // Petite_Dablofs_Horn 
+1040,1000,8,800,12,200                 // Elder_Pixie's_Beard 
+1041,800,3,1000                        // Lantern
+1042,800,6,1000                        // Short_Leg
+1043,800,6,1000                        // Nail_Of_Orc
+1045,800,8,1000                        // Sacred_Masque
+1046,800,4,1000                        // Tweezer
+1049,800,6,1000                        // Skirt_Of_Virgin
+1050,800,3,1000                        // Tendon
+1051,800,7,1000                        // Detonator
+1053,1000,6,800,9,200                  // Tooth_Of_Ancient_Fish 
+1056,800,8,1000                        // Grit
+1058,800,5,1000                        // Wing_Of_Moth
+1059,1000,5,1000                       // Transparent_Cloth
+1061,80,2,1000                         // Starsand_Of_Witch
+1061,1000,1,1000                       // Starsand_Of_Witch
+1064,800,8,1000                        // Reins
+1615,200,1,1000                        // Bone_Wand
+2267,1000,1,1000                       // Cigar
+2267,1000,1,1000                       // Cigar
+7063,1000,1,200,1,200,1,100            // Soft_Feather
+7166,1000,2,1000                       // Soft_Silk_Cloth
+13269,1000,5,500,2,250,1,100           // Boost500_To_Throw
+13270,1000,5,500,2,250,1,100           // Full_SwingK_To_Throw
+13271,1000,5,500,2,250,1,100           // Mana_Plus_To_Throw
+13272,1000,5,500,2,250,1,100           // Cure_Free_To_Throw
+13273,1000,5,500,2,250,1,100           // Stamina_Up_M_To_Throw
+13274,1000,5,500,2,250,1,100           // Digestive_F_To_Throw
+13275,1000,10,1000                     // HP_Inc_PotS_To_Throw
+13276,1000,10,1000                     // HP_Inc_PotM_To_Throw
+13277,1000,10,1000                     // HP_Inc_PotL_To_Throw
+13278,1000,10,1000                     // SP_Inc_PotS_To_Throw
+13279,1000,10,1000                     // SP_Inc_PotM_To_Throw
+13280,1000,10,1000                     // SP_Inc_PotL_To_Throw
+13281,1000,10,1000                     // En_White_PotZ_To_Throw
+13282,1000,10,1000                     // Vitata500_To_Throw
+13283,1000,10,1000                     // En_Cel_Juice_To_Throw
 
diff --git a/db/spellbook_db.txt b/db/spellbook_db.txt
index 11c447365..c7be7b8db 100644
--- a/db/spellbook_db.txt
+++ b/db/spellbook_db.txt
@@ -1,29 +1,36 @@
 // Reading Spellbook Preserve Points Database
 //
 // Structure of Database:
-// SkillID,PreservePoints,Required Book
-//
-// To add more entries, increase MAX_SKILL_SPELLBOOK_DB in skill.h.
+//        SkillID,PreservePoints,Required Book
+//====================================================
+// To add more entries, increase MAX_SKILL_SPELLBOOK_DB in /src/map/skill.h.
+//====================================================
 
-//Mage
-14,7,6190	//Cold Bolt
-19,7,6189	//Fire Bolt
-20,7,6191	//Lightning Bolt
-21,9,6197	//Thunder Storm
+//================
+// Mage
+//================
+14,7,6190         // Cold Bolt
+19,7,6189         // Fire Bolt
+20,7,6191         // Lightning Bolt
+21,9,6197         // Thunder Storm
 
-//Wizard
-83,10,6194	//Meteor Storm
-84,9,6198	//Jupitel Thunder
-85,10,6193	//Lord of Vermillion
-86,9,6199	//Water Ball
-89,10,6192	//Storm Gust
-90,8,6201	//Earth Spike
-91,9,6200	//Heaven's Drive
+//================
+// Wizard
+//================
+83,10,6194       // Meteor Storm
+84,9,6198        // Jupitel Thunder
+85,10,6193       // Lord of Vermillion
+86,9,6199        // Water Ball
+89,10,6192       // Storm Gust
+90,8,6201        // Earth Spike
+91,9,6200        // Heaven's Drive
 
-//Warlock
-2210,8,6205	//Drain Life
-2211,12,6204	//Crimson Rock
-2213,22,6195	//Comet
-2214,12,6203	//Chain Lightning
-2216,12,6202	//Earth Strain
-2217,22,6196	//Tetra Vortex
+//================
+// Warlock
+//================
+2210,8,6205      // Drain Life
+2211,12,6204     // Crimson Rock
+2213,22,6195     // Comet
+2214,12,6203     // Chain Lightning
+2216,12,6202     // Earth Strain
+2217,22,6196     // Tetra Vortex
diff --git a/npc/re/mobs/dungeons/moc_pryd.txt b/npc/re/mobs/dungeons/moc_pryd.txt
index dcd5197f1..6fc0dbb8a 100644
--- a/npc/re/mobs/dungeons/moc_pryd.txt
+++ b/npc/re/mobs/dungeons/moc_pryd.txt
@@ -10,6 +10,7 @@
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Added Nightmare spawns. [Euphy]
 //============================================================
 
 //==================================================
@@ -62,3 +63,19 @@ moc_pryd06,0,0,0,0	monster	Verit	1032,30,5000,0,0
 moc_pryd06,0,0,0,0	monster	Arclouze	1194,20,5000,0,0
 moc_pryd06,0,0,0,0	monster	Ancient Mummy	1297,20,5000,0,0
 moc_pryd06,102,85,1,1	boss_monster	Amon Ra	1511,1,3600000,600000,0
+
+//==================================================
+// moc_prydn1 - Nightmare Mode
+//==================================================
+moc_prydn1,0,0,0,0	monster	Nightmare Minorous	2353,60,5000,0,0
+moc_prydn1,0,0,0,0	monster	Nightmare Mummy	2354,10,5000,0,0
+moc_prydn1,0,0,0,0	monster	Nightmare Verit	2355,50,5000,0,0
+
+//==================================================
+// moc_prydn2 - Nightmare Mode
+//==================================================
+moc_prydn2,0,0,0,0	monster	Nightmare Mimic	2356,30,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Verit	2355,30,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Arclouze	2358,20,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Ancient Mummy	2360,20,5000,0,0
+moc_prydn2,102,85,1,1	boss_monster	Nightmare Amon Ra	2362,1,3600000,600000,1