Merge pull request #51 from xiashtra/6.57

6.57

Author: Hezkezl

Diff for: csv/Addon.csv

@@ -1813,7 +1813,7 @@ the right arrow button."
 1803,"Wait"
 1804,"Teleport Offer"
 1805,"<Clickable(<SheetEn(PlaceName,2,<Sheet(Aetheryte,IntegerParameter(1),8)/>,2,1)/>)/>"
-1806,"Teleport to Nearest Aetheryte"
+1806,"Teleport to Nearby Aetheryte"
 1807,"Letters from Friends"
 1808,"Purchases & Rewards"
 1809,"Letters from GMs"

Diff for: csv/BKJEObj.csv

@@ -59646,57 +59646,71 @@ int32,byte,byte,byte,byte,int32,int16,int32,uint16,Balloon,byte,byte,uint32,byte
 33691.28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 33691.29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 33691.30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-33692.0,1,0,0,27,1,1,0,0,0,25,40,1046118,0,0,0,0,0
-33692.1,0,0,0,27,1,1,0,0,0,25,40,1046117,0,0,0,0,0
-33692.2,0,0,0,23,10,0,0,0,0,0,50,0,0,25,40,1046119,0
+33692.0,1,0,0,27,100,100,0,0,0,25,40,1046117,0,0,0,0,0
+33692.1,0,0,0,27,100,100,0,0,0,25,40,1046119,0,0,0,0,0
+33692.2,0,0,0,23,10,0,0,0,0,0,50,0,0,0,0,0,0
 33692.3,10,2,0,28,10276556,0,0,0,0,25,51,1046117,0,0,0,0,0
 33692.4,0,2,0,28,10276558,0,0,0,0,25,51,1046119,0,0,0,0,0
 33692.5,0,0,0,28,10276557,0,0,0,0,0,0,0,0,0,0,0,0
-33692.6,0,2,0,26,4818,0,0,0,0,25,51,1046117,0,0,0,0,0
-33692.7,0,0,0,26,4818,0,0,0,0,0,0,0,0,0,0,0,0
-33692.8,0,2,0,26,4818,0,0,0,0,25,51,1046119,0,0,0,0,0
-33692.9,0,0,0,23,20,0,0,0,0,0,0,0,0,0,0,0,0
-33692.10,20,2,0,38,1,0,0,0,0,25,51,1046117,0,0,0,0,0
-33692.11,0,2,0,38,1,0,0,0,0,25,51,1046119,0,0,0,0,0
-33692.12,0,0,0,38,1,0,0,0,0,0,0,0,0,0,0,0,0
-33692.13,0,0,0,23,100,0,0,0,0,0,0,0,0,0,0,0,0
-33692.14,100,0,0,27,100,100,0,0,0,0,22,1,0,0,23,1,3
-33692.15,0,0,0,27,100,100,0,0,0,0,50,0,0,18,1,15,0
-33692.16,0,3,0,18,3,0,0,0,7416,0,50,0,0,25,51,1046117,0
-33692.17,0,0,1,18,3,0,0,0,7418,0,22,1,7,0,23,1,8
-33692.18,0,0,0,27,100,100,0,0,0,0,22,1,12,0,23,1,13
-33692.19,0,3,0,18,3,0,0,0,7420,0,50,0,0,25,51,1046119,0
-33692.20,0,0,0,7,1,0,0,0,0,0,22,1,30,0,0,0,0
-33692.21,0,0,0,7,1,0,0,0,0,18,2,15,0,0,0,0,0
+33692.6,0,0,0,23,20,0,0,0,0,0,0,0,0,0,0,0,0
+33692.7,20,2,0,38,1,0,0,0,0,25,51,1046117,0,0,0,0,0
+33692.8,0,2,0,38,1,0,0,0,0,25,51,1046119,0,0,0,0,0
+33692.9,0,0,0,38,1,0,0,0,0,0,0,0,0,0,0,0,0
+33692.10,0,2,0,2,692,0,0,0,0,25,51,1046117,0,0,0,0,0
+33692.11,0,2,0,2,692,0,0,0,0,25,51,1046119,0,0,0,0,0
+33692.12,0,0,0,2,692,0,0,0,0,0,0,0,0,0,0,0,0
+33692.13,0,2,0,26,4818,0,0,0,0,25,51,1046117,0,0,0,0,0
+33692.14,0,2,0,26,4818,0,0,0,0,25,51,1046119,0,0,0,0,0
+33692.15,0,0,0,26,4818,0,0,0,0,0,0,0,0,0,0,0,0
+33692.16,0,0,0,23,100,0,0,0,0,0,0,0,0,0,0,0,0
+33692.17,100,0,0,27,100,100,0,0,0,0,22,1,0,0,23,1,3
+33692.18,0,0,0,27,100,100,0,0,0,0,50,0,0,18,1,15,0
+33692.19,0,3,0,18,3,0,0,0,7416,0,50,0,0,25,51,1046117,0
+33692.20,0,0,1,18,3,0,0,0,7418,0,22,1,7,0,23,1,8
+33692.21,0,0,0,27,100,100,0,0,0,0,22,1,12,0,23,1,13
+33692.22,0,3,0,18,3,0,0,0,7420,0,50,0,0,25,51,1046119,0
+33692.23,0,0,0,7,1,0,0,0,0,0,22,1,30,0,0,0,0
+33692.24,0,0,0,7,1,0,0,0,0,18,2,30,0,0,0,0,0
+33692.25,0,0,0,23,110,0,0,0,0,0,50,0,0,0,0,0,0
+33692.26,110,0,0,23,1,0,0,0,0,18,1,30,0,0,0,0,0
+33692.27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+33692.28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+33692.29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+33692.30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 33693.0,1,0,0,27,100,100,0,0,0,0,22,1,5,0,23,1,7
 33693.1,0,0,1,18,3,0,0,0,7423,0,50,0,0,18,1,15,0
 33693.2,0,0,0,27,100,100,0,0,0,0,22,1,10,0,23,1,15
 33693.3,0,0,0,27,100,100,0,0,0,0,50,0,0,18,1,15,0
 33693.4,0,3,0,18,3,0,0,0,7422,0,50,0,0,25,51,1046120,0
 33693.5,0,0,0,7,1,0,0,0,0,0,22,1,20,0,0,0,0
 33693.6,0,0,0,7,1,0,0,0,0,18,2,15,0,0,0,0,0
-33694.0,1,0,0,27,1,1,0,0,0,25,40,1045388,0,0,0,0,0
-33694.1,0,0,0,27,1,1,0,0,0,25,40,1045387,0,0,0,0,0
-33694.2,0,0,0,23,10,0,0,0,0,0,50,0,0,25,40,1046215,0
+33694.0,1,0,0,27,1,1,0,0,0,25,40,1045387,0,0,0,0,0
+33694.1,0,0,0,27,1,1,0,0,0,25,40,1046215,0,0,0,0,0
+33694.2,0,0,0,23,10,0,0,0,0,0,50,0,0,0,0,0,0
 33694.3,10,2,0,28,10276556,0,0,0,0,25,51,1045387,0,0,0,0,0
 33694.4,0,2,0,28,10276558,0,0,0,0,25,51,1046215,0,0,0,0,0
 33694.5,0,0,0,28,10276557,0,0,0,0,0,0,0,0,0,0,0,0
-33694.6,0,2,0,26,4818,0,0,0,0,25,51,1045387,0,0,0,0,0
-33694.7,0,0,0,26,4818,0,0,0,0,0,0,0,0,0,0,0,0
-33694.8,0,2,0,26,4818,0,0,0,0,25,51,1046215,0,0,0,0,0
-33694.9,0,0,0,23,20,0,0,0,0,0,0,0,0,0,0,0,0
-33694.10,20,2,0,38,1,0,0,0,0,25,51,1045387,0,0,0,0,0
-33694.11,0,2,0,38,1,0,0,0,0,25,51,1046215,0,0,0,0,0
-33694.12,0,0,0,38,1,0,0,0,0,0,0,0,0,0,0,0,0
-33694.13,0,0,0,23,100,0,0,0,0,0,0,0,0,0,0,0,0
-33694.14,100,0,0,27,100,100,0,0,0,0,22,1,0,0,23,1,3
-33694.15,0,0,0,27,100,100,0,0,0,0,50,0,0,18,1,15,0
-33694.16,0,3,0,18,3,0,0,0,7417,0,50,0,0,25,51,1045387,0
-33694.17,0,0,1,18,3,0,0,0,7419,0,22,1,7,0,23,1,8
-33694.18,0,0,0,27,100,100,0,0,0,0,22,1,12,0,23,1,13
-33694.19,0,3,0,18,3,0,0,0,7421,0,50,0,0,25,51,1046215,0
-33694.20,0,0,0,7,1,0,0,0,0,0,22,1,30,0,0,0,0
-33694.21,0,0,0,7,1,0,0,0,0,18,2,15,0,0,0,0,0
+33694.6,0,0,0,23,20,0,0,0,0,0,0,0,0,0,0,0,0
+33694.7,20,2,0,38,1,0,0,0,0,25,51,1045387,0,0,0,0,0
+33694.8,0,2,0,38,1,0,0,0,0,25,51,1046215,0,0,0,0,0
+33694.9,0,0,0,38,1,0,0,0,0,0,0,0,0,0,0,0,0
+33694.10,0,2,0,2,692,0,0,0,0,25,51,1045387,0,0,0,0,0
+33694.11,0,2,0,2,692,0,0,0,0,25,51,1046215,0,0,0,0,0
+33694.12,0,0,0,2,692,0,0,0,0,0,0,0,0,0,0,0,0
+33694.13,0,2,0,26,4818,0,0,0,0,25,51,1045387,0,0,0,0,0
+33694.14,0,2,0,26,4818,0,0,0,0,25,51,1046215,0,0,0,0,0
+33694.15,0,0,0,26,4818,0,0,0,0,0,0,0,0,0,0,0,0
+33694.16,0,0,0,23,100,0,0,0,0,0,0,0,0,0,0,0,0
+33694.17,100,0,0,27,100,100,0,0,0,0,22,1,0,0,23,1,3
+33694.18,0,0,0,27,100,100,0,0,0,0,50,0,0,18,1,15,0
+33694.19,0,3,0,18,3,0,0,0,7417,0,50,0,0,25,51,1045387,0
+33694.20,0,0,1,18,3,0,0,0,7419,0,22,1,7,0,23,1,8
+33694.21,0,0,0,27,100,100,0,0,0,0,22,1,12,0,23,1,13
+33694.22,0,3,0,18,3,0,0,0,7421,0,50,0,0,25,51,1046215,0
+33694.23,0,0,0,7,1,0,0,0,0,0,22,1,30,0,0,0,0
+33694.24,0,0,0,7,1,0,0,0,0,18,2,30,0,0,0,0,0
+33694.25,0,0,0,23,110,0,0,0,0,0,50,0,0,0,0,0,0
+33694.26,110,0,0,23,1,0,0,0,0,18,1,30,0,0,0,0,0
 33695.0,1,0,2,9,0,0,0,0,0,23,3,45,0,0,0,0,0
 33695.1,0,0,0,22,0,0,0,0,0,18,36,1046213,0,0,0,0,0
 33695.2,0,0,0,1,787,0,0,0,0,18,35,1046213,0,0,0,0,0

Diff for: csv/BKJLivestock.csv

@@ -28,17 +28,16 @@ int32,uint16,uint16
 1.23,40,0
 1.24,41,0
 1.25,42,0
-1.26,52,0
-1.27,53,0
-1.28,54,0
-1.29,55,0
-1.30,56,0
-1.31,109,0
-1.32,110,0
-1.33,111,0
-1.34,112,0
-1.35,113,0
-1.36,114,0
+1.26,53,0
+1.27,54,0
+1.28,55,0
+1.29,56,0
+1.30,109,0
+1.31,110,0
+1.32,111,0
+1.33,112,0
+1.34,113,0
+1.35,114,0
 2.0,57,0
 2.1,58,0
 2.2,59,0
@@ -101,17 +100,16 @@ int32,uint16,uint16
 5.25,28,0
 5.26,29,0
 5.27,30,0
-5.28,52,0
-5.29,53,0
-5.30,54,0
-5.31,55,0
-5.32,56,0
-5.33,109,0
-5.34,110,0
-5.35,111,0
-5.36,112,0
-5.37,113,0
-5.38,114,0
+5.28,53,0
+5.29,54,0
+5.30,55,0
+5.31,56,0
+5.32,109,0
+5.33,110,0
+5.34,111,0
+5.35,112,0
+5.36,113,0
+5.37,114,0
 6.0,62,0
 6.1,63,0
 6.2,64,0

Diff for: csv/BKJPouch.csv

@@ -963,7 +963,7 @@ int32,str,TerritoryType,byte,Row,bit&01,byte,uint32,uint32,ClassJobCategory,Cont
 959,"",0,0,0,False,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,False,False,False,False,False,False,0,False,False,False,False,0,False,False,False,False,False,False,False,"","",0,0,0,0,0,0,0,0,False,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 960,"ec049",1177,1,5067,False,4,0,0,142,1,0,0,0,0,0,0,90,90,0,660,False,False,False,False,True,False,False,False,0,False,False,False,False,0,False,False,False,True,False,False,False,"The Game Is Afoot","",7,0,0,0,0,0,-1,0,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 961,"o5d1",1176,1,36003,False,4,0,0,142,11,0,0,0,0,0,0,90,90,605,665,False,True,False,False,False,False,False,False,0,True,False,False,True,0,False,False,False,True,False,False,False,"Aloalo Island","",30,0,5116,0,112549,0,-1,0,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
-962,"z5r3",1178,1,30134,False,4,0,0,108,4,0,0,0,0,0,0,90,90,625,0,False,False,False,True,False,False,False,False,0,True,True,False,True,0,False,False,False,True,False,False,False,"Thaleia","",5,42,3133,126,112546,0,0,0,True,0,False,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
+962,"z5r3",1178,1,30134,False,4,0,0,108,4,0,0,0,0,0,0,90,90,625,0,False,False,False,True,False,False,False,False,0,True,True,False,True,0,False,False,False,True,False,False,False,"Thaleia","",5,42,3133,126,112546,0,0,0,True,0,False,False,False,False,False,False,False,False,True,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 963,"a2fb_3",1175,1,64008,False,4,0,0,108,3,0,0,1,69501,0,0,90,90,560,565,False,False,False,True,True,False,False,False,0,True,False,True,True,4,False,False,False,True,False,False,False,"The Singularity Reactor (Unreal)","",4,39,2098,187,112547,0,-1,0,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 964,"z5fc",1168,1,20091,False,4,0,0,108,3,0,0,0,0,0,0,90,90,625,0,False,False,False,True,True,False,False,False,0,True,True,False,True,0,False,False,False,True,False,False,False,"The Abyssal Fracture","",4,38,2096,206,112544,0,-1,0,True,0,False,False,False,False,False,True,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 965,"z5fc_2",1169,1,20092,False,4,0,0,108,3,0,0,0,0,0,0,90,90,640,0,False,False,False,True,True,False,False,False,1,True,False,True,True,2,False,False,False,True,False,False,False,"The Abyssal Fracture (Extreme)","",4,39,2097,216,112545,0,-1,0,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False

Diff for: csv/BKJSeed.csv

@@ -9782,7 +9782,7 @@ Ahem. Stilll tryin' to wrap my head around this villainous banter, but don't you
 599447,0,1,2,0,0,767,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"Look, kupo! All this ardor and affection is making my pom shine brighter than a star!","0","0"
 599448,0,1,2,0,0,763,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"If the heart is a symbol of Countess Arabelle, does that mean our heart-shaped poms are a sign of her blessing?","0","0"
 599449,0,1,1,0,0,948,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"Kweh!♪","0","0"
-599450,0,1,2,2,0,4218,763,0,1,1,1,0,0,0,0,0,0,False,False,False,"If yer fixin' to 'ave one of 'em 'eart-shaped chocolates, ye can pick 'em up from the purveyor 'ere.","I'll 'ave ye know their flavor is as rich as their 'istory. Some 'undreds o' years ago, the Culinarians' Guild was 'onored by House Valentione with the sole privilege o' baking these 'eart-shaped treats, ye see.","An' there ain't no better time than the season o' ardor an' affection to delight in 'em, is there? They're delectable as they come, so make sure ye get 'em while the gettin's good!"
+599450,0,1,2,2,0,4218,763,0,1,1,1,0,0,0,0,0,0,False,False,False,"If yer fixin' to 'ave one of 'em 'eart-shaped chocolates, ye can pick 'em up from the purveyor 'ere.","I'll 'ave ye know their flavor is as rich as their 'istory. Some 'undreds o' years ago, the Culinarians' Guild was honored by House Valentione with the sole privilege o' baking these 'eart-shaped treats, ye see.","An' there ain't no better time than the season o' ardor an' affection to delight in 'em, is there? They're delectable as they come, so make sure ye get 'em while the gettin's good!"
 599451,0,1,2,0,0,8114,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"A lovely pose for a lovely festival. Tell me, how much better is my rendition than Bert's?","0","0"
 599452,0,1,2,0,0,8114,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"Behold! Bert the Beloved's dazzling embodiment of love puts Rodrigault's to shame, does it not!?","0","0"
 599453,0,1,2,0,0,764,0,0,1,1,1,0,0,0,0,0,0,False,False,False,"Welcome to Blunderville Square! If you'd like to learn more about our shows, then you've come to the right place.","0","0"