diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/Fish.xml b/L2J_Mobius_C6_Interlude/dist/game/data/Fish.xml new file mode 100644 index 0000000000..7c32424ee6 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/data/Fish.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/csv/fish.csv b/L2J_Mobius_C6_Interlude/dist/game/data/csv/fish.csv deleted file mode 100644 index 056b0cc699..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/data/csv/fish.csv +++ /dev/null @@ -1,274 +0,0 @@ -#id;level;name;hp;hpregen;fish_type;fish_group;fish_guts;guts_check_time;wait_time;combat_time -#fish_type: 0 = wide; 1 = swift; 2 = ugly; 3 = box; 4 = easy_wide; 5 = easy_swift; 6 = easy_ugly; 7 = hard_wide; 8 = hard_swift; 9 = hard_ugly -#fish_group: 0 = easy; 1 = normal; 2 = hard - -6411;1;Small Green Nimble Fish;100;4;1;1;500;5000;20000;24000 -6412;1;Small Green Ugly Fish;116;4;2;1;502;5000;20000;27000 -6413;1;Small Green Pudgy Fish;132;4;0;1;504;5000;20000;31000 -6414;2;Green Nimble Fish;150;6;1;1;506;5000;20000;25000 -6415;2;Green Ugly Fish;168;6;2;1;508;5000;20000;28000 -6416;2;Green Pudgy Fish;188;6;0;1;510;5000;20000;31000 -6417;3;Large Green Nimble Fish;208;8;1;1;512;5000;20000;26000 -6418;3;Large Green Ugly Fish;230;8;2;1;514;5000;20000;29000 -6419;3;Large Green Pudgy Fish;252;8;0;1;516;5000;20000;32000 -6420;4;Small Jade Nimble Fish;276;10;1;1;518;5000;20000;28000 -6421;4;Small Jade Ugly Fish;300;10;2;1;520;5000;20000;31000 -6422;4;Small Jade Fat Fish;310;10;0;1;522;5000;20000;32000 -6423;5;Jade Nimble Fish;320;11;1;1;524;5000;20000;30000 -6424;5;Jade Ugly Fish;330;11;2;1;526;4000;20000;31000 -6425;5;Jade Fat Fish;340;11;0;1;528;4000;20000;32000 -6426;6;Big Jade Nimble Fish;350;12;1;1;530;4000;20000;30000 -6427;6;Big Jade Ugly Fish;360;12;2;1;532;4000;20000;31000 -6428;6;Big Jade Fat Fish;370;12;0;1;534;4000;20000;32000 -6429;7;Small Blue Nimble Fish;380;12;1;1;536;4000;20000;31000 -6430;7;Small Blue Ugly Fish;390;13;2;1;538;4000;20000;31000 -6431;7;Small Blue Fat Fish;400;13;0;1;540;4000;20000;32000 -6432;8;Blue Nimble Fish;410;13;1;1;542;4000;20000;31000 -6433;8;Blue Ugly Fish;420;13;2;1;544;4000;20000;32000 -6434;8;Blue Fat Fish;430;14;0;1;546;4000;20000;31000 -6435;9;Big Blue Nimble Fish;506;17;1;1;548;4000;20000;29000 -6436;9;Big Blue Ugly Fish;518;17;2;1;550;4000;20000;30000 -6437;9;Big Blue Fat Fish;529;17;0;1;552;4000;20000;31000 -6438;10;Small Yellow Nimble Fish;541;18;1;1;554;4000;20000;30000 -6439;10;Small Yellow Ugly Fish;552;18;2;1;556;4000;20000;30000 -6440;10;Small Yellow Fat Fish;564;18;0;1;558;4000;20000;31000 -6441;11;Yellow Nimble Fish;575;19;1;1;560;4000;20000;30000 -6442;11;Yellow Ugly Fish;587;19;2;1;562;4000;20000;31000 -6443;11;Yellow Fat Fish;598;19;0;1;564;4000;20000;31000 -6444;12;Big Yellow Nimble Fish;610;20;1;1;566;4000;20000;30000 -6445;12;Big Yellow Ugly Fish;621;20;2;1;568;4000;20000;31000 -6446;12;Big Yellow Fat Fish;633;20;0;1;570;4000;20000;31000 -6447;13;Small Orange Nimble Fish;644;21;1;1;572;4000;20000;30000 -6448;13;Small Orange Ugly Fish;656;21;2;1;574;4000;20000;31000 -6449;13;Small Orange Fat Fish;667;21;0;1;576;3000;20000;32000 -6450;14;Orange Nimble Fish;679;22;1;1;578;3000;20000;31000 -6451;14;Orange Ugly Fish;690;22;2;1;580;3000;20000;31000 -6452;14;Orange Fat Fish;702;22;0;1;582;3000;20000;32000 -6453;15;Big Orange Nimble Fish;713;25;1;1;584;3000;20000;29000 -6454;15;Big Orange Ugly Fish;819;27;2;1;586;3000;20000;30000 -6455;15;Big Orange Fat Fish;832;28;0;1;588;3000;20000;30000 -6456;16;Small Purple Nimble Fish;845;29;1;1;590;3000;20000;29000 -6457;16;Small Purple Ugly Fish;858;29;2;1;592;3000;20000;30000 -6458;16;Small Purple Fat Fish;871;29;0;1;594;3000;20000;30000 -6459;17;Purple Nimble Fish;884;29;1;1;596;3000;20000;30000 -6460;17;Purple Ugly Fish;897;30;2;1;598;3000;20000;30000 -6461;17;Purple Fat Fish;910;29;0;1;600;3000;20000;31000 -6462;18;Big Purple Nimble Fish;923;31;1;1;602;3000;20000;30000 -6463;18;Big Purple Ugly Fish;936;31;2;1;604;3000;20000;30000 -6464;18;Big Purple Fat Fish;949;31;0;1;606;3000;20000;31000 -6465;19;Small Red Nimble Fish;962;34;1;1;608;3000;20000;28000 -6466;19;Small Red Ugly Fish;1125;39;2;1;610;3000;20000;29000 -6467;19;Small Red Fat Fish;1140;39;0;1;612;3000;20000;29000 -6468;20;Red Nimble Fish;1155;40;1;1;614;3000;20000;29000 -6469;20;Red Ugly Fish;1170;40;2;1;616;3000;20000;29000 -6470;20;Red Fat Fish;1185;40;0;1;618;3000;20000;30000 -6471;21;Big Red Nimble Fish;1200;41;1;1;620;3000;20000;29000 -6472;21;Big Red Ugly Fish;1215;42;2;1;622;3000;20000;29000 -6473;21;Big Red Fat Fish;1230;46;0;1;624;3000;20000;27000 -6474;22;Small White Nimble Fish;1453;56;1;1;626;2000;20000;26000 -6475;22;Small White Ugly Fish;1470;54;2;1;628;2000;20000;27000 -6476;22;Small White Fat Fish;1488;55;0;1;630;2000;20000;27000 -6477;23;White Nimble Fish;1505;56;1;1;632;2000;20000;27000 -6478;23;White Ugly Fish;1523;56;2;1;634;2000;20000;27000 -6479;23;White Fat Fish;1540;57;0;1;636;2000;20000;27000 -6480;24;Big White Nimble Fish;1558;58;1;1;638;2000;20000;27000 -6481;24;Big White Ugly Fish;1575;58;2;1;640;2000;20000;27000 -6482;24;Big White Fat Fish;1593;59;0;1;642;2000;20000;27000 -6483;25;Small Black Nimble Fish;1610;60;1;1;644;2000;20000;27000 -6484;25;Small Black Ugly Fish;1628;60;2;1;646;2000;20000;27000 -6485;25;Small Black Fat Fish;1648;59;0;1;648;2000;20000;28000 -6486;26;Black Nimble Fish;1663;67;1;1;650;2000;20000;25000 -6487;26;Black Ugly Fish;1872;75;2;1;652;2000;20000;25000 -6488;26;Black Fat Fish;1892;76;0;1;654;2000;20000;25000 -6489;27;Big Black Nimble Fish;1911;76;1;1;656;2000;20000;25000 -6490;27;Big Black Ugly Fish;1931;77;2;1;658;2000;20000;25000 -6491;27;Big Black Fat Fish;1950;78;0;1;660;2000;20000;25000 -6492;1;Small Green Treasure Chest;132;4;3;1;504;5000;20000;31000 -6493;2;Green Treasure Chest;188;6;3;1;510;5000;20000;31000 -6494;3;Big Green Treasure Chest;252;8;3;1;516;5000;20000;32000 -6495;4;Small Jade Treasure Chest;310;10;3;1;522;5000;20000;32000 -6496;5;Jade Treasure Chest;340;11;3;1;528;4000;20000;32000 -6497;6;Big Jade Treasure Chest;370;12;3;1;534;4000;20000;32000 -6498;7;Small Blue Treasure Chest;400;13;3;1;540;4000;20000;32000 -6499;8;Blue Treasure Chest;430;14;3;1;546;4000;20000;31000 -6500;9;Big Blue Treasure Chest;529;17;3;1;552;4000;20000;31000 -6501;10;Small Yellow Treasure Chest;564;18;3;1;558;4000;20000;31000 -6502;11;Yellow Treasure Chest;598;19;3;1;564;4000;20000;31000 -6503;12;Big Yellow Treasure Chest;633;20;3;1;570;4000;20000;31000 -6504;13;Small Orange Treasure Chest;667;21;3;1;576;3000;20000;32000 -6505;14;Orange Treasure Chest;702;22;3;1;582;3000;20000;32000 -6506;15;Big Orange Treasure Chest;832;28;3;1;588;3000;20000;30000 -6507;16;Small Purple Treasure Chest;871;29;3;1;594;3000;20000;30000 -6508;17;Purple Treasure Chest;910;29;3;1;600;3000;20000;31000 -6509;18;Big Purple Treasure Chest;949;31;3;1;606;3000;20000;31000 -6510;19;Small Red Treasure Chest;1140;39;3;1;612;3000;20000;29000 -6511;20;Red Treasure Chest;1185;40;3;1;618;3000;20000;30000 -6512;21;Big Red Treasure Chest;1230;46;3;1;624;3000;20000;27000 -6513;22;Small White Treasure Chest;1488;55;3;1;630;2000;20000;27000 -6514;23;White Treasure Chest;1540;57;3;1;636;2000;20000;27000 -6515;24;Big White Treasure Chest;1593;59;3;1;642;2000;20000;27000 -6516;25;Small Black Treasure Chest;1648;59;3;1;648;2000;20000;28000 -6517;26;Black Treasure Chest;1892;76;3;1;654;2000;20000;25000 -6518;27;Big Black Treasure Chest;1950;78;3;1;660;2000;20000;25000 -7726;1;Small Green Nimble Fish - For Beginners;100;4;5;0;400;5000;20000;35000 -7727;1;Small Green Ugly Fish - For Beginners;116;4;6;0;400;5000;20000;35000 -7728;1;Small Green Pudgy Fish - For Beginners;132;5;4;0;400;5000;20000;35000 -7729;2;Green Nimble Fish - For Beginners;150;5;5;0;400;5000;20000;35000 -7730;2;Green Ugly Fish - For Beginners;168;6;6;0;400;5000;20000;35000 -7731;2;Green Pudgy Fish - For Beginners;188;7;4;0;400;5000;20000;35000 -7732;3;Large Green Nimble Fish - For Beginners;208;7;5;0;400;5000;20000;35000 -7733;3;Large Green Ugly Fish - For Beginners;230;8;6;0;400;5000;20000;35000 -7734;3;Large Green Pudgy Fish - For Beginners;252;9;4;0;400;5000;20000;35000 -7735;4;Small Jade Nimble Fish - For Beginners;276;10;5;0;400;5000;20000;35000 -7736;4;Small Jade Ugly Fish - For Beginners;300;11;6;0;400;5000;20000;35000 -7737;4;Small Jade Fat Fish - For Beginners;310;11;4;0;400;5000;20000;35000 -7738;5;Jade Nimble Fish - For Beginners;320;11;5;0;400;5000;20000;35000 -7739;5;Jade Ugly Fish - For Beginners;330;12;6;0;400;4000;20000;35000 -7740;5;Jade Fat Fish - For Beginners;340;12;4;0;400;4000;20000;35000 -7741;6;Large Jade Nimble Fish - For Beginners;350;13;5;0;400;4000;20000;35000 -7742;6;Large Jade Ugly Fish - For Beginners;360;13;6;0;400;4000;20000;35000 -7743;6;Large Jade Fat Fish - For Beginners;370;13;4;0;400;4000;20000;35000 -7744;7;Small Blue Nimble Fish - For Beginners;380;14;5;0;400;4000;20000;35000 -7745;7;Small Blue Ugly Fish - For Beginners;390;14;6;0;400;4000;20000;35000 -7746;7;Small Blue Fat Fish - For Beginners;400;14;4;0;400;4000;20000;35000 -7747;8;Blue Nimble Fish - For Beginners;410;15;5;0;400;4000;20000;35000 -7748;8;Blue Ugly Fish - For Beginners;420;15;6;0;400;4000;20000;35000 -7749;8;Blue Fat Fish - For Beginners;430;15;4;0;400;4000;20000;35000 -7750;9;Large Blue Nimble Fish - For Beginners;506;18;5;0;400;4000;20000;35000 -7751;9;Large Blue Ugly Fish - For Beginners;518;19;6;0;400;4000;20000;35000 -7752;9;Large Blue Fat Fish - For Beginners;529;19;4;0;400;4000;20000;35000 -7753;10;Small Yellow Nimble Fish - For Beginners;541;19;5;0;400;4000;20000;35000 -7754;10;Small Yellow Ugly Fish - For Beginners;552;20;6;0;400;4000;20000;35000 -7755;10;Small Yellow Fat Fish - For Beginners;564;20;4;0;400;4000;20000;35000 -7756;11;Yellow Nimble Fish - For Beginners;575;21;5;0;400;4000;20000;35000 -7757;11;Yellow Ugly Fish - For Beginners;587;21;6;0;400;4000;20000;35000 -7758;11;Yellow Fat Fish - For Beginners;598;21;4;0;400;4000;20000;35000 -7759;12;Large Yellow Nimble Fish - For Beginners;610;22;5;0;400;4000;20000;35000 -7760;12;Large Yellow Ugly Fish - For Beginners;621;22;6;0;400;4000;20000;35000 -7761;12;Large Yellow Fat Fish - For Beginners;633;23;4;0;400;4000;20000;35000 -7762;13;Small Orange Nimble Fish - For Beginners;644;23;5;0;400;4000;20000;35000 -7763;13;Small Orange Ugly Fish - For Beginners;656;23;6;0;400;4000;20000;35000 -7764;13;Small Orange Fat Fish - For Beginners;667;24;4;0;400;3000;20000;35000 -7765;14;Orange Nimble Fish - For Beginners;679;24;5;0;400;3000;20000;35000 -7766;14;Orange Ugly Fish - For Beginners;690;25;6;0;400;3000;20000;35000 -7767;14;Orange Fat Fish - For Beginners;702;25;4;0;400;3000;20000;35000 -7768;15;Large Orange Nimble Fish - For Beginners;713;25;5;0;400;3000;20000;35000 -7769;15;Large Orange Ugly Fish - For Beginners;819;29;6;0;400;3000;20000;35000 -7770;15;Large Orange Fat Fish - For Beginners;832;30;4;0;400;3000;20000;35000 -7771;16;Small Purple Nimble Fish - For Beginners;845;30;5;0;400;3000;20000;35000 -7772;16;Small Purple Ugly Fish - For Beginners;858;31;6;0;400;3000;20000;35000 -7773;16;Small Purple Fat Fish - For Beginners;871;31;4;0;400;3000;20000;35000 -7774;17;Purple Nimble Fish - For Beginners;884;32;5;0;400;3000;20000;35000 -7775;17;Purple Ugly Fish - For Beginners;897;32;6;0;400;3000;20000;35000 -7776;17;Purple Fat Fish - For Beginners;910;33;4;0;400;3000;20000;35000 -7777;18;Large Purple Nimble Fish - For Beginners;923;33;5;0;400;3000;20000;35000 -7778;18;Large Purple Ugly Fish - For Beginners;936;33;6;0;400;3000;20000;35000 -7779;18;Large Purple Fat Fish - For Beginners;949;34;4;0;400;3000;20000;35000 -7780;19;Small Red Nimble Fish - For Beginners;962;34;5;0;400;3000;20000;35000 -7781;19;Small Red Ugly Fish - For Beginners;1125;40;6;0;400;3000;20000;35000 -7782;19;Small Red Fat Fish - For Beginners;1140;41;4;0;400;3000;20000;35000 -7783;20;Red Nimble Fish - For Beginners;1155;41;5;0;400;3000;20000;35000 -7784;20;Red Ugly Fish - For Beginners;1170;42;6;0;400;3000;20000;35000 -7785;20;Red Fat Fish - For Beginners;1185;42;4;0;400;3000;20000;35000 -7786;21;Large Red Nimble Fish - For Beginners;1200;43;5;0;400;3000;20000;35000 -7787;21;Large Red Ugly Fish - For Beginners;1215;43;6;0;400;3000;20000;35000 -7788;21;Large Red Fat Fish - For Beginners;1230;44;4;0;400;3000;20000;35000 -7789;22;Small White Nimble Fish - For Beginners;1453;52;5;0;400;2000;20000;35000 -7790;22;Small White Ugly Fish - For Beginners;1470;53;6;0;400;2000;20000;35000 -7791;22;Small White Fat Fish - For Beginners;1488;53;4;0;400;2000;20000;35000 -7792;23;White Nimble Fish - For Beginners;1505;54;5;0;400;2000;20000;35000 -7793;23;White Ugly Fish - For Beginners;1523;54;6;0;400;2000;20000;35000 -7794;23;White Fat Fish - For Beginners;1540;55;4;0;400;2000;20000;35000 -7795;24;Large White Nimble Fish - For Beginners;1558;56;5;0;400;2000;20000;35000 -7796;24;Large White Ugly Fish - For Beginners;1575;56;6;0;400;2000;20000;35000 -7797;24;Large White Fat Fish - For Beginners;1593;57;4;0;400;2000;20000;35000 -7798;25;Small Black Nimble Fish - For Beginners;1610;58;5;0;400;2000;20000;35000 -7799;25;Small Black Ugly Fish - For Beginners;1628;58;6;0;400;2000;20000;35000 -7800;25;Small Black Fat Fish - For Beginners;1645;59;4;0;400;2000;20000;35000 -7801;26;Black Nimble Fish - For Beginners;1663;59;5;0;400;2000;20000;35000 -7802;26;Black Ugly Fish - For Beginners;1872;67;6;0;400;2000;20000;35000 -7803;26;Black Fat Fish - For Beginners;1892;68;4;0;400;2000;20000;35000 -7804;27;Large Black Nimble Fish - For Beginners;1911;68;5;0;400;2000;20000;35000 -7805;27;Large Black Ugly Fish - For Beginners;1931;69;6;0;400;2000;20000;35000 -7806;27;Large Black Fat Fish - For Beginners;1950;70;4;0;400;2000;20000;35000 -8403;1;Small Green Nimble Fish - Upper Grade;100;4;8;2;500;5000;20000;24000 -8404;1;Small Green Ugly Fish - Upper Grade;116;4;9;2;502;5000;20000;27000 -8405;1;Small Green Pudgy Fish - Upper Grade;132;5;7;2;504;5000;20000;31000 -8406;2;Green Nimble Fish - Upper Grade;150;6;8;2;506;5000;20000;25000 -8407;2;Green Ugly Fish - Upper Grade;168;6;9;2;508;5000;20000;28000 -8408;2;Green Pudgy Fish - Upper Grade;188;6;7;2;510;5000;20000;31000 -8409;3;Large Green Nimble Fish - Upper Grade;208;8;8;2;512;5000;20000;26000 -8410;3;Large Green Ugly Fish - Upper Grade;230;8;9;2;514;5000;20000;29000 -8411;3;Large Green Pudgy Fish - Upper Grade;252;8;7;2;516;5000;20000;32000 -8412;4;Small Jade Nimble Fish - Upper Grade;276;10;8;2;518;5000;20000;28000 -8413;4;Small Jade Ugly Fish - Upper Grade;300;10;9;2;520;5000;20000;31000 -8414;4;Small Jade Fat Fish - Upper Grade;310;10;7;2;522;5000;20000;32000 -8415;5;Jade Nimble Fish - Upper Grade;320;11;8;2;524;5000;20000;30000 -8416;5;Jade Ugly Fish - Upper Grade;330;11;9;2;526;4000;20000;31000 -8417;5;Jade Fat Fish - Upper Grade;340;11;7;2;528;4000;20000;32000 -8418;6;Large Jade Nimble Fish - Upper Grade;350;12;8;2;530;4000;20000;30000 -8419;6;Large Jade Ugly Fish - Upper Grade;360;12;9;2;532;4000;20000;31000 -8420;6;Large Jade Fat Fish - Upper Grade;370;12;7;2;534;4000;20000;32000 -8421;7;Small Blue Nimble Fish - Upper Grade;380;12;8;2;536;4000;20000;31000 -8422;7;Small Blue Ugly Fish - Upper Grade;390;13;9;2;538;4000;20000;31000 -8423;7;Small Blue Fat Fish - Upper Grade;400;13;7;2;540;4000;20000;32000 -8424;8;Blue Nimble Fish - Upper Grade;410;13;8;2;542;4000;20000;31000 -8425;8;Blue Ugly Fish - Upper Grade;420;13;9;2;544;4000;20000;32000 -8426;8;Blue Fat Fish - Upper Grade;430;14;7;2;546;4000;20000;31000 -8427;9;Large Blue Nimble Fish - Upper Grade;506;17;8;2;548;4000;20000;29000 -8428;9;Large Blue Ugly Fish - Upper Grade;518;17;9;2;550;4000;20000;30000 -8429;9;Large Blue Fat Fish - Upper Grade;529;17;7;2;552;4000;20000;31000 -8430;10;Small Yellow Nimble Fish - Upper Grade;541;18;8;2;554;4000;20000;30000 -8431;10;Small Yellow Ugly Fish - Upper Grade;552;18;9;2;556;4000;20000;30000 -8432;10;Small Yellow Fat Fish - Upper Grade;564;18;7;2;558;4000;20000;31000 -8433;11;Yellow Nimble Fish - Upper Grade;575;19;8;2;560;4000;20000;30000 -8434;11;Yellow Ugly Fish - Upper Grade;587;19;9;2;562;4000;20000;31000 -8435;11;Yellow Fat Fish - Upper Grade;598;19;7;2;564;4000;20000;31000 -8436;12;Large Yellow Nimble Fish - Upper Grade;610;20;8;2;566;4000;20000;30000 -8437;12;Large Yellow Ugly Fish - Upper Grade;621;20;9;2;568;4000;20000;31000 -8438;12;Large Yellow Fat Fish - Upper Grade;633;20;7;2;570;4000;20000;31000 -8439;13;Small Orange Nimble Fish - Upper Grade;644;21;8;2;572;4000;20000;30000 -8440;13;Small Orange Ugly Fish - Upper Grade;656;21;9;2;574;4000;20000;31000 -8441;13;Small Orange Fat Fish - Upper Grade;667;21;7;2;576;3000;20000;32000 -8442;14;Orange Nimble Fish - Upper Grade;679;22;8;2;578;3000;20000;31000 -8443;14;Orange Ugly Fish - Upper Grade;690;22;9;2;580;3000;20000;31000 -8444;14;Orange Fat Fish - Upper Grade;702;22;7;2;582;3000;20000;32000 -8445;15;Large Orange Nimble Fish - Upper Grade;713;25;8;2;584;3000;20000;29000 -8446;15;Large Orange Ugly Fish - Upper Grade;819;27;9;2;586;3000;20000;30000 -8447;15;Large Orange Fat Fish - Upper Grade;832;28;7;2;588;3000;20000;30000 -8448;16;Small Purple Nimble Fish - Upper Grade;845;29;8;2;590;3000;20000;29000 -8449;16;Small Purple Ugly Fish - Upper Grade;858;29;9;2;592;3000;20000;30000 -8450;16;Small Purple Fat Fish - Upper Grade;871;29;7;2;594;3000;20000;30000 -8451;17;Purple Nimble Fish - Upper Grade;884;29;8;2;596;3000;20000;30000 -8452;17;Purple Ugly Fish - Upper Grade;897;30;9;2;598;3000;20000;30000 -8453;17;Purple Fat Fish - Upper Grade;910;29;7;2;600;3000;20000;31000 -8454;18;Large Purple Nimble Fish - Upper Grade;923;31;8;2;602;3000;20000;30000 -8455;18;Large Purple Ugly Fish - Upper Grade;936;31;9;2;604;3000;20000;30000 -8456;18;Large Purple Fat Fish - Upper Grade;949;31;7;2;606;3000;20000;31000 -8457;19;Small Red Nimble Fish - Upper Grade;962;34;8;2;608;3000;20000;28000 -8458;19;Small Red Ugly Fish - Upper Grade;1125;39;9;2;610;3000;20000;29000 -8459;19;Small Red Fat Fish - Upper Grade;1140;39;7;2;612;3000;20000;29000 -8460;20;Red Nimble Fish - Upper Grade;1155;40;8;2;614;3000;20000;29000 -8461;20;Red Ugly Fish - Upper Grade;1170;40;9;2;616;3000;20000;29000 -8462;20;Red Fat Fish - Upper Grade;1185;40;7;2;618;3000;20000;30000 -8463;21;Large Red Nimble Fish - Upper Grade;1200;41;8;2;620;3000;20000;29000 -8464;21;Large Red Ugly Fish - Upper Grade;1215;42;9;2;622;3000;20000;29000 -8465;21;Large Red Fat Fish - Upper Grade;1230;46;7;2;624;3000;20000;27000 -8466;22;Small White Nimble Fish - Upper Grade;1453;56;8;2;626;2000;20000;26000 -8467;22;Small White Ugly Fish - Upper Grade;1470;54;9;2;628;2000;20000;27000 -8468;22;Small White Fat Fish - Upper Grade;1488;55;7;2;630;2000;20000;27000 -8469;23;White Nimble Fish - Upper Grade;1505;56;8;2;632;2000;20000;27000 -8470;23;White Ugly Fish - Upper Grade;1523;56;9;2;634;2000;20000;27000 -8471;23;White Fat Fish - Upper Grade;1540;57;7;2;636;2000;20000;27000 -8472;24;High Grade - Large White Nimble Fish;1558;58;8;2;638;2000;20000;27000 -8473;24;Large White Ugly Fish - Upper Grade;1575;58;9;2;640;2000;20000;27000 -8474;24;Large White Fat Fish - Upper Grade;1593;59;7;2;642;2000;20000;27000 -8475;25;Small Black Nimble Fish - Upper Grade;1610;60;8;2;644;2000;20000;27000 -8476;25;Small Black Ugly Fish - Upper Grade;1628;60;9;2;646;2000;20000;27000 -8477;25;Small Black Fat Fish - Upper Grade;1648;59;7;2;648;2000;20000;28000 -8478;26;Black Nimble Fish - Upper Grade;1663;67;8;2;650;2000;20000;25000 -8479;26;Black Ugly Fish - Upper Grade;1872;75;9;2;652;2000;20000;25000 -8480;26;Black Fat Fish - Upper Grade;1892;76;7;2;654;2000;20000;25000 -8481;27;Large Black Nimble Fish - Upper Grade;1911;76;8;2;656;2000;20000;25000 -8482;27;Large Black Ugly Fish - Upper Grade;1931;77;9;2;658;2000;20000;25000 -8483;27;Large Black Fat Fish - Upper Grade;1950;78;7;2;660;2000;20000;25000 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/Fish.xsd b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/Fish.xsd new file mode 100644 index 0000000000..f49d01b8ae --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/Fish.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 0d6383f28a..9a69df0059 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -48,7 +48,6 @@ import org.l2jmobius.gameserver.datatables.SchemeBufferTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.csv.DoorTable; import org.l2jmobius.gameserver.datatables.csv.ExtractableItemsData; -import org.l2jmobius.gameserver.datatables.csv.FishTable; import org.l2jmobius.gameserver.datatables.csv.HennaTable; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRoutesTable; @@ -73,6 +72,7 @@ import org.l2jmobius.gameserver.datatables.xml.AdminData; import org.l2jmobius.gameserver.datatables.xml.AugmentationData; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; import org.l2jmobius.gameserver.datatables.xml.FenceData; +import org.l2jmobius.gameserver.datatables.xml.FishData; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.datatables.xml.ZoneData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -253,7 +253,7 @@ public class GameServer SummonItemsData.getInstance(); if (Config.ALLOWFISHING) { - FishTable.getInstance(); + FishData.getInstance(); } Util.printSection("Npc"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/FishTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/FishTable.java deleted file mode 100644 index 339a2800f6..0000000000 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/FishTable.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.datatables.csv; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.LineNumberReader; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; -import java.util.logging.Logger; - -import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.FishData; - -/** - * @author -Nemesiss- - */ -public class FishTable -{ - private static final Logger LOGGER = Logger.getLogger(FishTable.class.getName()); - - private static List _fishsNormal; - private static List _fishsEasy; - private static List _fishsHard; - public static FishData fish; - - private FishTable() - { - int count = 0; - - FileReader reader = null; - BufferedReader buff = null; - LineNumberReader lnr = null; - - try - { - final File fileData = new File(Config.DATAPACK_ROOT + "/data/csv/fish.csv"); - - reader = new FileReader(fileData); - buff = new BufferedReader(reader); - lnr = new LineNumberReader(buff); - - String line = null; - - _fishsEasy = new ArrayList<>(); - _fishsNormal = new ArrayList<>(); - _fishsHard = new ArrayList<>(); - - // format: - // id;level;name;hp;hpregen;fish_type;fish_group;fish_guts;guts_check_time;wait_time;combat_time - while ((line = lnr.readLine()) != null) - { - // ignore comments - if ((line.trim().length() == 0) || line.startsWith("#")) - { - continue; - } - - final StringTokenizer st = new StringTokenizer(line, ";"); - - final int id = Integer.parseInt(st.nextToken()); - final int lvl = Integer.parseInt(st.nextToken()); - final String name = st.nextToken(); - final int hp = Integer.parseInt(st.nextToken()); - final int hpreg = Integer.parseInt(st.nextToken()); - final int type = Integer.parseInt(st.nextToken()); - final int group = Integer.parseInt(st.nextToken()); - final int fish_guts = Integer.parseInt(st.nextToken()); - final int guts_check_time = Integer.parseInt(st.nextToken()); - final int wait_time = Integer.parseInt(st.nextToken()); - final int combat_time = Integer.parseInt(st.nextToken()); - - fish = new FishData(id, lvl, name, hp, hpreg, type, group, fish_guts, guts_check_time, wait_time, combat_time); - switch (fish.getGroup()) - { - case 0: - { - _fishsEasy.add(fish); - break; - } - case 1: - { - _fishsNormal.add(fish); - break; - } - case 2: - { - _fishsHard.add(fish); - } - } - } - - count = _fishsEasy.size() + _fishsNormal.size() + _fishsHard.size(); - } - catch (FileNotFoundException e) - { - LOGGER.warning("fish.csv is missing in data folder"); - } - catch (IOException e0) - { - LOGGER.warning("Error while creating table: " + e0.getMessage() + "\n" + e0); - } - finally - { - if (lnr != null) - { - try - { - lnr.close(); - } - catch (Exception e1) - { - LOGGER.warning("Problem with FishTable: " + e1.getMessage()); - } - } - - if (buff != null) - { - try - { - buff.close(); - } - catch (Exception e1) - { - LOGGER.warning("Problem with FishTable: " + e1.getMessage()); - } - } - - if (reader != null) - { - try - { - reader.close(); - } - catch (Exception e1) - { - LOGGER.warning("Problem with FishTable: " + e1.getMessage()); - } - } - } - LOGGER.info("FishTable: Loaded " + count + " Fishes."); - } - - /** - * @param lvl - * @param type - * @param group - * @return List of Fish that can be fished - */ - public List getfish(int lvl, int type, int group) - { - final List result = new ArrayList<>(); - List fishes = null; - - switch (group) - { - case 0: - { - fishes = _fishsEasy; - break; - } - case 1: - { - fishes = _fishsNormal; - break; - } - case 2: - { - fishes = _fishsHard; - } - } - if (fishes == null) - { - LOGGER.warning("Fish are not defined!"); - return null; - } - for (FishData f : fishes) - { - if (f.getLevel() != lvl) - { - continue; - } - - if (f.getType() != type) - { - continue; - } - - result.add(f); - } - if (result.isEmpty()) - { - LOGGER.warning("Cant Find Any Fish!? - Lvl: " + lvl + " Type: " + type); - } - - return result; - } - - public static FishTable getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final FishTable INSTANCE = new FishTable(); - } -} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java new file mode 100644 index 0000000000..9bed05dea5 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java @@ -0,0 +1,102 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.datatables.xml; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Fish; +import org.l2jmobius.gameserver.model.StatsSet; + +/** + * This class loads and stores {@link Fish} infos. + */ +public class FishData implements IXmlReader +{ + private final List _fish = new ArrayList<>(); + + protected FishData() + { + load(); + } + + @Override + public void load() + { + parseDatapackFile("data/Fish.xml"); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _fish.size() + " fish."); + } + + @Override + public void parseDocument(Document doc, File f) + { + // StatsSet used to feed informations. Cleaned on every entry. + final StatsSet set = new StatsSet(); + + // First element is never read. + final Node n = doc.getFirstChild(); + for (Node node = n.getFirstChild(); node != null; node = node.getNextSibling()) + { + if (!"fish".equalsIgnoreCase(node.getNodeName())) + { + continue; + } + + // Parse and feed content. + final NamedNodeMap attrs = node.getAttributes(); + for (int i = 0; i < attrs.getLength(); i++) + { + final Node attr = attrs.item(i); + set.set(attr.getNodeName(), attr.getNodeValue()); + } + + // Feed the list with new data. + _fish.add(new Fish(set)); + } + } + + /** + * Get a random {@link FishData} based on level, type and group. + * @param lvl : the fish level to check. + * @param type : the fish type to check. + * @param group : the fish group to check. + * @return a Fish with good criteria. + */ + public Fish getFish(int lvl, int type, int group) + { + final List fish = _fish.stream().filter(f -> (f.getLevel() == lvl) && (f.getType() == type) && (f.getGroup() == group)).collect(Collectors.toList()); + return fish.get(Rnd.get(fish.size())); + } + + public static FishData getInstance() + { + return SingletonHolder.INSTANCE; + } + + private static class SingletonHolder + { + protected static final FishData INSTANCE = new FishData(); + } +} \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java index d2ffcb1e88..434a3fcb37 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java @@ -69,10 +69,10 @@ public class Recipes implements IItemHandler // can't add recipe, becouse create item level too low player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER)); } - else if (player.getDwarvenRecipeBook().length >= player.GetDwarfRecipeLimit()) + else if (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit()) { final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER); - sm.addNumber(player.GetDwarfRecipeLimit()); + sm.addNumber(player.getDwarfRecipeLimit()); player.sendPacket(sm); } else @@ -97,10 +97,10 @@ public class Recipes implements IItemHandler // can't add recipe, becouse create item level too low player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER)); } - else if (player.getCommonRecipeBook().length >= player.GetCommonRecipeLimit()) + else if (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit()) { final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER); - sm.addNumber(player.GetCommonRecipeLimit()); + sm.addNumber(player.getCommonRecipeLimit()); player.sendPacket(sm); } else diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index 83a2d94d5e..f9b42a9ab9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -64,13 +64,13 @@ public class Fishing implements ISkillHandler if (player.isFishing()) { - if (player.GetFishCombat() != null) + if (player.getFishCombat() != null) { - player.GetFishCombat().doDie(false); + player.getFishCombat().doDie(false); } else { - player.EndFishing(false); + player.endFishing(false); } // Cancels fishing player.sendPacket(SystemMessageId.FISHING_ATTEMPT_CANCELLED); @@ -94,7 +94,7 @@ public class Fishing implements ISkillHandler return; } - player.SetLure(lure); + player.setLure(lure); ItemInstance lure2 = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); if ((lure2 == null) || (lure2.getCount() < 1)) // Not enough bait. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index 94e8704e23..96764d6757 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -48,7 +48,7 @@ public class FishingSkill implements ISkillHandler final PlayerInstance player = (PlayerInstance) creature; - final Fishing fish = player.GetFishCombat(); + final Fishing fish = player.getFishCombat(); if (fish == null) { if (skill.getSkillType() == SkillType.PUMPING) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/FishData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java similarity index 57% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/FishData.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java index d42cfda760..1e16f7a4b4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/FishData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java @@ -1,122 +1,110 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -public class FishData -{ - private final int _id; - private final int _level; - private final String _name; - private final int _hp; - private final int _hpRegen; - private int _type; - private final int _group; - private final int _fishGuts; - private final int _gutsCheckTime; - private final int _waitTime; - private final int _combatTime; - - public FishData(int id, int lvl, String name, int hp, int hpRegen, int type, int group, int fishGuts, int gutsCheckTime, int waitTime, int combatTime) - { - _id = id; - _level = lvl; - _name = name.intern(); - _hp = hp; - _hpRegen = hpRegen; - _type = type; - _group = group; - _fishGuts = fishGuts; - _gutsCheckTime = gutsCheckTime; - _waitTime = waitTime; - _combatTime = combatTime; - } - - public FishData(FishData copyOf) - { - _id = copyOf.getId(); - _level = copyOf.getLevel(); - _name = copyOf.getName(); - _hp = copyOf.getHP(); - _hpRegen = copyOf.getHpRegen(); - _type = copyOf.getType(); - _group = copyOf.getGroup(); - _fishGuts = copyOf.getFishGuts(); - _gutsCheckTime = copyOf.getGutsCheckTime(); - _waitTime = copyOf.getWaitTime(); - _combatTime = copyOf.getCombatTime(); - } - - public int getId() - { - return _id; - } - - public int getLevel() - { - return _level; - } - - public String getName() - { - return _name; - } - - public int getHP() - { - return _hp; - } - - public int getHpRegen() - { - return _hpRegen; - } - - public int getType() - { - return _type; - } - - public int getGroup() - { - return _group; - } - - public int getFishGuts() - { - return _fishGuts; - } - - public int getGutsCheckTime() - { - return _gutsCheckTime; - } - - public int getWaitTime() - { - return _waitTime; - } - - public int getCombatTime() - { - return _combatTime; - } - - public void setType(int type) - { - _type = type; - } -} +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import org.l2jmobius.gameserver.GameTimeController; + +/** + * A datatype used to retain a fish information. + */ +public class Fish +{ + private final int _id; + private final int _level; + private final int _hp; + private final int _hpRegen; + private final int _type; + private final int _group; + private final int _guts; + private final int _gutsCheckTime; + private final int _waitTime; + private final int _combatTime; + + public Fish(StatsSet set) + { + _id = set.getInt("id"); + _level = set.getInt("level"); + _hp = set.getInt("hp"); + _hpRegen = set.getInt("hpRegen"); + _type = set.getInt("type"); + _group = set.getInt("group"); + _guts = set.getInt("guts"); + _gutsCheckTime = set.getInt("gutsCheckTime"); + _waitTime = set.getInt("waitTime"); + _combatTime = set.getInt("combatTime"); + } + + public int getId() + { + return _id; + } + + public int getLevel() + { + return _level; + } + + public int getHp() + { + return _hp; + } + + public int getHpRegen() + { + return _hpRegen; + } + + public int getType() + { + return _type; + } + + public int getType(boolean isLureNight) + { + if (!GameTimeController.getInstance().isNowNight() && isLureNight) + { + return -1; + } + + return _type; + } + + public int getGroup() + { + return _group; + } + + public int getGuts() + { + return _guts; + } + + public int getGutsCheckTime() + { + return _gutsCheckTime; + } + + public int getWaitTime() + { + return _waitTime; + } + + public int getCombatTime() + { + return _combatTime; + } +} \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java index 9bb969d06a..04306ff384 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fishing.java @@ -43,6 +43,8 @@ public class Fishing implements Runnable private int _deceptiveMode = 0; private Future _fishAiTask; private boolean _thinking; + + // Fish datas private final int _fishId; private final int _fishMaxHp; private int _fishCurHp; @@ -77,10 +79,10 @@ public class Fishing implements Runnable } } - public Fishing(PlayerInstance fisher, FishData fish, boolean isNoob, boolean isUpperGrade, int lureId) + public Fishing(PlayerInstance fisher, Fish fish, boolean isNoob, boolean isUpperGrade, int lureId) { _fisher = fisher; - _fishMaxHp = fish.getHP(); + _fishMaxHp = fish.getHp(); _fishCurHp = _fishMaxHp; _regenHp = fish.getHpRegen(); _fishId = fish.getId(); @@ -101,9 +103,9 @@ public class Fishing implements Runnable _mode = Rnd.get(100) >= 80 ? 1 : 0; - final ExFishingStartCombat efsc = new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, _lureType, _deceptiveMode); - _fisher.broadcastPacket(efsc); + _fisher.broadcastPacket(new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, _lureType, _deceptiveMode)); _fisher.sendPacket(new PlaySound(1, "SF_S_01")); + // Succeeded in getting a bite _fisher.sendPacket(SystemMessageId.GOT_A_BITE); @@ -121,8 +123,7 @@ public class Fishing implements Runnable _fishCurHp = 0; } - final ExFishingHpRegen efhr = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, _goodUse, _anim, pen, _deceptiveMode); - _fisher.broadcastPacket(efhr); + _fisher.broadcastPacket(new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, _goodUse, _anim, pen, _deceptiveMode)); _anim = 0; if (_fishCurHp > (_fishMaxHp * 2)) { @@ -153,7 +154,8 @@ public class Fishing implements Runnable final int check = Rnd.get(100); if (check <= 5) { - PenaltyMonster(); + _fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING_SMELLY_THROW_IT_BACK); + spawnPenaltyMonster(); } else { @@ -162,7 +164,7 @@ public class Fishing implements Runnable FishingChampionshipManager.getInstance().newFish(_fisher, _lureId); } } - _fisher.EndFishing(win); + _fisher.endFishing(win); _fisher = null; } @@ -249,15 +251,10 @@ public class Fishing implements Runnable if (_deceptiveMode == 0) { // Reeling is successful, Damage: $s1 - SystemMessage sm = new SystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE); - sm.addNumber(dmg); - _fisher.sendPacket(sm); - + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE).addNumber(dmg)); if (pen == 50) { - sm = new SystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1); - sm.addNumber(pen); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1).addNumber(pen)); } _goodUse = 1; @@ -266,9 +263,7 @@ public class Fishing implements Runnable else { // Reeling failed, Damage: $s1 - final SystemMessage sm = new SystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED); - sm.addNumber(dmg); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED).addNumber(dmg)); _goodUse = 2; changeHp(-dmg, pen); } @@ -276,24 +271,17 @@ public class Fishing implements Runnable else if (_deceptiveMode == 0) { // Reeling failed, Damage: $s1 - final SystemMessage sm = new SystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED); - sm.addNumber(dmg); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED).addNumber(dmg)); _goodUse = 2; changeHp(-dmg, pen); } else { // Reeling is successful, Damage: $s1 - SystemMessage sm = new SystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE); - sm.addNumber(dmg); - _fisher.sendPacket(sm); - + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE).addNumber(dmg)); if (pen == 50) { - sm = new SystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1); - sm.addNumber(pen); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1).addNumber(pen)); } _goodUse = 1; @@ -323,15 +311,10 @@ public class Fishing implements Runnable if (_deceptiveMode == 0) { // Pumping is successful. Damage: $s1 - SystemMessage sm = new SystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE); - sm.addNumber(dmg); - _fisher.sendPacket(sm); - + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE).addNumber(dmg)); if (pen == 50) { - sm = new SystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1); - sm.addNumber(pen); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1).addNumber(pen)); } _goodUse = 1; @@ -340,9 +323,7 @@ public class Fishing implements Runnable else { // Pumping failed, Regained: $s1 - final SystemMessage sm = new SystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED); - sm.addNumber(dmg); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED).addNumber(dmg)); _goodUse = 2; changeHp(-dmg, pen); } @@ -350,24 +331,17 @@ public class Fishing implements Runnable else if (_deceptiveMode == 0) { // Pumping failed, Regained: $s1 - final SystemMessage sm = new SystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED); - sm.addNumber(dmg); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED).addNumber(dmg)); _goodUse = 2; changeHp(-dmg, pen); } else { // Pumping is successful. Damage: $s1 - SystemMessage sm = new SystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE); - sm.addNumber(dmg); - _fisher.sendPacket(sm); - + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE).addNumber(dmg)); if (pen == 50) { - sm = new SystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1); - sm.addNumber(pen); - _fisher.sendPacket(sm); + _fisher.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1).addNumber(pen)); } _goodUse = 1; @@ -375,74 +349,69 @@ public class Fishing implements Runnable } } - private void PenaltyMonster() + private void spawnPenaltyMonster() { - final int lvl = (int) Math.round(_fisher.getLevel() * 0.1); - int npcid; - - _fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING_SMELLY_THROW_IT_BACK); - switch (lvl) + int npcId; + switch ((int) Math.round(_fisher.getLevel() * 0.1)) { case 0: case 1: { - npcid = 18319; + npcId = 18319; break; } case 2: { - npcid = 18320; + npcId = 18320; break; } case 3: { - npcid = 18321; + npcId = 18321; break; } case 4: { - npcid = 18322; + npcId = 18322; break; } case 5: { - npcid = 18323; + npcId = 18323; break; } case 6: { - npcid = 18324; + npcId = 18324; break; } case 7: { - npcid = 18325; + npcId = 18325; break; } case 8: case 9: { - npcid = 18326; + npcId = 18326; break; } default: { - npcid = 18319; + npcId = 18319; break; } } - NpcTemplate temp; - temp = NpcTable.getInstance().getTemplate(npcid); - - if (temp != null) + NpcTemplate template = NpcTable.getInstance().getTemplate(npcId); + if (template != null) { try { - final Spawn spawn = new Spawn(temp); - spawn.setX(_fisher.GetFishx()); - spawn.setY(_fisher.GetFishy()); - spawn.setZ(_fisher.GetFishz()); + final Spawn spawn = new Spawn(template); + spawn.setX(_fisher.getFishX()); + spawn.setY(_fisher.getFishY()); + spawn.setZ(_fisher.getFishZ()); spawn.setAmount(1); spawn.setHeading(_fisher.getHeading()); spawn.stopRespawn(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java index 63024b316f..d0ce2f340a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java @@ -142,6 +142,6 @@ public class PlayerFreight extends ItemContainer @Override public boolean validateCapacity(int slots) { - return (getSize() + slots) <= _owner.GetFreightLimit(); + return (getSize() + slots) <= _owner.getFreightLimit(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerWarehouse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerWarehouse.java index 651360ea6a..820297ab6d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerWarehouse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerWarehouse.java @@ -58,6 +58,6 @@ public class PlayerWarehouse extends Warehouse @Override public boolean validateCapacity(int slots) { - return (_items.size() + slots) <= _owner.GetWareHouseLimit(); + return (_items.size() + slots) <= _owner.getWareHouseLimit(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2f04ff4389..f22a23fce8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -56,7 +56,6 @@ import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.datatables.HeroSkillTable; import org.l2jmobius.gameserver.datatables.NobleSkillTable; import org.l2jmobius.gameserver.datatables.SkillTable; -import org.l2jmobius.gameserver.datatables.csv.FishTable; import org.l2jmobius.gameserver.datatables.csv.HennaTable; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.datatables.csv.RecipeTable; @@ -66,6 +65,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import org.l2jmobius.gameserver.datatables.xml.AdminData; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; +import org.l2jmobius.gameserver.datatables.xml.FishData; import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -90,7 +90,7 @@ import org.l2jmobius.gameserver.instancemanager.TownManager; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.FishData; +import org.l2jmobius.gameserver.model.Fish; import org.l2jmobius.gameserver.model.Fishing; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.ItemContainer; @@ -471,6 +471,7 @@ public class PlayerInstance extends Playable private int _fishX = 0; private int _fishY = 0; private int _fishZ = 0; + private ItemInstance _lure = null; private ScheduledFuture _taskRentPet; private ScheduledFuture _taskWater; private final List _validBypass = new ArrayList<>(); @@ -519,7 +520,7 @@ public class PlayerInstance extends Playable private final List _selectedFriendList = new ArrayList<>(); // Related to CB. private final List _selectedBlocksList = new ArrayList<>(); // Related to CB. private int _mailPosition; - private FishData _fish; + private Fish _fish; private final Map _reuseTimestamps = new ConcurrentHashMap<>(); boolean _gmStatus = true; // true by default since this is used by GMs public WorldObject _saymode = null; @@ -11714,7 +11715,7 @@ public class PlayerInstance extends Playable { if (System.currentTimeMillis() >= _endTaskTime) { - EndFishing(false); + endFishing(false); return; } if (_fishType == -1) @@ -11725,7 +11726,7 @@ public class PlayerInstance extends Playable if (_fishGutsCheck > check) { stopLookingForFishTask(); - StartFishCombat(_isNoob, _isUpperGrade); + startFishCombat(_isNoob, _isUpperGrade); } } } @@ -14914,28 +14915,16 @@ public class PlayerInstance extends Playable return _selectedBlocksList; } - /** - * @return the mailPosition. - */ public int getMailPosition() { return _mailPosition; } - /** - * @param mailPosition The mailPosition to set. - */ public void setMailPosition(int mailPosition) { _mailPosition = mailPosition; } - /** - * Start fishing. - * @param x the fish x - * @param y the fish y - * @param z the fish z - */ public void startFishing(int x, int y, int z) { stopMove(null); @@ -14946,36 +14935,21 @@ public class PlayerInstance extends Playable _fishZ = z; broadcastUserInfo(); // Starts fishing - final int lvl = GetRandomFishLvl(); - final int group = GetRandomGroup(); - final int type = GetRandomFishType(group); - final List fishs = FishTable.getInstance().getfish(lvl, type, group); - if ((fishs == null) || fishs.isEmpty()) + final int lvl = getRandomFishLvl(); + final int group = getRandomGroup(); + final int type = getRandomFishType(group); + _fish = FishData.getInstance().getFish(lvl, type, group); + if (_fish == null) { sendMessage("Error - Fishes are not definied"); - EndFishing(false); + endFishing(false); return; } - final int check = Rnd.get(fishs.size()); - // Use a copy constructor else the fish data may be over-written below - _fish = new FishData(fishs.get(check)); - fishs.clear(); sendPacket(SystemMessageId.CAST_LINE_AND_START_FISHING); - ExFishingStart efs = null; - - if (!GameTimeController.getInstance().isNowNight() && _lure.isNightLure()) - { - _fish.setType(-1); - } - - efs = new ExFishingStart(this, _fish.getType(), x, y, z, _lure.isNightLure()); - broadcastPacket(efs); - StartLookingForFishTask(); + broadcastPacket(new ExFishingStart(this, _fish.getType(), x, y, z, _lure.isNightLure())); + startLookingForFishTask(); } - /** - * Stop looking for fish task. - */ public void stopLookingForFishTask() { if (_taskforfish != null) @@ -14985,10 +14959,7 @@ public class PlayerInstance extends Playable } } - /** - * Start looking for fish task. - */ - public void StartLookingForFishTask() + public void startLookingForFishTask() { if (!isDead() && (_taskforfish == null)) { @@ -15014,15 +14985,11 @@ public class PlayerInstance extends Playable checkDelay = Math.round((float) (_fish.getGutsCheckTime() * 0.66)); } } - _taskforfish = ThreadPool.scheduleAtFixedRate(new LookingForFishTask(_fish.getWaitTime(), _fish.getFishGuts(), _fish.getType(), isNoob, isUpperGrade), 10000, checkDelay); + _taskforfish = ThreadPool.scheduleAtFixedRate(new LookingForFishTask(_fish.getWaitTime(), _fish.getGuts(), _fish.getType(), isNoob, isUpperGrade), 10000, checkDelay); } } - /** - * Gets the random group. - * @return the int - */ - private int GetRandomGroup() + private int getRandomGroup() { switch (_lure.getItemId()) { @@ -15047,18 +15014,14 @@ public class PlayerInstance extends Playable } } - /** - * Gets the random fish type. - * @param group the group - * @return the int - */ - private int GetRandomFishType(int group) + private int getRandomFishType(int group) { final int check = Rnd.get(100); int type = 1; switch (group) { case 0: // fish for novices + { switch (_lure.getItemId()) { case 7807: // green lure, preferred by fast-moving (nimble) fish (type 5) @@ -15127,7 +15090,9 @@ public class PlayerInstance extends Playable } } break; + } case 1: // normal fish + { switch (_lure.getItemId()) { case 7610: @@ -15228,7 +15193,9 @@ public class PlayerInstance extends Playable } } break; + } case 2: // upper grade fish, luminous lure + { switch (_lure.getItemId()) { case 8506: // green lure, preferred by fast-moving (nimble) fish (type 8) @@ -15296,15 +15263,13 @@ public class PlayerInstance extends Playable break; } } + break; + } } return type; } - /** - * Gets the random fish lvl. - * @return the int - */ - private int GetRandomFishLvl() + private int getRandomFishLvl() { final Effect[] effects = getAllEffects(); int skilllvl = getSkillLevel(1315); @@ -15346,12 +15311,7 @@ public class PlayerInstance extends Playable return randomlvl; } - /** - * Start fish combat. - * @param isNoob the is noob - * @param isUpperGrade the is upper grade - */ - public void StartFishCombat(boolean isNoob, boolean isUpperGrade) + public void startFishCombat(boolean isNoob, boolean isUpperGrade) { _fishCombat = new Fishing(this, _fish, isNoob, isUpperGrade, _lure.getItemId()); } @@ -15360,7 +15320,7 @@ public class PlayerInstance extends Playable * End fishing. * @param win the win */ - public void EndFishing(boolean win) + public void endFishing(boolean win) { final ExFishingEnd efe = new ExFishingEnd(win, this); broadcastPacket(efe); @@ -15383,74 +15343,46 @@ public class PlayerInstance extends Playable stopLookingForFishTask(); } - /** - * Gets the fish combat. - * @return the l2 fishing - */ - public Fishing GetFishCombat() + public Fishing getFishCombat() { return _fishCombat; } - /** - * Gets the fishx. - * @return the int - */ - public int GetFishx() + public int getFishX() { return _fishX; } - /** - * Gets the fishy. - * @return the int - */ - public int GetFishy() + public int getFishY() { return _fishY; } - /** - * Gets the fishz. - * @return the int - */ - public int GetFishz() + public int getFishZ() { return _fishZ; } - public void SetPartyFind(int find) - { - _partyFind = find; - } - - public int GetPartyFind() - { - return _partyFind; - } - - /** - * Sets the lure. - * @param lure the lure - */ - public void SetLure(ItemInstance lure) + public void setLure(ItemInstance lure) { _lure = lure; } - /** - * Gets the lure. - * @return the l2 item instance - */ - public ItemInstance GetLure() + public ItemInstance getLure() { return _lure; } - /** - * Gets the inventory limit. - * @return the int - */ + public void setPartyFind(int find) + { + _partyFind = find; + } + + public int getPartyFind() + { + return _partyFind; + } + public int getInventoryLimit() { int ivlim; @@ -15471,11 +15403,7 @@ public class PlayerInstance extends Playable return ivlim; } - /** - * Gets the ware house limit. - * @return the int - */ - public int GetWareHouseLimit() + public int getWareHouseLimit() { int whlim; if (getRace() == Race.DWARF) @@ -15491,11 +15419,7 @@ public class PlayerInstance extends Playable return whlim; } - /** - * Gets the private sell store limit. - * @return the int - */ - public int GetPrivateSellStoreLimit() + public int getPrivateSellStoreLimit() { int pslim; if (getRace() == Race.DWARF) @@ -15512,11 +15436,7 @@ public class PlayerInstance extends Playable return pslim; } - /** - * Gets the private buy store limit. - * @return the int - */ - public int GetPrivateBuyStoreLimit() + public int getPrivateBuyStoreLimit() { int pblim; if (getRace() == Race.DWARF) @@ -15532,61 +15452,37 @@ public class PlayerInstance extends Playable return pblim; } - /** - * Gets the freight limit. - * @return the int - */ - public int GetFreightLimit() + public int getFreightLimit() { return Config.FREIGHT_SLOTS + (int) getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null); } - /** - * Gets the dwarf recipe limit. - * @return the int - */ - public int GetDwarfRecipeLimit() + public int getDwarfRecipeLimit() { int recdlim = Config.DWARF_RECIPE_LIMIT; recdlim += (int) getStat().calcStat(Stats.REC_D_LIM, 0, null, null); return recdlim; } - /** - * Gets the common recipe limit. - * @return the int - */ - public int GetCommonRecipeLimit() + public int getCommonRecipeLimit() { int recclim = Config.COMMON_RECIPE_LIMIT; recclim += (int) getStat().calcStat(Stats.REC_C_LIM, 0, null, null); return recclim; } - /** - * Sets the mount object id. - * @param newID the new mount object id - */ - public void setMountObjectID(int newID) + public void setMountObjectID(int oid) { - _mountObjectID = newID; + _mountObjectID = oid; } - /** - * Gets the mount object id. - * @return the mount object id - */ public int getMountObjectID() { return _mountObjectID; } - /** The _lure. */ - private ItemInstance _lure = null; - /** - * Get the current skill in use or return null.
- *
+ * Get the current skill in use or return null. * @return the current skill */ public SkillDat getCurrentSkill() @@ -15595,8 +15491,7 @@ public class PlayerInstance extends Playable } /** - * Create a new SkillDat object and set the player _currentSkill.
- *
+ * Create a new SkillDat object and set the player _currentSkill. * @param currentSkill the current skill * @param ctrlPressed the ctrl pressed * @param shiftPressed the shift pressed diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 5f2bc61b70..8083b0948a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -141,7 +141,7 @@ public class SetPrivateStoreListBuy extends GameClientPacket } // Check maximum number of allowed slots for pvt shops - if (_count > player.GetPrivateBuyStoreLimit()) + if (_count > player.getPrivateBuyStoreLimit()) { player.sendPacket(new PrivateStoreManageListBuy(player)); player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 3b35b25148..a5a5303992 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -149,7 +149,7 @@ public class SetPrivateStoreListSell extends GameClientPacket } // Check maximum number of allowed slots for pvt shops - if (_count > player.GetPrivateSellStoreLimit()) + if (_count > player.getPrivateSellStoreLimit()) { player.sendPacket(new PrivateStoreManageListSell(player)); player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 07c5070b47..8d35556ef7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -376,9 +376,9 @@ public class CharInfo extends GameServerPacket writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.getIsPVPHero()) ? 1 : 0); // Hero Aura writeC(_player.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0) - writeD(_player.GetFishx()); - writeD(_player.GetFishy()); - writeD(_player.GetFishz()); + writeD(_player.getFishX()); + writeD(_player.getFishY()); + writeD(_player.getFishZ()); writeD(_player.getAppearance().getNameColor()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 161db4b865..0697866d74 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -38,12 +38,12 @@ public class ExStorageMaxCount extends GameServerPacket { _player = character; _inventory = _player.getInventoryLimit(); - _warehouse = _player.GetWareHouseLimit(); - _privateSell = _player.GetPrivateSellStoreLimit(); - _privateBuy = _player.GetPrivateBuyStoreLimit(); - _freight = _player.GetFreightLimit(); - _receipeD = _player.GetDwarfRecipeLimit(); - _recipe = _player.GetCommonRecipeLimit(); + _warehouse = _player.getWareHouseLimit(); + _privateSell = _player.getPrivateSellStoreLimit(); + _privateBuy = _player.getPrivateBuyStoreLimit(); + _freight = _player.getFreightLimit(); + _receipeD = _player.getDwarfRecipeLimit(); + _recipe = _player.getCommonRecipeLimit(); } /* diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index ab8830d625..0021985369 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -326,9 +326,9 @@ public class UserInfo extends GameServerPacket writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.getIsPVPHero()) ? 1 : 0); // 0x01: Hero Aura writeC(_player.isFishing() ? 1 : 0); // Fishing Mode - writeD(_player.GetFishx()); // fishing x - writeD(_player.GetFishy()); // fishing y - writeD(_player.GetFishz()); // fishing z + writeD(_player.getFishX()); // fishing x + writeD(_player.getFishY()); // fishing y + writeD(_player.getFishZ()); // fishing z writeD(_player.getAppearance().getNameColor()); writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window