* Made Thor Volcano mobs safe to use

- raised their DEF/MDEF
- raised their speed
- removed 11.3 drops (using 11.2 drops)
- added most of their skills thanks to Doddler
- added Thor Volcano spawns, so they can be tested

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10605 54d463be-8e91-2dee-dedb-b68131a5f0ec

8 files changed, 167 insertions, 11 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 529ee5f89..445ef6c9f 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -49,6 +49,11 @@
 	----
 ========================
 05/22
+	* Made Thor Volcano mobs safe to use [Playtester]
+	- raised their DEF/MDEF
+	- raised their speed
+	- removed 11.3 drops (using 11.2 drops)
+	- added most of their skills thanks to Doddler
 	* Rev. 10602 Poison Bottle now reduces SP to 0 as well. [L0ne_W0lf]
 05/20
 	* Chase Walk's casting time is now 1200ms [Playtester]
diff --git a/db/mob_db.txt b/db/mob_db.txt
index c40e34fe1..907cd1f9e 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -852,15 +852,15 @@
 1816,EVENT_GOURD,Gourd,Gourd,12,1000,0,0,0,1,1,2,100,99,1,1,1,1,1,1,0,0,1,0,20,0x40,2000,96,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
 //Guessed mobs start here
-1829,G_KNIGHT_GUARDIAN,Sword Guardian,Sword Master,86,152533,0,155013,122604,2,7590,9140,60,40,110,90,60,3,125,86,10,12,2,7,80,0x37B5,265,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,30,1422,20,1176,20,2122,10,0,0,0,0,0,0
-1830,G_SOLDIER_GUARDIAN,Bow Guardian,Bow Master,80,80404,0,50149,2306,12,1840,2520,40,60,85,126,40,44,163,80,10,12,2,7,80,0x37B5,265,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,2367,10,2701,2,0,0,0,0,0,0,0,0,0,0,0,0
-1831,SALAMANDER,Salamander,Salamander,91,97934,0,72000,55000,2,7590,10680,60,60,71,91,65,18,102,91,10,12,2,0,63,0x37B5,180,76,384,288,0,0,0,0,0,0,0,0,7097,3000,994,100,716,500,2621,2,1370,20,2680,2,1920,10,2364,5,0,0,0,0
-1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,20,20,100,108,25,190,147,99,10,12,2,0,83,0x37B5,120,76,200,288,1577160,10000,603,5500,617,5000,994,5000,994,3000,2345,80,1133,80,1473,80,1471,80,2678,60,2677,60,2679,60,0,0,0,0
-1833,KASA,Kasa,Kasa,85,80375,0,49000,38000,2,2000,6000,30,20,51,105,31,250,90,85,10,12,2,0,63,0x37B5,180,872,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2000,2344,10,2680,2,2622,2,1730,10,1626,10,0,0,0,0,0,0
-1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,7590,10680,60,60,71,91,65,18,102,91,10,12,2,0,63,0x37B5,180,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1835,G_KASA,Kasa,Kasa,85,80375,0,0,0,2,2000,6000,30,20,51,105,31,250,90,85,10,12,2,0,63,0x37B5,180,872,600,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1836,MAGMARING,Magmaring,Magmaring,40,5300,0,2110,1910,1,550,700,20,20,30,55,25,12,80,40,10,12,0,0,43,0x83,300,384,672,432,0,0,0,0,0,0,0,0,7097,1000,7096,1000,12018,100,757,100,0,0,0,0,0,0,0,0,0,0,0,0
-1837,FIRE_IMP,Fire Imp,Fire Imp,76,46430,0,25200,11077,1,1059,1509,40,40,30,96,30,180,96,76,10,12,0,6,83,0x3395,150,76,384,288,0,0,0,0,0,0,0,0,7097,3000,7122,2000,13303,20,1972,10,1376,10,0,0,0,0,0,0,0,0,0,0
-1838,KNOCKER,Knocker,Knocker,50,7755,0,2202,4023,1,889,990,20,60,25,58,28,36,64,105,10,12,0,6,22,0x191,180,576,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2209,10,1001,100,5009,1,0,0,0,0,0,0
-1839,BYORGUE,Byorgue,Byorgue,86,38133,0,0,0,3,700,1500,20,20,36,126,12,30,146,86,10,12,1,7,20,0x37B5,120,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1829,G_KNIGHT_GUARDIAN,Sword Guardian,Sword Master,86,152533,0,155013,122604,2,7590,9140,60,60,110,90,60,3,125,86,10,12,2,7,80,0x37B5,150,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,15,1163,20,1168,10,0,0,0,0,0,0,0,0,0,0,0,0
+1830,G_SOLDIER_GUARDIAN,Bow Guardian,Bow Master,80,80404,0,50149,2306,12,1840,2520,40,60,85,126,40,44,163,80,10,12,2,7,80,0x37B5,150,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1831,SALAMANDER,Salamander,Salamander,91,97934,0,72000,55000,2,7590,10680,60,80,71,91,65,18,102,91,10,12,2,0,63,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7097,3000,994,100,716,500,2621,1,1370,5,2680,1,0,0,0,0,0,0,0,0
+1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,40,80,100,108,25,190,147,99,10,12,2,0,83,0x37B5,120,76,200,288,1577160,10000,603,5500,617,5000,994,5000,994,3000,2345,80,1133,80,1473,80,1471,80,2678,60,2677,60,2679,60,0,0,0,0
+1833,KASA,Kasa,Kasa,85,80375,0,49000,38000,2,2000,6000,40,80,51,105,31,250,90,85,10,12,2,0,63,0x37B5,150,872,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2000,2344,3,2680,1,2622,1,0,0,0,0,0,0,0,0,0,0
+1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,7590,10680,60,80,71,91,65,18,102,91,10,12,2,0,63,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1835,G_KASA,Kasa,Kasa,85,80375,0,0,0,2,2000,6000,40,80,51,105,31,250,90,85,10,12,2,0,63,0x37B5,150,872,600,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1836,MAGMARING,Magmaring,Magmaring,40,5300,0,2110,1910,1,550,700,40,60,30,55,25,12,80,40,10,12,0,0,43,0x83,300,384,672,432,0,0,0,0,0,0,0,0,7097,1000,7096,1000,12018,100,757,100,0,0,0,0,0,0,0,0,0,0,0,0
+1837,FIRE_IMP,Fire Imp,Fire Imp,76,46430,0,25200,11077,1,1059,1509,40,80,30,96,30,180,96,76,10,12,0,6,83,0x3395,120,76,384,288,0,0,0,0,0,0,0,0,7097,3000,7122,2000,13303,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1838,KNOCKER,Knocker,Knocker,50,7755,0,2202,4023,1,889,990,40,80,25,58,28,36,64,105,10,12,0,6,22,0x191,200,576,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2209,10,1001,100,5009,1,0,0,0,0,0,0
+1839,BYORGUE,Byorgue,Byorgue,86,38133,0,0,0,3,700,1500,40,60,36,126,12,30,146,86,10,12,1,7,20,0x37B5,150,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1840,GOLDEN_SAVAGE,Golden Savage,Golden Savage,99,5000,0,0,0,1,0,0,0,0,0,0,1,50,0,0,10,12,2,2,42,0x91,150,1960,960,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,0
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index f7883f7e9..a0939728b 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4138,5 +4138,117 @@
 1814,Moonlight Flower@MG_FIREWALL,chase,18,10,1000,500,5000,yes,target,always,0,,,,,,
 1814,Moonlight Flower@SA_DISPELL,attack,289,5,500,500,5000,no,target,always,0,,,,,,6
 1814,Moonlight Flower@SA_DISPELL,chase,289,5,500,500,5000,no,target,always,0,,,,,,6
+
+//Thor Volcano
+1829,Sword Master@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1829,Sword Master@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1829,Sword Master@KN_SPEARBOOMERANG,chase,59,5,10000,0,0,no,target,skillused,18,,,,,,6
+1829,Sword Master@KN_SPEARBOOMERANG,idle,59,5,10000,0,0,no,target,always,0,,,,,,6
+1829,Sword Master@KN_SPEARBOOMERANG,chase,59,5,500,0,5000,no,target,always,0,,,,,,
+1829,Sword Master@KN_TWOHANDQUICKEN,attack,60,10,10000,0,120000,no,self,myhpltmaxrate,30,,,,,,6
+1829,Sword Master@SM_BASH,attack,5,10,1000,0,5000,no,target,always,0,,,,,,
+1829,Sword Master@CR_REFLECTSHIELD,chase,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1829,Sword Master@CR_REFLECTSHIELD,attack,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1830,Bow Master@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1830,Bow Master@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1830,Bow Master@AC_DOUBLE,attack,46,10,2000,0,3000,no,target,always,0,,,,,,
+1830,Bow Master@AC_SHOWER,attack,47,10,2000,0,3000,no,target,always,0,,,,,,6
+1830,Bow Master@AC_CHARGEARROW,attack,148,1,2000,0,3000,no,target,always,0,,,,,,6
+1831,Salamander@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1831,Salamander@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1831,Salamander@MG_FIREBALL,chase,17,20,5000,500,5000,no,target,always,0,,,,,,
+1831,Salamander@MG_FIREBALL,attack,17,20,5000,500,5000,no,target,always,0,,,,,,
+1831,Salamander@CR_REFLECTSHIELD,chase,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1831,Salamander@CR_REFLECTSHIELD,attack,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1831,Salamander@NPC_CRITICALSLASH,attack,170,1,1000,0,3000,no,target,always,0,,,,,,
+1831,Salamander@KN_TWOHANDQUICKEN,attack,60,10,10000,0,30000,no,self,myhpltmaxrate,30,,,,,,
+1832,Ifrit@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1832,Ifrit@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1832,Ifrit@NPC_SUMMONSLAVE,attack,196,2,10000,700,10000,no,self,slavele,1,1834,1835,,,,
+1832,Ifrit@NPC_SUMMONSLAVE,idle,196,2,10000,700,10000,no,self,slavele,1,1834,1835,,,,
+1832,Ifrit@NPC_CALLSLAVE,attack,352,1,10000,0,30000,no,target,always,0,,,,,,
+1832,Ifrit@NPC_CALLSLAVE,idle,352,1,10000,0,10000,no,target,always,0,,,,,,
+1832,Ifrit@NPC_CALLSLAVE,chase,352,1,10000,0,10000,no,target,always,0,,,,,,
+1832,Ifrit@KN_TWOHANDQUICKEN,attack,60,10,3000,0,300000,no,self,myhpltmaxrate,30,,,,,,2
+1832,Ifrit@NPC_POWERUP,attack,349,5,2000,0,25000,no,self,myhpltmaxrate,30,,,,,,
+1832,Ifrit@NPC_POWERUP,attack,349,5,2000,0,100000,no,self,always,0,,,,,,
+1832,Ifrit@ST_FULLSTRIP,attack,476,5,2000,0,20000,no,target,always,0,,,,,,
+1832,Ifrit@WZ_METEOR,attack,83,11,2000,0,2000,no,target,always,0,,,,,,
+1832,Ifrit@WZ_METEOR,chase,83,11,2000,500,2000,no,target,always,0,,,,,,
+1832,Ifrit@ASC_METEOR,attack,406,10,2000,0,3000,no,target,always,0,,,,,,
+1832,Ifrit@NPC_FIREATTACK,attack,186,10,1000,0,5000,no,target,always,0,,,,,,
+1832,Ifrit@KN_BOWLINGBASH,attack,62,10,1000,0,10000,no,target,always,0,,,,,,
+1832,Ifrit@HW_GANBANTEIN,attack,483,5,2000,0,10000,no,target,always,0,,,,,,
+1832,Ifrit@AL_HEAL,attack,28,1,2000,0,10000,yes,self,myhpltmaxrate,99,,,,,,
+1832,Ifrit@AL_HEAL,attack,28,11,2000,0,5000,yes,self,myhpltmaxrate,30,,,,,,
+1832,Ifrit@AL_HEAL,idle,28,11,2000,0,5000,yes,self,myhpltmaxrate,99,,,,,,
+1832,Ifrit@AL_HEAL,chase,28,11,2000,0,5000,yes,self,myhpltmaxrate,30,,,,,,
+1832,Ifrit@NPC_CHANGEHOLY,attack,167,1,5000,500,6000000,no,self,myhpltmaxrate,40,,,,,,9
+1832,Ifrit@NPC_CHANGETELEKINESIS,attack,169,1,5000,500,6000000,no,self,myhpltmaxrate,10,,,,,,9
+1833,Kasa@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1833,Kasa@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1833,Kasa@WZ_FIREPILLAR,idle,80,11,5000,200,20000,no,around2,always,0,,,,,,
+1833,Kasa@MG_FIREBALL,attack,17,20,1000,600,5000,no,target,always,0,,,,,,
+1833,Kasa@MG_FIREBALL,chase,17,20,5000,600,5000,no,target,always,0,,,,,,
+1833,Kasa@NPC_FIREATTACK,attack,186,10,1000,0,5000,no,target,always,0,,,,,,
+1833,Kasa@NPC_FIREATTACK,chase,186,10,1000,0,5000,no,target,always,0,,,,,,
+1833,Kasa@WZ_METEOR,chase,83,6,2000,1000,20000,no,target,always,0,,,,,,
+1833,Kasa@WZ_METEOR,attack,83,4,2000,1000,20000,no,target,always,0,,,,,,
+1833,Kasa@WZ_METEOR,attack,83,6,2000,1000,20000,no,target,always,0,,,,,,
+1833,Kasa@WZ_SIGHTRASHER,attack,81,20,2000,0,3000,no,target,always,0,,,,,,
+1833,Kasa@KN_PIERCE,attack,56,10,1000,0,5000,no,target,always,0,,,,,,
+1833,Kasa@HW_GANBANTEIN,chase,483,2,500,1000,20000,no,target,always,0,,,,,,
+1833,Kasa@HW_GANBANTEIN,attack,483,2,500,1000,20000,no,target,always,0,,,,,,
+1834,G_Salamander@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1834,G_Salamander@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1834,G_Salamander@MG_FIREBALL,chase,17,20,5000,500,5000,no,target,always,0,,,,,,
+1834,G_Salamander@MG_FIREBALL,attack,17,20,5000,500,5000,no,target,always,0,,,,,,
+1834,G_Salamander@CR_REFLECTSHIELD,chase,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1834,G_Salamander@CR_REFLECTSHIELD,attack,252,5,2000,0,30000,no,self,always,0,,,,,,,
+1834,G_Salamander@NPC_CRITICALSLASH,attack,170,1,1000,0,3000,no,target,always,0,,,,,,
+1834,G_Salamander@KN_TWOHANDQUICKEN,attack,60,10,10000,0,30000,no,self,myhpltmaxrate,30,,,,,,
+1835,G_Kasa@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1835,G_Kasa@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1835,G_Kasa@WZ_FIREPILLAR,idle,80,11,5000,200,2000,no,around2,always,0,,,,,,
+1835,G_Kasa@MG_FIREBALL,attack,17,20,1000,600,5000,no,target,always,0,,,,,,
+1835,G_Kasa@MG_FIREBALL,chase,17,20,5000,600,5000,no,target,always,0,,,,,,
+1835,G_Kasa@NPC_FIREATTACK,attack,186,10,1000,0,5000,no,target,always,0,,,,,,
+1835,G_Kasa@NPC_FIREATTACK,chase,186,10,1000,0,5000,no,target,always,0,,,,,,
+1835,G_Kasa@WZ_METEOR,chase,83,6,2000,1000,20000,no,target,always,0,,,,,,
+1835,G_Kasa@WZ_METEOR,attack,83,4,2000,1000,20000,no,target,always,0,,,,,,
+1835,G_Kasa@WZ_METEOR,attack,83,6,2000,1000,20000,no,target,always,0,,,,,,
+1835,G_Kasa@WZ_SIGHTRASHER,attack,81,20,2000,0,3000,no,target,always,0,,,,,,
+1835,G_Kasa@KN_PIERCE,attack,56,10,1000,0,5000,no,target,always,0,,,,,,
+1835,G_Kasa@HW_GANBANTEIN,chase,483,1,500,1000,20000,no,target,always,0,,,,,,
+1835,G_Kasa@HW_GANBANTEIN,attack,483,1,500,1000,20000,no,target,always,0,,,,,,
 1836,Magmaring@SM_MAGNUM,attack,7,9,500,500,5000,no,self,always,0,,,,,,
 1836,Magmaring@NPC_FIREATTACK,attack,186,1,2000,0,5000,no,target,always,0,,,,,,
+1837,Fire Imp@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1837,Fire Imp@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1837,Fire Imp@RG_STRIPARMOR,attack,217,5,500,0,30000,no,target,always,0,,,,,,2
+1837,Fire Imp@NPC_FIREATTACK,attack,186,10,1000,0,5000,no,target,always,0,,,,,,
+1837,Fire Imp@KN_BRANDISHSPEAR,attack,57,7,1000,500,5000,no,target,always,0,,,,,,29
+1837,Fire Imp@MG_FIREBOLT,attack,19,7,2000,1000,5000,no,target,always,0,,,,,,,
+1837,Fire Imp@MG_FIREBALL,attack,17,20,2000,500,5000,no,target,attackpcgt,2,,,,,,
+1837,Fire Imp@MG_FIREWALL,chase,18,5,2000,500,5000,no,target,always,0,,,,,,2
+1837,Fire Imp@MG_FIREWALL,attack,18,5,2000,500,5000,no,target,always,0,,,,,,2
+1838,Knocker@HT_SANDMAN,idle,119,5,500,0,20000,no,around2,always,0,,,,,,29
+1838,Knocker@NPC_EMOTION,walk,197,1,2000,0,5000,no,self,always,0,8,,,,,
+1838,Knocker@NPC_GROUNDATTACK,attack,185,5,2000,0,5000,no,target,always,0,,,,,,
+1838,Knocker@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6
+1838,Knocker@TF_THROWSTONE,chase,152,1,2000,0,5000,yes,target,always,0,,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,attack,196,2,10000,700,300000,no,self,slavele,1,1829,1830,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,idle,196,2,10000,700,300000,no,self,slavele,1,1829,1830,,,,
+1839,Byorgue@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,
+1839,Byorgue@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,
+1839,Byorgue@AS_GRIMTOOTH,idle,137,5,10000,0,0,no,randomtarget,always,0,,,,,,6
+1839,Byorgue@AS_GRIMTOOTH,chase,137,5,10000,0,0,no,target,skillused,18,,,,,,6
+1839,Byorgue@TF_POISON,attack,52,10,1000,0,10000,no,target,always,0,,,,,,
+1839,Byorgue@NPC_AGIUP,attack,350,5,2000,0,100000,no,self,always,0,,,,,,
+1839,Byorgue@AS_SONICBLOW,attack,136,5,2000,0,5000,no,target,always,0,,,,,,6
+1839,Byorgue@AS_GRIMTOOTH,chase,137,5,2000,0,0,no,target,always,0,,,,,,
+1839,Byorgue@AS_VENOMDUST,idle,140,1,2000,0,50000,no,randomtarget,always,0,,,,,,29
+1839,Byorgue@AS_VENOMDUST,attack,140,1,2000,0,50000,no,target,always,0,,,,,,29
+1839,Byorgue@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,no,target,always,0,,,,,,
+1839,Byorgue@NPC_STUNATTACK,attack,179,5,1000,0,5000,no,target,always,0,,,,,,
+1839,Byorgue@NPC_POISONATTACK,attack,188,5,1000,0,5000,no,target,always,0,,,,,,
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9d1bd60f0..80af3434b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/05/22
+	* Added Thor Volcano spawns [Playtester]
 	* Updated Socket Enchant NPC to official. [SinSloth]
 	* Moved Munak's Grandma quest to monstertamers.txt, it didn't require another file. [SinSloth]
 	- Deleted munak_quest.txt
diff --git a/npc/mobs/dungeons/thor.txt b/npc/mobs/dungeons/thor.txt
new file mode 100644
index 000000000..2e1f83ae8
--- /dev/null
+++ b/npc/mobs/dungeons/thor.txt
@@ -0,0 +1,35 @@
+//===== Athena Script =============================================

+//= Thor Volcano Monster Spawn Script.

+//===== By: =======================================================

+//= Playtester

+//===== Current Version: ==========================================

+//= 1.0

+//===== Compatible With: ==========================================

+//= Any Athena Version 

+//===== Description: ==============================================

+//= Official monster spawn in Thor Volcano Dungeon.

+//===== Additional Comments: ======================================

+//= 1.0 Spawns according to RO Monthly and Doddler [Playtester]

+//=================================================================

+

+// ================= [Thor Volcano - 01] ==========================

+thor_v01,0,0,0,0	monster	Kasa	1833,30,0,0,0

+thor_v01,0,0,0,0	monster	Fire Imp	1837,20,0,0,0

+thor_v01,0,0,0,0	monster	Magmaring	1836,10,0,0,0

+thor_v01,0,0,0,0	monster	Salamander	1831,5,0,0,0

+thor_v01,0,0,0,0	monster	Sword Master	1829,1,0,0,0

+thor_v01,0,0,0,0	monster	Bow Master	1830,1,0,0,0

+

+// ================= [Thor Volcano - 02] ==========================

+thor_v02,0,0,0,0	monster	Knocker	1838,70,0,0,0

+thor_v02,0,0,0,0	monster	Fire Imp	1837,10,0,0,0

+thor_v02,0,0,0,0	monster	Magmaring	1836,10,0,0,0

+thor_v02,0,0,0,0	monster	Salamander	1831,5,0,0,0

+thor_v02,0,0,0,0	monster	Sword Master	1829,1,0,0,0

+thor_v02,0,0,0,0	monster	Bow Master	1830,1,0,0,0

+

+// ================= [Thor Volcano - 03] ==========================

+thor_v03,0,0,0,0	monster	Salamander	1831,30,0,0,0

+thor_v03,0,0,0,0	monster	Kasa	1833,20,0,0,0

+thor_v03,0,0,0,0	monster	Sword Master	1829,3,0,0,0

+thor_v03,0,0,0,0	monster	Bow Master	1830,3,0,0,0

diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf
index ef3904330..9dcee7866 100644
--- a/npc/scripts_eamonsters.conf
+++ b/npc/scripts_eamonsters.conf
@@ -71,6 +71,7 @@ npc: npc/mobs/dungeons/pront_maze.txt
 npc: npc/mobs/dungeons/pront_sewers.txt
 npc: npc/mobs/dungeons/racheldun.txt
 npc: npc/mobs/dungeons/thanatos.txt
+npc: npc/mobs/dungeons/thor.txt
 npc: npc/mobs/dungeons/toyfactory.txt
 npc: npc/mobs/dungeons/turtleisland.txt
 npc: npc/mobs/dungeons/umbaladun.txt
diff --git a/npc/scripts_jmonsters.conf b/npc/scripts_jmonsters.conf
index 3a2174aac..f6a8d9a2b 100644
--- a/npc/scripts_jmonsters.conf
+++ b/npc/scripts_jmonsters.conf
@@ -28,4 +28,5 @@ npc: npc/eamobs/jro/jro.txt
 //npc: npc/mobs/dungeons/kiel.txt
 //npc: npc/mobs/dungeons/icedun.txt
 //npc: npc/mobs/dungeons/racheldun.txt
+//npc: npc/mobs/dungeons/thor.txt
 // --------------------------------------------------------------
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index a1f56018d..64e4c121b 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -69,6 +69,7 @@ npc: npc/mobs/dungeons/pront_sewers.txt
 npc: npc/mobs/dungeons/racheldun.txt
 npc: npc/mobs/dungeons/sunkenship.txt
 npc: npc/mobs/dungeons/thanatos.txt
+npc: npc/mobs/dungeons/thor.txt
 npc: npc/mobs/dungeons/toyfactory.txt
 npc: npc/mobs/dungeons/turtleisland.txt
 npc: npc/mobs/dungeons/umbaladun.txt