* Updated Ifrit and Byorgue drops

- removed incomplete items from drops
* Updated Ganbantein on Ifrit and Kasa
* Added Ifrit and Byorgue to spawns
* Lowered Atroce respawn time on Veins fields

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

6 files changed, 20 insertions, 7 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 9a02481b7..cae2968de 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -49,6 +49,9 @@
 	----
 ========================
 06/16
+	* Updated Ifrit and Byorgue drops [Playtester]
+	- removed incomplete items from drops
+	- updated Ganbantein on Ifrit and Kasa
 	* Removed Mdef bonus on Ph.D Hat [Playtester]
 06/09
 	* Rev. 10745 Added Old_Bleu_Box and added corrisponding item group entries. [L0ne_W0lf]
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 014941396..f22b83331 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -855,14 +855,14 @@
 1829,G_KNIGHT_GUARDIAN,Sword Guardian,Sword Master,86,152533,0,155013,122604,2,7590,9140,60,33,1,40,54,65,125,65,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,23006,12,1840,2520,40,62,1,80,33,90,165,55,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,10860,65,50,1,55,44,45,180,25,10,12,2,0,63,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7097,3000,994,100,716,500,1370,5,2621,1,2680,1,0,0,0,0,0,0,0,0
-1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,40,50,1,180,25,190,199,50,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
+1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,40,50,1,180,25,190,199,50,10,12,2,0,83,0x37B5,120,76,200,288,1577160,10000,603,5500,617,5000,616,5000,994,3000,2345,600,1133,800,1473,800,1471,800,0,0,0,0,0,0,0,0,0,0
 1833,KASA,Kasa,Kasa,85,80375,0,49000,38000,2,3030,3500,23,70,1,110,31,250,140,30,10,12,2,0,63,0x37B5,150,872,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2000,0,0,2344,3,2622,1,2680,1,0,0,0,0,0,0,0,0
 1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,7590,10860,65,50,1,55,44,45,180,25,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,3030,3500,23,70,1,110,31,250,140,30,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,25,24,1,60,30,10,60,17,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,IMP,Imp,Fire Imp,76,46430,0,25200,11077,1,1059,1509,27,50,1,76,30,180,99,10,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,28,50,1,44,50,62,65,60,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,19000,9500,3,1340,2590,20,13,1,80,12,30,70,10,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
+1839,BYORGUE,Byorgue,Byorgue,86,38133,0,19000,9500,3,1340,2590,20,13,1,80,12,30,70,10,10,12,1,7,20,0x37B5,150,76,384,288,0,0,0,0,0,0,0,0,7110,3000,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
 
 1864,ZOMBIE_SLAUGHTER,Zombie Slaughter,Zombie Slaughter,77,43000,0,12000,8500,1,800,855,35,45,1,30,50,1,75,35,10,12,1,1,69,0x3695,100,288,288,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
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index e809fe881..074107345 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4164,6 +4164,7 @@
 1831,Salamander@KN_TWOHANDQUICKEN,attack,60,20,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@HW_GANBANTEIN,idle,483,5,10000,0,2000,yes,randomtarget,always,0,,,,,,
 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,,,,,,
@@ -4187,6 +4188,7 @@
 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@HW_GANBANTEIN,idle,483,2,10000,0,2000,yes,randomtarget,always,0,,,,,,
 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,,,,,,
@@ -4209,6 +4211,7 @@
 1834,G_Salamander@KN_TWOHANDQUICKEN,attack,60,20,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@HW_GANBANTEIN,idle,483,2,10000,0,2000,yes,randomtarget,always,0,,,,,,
 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,,,,,,
@@ -4219,8 +4222,8 @@
 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,,,,,,
+1835,G_Kasa@HW_GANBANTEIN,chase,483,2,500,1000,20000,no,target,always,0,,,,,,
+1835,G_Kasa@HW_GANBANTEIN,attack,483,2,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,,,,,,,
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ee815b7d0..9476c7dcc 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2007/06/16
+	* Added Byorgue and Ifrit to spawns [Playtester]
+	- lowered Atroce respawn time on Veins fields
 	* Added Louyang Revolution quest. [SinSloth]
 	- Moved some city NPCs and warps to proper quest file.
 2007/06/15
diff --git a/npc/mobs/dungeons/thor.txt b/npc/mobs/dungeons/thor.txt
index 162d88f94..10c5cdc11 100644
--- a/npc/mobs/dungeons/thor.txt
+++ b/npc/mobs/dungeons/thor.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== 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]
+//= 1.1 Added Byorgue and Ifrit [Playtester]
 //============================================================
 
 // ================= [Thor Volcano - 01] =====================
@@ -19,6 +20,7 @@ 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_v01,0,0,0,0	monster	Byorgue	1839,1,1800000,1200000,1
 
 // ================= [Thor Volcano - 02] =====================
 thor_v02,0,0,0,0	monster	Knocker	1838,70,0,0,0
@@ -27,9 +29,12 @@ 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_v02,0,0,0,0	monster	Byorgue	1839,1,1800000,1200000,1
 
 // ================= [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
+thor_v03,0,0,0,0	monster	Byorgue	1839,1,1800000,1200000,1
+thor_v03,0,0,0,0	monster	Ifrit	1832,1,39600000,39000000,1
diff --git a/npc/mobs/fields/veins.txt b/npc/mobs/fields/veins.txt
index 7c7527ff4..17c39f146 100644
--- a/npc/mobs/fields/veins.txt
+++ b/npc/mobs/fields/veins.txt
@@ -23,7 +23,7 @@ ve_fild01,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
 ve_fild01,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 ve_fild01,0,0,0,0	monster	Blue Plant	1079,3,1800000,900000,1
 ve_fild01,0,0,0,0	monster	Shining Plant	1083,1,1800000,900000,1
-ve_fild01,0,0,0,0	monster	Atroce	1785,1,86400000,86000000,1
+ve_fild01,0,0,0,0	monster	Atroce	1785,1,39600000,39000000,1
 
 //======== [Veins Field-02] ===================================
 ve_fild02,0,0,0,0	monster	Savage	1166,60,0,0,0
@@ -31,7 +31,7 @@ ve_fild02,0,0,0,0	monster	Side Winder	1037,20,0,0,0
 ve_fild02,0,0,0,0	monster	Roween	1782,20,0,0,0
 ve_fild02,0,0,0,0	monster	Stapo	1784,30,0,0,0
 ve_fild02,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
-ve_fild02,0,0,0,0	monster	Atroce	1785,1,86400000,86000000,1
+ve_fild02,0,0,0,0	monster	Atroce	1785,1,39600000,39000000,1
 
 //======== [Veins Field-03] ===================================
 ve_fild03,0,0,0,0	monster	Sandman	1165,20,600000,300000,1