diff --git a/2006Redone Client/bin/ClientSettings.class b/2006Redone Client/bin/ClientSettings.class index 7665596e..77204929 100644 Binary files a/2006Redone Client/bin/ClientSettings.class and b/2006Redone Client/bin/ClientSettings.class differ diff --git a/2006Redone Client/bin/Flo.class b/2006Redone Client/bin/Flo.class index 44145627..e9444d03 100644 Binary files a/2006Redone Client/bin/Flo.class and b/2006Redone Client/bin/Flo.class differ diff --git a/2006Redone Client/bin/Game.class b/2006Redone Client/bin/Game.class index ab5b5a7e..444c482e 100644 Binary files a/2006Redone Client/bin/Game.class and b/2006Redone Client/bin/Game.class differ diff --git a/2006Redone Server/data/cfg/doors.cfg b/2006Redone Server/data/cfg/doors.cfg deleted file mode 100644 index 7bc45892..00000000 --- a/2006Redone Server/data/cfg/doors.cfg +++ /dev/null @@ -1,68 +0,0 @@ -//the door starts as closed -// South 0 face = doorX -1 face = -3 -// East -1 face = doorY -1 face = 0 -// North -2 face = doorX +1 face = -1 -// West -3 face = doorY +1 face = -2 - -// doorX doorY Height Face State //0 closed, 1 open -door = 2474 3233 9312 0 1 //Ancient temple portal -door = 3312 3235 0 0 0 //duel arena gate -door = 3312 3234 0 0 0 //duel arena gate -door = 3253 3266 0 0 0 //cow gate - -door = 3268 3227 0 0 0 //al kharid gates -door = 3268 3228 0 0 0 - -door = 3562 9694 0 -2 0 //barrows door -door = 3563 9694 0 -1 1 - -//door = 2949 3379 0 0 0 //fally hair shop -//door = 2948 3379 0 -3 1 - -door = 3234 3426 0 -2 0 -door = 3235 3426 0 -1 1 - -door = 3238 3210 0 0 0 -door = 3237 3210 0 -3 1 - -door = 3234 3207 0 0 0 -door = 3233 3207 0 -3 1 - -door = 3079 3497 0 -2 0 -door = 3079 3497 0 -1 1 - -//the door starts as opened -// South 0 face = doorY +1 face = -1 -// East -1 face = doorX -1 face = -2 -// North -2 face = doorY -1 face = -3 -// West -3 face = doorX +1 face = 0 - -// doorX doorY Height Face State //0 closed, 1 open - -door = 3231 3433 0 -2 1 -door = 3231 3432 0 -3 0 - -door = 2950 3385 0 -2 1 -door = 2950 3384 0 -3 0 - -door = 3249 3435 0 -1 1 -door = 3248 3435 0 -2 0 - -door = 3253 3431 0 -2 1 -door = 3253 3430 0 -3 0 - -door = 3233 3427 0 0 1 -door = 3233 3428 0 -1 0 - -door = 3217 3219 0 0 0 -door = 3216 3219 0 -3 1 - -door = 3101 3510 0 0 0 -door = 3101 3509 0 0 0 - -door = 2816 3438 0 -3 0 -//door = 3101 3509 0 1 0 -//door = 3101 3510 0 -1 0 - -[ENDOFDOORLIST] - diff --git a/2006Redone Server/data/cfg/global-objects.cfg b/2006Redone Server/data/cfg/global-objects.cfg deleted file mode 100644 index 70c17733..00000000 --- a/2006Redone Server/data/cfg/global-objects.cfg +++ /dev/null @@ -1,3 +0,0 @@ -// objectId X Y H Face objectType -//object = 9981 3254 3429 0 -1 10 -[ENDOFOBJECTLIST] \ No newline at end of file diff --git a/2006Redone Server/data/cfg/npc.cfg b/2006Redone Server/data/cfg/npc.cfg index 842daa15..4526c6cc 100644 --- a/2006Redone Server/data/cfg/npc.cfg +++ b/2006Redone Server/data/cfg/npc.cfg @@ -2887,5 +2887,8 @@ npc = 3830 Kathy Corkat 0 0 npc = 3348 White_Knight 38 55 npc = 3350 White_Knight 42 60 npc = 3340 Giant_Mole 230 200 +npc = 3504 Hellcat 0 0 +npc = 3506 Lazy_Hellcat 0 0 +npc = 3507 Wily_Hellcat 0 0 [ENDOFNPCLIST] diff --git a/2006Redone Server/data/doorsbackup.txt b/2006Redone Server/data/doorsbackup.txt deleted file mode 100644 index 63a1a5bd..00000000 --- a/2006Redone Server/data/doorsbackup.txt +++ /dev/null @@ -1,1023 +0,0 @@ - 6106 1943 4702 1 0 0 - 6109 1933 4691 0 0 0 - 6114 1986 4494 2 0 0 - 6114 1986 4529 2 0 0 - 6114 2003 4494 0 0 0 - 6114 2003 4529 0 0 0 - 6114 2028 4494 2 0 0 - 6114 2028 4529 2 0 0 - 6114 2045 4494 0 0 0 - 6114 2045 4529 0 0 0 - 6114 1986 4494 2 1 0 - 6114 1986 4529 2 1 0 - 6114 2003 4494 0 1 0 - 6114 2003 4529 0 1 0 - 6114 2028 4494 2 1 0 - 6114 2028 4529 2 1 0 - 6114 2045 4494 0 1 0 - 6114 2045 4529 0 1 0 - 6114 1986 4494 2 2 0 - 6114 1986 4529 2 2 0 - 6114 2003 4494 0 2 0 - 6114 2003 4529 0 2 0 - 6114 2028 4494 2 2 0 - 6114 2028 4529 2 2 0 - 6114 2045 4494 0 2 0 - 6114 2045 4529 0 2 0 - 6114 1986 4494 2 3 0 - 6114 1986 4529 2 3 0 - 6114 2003 4494 0 3 0 - 6114 2003 4529 0 3 0 - 6114 2028 4494 2 3 0 - 6114 2028 4529 2 3 0 - 6114 2045 4494 0 3 0 - 6114 2045 4529 0 3 0 - 1530 2035 4646 1 0 0 - 1530 2038 4646 1 0 0 - 1530 2042 4644 2 0 0 - 8786 2041 4646 1 0 0 - 8787 2042 4633 1 0 0 - 8788 2037 4633 1 0 0 - 8789 2034 4636 0 0 0 - 3270 2158 4566 0 1 0 - 1530 2128 4915 3 0 0 - 1530 2128 4922 2 0 0 - 1530 2132 4919 1 0 0 - 1530 2141 4922 2 0 0 - 4636 2198 4943 1 1 0 - 4637 2217 4943 1 1 0 - 4638 2191 4950 2 0 0 - 4638 2191 4961 2 0 0 - 4638 2191 4969 2 0 0 - 4638 2198 4943 1 0 0 - 4638 2198 4976 3 0 0 - 4638 2206 4976 3 0 0 - 4638 2209 4976 3 0 0 - 4638 2217 4943 1 0 0 - 4638 2217 4976 3 0 0 - 4638 2224 4950 0 0 0 - 4638 2224 4961 0 0 0 - 4638 2224 4969 0 0 0 - 4640 2191 4958 2 0 0 - 4640 2224 4958 0 0 0 - 4640 2191 4958 2 1 0 - 4640 2224 4958 0 1 0 - 11196 2224 4950 0 1 0 - 11197 2191 4950 2 1 0 - 1530 2313 9803 3 0 0 - 1530 2325 9801 3 0 0 - 4465 2415 3073 0 0 0 - 4467 2384 3134 2 0 0 - 1530 2463 3176 0 0 0 - 1530 2467 3178 0 0 0 - 1533 2443 3183 1 0 0 - 1530 2467 3301 0 0 0 - 1530 2470 3285 0 0 0 - 1530 2470 3322 1 0 0 - 1530 2471 3307 2 0 0 - 1530 2476 3317 1 0 0 - 1530 2482 3287 3 0 0 - 1530 2483 3295 0 0 0 - 1530 2483 3307 0 0 0 - 1530 2487 3295 2 0 0 - 1530 2487 3301 2 0 0 - 1530 2488 3322 1 0 0 - 2997 2467 3295 0 0 0 - 2997 2467 3307 0 0 0 - 2997 2470 3317 1 0 0 - 2997 2471 3295 2 0 0 - 2997 2471 3301 2 0 0 - 2997 2477 3287 3 0 0 - 2997 2482 3317 1 0 0 - 2997 2482 3322 1 0 0 - 2997 2488 3317 1 0 0 - 10260 2436 3345 1 0 0 - 10261 2435 3345 0 1 0 - 10261 2438 3347 3 1 0 - 10262 2433 3348 2 0 0 - 10264 2433 3347 2 0 0 - 7274 2472 4972 0 0 0 - 7302 2447 4979 0 0 0 - 7317 2463 4963 2 0 0 - 7320 2480 4956 2 0 0 - 7323 2446 4956 2 0 0 - 7326 2478 4940 2 0 0 - 7354 2452 4943 1 0 0 - 1530 2551 3098 3 0 0 - 1533 2551 3082 1 0 0 - 1530 2505 3256 3 0 9 - 1530 2524 3254 1 0 0 - 2184 2502 3250 1 0 0 - 1530 2502 3309 2 0 0 - 1530 2502 3319 2 0 0 - 1530 2508 3323 1 0 0 - 1530 2511 3309 0 0 0 - 1530 2519 3275 0 0 0 - 1530 2521 3314 2 0 0 - 1530 2531 3276 1 0 0 - 1530 2541 3280 3 0 0 - 1530 2546 3325 2 0 0 - 1530 2551 3308 2 0 0 - 1530 2552 3314 2 0 0 - 1531 2527 3293 3 1 0 - 2034 2547 3325 0 1 0 - 2036 2551 3320 1 0 0 - 2528 2530 3314 0 0 0 - 2535 2533 3272 3 0 0 - 2535 2540 3273 3 0 0 - 2546 2525 3311 1 0 0 - 2548 2526 3311 1 0 0 - 2997 2502 3314 2 0 0 - 2997 2502 3323 1 0 0 - 2997 2510 3304 2 0 0 - 2997 2511 3314 0 0 0 - 2997 2511 3319 0 0 0 - 2997 2514 3323 1 0 0 - 2997 2523 3274 1 0 0 - 2997 2525 3272 3 0 0 - 2997 2536 3280 3 0 0 - 2997 2547 3280 3 0 0 - 2997 2549 3274 3 0 0 - 1530 2500 3328 1 0 0 - 1530 2506 3328 1 0 0 - 1530 2510 3380 1 0 0 - 1530 2512 3328 1 0 0 - 1530 2520 3332 0 0 0 - 1530 2521 3381 1 0 0 - 1530 2522 3375 2 0 0 - 2036 2551 3328 3 0 0 - 2537 2531 3328 1 0 0 - 1530 2524 3434 1 0 0 - 1536 2521 3432 0 0 0 - 1533 2525 3495 0 0 0 - 1533 2522 3495 3 1 0 - 1542 2551 3570 0 0 0 - 1544 2551 3569 0 0 0 - 4247 2534 3898 3 0 0 - 4247 2537 3894 0 0 0 - 4247 2539 3899 2 0 0 - 4247 2542 3895 1 0 0 - 4247 2547 3895 2 0 0 - 4247 2551 3893 1 0 0 - 4696 2512 3850 3 0 0 - 4696 2513 3868 1 0 0 - 4696 2517 3858 3 0 0 - 1991 2515 9575 1 0 0 - 2526 2539 9672 2 0 0 - 2002 2540 9900 1 0 0 - 2002 2542 9892 1 0 0 - 1530 2594 3102 1 0 0 - 1530 2591 3105 1 1 0 - 1530 2597 3105 1 1 0 - 1531 2611 3084 1 0 9 - 1533 2563 3082 2 0 0 - 1533 2603 3082 3 0 0 - 77 2606 3160 2 0 0 - 77 2606 3163 2 0 0 - 77 2606 3166 2 0 0 - 78 2606 3159 2 0 0 - 78 2606 3162 2 0 0 - 78 2606 3165 2 0 0 - 81 2585 3141 0 0 0 - 81 2617 3171 1 0 0 - 82 2606 3152 0 0 9 - 1530 2565 3188 2 0 0 - 1530 2567 3162 2 0 0 - 1530 2569 3150 1 0 0 - 1530 2570 3168 3 0 0 - 1530 2578 3195 3 0 0 - 1530 2590 3192 3 0 0 - 1530 2599 3192 3 0 0 - 1530 2605 3182 0 0 0 - 1530 2608 3181 3 0 0 - 1530 2609 3143 0 0 0 - 1530 2609 3191 3 0 0 - 1530 2612 3182 2 0 0 - 1530 2613 3150 0 0 0 - 1530 2616 3145 1 1 0 - 1531 2584 3193 1 0 0 - 1533 2595 3188 1 0 0 - 1533 2616 3147 3 0 0 - 131 2566 3237 2 0 0 - 1530 2567 3245 1 0 0 - 1530 2569 3239 3 0 0 - 1530 2574 3250 0 0 0 - 1530 2602 3209 0 0 0 - 1530 2606 3219 3 0 0 - 1530 2610 3209 2 0 0 - 1530 2564 3310 0 0 0 - 1530 2573 3302 3 0 0 - 1530 2574 3285 0 0 0 - 1530 2574 3293 2 0 0 - 1530 2574 3308 0 0 0 - 1530 2577 3287 3 0 0 - 1530 2577 3306 1 0 0 - 1530 2579 3285 2 0 0 - 1530 2579 3308 2 0 0 - 1530 2610 3307 1 0 0 - 1530 2610 3324 2 0 0 - 1530 2574 3285 0 1 0 - 1530 2574 3308 0 1 0 - 1530 2579 3285 2 1 0 - 1530 2579 3308 2 1 0 - 1533 2564 3321 2 0 0 - 1533 2565 3272 3 0 0 - 1533 2565 3317 1 0 0 - 1533 2567 3271 2 0 0 - 1533 2569 3273 1 0 0 - 1533 2569 3322 0 0 0 - 1533 2570 3271 0 0 0 - 1533 2571 3322 2 0 0 - 1533 2573 3271 3 0 0 - 1533 2576 3320 0 0 0 - 1533 2612 3309 2 0 0 - 1533 2621 3295 3 0 0 - 1533 2566 3268 2 1 0 - 1533 2567 3321 1 1 0 - 1533 2569 3323 0 1 0 - 1533 2571 3323 2 1 0 - 1533 2572 3268 0 1 0 - 1533 2573 3321 1 1 0 - 1533 2612 3325 3 1 0 - 1533 2615 3292 1 1 0 - 1533 2615 3315 0 1 0 - 1533 2616 3317 3 1 0 - 1533 2616 3325 3 1 0 - 1533 2617 3294 0 1 0 - 1533 2622 3293 1 1 0 - 1534 2614 3295 2 0 0 - 1536 2572 3288 3 0 0 - 1536 2572 3305 1 0 0 - 1536 2573 3295 3 0 0 - 1536 2574 3303 2 0 0 - 1536 2573 3302 3 1 0 - 1536 2575 3293 0 1 0 - 2546 2576 3298 0 0 0 - 2548 2576 3299 0 0 0 - 2555 2572 3288 3 1 0 - 2555 2572 3305 1 1 0 - 2556 2610 3316 2 0 0 - 1530 2570 3333 2 0 0 - 1530 2574 3333 0 0 0 - 1530 2578 3333 0 0 0 - 1530 2584 3339 3 0 0 - 1530 2616 3345 2 0 0 - 1533 2576 3336 3 1 0 - 1533 2586 3336 0 1 0 - 1533 2587 3335 2 1 0 - 2054 2592 3339 3 0 0 - 2554 2565 3356 0 0 0 - 1530 2611 3398 1 0 0 - 1531 2598 3404 2 0 9 - 2025 2611 3394 3 0 0 - 4 2576 3461 0 0 0 - 1530 2609 3474 0 0 0 - 4248 2621 3666 1 0 0 - 4247 2615 3897 1 0 0 - 4696 2603 3874 3 0 0 - 4696 2604 3878 1 0 0 - 4701 2618 3895 3 0 0 - 1991 2579 4455 1 0 0 - 2559 2601 9482 3 0 0 - 1530 2565 9612 1 0 0 - 1530 2575 9648 2 0 0 - 1530 2575 9651 2 0 0 - 1530 2582 9648 0 0 0 - 1530 2582 9651 0 0 0 - 1530 2595 9644 2 0 0 - 1530 2598 9648 3 0 0 - 1530 2602 9638 0 0 0 - 2000 2575 9861 3 0 0 - 2002 2566 9901 1 0 0 - 2002 2568 9893 1 0 0 - 2002 2604 9900 1 0 0 - 2002 2606 9892 1 0 0 - 1536 2677 3088 1 0 0 - 1530 2633 3169 1 0 0 - 1530 2634 3164 1 0 0 - 1530 2656 3161 1 0 0 - 1533 2656 3152 1 1 0 - 1534 2640 3172 3 0 0 - 1534 2656 3154 0 0 0 - 1530 2644 3273 3 0 0 - 1530 2645 3314 2 0 0 - 1530 2648 3299 2 0 0 - 1530 2650 3297 0 0 9 - 1530 2650 3305 3 0 0 - 1530 2656 3292 2 0 0 - 1530 2659 3320 1 0 0 - 1530 2663 3279 1 0 0 - 1530 2666 3294 3 0 0 - 1530 2668 3276 0 0 0 - 1530 2669 3316 1 0 9 - 1530 2670 3320 3 0 0 - 1530 2675 3285 3 0 0 - 1530 2676 3280 1 0 0 - 1530 2666 3291 1 1 0 - 1531 2661 3291 1 1 0 - 1533 2628 3323 2 0 0 - 1533 2636 3323 2 0 0 - 1533 2639 3323 2 0 0 - 1533 2632 3319 1 1 0 - 1533 2638 3319 1 1 0 - 1534 2653 3296 0 0 9 - 2550 2674 3305 1 0 0 - 2551 2674 3304 3 0 0 - 2705 2634 3323 0 0 0 - 2706 2635 3321 1 0 0 - 1530 2632 3381 1 0 0 - 1530 2641 3387 1 0 0 - 1530 2643 3360 3 0 0 - 1530 2644 3333 1 0 0 - 1530 2639 3415 2 0 9 - 1533 2641 3424 2 0 0 - 1533 2641 3452 0 0 0 - 1533 2642 3432 2 0 0 - 1533 2649 3449 3 0 0 - 1591 2654 3427 2 0 9 - 1591 2667 3414 0 0 9 - 1591 2669 3442 2 0 9 - 1591 2682 3429 0 0 9 - 99 2657 3496 1 0 0 - 4148 2667 3683 0 0 0 - 4165 2631 3667 3 0 0 - 4166 2636 3667 3 0 0 - 4247 2645 3663 3 0 0 - 4248 2662 3692 3 0 0 - 4250 2627 3656 3 0 0 - 4250 2627 3675 0 0 0 - 4250 2638 3652 2 0 0 - 4250 2655 3654 3 0 0 - 4250 2664 3652 2 0 0 - 4250 2665 3702 2 0 0 - 4250 2671 3652 0 0 0 - 4250 2671 3665 2 0 0 - 4250 2672 3675 2 0 0 - 4250 2677 3690 2 0 0 - 4250 2678 3665 0 0 0 - 4250 2682 3685 3 0 0 - 4250 2683 3679 3 0 0 - 4250 2683 3680 1 0 0 - 4250 2684 3673 1 0 0 - 1530 2629 4726 1 0 0 - 1530 2630 4681 2 0 0 - 1530 2633 4684 3 0 0 - 1530 2633 4728 0 0 0 - 1530 2638 4688 2 0 9 - 1530 2640 4682 1 0 0 - 1530 2645 4684 2 0 0 - 1530 2638 4688 0 1 9 - 10325 2665 9663 1 0 0 - 92 2648 9857 1 0 0 - 93 2646 9870 1 0 0 - 1533 2726 3368 2 0 0 - 1530 2702 3401 3 0 0 - 1530 2701 3477 3 0 0 - 1530 2713 3483 3 0 0 - 1530 2716 3472 0 0 0 - 1530 2706 3472 0 1 0 - 1530 2709 3472 2 1 0 - 1533 2698 3494 1 0 0 - 1533 2750 3495 1 0 0 - 1533 2750 3504 3 0 0 - 1591 2749 3495 1 2 0 - 1530 2731 3580 3 0 0 - 1530 2736 3577 3 1 0 - 1530 2744 3577 3 1 0 - 1533 2735 3575 2 0 0 - 1533 2735 3578 2 0 0 - 1533 2735 3581 2 0 0 - 1533 2738 3578 0 0 0 - 1533 2741 3576 3 0 0 - 1533 2745 3575 0 0 0 - 1533 2746 3577 3 0 0 - 1533 2735 3578 2 1 0 - 1533 2735 3581 2 1 0 - 1533 2739 3578 3 1 0 - 1533 2741 3578 3 1 0 - 1533 2745 3578 0 1 0 - 1533 2745 3581 0 1 0 - 2427 2719 9671 1 0 0 - 2429 2722 9671 1 0 0 - 2430 2727 9690 2 0 0 - 2431 2723 9711 3 0 0 - 1530 2770 3197 0 0 0 - 1530 2782 3194 2 0 0 - 1530 2789 3197 0 0 0 - 1531 2777 3195 0 0 0 - 1531 2799 3167 1 0 0 - 1533 2767 3194 0 0 0 - 1533 2771 3189 0 0 0 - 1533 2778 3190 0 0 0 - 1533 2807 3163 0 0 0 - 1534 2790 3177 2 0 0 - 1534 2794 3180 0 0 0 - 2621 2764 3197 0 0 0 - 2622 2781 3197 3 0 0 - 2626 2811 3170 0 0 0 - 2627 2774 3187 1 0 0 - 2628 2788 3189 1 0 0 - 1530 2764 3285 2 2 0 - 1533 2765 3277 2 1 0 - 1533 2765 3287 2 1 0 - 1530 2815 3448 1 0 0 - 1531 2797 3437 0 0 9 - 1533 2806 3452 0 0 0 - 24 2764 3503 2 1 0 - 1533 2766 3495 1 0 0 - 1533 2766 3504 3 0 0 - 1533 2752 3494 0 1 0 - 1533 2764 3494 2 1 0 - 4962 2799 4453 0 0 0 - 1530 2757 4726 1 0 0 - 1530 2758 4681 2 0 0 - 1530 2761 4684 3 0 0 - 1530 2761 4728 0 0 0 - 1530 2763 4676 0 0 0 - 1530 2766 4684 0 1 0 - 1530 2766 4688 0 1 9 - 1530 2848 3370 2 0 0 - 1533 2820 3356 1 0 0 - 1533 2822 3354 2 0 0 - 1533 2851 3341 1 0 0 - 1530 2816 3438 1 0 0 - 1530 2828 3450 0 0 0 - 1531 2822 3440 0 0 0 - 3745 2822 3555 2 0 0 - 3746 2820 3557 1 0 0 - 10325 2835 5093 1 0 0 - 10325 2838 5100 2 0 0 - 10325 2840 5091 0 0 0 - 10325 2843 5097 3 0 0 - 10325 2852 5097 3 0 0 - 10325 2855 5091 2 0 0 - 10325 2857 5100 0 0 0 - 10325 2860 5093 1 0 0 - 10325 2838 5099 2 1 0 - 10325 2857 5099 0 1 0 - 10326 2847 5088 3 0 0 - 10326 2848 5088 3 0 0 - 3776 2861 10092 2 0 0 - 3776 2828 10091 3 1 0 - 3776 2833 10070 2 1 0 - 3776 2837 10063 1 1 0 - 3776 2838 10057 2 2 0 - 6108 2872 10172 1 0 0 - 6100 2872 10195 2 1 0 - 6100 2872 10203 2 1 0 - 6101 2866 10199 3 0 0 - 6101 2867 10189 3 0 0 - 6101 2872 10206 2 0 0 - 6104 2837 10197 0 0 0 - 6104 2838 10193 0 1 0 - 6104 2841 10197 2 1 0 - 6104 2837 10223 2 2 0 - 6106 2827 10218 3 0 0 - 6106 2833 10197 2 0 0 - 6106 2848 10187 3 0 0 - 6106 2854 10224 0 0 0 - 6106 2856 10224 2 0 0 - 6106 2863 10229 3 0 0 - 6107 2826 10201 0 0 0 - 6107 2827 10223 2 0 0 - 6107 2829 10197 1 0 0 - 6107 2830 10224 1 0 0 - 6107 2841 10191 2 0 0 - 6110 2837 10219 1 0 0 - 6110 2861 10227 3 1 0 - 6110 2834 10223 2 2 0 - 6114 2862 10199 2 0 0 - 6114 2870 10199 2 2 0 - 1530 2928 3242 1 0 0 - 1530 2924 3242 3 1 0 - 1530 2925 3243 1 1 0 - 1530 2926 3258 3 1 0 - 1530 2928 3246 1 1 0 - 1530 2935 3256 1 1 0 - 1530 2938 3244 1 1 0 - 1530 2926 3258 3 2 0 - 1530 2934 3252 1 2 0 - 1533 2928 3209 2 0 0 - 1533 2932 3213 1 0 0 - 2595 2941 3248 0 0 0 - 1530 2922 3323 0 0 0 - 1530 2884 3423 0 0 0 - 1530 2884 3438 3 0 0 - 1530 2884 3440 1 0 0 - 1530 2884 3444 3 0 0 - 1530 2886 3420 3 0 0 - 1530 2893 3421 3 0 0 - 1530 2896 3450 2 0 0 - 1530 2899 3441 2 0 0 - 1530 2914 3435 3 0 0 - 1530 2898 3424 1 1 0 - 1530 2898 3432 3 1 0 - 1530 2902 3428 0 1 0 - 1531 2885 3452 0 0 0 - 1531 2895 3428 3 0 0 - 1531 2901 3428 1 0 0 - 1530 2902 3468 3 0 0 - 1530 2902 3474 1 0 0 - 1530 2941 3517 0 0 0 - 1530 2895 3508 3 1 0 - 1530 2901 3471 3 1 0 - 2624 2902 3510 0 0 0 - 2625 2902 3511 0 0 0 - 2861 2901 3473 0 0 0 - 2862 2901 3465 1 0 0 - 2863 2934 3463 0 0 0 - 1530 2911 3531 0 0 0 - 1530 2920 3561 1 0 0 - 1530 2920 3576 2 0 0 - 1530 2921 3571 1 0 0 - 1530 2932 3564 1 0 0 - 1533 2916 3537 0 0 0 - 1533 2922 3558 2 0 0 - 1533 2909 3543 3 1 0 - 1533 2912 3543 3 1 0 - 1534 2907 3544 2 0 0 - 1534 2923 3545 1 0 0 - 3747 2906 3543 3 1 0 - 1530 2935 4698 3 0 0 - 1533 2935 4682 1 0 0 - 1530 2896 9702 2 0 0 - 1530 2896 9709 2 0 0 - 1530 2918 9702 0 0 0 - 1530 2918 9709 0 0 0 - 2631 2931 9690 3 0 0 - 2631 2931 9694 1 0 0 - 1542 2892 9826 3 0 0 - 1544 2893 9826 3 0 0 - 6108 2913 10167 3 0 0 - 6108 2927 10166 2 0 0 - 6108 2914 10164 0 1 0 - 6100 2887 10195 0 1 0 - 6100 2887 10202 0 1 0 - 6100 2893 10193 3 1 0 - 6100 2893 10207 1 1 0 - 6102 2915 10223 3 0 0 - 6102 2927 10227 0 0 0 - 6102 2929 10189 1 0 0 - 6104 2917 10190 1 1 0 - 6106 2901 10231 3 0 0 - 6106 2913 10180 2 0 0 - 6106 2924 10180 0 0 0 - 6106 2927 10180 2 0 0 - 6106 2930 10183 3 0 0 - 6106 2912 10193 2 1 0 - 6107 2922 10211 3 0 0 - 6108 2909 10185 1 0 0 - 6108 2913 10219 1 0 0 - 6108 2918 10199 1 0 0 - 6108 2919 10191 0 0 0 - 6108 2921 10229 0 0 0 - 6108 2926 10222 1 0 0 - 6109 2903 10216 3 0 0 - 6109 2914 10196 0 0 0 - 6110 2906 10200 1 0 0 - 6110 2906 10203 1 1 0 - 6114 2896 10199 0 0 0 - 6114 2888 10199 0 2 0 - 6975 2930 10195 3 0 0 - 6977 2930 10185 1 0 0 - 1530 2964 3206 2 0 0 - 1531 2956 3205 0 0 0 - 1534 2950 3207 0 0 9 - 1534 2950 3214 1 0 0 - 1534 2963 3213 3 0 0 - 1534 2969 3216 0 0 0 - 11994 2972 3314 0 0 0 - 11994 2980 3316 0 0 0 - 11707 2949 3379 0 0 0 - 11707 2982 3371 3 0 0 - 11707 2989 3368 3 0 0 - 11708 2945 3337 0 0 0 - 11708 2956 3378 0 0 0 - 11708 2961 3372 1 0 0 - 11708 2966 3328 1 0 0 - 11708 2971 3376 0 0 0 - 11708 2972 3383 3 0 0 - 11708 2977 3373 1 0 0 - 11712 2950 3385 2 0 0 - 11712 2958 3385 2 0 0 - 11714 2973 3348 1 0 0 - 11714 2978 3346 1 0 0 - 11714 2983 3348 1 0 0 - 11714 2985 3341 2 0 0 - 11714 2991 3341 0 0 0 - 11714 2959 3333 1 1 0 - 11714 2960 3349 1 1 0 - 11714 2966 3338 2 1 0 - 11714 2976 3329 0 1 0 - 11714 2983 3348 1 1 0 - 11714 2990 3337 3 1 0 - 11714 2991 3341 0 1 0 - 11714 2982 3337 3 2 0 - 11714 2983 3348 1 2 0 - 11715 2959 3334 2 0 0 - 11715 2960 3343 0 0 0 - 11715 2978 3330 1 0 0 - 11715 2966 3328 1 1 0 - 1530 2949 3450 2 0 0 - 1530 2952 3452 1 0 0 - 1530 2952 3501 0 0 0 - 1530 2954 3505 0 0 0 - 1530 2958 3506 2 0 0 - 1530 2955 3497 0 2 0 - 1530 2956 3497 2 2 0 - 2309 2998 3917 3 0 0 - 7222 2968 5007 3 1 0 - 7222 2985 5035 0 1 0 - 7222 2955 5061 2 1 0 - 7222 2960 5091 3 1 0 - 7222 2980 5077 0 1 0 - 7246 2967 5061 2 1 0 - 7246 2967 5066 2 1 0 - 1530 3011 3197 3 0 0 - 1530 3019 3187 1 1 0 - 1531 3013 3188 2 1 0 - 9565 3014 3182 3 0 0 - 9565 3018 3182 3 0 0 - 9565 3018 3187 1 0 0 - 59 3016 3246 0 0 0 - 1530 3012 3239 3 0 0 - 1530 3014 3237 2 0 0 - 1530 3028 3258 1 0 0 - 1530 3031 3248 0 0 0 - 1531 3014 3220 2 0 0 - 1531 3017 3206 3 0 0 - 1531 3026 3245 2 0 0 - 1531 3053 3255 2 0 0 - 1531 3053 3259 0 0 0 - 1534 3016 3259 1 0 0 - 2069 3012 3204 0 0 0 - 8695 3020 3293 2 0 0 - 8695 3022 3296 1 0 0 - 8695 3024 3291 3 0 0 - 8695 3026 3287 0 0 0 - 8695 3026 3292 0 0 0 - 8695 3029 3292 2 0 0 - 8695 3039 3289 1 0 0 - 8695 3039 3297 3 0 0 - 8696 3034 3290 0 0 0 - 11707 3028 3356 3 0 0 - 11707 3037 3347 3 0 0 - 11707 3038 3361 1 0 0 - 11707 3046 3348 2 0 9 - 11707 3046 3353 2 0 0 - 11707 3046 3360 1 0 0 - 11707 3047 3357 2 0 0 - 11707 3061 3374 1 0 0 - 11707 3050 3380 0 1 0 - 11708 3027 3379 3 0 0 - 11714 3010 3344 2 0 0 - 11714 3013 3335 3 0 0 - 11714 3014 3340 0 0 0 - 11714 3015 3333 2 0 0 - 11714 3015 3346 2 0 0 - 11714 3023 3346 0 0 0 - 11714 3027 3344 3 0 0 - 11714 3040 3380 2 0 0 - 11714 3044 3377 1 0 0 - 11714 3047 3380 2 0 0 - 11715 3049 3378 2 0 0 - 3 3015 3453 0 0 0 - 1530 3016 3453 2 0 0 - 1530 3070 3515 3 0 0 - 1530 3019 3515 2 1 0 - 1530 3021 3515 2 1 0 - 1530 3044 3492 1 1 0 - 1530 3045 3485 1 1 0 - 1530 3049 3497 2 1 0 - 1530 3055 3497 0 1 0 - 1530 3058 3485 1 1 0 - 1530 3059 3493 3 1 0 - 2338 3020 3515 0 0 0 - 1530 3023 3627 1 0 0 - 1530 3024 3626 2 0 0 - 1530 3024 3637 2 0 0 - 1530 3033 3632 2 0 0 - 1530 3034 3626 0 0 0 - 1530 3034 3637 0 0 0 - 1530 3035 3627 1 0 0 - 1530 3035 3636 3 0 0 - 1533 3023 3627 1 1 0 - 1533 3023 3636 3 1 0 - 1533 3024 3626 2 1 0 - 1533 3024 3637 2 1 0 - 1533 3034 3626 0 1 0 - 1533 3034 3637 0 1 0 - 1533 3035 3627 1 1 0 - 1533 3035 3636 3 1 0 - 1530 3025 3704 1 0 0 - 1531 3026 3698 0 0 0 - 1531 3028 3702 3 0 0 - 1531 3034 3707 1 0 0 - 1531 3038 3704 0 0 0 - 2558 3038 3956 0 0 0 - 2558 3041 3959 1 0 0 - 2558 3044 3956 2 0 0 - 7259 3061 4984 3 1 0 - 7222 3015 5039 1 1 0 - 7222 3021 5055 1 1 0 - 7222 3029 5042 1 1 0 - 7222 3034 5005 3 1 0 - 7222 3057 5003 3 1 0 - 7232 3046 5014 0 1 0 - 7246 3024 4997 0 1 0 - 7222 3027 5087 1 1 0 - 7222 3044 5088 1 1 0 - 7234 3023 5082 2 1 0 - 2112 3046 9756 1 0 0 - 2586 3051 9840 0 0 0 - 1530 3118 3124 0 0 0 - 1530 3124 3126 3 0 0 - 3014 3098 3107 0 0 0 - 3017 3079 3084 0 0 0 - 3018 3072 3090 2 0 0 - 3019 3086 3126 3 0 0 - 3024 3125 3124 0 0 0 - 3025 3130 3124 0 0 0 - 3026 3122 3102 1 0 0 - 1536 3107 3162 3 0 9 - 1536 3109 3166 1 0 0 - 1536 3111 3163 3 0 0 - 1536 3108 3158 1 1 0 - 1536 3109 3159 2 1 0 - 1536 3109 3162 2 1 0 - 1536 3108 3162 0 2 0 - 1530 3088 3251 3 0 0 - 1530 3088 3258 2 0 0 - 1530 3101 3258 2 0 0 - 1536 3128 3246 1 0 0 - 1530 3092 3268 1 0 0 - 1530 3092 3274 2 0 9 - 1530 3098 3270 1 0 0 - 1530 3100 3276 1 0 0 - 22 3106 3361 1 2 0 - 131 3107 3367 2 0 0 - 136 3123 3361 3 0 0 - 11470 3099 3366 1 0 0 - 11470 3101 3371 2 0 0 - 11470 3103 3364 3 0 0 - 11470 3106 3368 1 0 0 - 11470 3109 3358 3 0 0 - 11470 3120 3356 0 0 0 - 11470 3116 3361 1 1 0 - 11470 3119 3356 0 1 0 - 11470 3108 3364 0 2 0 - 11471 3110 3358 1 1 0 - 11471 3113 3367 1 1 0 - 1530 3096 3429 1 2 0 - 1804 3115 3450 3 0 0 - 11616 3082 3426 1 0 0 - 11616 3098 3426 1 0 0 - 11617 3076 3427 2 0 0 - 1530 3079 3496 1 0 0 - 1531 3080 3507 2 0 0 - 1537 3092 3470 3 0 0 - 11051 3104 9305 1 0 0 - 11053 3097 9312 2 0 0 - 11055 3104 9319 3 0 0 - 11057 3111 9312 0 0 0 - 11064 3082 9287 0 0 0 - 11066 3126 9337 2 0 0 - 11068 3079 9334 1 0 0 - 11070 3129 9290 3 0 0 - 11151 3082 9287 0 3 0 - 11151 3129 9334 1 3 0 - 11152 3079 9334 1 3 0 - 11152 3129 9290 3 3 0 - 1530 3108 9570 0 0 0 - 1530 3111 9559 0 0 0 - 1530 3139 3082 3 0 0 - 1530 3188 3272 0 0 0 - 1530 3189 3275 1 0 0 - 1530 3190 3384 0 0 0 - 1530 3196 3384 0 0 0 - 1533 3192 3354 1 0 0 - 1533 3194 3357 2 0 0 - 1805 3191 3363 3 0 0 - 2399 3185 3388 3 0 0 - 1530 3150 3412 3 0 0 - 1530 3151 3405 2 0 0 - 1530 3152 3407 1 0 0 - 1530 3154 3405 0 0 0 - 1530 3154 3409 0 0 0 - 1530 3155 3428 2 0 0 - 1530 3185 3412 0 0 0 - 1530 3187 3404 1 0 0 - 1530 3195 3399 3 0 0 - 1530 3156 3431 3 1 0 - 1531 3175 3425 2 0 0 - 1531 3182 3401 3 0 0 - 1531 3184 3424 1 0 0 - 1531 3187 3428 2 0 0 - 1531 3192 3403 3 0 0 - 1533 3155 3433 2 0 0 - 1533 3155 3438 2 0 0 - 1533 3160 3432 3 0 0 - 1533 3160 3440 1 0 9 - 1533 3183 3434 2 0 0 - 1533 3159 3427 3 1 0 - 2712 3143 3444 3 0 0 - 102 3176 3481 3 0 0 - 2557 3190 3957 1 0 0 - 2557 3191 3963 3 0 0 - 1530 3183 4847 2 0 0 - 1530 3158 9640 0 0 9 - 1530 3159 9620 1 0 0 - 1530 3171 9621 1 0 0 - 1530 3174 9641 3 0 0 - 5501 3183 9611 0 0 0 - 1530 3234 3156 1 0 0 - 1530 3235 3198 1 0 0 - 1530 3247 3193 0 0 0 - 1530 3208 3211 1 0 0 - 1530 3226 3214 2 0 0 - 1530 3226 3223 2 0 0 - 1530 3228 3240 2 0 0 - 1530 3230 3235 1 0 0 - 1530 3234 3207 0 0 0 - 1530 3246 3244 3 0 0 - 1530 3207 3210 2 1 0 - 1530 3207 3227 2 1 0 - 1531 3233 3203 1 0 0 - 1533 3238 3210 0 0 0 - 1534 3214 3245 1 0 0 - 1536 3207 3217 1 0 0 - 1536 3215 3211 1 0 0 - 1536 3215 3225 1 0 0 - 1536 3207 3214 2 1 0 - 1536 3207 3222 2 1 0 - 1530 3225 3293 0 0 0 - 1530 3230 3291 2 0 0 - 1530 3205 3378 3 0 0 - 1530 3206 3385 2 0 9 - 1530 3218 3386 0 0 0 - 1530 3224 3386 2 0 0 - 1530 3231 3386 1 0 0 - 1530 3235 3386 1 0 0 - 1530 3241 3382 2 0 0 - 1530 3246 3385 1 0 0 - 1530 3256 3388 0 0 0 - 1591 3216 3381 1 0 0 - 2398 3251 3385 1 0 0 - 1530 3229 3396 1 0 0 - 1530 3234 3396 0 0 0 - 1530 3234 3426 2 0 0 - 1530 3235 3406 2 0 0 - 1530 3239 3392 3 0 0 - 1530 3240 3449 0 0 0 - 1530 3241 3406 0 0 0 - 1530 3242 3412 0 0 0 - 1530 3243 3450 0 0 0 - 1530 3244 3396 3 0 0 - 1530 3248 3396 0 0 0 - 1530 3248 3411 3 0 0 - 1530 3260 3400 0 0 0 - 1530 3205 3399 1 1 0 - 1530 3216 3413 3 1 0 - 1531 3231 3433 2 0 0 - 1531 3233 3427 0 0 0 - 1531 3233 3438 3 0 0 - 1531 3249 3435 3 0 0 - 1531 3253 3399 2 0 0 - 1531 3253 3431 2 0 0 - 1533 3222 3395 2 1 0 - 1533 3224 3401 0 1 0 - 1533 3226 3397 3 1 0 - 1533 3227 3401 3 1 0 - 1533 3230 3397 3 1 0 - 1534 3205 3432 3 0 0 - 1534 3208 3399 1 0 0 - 1534 3209 3419 2 0 9 - 1534 3214 3415 3 0 0 - 1534 3216 3395 3 0 0 - 1534 3217 3419 0 0 0 - 1534 3217 3399 1 1 0 - 1530 3217 3492 2 0 0 - 1530 3243 3473 0 0 0 - 1530 3243 3500 0 0 0 - 1530 3202 3475 3 1 0 - 1530 3204 3488 0 1 0 - 1530 3207 3473 0 1 0 - 1530 3211 3468 0 1 0 - 1530 3216 3489 1 1 0 - 1530 3221 3492 0 1 0 - 1530 3221 3496 0 1 0 - 1533 3203 3494 3 0 0 - 1533 3242 3485 0 0 0 - 1533 3255 3462 1 0 0 - 1533 3235 3486 0 1 0 - 1536 3204 3478 2 0 0 - 1536 3204 3485 2 0 0 - 1536 3206 3472 2 0 0 - 1536 3214 3486 1 0 0 - 1536 3215 3477 3 0 0 - 1536 3217 3488 2 0 0 - 1536 3219 3472 0 0 0 - 1536 3223 3479 3 0 0 - 1536 3258 3484 1 0 0 - 1536 3219 3472 0 1 0 - 1591 3209 3458 1 0 0 - 1591 3216 3458 1 0 0 - 1530 3238 9767 1 0 0 - 1530 3249 9774 3 0 0 - 1530 3251 9770 3 0 0 - 2397 3247 9779 1 0 0 - 1530 3241 9910 1 0 0 - 1530 3245 9916 2 0 0 - 1530 3247 9892 0 0 0 - 6624 3308 2799 0 0 0 - 6625 3308 2800 0 0 0 - 1531 3276 3180 3 0 0 - 1531 3278 3191 3 0 0 - 1531 3279 3185 1 0 0 - 1531 3311 3183 1 0 0 - 1534 3321 3142 2 0 0 - 1531 3316 3241 1 0 0 - 1530 3268 3382 0 0 0 - 1530 3273 3380 3 0 0 - 1530 3274 3382 2 0 0 - 1531 3268 3387 0 0 0 - 1531 3275 3389 3 0 0 - 1533 3278 3382 2 0 0 - 1533 3281 3385 3 0 0 - 1533 3283 3389 3 0 0 - 2032 3282 3382 2 0 0 - 1530 3284 3396 0 0 0 - 1531 3276 3421 1 0 0 - 1531 3278 3397 3 0 0 - 1531 3278 3404 3 0 0 - 1591 3268 3435 1 0 0 - 1591 3273 3417 0 0 0 - 1530 3302 3503 2 0 0 - 1534 3277 3501 0 1 0 - 1534 3280 3488 3 1 0 - 1534 3280 3495 3 1 0 - 1534 3284 3501 0 1 0 - 1530 3276 3929 3 0 0 - 1530 3276 3933 1 0 0 - 1530 3279 3939 2 0 9 - 1530 3282 3934 0 0 9 - 1530 3283 3931 2 0 0 - 1530 3288 3930 2 0 0 - 1530 3292 3931 2 0 0 - 1530 3294 3932 3 0 0 - 1530 3290 3931 2 1 0 - 1530 3293 3934 0 1 0 - 1539 3285 3938 3 0 0 - 1539 3286 3935 1 0 0 - 6238 3370 2971 2 0 0 - 6240 3370 2970 2 0 0 - 1533 3352 3337 1 0 0 - 1533 3357 3344 0 0 0 - 10431 3371 9312 1 0 0 - 10419 3372 9556 0 0 0 - 10420 3365 9542 1 0 0 - 10421 3374 9547 0 0 0 - 10423 3354 9558 1 0 0 - 10425 3355 9558 1 0 0 - 10427 3353 9544 1 0 0 - 10429 3354 9544 1 0 0 - 4487 3428 3535 1 0 0 - 4490 3429 3535 1 0 0 - 5126 3445 3554 1 2 0 - 10527 3426 3555 1 1 0 - 10529 3427 3555 1 1 0 - 1530 3484 3290 3 0 9 - 1530 3488 3294 1 0 0 - 1530 3494 3289 2 0 0 - 5244 3461 3555 1 0 0 - 5245 3574 3311 3 0 0 - 6824 3534 3306 1 0 0 - 6824 3534 3314 2 0 0 - 6824 3537 3319 3 0 0 - 6824 3545 3320 3 0 0 - 1530 3540 3555 0 0 0 - 1530 3545 3555 0 0 0 - 1530 3552 3555 2 0 0 - 1530 3557 3555 2 0 0 - 1530 3539 3554 2 1 0 - 1530 3558 3554 0 1 0 - 5172 3548 3551 1 1 0 - 5174 3548 3565 0 0 0 - 5183 3548 3535 1 0 0 - 5183 3548 3543 1 0 0 - 5183 3548 3551 1 0 0 - 5183 3549 3558 3 0 0 - 5183 3549 3543 3 1 0 - 5186 3548 3558 3 0 0 - 5186 3549 3535 1 0 0 - 5186 3549 3543 1 0 0 - 5186 3549 3551 1 0 0 - 5186 3548 3543 3 1 0 - 5244 3615 3543 2 1 0 - 5244 3659 3471 1 0 0 - 5244 3670 3497 2 0 0 - 5244 3674 3472 3 0 0 - 5244 3676 3476 1 0 0 - 5244 3684 3476 1 0 0 - 5244 3656 3514 0 1 0 - 1512 2444 3099 3 0 0 \ No newline at end of file diff --git a/2006Redone Server/data/doubledoors.txt b/2006Redone Server/data/doubledoors.txt index e420bf02..977f1d4c 100644 --- a/2006Redone Server/data/doubledoors.txt +++ b/2006Redone Server/data/doubledoors.txt @@ -256,5 +256,3 @@ 1520 3280 3506 0 0 4423 2426 3088 0 0 4424 2427 3088 0 0 - 14751 3021 3631 2 0 - 14752 3021 3632 2 0 diff --git a/2006Redone Server/data/logs/commands/andrew5.txt b/2006Redone Server/data/logs/commands/andrew5.txt index f8c928b3..1afc8f0c 100644 --- a/2006Redone Server/data/logs/commands/andrew5.txt +++ b/2006Redone Server/data/logs/commands/andrew5.txt @@ -1,3 +1,7 @@ [2019/11/21] 18:52 andrew5 used command: bank [2019/11/21] 19:04 andrew5 used command: bank [2019/12/04] 13:26 andrew5 used command: bank +[2019/12/22] 05:47 andrew5 used command: bank +[2019/12/22] 05:58 andrew5 used command: bank +[2019/12/22] 05:58 andrew5 used command: bank +[2019/12/22] 05:59 andrew5 used command: bank diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java index 042e031f..a3172158 100644 --- a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java +++ b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java @@ -282,6 +282,26 @@ public class NpcCombat { NpcHandler.npcs[i].attackType = 1; } switch (NpcHandler.npcs[i].npcType) { + case 1158://kq first form + int kqRandom = Misc.random(3); + if (kqRandom == 2) { + NpcHandler.npcs[i].projectileId = 280; //gfx + NpcHandler.npcs[i].attackType = 2; + NpcHandler.npcs[i].endGfx = 279; + } else { + NpcHandler.npcs[i].attackType = 0; + } + break; + case 1160://kq secondform + int kqRandom2 = Misc.random(3); + if (kqRandom2 == 2) { + NpcHandler.npcs[i].projectileId = 279; //gfx + NpcHandler.npcs[i].attackType = 1 + Misc.random(1); + NpcHandler.npcs[i].endGfx = 278; + } else { + NpcHandler.npcs[i].attackType = 0; + } + break; case 2607: NpcHandler.npcs[i].attackType = 1; case 2591: @@ -569,25 +589,17 @@ public class NpcCombat { damage = c.playerLevel[GameConstants.HITPOINTS] - 1; } } - if (c.getPrayer().prayerActive[18] - && !(NpcHandler.npcs[i].npcType == 2030)) { // protect - // from - // melee) - // { - // // - // protect - // from - // melee + if (c.getPrayer().prayerActive[18] && !(NpcHandler.npcs[i].npcType == 2030)) { // protect from melee damage = 0; - } else if (c.getPrayer().prayerActive[18] - && NpcHandler.npcs[i].npcType == 2030) { + } else if (c.getPrayer().prayerActive[18] && NpcHandler.npcs[i].npcType == 2030) { if (NpcHandler.npcs[i].attackType == 0) { damage = Misc.random(NpcHandler.npcs[i].maxHit); } - if (10 + Misc - .random(MeleeData.calculateMeleeDefence(c)) > Misc - .random(NpcHandler.npcs[i].attack)) { - damage = 0; + if (10 + Misc.random(MeleeData.calculateMeleeDefence(c)) > Misc.random(NpcHandler.npcs[i].attack)) { + if (NpcHandler.npcs[i].npcType == 1158 || NpcHandler.npcs[i].npcType == 1160) + damage = (damage / 2); + else + damage = 0; } } if (c.playerLevel[3] - damage < 0) { @@ -597,10 +609,11 @@ public class NpcCombat { if (NpcHandler.npcs[i].attackType == 1) { // range damage = Misc.random(NpcHandler.npcs[i].maxHit); - if (10 + Misc.random(c.getCombatAssistant() - .calculateRangeDefence()) > Misc - .random(NpcHandler.npcs[i].attack)) { - damage = 0; + if (10 + Misc.random(c.getCombatAssistant().calculateRangeDefence()) > Misc.random(NpcHandler.npcs[i].attack)) { + if (NpcHandler.npcs[i].npcType == 1158 || NpcHandler.npcs[i].npcType == 1160) + damage = (damage / 2); + else + damage = 0; } if (NpcData.cantKillYou(NpcHandler.npcs[i].npcType)) { if (damage >= c.playerLevel[GameConstants.HITPOINTS]) { @@ -618,8 +631,7 @@ public class NpcCombat { if (NpcHandler.npcs[i].attackType == 2) { // magic damage = Misc.random(NpcHandler.npcs[i].maxHit); boolean magicFailed = false; - if (10 + Misc.random(c.getCombatAssistant().mageDef()) > Misc - .random(NpcHandler.npcs[i].attack)) { + if (10 + Misc.random(c.getCombatAssistant().mageDef()) > Misc.random(NpcHandler.npcs[i].attack)) { damage = 0; magicFailed = true; } @@ -628,19 +640,23 @@ public class NpcCombat { damage = c.playerLevel[GameConstants.HITPOINTS] - 1; } } - if (c.getPrayer().prayerActive[16]) { // protect from magic - damage = 0; - magicFailed = true; - } - if (c.playerLevel[3] - damage < 0) { - damage = c.playerLevel[3]; - } - if (NpcHandler.npcs[i].endGfx > 0 && (!magicFailed || FightCaves.isFightCaveNpc(i))) { - c.gfx100(NpcHandler.npcs[i].endGfx); - } else { - c.gfx100(85); - c.getPacketSender().sendSound(SoundList.MAGE_FAIL, - 100, 0); + if(c.getPrayer().prayerActive[16]) { // protect from magic + + if (NpcHandler.npcs[i].npcType == 1158) { + damage = (damage / 2); + } else { + damage = 0; + } + magicFailed = true; + if (c.playerLevel[3] - damage < 0) { + damage = c.playerLevel[3]; + } + if(NpcHandler.npcs[i].endGfx > 0 && (!magicFailed || FightCaves.isFightCaveNpc(i))) { + c.gfx100(NpcHandler.npcs[i].endGfx); + } else { + c.gfx100(85); + c.getPacketSender().sendSound(SoundList.MAGE_FAIL, 100, 0); + } } } diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java index 27eb5269..df4d3821 100644 --- a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java +++ b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java @@ -1,6 +1,8 @@ package com.rebotted.game.content.combat.npcs; +import com.rebotted.GameEngine; import com.rebotted.game.npcs.NpcHandler; +import com.rebotted.game.players.Player; /** * Npc Emotes @@ -163,7 +165,7 @@ public enum NpcEmotes { return -1; } - public static int getDeadEmote(int i) { + public static int getDeadEmote(Player player, int i) { for (NpcEmotes e : NpcEmotes.values()) { for (int f = 0; f < e.getNpcId().length; f++) { if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) { @@ -172,6 +174,12 @@ public enum NpcEmotes { switch (NpcHandler.npcs[i].npcType) { case 2745: return 2654; + case 1158: + GameEngine.npcHandler.spawnSecondForm(player, i); + return 6242; + case 1160: + GameEngine.npcHandler.spawnFirstForm(player, i); + return 6233; } } } diff --git a/2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java b/2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java index 568742a9..bad93a9a 100644 --- a/2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java +++ b/2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java @@ -431,11 +431,11 @@ public class PestControl { private void spawnNPC() { //npcid, npcx, npcy, heightlevel, walking type, hp, att, def for (int[] aPcNPCData : pcNPCData) { - GameEngine.npcHandler.spawnNpc2(aPcNPCData[0], aPcNPCData[1], aPcNPCData[2], 0, 0, 200, 0, 0, playersInGame() * 200); + GameEngine.npcHandler.spawnNpc2(aPcNPCData[0], aPcNPCData[1], aPcNPCData[2], 0, 0, 200, 0, 0, playersInGame() * 200, false); } for (int[] voidMonsters : voidMonsterData) { //Server.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, voidMonsters[NpcHandler.getNpcListHP(voidMonsters[0])], NpcHandler.getNpcListCombat(voidMonsters[0])/10, NpcHandler.getNpcListCombat(voidMonsters[0]), playersInGame() * 200); - GameEngine.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, 500, 20, 200, 25); + GameEngine.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, 500, 20, 200, 25, false); } } } diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java index fd3cc3b1..2e60004d 100644 --- a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java +++ b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java @@ -1,6 +1,7 @@ package com.rebotted.game.dialogues; import com.rebotted.GameConstants; +import com.rebotted.GameEngine; import com.rebotted.game.content.quests.QuestAssistant; import com.rebotted.game.content.quests.QuestRewards; import com.rebotted.game.content.randomevents.FreakyForester; @@ -3901,9 +3902,9 @@ public class DialogueHandler { player.nextChat = 0; break; case 912: - player.getDialogueHandler().sendStatement( - "Catching rats is currently disabled."); - player.nextChat = 0; + GameEngine.npcHandler.catchRat(player.rememberNpcIndex); + player.getPacketSender().closeAllWindows(); + player.nextChat = 0; break; case 913: sendStatement("You shoo your cat away."); diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java index d924831f..b9df9db1 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java @@ -59,11 +59,15 @@ public class Doors { Doors d = getDoor(id, x, y, z); if (d == null) { + //System.out.println("D: " + id + " null debug x: " + x + " y: " + y + "."); return DoubleDoors.getSingleton().handleDoor(player, id, x, y, z); } //todo: improvment: if player manage to get to door then open the door. - if(player.distanceToPoint(x, y) > 1) return false; + if(player.distanceToPoint(x, y) > 1) { + //System.out.println("Door (single): " + id + " not in distance debug at x: " + x + " y: " + y + "."); + return false; + } //Remove clipping for old door (gets added back in placeObject) Region.removeClipping(x, y, z); diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java index 32decf3a..247b1a2f 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java @@ -51,10 +51,12 @@ public class DoubleDoors { DoubleDoors doorClicked = getDoor(id, x, y, z); if (doorClicked == null) { + //System.out.println("Door: " + id + " null debug at x: " + x + " y: " + y + "."); //GameEngine.objectHandler.placeObject(new Objects(-1, x, y, z, 0, 0, 0)); return true; } - if (doorClicked.doorId > 12000) { + if (doorClicked.doorId > 15000) { + // System.out.println("Door: " + id + " clicking debug x: " + x + " y: " + y + "."); return true; //nearly all of these are not opened } diff --git a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java index d6015ada..18e5b8f2 100644 --- a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java +++ b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java @@ -5,9 +5,9 @@ import com.rebotted.GameEngine; import com.rebotted.game.content.minigames.castlewars.CastleWars; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.players.Client; +import com.rebotted.game.players.MainFrameIDs; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.MainFrameIDs; import com.rebotted.util.Misc; public class ItemAssistant { diff --git a/2006Redone Server/src/com/rebotted/game/npcs/Npc.java b/2006Redone Server/src/com/rebotted/game/npcs/Npc.java index 915e094c..34500168 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/Npc.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/Npc.java @@ -23,6 +23,7 @@ public class Npc { public int summonedBy, size; public int focusPointX, focusPointY, masterId; public boolean turnUpdateRequired; + public int chasingRat = -1; /** * attackType: 0 = melee, 1 = range, 2 = mage diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java index 84b1f5e5..63caffaa 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java @@ -5,6 +5,7 @@ import com.rebotted.game.content.skills.core.Fishing; import com.rebotted.game.content.skills.crafting.Tanning; import com.rebotted.game.content.skills.thieving.Pickpocket; import com.rebotted.game.content.traveling.Sailing; +import com.rebotted.game.npcs.impl.Pets; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerAssistant; import com.rebotted.game.shops.ShopAssistant; @@ -21,6 +22,7 @@ public class NpcActions { public void firstClickNpc(int npcType) { c.clickNpcType = 0; + c.rememberNpcIndex = c.npcClickIndex; c.npcClickIndex = 0; Shops.dialogueShop(c, npcType); if (Pickpocket.isNPC(c, npcType)) { @@ -30,6 +32,15 @@ public class NpcActions { if (Fishing.fishingNPC(c, npcType)) { Fishing.fishingNPC(c, 1, npcType); } + if (Pets.isCat(npcType)) { + if (NpcHandler.npcs[c.rememberNpcIndex].spawnedBy == c.playerId) { + c.getSummon().pickUpPet(c, c.summonId); + c.hasNpc = false; + c.summonId = -1; + } else { + c.getPacketSender().sendMessage("This is not your pet."); + } + } switch (npcType) { case 209: c.getDialogueHandler().sendDialogues(3500, 209); @@ -814,28 +825,6 @@ public class NpcActions { } break; - case 3506: - case 3507: - case 761: - case 760: - case 762: - case 763: - case 764: - case 765: - case 766: - case 767: - case 768: - case 769: - case 770: - case 771: - case 772: - case 773: - case 3505: - c.getSummon().pickUpClean(c, c.summonId); - c.hasNpc = false; - c.summonId = 0; - break; - case 804: case 1041: Tanning.sendTanningInterface(c); @@ -996,9 +985,12 @@ public class NpcActions { if (Fishing.fishingNPC(c, npcType)) { Fishing.fishingNPC(c, 2, npcType); } - if (npcType >= 761 && npcType <= 773 || npcType > 3504 - && npcType < 3508 && npcType != 767) { - c.getDialogueHandler().sendDialogues(908, npcType); + if (Pets.isCat(npcType)) { + if (NpcHandler.npcs[c.rememberNpcIndex].spawnedBy == c.playerId) { + c.getDialogueHandler().sendDialogues(908, npcType); + } else { + c.getPacketSender().sendMessage("This is not your pet."); + } } switch (npcType) { @@ -1141,11 +1133,12 @@ public class NpcActions { Pickpocket.attemptPickpocket(c, npcType); return; } - if (npcType >= 761 && npcType <= 773 && npcType != 767) { - if (NpcHandler.npcs[c.rememberNpcIndex].spawnedBy == c.playerId) + if (Pets.isCat(npcType)) { + if (NpcHandler.npcs[c.rememberNpcIndex].spawnedBy == c.playerId) { c.getDialogueHandler().sendDialogues(910, npcType); - else - c.getPacketSender().sendMessage("This isn't your cat."); + } else { + c.getPacketSender().sendMessage("This is not your pet."); + } } switch (npcType) { diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcData.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcData.java index b3cf9f93..2bcec04a 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/NpcData.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcData.java @@ -54,14 +54,6 @@ public class NpcData { return false; } - /* - * public static boolean isAggressive(int i) { if - * (NPCHandler.npcs[i].aggressive && !onlyMage(NPCHandler.npcs[i].npcType)) - * { return true; } if (NPCHandler.npcs[i].inWild() && - * NPCHandler.npcs[i].MaxHP > 0 && !onlyMage(NPCHandler.npcs[i].npcType)) { - * return true; } return false; } - */ - public static int getNpcKillerId(int npcId) { int oldDamage = 0; int killerId = 0; @@ -256,6 +248,9 @@ public class NpcData { **/ public static int getRespawnTime(int i) { switch (NpcHandler.npcs[i].npcType) { + case 1158: + case 1160: + return -1; case 2881: case 2882: case 2883: diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java index d4e6b3fc..73cd2f10 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java @@ -7,6 +7,9 @@ import java.io.IOException; import com.rebotted.GameConstants; import com.rebotted.GameEngine; +import com.rebotted.event.CycleEvent; +import com.rebotted.event.CycleEventContainer; +import com.rebotted.event.CycleEventHandler; import com.rebotted.game.content.combat.CombatConstants; import com.rebotted.game.content.combat.npcs.NpcAggressive; import com.rebotted.game.content.combat.npcs.NpcCombat; @@ -19,6 +22,7 @@ import com.rebotted.game.content.randomevents.RandomEventHandler; import com.rebotted.game.content.randomevents.RiverTroll; import com.rebotted.game.npcs.drops.ItemDrop; import com.rebotted.game.npcs.drops.NPCDropsHandler; +import com.rebotted.game.npcs.impl.Pets; import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; @@ -33,6 +37,101 @@ public class NpcHandler { public static int maxListedNPCs = 4000; public static Npc npcs[] = new Npc[MAX_NPCS]; public static NpcList NpcList[] = new NpcList[maxListedNPCs]; + + public void spawnSecondForm(Player c, final int i) { + // npcs[i].gfx0(1055); + CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + spawnNpc2(1160, npcs[i].absX, npcs[i].absY, 0, 1, 230, 45, 500, 300, true); + container.stop(); + } + @Override + public void stop() { + + } + }, 15); + } + + + /** + * kq respawn first form + */ + public void spawnFirstForm(Player c, final int i) { + CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + spawnNpc2(1158, npcs[i].absX, npcs[i].absY, 0, 1, 230, 45, 500, 300, true); + container.stop(); + } + @Override + public void stop() { + + } + }, 15); + } + + + public void catchRat(final int npcIndex) { + int foundRat = -1; + for (int i = 0; i < MAX_NPCS; i++) { + if (npcs[i] == null || foundRat != -1) { + continue; + } + if(npcs[i].npcType == 47 && !npcs[i].isDead) { + if(goodDistance(npcs[npcIndex].absX, npcs[npcIndex].absY, npcs[i].absX, npcs[i].absY, 5)) { + foundRat = i; + continue; + } + } + } + final Client slaveOwner = (PlayerHandler.players[npcs[npcIndex].summonedBy] != null ? (Client) PlayerHandler.players[npcs[npcIndex].summonedBy] : null); + if(foundRat == -1) { + if(slaveOwner != null) { + slaveOwner.getPacketSender().sendMessage("The " + getNpcListName(NpcHandler.npcs[npcIndex].npcType) + " can't seem to find any rats nearby."); + } + } else { + npcs[npcIndex].chasingRat = foundRat; + boolean beatChance = (Misc.random(2) == 1 ? true : false); + CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + if(npcs[npcIndex].absX == npcs[npcs[npcIndex].chasingRat].absX && npcs[npcIndex].absY == npcs[npcs[npcIndex].chasingRat].absY && (beatChance || npcs[npcIndex].npcType >= 768 && npcs[npcIndex].npcType <= 773)) { + npcs[npcs[npcIndex].chasingRat].isDead = true; + npcs[npcs[npcIndex].chasingRat].forceChat("Eek!"); + npcs[npcIndex].forceChat("Meow!"); + //startAnimation(9163, npcIndex); + slaveOwner.getPacketSender().sendMessage("The " + getNpcListName(NpcHandler.npcs[npcIndex].npcType) + " caught a rat!"); + if(npcs[npcIndex].npcType >= 761 && npcs[npcIndex].npcType <= 766) + slaveOwner.ratsCaught++; + if(slaveOwner.ratsCaught == Pets.RATS_NEEDED_TO_GROW) { + slaveOwner.getPacketSender().sendMessage("Your kitten has grown into a cat!"); + int newNpcId = npcs[npcIndex].npcType+7; + int[] coords = {npcs[npcIndex].absX, npcs[npcIndex].absY, npcs[npcIndex].heightLevel}; + spawnNpc3(slaveOwner, newNpcId, coords[0], coords[1], coords[2], 0, 120, 25, 200, 200, true, false, true); + npcs[npcIndex].absX = 0; + npcs[npcIndex].absY = 0; + npcs[npcIndex] = null; + //Spawns grown cat in spot of kitten. + slaveOwner.summonId = Pets.summonItemId(newNpcId); + slaveOwner.ratsCaught = 0; + } + npcs[npcIndex].chasingRat = -1; + } else { + if(slaveOwner != null) + slaveOwner.getPacketSender().sendMessage("The " + getNpcListName(NpcHandler.npcs[npcIndex].npcType) + " failed to catch the rat."); + npcs[npcIndex].chasingRat = -1; + } + container.stop(); + } + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 4); + } + } public NpcHandler() { for (int i = 0; i < MAX_NPCS; i++) { @@ -139,15 +238,6 @@ public class NpcHandler { return 0; } - public int npcSize(int i) { - switch (npcs[i].npcType) { - case 2883: - case 2882: - case 2881: - return 3; - } - return 0; - } /** * Summon npc, barrows, etc @@ -201,7 +291,7 @@ public class NpcHandler { npcs[slot] = newNPC; } - public void spawnNpc2(int npcType, int x, int y, int heightLevel, int WalkingType, int HP, int maxHit, int attack, int defence) { + public void spawnNpc2(int npcType, int x, int y, int heightLevel, int WalkingType, int HP, int maxHit, int attack, int defence, boolean attackPlayer) { // first, search for a free slot int slot = -1; for (int i = 1; i < MAX_NPCS; i++) { @@ -225,6 +315,9 @@ public class NpcHandler { newNPC.MaxHP = HP; newNPC.maxHit = maxHit; newNPC.attack = attack; + if (attackPlayer) { + newNPC.underAttack = true; + } newNPC.defence = defence; npcs[slot] = newNPC; } @@ -356,6 +449,13 @@ public class NpcHandler { npcs[i].absX = slaveOwner.absX; npcs[i].absY = slaveOwner.absY - 1; } + + if (slaveOwner != null && slaveOwner.hasNpc && npcs[i].summoner) { + if (slaveOwner.goodDistance(npcs[i].absX, npcs[i].absY, slaveOwner.absX, slaveOwner.absY, 15)) { + NpcHandler.followPlayer(i, slaveOwner.playerId); + } + } + if (npcs[i].actionTimer > 0) { npcs[i].actionTimer--; @@ -385,7 +485,7 @@ public class NpcHandler { } } - if (npcs[i].spawnedBy > 0) { // delete summons npc + if (npcs[i].spawnedBy > 0) { if (PlayerHandler.players[npcs[i].spawnedBy] == null || PlayerHandler.players[npcs[i].spawnedBy].heightLevel != npcs[i].heightLevel || PlayerHandler.players[npcs[i].spawnedBy].respawnTimer > 0 @@ -393,11 +493,10 @@ public class NpcHandler { if (npcs[i].npcType == FightCaves.YT_HURKOT) { Player c = ((Client)PlayerHandler.players[npcs[i].spawnedBy]); - int ranHeal = Misc.random(19); - if (ranHeal == 19) + int ranHeal = Misc.random(10); + if (ranHeal == 10) FightCaves.healJad(c, i); } - if (PlayerHandler.players[npcs[i].spawnedBy] != null) { for (int o = 0; o < PlayerHandler.players[npcs[i].spawnedBy].barrowsNpcs.length; o++) { if (npcs[i].npcType == PlayerHandler.players[npcs[i].spawnedBy].barrowsNpcs[o][0]) { @@ -552,12 +651,11 @@ public class NpcHandler { && npcs[i].needRespawn == false) { npcs[i].updateRequired = true; npcs[i].facePlayer(0); - if (npcs[i].killedBy <= 0) - npcs[i].killedBy = NpcData.getNpcKillerId(i); - npcs[i].animNumber = NpcEmotes.getDeadEmote(i); // dead - // emote Player c = (Client) PlayerHandler.players[npcs[i].killedBy]; if (c != null) { + if (npcs[i].killedBy <= 0) + npcs[i].killedBy = NpcData.getNpcKillerId(i); + npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote if (CombatConstants.COMBAT_SOUNDS && NpcHandler.npcs[i].npcType < 3177 && NpcHandler.npcs[i].npcType > 3180) { @@ -653,8 +751,7 @@ public class NpcHandler { GameEngine.objectManager.removeObject(npcs[i].absX, npcs[i].absY); } - } else if (npcs[i].actionTimer == 0 - && npcs[i].needRespawn == true) { + } else if (npcs[i].actionTimer == 0 && npcs[i].needRespawn == true && npcs[i].npcType != 1158) { if (npcs[i].spawnedBy > 0) { npcs[i] = null; } else { @@ -735,6 +832,12 @@ public class NpcHandler { public static boolean multiAttacks(int i) { switch (npcs[i].npcType) { + case 1158: //kq + if (npcs[i].attackType == 2) + return true; + case 1160: //kq + if (npcs[i].attackType == 1) + return true; case 2558: return true; case 2562: @@ -1200,7 +1303,8 @@ public class NpcHandler { } public static void handleSpecialEffects(Player c, int i, int damage) { - if (npcs[i].npcType == 2892 || npcs[i].npcType == 2894) { + if (npcs[i].npcType == 2892 || npcs[i].npcType == 2894 || npcs[i].npcType == 1158 + || npcs[i].npcType == 1160) { if (damage > 0) { if (c != null) { if (c.playerLevel[5] > 0) { @@ -1226,6 +1330,8 @@ public class NpcHandler { public static int getMaxHit(int i) { switch (npcs[i].npcType) { + case 1158: + return 30; case 2558: if (npcs[i].attackType == 2) { return 28; @@ -1338,7 +1444,7 @@ public class NpcHandler { for (int i = 0; i < maxListedNPCs; i++) { if (NpcList[i] != null) { if (NpcList[i].npcId == npcId) { - return NpcList[i].npcName; + return NpcList[i].npcName.replace("_", " "); } } } @@ -1408,6 +1514,9 @@ public class NpcHandler { public boolean getNpcListAggressive(int npcId) { return NPCDefinition.forId(npcId).isAggressive(); } - + + public int getNpcSize(int npcId) { + return NPCDefinition.forId(npcId).getSize(); + } } diff --git a/2006Redone Server/src/com/rebotted/game/npcs/impl/Pets.java b/2006Redone Server/src/com/rebotted/game/npcs/impl/Pets.java index 3a831324..543ed68b 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/impl/Pets.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/impl/Pets.java @@ -1,91 +1,126 @@ package com.rebotted.game.npcs.impl; +import com.rebotted.GameEngine; import com.rebotted.game.npcs.Npc; import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; +import com.rebotted.game.players.PlayerSave; +import com.rebotted.world.clip.Region; public class Pets { + + public static final int RATS_NEEDED_TO_GROW = 10; - private final int[][] catArray = { { 3505, 7583 }, { 3506, 7584 }, - { 766, 1560 }, { 3507, 7585 }, { 765, 1559 }, { 764, 1558 }, - { 763, 1557 }, { 762, 1556 }, { 761, 1555 }, { 768, 1561 }, - { 769, 1562 }, { 770, 1563 }, { 771, 1564 }, { 772, 1565 }, - { 773, 1566 } }; + //npc id, item id + private final static int[][] CATS = { + { 3504, 7583 }, //hell kitten + { 3506, 7584 }, //lazy hell kitten + { 766, 1560 }, //pet kitten + { 3507, 7585 }, //wily hellcat + { 765, 1559 }, //pet kitten + { 764, 1558 }, //pet kitten + { 763, 1557 }, //pet kitten + { 762, 1556 }, //pet kitten + { 761, 1555 }, //pet kitten + { 768, 1561 }, //pet cat + { 769, 1562 }, //pet cat + { 770, 1563 }, //pet cat + { 771, 1564 }, //pet cat + { 772, 1565 },//pet cat + { 773, 1566 } //pet cat + }; - public static final int[] CAT_ITEMS = { 1555, 1556, 1557, 1558, 1559, 1560, - 1561, 1562, 1563, 1564, 1565, 7585, 7584 }; - - public void pickUp(Client c, int Type) { - for (Npc i : NpcHandler.npcs) { - if (i == null) { - continue; + public static final int[] CAT_ITEMS = { + 1555, 1556, 1557, 1558, 1559, 1560, + 1561, 1562, 1563, 1564, 1565, 7585, 7583, 7584 + }; + + public static boolean isCatItem(int itemId) { + for (int i = 0; i < CAT_ITEMS.length; i++) { + if (itemId == CAT_ITEMS[i]) { + return true; } } - for (Npc i : NpcHandler.npcs) { - if (i != null) { - if (i.npcType == Type) { - if (i.spawnedBy == c.playerId && i.spawnedBy > 0) { - i.absX = 0; - i.absY = 0; - i = null; - break; + return false; + } + + public static boolean isCat(int npcId) { + for (int i = 0; i < CATS.length; i++) { + if (npcId == CATS[i][0]) { + return true; + } + } + return false; + } + + + public static void dropPet(Player player, int itemId, int slot) { + if (player.hasNpc) { + player.getPacketSender().sendMessage("You already dropped your " + NpcHandler.getNpcListName(summonItemId(itemId)) + "."); + return; + } + player.getItemAssistant().deleteItem(itemId, slot, player.playerItemsN[slot]); + player.hasNpc = true; + player.getPacketSender().sendMessage("You drop your " + NpcHandler.getNpcListName(summonItemId(itemId)) + "."); + int offsetX = 0; + int offsetY = 0; + if (Region.getClipping(player.getX() - 1, player.getY(), player.heightLevel, -1, 0)) { + offsetX = -1; + } else if (Region.getClipping(player.getX() + 1, player.getY(), player.heightLevel, 1, 0)) { + offsetX = 1; + } else if (Region.getClipping(player.getX(), player.getY() - 1, player.heightLevel, 0, -1)) { + offsetY = -1; + } else if (Region.getClipping(player.getX(), player.getY() + 1, player.heightLevel, 0, 1)) { + offsetY = 1; + } + GameEngine.npcHandler.spawnNpc3(player, summonItemId(itemId), player.absX+offsetX, player.absY+offsetY, player.heightLevel, 0, 120, 25, 200, 200, false, false, true); + PlayerSave.saveGame(player); + } + + public void quickPickup(Player player, int id) { + for (Npc i : NpcHandler.npcs) { + if (i == null) { + continue; + } + if (i.npcType == id) { + i.absX = 0; + i.absY = 0; + i = null; + } + } + } + + + public void pickUpPet(Player player, int id) { + if (player.getItemAssistant().hasFreeSlots(1)) { + for (Npc i : NpcHandler.npcs) { + if (i == null) { + continue; + } + if (i.npcType == id) { + player.startAnimation(827); + i.absX = 0; + i.absY = 0; + i = null; + for (int[] element : CATS) { + if (element[0] == id) { + player.getItemAssistant().addItem(element[1], 1); + } } } } + } else { + player.getPacketSender().sendMessage("You do not have enough space in your inventory to do that."); } } - public void pickUpClean(Player c, int id) { - for (int[] element : catArray) { - if (element[0] == id) { - c.getItemAssistant().addItem(element[1], 1); - } - } - for (Npc i : NpcHandler.npcs) { - if (i == null) { - continue; - } - if (i.npcType == id) { - i.absX = 0; - i.absY = 0; - } - } - c.hasNpc = false; - } - public static int summonItemId(int itemId) { - if (itemId == 1555) { - return 761; - } else if (itemId == 1556) { - return 762; - } else if (itemId == 1557) { - return 763; - } else if (itemId == 1558) { - return 764; - } else if (itemId == 1559) { - return 765; - } else if (itemId == 1560) { - return 766; - } else if (itemId == 1561) { - return 768; - } else if (itemId == 1562) { - return 769; - } else if (itemId == 1563) { - return 770; - } else if (itemId == 1564) { - return 771; - } else if (itemId == 1565) { - return 772; - } else if (itemId == 1566) { - return 773; - } else if (itemId == 7585) { - return 3507; - } else if (itemId == 7584) { - return 3506; - } else if (itemId == 7583) { - return 3505; + for (int i = 0; i < CATS.length; i++) { + if (itemId == CATS[i][1]) { + return CATS[i][0]; + } } return 0; } + } diff --git a/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java b/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java index 9c44401b..04628d1e 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java +++ b/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java @@ -1611,12 +1611,12 @@ public class ObjectsActions { // PARTY ROOM START case 2417: // 26193 if falador - player.inPartyRoom = true; + //player.inPartyRoom = true; PartyRoom.open(player); break; case 2416: - player.inPartyRoom = true; + //player.inPartyRoom = true; PartyRoom.dropAll(); break; diff --git a/2006Redone Server/src/com/rebotted/game/players/MainFrameIDs.java b/2006Redone Server/src/com/rebotted/game/players/MainFrameIDs.java new file mode 100644 index 00000000..897adc09 --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/players/MainFrameIDs.java @@ -0,0 +1,9 @@ +package com.rebotted.game.players; + +/** + * Easy access to common interface IDs + */ +public class MainFrameIDs { + public static final int DEPOSIT_BOX = 4465; + public static final int BANK = 5292; //Might be incorrect!! +} diff --git a/2006Redone Server/src/com/rebotted/game/players/Player.java b/2006Redone Server/src/com/rebotted/game/players/Player.java index 4849e9eb..22ce0d2a 100644 --- a/2006Redone Server/src/com/rebotted/game/players/Player.java +++ b/2006Redone Server/src/com/rebotted/game/players/Player.java @@ -512,7 +512,7 @@ public abstract class Player { getPlayerAssistant().movePlayer(2657, 2639, 0); } if (hasNpc == true) { - getSummon().pickUpClean(this, summonId); + getSummon().pickUpPet(this, summonId); } if(GameEngine.ersSecret != null && !GameEngine.ersSecret.equals("") && this.playerRights < 2) { @@ -600,7 +600,7 @@ public abstract class Player { lastH = heightLevel; CycleEventHandler.getSingleton().stopEvents(this); if (hasNpc == true) { - getSummon().pickUpClean(this, summonId); + getSummon().pickUpPet(this, summonId); } if (forceLogout || System.currentTimeMillis() - logoutDelay > 2500) { if (!isBot) @@ -1270,7 +1270,7 @@ public abstract class Player { lastPinSettings = -1, setPinDate = -1, changePinDate = -1, deletePinDate = -1, firstPin, secondPin, thirdPin, fourthPin, bankPin1, bankPin2, bankPin3, bankPin4, pinDeleteDateRequested, - rememberNpcIndex, lastLoginDate, selectedSkill, newHerb, + rememberNpcIndex, ratsCaught, lastLoginDate, selectedSkill, newHerb, newItem, newXp, doingHerb, herbAmount, treeX, treeY, lastH, cookingItem, cookingObject, summonId, npcId2 = 0, leatherType = -1, weightCarried, teleotherType, rockX, rockY, itemUsing, tzKekTimer, diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java b/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java index 701c18a3..ced4e75d 100644 --- a/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java +++ b/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java @@ -142,7 +142,7 @@ public class PlayerHandler { players[i].lastY = players[i].absY; players[i].lastH = players[i].heightLevel; if (players[i].hasNpc == true) { - t.getSummon().pickUpClean(t, players[i].summonId); + t.getSummon().quickPickup(t, players[i].summonId); } if (players[i].duelStatus == 5) { Client o = (Client) PlayerHandler.players[players[i].duelingWith]; @@ -213,7 +213,7 @@ public class PlayerHandler { players[i].lastY = players[i].absY; players[i].lastH = players[i].heightLevel; if (players[i].hasNpc == true) { - t.getSummon().pickUpClean(t, players[i].summonId); + t.getSummon().quickPickup(t, players[i].summonId); } if (players[i].duelStatus == 5) { Client o1 = (Client) PlayerHandler.players[players[i].duelingWith]; diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java b/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java index 69f240e7..b55e3b41 100644 --- a/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java +++ b/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java @@ -100,6 +100,9 @@ public class PlayerSave { case "myBalls": player.getCannon().myBalls = Integer.parseInt(token2); break; + case "ratsCaught": + player.ratsCaught = Integer.parseInt(token2); + break; case "cannonX": player.cannonX = Integer.parseInt(token2); break; @@ -576,6 +579,8 @@ public class PlayerSave { characterfile.newLine(); characterfile.write("lostCannon = " + player.lostCannon); characterfile.newLine(); + characterfile.write("ratsCaught = " + player.ratsCaught); + characterfile.newLine(); characterfile.write("cannonX = " + player.cannonX); characterfile.newLine(); characterfile.write("cannonY = " + player.cannonY); diff --git a/2006Redone Server/src/com/rebotted/net/PacketSender.java b/2006Redone Server/src/com/rebotted/net/PacketSender.java index f94e7da7..d64499e8 100644 --- a/2006Redone Server/src/com/rebotted/net/PacketSender.java +++ b/2006Redone Server/src/com/rebotted/net/PacketSender.java @@ -12,9 +12,9 @@ import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.items.Weight; import com.rebotted.game.items.impl.LightSources; import com.rebotted.game.players.Client; +import com.rebotted.game.players.MainFrameIDs; import com.rebotted.game.players.Player; import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.MainFrameIDs; import com.rebotted.util.Misc; import com.rebotted.world.clip.Region; diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java index 894a79c7..81a9a1c7 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java @@ -47,7 +47,7 @@ public class ClickItem implements PacketType { if(CastleWars.isInCw(player) && itemId == 4053) { player.getItemAssistant().deleteItem(4053, player.getItemAssistant().getItemSlot(4053), 1); //npc id, x, y, height, walk, hp, maxhit, att, def - GameEngine.npcHandler.spawnNpc2(1532, player.absX, player.absY, player.heightLevel, 0, 200, 0, 0, 100); + GameEngine.npcHandler.spawnNpc2(1532, player.absX, player.absY, player.heightLevel, 0, 200, 0, 0, 100, false); player.getPacketSender().sendMessage("You setup a barricade."); } else if (!CastleWars.isInCw(player) && itemId == 4053) { player.getPacketSender().sendMessage("You need to be in castlewars to drop a barricade."); diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java b/2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java index 263f476e..a7941a64 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java @@ -61,222 +61,12 @@ public class DropItem implements PacketType { "You can't drop items on tutorial island!"); return; } + if (Pets.isCatItem(itemId)) { + Pets.dropPet(player, itemId, slot); + } player.endCurrentTask(); - switch (itemId) { - case 1560: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1559: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1558: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1557: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1556: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1555: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Kitten."); - } - break; - case 1561: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 1562: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 1563: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 1564: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 1565: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 7583: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage( - "You drop your Hell Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Hell Kitten."); - } - break; - case 1566: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage("You drop your Cat."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Cat."); - } - break; - case 7585: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage( - "You drop your Hell Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Hell Kitten."); - } - break; case 4045: if (CastleWars.isInCw(player)) { int explosiveHit = 15; @@ -294,22 +84,6 @@ public class DropItem implements PacketType { player.getPacketSender().sendMessage("You can't do that! Your not in castle wars!"); } break; - case 7584: - if (!player.hasNpc) { - GameEngine.npcHandler.spawnNpc3(player, Pets.summonItemId(itemId), - player.absX, player.absY - 1, player.heightLevel, 0, 120, 25, 200, - 200, false, false, true); - player.getItemAssistant().deleteItem(itemId, slot, - player.playerItemsN[slot]); - player.hasNpc = true; - player.getPlayerAssistant().followPlayer(); - player.getPacketSender().sendMessage( - "You drop your Hell Kitten."); - } else { - player.getPacketSender().sendMessage( - "You already dropped your Hell Kitten."); - } - break; } boolean droppable = true; @@ -357,7 +131,7 @@ public class DropItem implements PacketType { } } else { player.getPacketSender().sendMessage( - "This items cannot be dropped."); + "This item cannot be dropped."); } } } diff --git a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java index 66789202..c05932eb 100644 --- a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java +++ b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java @@ -1,12 +1,8 @@ package com.rebotted.world; -import java.io.BufferedReader; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; + import java.util.ArrayList; import java.util.List; - import com.rebotted.GameEngine; import com.rebotted.game.content.skills.core.Mining; import com.rebotted.game.content.skills.core.Woodcutting; @@ -29,7 +25,7 @@ public class ObjectHandler { public static List removedObjects = new ArrayList(); public ObjectHandler() { - loadGlobalObjects("./data/cfg/global-objects.cfg"); + } public Objects getObjectByPosition(int x, int y) { @@ -191,77 +187,6 @@ public class ObjectHandler { } } - public boolean loadGlobalObjects(String fileName) { - String line = ""; - String token = ""; - String token2 = ""; - String token2_2 = ""; - String[] token3 = new String[10]; - boolean EndOfFile = false; - BufferedReader objectFile = null; - try { - objectFile = new BufferedReader(new FileReader("./" + fileName)); - } catch (FileNotFoundException fileex) { - Misc.println(fileName + ": file not found."); - return false; - } - try { - line = objectFile.readLine(); - } catch (IOException ioexception) { - Misc.println(fileName + ": error loading file."); - try { - objectFile.close(); - } catch (IOException e) { - e.printStackTrace(); - } - return false; - } - while (EndOfFile == false && line != null) { - line = line.trim(); - int spot = line.indexOf("="); - if (spot > -1) { - token = line.substring(0, spot); - token = token.trim(); - token2 = line.substring(spot + 1); - token2 = token2.trim(); - token2_2 = token2.replaceAll("\t\t", "\t"); - token2_2 = token2_2.replaceAll("\t\t", "\t"); - token2_2 = token2_2.replaceAll("\t\t", "\t"); - token2_2 = token2_2.replaceAll("\t\t", "\t"); - token2_2 = token2_2.replaceAll("\t\t", "\t"); - token3 = token2_2.split("\t"); - if (token.equals("object")) { - Objects object = new Objects(Integer.parseInt(token3[0]), - Integer.parseInt(token3[1]), - Integer.parseInt(token3[2]), - Integer.parseInt(token3[3]), - Integer.parseInt(token3[4]), - Integer.parseInt(token3[5]), 0); - addObject(object); - } - } else { - if (line.equals("[ENDOFOBJECTLIST]")) { - try { - objectFile.close(); - } catch (IOException ioexception) { - } - //return true; - } - } - try { - line = objectFile.readLine(); - } catch (IOException ioexception1) { - EndOfFile = true; - } - } - try { - objectFile.close(); - } catch (IOException e) { - e.printStackTrace(); - } - return false; - } - public final int IN_USE_ID = 14825; public boolean isObelisk(int id) {