- Made some NPC's into duplicates and fixed some && / || checks in the Arch Bishop Job change Quest. bugreport:5437

- Bomb poring is now aggressive and explodes right away after it has been summoned. bugreport:5575
- Added some more checks tot he Pile Bunker NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16113 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/pre-re/mob_db.txt

@@ -944,7 +944,7 @@
 1901,E_CONDOR,Condor,Condor,5,8000,0,100,100,1,200,400,10,15,1,13,10,25,95,10,10,12,0,8,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7781,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,320,100,99,1,28,28,0,33,50,10,12,0,0,20,0x11AB,300,1672,672,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
+1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,320,100,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,672,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
 
 // WoE Second Edition; Battle Fields
 1905,BARRICADE,Barricade,Barricade,98,120000,0,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,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

db/pre-re/mob_skill_db.txt

@@ -4860,9 +4860,7 @@
 1894,Pouring@WZ_WATERBALL,attack,86,10,10000,500,5000,no,target,always,0,,,,,,,
 1894,Pouring@WZ_WATERBALL,chase,86,10,10000,500,5000,no,target,always,0,,,,,,,
 
-1904,Bomb Poring@NPC_SELFDESTRUCTION,idle,173,1,1000,3000,0,no,self,always,0,,,,,,,
+1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,,
-1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,1,1000,3000,0,no,self,always,0,,,,,,,
-1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,1,1000,3000,0,no,self,always,0,,,,,,,
 
 // Satan Morroc (12.1)
 //5% HP - Dragon Fear

db/re/mob_db.txt

@@ -979,7 +979,7 @@
 1901,E_CONDOR,Condor,Condor,10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x108B,300,1672,672,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
+1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,672,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
 1905,BARRICADE,Barricade,Barricade,98,600500,1,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,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
 1906,BARRICADE_,Barricade,Barricade,98,600,1,0,0,1,0,0,160,99,1,17,1,80,126,20,10,12,2,0,20,0x160,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
 1907,S_EMPEL_1,Guardian Stone,Guardian Stone,90,120500,1,0,0,0,1,2,64,50,1,1,1,1,1,1,0,0,0,0,20,0x120,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

db/re/mob_skill_db.txt

@@ -4860,9 +4860,7 @@
 1894,Pouring@WZ_WATERBALL,attack,86,10,10000,500,5000,no,target,always,0,,,,,,,
 1894,Pouring@WZ_WATERBALL,chase,86,10,10000,500,5000,no,target,always,0,,,,,,,
 
-1904,Bomb Poring@NPC_SELFDESTRUCTION,idle,173,1,1000,3000,0,no,self,always,0,,,,,,,
+1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,,
-1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,1,1000,3000,0,no,self,always,0,,,,,,,
-1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,1,1000,3000,0,no,self,always,0,,,,,,,
 
 // Satan Morroc (12.1)
 //5% HP - Dragon Fear

npc/quests/pile_bunker.txt

@@ -17,18 +17,18 @@ yuno,179,174,5	script	Gomer	813,{
 	if(Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic){
 		mes "[Gomer]";
 		mes "Hello "+strcharinfo(0)+",";
-		mes	"My name is Gomer and i can create Pile Bunkers for you if you bring me the required Items i need.";
+		mes "My name is Gomer and i can create Pile Bunkers for you if you bring me the required Items i need.";
 		next;
-		switch(select("Required items for Pile Bunker?:I bought the materials")){
+		switch(select("Required items for Pile Bunker?:I brought the materials!")){
 		case 1:
 			mes "[Gomer]";
 			mes "These are the required Items:";
 			mes "1x Brocca";
-			mes "50x Steel";
+			mes "200x Steel";
 			mes "30x Flexible Tube";
 			close;
 		case 2:
-			if(countitem(1415)<1 || countitem(999)<50 || countitem(7325)<30){
+			if(countitem(1415) < 1 || countitem(999) < 200 || countitem(7325) < 30){
 				mes "[Gomer]";
 				mes "You dont have all the required items. Just talk to me when you have all the requirements.";
 				close;
@@ -42,11 +42,17 @@ yuno,179,174,5	script	Gomer	813,{
 			getitem 1549,1; // Pile Bunker
 			getitem 1360,1; // Two-Handed Axe
 			mes "[Gomer]";
-			mes "So please, take the Pile Bunker and the Two-Handed Axe i made for you.";
+			mes "So please, take this Pile Bunker and this Two-Handed Axe i made for you.";
 			mes "If you need an new Pile Bunker just come and visit me again!";
 			close;
 		}
 	}
+	if(BaseJob == Merchant){
+		mes "[Gomer]";
+		mes "I'm sorry young one, but you do not seem ready yet to use the Pile Bunker.";
+		mes "Come back when you've grown in strength!";
+		close;
+	}
 	mes "[Gomer]";
 	mes "Isn't it a beautiful Day today?";
 	close;