2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #134 from Ceikry/master

Browse source 
Added Archaeologist drop table and more- read desc
This commit is contained in:
Daniel Ginovker 2020-03-01 22:13:44 -05:00 • committed by GitHub
commit 78467f5821
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Server/server.sql
View file

@ -19606,6 +19606,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES
(8366, '{592,1,1,0.0,ALWAYS}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', '{1371,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1432,1,1,0.0,COMMON}~{1289,1,1,0.0,COMMON}~{1185,1,1,0.0,COMMON}~{5298,1,2,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5294,1,2,0.0,COMMON}~{5104,1,3,0.0,COMMON}~{5292,1,2,0.0,COMMON}~{5311,3,1,0.0,COMMON}~{5299,1,2,0.0,COMMON}~{200,1,11,0.0,COMMON}~{202,1,11,0.0,COMMON}~{204,1,11,0.0,COMMON}~{206,1,11,0.0,COMMON}~{210,1,11,0.0,COMMON}~{212,1,11,0.0,COMMON}~{214,1,11,0.0,COMMON}~{216,1,11,0.0,COMMON}~{2486,1,11,0.0,COMMON}~{1602,4,4,0.0,COMMON}~{2362,4,4,0.0,COMMON}~{560,20,40,0.0,COMMON}~{563,20,45,0.0,COMMON}~{1443,4,4,0.0,COMMON}~{995,3000,15000,0.0,COMMON}~{5302,1,2,0.0,UNCOMMON}~{5303,1,2,0.0,UNCOMMON}~{5105,1,3,0.0,UNCOMMON}~{5296,1,2,0.0,UNCOMMON}~{5323,1,4,0.0,UNCOMMON}~{12176,1,2,0.0,UNCOMMON}~{5295,1,3,0.0,UNCOMMON}~{5100,1,2,0.0,UNCOMMON}~{5280,4,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,UNCOMMON}~{208,1,11,0.0,UNCOMMON}~{5301,1,3,0.0,UNCOMMON}~{218,1,11,0.0,UNCOMMON}~{565,10,20,0.0,UNCOMMON}~{14484,1,1,0.0,VERY_RARE, 299}~{14474,1,1,0.0,VERY_RARE}~{14476,1,1,0.0,VERY_RARE}~{14472,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}'),
(8610, '{532,1,1,0.0,ALWAYS}', '{560,250,250,0.0,COMMON}~{562,400,400,0.0,COMMON}~{560,300,300,0.0,COMMON}~{565,200,200,0.0,COMMON}~{1620,20,20,0.0,COMMON}~{1618,10,10,0.0,COMMON}~{6035,100,100,0.0,UNCOMMON}~{238,100,100,0.0,UNCOMMON}~{224,500,500,0.0,UNCOMMON}~{445,300,300,0.0,UNCOMMON}~{2,250,250,0.0,UNCOMMON}~{1514,100,100,0.0,RARE}~{226,50,50,0.0,RARE}~{1631,1,1,0.0,RARE}~{5315,1,1,0.0,RARE}~{5316,1,1,0.0,RARE}~{5289,1,1,0.0,RARE}~{3052,100,100,0.0,RARE}~{3024,3,3,0.0,RARE}~{995,15000,20000,0.0,COMMON}~{9194,60,60,0.0,UNCOMMON}~{1275,1,1,0.0,COMMON}~{9244,100,100,0.0,UNCOMMON}~{1319,1,1,0.0,UNCOMMON}~{868,60,60,0.0,COMMON}~{14669,1,1,0.0,RARE,256}~{7158,1,1,0.0,RARE,256}~{14722,1,1,0.0,RARE,512}~{14939,8,8,0.0,COMMON}~{14943,375,375,0.0,RARE,128}', '{12158,4,4,0.06,ALWAYS}~{12159,4,4,0.03,ALWAYS}~{12160,4,4,0.63,ALWAYS}~{12163,4,4,0.02,ALWAYS}'),
(8612, '{562,1,1,0.0,ALWAYS}', '{562,400,400,0.0,COMMON}~{560,300,300,0.0,COMMON}~{565,200,200,0.0,COMMON}~{1620,20,20,0.0,COMMON}~{1618,10,10,0.0,COMMON}~{6035,100,100,0.0,UNCOMMON}~{238,100,100,0.0,UNCOMMON}~{224,500,500,0.0,UNCOMMON}~{445,300,300,0.0,UNCOMMON}~{2,250,250,0.0,UNCOMMON}~{1514,100,100,0.0,RARE}~{226,50,50,0.0,RARE}~{1631,1,1,0.0,RARE}~{5315,1,1,0.0,RARE}~{5316,1,1,0.0,RARE}~{5289,1,1,0.0,RARE}~{3052,100,100,0.0,RARE}~{3024,3,3,0.0,RARE}~{995,15000,20000,0.0,COMMON}~{9194,60,60,0.0,UNCOMMON}~{1275,1,1,0.0,COMMON}~{9244,100,100,0.0,UNCOMMON}~{1319,1,1,0.0,UNCOMMON}~{868,60,60,0.0,COMMON}~{14669,1,1,0.0,RARE,256}~{7158,1,1,0.0,RARE,256}~{14862,1,1,0.0,RARE,512}~{14939,8,8,0.0,COMMON}~{14943,375,375,0.0,RARE,128}', '{12158,4,4,0.06,ALWAYS}~{12159,4,4,0.03,ALWAYS}~{12160,4,4,0.63,ALWAYS}~{12163,4,4,0.02,ALWAYS}'),
(8656, '{526,1,1,0.0,ALWAYS}', '{1731,1,1,0.0,COMMON}~{2501,1,1,0.0,UNCOMMON}~{868,10,10,0.0,UNCOMMON}~{4698,30,30,0.0,UNCOMMON}~{2,150,150,0.0,UNCOMMON}~{11212,75,75,0.0,RARE}~{385,1,1,0.0,COMMON}~{6705,3,3,0.0,COMMON}~{2434,1,1,0.0,COMMON}~{2298,8,8,0.0,UNCOMMON}~{995,499,3998,0.0,COMMON}~{218,4,4,0.0,COMMON}~{240,10,10,0.0,COMMON}~{443,40,40,0.0,COMMON}~{1622,6,6,0.0,UNCOMMON}~{1624,4,4,0.0,UNCOMMON}~{1750,10,10,0.0,UNCOMMON}~{991,1,1,0.0,UNCOMMON}~{9194,12,12,0.0,RARE}~{10976,1,1,0.0,RARE}~{4675,1,1,0.0,RARE}', ''),
(8629, '{14693,1,1,0.0,ALWAYS}~{14695,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}~', '{811,12,12,0.0,COMMON}~{830,20,20,0.0,COMMON}~{554,75,75,0.0,COMMON}~{4699,15,30,0.0,COMMON}~{868,8,8,0.0,UNCOMMON}~{9144,30,30,0.0,UNCOMMON}~{560,20,20,0.0,UNCOMMON}~{565,20,20,0.0,UNCOMMON}~{563,20,20,0.0,UNCOMMON}~{9194,12,12,0.0,UNCOMMON}~{1317,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{3053,1,1,0.0,UNCOMMON}~{1359,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1201,1,1,0.0,UNCOMMON}~{1147,1,1,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{995,66,3000,0.0,COMMON}~{1442,1,1,0.0,COMMON}~{570,15,15,0.0,UNCOMMON}~{1897,3,3,0.0,UNCOMMON}~{2362,2,2,0.0,UNCOMMON}~{11286,1,1,0.0,VERY_RARE}', '{0,1,1,0.915,ALWAYS}~{12158,1,1,0.03,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.032,ALWAYS}~{12163,1,1,0.003,ALWAYS}');
-- --------------------------------------------------------
@ -19713,7 +19714,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(53, '{2694,9508,0,0,3}-{2703,9505,0,0,6}-{2710,9499,0,0,1}-{2704,9520,0,0,5}-{2714,9523,0,0,3}-{2722,9520,0,0,7}'),
(4356, '{3755,9391,0,1,5}-{3723,9441,0,1,4}-{3766,9459,0,1,4}-{3800,9414,0,1,2}-{3821,9418,0,1,3}-{3810,9462,0,1,0}-{3809,9440,0,1,2}-{3748,9450,0,1,6}-{3765,9424,0,1,2}-{3787,9464,0,1,0}'),
(52, '{2899,9765,0,1,1}-{2893,9768,0,1,1}-{2895,9771,0,1,6}-{2894,9781,0,1,6}-{2891,9787,0,1,2}-{2904,9798,0,1,0}-{2910,9799,0,1,4}'),
(59, '{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'),
(59, '{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3188,3216,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3169,3257,0,1,1}-{3164,3236,0,1,6}-{3148,3226,0,1,5}-{3162,3223,0,1,7}-{3151,3221,0,1,0}-{3160,3221,0,1,0}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}'),
(58, '{3289,5482,0,1,1}-{3296,5472,0,1,0}-{3291,5466,0,1,6}-{3294,5481,0,1,0}-{3300,5479,0,1,7}-{3288,5480,0,1,3}-{3293,5475,0,1,3}-{3293,5481,0,1,2}-{3286,5465,0,1,3}-{3279,5478,0,1,4}-{3270,5464,0,1,2}-{3270,5468,0,1,1}-{2574,9874,0,1,0}-{2577,9877,0,1,3}-{2574,9878,0,1,0}-{2575,9871,0,1,4}'),
(63, '{3118,9950,0,1,6}-{3116,9956,0,1,0}-{3127,9953,0,1,7}-{3122,9955,0,1,4}-{3124,9951,0,1,4}-{3124,9950,0,1,3}-{3074,3892,0,1,3}-{3071,3894,0,1,7}-{3062,3897,0,1,3}-{3058,3889,0,1,4}-{3054,3880,0,1,2}-{3054,3895,0,1,7}-{3051,3879,0,1,6}-{3051,3886,0,1,6}-{3047,3893,0,1,1}-{3047,3881,0,1,4}-{3044,3893,0,1,5}-{3041,3894,0,1,1}-{3038,3890,0,1,1}-{3046,3872,0,1,4}-{3165,9891,0,1,6}-{3177,9886,0,1,4}-{3175,9889,0,1,4}-{3177,9879,0,1,4}-{3177,9888,0,1,1}-{3178,9895,0,1,4}-{3182,9884,0,1,3}-{2841,9583,0,1,4}-{2841,9582,0,1,4}-{2839,9582,0,1,1}-{2837,9572,0,1,6}-{2832,9580,0,1,1}-{3164,9888,0,1,3}-{3169,9892,0,1,6}-{3258,5560,0,1,2}-{3258,5555,0,1,3}-{3260,5557,0,1,3}-{3257,5552,0,1,1}-{3260,5558,0,1,5}-{3258,5556,0,1,6}-{3257,5555,0,1,6}-{3260,5559,0,1,7}-{3257,5561,0,1,1}'),
(62, '{2769,3198,0,1,7}-{2768,3206,0,1,1}-{2776,3107,0,1,1}-{2794,3121,0,1,3}-{2795,3118,0,1,1}-{2796,3109,0,1,1}-{2808,3112,0,1,6}-{2791,3124,0,1,1}-{2860,3094,0,1,6}-{2854,3086,0,1,6}-{2863,3083,0,1,3}-{2853,3081,0,1,4}-{2859,3079,0,1,4}-{2859,3075,0,1,6}-{2871,3092,0,1,1}-{2867,3094,0,1,1}-{2861,3082,0,1,3}-{2861,3094,0,1,3}-{2863,3081,0,1,2}-{2864,3089,0,1,3}-{2859,3084,0,1,0}-{2850,3060,0,1,6}-{2857,3044,0,1,7}-{2856,3066,0,1,4}-{2784,3030,0,1,4}-{2783,3017,0,1,3}-{2811,2975,0,1,7}-{2815,2987,0,1,5}-{2808,3007,0,1,6}-{2812,3007,0,1,1}-{2885,2950,0,1,4}-{2891,2951,0,1,6}-{2894,2946,0,1,4}-{2928,3022,0,1,3}-{2930,3029,0,1,4}-{2927,3039,0,1,6}-{2928,3043,0,1,0}-{2929,3036,0,1,7}-{2919,3040,0,1,4}-{2934,3045,0,1,2}-{2929,3035,0,1,4}-{2914,3055,0,1,4}-{2922,3059,0,1,3}-{2930,3049,0,1,4}-{2914,3047,0,1,4}-{2935,3049,0,1,1}-{2927,3058,0,1,3}'),

6
Server/src/org/crandor/game/content/skill/member/summoning/familiar/Familiar.java
View file

@ -536,11 +536,13 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
/**
* Calls the familiar.
*/
//int spamTimer = 0;
public boolean call() {
Location destination = getSpawnLocation();
if (destination == null) {
owner.getPacketDispatch().sendMessage("Your familiar is too big to fit here. Try calling it again when you are standing");
owner.getPacketDispatch().sendMessage("somewhere with more space.");
//owner.getPacketDispatch().sendMessage("Your familiar is too big to fit here. Try calling it again when you are standing");
//owner.getPacketDispatch().sendMessage("somewhere with more space.");
//spamTimer = 50;
return false;
}
setInvisible(getZoneMonitor().isRestricted(ZoneRestriction.FOLLOWERS) && !owner.getLocks().isLocked("enable_summoning"));