Updated monster modes for battleground NPCs.

Uncommented warp moc_fild02 -> pay_fild04, in morroc_fild.txt.

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

4 files changed, 15 insertions, 10 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 72ef1dfc3..ec6189d39 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,6 +40,8 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2009/01/06
+	* Rev. 13436 Updated monster modes for battleground NPCs. [L0ne_W0lf]
 2009/01/02
 	* Rev. 13429 Removed bonuses from Novice Armlet. C'mon guys. :( [L0ne_W0lf]
 2008/12/26
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 80b322325..e22e069cd 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -943,16 +943,16 @@
 1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,200,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,0
 // WoE Second Edition; Battle Fields
 1905,BARRICADE,Barricade,Barricade,98,600000,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,0
-1906,BARRICADE_,Barricade,Barricade,98,150,0,0,0,1,0,0,100,99,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,0
+1906,BARRICADE_,Barricade,Barricade,98,150,0,0,0,1,0,0,100,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,0
 1907,S_EMPEL_1,Guardian Stone,Guardian Stone,90,120000,0,0,0,0,1,1,40,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,0
 1908,S_EMPEL_2,Guardian Stone,Guardian Stone,90,120000,0,0,0,0,1,1,40,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,0
-1909,OBJ_A,Food Storage,Food Storage,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1910,OBJ_B,Food Depot,Food Depot,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1911,OBJ_NEUTRAL,Neutrality Flag,Neutrality Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1912,OBJ_FLAG_A,Lion Flag,Lion Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1913,OBJ_FLAG_B,Eagle Flag,Eagle Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1914,OBJ_A2,Blue Crystal,Blue Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
-1915,OBJ_B2,Pink Crystal,Pink Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1909,OBJ_A,Food Storage,Food Storage,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1910,OBJ_B,Food Depot,Food Depot,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1911,OBJ_NEUTRAL,Neutrality Flag,Neutrality Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1912,OBJ_FLAG_A,Lion Flag,Lion Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1913,OBJ_FLAG_B,Eagle Flag,Eagle Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1914,OBJ_A2,Blue Crystal,Blue Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
+1915,OBJ_B2,Pink Crystal,Pink Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,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,0
 // Satan Morroc
 1916,MOROCC,Satan Morroc,Satan Morroc,99,20000000,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,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,0
 1917,MOROCC_,Wounded Morroc,Wounded Morroc,99,15000000,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e227c9004..03c3987b6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2009/01/06
+	* Rev. 13436 Uncommented warp moc_fild02 -> pay_fild04, in morroc_fild.txt. [L0ne_W0lf]
 2008/12/29
 	* Rev. 13423 Fixed Econ values in agit_template. Commited by accident, as it's not finished. [L0ne_W0lf]
 	* Rev. 13422 Workin' on fixing some bugs. :) [L0ne_W0lf]
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
index 6bcd6f1af..1fb168a94 100644
--- a/npc/warps/fields/morroc_fild.txt
+++ b/npc/warps/fields/morroc_fild.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3 Updated warps for episode 12.1 [L0ne_W0lf]
 //= 1.4 Uncommented warp that shouldn't have been commented. [L0ne_W0lf]
+//= 1.4a Uncommented yet ANOTHER warp that was taken out. [L0ne_W0lf]
 //============================================================
 
 //= Sograt Dessert ===========================================
@@ -28,7 +29,7 @@ moc_fild01,56,384,0	warp	moc007a	3,2,prt_fild08,54,24
 //moc_fild01,68,16,0	warp	mocf01	15,3,moc_fild04,317,376
 moc_fild02,228,29,0	warp	mocf03	4,2,moc_fild13,298,367
 moc_fild02,332,19,0	warp	mocf04	5,3,moc_fild03,70,336
-//moc_fild02,350,339,0	warp	mocf012	6,2,pay_fild04,194,20
+moc_fild02,350,339,0	warp	mocf012	6,2,pay_fild04,194,20
 moc_fild02,67,342,0	warp	mocf02-3	11,3,moc_fild01,315,25
 moc_fild02,71,18,0	warp	mocf05	4,2,moc_fild13,146,365
 moc_fild02,92,342,0	warp	mocf02-4	11,3,moc_fild01,315,25