diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/ExtendDrop.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/18900-18999.xml index d25c571ac6..ee63a694ec 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/18900-18999.xml @@ -2782,9 +2782,6 @@ - - 1 - @@ -2833,9 +2830,6 @@ - - 1 - @@ -2880,9 +2874,6 @@ - - 1 - @@ -2930,9 +2921,6 @@ - - 1 - @@ -2978,9 +2966,6 @@ - - 1 - @@ -3029,9 +3014,6 @@ - - 1 - @@ -3098,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3169,13 +3144,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3243,13 +3211,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3312,13 +3273,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3377,13 +3331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3444,13 +3391,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19200-19299.xml index a0191397eb..890738a756 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/19200-19299.xml @@ -2674,13 +2674,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3389,9 +3382,6 @@ - - 1 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22100-22199.xml index db8ac8fad2..24a89bb40e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22100-22199.xml @@ -2150,9 +2150,6 @@ - - 1 - @@ -2216,9 +2213,6 @@ - - 1 - @@ -2282,9 +2276,6 @@ - - 1 - @@ -2362,9 +2353,6 @@ - - 1 - @@ -2441,9 +2429,6 @@ - - 1 - @@ -2523,9 +2508,6 @@ - - 1 - @@ -2618,9 +2600,6 @@ - - 1 - @@ -2711,9 +2690,6 @@ - - 1 - @@ -2792,9 +2768,6 @@ - - 1 - @@ -2873,9 +2846,6 @@ - - 1 - @@ -2966,9 +2936,6 @@ - - 1 - @@ -3046,9 +3013,6 @@ - - 1 - @@ -3113,9 +3077,6 @@ - - 1 - @@ -3194,9 +3155,6 @@ - - 1 - @@ -3263,9 +3221,6 @@ - - 1 - @@ -3342,9 +3297,6 @@ - - 1 - @@ -3423,9 +3375,6 @@ - - 1 - @@ -3506,9 +3455,6 @@ - - 1 - @@ -3570,9 +3516,6 @@ - - 1 - @@ -3660,13 +3603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3726,13 +3662,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3792,13 +3721,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3862,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3939,13 +3854,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4005,13 +3913,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4072,13 +3973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4142,13 +4036,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4224,13 +4111,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4290,13 +4170,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4360,13 +4233,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4428,13 +4294,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4505,13 +4364,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4575,13 +4427,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4642,13 +4487,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4708,13 +4546,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4790,13 +4621,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4857,13 +4681,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4744,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4997,13 +4807,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5095,13 +4898,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5179,13 +4975,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5267,13 +5056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5351,13 +5133,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5418,13 +5193,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5512,13 +5280,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5593,13 +5354,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5672,13 +5426,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5485,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5805,13 +5545,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22700-22799.xml index f24b03978a..b1f59f4f4d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22700-22799.xml @@ -3110,13 +3110,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3188,13 +3181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3266,13 +3252,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3333,13 +3312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3421,13 +3393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3506,13 +3471,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3590,13 +3548,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3674,13 +3625,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3757,13 +3701,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3837,13 +3774,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3903,13 +3833,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3993,13 +3916,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4077,13 +3993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4163,13 +4072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4246,13 +4148,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4324,13 +4219,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4403,13 +4291,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4493,13 +4374,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4578,13 +4452,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4662,13 +4529,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22800-22899.xml index 3a00e90382..0c90fec98f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22800-22899.xml @@ -2376,9 +2376,6 @@ - - 1 - @@ -2458,9 +2455,6 @@ - - 1 - @@ -2537,9 +2531,6 @@ - - 1 - @@ -2616,9 +2607,6 @@ - - 1 - @@ -2698,9 +2686,6 @@ - - 1 - @@ -2783,9 +2768,6 @@ - - 1 - @@ -2866,9 +2848,6 @@ - - 1 - @@ -2949,9 +2928,6 @@ - - 1 - @@ -3025,9 +3001,6 @@ - - 1 - @@ -3104,9 +3077,6 @@ - - 1 - @@ -3180,9 +3150,6 @@ - - 1 - @@ -3256,9 +3223,6 @@ - - 1 - @@ -3334,9 +3298,6 @@ - - 1 - @@ -3416,9 +3377,6 @@ - - 1 - @@ -3496,9 +3454,6 @@ - - 1 - @@ -3574,9 +3529,6 @@ - - 1 - @@ -3651,9 +3603,6 @@ - - 1 - @@ -3731,9 +3680,6 @@ - - 1 - @@ -3808,9 +3754,6 @@ - - 1 - @@ -3885,9 +3828,6 @@ - - 1 - @@ -3964,9 +3904,6 @@ - - 1 - @@ -4047,9 +3984,6 @@ - - 1 - @@ -4129,9 +4063,6 @@ - - 1 - @@ -4209,9 +4140,6 @@ - - 1 - @@ -4289,9 +4217,6 @@ - - 1 - @@ -4372,9 +4297,6 @@ - - 1 - @@ -4452,9 +4374,6 @@ - - 1 - @@ -4533,9 +4452,6 @@ - - 1 - @@ -4604,9 +4520,6 @@ - - 1 - @@ -4690,9 +4603,6 @@ - - 1 - @@ -4775,9 +4685,6 @@ - - 1 - @@ -4859,9 +4766,6 @@ - - 1 - @@ -4938,9 +4842,6 @@ - - 1 - @@ -5020,9 +4921,6 @@ - - 1 - @@ -5099,9 +4997,6 @@ - - 1 - @@ -5179,9 +5074,6 @@ - - 1 - @@ -5260,8 +5152,5 @@ - - 1 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22900-22999.xml index 57ffe8ca57..3a3798e826 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23000-23099.xml index ea5ba623e1..46811996e8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23000-23099.xml @@ -1139,9 +1139,6 @@ - - 1 - @@ -1213,9 +1210,6 @@ - - 1 - @@ -1285,9 +1279,6 @@ - - 1 - @@ -1357,9 +1348,6 @@ - - 1 - @@ -1430,9 +1418,6 @@ - - 1 - @@ -1661,13 +1646,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml index 6670e0df57..f9849221a5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml @@ -2281,9 +2281,6 @@ - - 1 - @@ -2366,9 +2363,6 @@ - - 1 - @@ -2451,9 +2445,6 @@ - - 1 - @@ -2522,9 +2513,6 @@ - - 1 - @@ -2612,9 +2600,6 @@ - - 1 - @@ -3128,13 +3113,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3197,13 +3175,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3273,9 +3244,6 @@ - - 1 - @@ -3346,9 +3314,6 @@ - - 1 - @@ -3423,9 +3388,6 @@ - - 1 - @@ -3496,9 +3458,6 @@ - - 1 - @@ -3571,9 +3530,6 @@ - - 1 - @@ -3645,9 +3601,6 @@ - - 1 - @@ -3721,9 +3674,6 @@ - - 1 - @@ -3801,9 +3751,6 @@ - - 1 - @@ -3892,9 +3839,6 @@ - - 1 - @@ -3966,9 +3910,6 @@ - - 1 - @@ -4043,9 +3984,6 @@ - - 1 - @@ -4113,9 +4051,6 @@ - - 1 - @@ -4187,9 +4122,6 @@ - - 1 - @@ -4266,9 +4198,6 @@ - - 1 - @@ -4341,9 +4270,6 @@ - - 1 - @@ -4417,9 +4343,6 @@ - - 1 - @@ -4488,9 +4411,6 @@ - - 1 - @@ -4562,9 +4482,6 @@ - - 1 - @@ -4634,9 +4551,6 @@ - - 1 - @@ -5966,12 +5880,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23200-23299.xml index e2f3bb7c36..9343d7c55a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23200-23299.xml @@ -58,13 +58,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -125,13 +118,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -192,13 +178,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -259,13 +238,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -325,13 +297,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -389,13 +354,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -455,13 +413,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -521,13 +472,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -589,13 +533,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -656,13 +593,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -717,13 +647,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -779,13 +702,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -845,13 +761,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -917,13 +826,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -989,13 +891,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1065,13 +960,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1140,13 +1028,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1209,13 +1090,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1278,13 +1152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1353,13 +1220,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1427,13 +1287,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1503,13 +1356,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1579,13 +1425,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1653,13 +1492,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1724,13 +1556,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1794,13 +1619,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1864,13 +1682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1933,13 +1744,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2002,13 +1806,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2073,13 +1870,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2143,13 +1933,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2208,13 +1991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2273,13 +2049,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2348,13 +2117,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2419,13 +2181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2492,13 +2247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2567,13 +2315,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2637,13 +2378,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2684,13 +2418,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2730,13 +2457,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2788,13 +2508,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2846,13 +2559,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2908,13 +2614,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2968,13 +2667,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3028,13 +2720,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3093,13 +2778,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3170,13 +2848,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3248,13 +2919,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3328,13 +2992,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3408,13 +3065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3487,13 +3137,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3564,13 +3207,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3617,13 +3253,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3670,13 +3299,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3746,13 +3368,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3825,13 +3440,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3902,13 +3510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3980,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4033,13 +3627,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4111,13 +3698,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4189,13 +3769,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4268,13 +3841,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4410,13 +3976,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4482,13 +4041,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4547,13 +4099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4619,13 +4164,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4694,13 +4232,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4766,13 +4297,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4837,13 +4361,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4912,13 +4429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4985,13 +4495,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5058,13 +4561,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5134,13 +4630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5206,13 +4695,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5279,13 +4761,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5352,13 +4827,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5425,9 +4893,6 @@ - - 1 - @@ -5502,9 +4967,6 @@ - - 1 - @@ -5570,13 +5032,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5646,13 +5101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5723,13 +5171,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5814,13 +5255,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5876,13 +5310,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5951,13 +5378,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6028,9 +5448,6 @@ - - 1 - @@ -6083,9 +5500,6 @@ - - 1 - @@ -6138,9 +5552,6 @@ - - 1 - @@ -6191,9 +5602,6 @@ - - 1 - @@ -6243,13 +5651,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 45b464e2ea..1b7d084ad0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -62,7 +62,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -313,7 +312,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e20e75af66..fc254e124c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1017,7 +1015,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/ExtendDrop.xml b/L2J_Mobius_2.5_Underground/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_2.5_Underground/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/18900-18999.xml index bad841c3b4..38a39b0578 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/18900-18999.xml @@ -2782,9 +2782,6 @@ - - 1 - @@ -2833,9 +2830,6 @@ - - 1 - @@ -2880,9 +2874,6 @@ - - 1 - @@ -2930,9 +2921,6 @@ - - 1 - @@ -2978,9 +2966,6 @@ - - 1 - @@ -3029,9 +3014,6 @@ - - 1 - @@ -3098,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3169,13 +3144,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3243,13 +3211,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3312,13 +3273,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3377,13 +3331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3444,13 +3391,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19200-19299.xml index b47df5925f..6a3aa2efab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/19200-19299.xml @@ -2676,13 +2676,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3391,9 +3384,6 @@ - - 1 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22100-22199.xml index a65603742f..b6d3b4ebd7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22100-22199.xml @@ -2150,9 +2150,6 @@ - - 1 - @@ -2216,9 +2213,6 @@ - - 1 - @@ -2282,9 +2276,6 @@ - - 1 - @@ -2362,9 +2353,6 @@ - - 1 - @@ -2441,9 +2429,6 @@ - - 1 - @@ -2523,9 +2508,6 @@ - - 1 - @@ -2618,9 +2600,6 @@ - - 1 - @@ -2711,9 +2690,6 @@ - - 1 - @@ -2792,9 +2768,6 @@ - - 1 - @@ -2873,9 +2846,6 @@ - - 1 - @@ -2966,9 +2936,6 @@ - - 1 - @@ -3046,9 +3013,6 @@ - - 1 - @@ -3113,9 +3077,6 @@ - - 1 - @@ -3194,9 +3155,6 @@ - - 1 - @@ -3263,9 +3221,6 @@ - - 1 - @@ -3342,9 +3297,6 @@ - - 1 - @@ -3423,9 +3375,6 @@ - - 1 - @@ -3506,9 +3455,6 @@ - - 1 - @@ -3570,9 +3516,6 @@ - - 1 - @@ -3660,13 +3603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3726,13 +3662,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3792,13 +3721,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3862,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3939,13 +3854,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4005,13 +3913,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4072,13 +3973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4142,13 +4036,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4224,13 +4111,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4290,13 +4170,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4360,13 +4233,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4428,13 +4294,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4505,13 +4364,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4575,13 +4427,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4642,13 +4487,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4708,13 +4546,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4790,13 +4621,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4857,13 +4681,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4744,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4997,13 +4807,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5095,13 +4898,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5179,13 +4975,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5267,13 +5056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5351,13 +5133,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5418,13 +5193,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5512,13 +5280,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5593,13 +5354,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5672,13 +5426,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5485,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5805,13 +5545,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22700-22799.xml index b0483e9524..6b6da61dfc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22700-22799.xml @@ -3110,13 +3110,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3188,13 +3181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3266,13 +3252,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3333,13 +3312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3421,13 +3393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3506,13 +3471,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3590,13 +3548,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3674,13 +3625,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3757,13 +3701,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3837,13 +3774,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3903,13 +3833,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3993,13 +3916,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4077,13 +3993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4163,13 +4072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4246,13 +4148,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4324,13 +4219,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4403,13 +4291,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4493,13 +4374,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4578,13 +4452,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4662,13 +4529,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22800-22899.xml index 3a00e90382..0c90fec98f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22800-22899.xml @@ -2376,9 +2376,6 @@ - - 1 - @@ -2458,9 +2455,6 @@ - - 1 - @@ -2537,9 +2531,6 @@ - - 1 - @@ -2616,9 +2607,6 @@ - - 1 - @@ -2698,9 +2686,6 @@ - - 1 - @@ -2783,9 +2768,6 @@ - - 1 - @@ -2866,9 +2848,6 @@ - - 1 - @@ -2949,9 +2928,6 @@ - - 1 - @@ -3025,9 +3001,6 @@ - - 1 - @@ -3104,9 +3077,6 @@ - - 1 - @@ -3180,9 +3150,6 @@ - - 1 - @@ -3256,9 +3223,6 @@ - - 1 - @@ -3334,9 +3298,6 @@ - - 1 - @@ -3416,9 +3377,6 @@ - - 1 - @@ -3496,9 +3454,6 @@ - - 1 - @@ -3574,9 +3529,6 @@ - - 1 - @@ -3651,9 +3603,6 @@ - - 1 - @@ -3731,9 +3680,6 @@ - - 1 - @@ -3808,9 +3754,6 @@ - - 1 - @@ -3885,9 +3828,6 @@ - - 1 - @@ -3964,9 +3904,6 @@ - - 1 - @@ -4047,9 +3984,6 @@ - - 1 - @@ -4129,9 +4063,6 @@ - - 1 - @@ -4209,9 +4140,6 @@ - - 1 - @@ -4289,9 +4217,6 @@ - - 1 - @@ -4372,9 +4297,6 @@ - - 1 - @@ -4452,9 +4374,6 @@ - - 1 - @@ -4533,9 +4452,6 @@ - - 1 - @@ -4604,9 +4520,6 @@ - - 1 - @@ -4690,9 +4603,6 @@ - - 1 - @@ -4775,9 +4685,6 @@ - - 1 - @@ -4859,9 +4766,6 @@ - - 1 - @@ -4938,9 +4842,6 @@ - - 1 - @@ -5020,9 +4921,6 @@ - - 1 - @@ -5099,9 +4997,6 @@ - - 1 - @@ -5179,9 +5074,6 @@ - - 1 - @@ -5260,8 +5152,5 @@ - - 1 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22900-22999.xml index 57ffe8ca57..3a3798e826 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23000-23099.xml index 25551d052f..7d85b8cdb4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23000-23099.xml @@ -1432,9 +1432,6 @@ - - 1 - @@ -1506,9 +1503,6 @@ - - 1 - @@ -1578,9 +1572,6 @@ - - 1 - @@ -1650,9 +1641,6 @@ - - 1 - @@ -1723,9 +1711,6 @@ - - 1 - @@ -1954,13 +1939,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml index 8dc8f04e48..e8a181baea 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml @@ -2298,9 +2298,6 @@ - - 1 - @@ -2383,9 +2380,6 @@ - - 1 - @@ -2468,9 +2462,6 @@ - - 1 - @@ -2539,9 +2530,6 @@ - - 1 - @@ -2629,9 +2617,6 @@ - - 1 - @@ -3145,13 +3130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3214,13 +3192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3290,9 +3261,6 @@ - - 1 - @@ -3363,9 +3331,6 @@ - - 1 - @@ -3440,9 +3405,6 @@ - - 1 - @@ -3513,9 +3475,6 @@ - - 1 - @@ -3588,9 +3547,6 @@ - - 1 - @@ -3662,9 +3618,6 @@ - - 1 - @@ -3738,9 +3691,6 @@ - - 1 - @@ -3818,9 +3768,6 @@ - - 1 - @@ -3909,9 +3856,6 @@ - - 1 - @@ -3983,9 +3927,6 @@ - - 1 - @@ -4060,9 +4001,6 @@ - - 1 - @@ -4130,9 +4068,6 @@ - - 1 - @@ -4204,9 +4139,6 @@ - - 1 - @@ -4283,9 +4215,6 @@ - - 1 - @@ -4358,9 +4287,6 @@ - - 1 - @@ -4434,9 +4360,6 @@ - - 1 - @@ -4505,9 +4428,6 @@ - - 1 - @@ -4579,9 +4499,6 @@ - - 1 - @@ -4651,9 +4568,6 @@ - - 1 - @@ -5984,12 +5898,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23200-23299.xml index 194a5c49f5..d640fdf4af 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23200-23299.xml @@ -59,13 +59,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -127,13 +120,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -195,13 +181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -263,13 +242,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -330,13 +302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -395,13 +360,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -462,13 +420,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -529,13 +480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -598,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -666,13 +603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -727,13 +657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -789,13 +712,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -856,13 +772,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -928,13 +837,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1000,13 +902,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1076,13 +971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1151,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1220,13 +1101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1289,13 +1163,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1364,13 +1231,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1438,13 +1298,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1514,13 +1367,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1590,13 +1436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1664,13 +1503,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1735,13 +1567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1805,13 +1630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1875,13 +1693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1944,13 +1755,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2013,13 +1817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2084,13 +1881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2154,13 +1944,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2219,13 +2002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2284,13 +2060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2359,13 +2128,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2430,13 +2192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2503,13 +2258,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2578,13 +2326,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2648,13 +2389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2695,13 +2429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2741,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2799,13 +2519,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2857,13 +2570,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2920,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2680,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3042,13 +2734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3185,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +2934,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3343,13 +3007,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3423,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3502,13 +3152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3579,13 +3222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3632,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3685,13 +3314,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3840,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3596,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4048,13 +3642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4126,13 +3713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4204,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4283,13 +3856,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +3991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4497,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4562,13 +4114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4634,13 +4179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4709,13 +4247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4781,13 +4312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4376,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4444,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5000,13 +4510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5073,13 +4576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5149,13 +4645,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5294,13 +4776,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5367,13 +4842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5440,9 +4908,6 @@ - - 1 - @@ -5517,9 +4982,6 @@ - - 1 - @@ -5585,13 +5047,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5661,13 +5116,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5186,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5829,13 +5270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5891,13 +5325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5966,13 +5393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6043,9 +5463,6 @@ - - 1 - @@ -6098,9 +5515,6 @@ - - 1 - @@ -6153,9 +5567,6 @@ - - 1 - @@ -6206,9 +5617,6 @@ - - 1 - @@ -6258,13 +5666,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 756d26559b..5fab875a5f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -321,7 +320,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 41c71b1ac6..13e1e98f63 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/ExtendDrop.xml b/L2J_Mobius_3.0_Helios/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_3.0_Helios/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18900-18999.xml index baefdc7639..cd8d61bd40 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18900-18999.xml @@ -2611,9 +2611,6 @@ - - 1 - @@ -2662,9 +2659,6 @@ - - 1 - @@ -2709,9 +2703,6 @@ - - 1 - @@ -2759,9 +2750,6 @@ - - 1 - @@ -2807,9 +2795,6 @@ - - 1 - @@ -2858,9 +2843,6 @@ - - 1 - @@ -2927,13 +2909,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2998,13 +2973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3072,13 +3040,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3141,13 +3102,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3206,13 +3160,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3273,13 +3220,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19200-19299.xml index 3da76227cb..9aa9645586 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19200-19299.xml @@ -2696,13 +2696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3411,9 +3404,6 @@ - - 1 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22100-22199.xml index 0c29884e43..c009b25424 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22100-22199.xml @@ -1179,9 +1179,6 @@ - - 1 - @@ -1245,9 +1242,6 @@ - - 1 - @@ -1311,9 +1305,6 @@ - - 1 - @@ -1391,9 +1382,6 @@ - - 1 - @@ -1470,9 +1458,6 @@ - - 1 - @@ -1552,9 +1537,6 @@ - - 1 - @@ -1647,9 +1629,6 @@ - - 1 - @@ -1740,9 +1719,6 @@ - - 1 - @@ -1821,9 +1797,6 @@ - - 1 - @@ -1902,9 +1875,6 @@ - - 1 - @@ -1995,9 +1965,6 @@ - - 1 - @@ -2075,9 +2042,6 @@ - - 1 - @@ -2142,9 +2106,6 @@ - - 1 - @@ -2223,9 +2184,6 @@ - - 1 - @@ -2292,9 +2250,6 @@ - - 1 - @@ -2371,9 +2326,6 @@ - - 1 - @@ -2452,9 +2404,6 @@ - - 1 - @@ -2535,9 +2484,6 @@ - - 1 - @@ -2599,9 +2545,6 @@ - - 1 - @@ -2689,13 +2632,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2691,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2821,13 +2750,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2891,13 +2813,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2968,13 +2883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3034,13 +2942,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3101,13 +3002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3171,13 +3065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3253,13 +3140,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3319,13 +3199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3389,13 +3262,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3457,13 +3323,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3534,13 +3393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3604,13 +3456,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3671,13 +3516,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3737,13 +3575,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3819,13 +3650,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3886,13 +3710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3956,13 +3773,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4026,13 +3836,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4124,13 +3927,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4208,13 +4004,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4296,13 +4085,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4380,13 +4162,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4447,13 +4222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4541,13 +4309,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4622,13 +4383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4701,13 +4455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4767,13 +4514,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4834,13 +4574,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22700-22799.xml index b0483e9524..6b6da61dfc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22700-22799.xml @@ -3110,13 +3110,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3188,13 +3181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3266,13 +3252,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3333,13 +3312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3421,13 +3393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3506,13 +3471,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3590,13 +3548,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3674,13 +3625,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3757,13 +3701,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3837,13 +3774,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3903,13 +3833,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3993,13 +3916,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4077,13 +3993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4163,13 +4072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4246,13 +4148,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4324,13 +4219,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4403,13 +4291,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4493,13 +4374,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4578,13 +4452,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4662,13 +4529,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22800-22899.xml index 77e140f1ba..e74727603b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22800-22899.xml @@ -2035,9 +2035,6 @@ - - 1 - @@ -2117,9 +2114,6 @@ - - 1 - @@ -2196,9 +2190,6 @@ - - 1 - @@ -2275,9 +2266,6 @@ - - 1 - @@ -2357,9 +2345,6 @@ - - 1 - @@ -2442,9 +2427,6 @@ - - 1 - @@ -2525,9 +2507,6 @@ - - 1 - @@ -2608,9 +2587,6 @@ - - 1 - @@ -2684,9 +2660,6 @@ - - 1 - @@ -2763,9 +2736,6 @@ - - 1 - @@ -2839,9 +2809,6 @@ - - 1 - @@ -2915,9 +2882,6 @@ - - 1 - @@ -2993,9 +2957,6 @@ - - 1 - @@ -3075,9 +3036,6 @@ - - 1 - @@ -3155,9 +3113,6 @@ - - 1 - @@ -3233,9 +3188,6 @@ - - 1 - @@ -3310,9 +3262,6 @@ - - 1 - @@ -3390,9 +3339,6 @@ - - 1 - @@ -3467,9 +3413,6 @@ - - 1 - @@ -3544,9 +3487,6 @@ - - 1 - @@ -3623,9 +3563,6 @@ - - 1 - @@ -3706,9 +3643,6 @@ - - 1 - @@ -3788,9 +3722,6 @@ - - 1 - @@ -3868,9 +3799,6 @@ - - 1 - @@ -3948,9 +3876,6 @@ - - 1 - @@ -4031,9 +3956,6 @@ - - 1 - @@ -4111,9 +4033,6 @@ - - 1 - @@ -4192,9 +4111,6 @@ - - 1 - @@ -4263,9 +4179,6 @@ - - 1 - @@ -4349,9 +4262,6 @@ - - 1 - @@ -4434,9 +4344,6 @@ - - 1 - @@ -4518,9 +4425,6 @@ - - 1 - @@ -4597,9 +4501,6 @@ - - 1 - @@ -4679,9 +4580,6 @@ - - 1 - @@ -4758,9 +4656,6 @@ - - 1 - @@ -4838,9 +4733,6 @@ - - 1 - @@ -4919,8 +4811,5 @@ - - 1 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22900-22999.xml index 57ffe8ca57..3a3798e826 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23000-23099.xml index 25551d052f..7d85b8cdb4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23000-23099.xml @@ -1432,9 +1432,6 @@ - - 1 - @@ -1506,9 +1503,6 @@ - - 1 - @@ -1578,9 +1572,6 @@ - - 1 - @@ -1650,9 +1641,6 @@ - - 1 - @@ -1723,9 +1711,6 @@ - - 1 - @@ -1954,13 +1939,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml index b28d5621b3..5074e2b095 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml @@ -2298,9 +2298,6 @@ - - 1 - @@ -2383,9 +2380,6 @@ - - 1 - @@ -2468,9 +2462,6 @@ - - 1 - @@ -2539,9 +2530,6 @@ - - 1 - @@ -2629,9 +2617,6 @@ - - 1 - @@ -3145,13 +3130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3214,13 +3192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3275,9 +3246,6 @@ - - 1 - @@ -3333,9 +3301,6 @@ - - 1 - @@ -3395,9 +3360,6 @@ - - 1 - @@ -3454,9 +3416,6 @@ - - 1 - @@ -3514,9 +3473,6 @@ - - 1 - @@ -3573,9 +3529,6 @@ - - 1 - @@ -3633,9 +3586,6 @@ - - 1 - @@ -3697,9 +3647,6 @@ - - 1 - @@ -3764,9 +3711,6 @@ - - 1 - @@ -3823,9 +3767,6 @@ - - 1 - @@ -3883,9 +3824,6 @@ - - 1 - @@ -3938,9 +3876,6 @@ - - 1 - @@ -3997,9 +3932,6 @@ - - 1 - @@ -4065,9 +3997,6 @@ - - 1 - @@ -4125,9 +4054,6 @@ - - 1 - @@ -4186,9 +4112,6 @@ - - 1 - @@ -4242,9 +4165,6 @@ - - 1 - @@ -4301,9 +4221,6 @@ - - 1 - @@ -4358,9 +4275,6 @@ - - 1 - @@ -5689,12 +5603,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23200-23299.xml index 194a5c49f5..d640fdf4af 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23200-23299.xml @@ -59,13 +59,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -127,13 +120,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -195,13 +181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -263,13 +242,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -330,13 +302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -395,13 +360,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -462,13 +420,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -529,13 +480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -598,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -666,13 +603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -727,13 +657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -789,13 +712,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -856,13 +772,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -928,13 +837,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1000,13 +902,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1076,13 +971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1151,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1220,13 +1101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1289,13 +1163,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1364,13 +1231,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1438,13 +1298,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1514,13 +1367,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1590,13 +1436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1664,13 +1503,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1735,13 +1567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1805,13 +1630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1875,13 +1693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1944,13 +1755,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2013,13 +1817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2084,13 +1881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2154,13 +1944,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2219,13 +2002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2284,13 +2060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2359,13 +2128,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2430,13 +2192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2503,13 +2258,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2578,13 +2326,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2648,13 +2389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2695,13 +2429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2741,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2799,13 +2519,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2857,13 +2570,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2920,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2680,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3042,13 +2734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3185,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +2934,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3343,13 +3007,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3423,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3502,13 +3152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3579,13 +3222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3632,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3685,13 +3314,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3840,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3596,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4048,13 +3642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4126,13 +3713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4204,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4283,13 +3856,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +3991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4497,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4562,13 +4114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4634,13 +4179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4709,13 +4247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4781,13 +4312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4376,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4444,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5000,13 +4510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5073,13 +4576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5149,13 +4645,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5294,13 +4776,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5367,13 +4842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5440,9 +4908,6 @@ - - 1 - @@ -5517,9 +4982,6 @@ - - 1 - @@ -5585,13 +5047,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5661,13 +5116,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5186,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5829,13 +5270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5891,13 +5325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5966,13 +5393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6043,9 +5463,6 @@ - - 1 - @@ -6098,9 +5515,6 @@ - - 1 - @@ -6153,9 +5567,6 @@ - - 1 - @@ -6206,9 +5617,6 @@ - - 1 - @@ -6258,13 +5666,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 756d26559b..5fab875a5f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -321,7 +320,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 41c71b1ac6..13e1e98f63 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ExtendDrop.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/18900-18999.xml index 9de0d4e559..1a4973c286 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/18900-18999.xml @@ -2611,9 +2611,6 @@ - - 1 - @@ -2662,9 +2659,6 @@ - - 1 - @@ -2709,9 +2703,6 @@ - - 1 - @@ -2759,9 +2750,6 @@ - - 1 - @@ -2807,9 +2795,6 @@ - - 1 - @@ -2858,9 +2843,6 @@ - - 1 - @@ -2927,13 +2909,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2998,13 +2973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3072,13 +3040,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3141,13 +3102,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3206,13 +3160,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3273,13 +3220,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19200-19299.xml index 0cd95489e8..5555d594a8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/19200-19299.xml @@ -2696,13 +2696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3411,9 +3404,6 @@ - - 1 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22100-22199.xml index 13d5e17378..c726f5bbe5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22100-22199.xml @@ -1212,9 +1212,6 @@ - - 1 - @@ -1278,9 +1275,6 @@ - - 1 - @@ -1344,9 +1338,6 @@ - - 1 - @@ -1424,9 +1415,6 @@ - - 1 - @@ -1503,9 +1491,6 @@ - - 1 - @@ -1585,9 +1570,6 @@ - - 1 - @@ -1680,9 +1662,6 @@ - - 1 - @@ -1773,9 +1752,6 @@ - - 1 - @@ -1854,9 +1830,6 @@ - - 1 - @@ -1935,9 +1908,6 @@ - - 1 - @@ -2028,9 +1998,6 @@ - - 1 - @@ -2108,9 +2075,6 @@ - - 1 - @@ -2175,9 +2139,6 @@ - - 1 - @@ -2271,9 +2232,6 @@ - - 1 - @@ -2340,9 +2298,6 @@ - - 1 - @@ -2434,9 +2389,6 @@ - - 1 - @@ -2531,9 +2483,6 @@ - - 1 - @@ -2614,9 +2563,6 @@ - - 1 - @@ -2678,9 +2624,6 @@ - - 1 - @@ -2786,13 +2729,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2852,13 +2788,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2934,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3020,13 +2942,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3112,13 +3027,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3195,13 +3103,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3278,13 +3179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3366,13 +3260,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3463,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3546,13 +3426,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3631,13 +3504,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3715,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3807,13 +3666,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3894,13 +3746,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3977,13 +3822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4061,13 +3899,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4158,13 +3989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4242,13 +4066,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4330,13 +4147,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4416,13 +4226,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4530,13 +4333,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4614,13 +4410,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4703,13 +4492,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4785,13 +4567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4627,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4958,13 +4726,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5043,13 +4804,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5126,13 +4880,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5192,13 +4939,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5259,13 +4999,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22700-22799.xml index a830b49e60..20ad868946 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22700-22799.xml @@ -3119,13 +3119,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3197,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3275,13 +3261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3342,13 +3321,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3430,13 +3402,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3515,13 +3480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3599,13 +3557,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3683,13 +3634,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3766,13 +3710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3846,13 +3783,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3912,13 +3842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4002,13 +3925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4086,13 +4002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4172,13 +4081,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4255,13 +4157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4333,13 +4228,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4412,13 +4300,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4502,13 +4383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4587,13 +4461,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4671,13 +4538,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22800-22899.xml index 1bbc17a717..876262f6f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22800-22899.xml @@ -2031,9 +2031,6 @@ - - 1 - @@ -2113,9 +2110,6 @@ - - 1 - @@ -2192,9 +2186,6 @@ - - 1 - @@ -2271,9 +2262,6 @@ - - 1 - @@ -2353,9 +2341,6 @@ - - 1 - @@ -2438,9 +2423,6 @@ - - 1 - @@ -2521,9 +2503,6 @@ - - 1 - @@ -2604,9 +2583,6 @@ - - 1 - @@ -2680,9 +2656,6 @@ - - 1 - @@ -2759,9 +2732,6 @@ - - 1 - @@ -2835,9 +2805,6 @@ - - 1 - @@ -2911,9 +2878,6 @@ - - 1 - @@ -2989,9 +2953,6 @@ - - 1 - @@ -3071,9 +3032,6 @@ - - 1 - @@ -3151,9 +3109,6 @@ - - 1 - @@ -3229,9 +3184,6 @@ - - 1 - @@ -3306,9 +3258,6 @@ - - 1 - @@ -3386,9 +3335,6 @@ - - 1 - @@ -3463,9 +3409,6 @@ - - 1 - @@ -3540,9 +3483,6 @@ - - 1 - @@ -3619,9 +3559,6 @@ - - 1 - @@ -3702,9 +3639,6 @@ - - 1 - @@ -3784,9 +3718,6 @@ - - 1 - @@ -3864,9 +3795,6 @@ - - 1 - @@ -3944,9 +3872,6 @@ - - 1 - @@ -4027,9 +3952,6 @@ - - 1 - @@ -4107,9 +4029,6 @@ - - 1 - @@ -4188,9 +4107,6 @@ - - 1 - @@ -4259,9 +4175,6 @@ - - 1 - @@ -4345,9 +4258,6 @@ - - 1 - @@ -4430,9 +4340,6 @@ - - 1 - @@ -4514,9 +4421,6 @@ - - 1 - @@ -4593,9 +4497,6 @@ - - 1 - @@ -4675,9 +4576,6 @@ - - 1 - @@ -4754,9 +4652,6 @@ - - 1 - @@ -4834,9 +4729,6 @@ - - 1 - @@ -4915,8 +4807,5 @@ - - 1 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22900-22999.xml index 57ffe8ca57..3a3798e826 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23000-23099.xml index 25551d052f..7d85b8cdb4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23000-23099.xml @@ -1432,9 +1432,6 @@ - - 1 - @@ -1506,9 +1503,6 @@ - - 1 - @@ -1578,9 +1572,6 @@ - - 1 - @@ -1650,9 +1641,6 @@ - - 1 - @@ -1723,9 +1711,6 @@ - - 1 - @@ -1954,13 +1939,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml index 04481e062b..6e4c97154d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml @@ -2250,9 +2250,6 @@ - - 1 - @@ -2336,9 +2333,6 @@ - - 1 - @@ -2422,9 +2416,6 @@ - - 1 - @@ -2503,9 +2494,6 @@ - - 1 - @@ -2594,9 +2582,6 @@ - - 1 - @@ -3110,13 +3095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3179,13 +3157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3250,9 +3221,6 @@ - - 1 - @@ -3318,9 +3286,6 @@ - - 1 - @@ -3390,9 +3355,6 @@ - - 1 - @@ -3459,9 +3421,6 @@ - - 1 - @@ -3529,9 +3488,6 @@ - - 1 - @@ -3598,9 +3554,6 @@ - - 1 - @@ -3668,9 +3621,6 @@ - - 1 - @@ -3742,9 +3692,6 @@ - - 1 - @@ -3819,9 +3766,6 @@ - - 1 - @@ -3888,9 +3832,6 @@ - - 1 - @@ -3958,9 +3899,6 @@ - - 1 - @@ -4023,9 +3961,6 @@ - - 1 - @@ -4092,9 +4027,6 @@ - - 1 - @@ -4170,9 +4102,6 @@ - - 1 - @@ -4240,9 +4169,6 @@ - - 1 - @@ -4311,9 +4237,6 @@ - - 1 - @@ -4377,9 +4300,6 @@ - - 1 - @@ -4446,9 +4366,6 @@ - - 1 - @@ -4503,9 +4420,6 @@ - - 1 - @@ -5854,12 +5768,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23200-23299.xml index 194a5c49f5..d640fdf4af 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23200-23299.xml @@ -59,13 +59,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -127,13 +120,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -195,13 +181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -263,13 +242,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -330,13 +302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -395,13 +360,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -462,13 +420,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -529,13 +480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -598,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -666,13 +603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -727,13 +657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -789,13 +712,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -856,13 +772,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -928,13 +837,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1000,13 +902,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1076,13 +971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1151,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1220,13 +1101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1289,13 +1163,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1364,13 +1231,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1438,13 +1298,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1514,13 +1367,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1590,13 +1436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1664,13 +1503,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1735,13 +1567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1805,13 +1630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1875,13 +1693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1944,13 +1755,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2013,13 +1817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2084,13 +1881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2154,13 +1944,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2219,13 +2002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2284,13 +2060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2359,13 +2128,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2430,13 +2192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2503,13 +2258,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2578,13 +2326,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2648,13 +2389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2695,13 +2429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2741,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2799,13 +2519,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2857,13 +2570,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2920,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2680,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3042,13 +2734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3185,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +2934,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3343,13 +3007,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3423,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3502,13 +3152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3579,13 +3222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3632,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3685,13 +3314,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3840,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3596,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4048,13 +3642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4126,13 +3713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4204,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4283,13 +3856,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +3991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4497,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4562,13 +4114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4634,13 +4179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4709,13 +4247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4781,13 +4312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4376,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4444,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5000,13 +4510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5073,13 +4576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5149,13 +4645,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5294,13 +4776,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5367,13 +4842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5440,9 +4908,6 @@ - - 1 - @@ -5517,9 +4982,6 @@ - - 1 - @@ -5585,13 +5047,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5661,13 +5116,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5186,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5829,13 +5270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5891,13 +5325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5966,13 +5393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6043,9 +5463,6 @@ - - 1 - @@ -6098,9 +5515,6 @@ - - 1 - @@ -6153,9 +5567,6 @@ - - 1 - @@ -6206,9 +5617,6 @@ - - 1 - @@ -6258,13 +5666,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 7e0c6cb553..ef3a35568a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -64,7 +64,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -320,7 +319,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); MonsterBookData.getInstance(); WalkingManager.getInstance(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 41c71b1ac6..13e1e98f63 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/ExtendDrop.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/18900-18999.xml index 9de0d4e559..1a4973c286 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/18900-18999.xml @@ -2611,9 +2611,6 @@ - - 1 - @@ -2662,9 +2659,6 @@ - - 1 - @@ -2709,9 +2703,6 @@ - - 1 - @@ -2759,9 +2750,6 @@ - - 1 - @@ -2807,9 +2795,6 @@ - - 1 - @@ -2858,9 +2843,6 @@ - - 1 - @@ -2927,13 +2909,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2998,13 +2973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3072,13 +3040,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3141,13 +3102,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3206,13 +3160,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3273,13 +3220,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/19200-19299.xml index 0cd95489e8..5555d594a8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/19200-19299.xml @@ -2696,13 +2696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3411,9 +3404,6 @@ - - 1 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22100-22199.xml index 796e6704ca..13fbb94278 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22100-22199.xml @@ -1212,9 +1212,6 @@ - - 1 - @@ -1278,9 +1275,6 @@ - - 1 - @@ -1344,9 +1338,6 @@ - - 1 - @@ -1424,9 +1415,6 @@ - - 1 - @@ -1503,9 +1491,6 @@ - - 1 - @@ -1585,9 +1570,6 @@ - - 1 - @@ -1680,9 +1662,6 @@ - - 1 - @@ -1773,9 +1752,6 @@ - - 1 - @@ -1854,9 +1830,6 @@ - - 1 - @@ -1935,9 +1908,6 @@ - - 1 - @@ -2028,9 +1998,6 @@ - - 1 - @@ -2108,9 +2075,6 @@ - - 1 - @@ -2175,9 +2139,6 @@ - - 1 - @@ -2271,9 +2232,6 @@ - - 1 - @@ -2340,9 +2298,6 @@ - - 1 - @@ -2434,9 +2389,6 @@ - - 1 - @@ -2531,9 +2483,6 @@ - - 1 - @@ -2614,9 +2563,6 @@ - - 1 - @@ -2678,9 +2624,6 @@ - - 1 - @@ -2786,13 +2729,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2852,13 +2788,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2934,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3020,13 +2942,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3112,13 +3027,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3195,13 +3103,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3278,13 +3179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3366,13 +3260,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3463,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3546,13 +3426,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3631,13 +3504,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3715,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3807,13 +3666,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3894,13 +3746,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3977,13 +3822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4061,13 +3899,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4158,13 +3989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4242,13 +4066,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4330,13 +4147,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4416,13 +4226,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4530,13 +4333,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4614,13 +4410,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4703,13 +4492,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4785,13 +4567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4627,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4958,13 +4726,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5043,13 +4804,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5126,13 +4880,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5192,13 +4939,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5259,13 +4999,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22700-22799.xml index 9834032241..c126c17179 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22700-22799.xml @@ -3119,13 +3119,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3197,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3275,13 +3261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3342,13 +3321,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3430,13 +3402,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3515,13 +3480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3599,13 +3557,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3683,13 +3634,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3766,13 +3710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3846,13 +3783,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3912,13 +3842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4002,13 +3925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4086,13 +4002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4172,13 +4081,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4255,13 +4157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4333,13 +4228,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4412,13 +4300,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4502,13 +4383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4587,13 +4461,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4671,13 +4538,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22800-22899.xml index 1bbc17a717..876262f6f7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22800-22899.xml @@ -2031,9 +2031,6 @@ - - 1 - @@ -2113,9 +2110,6 @@ - - 1 - @@ -2192,9 +2186,6 @@ - - 1 - @@ -2271,9 +2262,6 @@ - - 1 - @@ -2353,9 +2341,6 @@ - - 1 - @@ -2438,9 +2423,6 @@ - - 1 - @@ -2521,9 +2503,6 @@ - - 1 - @@ -2604,9 +2583,6 @@ - - 1 - @@ -2680,9 +2656,6 @@ - - 1 - @@ -2759,9 +2732,6 @@ - - 1 - @@ -2835,9 +2805,6 @@ - - 1 - @@ -2911,9 +2878,6 @@ - - 1 - @@ -2989,9 +2953,6 @@ - - 1 - @@ -3071,9 +3032,6 @@ - - 1 - @@ -3151,9 +3109,6 @@ - - 1 - @@ -3229,9 +3184,6 @@ - - 1 - @@ -3306,9 +3258,6 @@ - - 1 - @@ -3386,9 +3335,6 @@ - - 1 - @@ -3463,9 +3409,6 @@ - - 1 - @@ -3540,9 +3483,6 @@ - - 1 - @@ -3619,9 +3559,6 @@ - - 1 - @@ -3702,9 +3639,6 @@ - - 1 - @@ -3784,9 +3718,6 @@ - - 1 - @@ -3864,9 +3795,6 @@ - - 1 - @@ -3944,9 +3872,6 @@ - - 1 - @@ -4027,9 +3952,6 @@ - - 1 - @@ -4107,9 +4029,6 @@ - - 1 - @@ -4188,9 +4107,6 @@ - - 1 - @@ -4259,9 +4175,6 @@ - - 1 - @@ -4345,9 +4258,6 @@ - - 1 - @@ -4430,9 +4340,6 @@ - - 1 - @@ -4514,9 +4421,6 @@ - - 1 - @@ -4593,9 +4497,6 @@ - - 1 - @@ -4675,9 +4576,6 @@ - - 1 - @@ -4754,9 +4652,6 @@ - - 1 - @@ -4834,9 +4729,6 @@ - - 1 - @@ -4915,8 +4807,5 @@ - - 1 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22900-22999.xml index 57ffe8ca57..3a3798e826 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23000-23099.xml index 25551d052f..7d85b8cdb4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23000-23099.xml @@ -1432,9 +1432,6 @@ - - 1 - @@ -1506,9 +1503,6 @@ - - 1 - @@ -1578,9 +1572,6 @@ - - 1 - @@ -1650,9 +1641,6 @@ - - 1 - @@ -1723,9 +1711,6 @@ - - 1 - @@ -1954,13 +1939,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml index 04481e062b..6e4c97154d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml @@ -2250,9 +2250,6 @@ - - 1 - @@ -2336,9 +2333,6 @@ - - 1 - @@ -2422,9 +2416,6 @@ - - 1 - @@ -2503,9 +2494,6 @@ - - 1 - @@ -2594,9 +2582,6 @@ - - 1 - @@ -3110,13 +3095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3179,13 +3157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3250,9 +3221,6 @@ - - 1 - @@ -3318,9 +3286,6 @@ - - 1 - @@ -3390,9 +3355,6 @@ - - 1 - @@ -3459,9 +3421,6 @@ - - 1 - @@ -3529,9 +3488,6 @@ - - 1 - @@ -3598,9 +3554,6 @@ - - 1 - @@ -3668,9 +3621,6 @@ - - 1 - @@ -3742,9 +3692,6 @@ - - 1 - @@ -3819,9 +3766,6 @@ - - 1 - @@ -3888,9 +3832,6 @@ - - 1 - @@ -3958,9 +3899,6 @@ - - 1 - @@ -4023,9 +3961,6 @@ - - 1 - @@ -4092,9 +4027,6 @@ - - 1 - @@ -4170,9 +4102,6 @@ - - 1 - @@ -4240,9 +4169,6 @@ - - 1 - @@ -4311,9 +4237,6 @@ - - 1 - @@ -4377,9 +4300,6 @@ - - 1 - @@ -4446,9 +4366,6 @@ - - 1 - @@ -4503,9 +4420,6 @@ - - 1 - @@ -5854,12 +5768,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23200-23299.xml index d0feece173..cfbeb5d74d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23200-23299.xml @@ -59,13 +59,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -127,13 +120,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -195,13 +181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -263,13 +242,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -330,13 +302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -395,13 +360,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -462,13 +420,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -529,13 +480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -598,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -666,13 +603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -727,13 +657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -789,13 +712,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -856,13 +772,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -928,13 +837,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1000,13 +902,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1076,13 +971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1151,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1220,13 +1101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1289,13 +1163,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1364,13 +1231,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1438,13 +1298,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1514,13 +1367,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1590,13 +1436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1664,13 +1503,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1735,13 +1567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1805,13 +1630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1875,13 +1693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1944,13 +1755,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2013,13 +1817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2084,13 +1881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2154,13 +1944,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2219,13 +2002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2284,13 +2060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2359,13 +2128,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2430,13 +2192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2503,13 +2258,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2578,13 +2326,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2648,13 +2389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2695,13 +2429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2741,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2799,13 +2519,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2857,13 +2570,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2920,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2680,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3042,13 +2734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3185,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +2934,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3343,13 +3007,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3423,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3502,13 +3152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3579,13 +3222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3632,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3685,13 +3314,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3840,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3596,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4048,13 +3642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4126,13 +3713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4204,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4283,13 +3856,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +3991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4497,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4562,13 +4114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4634,13 +4179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4709,13 +4247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4781,13 +4312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4376,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4444,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5000,13 +4510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5073,13 +4576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5149,13 +4645,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5294,13 +4776,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5367,13 +4842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5440,9 +4908,6 @@ - - 1 - @@ -5517,9 +4982,6 @@ - - 1 - @@ -5585,13 +5047,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5661,13 +5116,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5186,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5829,13 +5270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5891,13 +5325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5966,13 +5393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6043,9 +5463,6 @@ - - 1 - @@ -6098,9 +5515,6 @@ - - 1 - @@ -6153,9 +5567,6 @@ - - 1 - @@ -6206,9 +5617,6 @@ - - 1 - @@ -6258,13 +5666,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index 82f7610f37..fe6f164da2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -322,7 +321,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); MonsterBookData.getInstance(); WalkingManager.getInstance(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b326dc412d..4c2368afb1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -999,7 +997,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/ExtendDrop.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/18900-18999.xml index 8bd8a52389..9f76020fd8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/18900-18999.xml @@ -2611,9 +2611,6 @@ - - 1 - @@ -2662,9 +2659,6 @@ - - 1 - @@ -2709,9 +2703,6 @@ - - 1 - @@ -2759,9 +2750,6 @@ - - 1 - @@ -2807,9 +2795,6 @@ - - 1 - @@ -2858,9 +2843,6 @@ - - 1 - @@ -2927,13 +2909,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2998,13 +2973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3072,13 +3040,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3141,13 +3102,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3206,13 +3160,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3273,13 +3220,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/19200-19299.xml index 2ff4835986..52e9dab5f0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/19200-19299.xml @@ -2696,13 +2696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3411,9 +3404,6 @@ - - 1 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22100-22199.xml index 3bd3c8c1d3..8faf858658 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22100-22199.xml @@ -1212,9 +1212,6 @@ - - 1 - @@ -1278,9 +1275,6 @@ - - 1 - @@ -1344,9 +1338,6 @@ - - 1 - @@ -1424,9 +1415,6 @@ - - 1 - @@ -1503,9 +1491,6 @@ - - 1 - @@ -1585,9 +1570,6 @@ - - 1 - @@ -1680,9 +1662,6 @@ - - 1 - @@ -1773,9 +1752,6 @@ - - 1 - @@ -1854,9 +1830,6 @@ - - 1 - @@ -1935,9 +1908,6 @@ - - 1 - @@ -2028,9 +1998,6 @@ - - 1 - @@ -2108,9 +2075,6 @@ - - 1 - @@ -2175,9 +2139,6 @@ - - 1 - @@ -2271,9 +2232,6 @@ - - 1 - @@ -2340,9 +2298,6 @@ - - 1 - @@ -2434,9 +2389,6 @@ - - 1 - @@ -2531,9 +2483,6 @@ - - 1 - @@ -2614,9 +2563,6 @@ - - 1 - @@ -2678,9 +2624,6 @@ - - 1 - @@ -2786,13 +2729,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2852,13 +2788,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2934,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3020,13 +2942,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3112,13 +3027,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3195,13 +3103,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3278,13 +3179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3366,13 +3260,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3463,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3546,13 +3426,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3631,13 +3504,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3715,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3807,13 +3666,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3894,13 +3746,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3977,13 +3822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4061,13 +3899,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4158,13 +3989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4242,13 +4066,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4330,13 +4147,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4416,13 +4226,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4530,13 +4333,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4614,13 +4410,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4703,13 +4492,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4785,13 +4567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4627,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4958,13 +4726,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5043,13 +4804,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5126,13 +4880,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5192,13 +4939,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5259,13 +4999,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22700-22799.xml index 3db4dea1a3..88208cb081 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22700-22799.xml @@ -3119,13 +3119,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3197,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3275,13 +3261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3342,13 +3321,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3430,13 +3402,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3515,13 +3480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3599,13 +3557,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3683,13 +3634,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3766,13 +3710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3846,13 +3783,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3912,13 +3842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4002,13 +3925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4086,13 +4002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4172,13 +4081,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4255,13 +4157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4333,13 +4228,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4412,13 +4300,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4502,13 +4383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4587,13 +4461,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4671,13 +4538,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22800-22899.xml index c5c5f7b4db..6a8e7970d7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22800-22899.xml @@ -2031,9 +2031,6 @@ - - 1 - @@ -2113,9 +2110,6 @@ - - 1 - @@ -2192,9 +2186,6 @@ - - 1 - @@ -2271,9 +2262,6 @@ - - 1 - @@ -2353,9 +2341,6 @@ - - 1 - @@ -2438,9 +2423,6 @@ - - 1 - @@ -2521,9 +2503,6 @@ - - 1 - @@ -2604,9 +2583,6 @@ - - 1 - @@ -2680,9 +2656,6 @@ - - 1 - @@ -2759,9 +2732,6 @@ - - 1 - @@ -2835,9 +2805,6 @@ - - 1 - @@ -2911,9 +2878,6 @@ - - 1 - @@ -2989,9 +2953,6 @@ - - 1 - @@ -3071,9 +3032,6 @@ - - 1 - @@ -3151,9 +3109,6 @@ - - 1 - @@ -3229,9 +3184,6 @@ - - 1 - @@ -3306,9 +3258,6 @@ - - 1 - @@ -3386,9 +3335,6 @@ - - 1 - @@ -3463,9 +3409,6 @@ - - 1 - @@ -3540,9 +3483,6 @@ - - 1 - @@ -3619,9 +3559,6 @@ - - 1 - @@ -3702,9 +3639,6 @@ - - 1 - @@ -3784,9 +3718,6 @@ - - 1 - @@ -3864,9 +3795,6 @@ - - 1 - @@ -3944,9 +3872,6 @@ - - 1 - @@ -4027,9 +3952,6 @@ - - 1 - @@ -4107,9 +4029,6 @@ - - 1 - @@ -4188,9 +4107,6 @@ - - 1 - @@ -4259,9 +4175,6 @@ - - 1 - @@ -4345,9 +4258,6 @@ - - 1 - @@ -4430,9 +4340,6 @@ - - 1 - @@ -4514,9 +4421,6 @@ - - 1 - @@ -4593,9 +4497,6 @@ - - 1 - @@ -4675,9 +4576,6 @@ - - 1 - @@ -4754,9 +4652,6 @@ - - 1 - @@ -4834,9 +4729,6 @@ - - 1 - @@ -4915,8 +4807,5 @@ - - 1 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22900-22999.xml index 5c9b26c82d..ace6e6a079 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/22900-22999.xml @@ -81,9 +81,6 @@ - - 1 - @@ -164,9 +161,6 @@ - - 1 - @@ -246,9 +240,6 @@ - - 1 - @@ -326,9 +317,6 @@ - - 1 - @@ -409,9 +397,6 @@ - - 1 - @@ -489,9 +474,6 @@ - - 1 - @@ -570,9 +552,6 @@ - - 1 - @@ -652,9 +631,6 @@ - - 1 - @@ -738,9 +714,6 @@ - - 1 - @@ -822,9 +795,6 @@ - - 1 - @@ -904,9 +874,6 @@ - - 1 - @@ -971,13 +938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1045,13 +1005,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1119,13 +1072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1188,13 +1134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1260,13 +1199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1332,13 +1264,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1406,13 +1331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1482,13 +1400,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1559,13 +1470,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1635,13 +1539,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1707,13 +1604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1780,13 +1670,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1853,13 +1736,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1988,13 +1857,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2056,13 +1918,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2127,13 +1982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2198,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2433,13 +2274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2513,13 +2347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2419,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2673,13 +2493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2755,13 +2568,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2836,13 +2642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2717,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3004,13 +2796,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3091,13 +2876,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3175,13 +2953,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +3034,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3348,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3433,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3520,13 +3270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3350,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3673,13 +3409,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3469,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3806,13 +3528,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3871,13 +3586,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3933,13 +3641,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4131,13 +3818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4203,13 +3883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4272,13 +3945,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4335,13 +4001,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4406,13 +4065,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4478,13 +4130,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4550,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4616,13 +4254,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4689,13 +4320,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4756,13 +4380,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4819,13 +4436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4886,13 +4496,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5021,13 +4617,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5089,13 +4678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5155,13 +4737,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4796,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23000-23099.xml index ccb2d98422..9c3a5c930e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23000-23099.xml @@ -1432,9 +1432,6 @@ - - 1 - @@ -1506,9 +1503,6 @@ - - 1 - @@ -1578,9 +1572,6 @@ - - 1 - @@ -1650,9 +1641,6 @@ - - 1 - @@ -1723,9 +1711,6 @@ - - 1 - @@ -1954,13 +1939,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml index 05fa832fcf..5594bc2c47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml @@ -2250,9 +2250,6 @@ - - 1 - @@ -2336,9 +2333,6 @@ - - 1 - @@ -2422,9 +2416,6 @@ - - 1 - @@ -2503,9 +2494,6 @@ - - 1 - @@ -2594,9 +2582,6 @@ - - 1 - @@ -3110,13 +3095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3179,13 +3157,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3250,9 +3221,6 @@ - - 1 - @@ -3318,9 +3286,6 @@ - - 1 - @@ -3390,9 +3355,6 @@ - - 1 - @@ -3459,9 +3421,6 @@ - - 1 - @@ -3529,9 +3488,6 @@ - - 1 - @@ -3598,9 +3554,6 @@ - - 1 - @@ -3668,9 +3621,6 @@ - - 1 - @@ -3742,9 +3692,6 @@ - - 1 - @@ -3819,9 +3766,6 @@ - - 1 - @@ -3888,9 +3832,6 @@ - - 1 - @@ -3958,9 +3899,6 @@ - - 1 - @@ -4023,9 +3961,6 @@ - - 1 - @@ -4092,9 +4027,6 @@ - - 1 - @@ -4170,9 +4102,6 @@ - - 1 - @@ -4240,9 +4169,6 @@ - - 1 - @@ -4311,9 +4237,6 @@ - - 1 - @@ -4377,9 +4300,6 @@ - - 1 - @@ -4446,9 +4366,6 @@ - - 1 - @@ -4503,9 +4420,6 @@ - - 1 - @@ -5854,12 +5768,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23200-23299.xml index d15c81e8c7..2cd34b6ca3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23200-23299.xml @@ -59,13 +59,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -127,13 +120,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -195,13 +181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -263,13 +242,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -330,13 +302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -395,13 +360,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -462,13 +420,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -529,13 +480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -598,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -666,13 +603,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -727,13 +657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -789,13 +712,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -856,13 +772,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -928,13 +837,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1000,13 +902,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1076,13 +971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1151,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1220,13 +1101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1289,13 +1163,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1364,13 +1231,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1438,13 +1298,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1514,13 +1367,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1590,13 +1436,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1664,13 +1503,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1735,13 +1567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1805,13 +1630,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1875,13 +1693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1944,13 +1755,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2013,13 +1817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2084,13 +1881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2154,13 +1944,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2219,13 +2002,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2284,13 +2060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2359,13 +2128,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2430,13 +2192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2503,13 +2258,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2578,13 +2326,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2648,13 +2389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2695,13 +2429,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2741,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2799,13 +2519,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2857,13 +2570,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2920,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2680,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3042,13 +2734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3185,13 +2863,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3263,13 +2934,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3343,13 +3007,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3423,13 +3080,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3502,13 +3152,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3579,13 +3222,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3632,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3685,13 +3314,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3840,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3995,13 +3596,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4048,13 +3642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4126,13 +3713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4204,13 +3784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4283,13 +3856,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +3991,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4497,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4562,13 +4114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4634,13 +4179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4709,13 +4247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4781,13 +4312,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4852,13 +4376,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4927,13 +4444,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5000,13 +4510,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5073,13 +4576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5149,13 +4645,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5221,13 +4710,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5294,13 +4776,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5367,13 +4842,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5440,9 +4908,6 @@ - - 1 - @@ -5517,9 +4982,6 @@ - - 1 - @@ -5585,13 +5047,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5661,13 +5116,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5738,13 +5186,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5829,13 +5270,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5891,13 +5325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5966,13 +5393,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -6043,9 +5463,6 @@ - - 1 - @@ -6098,9 +5515,6 @@ - - 1 - @@ -6153,9 +5567,6 @@ - - 1 - @@ -6206,9 +5617,6 @@ - - 1 - @@ -6258,13 +5666,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index 82f7610f37..fe6f164da2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -322,7 +321,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); MonsterBookData.getInstance(); WalkingManager.getInstance(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b326dc412d..4c2368afb1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -999,7 +997,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/ExtendDrop.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/18900-18999.xml index 23f1baf858..7e43e6fc9a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/18900-18999.xml @@ -2592,9 +2592,6 @@ - - 1 - @@ -2643,9 +2640,6 @@ - - 1 - @@ -2690,9 +2684,6 @@ - - 1 - @@ -2740,9 +2731,6 @@ - - 1 - @@ -2788,9 +2776,6 @@ - - 1 - @@ -2839,9 +2824,6 @@ - - 1 - @@ -2880,13 +2862,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2950,13 +2925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3021,13 +2989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3089,13 +3050,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3158,13 +3112,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3223,13 +3170,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/19200-19299.xml index cd048d392d..3c3976827d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/19200-19299.xml @@ -2624,13 +2624,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3331,9 +3324,6 @@ - - 1 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22100-22199.xml index 501da83728..627e0caf38 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22100-22199.xml @@ -1147,9 +1147,6 @@ - - 1 - @@ -1213,9 +1210,6 @@ - - 1 - @@ -1279,9 +1273,6 @@ - - 1 - @@ -1335,9 +1326,6 @@ - - 1 - @@ -1402,9 +1390,6 @@ - - 1 - @@ -1469,9 +1454,6 @@ - - 1 - @@ -1551,9 +1533,6 @@ - - 1 - @@ -1636,9 +1615,6 @@ - - 1 - @@ -1702,9 +1678,6 @@ - - 1 - @@ -1771,9 +1744,6 @@ - - 1 - @@ -1853,9 +1823,6 @@ - - 1 - @@ -1929,9 +1896,6 @@ - - 1 - @@ -2018,9 +1982,6 @@ - - 1 - @@ -2088,9 +2049,6 @@ - - 1 - @@ -2179,9 +2137,6 @@ - - 1 - @@ -2273,9 +2228,6 @@ - - 1 - @@ -2344,9 +2296,6 @@ - - 1 - @@ -2449,9 +2398,6 @@ - - 1 - @@ -2513,9 +2459,6 @@ - - 1 - @@ -2621,13 +2564,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2687,13 +2623,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2769,13 +2698,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2777,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2947,13 +2862,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3030,13 +2938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3113,13 +3014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3201,13 +3095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3298,13 +3185,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3381,13 +3261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3466,13 +3339,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3550,13 +3416,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3642,13 +3501,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3729,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3812,13 +3657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3896,13 +3734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3993,13 +3824,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4077,13 +3901,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4165,13 +3982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4251,13 +4061,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4337,13 +4140,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4408,13 +4204,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4510,13 +4299,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4565,13 +4347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4647,13 +4422,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4725,13 +4493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4806,13 +4567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4874,13 +4628,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4699,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5019,13 +4759,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22700-22799.xml index f2a60d6069..b5195b2dff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22700-22799.xml @@ -2725,13 +2725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2791,13 +2784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2841,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2897,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2986,13 +2958,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3059,13 +3024,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3130,13 +3088,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3199,13 +3150,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3265,13 +3209,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3331,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3395,13 +3325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3466,13 +3389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3538,13 +3454,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3516,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3676,13 +3578,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3741,13 +3636,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3805,13 +3693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3876,13 +3757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3948,13 +3822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4019,13 +3886,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22800-22899.xml index 6930ee84d0..6cf9e67706 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22800-22899.xml @@ -1724,9 +1724,6 @@ - - 1 - @@ -1799,9 +1796,6 @@ - - 1 - @@ -1873,9 +1867,6 @@ - - 1 - @@ -1946,9 +1937,6 @@ - - 1 - @@ -2021,9 +2009,6 @@ - - 1 - @@ -2098,9 +2083,6 @@ - - 1 - @@ -2177,9 +2159,6 @@ - - 1 - @@ -2252,9 +2231,6 @@ - - 1 - @@ -2326,9 +2302,6 @@ - - 1 - @@ -2398,9 +2371,6 @@ - - 1 - @@ -2469,9 +2439,6 @@ - - 1 - @@ -2539,9 +2506,6 @@ - - 1 - @@ -2611,9 +2575,6 @@ - - 1 - @@ -2685,9 +2646,6 @@ - - 1 - @@ -2761,9 +2719,6 @@ - - 1 - @@ -2833,9 +2788,6 @@ - - 1 - @@ -2901,9 +2853,6 @@ - - 1 - @@ -2974,9 +2923,6 @@ - - 1 - @@ -3046,9 +2992,6 @@ - - 1 - @@ -3117,9 +3060,6 @@ - - 1 - @@ -3190,9 +3130,6 @@ - - 1 - @@ -3264,9 +3201,6 @@ - - 1 - @@ -3341,9 +3275,6 @@ - - 1 - @@ -3415,9 +3346,6 @@ - - 1 - @@ -3490,9 +3418,6 @@ - - 1 - @@ -3566,9 +3491,6 @@ - - 1 - @@ -3641,9 +3563,6 @@ - - 1 - @@ -3715,9 +3634,6 @@ - - 1 - @@ -3809,9 +3725,6 @@ - - 1 - @@ -3865,9 +3778,6 @@ - - 1 - @@ -3945,9 +3855,6 @@ - - 1 - @@ -4022,9 +3929,6 @@ - - 1 - @@ -4096,9 +4000,6 @@ - - 1 - @@ -4171,9 +4072,6 @@ - - 1 - @@ -4245,9 +4143,6 @@ - - 1 - @@ -4318,9 +4213,6 @@ - - 1 - @@ -4394,9 +4286,6 @@ - - 1 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22900-22999.xml index 75243eb702..eac39aa0a1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/22900-22999.xml @@ -51,9 +51,6 @@ - - 1 - @@ -130,9 +127,6 @@ - - 1 - @@ -205,9 +199,6 @@ - - 1 - @@ -280,9 +271,6 @@ - - 1 - @@ -356,9 +344,6 @@ - - 1 - @@ -431,9 +416,6 @@ - - 1 - @@ -505,9 +487,6 @@ - - 1 - @@ -582,9 +561,6 @@ - - 1 - @@ -660,9 +636,6 @@ - - 1 - @@ -740,9 +713,6 @@ - - 1 - @@ -816,9 +786,6 @@ - - 1 - @@ -886,13 +853,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -955,13 +915,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1024,13 +977,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1093,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1160,13 +1099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1226,13 +1158,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1294,13 +1219,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1365,13 +1283,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1436,13 +1347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1507,13 +1411,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1575,13 +1472,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1639,13 +1529,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1702,13 +1585,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1763,13 +1639,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1827,13 +1696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1892,13 +1754,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1955,13 +1810,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2172,13 +2020,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2258,13 +2099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2343,13 +2177,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2426,13 +2253,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2509,13 +2329,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2594,13 +2407,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2679,13 +2485,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2764,13 +2563,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2647,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2947,13 +2732,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3036,13 +2814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3123,13 +2894,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3215,13 +2979,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3303,13 +3060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3392,13 +3142,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3483,13 +3226,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3558,13 +3294,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3620,13 +3349,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3681,13 +3403,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3797,13 +3505,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3854,13 +3555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3913,13 +3607,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3979,13 +3666,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4045,13 +3725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4108,13 +3781,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4166,13 +3832,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4231,13 +3890,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4297,13 +3949,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4363,13 +4008,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4424,13 +4062,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4491,13 +4122,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4553,13 +4177,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4610,13 +4227,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4667,13 +4277,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4728,13 +4331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4790,13 +4386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4853,13 +4442,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4916,13 +4498,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4976,13 +4551,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23000-23099.xml index ca5a4a675d..4c8a18af88 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23000-23099.xml @@ -1348,9 +1348,6 @@ - - 1 - @@ -1415,9 +1412,6 @@ - - 1 - @@ -1482,9 +1476,6 @@ - - 1 - @@ -1548,9 +1539,6 @@ - - 1 - @@ -1614,9 +1602,6 @@ - - 1 - @@ -1826,13 +1811,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml index f5de3d3774..0bf8b1e744 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml @@ -2132,9 +2132,6 @@ - - 1 - @@ -2210,9 +2207,6 @@ - - 1 - @@ -2289,9 +2283,6 @@ - - 1 - @@ -2365,9 +2356,6 @@ - - 1 - @@ -2448,9 +2436,6 @@ - - 1 - @@ -2991,13 +2976,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3047,13 +3025,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3093,9 +3064,6 @@ - - 1 - @@ -3156,9 +3124,6 @@ - - 1 - @@ -3223,9 +3188,6 @@ - - 1 - @@ -3288,9 +3250,6 @@ - - 1 - @@ -3356,9 +3315,6 @@ - - 1 - @@ -3421,9 +3377,6 @@ - - 1 - @@ -3487,9 +3440,6 @@ - - 1 - @@ -3554,9 +3504,6 @@ - - 1 - @@ -3625,9 +3572,6 @@ - - 1 - @@ -3694,9 +3638,6 @@ - - 1 - @@ -3760,9 +3701,6 @@ - - 1 - @@ -3826,9 +3764,6 @@ - - 1 - @@ -3889,9 +3824,6 @@ - - 1 - @@ -3960,9 +3892,6 @@ - - 1 - @@ -4029,9 +3958,6 @@ - - 1 - @@ -4095,9 +4021,6 @@ - - 1 - @@ -4159,9 +4082,6 @@ - - 1 - @@ -4222,9 +4142,6 @@ - - 1 - @@ -4288,9 +4205,6 @@ - - 1 - @@ -5535,13 +5449,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23200-23299.xml index 5f421d1440..f1607ba26a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23200-23299.xml @@ -43,13 +43,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -105,13 +98,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -170,13 +156,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -231,13 +210,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -294,13 +266,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -356,13 +321,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -416,13 +374,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -479,13 +430,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -543,13 +487,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -604,13 +541,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -661,13 +591,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -717,13 +640,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -779,13 +695,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -845,13 +754,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -912,13 +814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -979,13 +874,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1047,13 +935,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1112,13 +993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1175,13 +1049,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1242,13 +1109,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1310,13 +1170,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1377,13 +1230,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1447,13 +1293,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1517,13 +1356,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1583,13 +1415,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1647,13 +1472,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1711,13 +1529,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1774,13 +1585,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1838,13 +1642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1902,13 +1699,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1967,13 +1757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2029,13 +1812,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2089,13 +1865,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2156,13 +1925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2221,13 +1983,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2288,13 +2043,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2357,13 +2105,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2421,13 +2162,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2479,13 +2213,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2525,13 +2252,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2566,13 +2286,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2619,13 +2332,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2677,13 +2383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2734,13 +2433,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2790,13 +2482,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2851,13 +2536,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2909,13 +2587,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2978,13 +2649,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3049,13 +2713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3120,13 +2777,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3190,13 +2840,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3258,13 +2901,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3327,13 +2963,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3388,13 +3017,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3446,13 +3068,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3514,13 +3129,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3584,13 +3192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3655,13 +3256,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3724,13 +3318,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3785,13 +3372,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3854,13 +3434,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3924,13 +3497,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4052,13 +3618,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4120,13 +3679,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4205,13 +3757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4253,13 +3798,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4323,13 +3861,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4394,13 +3925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4465,13 +3989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4540,13 +4057,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4619,13 +4129,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4692,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4767,13 +4263,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4845,13 +4334,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4923,13 +4405,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4999,13 +4474,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5072,9 +4540,6 @@ - - 1 - @@ -5137,9 +4602,6 @@ - - 1 - @@ -5220,13 +4682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5292,13 +4747,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5366,13 +4814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5437,13 +4878,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5512,13 +4946,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5587,13 +5014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5659,9 +5079,6 @@ - - 1 - @@ -5709,9 +5126,6 @@ - - 1 - @@ -5759,9 +5173,6 @@ - - 1 - @@ -5806,9 +5217,6 @@ - - 1 - @@ -5854,13 +5262,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index 28e2cfb72c..f3b597e79b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -66,7 +66,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -324,7 +323,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); MonsterBookData.getInstance(); WalkingManager.getInstance(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b326dc412d..4c2368afb1 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -999,7 +997,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ExtendDrop.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ExtendDrop.xml deleted file mode 100644 index 2d0205f1d2..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - 85 - 127 - - - - FOURTH_CLASS_GROUP - FIFTH_CLASS_GROUP - SIXTH_CLASS_GROUP - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml index ceb83a66b7..0e7b8eb079 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml @@ -2552,9 +2552,6 @@ - - 1 - @@ -2603,9 +2600,6 @@ - - 1 - @@ -2650,9 +2644,6 @@ - - 1 - @@ -2700,9 +2691,6 @@ - - 1 - @@ -2748,9 +2736,6 @@ - - 1 - @@ -2799,9 +2784,6 @@ - - 1 - @@ -2840,13 +2822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2910,13 +2885,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2981,13 +2949,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3049,13 +3010,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3118,13 +3072,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3183,13 +3130,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/19200-19299.xml index cd048d392d..3c3976827d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/19200-19299.xml @@ -2624,13 +2624,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3331,9 +3324,6 @@ - - 1 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22100-22199.xml index 501da83728..627e0caf38 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22100-22199.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22100-22199.xml @@ -1147,9 +1147,6 @@ - - 1 - @@ -1213,9 +1210,6 @@ - - 1 - @@ -1279,9 +1273,6 @@ - - 1 - @@ -1335,9 +1326,6 @@ - - 1 - @@ -1402,9 +1390,6 @@ - - 1 - @@ -1469,9 +1454,6 @@ - - 1 - @@ -1551,9 +1533,6 @@ - - 1 - @@ -1636,9 +1615,6 @@ - - 1 - @@ -1702,9 +1678,6 @@ - - 1 - @@ -1771,9 +1744,6 @@ - - 1 - @@ -1853,9 +1823,6 @@ - - 1 - @@ -1929,9 +1896,6 @@ - - 1 - @@ -2018,9 +1982,6 @@ - - 1 - @@ -2088,9 +2049,6 @@ - - 1 - @@ -2179,9 +2137,6 @@ - - 1 - @@ -2273,9 +2228,6 @@ - - 1 - @@ -2344,9 +2296,6 @@ - - 1 - @@ -2449,9 +2398,6 @@ - - 1 - @@ -2513,9 +2459,6 @@ - - 1 - @@ -2621,13 +2564,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2687,13 +2623,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2769,13 +2698,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2777,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2947,13 +2862,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3030,13 +2938,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3113,13 +3014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3201,13 +3095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3298,13 +3185,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3381,13 +3261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3466,13 +3339,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3550,13 +3416,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3642,13 +3501,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3729,13 +3581,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3812,13 +3657,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3896,13 +3734,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3993,13 +3824,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4077,13 +3901,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4165,13 +3982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4251,13 +4061,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4337,13 +4140,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4408,13 +4204,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4510,13 +4299,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4565,13 +4347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4647,13 +4422,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4725,13 +4493,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4806,13 +4567,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4874,13 +4628,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4952,13 +4699,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5019,13 +4759,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22700-22799.xml index f2a60d6069..b5195b2dff 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22700-22799.xml @@ -2725,13 +2725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2791,13 +2784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2841,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2918,13 +2897,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2986,13 +2958,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3059,13 +3024,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3130,13 +3088,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3199,13 +3150,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3265,13 +3209,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3331,13 +3268,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3395,13 +3325,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3466,13 +3389,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3538,13 +3454,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3607,13 +3516,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3676,13 +3578,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3741,13 +3636,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3805,13 +3693,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3876,13 +3757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3948,13 +3822,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4019,13 +3886,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22800-22899.xml index 6930ee84d0..6cf9e67706 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22800-22899.xml @@ -1724,9 +1724,6 @@ - - 1 - @@ -1799,9 +1796,6 @@ - - 1 - @@ -1873,9 +1867,6 @@ - - 1 - @@ -1946,9 +1937,6 @@ - - 1 - @@ -2021,9 +2009,6 @@ - - 1 - @@ -2098,9 +2083,6 @@ - - 1 - @@ -2177,9 +2159,6 @@ - - 1 - @@ -2252,9 +2231,6 @@ - - 1 - @@ -2326,9 +2302,6 @@ - - 1 - @@ -2398,9 +2371,6 @@ - - 1 - @@ -2469,9 +2439,6 @@ - - 1 - @@ -2539,9 +2506,6 @@ - - 1 - @@ -2611,9 +2575,6 @@ - - 1 - @@ -2685,9 +2646,6 @@ - - 1 - @@ -2761,9 +2719,6 @@ - - 1 - @@ -2833,9 +2788,6 @@ - - 1 - @@ -2901,9 +2853,6 @@ - - 1 - @@ -2974,9 +2923,6 @@ - - 1 - @@ -3046,9 +2992,6 @@ - - 1 - @@ -3117,9 +3060,6 @@ - - 1 - @@ -3190,9 +3130,6 @@ - - 1 - @@ -3264,9 +3201,6 @@ - - 1 - @@ -3341,9 +3275,6 @@ - - 1 - @@ -3415,9 +3346,6 @@ - - 1 - @@ -3490,9 +3418,6 @@ - - 1 - @@ -3566,9 +3491,6 @@ - - 1 - @@ -3641,9 +3563,6 @@ - - 1 - @@ -3715,9 +3634,6 @@ - - 1 - @@ -3809,9 +3725,6 @@ - - 1 - @@ -3865,9 +3778,6 @@ - - 1 - @@ -3945,9 +3855,6 @@ - - 1 - @@ -4022,9 +3929,6 @@ - - 1 - @@ -4096,9 +4000,6 @@ - - 1 - @@ -4171,9 +4072,6 @@ - - 1 - @@ -4245,9 +4143,6 @@ - - 1 - @@ -4318,9 +4213,6 @@ - - 1 - @@ -4394,9 +4286,6 @@ - - 1 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22900-22999.xml index 75243eb702..eac39aa0a1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/22900-22999.xml @@ -51,9 +51,6 @@ - - 1 - @@ -130,9 +127,6 @@ - - 1 - @@ -205,9 +199,6 @@ - - 1 - @@ -280,9 +271,6 @@ - - 1 - @@ -356,9 +344,6 @@ - - 1 - @@ -431,9 +416,6 @@ - - 1 - @@ -505,9 +487,6 @@ - - 1 - @@ -582,9 +561,6 @@ - - 1 - @@ -660,9 +636,6 @@ - - 1 - @@ -740,9 +713,6 @@ - - 1 - @@ -816,9 +786,6 @@ - - 1 - @@ -886,13 +853,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -955,13 +915,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1024,13 +977,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1093,13 +1039,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1160,13 +1099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1226,13 +1158,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1294,13 +1219,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1365,13 +1283,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1436,13 +1347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1507,13 +1411,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1575,13 +1472,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1639,13 +1529,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1702,13 +1585,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1763,13 +1639,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1827,13 +1696,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1892,13 +1754,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1955,13 +1810,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2172,13 +2020,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2258,13 +2099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2343,13 +2177,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2426,13 +2253,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2509,13 +2329,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2594,13 +2407,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2679,13 +2485,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2764,13 +2563,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2855,13 +2647,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2947,13 +2732,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3036,13 +2814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3123,13 +2894,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3215,13 +2979,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3303,13 +3060,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3392,13 +3142,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3483,13 +3226,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3558,13 +3294,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3620,13 +3349,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3681,13 +3403,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3740,13 +3455,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3797,13 +3505,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3854,13 +3555,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3913,13 +3607,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3979,13 +3666,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4045,13 +3725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4108,13 +3781,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4166,13 +3832,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4231,13 +3890,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4297,13 +3949,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4363,13 +4008,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4424,13 +4062,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4491,13 +4122,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4553,13 +4177,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4610,13 +4227,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4667,13 +4277,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4728,13 +4331,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4790,13 +4386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4853,13 +4442,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4916,13 +4498,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4976,13 +4551,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23000-23099.xml index ca5a4a675d..4c8a18af88 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23000-23099.xml @@ -1348,9 +1348,6 @@ - - 1 - @@ -1415,9 +1412,6 @@ - - 1 - @@ -1482,9 +1476,6 @@ - - 1 - @@ -1548,9 +1539,6 @@ - - 1 - @@ -1614,9 +1602,6 @@ - - 1 - @@ -1826,13 +1811,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23100-23199.xml index f5de3d3774..0bf8b1e744 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23100-23199.xml @@ -2132,9 +2132,6 @@ - - 1 - @@ -2210,9 +2207,6 @@ - - 1 - @@ -2289,9 +2283,6 @@ - - 1 - @@ -2365,9 +2356,6 @@ - - 1 - @@ -2448,9 +2436,6 @@ - - 1 - @@ -2991,13 +2976,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3047,13 +3025,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3093,9 +3064,6 @@ - - 1 - @@ -3156,9 +3124,6 @@ - - 1 - @@ -3223,9 +3188,6 @@ - - 1 - @@ -3288,9 +3250,6 @@ - - 1 - @@ -3356,9 +3315,6 @@ - - 1 - @@ -3421,9 +3377,6 @@ - - 1 - @@ -3487,9 +3440,6 @@ - - 1 - @@ -3554,9 +3504,6 @@ - - 1 - @@ -3625,9 +3572,6 @@ - - 1 - @@ -3694,9 +3638,6 @@ - - 1 - @@ -3760,9 +3701,6 @@ - - 1 - @@ -3826,9 +3764,6 @@ - - 1 - @@ -3889,9 +3824,6 @@ - - 1 - @@ -3960,9 +3892,6 @@ - - 1 - @@ -4029,9 +3958,6 @@ - - 1 - @@ -4095,9 +4021,6 @@ - - 1 - @@ -4159,9 +4082,6 @@ - - 1 - @@ -4222,9 +4142,6 @@ - - 1 - @@ -4288,9 +4205,6 @@ - - 1 - @@ -5535,13 +5449,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23200-23299.xml index 5f421d1440..f1607ba26a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23200-23299.xml @@ -43,13 +43,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -105,13 +98,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -170,13 +156,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -231,13 +210,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -294,13 +266,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -356,13 +321,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -416,13 +374,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -479,13 +430,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -543,13 +487,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -604,13 +541,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -661,13 +591,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -717,13 +640,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -779,13 +695,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -845,13 +754,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -912,13 +814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -979,13 +874,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1047,13 +935,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1112,13 +993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1175,13 +1049,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1242,13 +1109,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1310,13 +1170,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1377,13 +1230,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1447,13 +1293,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1517,13 +1356,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1583,13 +1415,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1647,13 +1472,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1711,13 +1529,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1774,13 +1585,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1838,13 +1642,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1902,13 +1699,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1967,13 +1757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2029,13 +1812,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2089,13 +1865,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2156,13 +1925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2221,13 +1983,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2288,13 +2043,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2357,13 +2105,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2421,13 +2162,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2479,13 +2213,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2525,13 +2252,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2566,13 +2286,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2619,13 +2332,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2677,13 +2383,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2734,13 +2433,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2790,13 +2482,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2851,13 +2536,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2909,13 +2587,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2978,13 +2649,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3049,13 +2713,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3120,13 +2777,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3190,13 +2840,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3258,13 +2901,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3327,13 +2963,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3388,13 +3017,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3446,13 +3068,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3514,13 +3129,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3584,13 +3192,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3655,13 +3256,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3724,13 +3318,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3785,13 +3372,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3854,13 +3434,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3924,13 +3497,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4052,13 +3618,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4120,13 +3679,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4205,13 +3757,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4253,13 +3798,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4323,13 +3861,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4394,13 +3925,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4465,13 +3989,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4540,13 +4057,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4619,13 +4129,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4692,13 +4195,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4767,13 +4263,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4845,13 +4334,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4923,13 +4405,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4999,13 +4474,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5072,9 +4540,6 @@ - - 1 - @@ -5137,9 +4602,6 @@ - - 1 - @@ -5220,13 +4682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5292,13 +4747,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5366,13 +4814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5437,13 +4878,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5512,13 +4946,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5587,13 +5014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -5659,9 +5079,6 @@ - - 1 - @@ -5709,9 +5126,6 @@ - - 1 - @@ -5759,9 +5173,6 @@ - - 1 - @@ -5806,9 +5217,6 @@ - - 1 - @@ -5854,13 +5262,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java index 46ea132ee5..4238338dcd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -66,7 +66,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -326,7 +325,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); MonsterBookData.getInstance(); WalkingManager.getInstance(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index d7dcda513b..89332b2ea2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -463,13 +463,6 @@ public class NpcData implements IXmlReader } break; } - case "extenddrop": - { - final List extendDrop = new ArrayList<>(); - forEach(npcNode, "id", idNode -> extendDrop.add(Integer.parseInt(idNode.getTextContent()))); - set.set("extendDrop", extendDrop); - break; - } case "collision": { for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index bd6cc50adc..01fa2bd3c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1007,7 +1005,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ffc08f8ee5..77ac00f8d3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -991,9 +988,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23000-23099.xml index 5ab66bf8c4..279b0049ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23000-23099.xml @@ -857,9 +857,6 @@ - - 1 - @@ -898,9 +895,6 @@ - - 1 - @@ -939,9 +933,6 @@ - - 1 - @@ -980,9 +971,6 @@ - - 1 - @@ -1021,9 +1009,6 @@ - - 1 - @@ -1162,13 +1147,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23100-23199.xml index 491370d13e..6d2955c671 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23100-23199.xml @@ -1871,9 +1871,6 @@ - - 1 - @@ -1918,9 +1915,6 @@ - - 1 - @@ -1966,9 +1960,6 @@ - - 1 - @@ -2013,9 +2004,6 @@ - - 1 - @@ -2061,9 +2049,6 @@ - - 1 - @@ -2431,13 +2416,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2481,13 +2459,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2526,9 +2497,6 @@ - - 1 - @@ -2567,9 +2535,6 @@ - - 1 - @@ -2611,9 +2576,6 @@ - - 1 - @@ -2653,9 +2615,6 @@ - - 1 - @@ -2697,9 +2656,6 @@ - - 1 - @@ -2740,9 +2696,6 @@ - - 1 - @@ -2783,9 +2736,6 @@ - - 1 - @@ -2827,9 +2777,6 @@ - - 1 - @@ -2872,9 +2819,6 @@ - - 1 - @@ -2914,9 +2858,6 @@ - - 1 - @@ -2958,9 +2899,6 @@ - - 1 - @@ -3001,9 +2939,6 @@ - - 1 - @@ -3044,9 +2979,6 @@ - - 1 - @@ -3091,9 +3023,6 @@ - - 1 - @@ -3134,9 +3063,6 @@ - - 1 - @@ -3178,9 +3104,6 @@ - - 1 - @@ -3218,9 +3141,6 @@ - - 1 - @@ -3259,9 +3179,6 @@ - - 1 - @@ -3301,9 +3218,6 @@ - - 1 - @@ -4066,12 +3980,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23200-23299.xml index 5081a0c164..9bbd3a22cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/23200-23299.xml @@ -38,13 +38,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -84,13 +77,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -129,13 +115,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -175,13 +154,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -221,13 +193,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -267,13 +232,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -313,13 +271,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -360,13 +311,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -405,13 +349,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -451,13 +388,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -493,13 +423,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -535,13 +458,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -581,13 +497,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -633,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -685,13 +587,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -740,13 +635,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -794,13 +682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -844,13 +725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -894,13 +768,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -950,13 +817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1005,13 +865,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1059,13 +912,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1113,13 +959,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1167,13 +1006,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1219,13 +1051,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1270,13 +1095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1321,13 +1139,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1370,13 +1181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1419,13 +1223,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1469,13 +1266,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1518,13 +1308,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1564,13 +1347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1610,13 +1386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1666,13 +1435,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1718,13 +1480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1772,13 +1527,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1828,13 +1576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1879,13 +1620,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1654,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1961,13 +1688,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1999,13 +1719,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2037,13 +1750,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2078,13 +1784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2119,13 +1818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2160,13 +1852,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2205,13 +1890,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2252,13 +1930,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2300,13 +1971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2400,13 +2057,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2449,13 +2099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2496,13 +2139,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2544,13 +2180,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2221,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2639,13 +2261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2687,13 +2302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2735,13 +2343,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2783,13 +2384,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2831,13 +2425,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2879,13 +2466,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2927,13 +2507,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2976,13 +2549,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3060,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2667,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3155,13 +2707,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3203,13 +2748,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3253,13 +2791,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3305,13 +2836,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3357,13 +2881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3410,13 +2927,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3464,13 +2974,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3517,13 +3020,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3571,13 +3067,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3624,13 +3113,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3677,13 +3159,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3730,13 +3205,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3782,9 +3250,6 @@ - - 1 - @@ -3834,9 +3299,6 @@ - - 1 - @@ -3896,13 +3358,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3950,13 +3405,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4005,13 +3453,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3500,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4115,13 +3549,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4170,13 +3597,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4223,9 +3643,6 @@ - - 1 - @@ -4273,9 +3690,6 @@ - - 1 - @@ -4323,9 +3737,6 @@ - - 1 - @@ -4370,9 +3781,6 @@ - - 1 - @@ -4417,13 +3825,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index 42c4c0903a..7cdddb891e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -63,7 +63,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -316,7 +315,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8b49ce210c..f27bde1f08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fad603da78..9cbb2e6296 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -983,9 +980,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23000-23099.xml index 5ab66bf8c4..279b0049ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23000-23099.xml @@ -857,9 +857,6 @@ - - 1 - @@ -898,9 +895,6 @@ - - 1 - @@ -939,9 +933,6 @@ - - 1 - @@ -980,9 +971,6 @@ - - 1 - @@ -1021,9 +1009,6 @@ - - 1 - @@ -1162,13 +1147,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23100-23199.xml index 491370d13e..6d2955c671 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23100-23199.xml @@ -1871,9 +1871,6 @@ - - 1 - @@ -1918,9 +1915,6 @@ - - 1 - @@ -1966,9 +1960,6 @@ - - 1 - @@ -2013,9 +2004,6 @@ - - 1 - @@ -2061,9 +2049,6 @@ - - 1 - @@ -2431,13 +2416,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2481,13 +2459,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2526,9 +2497,6 @@ - - 1 - @@ -2567,9 +2535,6 @@ - - 1 - @@ -2611,9 +2576,6 @@ - - 1 - @@ -2653,9 +2615,6 @@ - - 1 - @@ -2697,9 +2656,6 @@ - - 1 - @@ -2740,9 +2696,6 @@ - - 1 - @@ -2783,9 +2736,6 @@ - - 1 - @@ -2827,9 +2777,6 @@ - - 1 - @@ -2872,9 +2819,6 @@ - - 1 - @@ -2914,9 +2858,6 @@ - - 1 - @@ -2958,9 +2899,6 @@ - - 1 - @@ -3001,9 +2939,6 @@ - - 1 - @@ -3044,9 +2979,6 @@ - - 1 - @@ -3091,9 +3023,6 @@ - - 1 - @@ -3134,9 +3063,6 @@ - - 1 - @@ -3178,9 +3104,6 @@ - - 1 - @@ -3218,9 +3141,6 @@ - - 1 - @@ -3259,9 +3179,6 @@ - - 1 - @@ -3301,9 +3218,6 @@ - - 1 - @@ -4066,12 +3980,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23200-23299.xml index 5081a0c164..9bbd3a22cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/23200-23299.xml @@ -38,13 +38,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -84,13 +77,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -129,13 +115,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -175,13 +154,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -221,13 +193,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -267,13 +232,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -313,13 +271,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -360,13 +311,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -405,13 +349,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -451,13 +388,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -493,13 +423,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -535,13 +458,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -581,13 +497,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -633,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -685,13 +587,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -740,13 +635,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -794,13 +682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -844,13 +725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -894,13 +768,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -950,13 +817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1005,13 +865,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1059,13 +912,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1113,13 +959,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1167,13 +1006,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1219,13 +1051,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1270,13 +1095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1321,13 +1139,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1370,13 +1181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1419,13 +1223,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1469,13 +1266,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1518,13 +1308,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1564,13 +1347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1610,13 +1386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1666,13 +1435,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1718,13 +1480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1772,13 +1527,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1828,13 +1576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1879,13 +1620,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1920,13 +1654,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1961,13 +1688,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1999,13 +1719,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2037,13 +1750,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2078,13 +1784,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2119,13 +1818,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2160,13 +1852,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2205,13 +1890,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2252,13 +1930,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2300,13 +1971,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2350,13 +2014,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2400,13 +2057,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2449,13 +2099,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2496,13 +2139,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2544,13 +2180,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2592,13 +2221,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2639,13 +2261,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2687,13 +2302,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2735,13 +2343,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2783,13 +2384,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2831,13 +2425,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2879,13 +2466,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2927,13 +2507,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2976,13 +2549,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3060,13 +2626,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3108,13 +2667,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3155,13 +2707,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3203,13 +2748,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3253,13 +2791,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3305,13 +2836,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3357,13 +2881,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3410,13 +2927,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3464,13 +2974,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3517,13 +3020,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3571,13 +3067,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3624,13 +3113,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3677,13 +3159,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3730,13 +3205,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3782,9 +3250,6 @@ - - 1 - @@ -3834,9 +3299,6 @@ - - 1 - @@ -3896,13 +3358,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3950,13 +3405,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4005,13 +3453,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4059,13 +3500,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4115,13 +3549,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4170,13 +3597,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4223,9 +3643,6 @@ - - 1 - @@ -4273,9 +3690,6 @@ - - 1 - @@ -4323,9 +3737,6 @@ - - 1 - @@ -4370,9 +3781,6 @@ - - 1 - @@ -4417,13 +3825,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index 42c4c0903a..7cdddb891e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -63,7 +63,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -316,7 +315,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8b49ce210c..f27bde1f08 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fad603da78..9cbb2e6296 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -983,9 +980,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index 42c4c0903a..7cdddb891e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -63,7 +63,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -316,7 +315,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8b49ce210c..f27bde1f08 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fad603da78..9cbb2e6296 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -983,9 +980,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/npcs.xsd index de99803daa..0c41d17e93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/npcs.xsd @@ -287,13 +287,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index 4e6b7662bb..36680edb4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -64,7 +64,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -318,7 +317,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0d7e0d85da..b22fb28b74 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1031,7 +1029,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bb8bda51e9..59452dc551 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,9 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private MpRewardType _mpRewardType; private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - - private List _extendDrop; - private ElementalType _elementalType; private long _attributeExp; @@ -210,7 +207,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -999,9 +995,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/npcs.xsd index de99803daa..0c41d17e93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/npcs.xsd @@ -287,13 +287,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 174b2b110d..b1770481cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -320,7 +319,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0d7e0d85da..b22fb28b74 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1031,7 +1029,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bb8bda51e9..59452dc551 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,9 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private MpRewardType _mpRewardType; private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - - private List _extendDrop; - private ElementalType _elementalType; private long _attributeExp; @@ -210,7 +207,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -999,9 +995,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/npcs.xsd index de99803daa..0c41d17e93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/npcs.xsd @@ -287,13 +287,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java index 1f8d9bb63d..c5f414405c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java @@ -65,7 +65,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EquipmentUpgradeData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -322,7 +321,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0d7e0d85da..b22fb28b74 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1031,7 +1029,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bb8bda51e9..59452dc551 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,9 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private MpRewardType _mpRewardType; private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - - private List _extendDrop; - private ElementalType _elementalType; private long _attributeExp; @@ -210,7 +207,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -999,9 +995,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/ExtendDrop.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/ExtendDrop.xml deleted file mode 100644 index a9e0660b71..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/ExtendDrop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/18900-18999.xml index 57c654ba1c..2b5da72997 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/18900-18999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/18900-18999.xml @@ -2475,9 +2475,6 @@ - - 1 - @@ -2526,9 +2523,6 @@ - - 1 - @@ -2573,9 +2567,6 @@ - - 1 - @@ -2623,9 +2614,6 @@ - - 1 - @@ -2671,9 +2659,6 @@ - - 1 - @@ -2722,9 +2707,6 @@ - - 1 - @@ -2788,13 +2770,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2856,13 +2831,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2927,13 +2895,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2996,13 +2957,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3061,13 +3015,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3128,13 +3075,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/19200-19299.xml index 03a67bc27e..33767d81f8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/19200-19299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/19200-19299.xml @@ -2683,13 +2683,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3398,9 +3391,6 @@ - - 1 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22700-22799.xml index cbe89accd4..fa13f41186 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22700-22799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22700-22799.xml @@ -2986,13 +2986,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3061,13 +3054,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3136,13 +3122,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3200,13 +3179,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3285,13 +3257,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3367,13 +3332,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3448,13 +3406,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3529,13 +3480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3609,13 +3553,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3686,13 +3623,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3749,13 +3679,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3836,13 +3759,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3917,13 +3833,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4000,13 +3909,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4080,13 +3982,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4155,13 +4050,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4231,13 +4119,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4318,13 +4199,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4400,13 +4274,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4481,13 +4348,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22800-22899.xml index 5d9b00c286..0de2e713cc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22800-22899.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22800-22899.xml @@ -1911,9 +1911,6 @@ - - 1 - @@ -1981,9 +1978,6 @@ - - 1 - @@ -2048,9 +2042,6 @@ - - 1 - @@ -2115,9 +2106,6 @@ - - 1 - @@ -2185,9 +2173,6 @@ - - 1 - @@ -2258,9 +2243,6 @@ - - 1 - @@ -2329,9 +2311,6 @@ - - 1 - @@ -2400,9 +2379,6 @@ - - 1 - @@ -2464,9 +2440,6 @@ - - 1 - @@ -2531,9 +2504,6 @@ - - 1 - @@ -2595,9 +2565,6 @@ - - 1 - @@ -2659,9 +2626,6 @@ - - 1 - @@ -2725,9 +2689,6 @@ - - 1 - @@ -2795,9 +2756,6 @@ - - 1 - @@ -2863,9 +2821,6 @@ - - 1 - @@ -2929,9 +2884,6 @@ - - 1 - @@ -2994,9 +2946,6 @@ - - 1 - @@ -3062,9 +3011,6 @@ - - 1 - @@ -3127,9 +3073,6 @@ - - 1 - @@ -3192,9 +3135,6 @@ - - 1 - @@ -3259,9 +3199,6 @@ - - 1 - @@ -3330,9 +3267,6 @@ - - 1 - @@ -3400,9 +3334,6 @@ - - 1 - @@ -3468,9 +3399,6 @@ - - 1 - @@ -3536,9 +3464,6 @@ - - 1 - @@ -3607,9 +3532,6 @@ - - 1 - @@ -3675,9 +3597,6 @@ - - 1 - @@ -3744,9 +3663,6 @@ - - 1 - @@ -3802,9 +3718,6 @@ - - 1 - @@ -3876,9 +3789,6 @@ - - 1 - @@ -3949,9 +3859,6 @@ - - 1 - @@ -4021,9 +3928,6 @@ - - 1 - @@ -4088,9 +3992,6 @@ - - 1 - @@ -4158,9 +4059,6 @@ - - 1 - @@ -4225,9 +4123,6 @@ - - 1 - @@ -4293,9 +4188,6 @@ - - 1 - @@ -4362,8 +4254,5 @@ - - 1 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22900-22999.xml index 933d2f0465..800e850aa6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22900-22999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/22900-22999.xml @@ -69,9 +69,6 @@ - - 1 - @@ -140,9 +137,6 @@ - - 1 - @@ -210,9 +204,6 @@ - - 1 - @@ -278,9 +269,6 @@ - - 1 - @@ -349,9 +337,6 @@ - - 1 - @@ -417,9 +402,6 @@ - - 1 - @@ -486,9 +468,6 @@ - - 1 - @@ -556,9 +535,6 @@ - - 1 - @@ -630,9 +606,6 @@ - - 1 - @@ -702,9 +675,6 @@ - - 1 - @@ -772,9 +742,6 @@ - - 1 - @@ -836,13 +803,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -907,13 +867,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -978,13 +931,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1044,13 +990,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1113,13 +1052,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1182,13 +1114,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1253,13 +1178,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1326,13 +1244,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1400,13 +1311,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1473,13 +1377,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1545,13 +1442,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1618,13 +1508,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1691,13 +1574,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1758,13 +1634,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1826,13 +1695,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1891,13 +1753,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1959,13 +1814,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2179,13 +2027,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2259,13 +2100,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2336,13 +2170,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2412,13 +2239,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2490,13 +2310,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2569,13 +2382,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2647,13 +2453,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2726,13 +2525,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2809,13 +2601,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2893,13 +2678,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2974,13 +2752,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3059,13 +2830,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3141,13 +2905,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3223,13 +2980,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3307,13 +3057,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3391,13 +3134,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3454,13 +3190,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3518,13 +3247,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3581,13 +3303,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3643,13 +3358,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3702,13 +3410,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3761,13 +3462,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3822,13 +3516,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3891,13 +3578,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3960,13 +3640,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4026,13 +3699,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4086,13 +3752,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4154,13 +3813,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4223,13 +3875,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4292,13 +3937,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4355,13 +3993,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4425,13 +4056,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4489,13 +4113,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4549,13 +4166,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4613,13 +4223,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4676,13 +4279,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4742,13 +4338,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4807,13 +4396,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4870,13 +4452,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4933,13 +4508,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23000-23099.xml index 1dd9b21475..21c6539c5e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23000-23099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23000-23099.xml @@ -857,9 +857,6 @@ - - 1 - @@ -898,9 +895,6 @@ - - 1 - @@ -939,9 +933,6 @@ - - 1 - @@ -980,9 +971,6 @@ - - 1 - @@ -1021,9 +1009,6 @@ - - 1 - @@ -1163,13 +1148,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23100-23199.xml index dd4e465679..75eb9df17e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23100-23199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23100-23199.xml @@ -1876,9 +1876,6 @@ - - 1 - @@ -1923,9 +1920,6 @@ - - 1 - @@ -1971,9 +1965,6 @@ - - 1 - @@ -2018,9 +2009,6 @@ - - 1 - @@ -2067,9 +2055,6 @@ - - 1 - @@ -2439,13 +2424,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2489,13 +2467,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2534,9 +2505,6 @@ - - 1 - @@ -2575,9 +2543,6 @@ - - 1 - @@ -2619,9 +2584,6 @@ - - 1 - @@ -2661,9 +2623,6 @@ - - 1 - @@ -2705,9 +2664,6 @@ - - 1 - @@ -2748,9 +2704,6 @@ - - 1 - @@ -2791,9 +2744,6 @@ - - 1 - @@ -2835,9 +2785,6 @@ - - 1 - @@ -2880,9 +2827,6 @@ - - 1 - @@ -2922,9 +2866,6 @@ - - 1 - @@ -2966,9 +2907,6 @@ - - 1 - @@ -3009,9 +2947,6 @@ - - 1 - @@ -3052,9 +2987,6 @@ - - 1 - @@ -3099,9 +3031,6 @@ - - 1 - @@ -3142,9 +3071,6 @@ - - 1 - @@ -3186,9 +3112,6 @@ - - 1 - @@ -3226,9 +3149,6 @@ - - 1 - @@ -3267,9 +3187,6 @@ - - 1 - @@ -3309,9 +3226,6 @@ - - 1 - @@ -4075,12 +3989,5 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23200-23299.xml index e349d4de3c..3865e5e6ad 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23200-23299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/23200-23299.xml @@ -38,13 +38,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -84,13 +77,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -129,13 +115,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -175,13 +154,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -221,13 +193,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -267,13 +232,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -313,13 +271,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -360,13 +311,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -405,13 +349,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -451,13 +388,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -493,13 +423,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -535,13 +458,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -581,13 +497,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -633,13 +542,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -685,13 +587,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -740,13 +635,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -794,13 +682,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -844,13 +725,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -894,13 +768,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -950,13 +817,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1005,13 +865,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1059,13 +912,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1113,13 +959,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1167,13 +1006,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1219,13 +1051,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1270,13 +1095,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1321,13 +1139,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1370,13 +1181,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1419,13 +1223,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1469,13 +1266,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1518,13 +1308,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1564,13 +1347,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1610,13 +1386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1666,13 +1435,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1718,13 +1480,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1772,13 +1527,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1828,13 +1576,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1879,13 +1620,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1921,13 +1655,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -1962,13 +1689,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2000,13 +1720,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2038,13 +1751,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2080,13 +1786,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2121,13 +1820,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2162,13 +1854,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2207,13 +1892,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2254,13 +1932,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2302,13 +1973,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2352,13 +2016,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2402,13 +2059,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2451,13 +2101,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2498,13 +2141,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2546,13 +2182,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2594,13 +2223,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2641,13 +2263,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2689,13 +2304,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2737,13 +2345,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2785,13 +2386,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2833,13 +2427,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2881,13 +2468,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2929,13 +2509,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -2978,13 +2551,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3062,13 +2628,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3110,13 +2669,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3157,13 +2709,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3205,13 +2750,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3255,13 +2793,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3307,13 +2838,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3359,13 +2883,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3412,13 +2929,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3466,13 +2976,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3519,13 +3022,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3573,13 +3069,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3626,13 +3115,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3679,13 +3161,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3732,13 +3207,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3784,9 +3252,6 @@ - - 1 - @@ -3837,9 +3302,6 @@ - - 1 - @@ -3900,13 +3362,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -3955,13 +3410,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4011,13 +3459,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4065,13 +3506,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4122,13 +3556,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4177,13 +3604,6 @@ - - 1 - 2 - 3 - 4 - 5 - @@ -4231,9 +3651,6 @@ - - 1 - @@ -4281,9 +3698,6 @@ - - 1 - @@ -4331,9 +3745,6 @@ - - 1 - @@ -4379,9 +3790,6 @@ - - 1 - @@ -4426,13 +3834,6 @@ - - 1 - 2 - 3 - 4 - 5 - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ExtendDrop.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ExtendDrop.xsd deleted file mode 100644 index c3588b68d1..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ExtendDrop.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/npcs.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/npcs.xsd index 87d6e604e0..24e03ac8a0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/npcs.xsd +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/npcs.xsd @@ -286,13 +286,6 @@ - - - - - - - diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java index e2206a9d43..65b734a9d9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -63,7 +63,6 @@ import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.impl.EnsoulData; import org.l2jmobius.gameserver.data.xml.impl.EventEngineData; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.data.xml.impl.FakePlayerData; import org.l2jmobius.gameserver.data.xml.impl.FenceData; import org.l2jmobius.gameserver.data.xml.impl.FishingData; @@ -317,7 +316,6 @@ public class GameServer NpcData.getInstance(); FakePlayerData.getInstance(); FakePlayerChatManager.getInstance(); - ExtendDropData.getInstance(); SpawnData.getInstance(); WalkingManager.getInstance(); StaticObjectData.getInstance(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java deleted file mode 100644 index b86a1a6a39..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ /dev/null @@ -1,203 +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.data.xml.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; -import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropData implements IXmlReader -{ - private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName()); - private final Map _extendDrop = new HashMap<>(); - - protected ExtendDropData() - { - load(); - } - - @Override - public void load() - { - _extendDrop.clear(); - parseDatapackFile("data/ExtendDrop.xml"); - LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extendDrop.size() + " extend drops."); - } - - @Override - public void parseDocument(Document doc, File f) - { - forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> - { - final StatSet set = new StatSet(parseAttributes(dropNode)); - final List items = new ArrayList<>(1); - forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> - { - final int itemId = parseInteger(itemNode.getAttributes(), "id"); - final int itemCount = parseInteger(itemNode.getAttributes(), "count"); - final int itemMaxCount = parseInteger(itemNode.getAttributes(), "maxCount"); - final double itemChance = parseDouble(itemNode.getAttributes(), "chance"); - final double itemAdditionalChance = parseDouble(itemNode.getAttributes(), "additionalChance"); - items.add(new ExtendDropItemHolder(itemId, itemCount, itemMaxCount, itemChance, itemAdditionalChance)); - })); - set.set("items", items); - - final List conditions = new ArrayList<>(1); - forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> - { - final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatSet params = (StatSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); - if (conditionFunction != null) - { - conditions.add(conditionFunction.apply(params)); - } - else - { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for ExtendDrop Id[" + set.getInt("id") + "] Condition Name[" + conditionName + "]"); - } - })); - set.set("conditions", conditions); - - final Map systemMessages = new HashMap<>(); - forEach(dropNode, "systemMessages", systemMessagesNode -> forEach(systemMessagesNode, "systemMessage", systemMessageNode -> - { - final long amount = parseLong(systemMessageNode.getAttributes(), "amount"); - final SystemMessageId systemMessageId = SystemMessageId.getSystemMessageId(parseInteger(systemMessageNode.getAttributes(), "id")); - systemMessages.put(amount, systemMessageId); - })); - set.set("systemMessages", systemMessages); - _extendDrop.put(set.getInt("id"), new ExtendDropDataHolder(set)); - })); - } - - private Object parseValue(Node node) - { - StatSet statSet = null; - List list = null; - Object text = null; - Node n = node; - for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) - { - final String nodeName = n.getNodeName(); - switch (n.getNodeName()) - { - case "#text": - { - final String value = n.getNodeValue().trim(); - if (!value.isEmpty()) - { - text = value; - } - break; - } - case "item": - { - if (list == null) - { - list = new LinkedList<>(); - } - - final Object value = parseValue(n); - if (value != null) - { - list.add(value); - } - break; - } - default: - { - final Object value = parseValue(n); - if (value != null) - { - if (statSet == null) - { - statSet = new StatSet(); - } - - statSet.set(nodeName, value); - } - } - } - } - if (list != null) - { - if (text != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", list); - } - else - { - return list; - } - } - if (text != null) - { - if (list != null) - { - throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]"); - } - if (statSet != null) - { - statSet.set(".", text); - } - else - { - return text; - } - } - return statSet; - } - - public ExtendDropDataHolder getExtendDropById(int id) - { - return _extendDrop.getOrDefault(id, null); - } - - public static ExtendDropData getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final ExtendDropData INSTANCE = new ExtendDropData(); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8b49ce210c..f27bde1f08 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +35,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.xml.impl.ExtendDropData; import org.l2jmobius.gameserver.datatables.EventDroplist; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -1010,7 +1008,6 @@ public class Attackable extends Npc } CursedWeaponsManager.getInstance().checkDrop(this, player); - npcTemplate.getExtendDrop().stream().map(ExtendDropData.getInstance()::getExtendDropById).filter(Objects::nonNull).forEach(e -> e.reward(player, this)); if (isSpoiled() && !_plundered) { _sweepItems.set(npcTemplate.calculateDrops(DropType.SPOIL, this, player)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index fad603da78..9cbb2e6296 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -119,8 +119,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _mpRewardTicks; private MpRewardAffectType _mpRewardAffectType; - private List _extendDrop; - /** * Constructor of Creature. * @param set The StatSet object to transfer data to the method @@ -204,7 +202,6 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); _mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO); - _extendDrop = set.getList("extendDrop", Integer.class); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers { switch (_type) @@ -983,9 +980,4 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { return isAssignableTo(obj.getClass(), clazz); } - - public List getExtendDrop() - { - return _extendDrop == null ? Collections.emptyList() : _extendDrop; - } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java deleted file mode 100644 index 5d00bf394e..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ /dev/null @@ -1,73 +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.model.holders; - -import java.util.List; -import java.util.Map; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.conditions.ICondition; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author Sdw - */ -public class ExtendDropDataHolder -{ - private final int _id; - private final List _items; - private final List _conditions; - private final Map _systemMessages; - - public ExtendDropDataHolder(StatSet set) - { - _id = set.getInt("id"); - _items = set.getList("items", ExtendDropItemHolder.class); - _conditions = set.getList("conditions", ICondition.class); - _systemMessages = set.getMap("systemMessages", Long.class, SystemMessageId.class); - } - - public void reward(PlayerInstance player, Npc npc) - { - if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(player, npc))) - { - _items.forEach(i -> - { - final long currentAmount = player.getVariables().getExtendDropCount(_id); - if ((Rnd.nextDouble() < i.getChance()) && (currentAmount < i.getMaxCount())) - { - boolean sendMessage = true; - final long newAmount = currentAmount + i.getCount(); - if (_systemMessages != null) - { - final SystemMessageId systemMessageId = _systemMessages.get(newAmount); - if (systemMessageId != null) - { - sendMessage = false; - player.sendPacket(systemMessageId); - } - } - player.addItem("ExtendDrop", i.getId(), i.getCount(), player, sendMessage); - player.getVariables().updateExtendDrop(_id, newAmount); - } - }); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java deleted file mode 100644 index f15a0dbedc..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropItemHolder.java +++ /dev/null @@ -1,51 +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.model.holders; - -/** - * @author Sdw - */ -public class ExtendDropItemHolder extends ItemHolder -{ - private final long _maxCount; - private final double _chance; - private final double _additionalChance; - - public ExtendDropItemHolder(int id, long count, long maxCount, double chance, double additionalChance) - { - super(id, count); - - _maxCount = maxCount; - _chance = chance; - _additionalChance = additionalChance; - } - - public long getMaxCount() - { - return _maxCount; - } - - public double getChance() - { - return _chance; - } - - public double getAdditionalChance() - { - return _additionalChance; - } -} \ No newline at end of file