From 1d86d055a5a683d0352e5b9d579c90b277240f5b Mon Sep 17 00:00:00 2001 From: dginovker Date: Mon, 27 Jan 2020 08:02:18 -0500 Subject: [PATCH] Merge commit w. Mr Extremez --- 2006Redone Client/bin/Game.class | Bin 223776 -> 223681 bytes 2006Redone Client/src/Game.java | 9 +- 2006Redone Server/data/cfg/npc.cfg | 259 +-- .../game/content/combat/Specials.java | 4 +- .../game/content/combat/magic/Enchanting.java | 5 +- .../content/combat/magic/MagicTeleports.java | 17 - .../game/content/consumables/Food.java | 1 - .../game/content/skills/SkillHandler.java | 2 +- .../game/content/skills/cooking/Cooking.java | 28 +- .../content/skills/cooking/DairyChurn.java | 114 ++ .../game/content/skills/core/Mining.java | 20 +- .../content/skills/crafting/SoftClay.java | 46 +- .../content/skills/crafting/Spinning.java | 41 +- .../game/content/skills/crafting/Tanning.java | 14 +- .../content/skills/prayer/Ectofuntus.java | 238 +++ .../skills/{core => prayer}/Prayer.java | 2 +- .../skills/runecrafting/Runecrafting.java | 20 +- .../content/skills/runecrafting/Tiaras.java | 41 + .../content/skills/thieving/Pickpocket.java | 4 +- .../content/skills/woodcutting/BirdNest.java | 87 + .../{core => woodcutting}/Woodcutting.java | 34 +- .../{Desert.java => DesertCactus.java} | 20 +- .../game/content/traveling/DesertHeat.java | 138 ++ .../rebotted/game/dialogues/ChatEmotes.java | 50 + .../game/dialogues/DialogueHandler.java | 1423 ++++++++--------- .../game/dialogues/DialogueOptions.java | 4 +- .../game/globalworldobjects/Doors.java | 1 - .../game/globalworldobjects/DoubleDoors.java | 2 - .../rebotted/game/items/ItemAssistant.java | 39 +- .../src/com/rebotted/game/items/UseItem.java | 14 + .../com/rebotted/game/items/impl/Flowers.java | 2 +- .../rebotted/game/items/impl/HandleEmpty.java | 15 +- .../game/items/impl/RareProtection.java | 4 +- .../com/rebotted/game/items/impl/Teles.java | 6 +- .../src/com/rebotted/game/npcs/Npc.java | 24 +- .../com/rebotted/game/npcs/NpcActions.java | 58 +- .../com/rebotted/game/npcs/NpcHandler.java | 25 + .../rebotted/game/objects/ObjectsActions.java | 31 +- .../game/objects/impl/BrimhavenVines.java | 2 +- .../rebotted/game/objects/impl/Climbing.java | 2 +- .../game/objects/impl/OtherObjects.java | 2 +- .../game/objects/impl/SpecialObjects.java | 5 +- .../src/com/rebotted/game/players/Player.java | 70 +- .../game/players/PlayerAssistant.java | 24 +- .../rebotted/game/players/PlayerHandler.java | 12 + .../com/rebotted/game/players/PlayerSave.java | 5 + .../discord/commands/Players.java | 2 +- .../src/com/rebotted/net/PacketSender.java | 3 +- .../rebotted/net/packets/impl/ClickItem.java | 15 +- .../rebotted/net/packets/impl/ClickNPC.java | 4 - .../net/packets/impl/ClickObject.java | 3 +- .../net/packets/impl/ClickingButtons.java | 3 +- .../rebotted/net/packets/impl/Commands.java | 77 +- .../rebotted/net/packets/impl/ItemClick3.java | 19 + .../rebotted/net/packets/impl/ItemOnNpc.java | 8 +- .../src/com/rebotted/world/ObjectHandler.java | 2 +- 56 files changed, 1879 insertions(+), 1221 deletions(-) create mode 100644 2006Redone Server/src/com/rebotted/game/content/skills/cooking/DairyChurn.java create mode 100644 2006Redone Server/src/com/rebotted/game/content/skills/prayer/Ectofuntus.java rename 2006Redone Server/src/com/rebotted/game/content/skills/{core => prayer}/Prayer.java (98%) create mode 100644 2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Tiaras.java create mode 100644 2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/BirdNest.java rename 2006Redone Server/src/com/rebotted/game/content/skills/{core => woodcutting}/Woodcutting.java (94%) rename 2006Redone Server/src/com/rebotted/game/content/traveling/{Desert.java => DesertCactus.java} (74%) create mode 100644 2006Redone Server/src/com/rebotted/game/content/traveling/DesertHeat.java create mode 100644 2006Redone Server/src/com/rebotted/game/dialogues/ChatEmotes.java diff --git a/2006Redone Client/bin/Game.class b/2006Redone Client/bin/Game.class index b96412b469fe05155cd9f9daac1ca3cf69fec5a8..05fbc278442d3f90b4d28198ec818c1121a8a5e5 100644 GIT binary patch delta 4943 zcmY+H349bq+K1n&>Ygi|K#uNQ-7^VtX5LCeE(l0KAOz$Jhhjh>0YZWt0VE)D41x+G zmkij70v;f!Cw85d!L< zHW@s_rytw)`QC0M!p7y~d!bhVh~d%voKBX>r+KW~DWI`f@~fSwEsB+bx46R%z|q347tZSvZ+@vG%VvSy@!hk#bmrKVIo{HY;Qy-@1eEWL49&<)5Nr7F%5vM}%IY1O(KLGT{#rq#1?W5=RXL#;3io8b0X#4?_buv0fTOYWG zbcsH3pa~8e%8YKi8KUguf!X8&Kp~~)7Q#)c@rDpUr?v82)+mOD|qJuM( zQUYnwyAGx*nLcAc^z(xyp+TB)4+O*_2Nn;ww|Kzto~2$$67Q>VpJtR9L!zAzrIGui zLk~467^#r~;E{`|)X3`FsY)ZC$&HI2UsL-~<>2bd%5mK$S5#G1j*{aZ)QqvwZHKzX z*J#E#V|>7vWIW_GCKE`Gb~>EQG-JxP%)|TQBRZ(r$>7iKNM6nUohIAesb!bY9(E5p z+3rc75_ySzH(hS`rq9@Y=_mm+irHqg_Ea+aqY5J(AYjqv%e%k{+=~)8lp( zJtb=2*$>il_E>ts9!D?RHFcFc1Sn-$;jz;@;B4G<9N9cNoU z%O?98zRhRP5ptkmW?MFzki*WIc5D$j>P#$T??&ELMnN(>ACg=R$6bB`U%LE?Ndah3sRO2NWu)D9TcoPb=44URQG@)jV~X%jN1PF8`(e6mi2j zPjg96OK+m2SJ&JLX{)ur$+osfb0?&I728O*W8-7FOFOpK<+Rv?E)U1$O2*~Kxf6(c zI&PiYezoxt$;QXx-Peh4nczNO!dHnAkL*bFC7yNpLz26)q>7}SvYoU`2T7gkXI!2& z{E|kD(bHuw<1v>{7{^>5PgW$8J;^g%&PsmI4dThG8mFaouecg6x`V^N_)7>3QUu|Z|wuxpR zm;KBaT&^+Cxx8Sx3$}b#v20tB5^J*?>VmB$gE_(1U2Y1xTNXSPavcb@4egM1@Pi)O zO^>_INJ?iUr8AP!89~<>N$HHB>x`i5jHGl%Fv6rXBDm5>N@*meG=i=)l2RH;A&pDv zjA*;g2)fP)y3R;SXC$RFg03@?(iutV%x)Sv9xJ601y>qLDUGC*M$nZ;(3M6|NaK-p z*BMFajG*g`q;y8mbw*M;Bj`FKDV>p&&g_neAf*unR~ktvjii)DQc5G}N+Y>kI3p>Y z5pX9Qhm1YKt&r8AP!8A<8Pcp0QLg03`@QW{Aqjii)D(3M6~IwL8a5pX9Qhm1cA{kfJR-|(S~J3taWT8{c89p6T&~6-tajy5I%3lhcB8b;a|-3@Fg=N zeA#RkzG7yDubLSC%`6E2ZWe{FnO(zwm_5SR%|789X20-X=6&ItW_kFQS&d-UATg&S zHRm8RA4kPph^o09J*I)v7lbB?F zgSz=WrkLk2)x3b|=5J_P1TD*hLCc33Rsv>PY1qVSf_GT0u&HHZGb<09TkWxh)frn^ z#h7K4AX@#ATVGR0`Ih*$Bx#E zSY)lo&erRAm$ezYSasOV+KI*12iV=(izU_}>|q_np4Lgc+xixJS?92~bp`uae`3F2 z43-9yuz%3P9>FjU3bw|3f;l)i_#ECBT#seJ*KtU26W$-(jt>Ms#9_h6-*I?wKb8lN zU`6m4jtri{QNc4<8T=7P2QOh&@K>x3UdJ)PTR1l4#c?4GCxnu)CX|YkLYX)@)EuXT z!dM$>jZ;JUI4#r`r-!EFBca(iBeYg<3(g9?jk7~LFcR8@b3(iE(a;{8n~{U_GTP!} zSsC|8TlkmxmT6{|0`@A`@L*C}-YPv?;3FAW>oS*x!4`Tia8c_8OK>fJ$ zc3;+loN&JA%Q}!xoRogdYW1n;_V}8@m-@d%Qhm9wOBY7~QCkOv`bm+zzWtD>f9?zu z!y~6;mp=##^)Fb>k*m&< z{$d+{b?PO4b58eX#ks$W!JdRf_`5bqoHslPCN${RM9rHp1jg!rh~!I{4JF!42!KD~ zWw=AX?%X?ojn{9;L3$00(#DA{uh@H!{-^WV0JfFte>sZ=veue@Q$Bg>EU|I7oP7gX zSp;Mu?Nul@#F-epX*-~=K}GVVzXh|^M@6D$5yYzt-Bb=m>LNE)LqU>!XPCKJ)K)~qJbEa{3IXSIT$RttZCV(o>o>Rh+?Py{NqDp6$CN$8ezOB5CB zTj-E3rIKrpAbuKK$o~Sq@mS4tS8kKa!ZJ=dVz=^FTE3(*H9Yf z4`%C#YI^+2btk`!J)5FtDfNaoi`5&d{Nv54H~iue zCm8S44q=z9!~(Cf%`n(DZA;eM%9Gwv+l*8Z7Rg{bbBD5KX(7@6rru~GE@~zoEwXfP zz0pdfu=CMS);Y2i0=Nts;nR?W%OMq`5X2SG1Xn_Hd!ATRz%JYfAK`1T7hi`%_y!!uO>h$5gfsXS$;8d1Ic_0s za4Ttx+ejDOPI^SJo(#ktqzvC7)%Y%%fV;?ae2>h-_sK&1kgULu$n&^~ti!$JHQYzu z#E(fG?k79(0NITP$v^NAIfRGFPk4k}!lUFW9wXQA1i6WyQi`9^MtG7M_&H6-Q#1p= zpw011ig=pl;MeYHyy4dUtQ{#lBX;3CNWim@jNgNaKR_n_D0bjy$i{P!i|3&oUVx7H z3l!rexEn9S0K5W&@v1X%7;8(ovvC-^P@0{kZ1=pAXtds8f-Vl1ZY`Hqj_l zb{HMD(w7pAyXxs1iAGm3WQS3lWb|^LcgOTeH2VGTnEqnSR%4)Zb~wu*_d1?(F~`A9 zr*hVe40S5Y*+lYy^JzJ2N`^T%%GtlkaOXk=n-*WbJ)ttI@u>IMy6ygXS&2r4Q#*p$ z;>z_S*t2AWQ#6v5iq_JRtQ#5SoEXU_Mn=~OKi&H`eFoM8;BTNnCiwYIh|4yieRdtp z&pr+3Z5=M##qc{`BObg?;_(Ja!@o!t-X!^WixhD}x^YTMIU{9UA)~oU#&Qpt!M)^h z?juXMpEx`~*69A6FiBW=g|{9pPu9e z^ef(${>0nSE4+~Y#oIG4@4({uoh+SqWX-rZ?(j}5pLb?O{4Q3^yRhE8D;vnWv0=QJ zjpW@~H7{W`ya$`Yd$L*lZZ?%4lAtJjAP&hxr&~E`Ly&&&Mi@_&8-HAFr&6@CnLVUZbqz6P4Ha zB;_qWS=q)PQg-ku$_Knw`3Ik>9N^QGqx@mz6rZkq%O6pG;4_qqe5P`Z&r)vj*{YXE zRE^J36ZoTQDxa%n@_A}={+Jr(kE^Zu6KWx!uinKMsNMOKYG1xk9mt5~PRA1oFs4sEH`F=EONvfSjRZJ&ioMu%F z;dnFvS9XMt`3!mE0!6|zcoVH(pGxlou(Ov@=?6q*oehGfHUxw@U zD{#wRM`*SED)HJINUXh)B-pPJ-F}0l*_%j){U&KJIO%%T~cQ6BE#$t-On-O_DcVIvJz`HYK^JRpJSNiohJUnsqyfC E0AWH}CIA2c delta 5112 zcmY+I3tSXc`^TSi&de^m4Cn$gh|KKbUD@X_%0_|ayjt&)5Be$HHUfBo=!Z0#O4Gb5=tngDDD6SOQ&~E-ys9KUEmL-n zYx>9k-Azr6&_5xd4r`ahlOps_cOU+sCkeS{lvWg1RhAN96{#6+7$EN2@M<1Tt7XzO zmvuKqYb=UfmA!^qboaX{M$>!89GAT~E%q?&A(NrSip6-?dZUqMB!DKCRWz~R#HsDl zGuwI8(MFEabGhL4OH6!p}^V?@;$ZiwOX!`%U?Y+u5qq%0Z zh&lexDW|ndligOD(VAQ(5M5kRT2!4oW_(7EqT=#WxvXT({p{UEqvox>n^Lrh5xwY4 zIowu@oh_RzBFiJnG>vQnEyBnk5Ibes#FV1y;_{S|qNznGl~pCB6<)f@=%5*ybRL1o zveK!8tE(oJR!^N3VRR%w+owkuoohxNnyzFMNUSM1WJL8ZnqJhzYjiWZyN!ElZX7aM z52I&I{NdrGcTMHtzNBwW-Qhs6zcJ8l3?R^OyqIoR6iqC%dsa;wQ&FlJgNz*UP?L(P zr<6LankM%(s%dmYBSULi9GOFg)jW43K<=$Mc%)Cq5t@+?Ua>WKy@uY~YiMD=!ET5X zLKydJ#sfwH0atN#Y0*^ijC)(R8JIU!6qTLiNsq4Sezd7xChiklvL2_A^>@>RnpsCJ zWuj(O)vP_*!#71UCK;2x#x!Gw+n7!uzUHl?@k}#j?v6P2p)X{Bn$ie7DcR(Olp8eO z?n5oRFYRmhqt$kQ`k2Ve?E!S9J&3NhbLm=p2;E>0rJL*#belbfzG4^CTDyeS*`;*9 zJ(eD~%jikFoSqWBbM^#!(XODE>`MB(J(1qDtLSaJlDX|_8WgXQbWmyS!rbqcnD=DU1d zUdhdO`?_q%&5!VP3FqdRzD~l-!@7XvdN}FuGdS(=49Sor z9mt;!Z_#6t^kY^i$%@z`4wtfz93EDvq@pNKI9#FJaClQql~mK!CmpU-KXdqndLiV5 zi>{WEuGa2YNw=;!3)0qWZ_8SHS92Dmor!87>nL9ocW6gVb2uaFh{I#iX_CK7Uwmuz^#=RA(Db&PX=F=t{!E;$ez5qsX@4{^?!#TCWvmv!6$9VB(CfA8?T z;gK{VjeZUX7>gV(HcmJ^8LvpjyW;0KoEQIw!?)s{9gM%#sF|!AwP@t*M5C3VM$Q>F zdN;u*2NGfvHaXmq@Vmo58aq4ESWk?Ubz)Savz3YIi8)R^IB}}O>50ycC9XFgkhNK8 z&Ud)Lbk5v7VfkfkC0SVxJ6SUwhGtu5op8=yEa@-xJ6q#F6QHsVD1mZ^;{z8Z!2^2W z8a?SaBPpGcl+H*>X9OK*B&9Qgjx&OeGm_F7!4Q+uh~P*gDW#E=(g-@zNJ?oWg)|PO zGop5!5p@|8c8XQq?AU`kw$W*a7I!( zBj`9IDV>p&&Imfr2s+M4N@pacGm_GokPK29K}Q-%DUGC*M$nN)Qc5E!ospEz2s+M4 zN@oNeXC$RFg1~4pK!e`w1VF1p;BIvoJgts_uhntT>+j8G{-}^?1TUCY@F%lP@S>R! z{MpP5UNUDdLFPk~R-^{$=6>~)J5A%WGRkJX7-5eLZVNMSIX-*H`H0K0wne&5x znG1rq&Buaw%o+r99TIaBQgb^pb2lpHUR2FD&}F`dZu1a&&Eptpp1>&cYm7F}VyJ=n z6E-w|L!WsIV=RiXmK)~5XK9@aVRWnIGF*6-NIx`}=Lfc^Xo z`};K<;MZ}W-;aa*EiuP$<6wU_4)OQFq5i>QP5}=07vsJDQXJtwg8BY0aisq=j`E+u z2mC)`fj@Kw3;j26wEu4`3Q!yqP_QHrjimtt#|9FyEYJ+g1FdmffaCZ;DpmwKVr8H! zRt5Utq`*L|4h+L7fqa}6D8T7~Vw@2u$C-igI6JT%=LBkTZr~Ha@A1LF4;Ttu#QA|= z@u9#qToAa93zJH5QA*Nyd^qVbT$J<-K9aN%A5GeVOOv+YGWj9u?hO0n=OtZFH;9i^ zU*PNT+Cl8C$j?9ns=f@Ue;zK$VXep);bl3j6ZtayVGgs}d?kim5zXPW{e5> zPdU9Ukfnbkk~`uM#OkNR(YeeDeJh7NepsrXkwc#5FkAmlqzF%YDA4~UlE>2r2I*%- z@_L3q5B+xN&8uJT;Ao7>l)}91a9wYXr*6rj=TtE`Y+Dtb;ylq zPO`-49WnZA_;xPqly+I^2$7MG!(#n6F-ePj3MT8nixd^P0rK@LB1K0&4@31oL~0PZ z4RZCX;fld*2DuhKH<;y<>*4GnVjFLS$4dMeUOt5NO1mj0yJBMDJ#DhMaB;<$P_N$- zJ$KAVn4te9Qbf#y&_|mqz5;k+HbFD}@33nqtJH7HNqQBOXcc0}t$ztF{Z9Cip==j5 zAlx~Rwbcx9(G9MId5~n#@XS1xA7Zl6_yrhkDDv>edm+bAMT$t=3AO4&B2m+TeufKT zfSHrQr!IARHIS_?bJ99!A19wdW}X$jwNCFRXs=|6&0*Fc;OactvxY;9IJqUvx*z=7 zH24z~>t+Zhs0-wX<#R0#9bFX7WfsE$T^X7fdsBYt&&Gi0ZA%_9(U&@mHpp5+73W@ob>e6zc-BK zQ9Xj(5u&SZAmYbOI|FkY5%v5&wuN~Ag8puDE7GI<8UB0(ThqvstkfBi$*j)s$Ul+E zbw-r9H3%=xXLI9x$*)BYTnn-r+j%QQ2%|@{njhl)3Uv)-HaZnp^3nuICI)jU3hsTU!-9k@-7gs<7TnTYl0}1#P_;D39 z#nsRf!@zM3q~g<%jccI~J_7}~9>(FbFatNjX50)f;TCuWpNC!e0@UL+IDjw0L3{~5 zz?b1DZikb&1HQtY@IAgln&7LXCDxL5xSMpq*GPA)BYi_yPx5dd$;bVq91oC*_y(DU zZ<2-h7Fmi1$y4|?S%*8w7W|OBh#!$1c!<>EVX_~OkazGXc^{9Fqj;QLz>mpgJVE}z zPsk1YjNHaAD8;X61N@pAc#0fhgZYC0@i`F3->Evmjha;(uuOxbJni!*Y=>zp}5 zVvW3i<_s5eb{Y4D7ZZf)s{bquC@<6rM4fH78@j&x~fjk>c?3 zA~wTUvL~iAxnap0Y|9?c!sJ+^G;EAvwm7o)7`BFt4WAjq28*g~G3!an!_$h{q|o?U zA*u7xPFKV80C*h~XaXMoIz*>f&@p8fEJ-;7KidZUZuf@k_$P7UE#kw!NMpQBlJO47 z;6SoDB|SMKgSkTTxk|=z7n#7_WDbuY4|5M$&b=heBgqD?kY{L1s%y-(jwl9R`S+#8gD}%PkDR#74JaL@JxDvXVELXBmJ9qVs74<`FIzW$g^1s z-j%iG-B<>{hh_8btQYUW2J)UPkN08)yf-W6eONi~%c^)kHkJ2h^Y{R^fDdF#`5;!q zbJ!Xl%4N^-!R!S-gw^t)Y#+~K@A6^nC?C!~<@d60#M{MrK7#$i^VtUvwV`Wg-=#qL~uWTFjTLt;+cmY9)VCt>!D#S$w5BpVz1l^QY9Me3e?m zSF6wPu=*Td6J9cwwI&teSI07)REFOl%g{Fs-1c;cuxCJ=Jrk1bSz%VjQcdwc1o4)8 z4S>!7Dt>_!CI{<{>R_EQwSGt$DBxIZ!ds__9A%1ei$CN7sE<>39Pao zg|+rlc-DRlw%E&HtGyhy+fP8P{Up@cD`1~p18>?-!MpY<_{d%jN9;9l!hRY)x7Wfc zdmVghuZQpL4e+D=EL^fT!ex6CT(vjDO?wO6v7aZj+}=vu_BIk_zer;2mxyj}CynhL zB+1@MTG+3U)^;u7_AZiU?WXCEN>_8X+YKIpuU d8F$b0e=o1ZIUBQ#+2Qr$nB|@$Ug6Z3`ybZbnmqsj diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java index d4bf8c9f..884b4e19 100644 --- a/2006Redone Client/src/Game.java +++ b/2006Redone Client/src/Game.java @@ -11234,15 +11234,14 @@ public class Game extends RSApplet { // 15819 = Christmas Type // 15812 = Security Type // 15801 = Item Scam Type - // 15791 = Password Safety ? + // 15791 = Password Safety // 15774 = Good/Bad Password - // 15767 = Drama Type ???? - int[] welcome = {17511, 15812, 15801, 15791, 15774, 15767}; + // 15767 = Drama Type if (l7 == 15244) { if (Flo.getTodaysDate().contains(ClientSettings.SNOW_MONTH)) { - openInterfaceID = welcome[random(5)]; + openInterfaceID = 15819; } else { - openInterfaceID = welcome[random(5)]; + openInterfaceID = 15801; } fullScreenInterfaceId = 15244; } else { diff --git a/2006Redone Server/data/cfg/npc.cfg b/2006Redone Server/data/cfg/npc.cfg index 4526c6cc..b2506851 100644 --- a/2006Redone Server/data/cfg/npc.cfg +++ b/2006Redone Server/data/cfg/npc.cfg @@ -8,8 +8,8 @@ npc = 5 Woman 2 7 npc = 6 Woman 2 7 npc = 7 Farmer 7 12 npc = 8 Thief 16 17 -npc = 9 Guard 21 22 -npc = 10 Guard 22 22 +npc = 9 Gaurd 21 22 +npc = 10 Gaurd 22 22 npc = 11 Tramp 2 7 npc = 12 Barbarian 7 14 npc = 13 Wizard 9 14 @@ -31,7 +31,7 @@ npc = 28 Zoo_keeper 0 0 npc = 29 Chuck 0 0 npc = 30 Barman 0 0 npc = 31 Priest 0 0 -npc = 32 Guard 20 22 +npc = 32 Gaurd 20 22 npc = 33 Door_man 0 0 npc = 34 Watchman 33 22 npc = 35 Soldier 28 22 @@ -114,7 +114,7 @@ npc = 95 Wolf 64 70 npc = 96 White_wolf 25 34 npc = 97 White_wolf 25 34 npc = 98 Dog 0 0 -npc = 99 Guard_dog 44 49 +npc = 99 Gaurd_dog 44 49 npc = 100 Goblin 2 5 npc = 101 Goblin 5 14 npc = 102 Goblin 13 16 @@ -186,8 +186,8 @@ npc = 159 Gnome_child 1 2 npc = 160 Gnome_child 1 2 npc = 161 Gnome_child 1 2 npc = 162 Gnome_trainer 0 0 -npc = 163 Gnome_guard 23 33 -npc = 164 Gnome_guard 23 33 +npc = 163 Gnome_Gaurd 23 33 +npc = 164 Gnome_Gaurd 23 33 npc = 165 Gnome_shop_keeper 0 0 npc = 166 Gnome_banker 0 0 npc = 167 Gnome_baller 0 0 @@ -219,10 +219,10 @@ npc = 192 Dark_warrior 8 18 npc = 193 Chaos_druid_warrior 37 40 npc = 194 Necromancer 26 44 npc = 195 Gaurd_Bandit 21 28 -npc = 196 Guard_Bandit 21 28 +npc = 196 Gaurd_Bandit 21 28 //------------------------Not In DB------------------------ -npc = 197 Barbarian_guard 8 0 +npc = 197 Barbarian_Gaurd 8 0 //------------------------Not In DB------------------------ npc = 198 Guild_master 0 0 @@ -284,11 +284,11 @@ npc = 249 Merlin 0 0 npc = 250 The_Lady_of_the_Lake 0 0 npc = 251 King_Arthur 0 0 npc = 252 Beggar 0 0 -npc = 253 Khazard_Guard 23 22 -npc = 254 Khazard_Guard 23 22 -npc = 255 Khazard_Guard 23 22 -npc = 256 Khazard_Guard 23 22 -npc = 257 Khazard_Guard 23 22 +npc = 253 Khazard_Gaurd 23 22 +npc = 254 Khazard_Gaurd 23 22 +npc = 255 Khazard_Gaurd 23 22 +npc = 256 Khazard_Gaurd 23 22 +npc = 257 Khazard_Gaurd 23 22 npc = 258 General_Khazard 112 170 npc = 259 Khazard_barman 0 0 npc = 260 Kelvin 0 0 @@ -307,8 +307,8 @@ npc = 272 Lucien 0 0 npc = 273 Lucien 0 0 //------------------------Not In DB------------------------ -npc = 274 Guardian_of_Armadyl 45 0 -npc = 275 Guardian_of_Armadyl 43 0 +npc = 274 Gaurdian_of_Armadyl 45 0 +npc = 275 Gaurdian_of_Armadyl 43 0 //------------------------Not In DB------------------------ npc = 276 Winelda 0 0 @@ -371,17 +371,17 @@ npc = 332 Fishing_spot 0 0 npc = 333 Fishing_spot 0 0 npc = 334 Fishing_spot 0 0 npc = 335 Elena 0 0 -npc = 336 DeVinci 0 0 -npc = 337 DeVinci 0 0 +npc = 336 Da_Vinci 0 0 +npc = 337 Da_Vinci 0 0 npc = 338 Chancy 0 0 npc = 339 Chancy 0 0 npc = 340 Hops 0 0 npc = 341 Hops 0 0 npc = 342 Guidor's_wife 0 0 npc = 343 Guidor 0 0 -npc = 344 Guard 0 0 -npc = 345 Guard 0 0 -npc = 346 Guard 0 0 +npc = 344 Gaurd 0 0 +npc = 345 Gaurd 0 0 +npc = 346 Gaurd 0 0 npc = 347 Mourner 11 19 npc = 348 Mourner 24 25 npc = 349 Kilron 0 0 @@ -403,7 +403,7 @@ npc = 364 King_Lathas 0 0 npc = 365 Paladin 62 57 npc = 366 Jerico 0 0 npc = 367 Chemist 0 0 -npc = 368 Guard 0 0 +npc = 368 Gaurd 0 0 npc = 369 Mourner 24 25 npc = 370 Mourner 11 19 npc = 371 Mourner 11 19 @@ -419,7 +419,7 @@ npc = 380 Customs_officer 0 0 npc = 381 Captain_Barnaby 0 0 npc = 382 Dwarf 0 0 npc = 383 Stankers 0 0 -npc = 384 Barbarian_guard 0 0 +npc = 384 Barbarian_Gaurd 0 0 npc = 385 Kharid_Scorpion 0 0 npc = 386 Kharid_Scorpion 0 0 npc = 387 Kharid_Scorpion 0 0 @@ -433,8 +433,8 @@ npc = 394 River_troll 79 90 npc = 395 River_troll 120 130 npc = 396 River_troll 159 160 npc = 397 Cow 2 8 -npc = 398 Legends_Guard 0 0 -npc = 399 Legends_Guard 0 0 +npc = 398 Legends_Gaurd 0 0 +npc = 399 Legends_Gaurd 0 0 npc = 400 Radimus_Erkle 0 0 npc = 401 Jungle_Forester 0 0 npc = 402 Jungle_Forester 0 0 @@ -482,9 +482,9 @@ npc = 443 Tree_spirit 159 160 npc = 444 Goblin 5 13 npc = 445 Goblin 5 13 npc = 446 Giant_rat 3 5 -npc = 447 Jail_guard 26 29 -npc = 448 Jail_guard 26 29 -npc = 449 Jail_guard 26 29 +npc = 447 Jail_Gaurd 26 29 +npc = 448 Jail_Gaurd 26 29 +npc = 449 Jail_Gaurd 26 29 npc = 450 Gull 0 0 npc = 451 Gull 0 0 npc = 452 Seth_Groats 0 0 @@ -524,7 +524,7 @@ npc = 485 Local_Gnome 0 0 npc = 486 Kalron 0 0 npc = 487 Observatory_assistant 0 0 npc = 488 Observatory_professor 0 0 -npc = 489 Goblin_guard 26 26 +npc = 489 Goblin_Gaurd 26 26 npc = 490 Observatory_professor 0 0 npc = 491 Ghost 19 25 npc = 492 Spirit_of_Scorpius 0 0 @@ -648,7 +648,7 @@ npc = 605 Sir_Vyvin 0 0 npc = 606 Squire 0 0 npc = 607 Gunnjorn 0 0 npc = 608 Sir_Amik_Varze 0 0 -npc = 609 Fortress_Guard 20 22 +npc = 609 Fortress_Gaurd 20 22 npc = 610 Black_Knight 33 42 npc = 611 Witch 25 10 npc = 612 Greldo 0 0 @@ -687,8 +687,8 @@ npc = 642 Katrine 0 0 npc = 643 Weaponsmaster 23 0 //------------------------Not In DB------------------------ -npc = 644 Straven 0 0 -npc = 645 Jonny_the_beard 2 10 +npc = 644 Straven 23 20 +npc = 645 Jonny_the_beard 0 0 npc = 646 Curator 0 0 npc = 647 Reldo 0 0 npc = 648 King_Roald 0 0 @@ -702,6 +702,8 @@ npc = 655 Tree_spirit 101 96 npc = 656 Cave_monk 0 0 npc = 657 Monk of Entrana 0 0 npc = 658 Monk of Entrana 0 0 +npc = 2728 Monk of Entrana 0 0 +npc = 2729 Monk of Entrana 0 0 npc = 659 Party_Pete 0 0 npc = 660 Knight 0 0 npc = 661 Megan 0 0 @@ -721,7 +723,7 @@ npc = 674 Foreman 23 20 npc = 675 Shipyard_worker 0 0 npc = 676 Femi 0 0 npc = 677 Black_Demon 172 157 -npc = 678 Guard 37 40 +npc = 678 Gaurd 37 40 npc = 679 Ranging_Guild_Doorman 0 0 npc = 680 Leatherworker 0 0 npc = 681 Weapon_poison_salesman 0 0 @@ -779,7 +781,7 @@ npc = 732 Bartender 0 0 npc = 733 Bartender 0 0 npc = 734 Bartender 0 0 npc = 735 Bartender 0 0 -npc = 736 Barmaid 0 0 +npc = 736 Emily 0 0 npc = 737 Bartender 0 0 npc = 738 Bartender 0 0 npc = 739 Bartender 0 0 @@ -846,7 +848,7 @@ npc = 795 Ice_Queen 111 105 npc = 796 Achietties 0 0 npc = 797 Helemos 0 0 npc = 798 Velrak the explorer 0 0 -npc = 799 Pirate_Guard 19 25 +npc = 799 Pirate_Gaurd 19 25 npc = 800 Fishing_spot 0 0 npc = 801 Abbot_Langley 0 0 npc = 802 Brother_Jered 0 0 @@ -859,7 +861,7 @@ npc = 808 Hobbes 0 0 npc = 809 Louisa 0 0 npc = 810 Mary 0 0 npc = 811 Stanford 0 0 -npc = 812 Guard 0 0 +npc = 812 Gaurd 0 0 npc = 813 Gossip 0 0 npc = 814 Anna 0 0 npc = 815 Bob 0 0 @@ -868,7 +870,7 @@ npc = 817 David 0 0 npc = 818 Elizabeth 0 0 npc = 819 Frank 0 0 npc = 820 Poison_Salesman 0 0 -npc = 821 Sinclair_Guard_dog 1 0 +npc = 821 Sinclair_Gaurd_dog 1 0 npc = 822 Ana 0 0 npc = 823 anabarrel 0 0 npc = 824 Female_slave 0 0 @@ -881,15 +883,15 @@ npc = 830 Mercenary_Captain 47 68 npc = 831 Captain_Siad 0 0 npc = 832 Al_Shabim 0 0 npc = 833 Bedabin_Nomad 0 0 -npc = 834 Bedabin_Nomad_Guard 0 0 +npc = 834 Bedabin_Nomad_Gaurd 0 0 npc = 835 Irena 0 0 npc = 836 Shantay 0 0 -npc = 837 Shantay_Guard 22 32 -npc = 838 Shantay_Guard 22 32 +npc = 837 Shantay_Gaurd 22 32 +npc = 838 Shantay_Gaurd 22 32 npc = 839 Desert_Wolf 27 34 npc = 840 Ugthanki 42 45 npc = 841 Mine_cart_driver 0 0 -npc = 842 Rowdy_Guard 43 60 +npc = 842 Rowdy_Gaurd 43 60 npc = 843 RPDT_employee 0 0 npc = 844 Wizard Cromperty 0 0 npc = 845 Horacio 0 0 @@ -904,14 +906,14 @@ npc = 853 Og 0 0 npc = 854 Grew 0 0 npc = 855 Toban 0 0 npc = 856 Gorad 68 81 -npc = 857 Ogre_guard 83 80 -npc = 858 Ogre_guard 83 80 -npc = 859 Ogre_guard 83 80 -npc = 860 Ogre_guard 83 80 -npc = 861 Ogre_guard 83 80 +npc = 857 Ogre_Gaurd 83 80 +npc = 858 Ogre_Gaurd 83 80 +npc = 859 Ogre_Gaurd 83 80 +npc = 860 Ogre_Gaurd 83 80 +npc = 861 Ogre_Gaurd 83 80 //------------------------Not In DB------------------------ -npc = 862 City_guard 83 0 +npc = 862 City_Gaurd 83 0 //------------------------Not In DB------------------------ npc = 863 Scared_skavid 0 0 @@ -921,14 +923,14 @@ npc = 866 Skavid 0 0 npc = 867 Skavid 0 0 npc = 868 Skavid 0 0 npc = 869 Skavid 0 0 -npc = 870 Enclave_guard 83 80 +npc = 870 Enclave_Gaurd 83 80 npc = 871 Ogre_shaman 113 110 npc = 872 Watchtower_wizard 0 0 npc = 873 Ogre_trader 70 60 npc = 874 Ogre_merchant 60 60 npc = 875 Ogre_trader 70 60 npc = 876 Ogre_trader 70 60 -npc = 877 Tower_guard 25 22 +npc = 877 Tower_Gaurd 25 22 npc = 878 Colonel_Radick 37 65 npc = 879 Delrith 27 7 npc = 880 Weakened_Delrith 2 1 @@ -938,7 +940,7 @@ npc = 883 Sir_Prysin 0 0 npc = 884 Captain_Rovin 0 0 npc = 885 Ceril_Carnillean 0 0 npc = 886 Claus_the_chef 0 0 -npc = 887 Guard 0 0 +npc = 887 Gaurd 0 0 npc = 888 Philipe_Carnillean 0 0 npc = 889 Henryeta_Carnillean 0 0 npc = 890 Butler_Jones 0 0 @@ -955,7 +957,7 @@ npc = 900 Witches_experiment_fourth_form 53 55 npc = 901 Mouse 0 0 npc = 902 Gundai 0 0 npc = 903 Lundail 0 0 -npc = 904 Chamber_guardian 0 0 +npc = 904 Chamber_Gaurdian 0 0 npc = 905 Kolodion 0 0 npc = 906 Kolodion 0 0 npc = 907 Kolodion 0 0 @@ -968,7 +970,7 @@ npc = 913 Battle_mage 54 127 npc = 914 Battle_mage 54 127 npc = 915 Leela 0 0 npc = 916 Joe 0 0 -npc = 917 Jail_guard 26 26 +npc = 917 Jail_Gaurd 26 26 npc = 918 Ned 0 0 npc = 919 Lady_Keli 0 0 npc = 920 Prince_Ali 0 0 @@ -976,8 +978,8 @@ npc = 921 Prince_Ali 0 0 npc = 922 Aggie 0 0 npc = 923 Hassan 0 0 npc = 924 Osman 0 0 -npc = 925 Border_Guard 0 0 -npc = 926 Border_Guard 0 0 +npc = 925 Border_Gaurd 0 0 +npc = 926 Border_Gaurd 0 0 npc = 927 Fishing_spot 0 0 npc = 928 Gujuo 0 0 npc = 929 Ungadulu 70 70 @@ -1110,7 +1112,7 @@ npc = 1043 Will_o'_the_wisp 0 0 npc = 1044 Monk_of_Zamorak 22 23 npc = 1045 Monk_of_Zamorak 17 11 npc = 1046 Monk_of_Zamorak 45 42 -npc = 1047 Temple_guardian 30 30 +npc = 1047 Temple_Gaurdian 30 30 npc = 1048 Drezel 0 0 npc = 1049 Drezel 0 0 npc = 1050 Filliman_Tarlock 0 0 @@ -1139,8 +1141,8 @@ npc = 1072 Eadburg 4 10 npc = 1073 Archer 42 50 npc = 1074 Archer 42 50 npc = 1075 Archer 42 50 -npc = 1076 Guard 37 40 -npc = 1077 Guard 37 40 +npc = 1076 Gaurd 37 40 +npc = 1077 Gaurd 37 40 npc = 1078 Harold 0 0 npc = 1079 Tostig 0 0 npc = 1080 Eohric 0 0 @@ -1205,22 +1207,22 @@ npc = 1138 Mountain_Troll 71 71 npc = 1139 Mushroom 0 0 npc = 1140 Mountain_Goat 0 0 npc = 1141 Mountain_Goat 0 0 -npc = 1142 Guard 0 0 -npc = 1143 Guard 0 0 -npc = 1144 Guard 0 0 -npc = 1145 Guard 0 0 -npc = 1146 Guard 0 0 -npc = 1147 Guard 0 0 -npc = 1148 Guard 0 0 -npc = 1149 Guard 0 0 -npc = 1150 Guard 0 0 +npc = 1142 Gaurd 0 0 +npc = 1143 Gaurd 0 0 +npc = 1144 Gaurd 0 0 +npc = 1145 Gaurd 0 0 +npc = 1146 Gaurd 0 0 +npc = 1147 Gaurd 0 0 +npc = 1148 Gaurd 0 0 +npc = 1149 Gaurd 0 0 +npc = 1150 Gaurd 0 0 npc = 1151 Burntmeat 0 0 npc = 1152 Weird_Old_Man 0 0 npc = 1153 Kalphite_Worker 28 40 npc = 1154 Kalphite_Soldier 85 90 -npc = 1155 Kalphite_Guardian 141 171 +npc = 1155 Kalphite_Gaurdian 141 171 npc = 1156 Kalphite_Worker 28 40 -npc = 1157 Kalphite_Guardian 141 171 +npc = 1157 Kalphite_Gaurdian 141 171 npc = 1158 Kalphite_Queen 333 267 npc = 1159 Kalphite_Queen 333 267 npc = 1160 Kalphite_Queen 333 267 @@ -1248,7 +1250,7 @@ npc = 1181 Albatross 0 0 npc = 1182 Lord_Iorwerth 0 0 npc = 1183 Elf_warrior 90 110 npc = 1184 Elf_warrior 108 110 -npc = 1185 Elven_city_guard 0 0 +npc = 1185 Elven_city_Gaurd 0 0 npc = 1186 Idris 0 0 npc = 1187 Essyllt 0 0 npc = 1188 Morvran 0 0 @@ -1263,13 +1265,13 @@ npc = 1196 Grizzly_bear_cub 19 20 npc = 1197 Grizzly_bear_cub 19 20 npc = 1198 Dire_Wolf 88 86 npc = 1199 Elf_Tracker 0 0 -npc = 1200 Tyras_guard 110 112 +npc = 1200 Tyras_Gaurd 110 112 npc = 1201 Elf_warrior 0 0 npc = 1202 Arianwyn 0 0 -npc = 1203 Tyras_guard 110 112 -npc = 1204 Tyras_guard 110 112 -npc = 1205 Tyras_guard 0 0 -npc = 1206 Tyras_guard 0 0 +npc = 1203 Tyras_Gaurd 110 112 +npc = 1204 Tyras_Gaurd 110 112 +npc = 1205 Tyras_Gaurd 0 0 +npc = 1206 Tyras_Gaurd 0 0 npc = 1207 General_Hining 0 0 npc = 1208 Quartermaster 0 0 npc = 1209 Koftik 0 0 @@ -1363,10 +1365,10 @@ npc = 1292 Koschei_the_deathless 0 0 npc = 1293 Koschei_the_deathless 0 0 npc = 1294 Brundt_the_Chieftain 0 0 npc = 1295 Askeladden 0 0 -npc = 1296 Guard 0 0 -npc = 1297 Guard 0 0 -npc = 1298 Town_Guard 0 0 -npc = 1299 Town_Guard 0 0 +npc = 1296 Gaurd 0 0 +npc = 1297 Gaurd 0 0 +npc = 1298 Town_Gaurd 0 0 +npc = 1299 Town_Gaurd 0 0 npc = 1300 Thora_the_Barkeep 0 0 npc = 1301 Yrsa 0 0 npc = 1302 Fisherman 0 0 @@ -1384,7 +1386,7 @@ npc = 1313 Sassilik 48 50 npc = 1314 Inga 48 50 npc = 1315 Fish_monger 0 0 npc = 1316 Fur_trader 0 0 -npc = 1317 Market_Guard 48 50 +npc = 1317 Market_Gaurd 48 50 npc = 1318 Warrior 48 50 npc = 1319 Fox 0 0 npc = 1320 Bunny 2 5 @@ -1441,7 +1443,7 @@ npc = 1370 Greengrocer 0 0 npc = 1371 Prince_Brand 0 0 npc = 1372 Princess_Astrid 0 0 npc = 1373 King_Vargas 0 0 -npc = 1374 Guard 0 0 +npc = 1374 Gaurd 0 0 npc = 1375 Advisor_Ghrim 0 0 npc = 1376 Derrik 0 0 npc = 1377 Farmer 0 0 @@ -1522,14 +1524,14 @@ npc = 1451 Sleeping_Monkey 0 0 npc = 1452 Monkey_Child 0 0 npc = 1453 The_Monkey's_Uncle 0 0 npc = 1454 The_Monkey's_Aunt 0 0 -npc = 1455 Monkey_Guard 167 120 +npc = 1455 Monkey_Gaurd 167 120 npc = 1456 Monkey_Archer 86 50 npc = 1457 Monkey_Archer 86 50 npc = 1458 Monkey_Archer 86 50 -npc = 1459 Monkey_Guard 167 120 -npc = 1460 Monkey_Guard 167 120 -npc = 1461 Elder_Guard 0 0 -npc = 1462 Elder_Guard 0 0 +npc = 1459 Monkey_Gaurd 167 120 +npc = 1460 Monkey_Gaurd 167 120 +npc = 1461 Elder_Gaurd 0 0 +npc = 1462 Elder_Gaurd 0 0 npc = 1463 Monkey 3 6 npc = 1464 Monkey 3 6 npc = 1465 Monkey_Zombie 98 80 @@ -1568,17 +1570,17 @@ npc = 1495 toms_zombie_monkey_small 0 0 npc = 1496 toms_female_monkey 0 0 npc = 1497 toms_uncle_monkey 0 0 npc = 1498 toms_caretaker 0 0 -npc = 1499 toms_jail_guard 0 0 +npc = 1499 toms_jail_Gaurd 0 0 npc = 1500 toms_adviser 0 0 npc = 1501 toms_child 0 0 -npc = 1502 toms_ninja_guard 35 0 +npc = 1502 toms_ninja_Gaurd 35 0 npc = 1503 toms_monkey_archer 61 0 -npc = 1504 toms_ninja_guard_captin 35 0 +npc = 1504 toms_ninja_Gaurd_captin 35 0 npc = 1505 toms_gorilla 35 0 npc = 1506 toms_gorilla_pound 35 0 npc = 1507 toms_gorilla_beard 35 0 npc = 1508 toms_gorilla_priest 35 0 -npc = 1509 toms_gorilla_guard 35 0 +npc = 1509 toms_gorilla_Gaurd 35 0 npc = 1510 toms_acolyte 0 0 npc = 1511 toms_gnome_assassin 0 0 npc = 1512 toms_gnome_sapper 0 0 @@ -1781,13 +1783,13 @@ npc = 1702 Ghost_Banker 0 0 npc = 1703 Ghost_Sailor 0 0 npc = 1704 Ghost_Captain 0 0 npc = 1705 Ghost_Captain 0 0 -npc = 1706 Ghost_Guard 0 0 +npc = 1706 Ghost_Gaurd 0 0 npc = 1707 Ghost_(?) 0 0 npc = 1708 Ghost_(?) 0 0 npc = 1709 Johanhus_Ulsbrecht 0 0 -npc = 1710 H.A.M._Guard 12 15 -npc = 1711 H.A.M._Guard 18 20 -npc = 1712 H.A.M._Guard 22 31 +npc = 1710 H.A.M._Gaurd 12 15 +npc = 1711 H.A.M._Gaurd 18 20 +npc = 1712 H.A.M._Gaurd 22 31 npc = 1713 H.A.M._Deacon 0 0 npc = 1714 H.A.M._Member 0 0 npc = 1715 H.A.M._Member 0 0 @@ -1884,8 +1886,8 @@ npc = 1802 Slagilith 92 0 npc = 1803 Rock_pile 0 0 npc = 1804 Slagilith 0 0 -npc = 1805 Guard 0 0 -npc = 1806 Guard 0 0 +npc = 1805 Gaurd 0 0 +npc = 1806 Gaurd 0 0 npc = 1807 Hamal_the_Chieftain 0 0 npc = 1808 Ragnar 0 0 npc = 1809 Svidi 0 0 @@ -1970,10 +1972,10 @@ npc = 1875 Snake 0 0 npc = 1876 Blackjack_seller 0 0 npc = 1877 feud_bandit_boss 0 0 npc = 1878 Bandit_Leader 0 0 -npc = 1879 feud_arabian_guard_multi 0 0 +npc = 1879 feud_arabian_Gaurd_multi 0 0 npc = 1880 Bandit 56 30 npc = 1881 Bandit 56 30 -npc = 1882 feud_arabian_guard2_multi 0 0 +npc = 1882 feud_arabian_Gaurd2_multi 0 0 npc = 1883 Bandit 41 30 npc = 1884 Bandit 41 30 npc = 1885 Bandit_champion 70 50 @@ -2157,8 +2159,8 @@ npc = 2038 Grish 0 0 npc = 2039 Uglug_Nar 0 0 npc = 2040 Pilg 0 0 npc = 2041 Grug 0 0 -npc = 2042 Ogre_guard 0 0 -npc = 2043 Ogre_guard 83 80 +npc = 2042 Ogre_Gaurd 0 0 +npc = 2043 Ogre_Gaurd 83 80 npc = 2044 Zogre 44 72 npc = 2045 Zogre 44 72 npc = 2046 Zogre 44 72 @@ -2192,8 +2194,8 @@ npc = 2069 Cave_goblin_miner 11 10 npc = 2070 Cave_goblin_miner 11 10 npc = 2071 Cave_goblin_miner 11 10 npc = 2072 Cave_goblin_miner 11 10 -npc = 2073 Cave_goblin_guard 26 26 -npc = 2074 Cave_goblin_guard 24 26 +npc = 2073 Cave_goblin_Gaurd 26 26 +npc = 2074 Cave_goblin_Gaurd 24 26 npc = 2075 Cave_goblin_miner 11 10 npc = 2076 Cave_goblin_miner 11 10 npc = 2077 Cave_goblin_miner 11 10 @@ -2249,13 +2251,13 @@ npc = 2126 Trader 0 0 npc = 2127 Trade_Referee 0 0 npc = 2128 Supreme_Commander 0 0 npc = 2129 Commander_Veldaban 0 0 -npc = 2130 Black_Guard 48 40 -npc = 2131 Black_Guard 48 40 -npc = 2132 Black_Guard 48 40 -npc = 2133 Black_Guard 48 40 -npc = 2134 Black_Guard_Berserker 66 51 -npc = 2135 Black_Guard_Berserker 66 51 -npc = 2136 Black_Guard_Berserker 66 51 +npc = 2130 Black_Gaurd 48 40 +npc = 2131 Black_Gaurd 48 40 +npc = 2132 Black_Gaurd 48 40 +npc = 2133 Black_Gaurd 48 40 +npc = 2134 Black_Gaurd_Berserker 66 51 +npc = 2135 Black_Gaurd_Berserker 66 51 +npc = 2136 Black_Gaurd_Berserker 66 51 npc = 2137 Gnome_emissary 0 0 npc = 2138 Gnome_traveller 0 0 npc = 2139 Gnome_traveller 0 0 @@ -2350,12 +2352,12 @@ npc = 2227 Red_Axe_Director 0 0 npc = 2228 Commander_Veldaban 0 0 npc = 2229 Red_Axe_Cat 0 0 npc = 2230 Red_Axe_Cat 0 0 -npc = 2231 Black_Guard_Berserker 0 0 -npc = 2232 Black_Guard_Berserker 0 0 +npc = 2231 Black_Gaurd_Berserker 0 0 +npc = 2232 Black_Gaurd_Berserker 0 0 npc = 2233 Olivia 0 0 npc = 2234 Master Farmer 0 0 npc = 2235 Master Farmer 0 0 -npc = 2236 Market_Guard 20 22 +npc = 2236 Market_Gaurd 20 22 npc = 2237 Gee 0 0 npc = 2238 Donie 0 0 npc = 2239 Pig 0 0 @@ -2383,12 +2385,12 @@ npc = 2260 rcu_zammy_mage1_edge 0 0 npc = 2261 Mage_of_Zamorak 0 0 npc = 2262 Dark_mage 0 0 npc = 2263 Abyssal_leech 41 10 -npc = 2264 Abyssal_guardian 59 50 +npc = 2264 Abyssal_Gaurdian 59 50 npc = 2265 Abyssal_walker 81 95 npc = 2266 Brian_O'Richard 0 0 -npc = 2267 Rogue_Guard 0 0 -npc = 2268 Rogue_Guard 0 0 -npc = 2269 Rogue_Guard 0 0 +npc = 2267 Rogue_Gaurd 0 0 +npc = 2268 Rogue_Gaurd 0 0 +npc = 2269 Rogue_Gaurd 0 0 npc = 2270 Martin_Thwait 0 0 npc = 2271 Emerald_Benedict 0 0 npc = 2272 Spin_Blades 0 0 @@ -2698,12 +2700,12 @@ npc = 2567 Wise_Old_Man 0 0 npc = 2568 Banker 0 0 npc = 2569 Banker 0 0 npc = 2570 Banker 0 0 -npc = 2571 Market_Guard 20 22 +npc = 2571 Market_Gaurd 20 22 npc = 2572 Olivia 0 0 //------------------------Custom------------------------ npc = 2573 Watchman 253 0 -npc = 2574 Bank_guard 0 0 +npc = 2574 Bank_Gaurd 0 0 npc = 2575 Purepker895 52 0 npc = 2576 Qutiedoll 16 0 npc = 2577 1337sp34kr 63 0 @@ -2715,8 +2717,8 @@ npc = 2582 Trolley 0 0 npc = 2583 Trolley 0 0 npc = 2584 Trolley 0 0 npc = 2585 garden_trolley 1 0 -npc = 2586 Billy,_a_guard_of_Falador 0 0 -npc = 2587 Bob,_another_guard_of_Falador 0 0 +npc = 2586 Billy,_a_Gaurd_of_Falador 0 0 +npc = 2587 Bob,_another_Gaurd_of_Falador 0 0 npc = 2588 Brother_Althric 0 0 npc = 2589 PKMaster0036 87 0 npc = 2590 King_Roald 0 0 @@ -2814,12 +2816,29 @@ npc = 2677 Highwayman 0 0 npc = 2678 Goblin 0 0 npc = 2679 Goblin 0 0 npc = 2680 Goblin 0 0 +npc = 2695 Pirate 0 0 +npc = 2696 Thief 16 16 +npc = 2697 Mugger 5 5 +npc = 2698 Black_Knight 30 30 +npc = 2704 Guard 0 0 +npc = 2709 Fire_Wizard 13 25 +npc = 2710 Water_Wizard 13 25 +npc = 2711 Earth_Wizard 13 25 +npc = 2712 Air_Wizard 13 25 +npc = 2713 Malignius_Mortifer 0 0 +npc = 2745 TzTok_Jad 702 250 npc = 2881 Dagannoth_Supreme 303 255 npc = 2882 Dagannoth_Prime 303 255 npc = 2883 Dagannoth_Rex 303 255 npc = 2892 Spinolyp 76 100 npc = 2894 Spinolyp 76 100 +npc = 2950 The_Face 0 0 +npc = 3021 Tool_Leprechaun 0 0 +npc = 3108 Bert 0 0 +npc = 3109 Gaurd_Captain 0 0 npc = 3200 Chaos_Elemental 305 250 +npc = 3217 Kaylee 0 0 +npc = 3218 Tina 0 0 npc = 3727 Splatter 21 18 npc = 3728 Splatter 32 27 npc = 3729 Splatter 43 37 @@ -2887,8 +2906,6 @@ 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 +npc = 3790 Squire 0 0 [ENDOFNPCLIST] diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/Specials.java b/2006Redone Server/src/com/rebotted/game/content/combat/Specials.java index 595e43dd..6feae94a 100644 --- a/2006Redone Server/src/com/rebotted/game/content/combat/Specials.java +++ b/2006Redone Server/src/com/rebotted/game/content/combat/Specials.java @@ -107,7 +107,6 @@ public class Specials { public void activateSpecial(int weapon, Client o, int i) { int equippedWeapon = player.playerEquipment[player.playerWeapon]; - if (NpcHandler.npcs[i] == null && player.npcIndex > 0 || PlayerHandler.players[player.playerIndex] == null && player.playerIndex > 0) { return; } @@ -219,8 +218,7 @@ public class Specials { player.hitDelay = player.getCombatAssistant().getHitDelay(); player.doubleHit = SA.getDoubleHit(); } else { - if (o != null) - { + if (o != null) { o.gfx0(SA.getGfx1()); } player.startAnimation(SA.getAnim()); diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java b/2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java index 87156291..4f663aaf 100644 --- a/2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java +++ b/2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java @@ -154,9 +154,8 @@ public class Enchanting { ens.put(en.getSpell(), en); } } - } - + private boolean hasRunes(int spellID) { EnchantSpell ens = EnchantSpell.forId(spellID); if (ens.getReq3() == 0) { @@ -230,7 +229,7 @@ public class Enchanting { c.getPacketSender().sendFrame106(6); } else { c.getPacketSender().sendMessage( - "You can only enchant this jewelry using a level-" + "You can only enchant this jewelery using a level-" + enc.getELevel() + " enchantment spell!"); } diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java b/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java index 61c45d11..c4d0f439 100644 --- a/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java +++ b/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java @@ -41,21 +41,4 @@ public class MagicTeleports { player.getPlayerAssistant().startTeleport(teleport.getDestX(), teleport.getDestY(), teleport.getDestZ(), teleport.getType()); player.getPlayerAssistant().addSkillXP(teleport.getExperienceGained(), player.playerMagic); } - - - - - - - - - - - - - - - - - } \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/content/consumables/Food.java b/2006Redone Server/src/com/rebotted/game/content/consumables/Food.java index fef3c463..0887bba9 100644 --- a/2006Redone Server/src/com/rebotted/game/content/consumables/Food.java +++ b/2006Redone Server/src/com/rebotted/game/content/consumables/Food.java @@ -3,7 +3,6 @@ package com.rebotted.game.content.consumables; import java.util.HashMap; import com.rebotted.game.content.music.sound.SoundList; import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Client; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java b/2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java index 30b98548..23c05646 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java @@ -4,9 +4,9 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.content.skills.cooking.Cooking; import com.rebotted.game.content.skills.core.Fishing; import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.core.Woodcutting; import com.rebotted.game.content.skills.herblore.Herblore; import com.rebotted.game.content.skills.smithing.Smelting; +import com.rebotted.game.content.skills.woodcutting.Woodcutting; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.players.Player; diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/cooking/Cooking.java b/2006Redone Server/src/com/rebotted/game/content/skills/cooking/Cooking.java index e51191a0..f30f7038 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/cooking/Cooking.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/cooking/Cooking.java @@ -10,6 +10,7 @@ import com.rebotted.game.content.randomevents.RandomEventHandler; import com.rebotted.game.content.skills.SkillHandler; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.players.Player; +import com.rebotted.util.Misc; public class Cooking extends SkillHandler { @@ -82,8 +83,6 @@ public class Cooking extends SkillHandler { return stopBurn; } - @SuppressWarnings("unused") - // causes bugs private int getStopBurnGloves() { return stopBurnGloves; } @@ -221,10 +220,9 @@ public class Cooking extends SkillHandler { return burn_chance <= randNum; } - public static void cookItem(final Player player, final int itemId, - final int amount, final int objectId) { + public static void cookItem(final Player player, final int itemId, final int amount, final int objectId) { + CycleEventHandler.getSingleton().stopEvents(player, "cookingEvent".hashCode()); final CookingItems item = forId(itemId); - if (item != null) { setCooking(player); RandomEventHandler.addRandom(player); @@ -236,7 +234,7 @@ public class Cooking extends SkillHandler { if (objectId > 0) { player.startAnimation(objectId == 2732 ? 897 : 896); } - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + CycleEventHandler.getSingleton().addEvent("cookingEvent".hashCode(), player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { if (!player.playerIsCooking) { @@ -253,14 +251,12 @@ public class Cooking extends SkillHandler { container.stop(); return; } - - // if (c.playerEquipment[c.playerHands] != 775) - boolean burn = !getSuccess(player, 3, item.getLevelReq(), - item.getStopBurn()); - /* - * else burn = !getSuccess(c, 3, item.getLevelReq(), item - * .getStopBurnGloves()); - */ + boolean burn; + if (player.playerEquipment[GameConstants.HANDS] == 775) { + burn = !getSuccess(player, 3, item.getLevelReq(), item.getStopBurnGloves()); + } else { + burn = !getSuccess(player, 3, item.getLevelReq(), item.getStopBurn()); + } player.getItemAssistant().deleteItem(item.getRawItem(), player.getItemAssistant().getItemSlot(itemId), 1); if (!burn) { @@ -289,6 +285,10 @@ public class Cooking extends SkillHandler { container.stop(); return; } + if (player.playerIsCooking && !Misc.goodDistance(player.objectX, player.objectY, player.absX, player.absY, 2)) { + container.stop(); + return; + } if (player.doAmount > 0) { if (objectId > 0) { player.startAnimation(objectId == 2732 ? 897 : 896); diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/cooking/DairyChurn.java b/2006Redone Server/src/com/rebotted/game/content/skills/cooking/DairyChurn.java new file mode 100644 index 00000000..92697aa4 --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/content/skills/cooking/DairyChurn.java @@ -0,0 +1,114 @@ +package com.rebotted.game.content.skills.cooking; + +import java.util.HashMap; + +import com.rebotted.event.CycleEvent; +import com.rebotted.event.CycleEventContainer; +import com.rebotted.event.CycleEventHandler; +import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.players.Player; +/** + * Created by IntelliJ IDEA. User: vayken Date: 23/12/11 Time: 20:42 To change + * this template use File | Settings | File Templates. + */ +public class DairyChurn { + private static final int CHURN_ANIMATION = 894; + + public static enum ChurnData { + CREAM(59238, new int[] { 1927 }, 2130, 21, 18), BUTTER(59239, + new int[] { 1927, 2130 }, 6697, 38, 40), CHEESE(59240, + new int[] { 1927, 2130, 6697 }, 1985, 48, 64); + + private int buttonId; + private int[] used; + private int result; + private int level; + private double experience; + + public static HashMap churnItems = new HashMap(); + + public static ChurnData forId(int id) { + return churnItems.get(id); + } + + static { + for (ChurnData data : ChurnData.values()) { + churnItems.put(data.buttonId, data); + } + } + + private ChurnData(int buttonId, int[] used, int result, int level, + double experience) { + this.buttonId = buttonId; + this.used = used; + this.result = result; + this.level = level; + this.experience = experience; + } + + public int getButtonId() { + return buttonId; + } + + public int[] getUsed() { + return used; + } + + public int getResult() { + return result; + } + + public int getLevel() { + return level; + } + + public double getExperience() { + return experience; + } + + } + + public static void churnItem(final Player player, int buttonId) { + final ChurnData churnData = ChurnData.forId(buttonId); + if (churnData == null || player.getStatedInterface() != "dairyChurn") { + return; + } + if (player.playerLevel[player.playerCooking] < churnData.getLevel()) { + player.getDialogueHandler().sendStatement("You need a cooking level of " + churnData.getLevel() + " to make this."); + return; + } + + player.playerIsCooking = true; + player.getPacketSender().closeAllWindows(); + + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + for (int i = 0; i <= churnData.getUsed().length - 1; i++) { + if (!player.getItemAssistant().playerHasItem(churnData.getUsed()[i])) { + player.getDialogueHandler().sendStatement("You don't have the required items to use the churn."); + container.stop(); + return; + } + } + if (!player.playerIsCooking) { + container.stop(); + return; + } + container.setTick(5); + player.startAnimation(CHURN_ANIMATION); + player.getPacketSender().sendMessage("You make a " + ItemAssistant.getItemName(churnData.getResult()).toLowerCase() + "."); + for (int i = 0; i < churnData.getUsed().length; i++) + player.getItemAssistant().deleteItem(churnData.getUsed()[i], 1); + player.getItemAssistant().addItem(churnData.getResult(), 1); + player.getItemAssistant().addItem(1925, 1); + player.getPlayerAssistant().addSkillXP(churnData.getExperience(), player.playerCooking); + } + + @Override + public void stop() { + player.getPlayerAssistant().resetAnimation(); + } + }, 1); + } +} diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java b/2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java index d45d9fe3..ab4cf412 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java @@ -129,14 +129,12 @@ public class Mining { } } - int pickaxe = -1; - public void repeatAnimation(final Player c) { CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { @Override public void execute(CycleEventContainer container) { if (c.isMining) { - c.startAnimation(Pick_Settings[pickaxe][3]); + c.startAnimation(Pick_Settings[c.miningAxe][3]); } else { container.stop(); } @@ -151,11 +149,12 @@ public class Mining { } public void startMining(final Player player, final int objectID, final int objectX, final int objectY, final int type) { + CycleEventHandler.getSingleton().stopEvents(player, "miningEvent".hashCode()); if (player.isMining || player.miningRock) return; int miningLevel = player.playerLevel[player.playerMining]; rockData rock = rockData.getRock(objectID); - pickaxe = -1; + player.miningAxe = -1; player.turnPlayerTo(objectX, objectY); // check if the player has required level for this rock if (rock.getRequiredLevel() > miningLevel) { @@ -166,11 +165,11 @@ public class Mining { for (int i = 0; i < Pick_Settings.length; i++) { if (player.getItemAssistant().playerHasItem(Pick_Settings[i][0]) || player.playerEquipment[player.playerWeapon] == Pick_Settings[i][0]) { if (Pick_Settings[i][1] <= miningLevel) { - pickaxe = i; + player.miningAxe = i; } } } - if (pickaxe == -1) { + if (player.miningAxe == -1) { player.getPacketSender().sendMessage("You need a pickaxe to mine this rock."); return; } @@ -179,7 +178,7 @@ public class Mining { return; } - player.startAnimation(Pick_Settings[pickaxe][3]); + player.startAnimation(Pick_Settings[player.miningAxe][3]); player.isMining = true; repeatAnimation(player); player.rockX = objectX; @@ -195,7 +194,7 @@ public class Mining { player.getPacketSender().sendMessage("You swing your pick at the rock."); } - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + CycleEventHandler.getSingleton().addEvent("miningEvent".hashCode(), player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { int oreID = rock.getOre(miningLevel); @@ -237,8 +236,9 @@ public class Mining { } mineRock(rock.getRespawnTimer(), objectX, objectY, type, objectID); container.stop(); - if (rock == rockData.ESSENCE) + if (rock == rockData.ESSENCE) { startMining(player, objectID, objectX, objectY, type); + } } @Override public void stop() { @@ -250,7 +250,7 @@ public class Mining { player.miningRock = false; return; } - }, getTimer(rock, pickaxe, miningLevel)); + }, getTimer(rock, player.miningAxe, miningLevel)); } public static void resetMining(Player player) { diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/SoftClay.java b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/SoftClay.java index 8ae65993..9ffaebde 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/SoftClay.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/SoftClay.java @@ -15,38 +15,36 @@ public class SoftClay { public static final int SOFT_CLAY = 1761, CLAY = 434; - public static void makeClay(final Player c) { - if (!c.getItemAssistant().playerHasItem(CLAY)) { - c.getPacketSender().sendMessage("You need clay to do this."); + public static void makeClay(final Player player) { + if (!player.getItemAssistant().playerHasItem(CLAY)) { + player.getPacketSender().sendMessage("You need clay to do this."); return; } - CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { - @Override + player.isSpinning = true; + player.doAmount = player.getItemAssistant().getItemAmount(CLAY); + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override public void execute(CycleEventContainer container) { - int amountToSubtract = c.getItemAssistant().getItemAmount(CLAY); - int amountToAdd = amountToSubtract; - c.doAmount = amountToSubtract; - c.addAmount = amountToAdd; - if (c.getItemAssistant().playerHasItem(CLAY)) { - c.getItemAssistant().deleteItem(CLAY, c.doAmount); - c.doAmount--; - c.getItemAssistant().addItem(SOFT_CLAY, c.addAmount); - c.addAmount++; - RandomEventHandler.addRandom(c); - if (c.doAmount == 0) { - c.getPacketSender().sendMessage("You have ran out of clay to turn to soft clay."); - container.stop(); - } - if (c.disconnected) { + if (player.getItemAssistant().playerHasItem(CLAY) && player.isSpinning == true) { + player.startAnimation(896); + player.getItemAssistant().deleteItem(CLAY, 1); + player.getItemAssistant().addItem(SOFT_CLAY, 1); + player.doAmount--; + RandomEventHandler.addRandom(player); + player.getPacketSender().sendMessage("You turn the clay into soft clay."); + if (player.disconnected || player.isSpinning == false || player.doAmount == 0) { container.stop(); + return; } } } @Override public void stop() { - + player.isSpinning = false; + player.startAnimation(65535); + return; } - }, 1); + }, 3); } - -} + +} \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java index dd40f748..bd6f0d50 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java @@ -29,41 +29,36 @@ public class Spinning extends CraftingData { c.isSpinning = true; } - public static void spinItem(final Player c) { - c.getPacketSender().closeAllWindows(); + public static void spinItem(final Player player) { + player.getPacketSender().closeAllWindows(); for (int[] element : BEFORE_AFTER) { final int before = element[0]; final int after = element[1]; final int exp = element[2]; final int level = element[3]; - CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { - if (c.isSpinning) { - if (c.getItemAssistant().playerHasItem(before)) { - if (c.playerLevel[c.playerCrafting] < level) { - c.getDialogueHandler().sendStatement( + if (player.isSpinning == true) { + if (player.getItemAssistant().playerHasItem(before)) { + if (player.playerLevel[player.playerCrafting] < level) { + player.getDialogueHandler().sendStatement( "You need a crafting level of " + level + " to do this."); return; } - c.startAnimation(896); - int amount = c.getItemAssistant().getItemCount( before); - c.getItemAssistant().deleteItem(before, amount); - c.getItemAssistant().addItem(after, amount); - c.getPlayerAssistant().addSkillXP(exp * amount, c.playerCrafting); - c.getPacketSender().sendMessage("You spin the " + ItemAssistant.getItemName(before) + " into a " + ItemAssistant.getItemName(after) + "."); - c.doAmount--; + player.startAnimation(896); + player.getItemAssistant().deleteItem(before, 1); + player.getItemAssistant().addItem(after, 1); + player.getPlayerAssistant().addSkillXP(exp, player.playerCrafting); + player.getPacketSender().sendMessage("You spin the " + ItemAssistant.getItemName(before) + " into a " + ItemAssistant.getItemName(after) + "."); + player.doAmount--; } - if (!c.getItemAssistant().playerHasItem(before) - || c.isSpinning == false) { - container.stop(); - } - - if (c.doAmount <= 0) { + if (player.doAmount <= 0 || player.isSpinning == false) { container.stop(); + return; } } @@ -71,9 +66,11 @@ public class Spinning extends CraftingData { @Override public void stop() { - c.isSpinning = false; + player.isSpinning = false; + player.startAnimation(65535); + return; } - }, 2); + }, 3); } } } diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Tanning.java b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Tanning.java index 1f3dd33b..329e13d9 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Tanning.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/crafting/Tanning.java @@ -32,9 +32,8 @@ public class Tanning extends CraftingData { if (price > coins) { price = coins - coins % t.getPrice(); } - if (price == 0) { - player.getPacketSender().sendMessage( - "You do not have enough coins to tan this hide."); + if (amount > 0 && price == 0) { + player.getPacketSender().sendMessage("You do not have enough coins to tan this hide."); return; } amount = price / t.getPrice(); @@ -43,14 +42,11 @@ public class Tanning extends CraftingData { if (player.getItemAssistant().playerHasItem(995, price)) { if (player.getItemAssistant().playerHasItem(hide)) { player.getItemAssistant().deleteItem(hide, amount); - player.getItemAssistant().deleteItem(995, - player.getItemAssistant().getItemSlot(995), price); + player.getItemAssistant().deleteItem(995, player.getItemAssistant().getItemSlot(995), price); player.getItemAssistant().addItem(leather, amount); - player.getPacketSender().sendMessage( - "The tanner tans the hides for you."); + player.getPacketSender().sendMessage("The tanner tans the hides for you."); } else { - player.getPacketSender().sendMessage( - "You do not have any hides to tan."); + player.getPacketSender().sendMessage("You do not have any hides to tan."); return; } } else { diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/prayer/Ectofuntus.java b/2006Redone Server/src/com/rebotted/game/content/skills/prayer/Ectofuntus.java new file mode 100644 index 00000000..6de96126 --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/content/skills/prayer/Ectofuntus.java @@ -0,0 +1,238 @@ +package com.rebotted.game.content.skills.prayer; + +import com.rebotted.event.CycleEvent; +import com.rebotted.event.CycleEventContainer; +import com.rebotted.event.CycleEventHandler; +import com.rebotted.game.players.Player; + +/** + * Aug 31, 2017 : 5:29:02 PM + * Ectofuntus.java + * @author Andrew (Mr Extremez) + * @author Haley n (most of this ectofuntus base is hers) + */ +public class Ectofuntus { + + /** + * Data storage for ectofuntus + */ + public enum EctofuntusData { + BONES(526, 4255, 18), BIG_BONES(532, 4257, 60), BABYDRAGON_BONES(534, + 4260, 120), DRAGON_BONES(536, 4261, 288), DAGANNOTH_BONES(6729, + 6728, 500); + + int boneId, bonemealId, worshipExperience; + + EctofuntusData(int boneId, int bonemealId, int worshipExperience) { + this.boneId = boneId; + this.bonemealId = bonemealId; + this.worshipExperience = worshipExperience; + } + + public int getBoneId() { + return boneId; + } + + public int getBonemealId() { + return bonemealId; + } + + public int getWorshipExperience() { + return worshipExperience; + } + } + + /** + * Get the name of the bone used + * + * @param boneId + * @return + */ + public static String getBoneName(int boneId) { + for (EctofuntusData ectofuntus : EctofuntusData.values()) { + if (ectofuntus.boneId == boneId) { + return ectofuntus.name().replaceAll("_", " ").toLowerCase(); + } + } + return ""; + } + + /** + * Put bones in the loader + * + * @param objectId + * @param boneId + */ + public static void boneOnLoader(Player player, int objectId, int boneId) { + for (final EctofuntusData ectofuntus : EctofuntusData.values()) { + if (player.ectofuntusBoneCrusherState.equals("Loaded")) { + player.getPacketSender().sendMessage("There are already bone ready to be crushed."); + return; + } else if (player.ectofuntusBoneCrusherState.equals("Bin")) { + player.getPacketSender().sendMessage("The bin is full please empty it."); + return; + } else if (objectId == LOADER && ectofuntus.boneId == boneId && player.ectofuntusBoneCrusherState.equals("Empty")) { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + player.startAnimation(BONES); + player.getItemAssistant().deleteItem(ectofuntus.getBoneId(), 1); + player.ectofuntusBoneCrusherState = "Loaded"; + player.ectofuntusBoneUsed = ectofuntus.getBoneId(); + player.getPacketSender().sendMessage("You load the " + getBoneName(ectofuntus.getBoneId()) + " into the loader."); + container.stop(); + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 3); + } + } + } + + /** + * Grinds the bones + */ + public static void useBoneGrinder(Player player) { + if (player.ectofuntusBoneCrusherState.equals("Loaded")) { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + player.startAnimation(WHEEL); + player.ectofuntusBoneCrusherState = "Bin"; + player.getPacketSender().sendMessage("You crush the bones."); + container.stop(); + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 3); + } else if (player.ectofuntusBoneCrusherState.equals("Empty") || player.ectofuntusBoneCrusherState.equals("Bin")) { + player.getPacketSender().sendMessage("There is nothing to be crushed."); + } + } + + /** + * Emptys the bin into pots + */ + public static void emptyBin(Player player) { + for (final EctofuntusData ectofuntus : EctofuntusData.values()) { + if (player.ectofuntusBoneCrusherState.equals("Loaded") || player.ectofuntusBoneCrusherState.equals("Empty")) { + player.getPacketSender().sendMessage("There is nothing to be crushed."); + return; + } else if (!player.getItemAssistant().playerHasItem(POT)) { + player.getPacketSender().sendMessage("You need a pot to collect the bonemeal."); + return; + } else if (player.getItemAssistant().playerHasItem(POT) && ectofuntus.boneId == player.ectofuntusBoneUsed && player.ectofuntusBoneCrusherState.equals("Bin")) { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + player.getItemAssistant().addItem(ectofuntus.getBonemealId(), 1); + player.getItemAssistant().deleteItem(POT, 1); + player.ectofuntusBoneCrusherState = "Empty"; + player.ectofuntusBoneUsed = -1; + player.getPacketSender().sendMessage("You collect the bonemeal."); + container.stop(); + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 3); + } + } + } + + /** + * Handles ectofuntus + * + * @param objectId + * @param itemId + */ + public static void handleEctofuntus(Player player, int objectId) { + player.turnPlayerTo(3660, 3520); + for (final EctofuntusData ectofuntus : EctofuntusData.values()) { + if (objectId == ECTOFUNTUS && player.getItemAssistant().playerHasItem(ectofuntus.getBonemealId()) && player.getItemAssistant().playerHasItem(BUCKET_OF_SLIME)) { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + player.getItemAssistant().deleteItem(ectofuntus.getBonemealId(), 1); + player.startAnimation(WORSHIP); + player.getPlayerAssistant().addSkillXP(ectofuntus.getWorshipExperience(), player.playerPrayer); + player.getPacketSender().sendMessage("You pray to the ectofuntus."); + container.stop(); + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 3); + } + } + } + + /** + * Fills all buckets in your inventory individualy with slime + * + * @param objectId + * @param itemId + */ + public static void fillBucketWithSlime(Player player, final int objectId) { + for (int i = 0; i < SLIME.length; i++) { + if (objectId == SLIME[i]) { + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + if (player.getItemAssistant().playerHasItem(BUCKET)) { + player.getItemAssistant().deleteItem(BUCKET, 1); + player.getItemAssistant().addItem(BUCKET_OF_SLIME, 1); + player.startAnimation(BUCKET_FILL); + } else { + player.getPacketSender().sendMessage("You have ran out of buckets."); + container.stop(); + } + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + }, 3); + } + } + } + + /** + * item constants + */ + private final static int POT = 1931; + public final static int BUCKET = 1925; + private final static int BUCKET_OF_SLIME = 4286; + + /** + * object constants + */ + private final static int ECTOFUNTUS = 5282; + private final static int LOADER = 11162; + private final static int[] SLIME = { 5461, 5462 }; + + /** + * animation constants + */ + private final static int WORSHIP = 1651; + private final static int WHEEL = 1648; + private final static int BONES = 1649; + private final static int BUCKET_FILL = 895; + +} \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/core/Prayer.java b/2006Redone Server/src/com/rebotted/game/content/skills/prayer/Prayer.java similarity index 98% rename from 2006Redone Server/src/com/rebotted/game/content/skills/core/Prayer.java rename to 2006Redone Server/src/com/rebotted/game/content/skills/prayer/Prayer.java index 1fff3196..a91163e1 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/core/Prayer.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/prayer/Prayer.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills.core; +package com.rebotted.game.content.skills.prayer; import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEventContainer; diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Runecrafting.java b/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Runecrafting.java index 12c20df8..d588dc4f 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Runecrafting.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Runecrafting.java @@ -19,23 +19,37 @@ public class Runecrafting { this.c = player; } - public static void locate(Client c, int xPos, int yPos) { + public static void locate(Player c, int xPos, int yPos) { String X = ""; String Y = ""; if (c.absX >= xPos) { X = "west"; } if (c.absY > yPos) { - Y = "South"; + Y = "south"; } if (c.absX < xPos) { X = "east"; } if (c.absY <= yPos) { - Y = "North"; + Y = "north"; } c.getPacketSender().sendMessage("You need to travel " + Y + "-" + X + "."); } + + public final static int RC_DATA[][] = { + { 1438, 5527, 2478}, // air + { 1448, 5529, 2479 }, // mind + { 1444, 5531, 2480 }, // water + { 1440, 5535, 2481 }, // earth + { 1442, 5537, 2482 }, // fire + { 1446, 5533, 2483 }, // body + { 1454, 5539, 2484 }, // cosmic + { 1452, 5543, 2487 }, // chaos + { 1462, 5541, 2486 }, // nature + { 1458, 5545, 2485 }, // law + { 1456, 5547, 2488 }, // death + }; private enum Altars { AIR_ALTAR(2452, new int[] { 1438, 5527 }, new int[] { 2842, 4829 }), diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Tiaras.java b/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Tiaras.java new file mode 100644 index 00000000..287dfee0 --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/content/skills/runecrafting/Tiaras.java @@ -0,0 +1,41 @@ +package com.rebotted.game.content.skills.runecrafting; + +import com.rebotted.game.content.skills.SkillHandler; +import com.rebotted.game.players.Player; + +public class Tiaras { + + public static boolean bindTiara(Player player, int itemId, int objectId) { + for (int[] ruin : Runecrafting.RC_DATA) { + if (itemId == ruin[0] && objectId == ruin[2]) { + if (!SkillHandler.RUNECRAFTING) { + player.getPacketSender().sendMessage("This skill is currently disabled."); + return false; + } + if (player.getItemAssistant().playerHasItem(5525)) { + player.getItemAssistant().deleteItem(5525, 1); + player.getItemAssistant().addItem(ruin[1], 1); + player.getPacketSender() + .sendMessage( + "You bind the power of the talisman into the tiara."); + } + return true; + } + } + return false; + } + + public static void handleTiara(Player player, int id) { + int[][] tiaras = { { 5527, 1 }, { 5529, 2 }, { 5531, 4 }, { 5535, 8 }, + { 5537, 16 }, { 5533, 31 }, { 5539, 64 }, { 5543, 128 }, + { 5541, 256 }, { 5545, 512 }, { 5547, 1024 } }; + for (int[] t : tiaras) { + if (t[0] == id) { + player.getPacketSender().sendConfig(491, t[1]); + return; + } + } + player.getPacketSender().sendConfig(491, 0); + } + +} diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java b/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java index c1c5c50d..c020197d 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java @@ -222,11 +222,13 @@ public class Pickpocket extends SkillHandler { c.getPacketSender().sendMessage("You can't pickpocket while in combat!"); return; } + if (System.currentTimeMillis() - c.logoutDelay < 4000) { + return; + } if (!THIEVING) { c.getPacketSender().sendMessage("This skill is currently disabled."); return; } - // membersOnly(); for (final npcData n : npcData.values()) { if (npcId == n.getNpc(npcId)) { if (c.playerLevel[c.playerThieving] < n.getLevel()) { diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/BirdNest.java b/2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/BirdNest.java new file mode 100644 index 00000000..5e960c8d --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/BirdNest.java @@ -0,0 +1,87 @@ +package com.rebotted.game.content.skills.woodcutting; + +import com.rebotted.GameEngine; +import com.rebotted.game.items.ItemAssistant; +import com.rebotted.game.players.Player; +import com.rebotted.util.Misc; + +/** + * Aug 31, 2017 : 3:02:33 AM + * BirdsNest.java + * @author Andrew (Mr Extremez) + */ +public class BirdNest { + + + private final static int[][] TREE_CHANCE = { + {5312, 0, 203}, {5283, 204, 349}, {5313, 350, 492}, + {5284, 493, 599}, {5285, 600, 679}, {5286, 680, 751}, + {5314, 752, 810}, {5287, 811, 864}, {5288, 865, 907}, + {5289, 908, 939}, {5315, 940, 963}, {5290, 964, 985}, + {5316, 986, 996}, {5317, 996, 1000}, + }; + + private final static int[][] RING_CHANCE = { + {1637, 0, 398}, {1635, 399, 775}, + {1639, 776, 901}, {1641, 902, 992}, + {1643, 993, 1001} + }; + + private final static int[][] WYSON_CHANCE = { + {5318, 14, 0, 1739}, {5320, 3, 1740, 2763}, + {5322, 6, 2764, 3708}, {5324, 9, 3709, 4559}, + {5319, 11, 4560, 5368}, {5100, 2, 5369, 6166}, + {5321, 2, 6167, 6958}, {5323, 3, 6959, 7693}, + {5312, 1, 7694, 7965}, {5295, 1, 7966, 8151}, + {5313, 1, 8152, 8317}, {5314, 1, 8318, 8415}, + {5315, 1, 8416, 8481}, {5317, 1, 8482, 8491}, + {5316, 1, 8492, 8499} + }; + + public static void handleBirdNest(Player player, int itemId, int nestType) { + player.getPacketSender().sendMessage("You search the nest..."); + player.getItemAssistant().deleteItem(itemId, 1); + player.getItemAssistant().addItem(5075, 1); + switch (nestType) { + case 0: + int randomTree = Misc.random(1000); + for (int i = 0; i < TREE_CHANCE.length; i++) { + if (randomTree >= TREE_CHANCE[i][1] && randomTree <= TREE_CHANCE[i][2]) { + player.getItemAssistant().addItem(TREE_CHANCE[i][0], 1); + player.getPacketSender().sendMessage("You find a " + ItemAssistant.getItemName(TREE_CHANCE[i][0]) + "."); + } + } + break; + case 1: + int randomRing = Misc.random(1001); + for (int i = 0; i < RING_CHANCE.length; i++) { + if (randomRing >= RING_CHANCE[i][1] && randomRing <= RING_CHANCE[i][2]) { + player.getItemAssistant().addItem(RING_CHANCE[i][0], 1); + player.getPacketSender().sendMessage("You find a " + ItemAssistant.getItemName(RING_CHANCE[i][0]) + "."); + } + } + break; + case 2: + int randomWyson = Misc.random(8499); + for (int i = 0; i < WYSON_CHANCE.length; i++) { + if (randomWyson >= WYSON_CHANCE[i][2] && randomWyson <= WYSON_CHANCE[i][3]) { + player.getItemAssistant().addItem(WYSON_CHANCE[i][0], WYSON_CHANCE[i][1]); + player.getPacketSender().sendMessage("You find a " + ItemAssistant.getItemName(WYSON_CHANCE[i][0]) + "."); + } + } + break; + } + } + + public static void birdNests(Player player) { + if (Misc.random(256) == 69 && player.tutorialProgress >= 36) { + player.getPacketSender().sendMessage("A birds nest falls from the branches."); + dropNest(player); + } + } + + public static void dropNest(Player player) { + GameEngine.itemHandler.createGroundItem(player, 5070 + Misc.random(4), player.getX(), player.getY(), 1, player.getId()); + } + +} diff --git a/2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java b/2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/Woodcutting.java similarity index 94% rename from 2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java rename to 2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/Woodcutting.java index f1522261..f82f17a1 100644 --- a/2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java +++ b/2006Redone Server/src/com/rebotted/game/content/skills/woodcutting/Woodcutting.java @@ -1,6 +1,5 @@ -package com.rebotted.game.content.skills.core; +package com.rebotted.game.content.skills.woodcutting; -import com.rebotted.GameEngine; import com.rebotted.event.CycleEvent; import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventHandler; @@ -105,9 +104,9 @@ public class Woodcutting { @Override public void execute(CycleEventContainer container) { if (p.isWoodcutting) { - if ((p.axeAnimation >= 0) && (p.axeAnimation < Axe_Settings.length)) { + if ((p.woodcuttingAxe >= 0) && (p.woodcuttingAxe < Axe_Settings.length)) { try { - p.startAnimation(Axe_Settings[p.axeAnimation][3]); + p.startAnimation(Axe_Settings[p.woodcuttingAxe][3]); } catch (ArrayIndexOutOfBoundsException exception) { System.out.println("LOL this happend again: " + exception); } @@ -241,7 +240,7 @@ public class Woodcutting { return; } int wcLevel = p.playerLevel[8]; - p.axeAnimation = -1; + p.woodcuttingAxe = -1; treeData tree = treeData.getTree(objectId); p.turnPlayerTo(x, y); if (tree.getLevelReq() > wcLevel) { @@ -251,11 +250,11 @@ public class Woodcutting { for (int i = 0; i < Axe_Settings.length; i++) { if (p.getItemAssistant().playerHasItem(Axe_Settings[i][0]) || p.playerEquipment[p.playerWeapon] == Axe_Settings[i][0]) { if (Axe_Settings[i][1] <= wcLevel) { - p.axeAnimation = i; + p.woodcuttingAxe = i; } } } - if (p.axeAnimation == -1) { + if (p.woodcuttingAxe == -1) { p.getPacketSender().sendMessage("You need an axe to cut this tree."); return; } @@ -268,7 +267,7 @@ public class Woodcutting { p.getPacketSender().sendMessage("You are already woodcutting!"); return; } - p.startAnimation(Axe_Settings[p.axeAnimation][3]); + p.startAnimation(Axe_Settings[p.woodcuttingAxe][3]); p.isWoodcutting = true; p.getPacketSender().sendSound(SoundList.TREE_CUT_BEGIN, 100, 0); repeatAnimation(p); @@ -290,7 +289,7 @@ public class Woodcutting { @Override public void execute(CycleEventContainer container) { - if (p.axeAnimation <= -1) + if (p.woodcuttingAxe <= -1) { container.stop(); return; @@ -304,7 +303,7 @@ public class Woodcutting { return; } if (p.isWoodcutting) { - p.startAnimation(Axe_Settings[p.axeAnimation][3]); + p.startAnimation(Axe_Settings[p.woodcuttingAxe][3]); } if (p.getItemAssistant().freeSlots() < 1) { p.getPacketSender().sendMessage("You have ran out of inventory slots."); @@ -320,7 +319,7 @@ public class Woodcutting { p.getDialogueHandler().sendDialogues(3014, 0); } if (p.isWoodcutting) { - birdNests(p); + BirdNest.birdNests(p); } if (p.isWoodcutting && p.tutorialProgress >= 36 && p.treeSpiritSpawned == false) { RandomEventHandler.addRandom(p); @@ -344,7 +343,7 @@ public class Woodcutting { p.treeX = 0; p.treeY = 0; } - }, getTimer(tree, p.axeAnimation, wcLevel)); + }, getTimer(tree, p.woodcuttingAxe, wcLevel)); } } @@ -364,17 +363,6 @@ public class Woodcutting { } } - public static void birdNests(Player p) { - if (Misc.random(200) == 69 && p.tutorialProgress >= 36) { - p.getPacketSender().sendMessage("A birds nest falls from the branches."); - dropNest(p); - } - } - - public static void dropNest(Player p) { - GameEngine.itemHandler.createGroundItem(p, 5070 + Misc.random(4), p.getX(), p.getY(), 1, p.getId()); - } - public static boolean playerTrees(Player player, int tree) { boolean trees2 = false; for (int i = 0; i < trees.length; i++) { diff --git a/2006Redone Server/src/com/rebotted/game/content/traveling/Desert.java b/2006Redone Server/src/com/rebotted/game/content/traveling/DesertCactus.java similarity index 74% rename from 2006Redone Server/src/com/rebotted/game/content/traveling/Desert.java rename to 2006Redone Server/src/com/rebotted/game/content/traveling/DesertCactus.java index c68affa2..00bf6a9d 100644 --- a/2006Redone Server/src/com/rebotted/game/content/traveling/Desert.java +++ b/2006Redone Server/src/com/rebotted/game/content/traveling/DesertCactus.java @@ -7,7 +7,7 @@ import com.rebotted.event.CycleEventHandler; import com.rebotted.game.players.Player; import com.rebotted.util.Misc; -public class Desert { +public class DesertCactus { /** * The animation played when cutting the cactus.(SLASH) @@ -52,24 +52,6 @@ public class Desert { return cut; } - public static void showWarning(Player c) { - for (int i = 8144; i < 8195; i++) { - c.getPacketSender().sendFrame126("", i); - } - c.getPacketSender().sendFrame126("@dre@DESERT WARNING", 8144); - c.getPacketSender().sendFrame126("", 8145); - c.getPacketSender().sendFrame126("The intense heat of the desert reduces your health.", 8147); - c.getPacketSender().sendFrame126("Bring 2-5 waterskins to avoid receiving any damage.", 8148); - c.getPacketSender().sendFrame126("", 8149); - c.getPacketSender().sendFrame126("Wearing desert robes will not prevent the damage, but", 8150); - c.getPacketSender().sendFrame126("will reduce it significantly.", 8151); - c.getPacketSender().sendFrame126("", 8152); - c.getPacketSender().sendFrame126("The waterskins however need to be re-filled. Bring a", 8153); - c.getPacketSender().sendFrame126("knife and cut healthy cacti to re-fill the waterskins.", 8154); - c.getPacketSender().sendFrame126("@red@Any water vessels will evaporate, such as jug of water.", 8155); - c.getPacketSender().showInterface(8134); - } - /** * Handles fails and success attempts. * diff --git a/2006Redone Server/src/com/rebotted/game/content/traveling/DesertHeat.java b/2006Redone Server/src/com/rebotted/game/content/traveling/DesertHeat.java new file mode 100644 index 00000000..3ebc2340 --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/content/traveling/DesertHeat.java @@ -0,0 +1,138 @@ +package com.rebotted.game.content.traveling; + +import com.rebotted.GameConstants; +import com.rebotted.event.CycleEvent; +import com.rebotted.event.CycleEventContainer; +import com.rebotted.event.CycleEventHandler; +import com.rebotted.game.players.Player; +import com.rebotted.util.Misc; + +/** + * Aug 12, 2017 : 1:51:21 AM + * DesertHeat.java + * @author Andrew (Mr Extremez) + */ +public class DesertHeat { + + /** + * Damage dealt to player + */ + private static int DAMAGE = 1+Misc.random(8); + /** + * Waterskin animation + */ + private static final int ANIMATION = 829; + /** + * Time player has if they don't have protection + */ + private static int REGULAR_TIMER = 30000; + /** + * Integer to check if player has waterskins + */ + private static int waterskin = -1; + /** + * Waterskins before and after + */ + private static int[][] WATERSKINS = { + {1825, 1823},//waterskin 3 + {1827, 1825},//waterskin 2 + {1829, 1827},//waterskin 1 + {1831, 1829}//waterskin 0 + }; + /** + * Desert clothes + */ + private static final int[][] CLOTHES = { + {1833, GameConstants.CHEST}, {1835, GameConstants.LEGS}, {1837, GameConstants.FEET} + }; + + private static void doDamage(Player player) { + player.getPacketSender().sendMessage("You should get a waterskin for any traveling in the desert."); + player.handleHitMask(DAMAGE); + player.dealDamage(DAMAGE); + player.getPlayerAssistant().refreshSkill(player.playerHitpoints); + } + + private static int getClothes(Player player) { + int temp = 0; + for (int element[] : CLOTHES) { + if (player.playerEquipment[element[1]] == element[0]) { + temp += 1; + } + } + return temp; + } + + private static int getTimer(Player player) { + /** + * 10 secs extra for each desert clothing item + */ + int heat = 10000 * getClothes(player); + return REGULAR_TIMER + heat; + } + + public static void callHeat(final Player player) { + if (!player.inDesert() || player.playerLevel[player.playerHitpoints] < 0) { + return; + } + CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + if (!player.inDesert() || player.playerLevel[player.playerHitpoints] < 0 || player.disconnected) { + container.stop(); + return; + } + if (System.currentTimeMillis() - player.lastDesert > getTimer(player)) { + player.lastDesert = System.currentTimeMillis(); + if (!checkWaterskin(player)) { + doDamage(player); + } + container.stop(); + } else if (player.playerLevel[player.playerHitpoints] < 0) { + player.isDead = true; + container.stop(); + } + } + @Override + public void stop() { + + } + }, 1); + } + + public static boolean checkWaterskin(final Player player) { + for (int i = 0; i < WATERSKINS.length; i++) { + if (player.getItemAssistant().playerHasItem(WATERSKINS[i][1])) { + waterskin = i; + } + } + if (waterskin == -1) {//empty waterskin + return false; + } + if (waterskin > 0) { + player.getItemAssistant().deleteItem(WATERSKINS[waterskin][1], 1); + player.getItemAssistant().addItem(WATERSKINS[waterskin][0], 1); + player.startAnimation(ANIMATION); + return true; + } + return false; + } + + public static void showWarning(Player player) { + for (int i = 8144; i < 8195; i++) { + player.getPacketSender().sendFrame126("", i); + } + player.getPacketSender().sendFrame126("@dre@DESERT WARNING", 8144); + player.getPacketSender().sendFrame126("", 8145); + player.getPacketSender().sendFrame126("The intense heat of the desert reduces your health.", 8147); + player.getPacketSender().sendFrame126("Bring 2-5 waterskins to avoid receiving any damage.", 8148); + player.getPacketSender().sendFrame126("", 8149); + player.getPacketSender().sendFrame126("Wearing desert robes will not prevent the damage, but", 8150); + player.getPacketSender().sendFrame126("will reduce it significantly.", 8151); + player.getPacketSender().sendFrame126("", 8152); + player.getPacketSender().sendFrame126("The waterskins however need to be re-filled. Bring a", 8153); + player.getPacketSender().sendFrame126("knife and cut healthy cacti to re-fill the waterskins.", 8154); + player.getPacketSender().sendFrame126("@red@Any water vessels will evaporate, such as jug of water.", 8155); + player.getPacketSender().showInterface(8134); + } +} diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/ChatEmotes.java b/2006Redone Server/src/com/rebotted/game/dialogues/ChatEmotes.java new file mode 100644 index 00000000..2211158d --- /dev/null +++ b/2006Redone Server/src/com/rebotted/game/dialogues/ChatEmotes.java @@ -0,0 +1,50 @@ +package com.rebotted.game.dialogues; + +/** + * ChatEmotes.java + * @author Andrew (Mr Extremez) + */ + +public enum ChatEmotes { + + HAPPY_JOYFUL(588), + CALM_TALK1(589), + CALM_TALK2(590), + DEFAULT(591), + EVIL1(592), + EVIL2(593), + EVIL3(594), + ANNOYED(595), + DISTRESSED(596), + DISTRESSED2(597), + ALMOST_CRYING(598), + BOWS_HEAD_SAD(598), + DRUNK_LEFT(600), + DRUNK_RIGHT(601), + NOT_INTERESTED(602), + SLEEPY(603), + PLAIN_EVIL(604), + LAUGH1(605), + LAUGH2(606), + LAUGH3(607), + LAUGH4(608), + EVIL_LAUGH(609), + SAD(610), + MORE_SAD(611), + ON_ONE_HAND(612), + NEARLY_CRYING(613), + ANGRY1(614), + ANGRY2(615), + ANGRY3(616), + ANGRY4(617); + + private ChatEmotes(int animId) { + this.animId = animId; + } + + private int animId; + + static int getAnimId(ChatEmotes ce) { + return ce.animId; + } + } \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java index 6f3b7fac..2e282b58 100644 --- a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java +++ b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java @@ -17,11 +17,6 @@ import com.rebotted.game.players.PlayerAssistant; import com.rebotted.game.shops.Shops.Shop; import com.rebotted.util.Misc; -/** - * Anims: - * http://www.rune-server.org/runescape-development/rs2-server/tutorials/518991-pi-317-player-npc-facial-dialogue-expressions.html - */ - public class DialogueHandler { private final Player player; @@ -41,7 +36,7 @@ public class DialogueHandler { break; case 1: // was 16 - sendOption2("I would like to reset my barrows brothers.", + sendOption("I would like to reset my barrows brothers.", "I would like to fix all my barrows"); player.dialogueAction = 8; break; @@ -91,13 +86,13 @@ public class DialogueHandler { break; case 8: - sendOption2("I would like to collect some banana's for you", + sendOption("I would like to collect some banana's for you", "Never mind"); player.dialogueAction = 92; break; case 9: - sendPlayerChat1("I would like to collect some banana's for you."); + sendPlayerChat("I would like to collect some banana's for you."); player.luthas = true; player.bananas = 1; player.nextChat = 10; @@ -111,7 +106,7 @@ public class DialogueHandler { break; case 5: - sendPlayerChat1("Hello, how's it going?"); + sendPlayerChat("Hello, how's it going?"); player.nextChat = 6; break; case 6: @@ -119,19 +114,19 @@ public class DialogueHandler { player.nextChat = 7; break; case 7: - sendPlayerChat1("Very well thank you."); + sendPlayerChat("Very well thank you."); player.nextChat = 0; break; case 11: - sendOption2("Here's 5 coins you tramp.", "Leave, me alone."); + sendOption("Here's 5 coins you tramp.", "Leave, me alone."); player.dialogueAction = 90; break; case 12: if (player.getItemAssistant().playerHasItem(995, 5)) { player.getItemAssistant().deleteItem(995, 5); - sendPlayerChat1("Here's 5 coins you tramp."); + sendPlayerChat("Here's 5 coins you tramp."); player.nextChat = 0; } else { player.nextChat = 13; @@ -139,7 +134,7 @@ public class DialogueHandler { break; case 13: - sendPlayerChat1("No! Leave me alone."); + sendPlayerChat("No! Leave me alone."); player.nextChat = 0; break; @@ -151,7 +146,7 @@ public class DialogueHandler { break; case 15: - sendOption2("I would like to view your shop", + sendOption("I would like to view your shop", "I would like to fix my barrows"); player.dialogueAction = 91; break; @@ -180,12 +175,12 @@ public class DialogueHandler { case 20: if (player.getItemAssistant().playerHasItem(995, 2)) { - sendPlayerChat1("Yes I would love a beer."); + sendPlayerChat("Yes I would love a beer."); player.getItemAssistant().deleteItem(995, 2); player.getItemAssistant().addOrDropItem(1917, 1); player.nextChat = 0; } else { - sendPlayerChat1("I don't have enough coins to buy a beer."); + sendPlayerChat("I don't have enough coins to buy a beer."); player.nextChat = 0; } break; @@ -198,7 +193,7 @@ public class DialogueHandler { break; case 22: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 93; break; @@ -221,7 +216,7 @@ public class DialogueHandler { break; case 25: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPlayerAssistant().startTeleport(3308, 3108, 0, "modern"); player.getItemAssistant().deleteItem(995, 200); player.nextChat = 0; @@ -241,28 +236,28 @@ public class DialogueHandler { break; case 27: - sendOption4("Pollnivneach (North)", "Bedabin Camp", "Uzer", + sendOption("Pollnivneach (North)", "Bedabin Camp", "Uzer", "Shantay Pass"); player.dialogueAction = 700; break; case 28: - sendPlayerChat1("Pollnivneach please."); + sendPlayerChat("Pollnivneach please."); player.getPlayerAssistant().startTeleport(3350, 3004, 0, "modern"); player.nextChat = 32; break; case 29: - sendPlayerChat1("Bedabin Camp please."); + sendPlayerChat("Bedabin Camp please."); player.getPlayerAssistant().startTeleport(3180, 3043, 0, "modern"); player.nextChat = 32; break; case 30: - sendPlayerChat1("Uzer please."); + sendPlayerChat("Uzer please."); player.getPlayerAssistant().startTeleport(3469, 3111, 0, "modern"); player.nextChat = 32; break; case 31: - sendPlayerChat1("Shantay pass please."); + sendPlayerChat("Shantay pass please."); player.getPlayerAssistant().startTeleport(3308, 3108, 0, "modern"); player.nextChat = 32; break; @@ -278,16 +273,16 @@ public class DialogueHandler { break; case 34: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 67; break; case 35: - sendPlayerChat1("No thank you."); + sendPlayerChat("No thank you."); player.nextChat = 0; break; case 36: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 583; break; @@ -298,19 +293,19 @@ public class DialogueHandler { player.nextChat = 38; break; case 38: - sendOption3("Yes please.", "No thank you.", "Can I get a job here?"); + sendOption("Yes please.", "No thank you.", "Can I get a job here?"); player.dialogueAction = 68; break; case 39: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getShopAssistant().openShop(34); break; case 40: - sendPlayerChat1("No thank you."); + sendPlayerChat("No thank you."); player.nextChat = 0; break; case 41: - sendPlayerChat1("Can I get a job here?"); + sendPlayerChat("Can I get a job here?"); player.ptjob = 1; player.nextChat = 42; break; @@ -322,7 +317,7 @@ public class DialogueHandler { player.nextChat = 43; break; case 43: - sendPlayerChat1("No, I haven't."); + sendPlayerChat("No, I haven't."); player.nextChat = 44; break; case 44: @@ -333,7 +328,7 @@ public class DialogueHandler { player.nextChat = 45; break; case 45: - sendPlayerChat1("Where can I get one of those?"); + sendPlayerChat("Where can I get one of those?"); player.nextChat = 46; break; case 46: @@ -350,11 +345,11 @@ public class DialogueHandler { break; case 48: if (player.getItemAssistant().playerHasItem(1005, 1)) { - sendPlayerChat1("Yes I have one here."); + sendPlayerChat("Yes I have one here."); player.nextChat = 49; player.ptjob = 1; } else { - sendPlayerChat1("No I still need to get one."); + sendPlayerChat("No I still need to get one."); player.nextChat = 0; } break; @@ -370,12 +365,12 @@ public class DialogueHandler { player.nextChat = 51; break; case 51: - sendOption4("What's wrong?", "Can you cook me a cake?", + sendOption("What's wrong?", "Can you cook me a cake?", "You don't look very happy.", "Nice hat."); player.dialogueAction = 52; break; case 52: - sendPlayerChat1("What's wrong?"); + sendPlayerChat("What's wrong?"); player.nextChat = 54; break; case 54: @@ -395,16 +390,16 @@ public class DialogueHandler { player.nextChat = 56; break; case 56: - sendOption2("I'm always happy to help a cook in distress.", + sendOption("I'm always happy to help a cook in distress.", "I can't right now, Maybe later."); player.dialogueAction = 57; break; case 57: - sendPlayerChat1("Yes, I'll help you.");// 9157 + sendPlayerChat("Yes, I'll help you.");// 9157 player.nextChat = 60; break; case 58: - sendPlayerChat1("I can't right now, Maybe later.");// 9158 + sendPlayerChat("I can't right now, Maybe later.");// 9158 player.nextChat = 59; break; case 59: @@ -420,7 +415,7 @@ public class DialogueHandler { player.nextChat = 61; break; case 61: - sendPlayerChat1("So where do I find these ingredients then?"); + sendPlayerChat("So where do I find these ingredients then?"); player.nextChat = 62; break; case 62: @@ -441,7 +436,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 65: - sendPlayerChat1("You don't look so happy."); + sendPlayerChat("You don't look so happy."); player.nextChat = 54; break; case 66: @@ -454,10 +449,10 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(1944, 1) && player.getItemAssistant().playerHasItem(1927, 1) && player.getItemAssistant().playerHasItem(1933, 1)) { - sendPlayerChat1("Here's all the items!"); + sendPlayerChat("Here's all the items!"); player.nextChat = 68; } else { - sendPlayerChat1("I don't have all the items yet."); + sendPlayerChat("I don't have all the items yet."); player.nextChat = 59; } break; @@ -471,7 +466,7 @@ public class DialogueHandler { player.nextChat = 69; break; case 69: - sendPlayerChat1("So do I get to go to the Duke's Party?"); + sendPlayerChat("So do I get to go to the Duke's Party?"); player.nextChat = 70; break; case 70: @@ -481,7 +476,7 @@ public class DialogueHandler { player.nextChat = 72; break; case 72: - sendPlayerChat2( + sendPlayerChat( "Well, maybe one day I'll be important enough to sit on", "the Duke's table"); player.nextChat = 74; @@ -508,10 +503,10 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(434, 6) && player.getItemAssistant().playerHasItem(436, 4) && player.getItemAssistant().playerHasItem(440, 2)) { - sendPlayerChat1("Here's all the items!"); + sendPlayerChat("Here's all the items!"); player.nextChat = 86; } else { - sendPlayerChat1("I haven't found all the items yet."); + sendPlayerChat("I haven't found all the items yet."); player.nextChat = 88; } break; @@ -539,7 +534,7 @@ public class DialogueHandler { player.nextChat = 90; break; case 90: - sendOption2("Mind your own buisness, Shortstuff!", + sendOption("Mind your own buisness, Shortstuff!", "I wanted to use your anivils."); player.dialogueAction = 55; break; @@ -554,7 +549,7 @@ public class DialogueHandler { player.nextChat = 98; break; case 98: - sendPlayerChat1("Yes, I would like to use your anivil."); + sendPlayerChat("Yes, I would like to use your anivil."); player.nextChat = 93; break; case 93: @@ -565,16 +560,16 @@ public class DialogueHandler { player.nextChat = 94; break; case 94: - sendOption2("Yes i will get you the materials.", + sendOption("Yes i will get you the materials.", "No, hitting rocks is boring."); player.dialogueAction = 56; break; case 95: - sendPlayerChat1("No, hitting rocks is boring."); + sendPlayerChat("No, hitting rocks is boring."); player.nextChat = 0; break; case 96: - sendPlayerChat1("Yes i will get you the materials."); + sendPlayerChat("Yes i will get you the materials."); player.nextChat = 97; break; case 97: @@ -588,7 +583,7 @@ public class DialogueHandler { player.nextChat = 99; break; case 99: - sendPlayerChat1("Certainly, I'll be right back!"); + sendPlayerChat("Certainly, I'll be right back!"); player.doricQuest = 1; QuestAssistant.sendStages(player); player.nextChat = 0; @@ -614,7 +609,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 145: - sendPlayerChat1("Give me a quest!"); + sendPlayerChat("Give me a quest!"); player.nextChat = 146; break; case 146: @@ -623,7 +618,7 @@ public class DialogueHandler { player.nextChat = 147; break; case 147: - sendPlayerChat1("Give me a quest please."); + sendPlayerChat("Give me a quest please."); player.nextChat = 148; break; case 148: @@ -660,12 +655,12 @@ public class DialogueHandler { player.nextChat = 153; break; case 153: - sendOption2("I'll try.", + sendOption("I'll try.", "I've better things to do than chase imps."); player.dialogueAction = 125; break; case 154: - sendPlayerChat1("I'll try."); + sendPlayerChat("I'll try."); player.impsC = 1; QuestAssistant.sendStages(player); player.nextChat = 155; @@ -682,7 +677,7 @@ public class DialogueHandler { player.nextChat = 157; break; case 157: - sendPlayerChat1("I am still working on it."); + sendPlayerChat("I am still working on it."); player.nextChat = 0; break; @@ -692,7 +687,7 @@ public class DialogueHandler { player.nextChat = 159; break; case 159: - sendPlayerChat1("I've got all four beads. It was hard work I can tell you."); + sendPlayerChat("I've got all four beads. It was hard work I can tell you."); player.nextChat = 160; break; case 160: @@ -723,7 +718,7 @@ public class DialogueHandler { QuestRewards.impFinish(player); break; case 163: - sendPlayerChat1("I've better things to do than chase imps."); + sendPlayerChat("I've better things to do than chase imps."); player.nextChat = 0; break; @@ -735,12 +730,12 @@ public class DialogueHandler { player.nextChat = 165; break; case 165: - sendOption3("I'm looking for a quest.", + sendOption("I'm looking for a quest.", "I'm looking for something to kill.", "I'm lost."); player.dialogueAction = 63; break; case 166: - sendPlayerChat1("I'm looking for a quest."); + sendPlayerChat("I'm looking for a quest."); player.nextChat = 170; break; case 167: @@ -774,7 +769,7 @@ public class DialogueHandler { player.nextChat = 172; break; case 172: - sendOption3("Yes okay. I can do that.", + sendOption("Yes okay. I can do that.", "That doesn't sound a very exciting quest.", "What do you mean, The Thing?"); player.sheepShear = 1; @@ -782,15 +777,15 @@ public class DialogueHandler { player.dialogueAction = 64; break; case 173: - sendPlayerChat1("Yes okay. I can do that."); + sendPlayerChat("Yes okay. I can do that."); player.nextChat = 177; break; case 174: - sendPlayerChat1("Nevermind, that doesn't sound a very exciting quest."); + sendPlayerChat("Nevermind, that doesn't sound a very exciting quest."); player.nextChat = 0; break; case 175: - sendPlayerChat1("What do you mean, The Thing?"); + sendPlayerChat("What do you mean, The Thing?"); player.nextChat = 176; break; case 176: @@ -804,11 +799,11 @@ public class DialogueHandler { player.nextChat = 178; break; case 178: - sendOption2("Of course!", "Err. No, I don't know acctually."); + sendOption("Of course!", "Err. No, I don't know acctually."); player.dialogueAction = 65; break; case 179: - sendPlayerChat1("Of course!"); + sendPlayerChat("Of course!"); player.nextChat = 180; break; case 180: @@ -817,12 +812,12 @@ public class DialogueHandler { player.nextChat = 181; break; case 181: - sendOption2("I'm something of an expert actually!", + sendOption("I'm something of an expert actually!", "I don't know how to spin wool, sorry.."); player.dialogueAction = 66; break; case 182: - sendPlayerChat1("I'm something of an expert actually!"); + sendPlayerChat("I'm something of an expert actually!"); player.nextChat = 183; break; case 183: @@ -842,7 +837,7 @@ public class DialogueHandler { break; case 186: if (player.getItemAssistant().playerHasItem(1759, 20)) { - sendPlayerChat1("I have some."); + sendPlayerChat("I have some."); player.getItemAssistant().deleteItem(1759, 20); player.nextChat = 187; } else { @@ -855,7 +850,7 @@ public class DialogueHandler { player.nextChat = 188; break; case 188: - sendPlayerChat1("That's the last of them."); + sendPlayerChat("That's the last of them."); player.nextChat = 189; break; case 189: @@ -872,13 +867,13 @@ public class DialogueHandler { player.nextChat = 191; break; case 191: - sendOption3("Have you any quests for me?", + sendOption("Have you any quests for me?", "Where can I find money?", "Can I have an anti dragon shield please?"); player.dialogueAction = 124; break; case 192:// 9158 - sendPlayerChat1("Where can I find money?"); + sendPlayerChat("Where can I find money?"); player.nextChat = 193; break; case 193: @@ -914,11 +909,11 @@ public class DialogueHandler { player.nextChat = 197; break; case 197: - sendOption2("Sure, no problem.", "Not right now."); + sendOption("Sure, no problem.", "Not right now."); player.dialogueAction = 140; break; case 198:// 9157 - sendPlayerChat1("Sure, no problem."); + sendPlayerChat("Sure, no problem."); player.nextChat = 199; break; case 199: @@ -929,7 +924,7 @@ public class DialogueHandler { player.nextChat = 200; break; case 200: - itemMessage1("The duke hands you an @blu@air talisman@blu@.", 1438, + itemMessage("The duke hands you an @blu@air talisman@blu@.", 1438, 1); player.getItemAssistant().addOrDropItem(1438, 1); player.runeMist = 1; @@ -943,7 +938,7 @@ public class DialogueHandler { player.nextChat = 202; break; case 202: - sendOption3("Nothing thanks, I'm just looking around.", + sendOption("Nothing thanks, I'm just looking around.", "What are you doing down here?", "I'm looking for the head wizard."); player.dialogueAction = 126; @@ -954,7 +949,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 204: // 9169 - sendPlayerChat1("I'm looking for the head wizard."); + sendPlayerChat("I'm looking for the head wizard."); player.nextChat = 205; break; case 205: @@ -964,7 +959,7 @@ public class DialogueHandler { player.nextChat = 207; break; case 207: - sendPlayerChat3( + sendPlayerChat( "The Duke of Lumbridge sent me to find him.", "I have this weird talisman he found. He said", "the head wizard would be very interested in it."); @@ -979,16 +974,16 @@ public class DialogueHandler { player.nextChat = 209; break; case 209: - sendOption2("Ok, here you are.", + sendOption("Ok, here you are.", "No, I'll only give it to the head wizard."); player.dialogueAction = 127; break; case 210:// 9157 - sendPlayerChat1("Ok, here you are."); + sendPlayerChat("Ok, here you are."); player.nextChat = 212; break; case 212: - itemMessage1("You hand the Talisman to the wizard.", 1438, 1); + itemMessage("You hand the Talisman to the wizard.", 1438, 1); player.getItemAssistant().deleteItem(1438, 1); player.runeMist = 2; player.nextChat = 213; @@ -1053,11 +1048,11 @@ public class DialogueHandler { player.nextChat = 222; break; case 222: - sendOption2("Yes, certainly.", "No, I'm busy."); + sendOption("Yes, certainly.", "No, I'm busy."); player.dialogueAction = 128; break; case 223:// 9157 - sendPlayerChat1("Yes, certainly."); + sendPlayerChat("Yes, certainly."); player.nextChat = 224; break; case 224: @@ -1086,7 +1081,7 @@ public class DialogueHandler { player.nextChat = 227; break; case 227: - itemMessage1("The head wizard gives you a package.", 290, 1); + itemMessage("The head wizard gives you a package.", 290, 1); player.getItemAssistant().addOrDropItem(290, 1); player.nextChat = 228; break; @@ -1101,18 +1096,18 @@ public class DialogueHandler { player.nextChat = 230; break; case 230: - sendOption3("Yes please!", + sendOption("Yes please!", "Oh, it's a rune shop. No thank you, then.", "I have been sent here with a package for you."); player.dialogueAction = 129; break; case 231: // 9167 - sendPlayerChat1("Yes please!"); + sendPlayerChat("Yes please!"); player.getShopAssistant().openShop(52); player.nextChat = 0; break; case 232: // 9169 - sendPlayerChat2("I have been sent here with a package for you.", + sendPlayerChat("I have been sent here with a package for you.", "It's for the head wizard at the Wizards Tower."); player.nextChat = 233; break; @@ -1125,7 +1120,7 @@ public class DialogueHandler { player.nextChat = 234; break; case 234: - itemMessage1("You hand Aubury the research package.", 290, 1); + itemMessage("You hand Aubury the research package.", 290, 1); player.getItemAssistant().deleteItem(290, 1); player.runeMist = 3; player.nextChat = 235; @@ -1139,7 +1134,7 @@ public class DialogueHandler { player.nextChat = 236; break; case 236: - itemMessage1("Aubury gives you the research notes.", 290, 1); + itemMessage("Aubury gives you the research notes.", 290, 1); player.getItemAssistant().addOrDropItem(290, 1); player.nextChat = 237; break; @@ -1164,7 +1159,7 @@ public class DialogueHandler { player.nextChat = 240; break; case 240: - sendPlayerChat2("Yes, I have.", + sendPlayerChat("Yes, I have.", "He gave me some research notes to pass on to you."); player.nextChat = 241; break; @@ -1173,7 +1168,7 @@ public class DialogueHandler { player.nextChat = 242; break; case 242: - sendPlayerChat1("Sure. I have them here."); + sendPlayerChat("Sure. I have them here."); player.nextChat = 243; break; case 243: @@ -1249,7 +1244,7 @@ public class DialogueHandler { player.nextChat = 254; break; case 254: - sendPlayerChat1("I'm still not sure how I fit into this little story of yours."); + sendPlayerChat("I'm still not sure how I fit into this little story of yours."); player.nextChat = 255; break; case 255: @@ -1316,7 +1311,7 @@ public class DialogueHandler { player.nextChat = 264; break; case 264: - sendPlayerChat2("So, only you and Aubury know the teleport spell", + sendPlayerChat("So, only you and Aubury know the teleport spell", "to the rune essence?"); player.nextChat = 266; break; @@ -1337,7 +1332,7 @@ public class DialogueHandler { player.nextChat = 268; break; case 268: - itemMessage1( + itemMessage( "You give the research notes to Sedridor. He gives you an air talisman.", 290, 1); player.getItemAssistant().deleteItem(290, 1); @@ -1346,7 +1341,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 269: - sendPlayerChat1("Hello, are you ok?"); + sendPlayerChat("Hello, are you ok?"); player.nextChat = 270; break; case 270: @@ -1360,7 +1355,7 @@ public class DialogueHandler { player.nextChat = 272; break; case 272: - sendPlayerChat1("Lost whom?"); + sendPlayerChat("Lost whom?"); player.nextChat = 273; break; case 273: @@ -1369,7 +1364,7 @@ public class DialogueHandler { player.nextChat = 274; break; case 274: - sendPlayerChat1("Who's Fluffs?"); + sendPlayerChat("Who's Fluffs?"); player.nextChat = 275; break; case 275: @@ -1381,18 +1376,18 @@ public class DialogueHandler { player.nextChat = 276; break; case 276: - sendOption3( + sendOption( "Well, I suppose I could though I'd need more details.", "What's in it for me?", "Sorry, I'm too busy to play per rescue."); player.dialogueAction = 60; break; case 277: // 9167 - sendPlayerChat1("Well, I suppose I could though I'd need more details."); + sendPlayerChat("Well, I suppose I could though I'd need more details."); player.nextChat = 280; break; case 278: // 9169 - sendPlayerChat1("Sorry I'm too busy to play per rescue."); + sendPlayerChat("Sorry I'm too busy to play per rescue."); player.nextChat = 0; break; case 279: // 9168 @@ -1416,7 +1411,7 @@ public class DialogueHandler { player.nextChat = 282; break; case 282: - sendPlayerChat2("The marketplace? Which one would that be?", + sendPlayerChat("The marketplace? Which one would that be?", "It would help to know what they get up to, as well."); player.nextChat = 283; break; @@ -1435,14 +1430,14 @@ public class DialogueHandler { player.nextChat = 285; break; case 285: - sendPlayerChat2( + sendPlayerChat( "I'll see what I can do. Two young lads in Varrock.", "I hope that there's no school trip passing when I arrive."); QuestAssistant.sendStages(player); player.nextChat = 0; break; case 286: - sendPlayerChat1("Hello there, I've been looking for you."); + sendPlayerChat("Hello there, I've been looking for you."); player.nextChat = 287; break; case 287: @@ -1451,7 +1446,7 @@ public class DialogueHandler { player.nextChat = 288; break; case 288: - sendPlayerChat2("What?", + sendPlayerChat("What?", "I'm trying to help your mum find some cat called Fluffs."); player.nextChat = 289; break; @@ -1464,7 +1459,7 @@ public class DialogueHandler { player.nextChat = 290; break; case 290: - sendPlayerChat2("Where is this secret hideout?", + sendPlayerChat("Where is this secret hideout?", "I really need to find that cat for you mum."); player.nextChat = 291; break; @@ -1475,7 +1470,7 @@ public class DialogueHandler { player.nextChat = 292; break; case 292: - sendPlayerChat2("From my limited knowledge of law,", + sendPlayerChat("From my limited knowledge of law,", "they are not usually involved in manhunts for children."); player.nextChat = 293; break; @@ -1488,7 +1483,7 @@ public class DialogueHandler { player.nextChat = 294; break; case 294: - sendOption3( + sendOption( "Tell me sonny, or I will inform you are a pair of criminals.", "What will make you tell me?", "Well never mind, it's Fluffs loss."); @@ -1500,11 +1495,11 @@ public class DialogueHandler { player.nextChat = 0; break; case 296: // 9169 - sendPlayerChat1("Well never mind, it's Fluffs loss."); + sendPlayerChat("Well never mind, it's Fluffs loss."); player.nextChat = 0; break; case 297: // 9168 - sendPlayerChat1("What will make you tell me?"); + sendPlayerChat("What will make you tell me?"); player.nextChat = 298; break; case 298: @@ -1513,7 +1508,7 @@ public class DialogueHandler { player.nextChat = 299; break; case 299: - sendPlayerChat1("How much?"); + sendPlayerChat("How much?"); player.nextChat = 300; break; case 300: @@ -1534,7 +1529,7 @@ public class DialogueHandler { player.nextChat = 304; break; case 304: - sendPlayerChat2("100 coins!", + sendPlayerChat("100 coins!", "What sort of expensive things do you need that badly?"); player.nextChat = 305; break; @@ -1545,7 +1540,7 @@ public class DialogueHandler { player.nextChat = 306; break; case 306: - sendPlayerChat2("Why should I pay you then", + sendPlayerChat("Why should I pay you then", "can you answer that as easily?"); player.nextChat = 307; break; @@ -1557,11 +1552,11 @@ public class DialogueHandler { player.nextChat = 308; break; case 308: - sendOption2("I'm not paying you a thing.", "Okay then, I'll pay."); + sendOption("I'm not paying you a thing.", "Okay then, I'll pay."); player.dialogueAction = 62; break; case 309: // 9158 - sendPlayerChat2("Okay then. I'll pay, but I'll want you,", + sendPlayerChat("Okay then. I'll pay, but I'll want you,", "to tell your mother what a nice person I am."); player.nextChat = 310; break; @@ -1570,7 +1565,7 @@ public class DialogueHandler { player.nextChat = 311; break; case 311: - sendPlayerChat2( + sendPlayerChat( "I'll want you to tell your mother what a nice person I am", "so she rewards me for this search."); player.nextChat = 312; @@ -1591,7 +1586,7 @@ public class DialogueHandler { } break; case 314: - sendPlayerChat1("There you go, now where did you see Fluffs?"); + sendPlayerChat("There you go, now where did you see Fluffs?"); player.nextChat = 315; break; case 315: @@ -1604,7 +1599,7 @@ public class DialogueHandler { player.nextChat = 316; break; case 316: - sendPlayerChat1("Anything else?"); + sendPlayerChat("Anything else?"); player.nextChat = 317; break; case 317: @@ -1621,7 +1616,7 @@ public class DialogueHandler { player.nextChat = 319; break; case 319: - sendPlayerChat1("Progress atleast."); + sendPlayerChat("Progress atleast."); player.nextChat = 321; break; case 321: @@ -1633,15 +1628,15 @@ public class DialogueHandler { player.nextChat = 323; break; case 323: - sendPlayerChat1("Progress atleast."); + sendPlayerChat("Progress atleast."); player.nextChat = 324; break; case 324: - sendStatement2("Fluffs devours the dougle sardine greedly.", "Then she mews at you again."); + sendStatement("Fluffs devours the dougle sardine greedly.", "Then she mews at you again."); player.nextChat = 0; break; case 325: - sendStatement2("Fluffs seems afraid to leave.", "In the lumberyard below you can hear the mewing."); + sendStatement("Fluffs seems afraid to leave.", "In the lumberyard below you can hear the mewing."); player.nextChat = 0; break; case 326: @@ -1653,7 +1648,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 328: - sendPlayerChat2( + sendPlayerChat( "Hello Gertrude. Fluffs has run off with her lost kittens.", "That I have now returned to her."); player.nextChat = 329; @@ -1678,7 +1673,7 @@ public class DialogueHandler { player.nextChat = 332; break; case 332: - sendPlayerChat1("That's okay, I like to do my bit."); + sendPlayerChat("That's okay, I like to do my bit."); player.nextChat = 333; break; case 333: @@ -1690,7 +1685,7 @@ public class DialogueHandler { player.nextChat = 334; break; case 334: - sendPlayerChat1("Well, if one needs a home."); + sendPlayerChat("Well, if one needs a home."); player.nextChat = 335; break; case 335: @@ -1716,7 +1711,7 @@ public class DialogueHandler { player.nextChat = 339; break; case 339: - sendOption4("Who's Saradomin?", "Nice place you've got here", + sendOption("Who's Saradomin?", "Nice place you've got here", "I'm looking for a quest", "Never Mind"); player.dialogueAction = 32; break; @@ -1726,11 +1721,11 @@ public class DialogueHandler { player.nextChat = 0; break; case 341:// 9179 - sendPlayerChat1("Nice place you've got here."); + sendPlayerChat("Nice place you've got here."); player.nextChat = 0; break; case 342:// 9180 - sendPlayerChat1("I'm looking for a quest."); + sendPlayerChat("I'm looking for a quest."); player.nextChat = 343; break; case 343: @@ -1739,7 +1734,7 @@ public class DialogueHandler { player.nextChat = 344; break; case 344: - sendPlayerChat1("Okay, let me help then."); + sendPlayerChat("Okay, let me help then."); player.nextChat = 345; break; case 345: @@ -1769,7 +1764,7 @@ public class DialogueHandler { player.nextChat = 349; break; case 349: - sendPlayerChat1("Likewise."); + sendPlayerChat("Likewise."); player.nextChat = 350; break; case 350: @@ -1782,7 +1777,7 @@ public class DialogueHandler { QuestAssistant.sendStages(player); break; case 351: - sendPlayerChat1("I will thanks."); + sendPlayerChat("I will thanks."); player.nextChat = 0; break; case 352: @@ -1791,21 +1786,21 @@ public class DialogueHandler { player.nextChat = 353; break; case 353: - sendOption4("Well, that's friendly", + sendOption("Well, that's friendly", "Father Aereck sent me to talk to you", "I've come to repossess your house", "Never Mind"); player.dialogueAction = 33; break; case 354:// 9178 - sendPlayerChat1("Well, that's friendly."); + sendPlayerChat("Well, that's friendly."); player.nextChat = 0; break; case 355: // 9180 - sendPlayerChat1("I've come to repossess your house."); + sendPlayerChat("I've come to repossess your house."); player.nextChat = 0; break; case 356: // 9179 - sendPlayerChat1("Father Aereck sent me to talk to you."); + sendPlayerChat("Father Aereck sent me to talk to you."); player.nextChat = 357; break; case 357: @@ -1815,12 +1810,12 @@ public class DialogueHandler { player.nextChat = 358; break; case 358: - sendOption2("A ghost is haunting his graveyard", + sendOption("A ghost is haunting his graveyard", "You mean he gets into lots of problems?"); player.dialogueAction = 34; break; case 359: // 9158 - sendPlayerChat1("You mean he gets into lots of problems?"); + sendPlayerChat("You mean he gets into lots of problems?"); player.nextChat = 360; break; case 360: @@ -1829,7 +1824,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 361: - sendPlayerChat1("A ghost is haunting his graveyard"); + sendPlayerChat("A ghost is haunting his graveyard"); player.nextChat = 362; break; case 362: @@ -1884,11 +1879,11 @@ public class DialogueHandler { player.nextChat = 370; break; case 370: - sendPlayerChat1("Thank you. I'll give it a try."); + sendPlayerChat("Thank you. I'll give it a try."); player.nextChat = 0; break; case 371: - sendPlayerChat1("Hello ghost how are you?"); + sendPlayerChat("Hello ghost how are you?"); player.nextChat = 372; break; case 372: @@ -1897,7 +1892,7 @@ public class DialogueHandler { player.nextChat = 373; break; case 373: - sendPlayerChat1("What's the problem?"); + sendPlayerChat("What's the problem?"); player.nextChat = 374; break; case 374: @@ -1906,21 +1901,21 @@ public class DialogueHandler { player.nextChat = 375; break; case 375: - sendOption4("Yep. Now, tell me what the problem is.", + sendOption("Yep. Now, tell me what the problem is.", "No, you sound like you're speaking nonsense to me.", "Wow, this amulet works!", "Never mind."); player.dialogueAction = 35; break; case 376: // 9179 - sendPlayerChat1("No, you sound like you're speaking nonsense to me."); + sendPlayerChat("No, you sound like you're speaking nonsense to me."); player.nextChat = 0; break; case 377: // 9180 - sendPlayerChat1("Wow, this amulet works!"); + sendPlayerChat("Wow, this amulet works!"); player.nextChat = 0; break; case 378: // 9178 - sendPlayerChat1("Yep. Now, tell me what the problem is."); + sendPlayerChat("Yep. Now, tell me what the problem is."); player.nextChat = 379; break; case 379: @@ -1930,11 +1925,11 @@ public class DialogueHandler { player.nextChat = 380; break; case 380: - sendPlayerChat1("Okay, okay, I can understand you."); + sendPlayerChat("Okay, okay, I can understand you."); player.nextChat = 381; break; case 381: - sendPlayerChat1("But have you any idea why you're doomed to be a ghost?"); + sendPlayerChat("But have you any idea why you're doomed to be a ghost?"); player.nextChat = 382; break; case 382: @@ -1943,7 +1938,7 @@ public class DialogueHandler { player.nextChat = 383; break; case 383: - sendPlayerChat2( + sendPlayerChat( "I've been told that a certain task needs to be completed", "before you can rest in peace."); player.nextChat = 384; @@ -1954,7 +1949,7 @@ public class DialogueHandler { player.nextChat = 385; break; case 385: - sendPlayerChat1("What? I can see your head perfectly fine. Well, see through it at least."); + sendPlayerChat("What? I can see your head perfectly fine. Well, see through it at least."); player.nextChat = 386; break; case 386: @@ -1972,7 +1967,7 @@ public class DialogueHandler { player.restGhost = 3; break; case 388: - sendPlayerChat1("Okay. I'll try to get your skull back for you so you can rest in peace."); + sendPlayerChat("Okay. I'll try to get your skull back for you so you can rest in peace."); player.nextChat = 0; break; case 389: @@ -1985,11 +1980,11 @@ public class DialogueHandler { player.nextChat = 391; break; case 391: - sendOption2("What's wrong?", "Yes it's your hair"); + sendOption("What's wrong?", "Yes it's your hair"); player.dialogueAction = 118; break; case 392: // 9158 - sendPlayerChat1("Haha yes it's your hair, get a haircut loser!"); + sendPlayerChat("Haha yes it's your hair, get a haircut loser!"); player.nextChat = 393; break; case 393: @@ -1997,7 +1992,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 394: // 9157 - sendPlayerChat1("What's wrong?"); + sendPlayerChat("What's wrong?"); player.nextChat = 396; break; case 396: @@ -2012,7 +2007,7 @@ public class DialogueHandler { player.nextChat = 398; break; case 398: - sendOption2("Why don't you just meet in person?", + sendOption("Why don't you just meet in person?", "I might have to go now..."); player.dialogueAction = 119; break; @@ -2033,19 +2028,19 @@ public class DialogueHandler { player.nextChat = 403; break; case 403: - sendOption2("Yes I'll do so now", "Is that my fish calling me?"); + sendOption("Yes I'll do so now", "Is that my fish calling me?"); player.dialogueAction = 120; break; case 404:// 9158 - sendPlayerChat1("I might have to go now..."); + sendPlayerChat("I might have to go now..."); player.nextChat = 0; break; case 405: - sendPlayerChat1("Why not just meet her in person?"); + sendPlayerChat("Why not just meet her in person?"); player.nextChat = 406; break; case 406: - sendPlayerChat1("Yeah anything to help a lover in need."); + sendPlayerChat("Yeah anything to help a lover in need."); player.nextChat = 407; break; case 407: @@ -2070,7 +2065,7 @@ public class DialogueHandler { player.nextChat = 411; break; case 411: - sendPlayerChat2("Wait, what's happening? Romeo has", + sendPlayerChat("Wait, what's happening? Romeo has", "been looking all over for you."); player.nextChat = 412; break; @@ -2097,7 +2092,7 @@ public class DialogueHandler { player.nextChat = 416; break; case 416: - sendPlayerChat1("Yes she gave me this let---"); + sendPlayerChat("Yes she gave me this let---"); player.nextChat = 417; break; case 417: @@ -2132,7 +2127,7 @@ public class DialogueHandler { player.nextChat = 422; break; case 422: - sendPlayerChat2("She gave me a letter to give you..", + sendPlayerChat("She gave me a letter to give you..", "Which I don't have on me"); player.nextChat = 423; break; @@ -2155,7 +2150,7 @@ public class DialogueHandler { player.nextChat = 427; break; case 427: - sendPlayerChat2("Are you just going to give up??", + sendPlayerChat("Are you just going to give up??", "What about love?"); player.nextChat = 428; break; @@ -2185,7 +2180,7 @@ public class DialogueHandler { player.nextChat = 433; break; case 433: - sendPlayerChat1("Wait how did you know?"); + sendPlayerChat("Wait how did you know?"); player.nextChat = 434; break; case 434: @@ -2200,16 +2195,16 @@ public class DialogueHandler { player.nextChat = 436; break; case 436: - sendOption2("So what do I need to do?", + sendOption("So what do I need to do?", "I don't think I'm up for this anymore..."); player.dialogueAction = 121; break; case 437:// 9158 - sendPlayerChat1("This is just getting more twisted...I have to go..."); + sendPlayerChat("This is just getting more twisted...I have to go..."); player.nextChat = 0; break; case 438:// 9157 - sendPlayerChat1("So what do you need me to do?"); + sendPlayerChat("So what do you need me to do?"); player.nextChat = 439; break; case 439: @@ -2239,7 +2234,7 @@ public class DialogueHandler { player.nextChat = 444; break; case 444: - sendPlayerChat2("She wants me to bring her 3 items", + sendPlayerChat("She wants me to bring her 3 items", "Then she'll speak to me"); player.nextChat = 445; break; @@ -2249,7 +2244,7 @@ public class DialogueHandler { player.nextChat = 446; break; case 446: - sendPlayerChat1("Oh just a rat's"); + sendPlayerChat("Oh just a rat's"); player.nextChat = 448; break; case 447: @@ -2279,7 +2274,7 @@ public class DialogueHandler { player.nextChat = 453; break; case 453: - sendPlayerChat1("Wait but will Juliet actually drink it?"); + sendPlayerChat("Wait but will Juliet actually drink it?"); player.nextChat = 454; break; case 454: @@ -2293,7 +2288,7 @@ public class DialogueHandler { player.nextChat = 456; break; case 456: - sendPlayerChat1("Wow she's polite..."); + sendPlayerChat("Wow she's polite..."); player.nextChat = 0; break; case 457: @@ -2301,7 +2296,7 @@ public class DialogueHandler { player.nextChat = 458; break; case 458: - sendPlayerChat1("Here take this."); + sendPlayerChat("Here take this."); player.nextChat = 459; break; case 459: @@ -2314,7 +2309,7 @@ public class DialogueHandler { player.nextChat = 461; break; case 461: - sendPlayerChat1("Now tell me why you've been ignoring Romeo!"); + sendPlayerChat("Now tell me why you've been ignoring Romeo!"); player.nextChat = 462; break; case 462: @@ -2329,7 +2324,7 @@ public class DialogueHandler { player.nextChat = 464; break; case 464: - sendPlayerChat1("Wait was that it?"); + sendPlayerChat("Wait was that it?"); player.nextChat = 465; break; case 465: @@ -2343,7 +2338,7 @@ public class DialogueHandler { player.nextChat = 467; break; case 467: - sendPlayerChat1("I should get going"); + sendPlayerChat("I should get going"); player.nextChat = 0; player.romeojuliet++; break; @@ -2358,12 +2353,12 @@ public class DialogueHandler { player.nextChat = 470; break; case 470: - sendPlayerChat2("She's been planning a surprise", + sendPlayerChat("She's been planning a surprise", "birthday party for you all along"); player.nextChat = 471; break; case 471: - sendPlayerChat2("Her mother was in on in too. They", + sendPlayerChat("Her mother was in on in too. They", "just wanted to show that they're always there for you"); player.nextChat = 472; break; @@ -2392,7 +2387,7 @@ public class DialogueHandler { } break; case 211: - sendOption2("Quest.", "Buy Wool."); + sendOption("Quest.", "Buy Wool."); player.dialogueAction = 168; break; case 476: @@ -2402,7 +2397,7 @@ public class DialogueHandler { player.nextChat = 477; break; case 477: - sendPlayerChat1("Wha-"); + sendPlayerChat("Wha-"); player.nextChat = 478; break; case 478: @@ -2412,16 +2407,16 @@ public class DialogueHandler { player.nextChat = 479; break; case 479: - sendOption2("Why don't you save your own village?", + sendOption("Why don't you save your own village?", "What terrible threat?"); player.dialogueAction = 29; break; case 480:// 9157 - sendPlayerChat1("Why don't you save your own village?"); + sendPlayerChat("Why don't you save your own village?"); player.nextChat = 0; break; case 481:// 9158 - sendPlayerChat1("What terrible threat?"); + sendPlayerChat("What terrible threat?"); player.nextChat = 482; break; case 482: @@ -2432,7 +2427,7 @@ public class DialogueHandler { player.nextChat = 483; break; case 483: - sendPlayerChat2("The vampire showed up all of a sudden", + sendPlayerChat("The vampire showed up all of a sudden", "and started attacking your village?"); player.nextChat = 484; break; @@ -2457,11 +2452,11 @@ public class DialogueHandler { player.nextChat = 487; break; case 487: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 30; break; case 488:// 9157 - sendPlayerChat1("Yes I'll help you."); + sendPlayerChat("Yes I'll help you."); player.vampSlayer = 1; QuestAssistant.sendStages(player); player.nextChat = 489; @@ -2474,7 +2469,7 @@ public class DialogueHandler { player.nextChat = 490; break; case 490: - sendPlayerChat1("Who is this harlow?"); + sendPlayerChat("Who is this harlow?"); player.nextChat = 491; break; case 491: @@ -2485,7 +2480,7 @@ public class DialogueHandler { player.nextChat = 492; break; case 492: - sendPlayerChat2("You already know a vampire slayer?", + sendPlayerChat("You already know a vampire slayer?", "What do you need me for?"); player.nextChat = 493; break; @@ -2498,7 +2493,7 @@ public class DialogueHandler { player.nextChat = 494; break; case 494: - sendPlayerChat1("Where can i find this Harlow?"); + sendPlayerChat("Where can i find this Harlow?"); player.nextChat = 495; break; case 495: @@ -2511,7 +2506,7 @@ public class DialogueHandler { player.nextChat = 496; break; case 496: - sendPlayerChat1("Okay, I'll go find Harlow."); + sendPlayerChat("Okay, I'll go find Harlow."); player.nextChat = 497; break; case 497: @@ -2525,22 +2520,22 @@ public class DialogueHandler { player.nextChat = 499; break; case 499: - sendOption4("No you've had enough.", + sendOption("No you've had enough.", "Are you Dr Harlow, the famous vampire slayer?", "You couldn't possibly be Dr Harlow, your just a drunk.", "Never mind."); player.dialogueAction = 31; break; case 500:// 9178 - sendPlayerChat1("No you've had enough."); + sendPlayerChat("No you've had enough."); player.nextChat = 0; break; case 501:// 9180 - sendPlayerChat1("You couldn't possibly be Dr Harlow, your just a drunk."); + sendPlayerChat("You couldn't possibly be Dr Harlow, your just a drunk."); player.nextChat = 0; break; case 502:// 9179 - sendPlayerChat1("Are you Dr harlow, the famous vampire Slayer?"); + sendPlayerChat("Are you Dr harlow, the famous vampire Slayer?"); player.nextChat = 503; break; case 503: @@ -2549,7 +2544,7 @@ public class DialogueHandler { player.nextChat = 504; break; case 504: - sendPlayerChat2("Your friend Morgan sent me.", + sendPlayerChat("Your friend Morgan sent me.", "He said you could teach me how to slay a vampire."); player.nextChat = 505; break; @@ -2565,7 +2560,7 @@ public class DialogueHandler { player.nextChat = 507; break; case 507: - sendPlayerChat2( + sendPlayerChat( "Your good friend Morgan is living in fear of a vampire,", "and all you think about is beer?"); player.nextChat = 508; @@ -2577,11 +2572,11 @@ public class DialogueHandler { break; case 509: if (player.getItemAssistant().playerHasItem(1917, 1)) { - sendPlayerChat1("Okay, here you go."); + sendPlayerChat("Okay, here you go."); player.getItemAssistant().deleteItem(1917, 1); player.nextChat = 510; } else { - sendPlayerChat1("Okay, let me get one."); + sendPlayerChat("Okay, let me get one."); player.nextChat = 0; } break; @@ -2591,7 +2586,7 @@ public class DialogueHandler { player.nextChat = 511; break; case 511: - sendPlayerChat1("So tell me how to kill vampires then."); + sendPlayerChat("So tell me how to kill vampires then."); player.nextChat = 512; break; case 512: @@ -2652,7 +2647,7 @@ public class DialogueHandler { player.nextChat = 521; break; case 521: - sendPlayerChat2("Okay, So those are the supplies I need", + sendPlayerChat("Okay, So those are the supplies I need", "but how do I acctually kill him?"); player.nextChat = 522; break; @@ -2698,11 +2693,11 @@ public class DialogueHandler { player.nextChat = 528; break; case 528: - sendPlayerChat1("Thank you!"); + sendPlayerChat("Thank you!"); player.nextChat = 0; break; case 529: - sendPlayerChat1("I killed the vampire!"); + sendPlayerChat("I killed the vampire!"); player.nextChat = 530; break; case 530: @@ -2712,11 +2707,11 @@ public class DialogueHandler { break; case 531: if (player.getItemAssistant().playerHasItem(1549)) { - sendPlayerChat1("I still need to kill the vampire."); + sendPlayerChat("I still need to kill the vampire."); player.nextChat = 0; } else if (!player.getItemAssistant().playerHasItem(1549) && player.vampSlayer == 3) { player.getItemAssistant().addOrDropItem(1549, 1); - sendPlayerChat1("Thank you, I will be more careful next time."); + sendPlayerChat("Thank you, I will be more careful next time."); player.nextChat = 0; } break; @@ -2726,12 +2721,12 @@ public class DialogueHandler { player.nextChat = 533; break; case 533: - sendOption2("I am in search of a quest", + sendOption("I am in search of a quest", "I've heard that you are a witch"); player.dialogueAction = 74; break; case 534: // 9157 - sendPlayerChat1("I am in search of a quest."); + sendPlayerChat("I am in search of a quest."); player.nextChat = 536; break; case 535: // 9158 @@ -2744,21 +2739,21 @@ public class DialogueHandler { player.nextChat = 537; break; case 537: - sendOption3("Yes help me become one with my darker side.", + sendOption("Yes help me become one with my darker side.", "No I have my principles and hour.", "What, you mean improve my magic?"); player.dialogueAction = 58; break; case 538:// 9168 - sendPlayerChat1("No I have my principles and hour."); + sendPlayerChat("No I have my principles and hour."); player.nextChat = 0; break; case 539:// 9169 - sendPlayerChat1("What, you mean improve my magic?"); + sendPlayerChat("What, you mean improve my magic?"); player.nextChat = 0; break; case 540:// 9167 - sendPlayerChat1("Yes help me become one with my darker side."); + sendPlayerChat("Yes help me become one with my darker side."); player.nextChat = 541; break; case 541: @@ -2773,7 +2768,7 @@ public class DialogueHandler { player.nextChat = 543; break; case 543: - sendPlayerChat1("What do I need?"); + sendPlayerChat("What do I need?"); player.nextChat = 544; break; case 544: @@ -2782,7 +2777,7 @@ public class DialogueHandler { player.nextChat = 545; break; case 545: - sendPlayerChat1("Great, I'll go and get them."); + sendPlayerChat("Great, I'll go and get them."); player.witchspot = 1; QuestAssistant.sendStages(player); player.nextChat = 0; @@ -2796,21 +2791,21 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(221, 1) && player.getItemAssistant().playerHasItem(300, 1) && player.getItemAssistant().playerHasItem(2146, 1)) { - sendPlayerChat1("Yes I have everything!"); + sendPlayerChat("Yes I have everything!"); player.witchspot = 2; player.nextChat = 550; } else { - sendPlayerChat1("No I still need to keep looking."); + sendPlayerChat("No I still need to keep looking."); player.nextChat = 0; } break; case 548: - sendPlayerChat1("Yes I have everything!"); + sendPlayerChat("Yes I have everything!"); player.witchspot = 2; player.nextChat = 550; break; case 549: - sendPlayerChat1("No I still need to keep looking."); + sendPlayerChat("No I still need to keep looking."); player.nextChat = 0; break; case 550: @@ -2822,7 +2817,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(221, 1) && player.getItemAssistant().playerHasItem(300, 1) && player.getItemAssistant().playerHasItem(2146, 1)) { - sendStatement4( + sendStatement( "You pass the ingredients to Hetty and she puts them all into her,", "Cauldron.", "Hetty closes her eyes and begins to chant.", @@ -2832,12 +2827,12 @@ public class DialogueHandler { player.getItemAssistant().deleteItem(2146, 1); player.nextChat = 552; } else { - sendPlayerChat1("I don't have them anymore."); + sendPlayerChat("I don't have them anymore."); player.nextChat = 0; } break; case 552: - sendPlayerChat1("Well, is it ready?"); + sendPlayerChat("Well, is it ready?"); player.nextChat = 553; break; case 553: @@ -2850,11 +2845,11 @@ public class DialogueHandler { player.nextChat = 555; break; case 555: - sendOption2("I'm in search of treasure.", "Arr!"); + sendOption("I'm in search of treasure.", "Arr!"); player.dialogueAction = 71; break; case 556:// 9157 - sendPlayerChat1("I'm in search of treasure."); + sendPlayerChat("I'm in search of treasure."); player.nextChat = 557; break; case 557: @@ -2865,7 +2860,7 @@ public class DialogueHandler { player.nextChat = 558; break; case 558: - sendPlayerChat1("What sort of price?"); + sendPlayerChat("What sort of price?"); player.nextChat = 559; break; case 559: @@ -2882,15 +2877,15 @@ public class DialogueHandler { player.nextChat = 561; break; case 561: - sendOption2("Ok, I will bring you some rum.", "Not right now."); + sendOption("Ok, I will bring you some rum.", "Not right now."); player.dialogueAction = 72; break; case 562:// 9158 - sendPlayerChat1("Not right now."); + sendPlayerChat("Not right now."); player.nextChat = 0; break; case 563:// 9157 - sendPlayerChat1("Ok, I will bring you some rum."); + sendPlayerChat("Ok, I will bring you some rum."); player.nextChat = 564; break; case 564: @@ -2900,7 +2895,7 @@ public class DialogueHandler { player.nextChat = 565; break; case 565: - sendPlayerChat1("What do you mean?"); + sendPlayerChat("What do you mean?"); player.nextChat = 566; break; case 566: @@ -2912,7 +2907,7 @@ public class DialogueHandler { player.nextChat = 567; break; case 567: - sendPlayerChat1("Well, I'll give it a shot."); + sendPlayerChat("Well, I'll give it a shot."); player.nextChat = 568; break; case 568: @@ -2928,7 +2923,7 @@ public class DialogueHandler { sendNpcChat1("Arr, Matey!", player.talkingNpc, "Redbeard Frank"); player.nextChat = 570; } else { - sendPlayerChat1("No I still need to get some rum."); + sendPlayerChat("No I still need to get some rum."); player.nextChat = 0; } break; @@ -2939,10 +2934,10 @@ public class DialogueHandler { break; case 571: if (player.getItemAssistant().playerHasItem(431, 1)) { - sendPlayerChat1("Yes I've got some."); + sendPlayerChat("Yes I've got some."); player.nextChat = 572; } else { - sendPlayerChat1("No I still need to get it."); + sendPlayerChat("No I still need to get it."); player.nextChat = 0; } break; @@ -2973,7 +2968,7 @@ public class DialogueHandler { player.getItemAssistant().addOrDropItem(432, 1); player.nextChat = 576; } else { - sendPlayerChat1("I still need to get some rum."); + sendPlayerChat("I still need to get some rum."); player.nextChat = 0; } break; @@ -2990,17 +2985,17 @@ public class DialogueHandler { player.nextChat = 578; break; case 578: - sendOption2("Ok thanks, I'll go and get it.", + sendOption("Ok thanks, I'll go and get it.", "So why didn't you ever get it?"); player.dialogueAction = 73; break; case 579:// 9157 - sendPlayerChat1("Ok thanks, I'll go and get it."); + sendPlayerChat("Ok thanks, I'll go and get it."); player.pirateTreasure = 3; player.nextChat = 0; break; case 580:// 9158 - sendPlayerChat1("So why didn't you ever get it?"); + sendPlayerChat("So why didn't you ever get it?"); player.nextChat = 581; break; case 581: @@ -3009,13 +3004,13 @@ public class DialogueHandler { player.nextChat = 0; break; case 582:// 9158 - sendPlayerChat1("Arr!"); + sendPlayerChat("Arr!"); player.nextChat = 0; break; case 583: if (!player.getItemAssistant().playerHasItem(995, 30)) { - sendPlayerChat1("Sorry, I don't have enough coins for that."); + sendPlayerChat("Sorry, I don't have enough coins for that."); player.nextChat = 0; return; } else { @@ -3032,23 +3027,23 @@ public class DialogueHandler { break; case 585: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 68; break; case 586: - sendPlayerChat1("No thank you."); + sendPlayerChat("No thank you."); player.nextChat = 0; break; case 587: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 588; break; case 588: if (!player.getItemAssistant().playerHasItem(995, 30)) { - sendPlayerChat1("Sorry, I don't have enough coins for that."); + sendPlayerChat("Sorry, I don't have enough coins for that."); player.nextChat = 0; return; } else { @@ -3076,17 +3071,17 @@ public class DialogueHandler { break; case 592: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 130; break; case 593: - sendPlayerChat1("No thank you."); + sendPlayerChat("No thank you."); player.nextChat = 0; break; case 594: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 595; break; @@ -3144,7 +3139,7 @@ public class DialogueHandler { player.nextChat = 85; break; case 604: - sendOption2("Void Knight Armor", "Experience Shop"); + sendOption("Void Knight Armor", "Experience Shop"); player.dialogueAction = 85; break; case 605: @@ -3160,11 +3155,11 @@ public class DialogueHandler { player.nextChat = 611; break; case 611: - sendOption2("And how is life as a squire?", "Wouldn't you prefer to be a squire for me?"); + sendOption("And how is life as a squire?", "Wouldn't you prefer to be a squire for me?"); player.dialogueAction = 181;/*DIALOGUE ACTION*/ break; case 612: - sendPlayerChat1("And how is life as a squire?"); + sendPlayerChat("And how is life as a squire?"); player.nextChat = 613; break; case 613: @@ -3172,11 +3167,11 @@ public class DialogueHandler { player.nextChat = 614; break; case 614: - sendOption3("Do you know where you lost it?", "I can make a new sword if you like...", "Is he angry?"); + sendOption("Do you know where you lost it?", "I can make a new sword if you like...", "Is he angry?"); player.dialogueAction = 182;/*DIALOGUE ACTION*/ break; case 615: - sendPlayerChat1("I can make a new sword if you like..."); + sendPlayerChat("I can make a new sword if you like..."); player.nextChat = 616; break; case 616: @@ -3192,11 +3187,11 @@ public class DialogueHandler { player.nextChat = 619; break; case 619: - sendOption2("So would these dwarves make another one?", "Well I hope you find it soon."); + sendOption("So would these dwarves make another one?", "Well I hope you find it soon."); player.dialogueAction = 183;/*DIALOGUE ACTION*/ break; case 620: - sendPlayerChat1("So would these dwarves make another one?"); + sendPlayerChat("So would these dwarves make another one?"); player.nextChat = 621; break; case 621: @@ -3208,11 +3203,11 @@ public class DialogueHandler { player.nextChat = 623; break; case 623: - sendOption2("Ok, I'll give it a go.", "No, I've got lots of mining work to do."); + sendOption("Ok, I'll give it a go.", "No, I've got lots of mining work to do."); player.dialogueAction = 184;/*DIALOGUE ACTION*/ break; case 624: - sendPlayerChat1("Ok, I'll give it a go."); + sendPlayerChat("Ok, I'll give it a go."); player.knightS = 1; QuestAssistant.sendStages(player); player.nextChat = 625; @@ -3228,7 +3223,7 @@ public class DialogueHandler { player.nextChat = 627; break; case 627: - sendOption3("Do you have anything to trade?", "What do you do?", "What do you know about the Imcando Dwarves?"); + sendOption("Do you have anything to trade?", "What do you do?", "What do you know about the Imcando Dwarves?"); player.dialogueAction = 185;/*DIALOGUE ACTION*/ break; case 628: @@ -3241,7 +3236,7 @@ public class DialogueHandler { break; case 630: if (player.knightS == 1) { - sendPlayerChat1("What do you know about the Imcando dwarves?"); + sendPlayerChat("What do you know about the Imcando dwarves?"); player.nextChat = 631; } else { sendNpcChat1("You are not on this part of the Knights Sword quest.", player.talkingNpc, "Reldo"); @@ -3261,7 +3256,7 @@ public class DialogueHandler { player.nextChat = 634; break; case 634: - sendPlayerChat1("So are there any Imcando left at all?"); + sendPlayerChat("So are there any Imcando left at all?"); player.nextChat = 635; break; case 635: @@ -3286,7 +3281,7 @@ public class DialogueHandler { case 640: if (player.knightS == 2) { if (player.getItemAssistant().playerHasItem(2325, 1)) { - sendPlayerChat1("Hello. Are you an Imcando dwarf?"); + sendPlayerChat("Hello. Are you an Imcando dwarf?"); player.nextChat = 641; } else if (!player.getItemAssistant().playerHasItem(2325, 1)) { sendNpcChat1("I am not interested in talking to you right now.", player.talkingNpc, "Thurgo"); @@ -3301,7 +3296,7 @@ public class DialogueHandler { break; case 642: - sendPlayerChat1("Would you like some redberry pie?"); + sendPlayerChat("Would you like some redberry pie?"); player.nextChat = 644; break; @@ -3316,11 +3311,11 @@ public class DialogueHandler { break; case 646: if (player.getItemAssistant().playerHasItem(2325, 1)) { - sendStatement2("You hand over the pie. Thurgo eats the pie. Thurgo pats his", "stomach."); + sendStatement("You hand over the pie. Thurgo eats the pie. Thurgo pats his", "stomach."); player.getItemAssistant().deleteItem(2325, 1); player.nextChat = 647; } else { - sendPlayerChat1("I don't have pie anymore."); + sendPlayerChat("I don't have pie anymore."); player.nextChat = 0; } break; @@ -3330,7 +3325,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 648: - sendPlayerChat1("Can you make a special sword?"); + sendPlayerChat("Can you make a special sword?"); player.nextChat = 649; break; case 649: @@ -3338,7 +3333,7 @@ public class DialogueHandler { player.nextChat = 650; break; case 650: - sendPlayerChat4("I need you to make a sword for one of Falador's", "knights. He had one which was passed down through five", "generations, but his squire lost it. So we need an", "identical one to replace it."); + sendPlayerChat("I need you to make a sword for one of Falador's", "knights. He had one which was passed down through five", "generations, but his squire lost it. So we need an", "identical one to replace it."); player.nextChat = 651; break; case 651: @@ -3350,7 +3345,7 @@ public class DialogueHandler { player.nextChat = 653; break; case 653: - sendPlayerChat1("I'll go ask his squire and see if I can find one."); + sendPlayerChat("I'll go ask his squire and see if I can find one."); player.knightS = 4; player.nextChat = 0; break; @@ -3360,7 +3355,7 @@ public class DialogueHandler { player.nextChat = 655; break; case 655: - sendPlayerChat2("I've found an Imcando dwarf but he needs a picture of", "the sword before he can make it."); + sendPlayerChat("I've found an Imcando dwarf but he needs a picture of", "the sword before he can make it."); player.nextChat = 656; break; case 656: @@ -3368,7 +3363,7 @@ public class DialogueHandler { player.nextChat = 657; break; case 657: - sendPlayerChat1("Ok, I'll try and get that then."); + sendPlayerChat("Ok, I'll try and get that then."); player.nextChat = 658; break; case 658: @@ -3383,7 +3378,7 @@ public class DialogueHandler { break; // back to thurgo case 660: - sendPlayerChat2("I have found a picture of the sword I would like you to", "make."); + sendPlayerChat("I have found a picture of the sword I would like you to", "make."); player.nextChat = 661; break; case 661: @@ -3417,7 +3412,7 @@ public class DialogueHandler { player.nextChat = 668; break; case 668: - sendPlayerChat1("Ok. I'll go and find them then."); + sendPlayerChat("Ok. I'll go and find them then."); player.nextChat = 0; break; @@ -3428,16 +3423,16 @@ public class DialogueHandler { break; case 670: if (player.getItemAssistant().playerHasItem(2351, 2) && player.getItemAssistant().playerHasItem(668, 1)) { - sendPlayerChat1("I have them right here."); + sendPlayerChat("I have them right here."); player.nextChat = 671; } else { - sendPlayerChat1("I'm still working on it."); + sendPlayerChat("I'm still working on it."); player.nextChat = 0; } break; case 671: if (player.knightS == 7 || player.knightS == 8) { - sendStatement2("You give the blurite ore and two bars to Thurgo. Thurgo starts", "to make the sword. Thurgo hands you a sword."); + sendStatement("You give the blurite ore and two bars to Thurgo. Thurgo starts", "to make the sword. Thurgo hands you a sword."); player.getItemAssistant().deleteItem(2351, 1); player.getItemAssistant().deleteItem(2351, 1); player.getItemAssistant().deleteItem(668, 1); @@ -3450,7 +3445,7 @@ public class DialogueHandler { } break; case 672: - sendPlayerChat1("Thank you very much!"); + sendPlayerChat("Thank you very much!"); player.nextChat = 673; break; @@ -3470,7 +3465,7 @@ public class DialogueHandler { break; case 675: - sendPlayerChat2("I've seemed to have lost my sword.", "Can you make me another?"); + sendPlayerChat("I've seemed to have lost my sword.", "Can you make me another?"); player.nextChat = 676; break; @@ -3500,7 +3495,7 @@ public class DialogueHandler { player.nextChat = 680; break; case 680: - sendPlayerChat1("Thank you very much!"); + sendPlayerChat("Thank you very much!"); player.nextChat = 681; break; case 681: @@ -3510,7 +3505,7 @@ public class DialogueHandler { // back to squire case 682: - sendPlayerChat1("I have retrieved your sword for you."); + sendPlayerChat("I have retrieved your sword for you."); player.nextChat = 683; break; case 683: @@ -3530,7 +3525,7 @@ public class DialogueHandler { //Shield of Arrav Quest line: //Reldo case 690: - sendOption3("Do you have anything to trade?", "What do you do?", "I'm in search of a quest."); + sendOption("Do you have anything to trade?", "What do you do?", "I'm in search of a quest."); player.dialogueAction = 186;/*DIALOGUE ACTION*/ break; case 691: @@ -3550,20 +3545,20 @@ public class DialogueHandler { player.nextChat = 695; break; case 695: - sendPlayerChat1("Thank you."); + sendPlayerChat("Thank you."); player.shieldArrav = 1; player.nextChat = 0; break; //bookcase case 696: - sendPlayerChat2("Aha! 'The Shield of Arrav'! Exactly what I was looking", "for"); + sendPlayerChat("Aha! 'The Shield of Arrav'! Exactly what I was looking", "for"); player.getItemAssistant().addOrDropItem(757, 1); player.shieldArrav = 2; player.nextChat = 0; break; //reldo case 697: - sendPlayerChat2("Ok. I've read the book. Do you know where I can find", "the Phoenix Gang?"); + sendPlayerChat("Ok. I've read the book. Do you know where I can find", "the Phoenix Gang?"); player.nextChat = 698; break; case 698: @@ -3576,12 +3571,12 @@ public class DialogueHandler { player.nextChat = 700; break; case 700: - sendPlayerChat1("Thanks, I'll try that!"); + sendPlayerChat("Thanks, I'll try that!"); player.nextChat = 0; break; //Baraek case 701: - sendPlayerChat1("Can you tell me where I can find the Phoenix Gang?"); + sendPlayerChat("Can you tell me where I can find the Phoenix Gang?"); player.nextChat = 702; break; case 702: @@ -3589,7 +3584,7 @@ public class DialogueHandler { player.nextChat = 703; break; case 703: - sendPlayerChat1("So DO you know where they are?"); + sendPlayerChat("So DO you know where they are?"); player.nextChat = 704; break; case 704: @@ -3606,10 +3601,10 @@ public class DialogueHandler { break; case 707: if (player.getItemAssistant().playerHasItem(995, 20)) { - sendPlayerChat1("Okay. Have 20 gold coins."); + sendPlayerChat("Okay. Have 20 gold coins."); player.nextChat = 708; } else { - sendPlayerChat1("I'm a little short on gold coins right now.."); + sendPlayerChat("I'm a little short on gold coins right now.."); player.nextChat = 0; } break; @@ -3630,12 +3625,12 @@ public class DialogueHandler { player.nextChat = 710; break; case 710: - sendPlayerChat1("Thanks!"); + sendPlayerChat("Thanks!"); player.nextChat = 0; break; //Straven case 711: - sendPlayerChat1("What's through that door?"); + sendPlayerChat("What's through that door?"); player.nextChat = 712; break; case 712: @@ -3648,7 +3643,7 @@ public class DialogueHandler { player.nextChat = 713; break; case 713: - sendPlayerChat1("I know who you are!"); + sendPlayerChat("I know who you are!"); player.nextChat = 714; break; case 714: @@ -3664,7 +3659,7 @@ public class DialogueHandler { player.nextChat = 717; break; case 717: - sendPlayerChat2("This is the headquarters of the Phoenix Gang, the most", "powerful crime syndicate this city has ever seen!"); + sendPlayerChat("This is the headquarters of the Phoenix Gang, the most", "powerful crime syndicate this city has ever seen!"); player.nextChat = 718; break; case 718: @@ -3676,7 +3671,7 @@ public class DialogueHandler { player.nextChat = 720; break; case 720: - sendPlayerChat1("I'd like to offer you my services."); + sendPlayerChat("I'd like to offer you my services."); player.nextChat = 721; break; case 721: @@ -3696,7 +3691,7 @@ public class DialogueHandler { player.nextChat = 725; break; case 725: - sendPlayerChat1("How would I go about doing that?"); + sendPlayerChat("How would I go about doing that?"); player.nextChat = 726; break; case 726: @@ -3720,7 +3715,7 @@ public class DialogueHandler { player.nextChat = 729; break; case 729: - sendPlayerChat1("Ok, I'll get right on it."); + sendPlayerChat("Ok, I'll get right on it."); player.shieldArrav = 5; player.nextChat = 0; break; @@ -3732,7 +3727,7 @@ public class DialogueHandler { player.nextChat = 731; break; case 731: - sendPlayerChat1("I haven't managed to find the report yet..."); + sendPlayerChat("I haven't managed to find the report yet..."); player.nextChat = 732; break; case 732: @@ -3743,7 +3738,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 733: - sendPlayerChat1("I have the intelligence report!"); + sendPlayerChat("I have the intelligence report!"); player.nextChat = 734; break; case 734: @@ -3764,7 +3759,7 @@ public class DialogueHandler { player.nextChat = 738; break; case 738: - sendPlayerChat1("Nice to meet you."); + sendPlayerChat("Nice to meet you."); player.nextChat = 739; break; case 739: @@ -3772,7 +3767,7 @@ public class DialogueHandler { player.nextChat = 740; break; case 740: - sendItemChat1("", "Straven hands you a key", 759, 150); + sendItemChat(759, 150, "", "Straven hands you a key"); player.getItemAssistant().addOrDropItem(759, 1); player.shieldArrav = 6; player.nextChat = 0; @@ -3793,7 +3788,7 @@ public class DialogueHandler { sendStatement("It's empty."); break; case 744: - sendItemChat1("", "You find half of a shield, which you take.", 763, 150); + sendItemChat(763, 150, "", "You find half of a shield, which you take."); player.getItemAssistant().addOrDropItem(763, 1); player.nextChat = 0; break; @@ -3806,7 +3801,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 746: - sendPlayerChat2("I have half the shield of Arrav here. Can I get a", "reward?"); + sendPlayerChat("I have half the shield of Arrav here. Can I get a", "reward?"); player.nextChat = 747; break; case 747: @@ -3817,7 +3812,7 @@ public class DialogueHandler { player.nextChat = 748; break; case 748: - sendPlayerChat1("Well, I'm here to claim it."); + sendPlayerChat("Well, I'm here to claim it."); player.nextChat = 749; break; case 749: @@ -3826,9 +3821,9 @@ public class DialogueHandler { break; case 750: if (player.getItemAssistant().playerHasItem(763)) - sendItemChat1("", "The curator peers at the shield", 763, 150); + sendItemChat(763, 150, "", "The curator peers at the shield"); else if (player.getItemAssistant().playerHasItem(765)) - sendItemChat1("", "The curator peers at the shield", 765, 150); + sendItemChat(763, 150, "", "The curator peers at the shield"); player.nextChat = 751; break; case 751: @@ -3848,31 +3843,31 @@ public class DialogueHandler { break; case 754: if (player.getItemAssistant().playerHasItem(763)) { - sendItemChat1("", "You hand over the shield half.", 763, 150); + sendItemChat(763, 150, "", "You hand over the shield half."); player.getItemAssistant().deleteItem(763, 1); } else if (player.getItemAssistant().playerHasItem(765)) { - sendItemChat1("", "You hand over the shield half.", 765, 150); + sendItemChat(765, 150, "", "You hand over the shield half."); player.getItemAssistant().deleteItem(765, 1); } player.nextChat = 755; break; case 755: - sendItemChat1("", "The curator writes out a certificate.", 769, 150); + sendItemChat(769, 150, "", "The curator writes out a certificate."); player.getItemAssistant().addOrDropItem(769, 1); player.shieldArrav = 7; player.nextChat = 0; break; //King Roald case 756: - sendPlayerChat1("Greetings, your majesty."); + sendPlayerChat("Greetings, your majesty."); player.nextChat = 757; break; case 757: - sendPlayerChat2("Your majesty, I have come to claim the reward for the", "return of the Shield of Arrav."); + sendPlayerChat("Your majesty, I have come to claim the reward for the", "return of the Shield of Arrav."); player.nextChat = 758; break; case 758: - sendItemChat1("", "You show the certificate to the king.", 769, 150); + sendItemChat(769, 150, "", "You show the certificate to the king."); player.nextChat = 759; break; case 759: @@ -3888,7 +3883,7 @@ public class DialogueHandler { player.nextChat = 761; break; case 761: - sendItemChat1("", "You hand over the certificate, The king gives you 1,200gp.", 995, 150); + sendItemChat(995, 150, "", "You hand over the certificate, The king gives you 1,200gp."); player.nextChat = 762; break; case 762: @@ -3899,7 +3894,7 @@ public class DialogueHandler { case 908: - sendPlayerChat1("Hello there " + NpcHandler.getNpcListName(player.talkingNpc) + "!"); + sendPlayerChat("Hello there " + NpcHandler.getNpcListName(player.talkingNpc) + "!"); player.nextChat = 909; break; case 909: @@ -3908,7 +3903,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 910: - sendOption3("Pet", "Catch Rat", "Shoo Away"); + sendOption("Pet", "Catch Rat", "Shoo Away"); player.dialogueAction = 222; player.nextChat = 0; break; @@ -3944,7 +3939,7 @@ public class DialogueHandler { player.nextChat = 1001; break; case 1001: - sendOption4("Yes, can I work out front now?", + sendOption("Yes, can I work out front now?", "Yes, are you going to pay me yet?", "No it's a complete mess", "Can I buy something please?"); player.dialogueAction = 69; @@ -3954,16 +3949,16 @@ public class DialogueHandler { player.nextChat = 0; break; case 1003:// 9180 - sendPlayerChat1("No it's a complete mess"); + sendPlayerChat("No it's a complete mess"); player.nextChat = 0; break; case 1004:// 9181 - sendPlayerChat1("Can I buy something please?"); + sendPlayerChat("Can I buy something please?"); player.getShopAssistant().openShop(34); player.nextChat = 0; break; case 1005:// 9178 - sendPlayerChat1("Yes can I work out front now?"); + sendPlayerChat("Yes can I work out front now?"); player.nextChat = 1006; break; case 1006: @@ -3976,11 +3971,11 @@ public class DialogueHandler { player.nextChat = 1008; break; case 1008: - sendOption2("Yes", "No"); + sendOption("Yes", "No"); player.dialogueAction = 70; break; case 1009: - sendPlayerChat1("Yes."); + sendPlayerChat("Yes."); player.getPlayerAssistant().movePlayer(1761, 5192, 0); player.nextChat = 0; break; @@ -4007,12 +4002,12 @@ public class DialogueHandler { break; case 1014:// bank open done, this place done, settings done, to do // delete pin - sendOption3("I'd like to access my bank account, please.", "I'd like to check my my P I N settings.", "What is this place?"); + sendOption("I'd like to access my bank account, please.", "I'd like to check my my P I N settings.", "What is this place?"); player.dialogueAction = 251; break; /** What is this place? **/ case 1015: - sendPlayerChat1("What is this place?"); + sendPlayerChat("What is this place?"); player.nextChat = 1016; break; case 1016: @@ -4030,7 +4025,7 @@ public class DialogueHandler { break; case 1018: - sendPlayerChat1("Can I come through this gate?"); + sendPlayerChat("Can I come through this gate?"); player.nextChat = 1019; break; case 1019: @@ -4044,12 +4039,12 @@ public class DialogueHandler { } break; case 1020: - sendOption3("Okay, I'll pay.", "Who does my money go to?", + sendOption("Okay, I'll pay.", "Who does my money go to?", "No thanks, I'll walk around."); player.dialogueAction = 502; break; case 1022: - sendPlayerChat1("Who does my money go to?"); + sendPlayerChat("Who does my money go to?"); player.nextChat = 1023; break; case 1023: @@ -4058,20 +4053,20 @@ public class DialogueHandler { player.nextChat = 1024; break; case 1024: - sendOption2("Okay, I'll pay.", "No thanks, I'll walk around."); + sendOption("Okay, I'll pay.", "No thanks, I'll walk around."); player.dialogueAction = 508; break; case 1025: - sendPlayerChat1("No thanks, I'll walk around."); + sendPlayerChat("No thanks, I'll walk around."); player.nextChat = 0; break; case 1026: if (!player.getItemAssistant().playerHasItem(995, 10)) { - sendPlayerChat1("I haven't got that much."); + sendPlayerChat("I haven't got that much."); player.nextChat = 0; } else { - sendPlayerChat1("Okay, I'll pay."); + sendPlayerChat("Okay, I'll pay."); player.nextChat = 1027; } break; @@ -4090,7 +4085,7 @@ public class DialogueHandler { */ case 1033: - sendOption2( + sendOption( "I would like to skip tutorial Island and go to Mainland", "I would like to continue"); player.dialogueAction = 132; @@ -4116,14 +4111,14 @@ public class DialogueHandler { player.nextChat = 1037; break; case 1037: - sendOption4("Can I go through that door please?", + sendOption("Can I go through that door please?", "Where does this strange entrance lead?", "Good day to you too.", "I'm impressed, that tree is growing on that shed."); player.dialogueAction = 228; break; case 1038: - sendPlayerChat1("I'm impressed, that tree is growing on that shed."); + sendPlayerChat("I'm impressed, that tree is growing on that shed."); player.nextChat = 1039; break; case 1040: @@ -4133,11 +4128,11 @@ public class DialogueHandler { player.nextChat = 0; break; case 1041: - sendPlayerChat1("Good day to you too."); + sendPlayerChat("Good day to you too."); player.nextChat = 0; break; case 1042: - sendPlayerChat1("Where does this strange entrance lead?"); + sendPlayerChat("Where does this strange entrance lead?"); player.nextChat = 1043; break; case 1043: @@ -4154,7 +4149,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 1045: - sendPlayerChat1("Can I go through that door please?"); + sendPlayerChat("Can I go through that door please?"); player.nextChat = 1046; break; case 1046: @@ -4164,7 +4159,7 @@ public class DialogueHandler { player.nextChat = 1047; break; case 1047: - sendOption3("Ok, here's 875 coins.", "Never mind.", + sendOption("Ok, here's 875 coins.", "Never mind.", "Why is it worth the entry cost?"); player.dialogueAction = 230; break; @@ -4174,11 +4169,11 @@ public class DialogueHandler { player.nextChat = 0; break; case 1049: - sendPlayerChat1("Never mind."); + sendPlayerChat("Never mind."); player.nextChat = 0; break; case 1050: - sendPlayerChat1("Why is it worth the entry cost?"); + sendPlayerChat("Why is it worth the entry cost?"); player.nextChat = 1051; break; case 1051: @@ -4198,10 +4193,10 @@ public class DialogueHandler { break; case 1053: if (player.getItemAssistant().playerHasItem(995, 875)) { - sendPlayerChat1("Ok, here's 875 coins."); + sendPlayerChat("Ok, here's 875 coins."); player.nextChat = 1054; } else { - sendPlayerChat1("I don't have the money at the moment."); + sendPlayerChat("I don't have the money at the moment."); player.nextChat = 1057; } break; @@ -4217,7 +4212,7 @@ public class DialogueHandler { player.nextChat = 0; break; case 1056: - sendPlayerChat1("I don't have the money at the moment."); + sendPlayerChat("I don't have the money at the moment."); player.nextChat = 1057; break; case 1057: @@ -4228,7 +4223,7 @@ public class DialogueHandler { player.nextChat = 1058; break; case 1058: - sendPlayerChat2( + sendPlayerChat( "But you don't even have clothes, how can you seriously", "call anyone riff raff"); player.nextChat = 1059; @@ -4261,14 +4256,14 @@ public class DialogueHandler { } break; case 1229: - sendOption4("I need another assignement.", + sendOption("I need another assignement.", "Where is the location of my task?", "I would like to view your shop.", "I would like to cancel or remove my task."); player.dialogueAction = 142; break; case 1231: - sendOption2("I want to cancel my current task.", + sendOption("I want to cancel my current task.", "I want to remove my task for ever."); player.dialogueAction = 143; break; @@ -4317,13 +4312,13 @@ public class DialogueHandler { break; case 1301: - sendOption3("A haircut, please.", "A shave, please.", + sendOption("A haircut, please.", "A shave, please.", "No, thank you."); player.dialogueAction = 1301; break; case 1302:// first option - sendPlayerChat1("A haircut, please."); + sendPlayerChat("A haircut, please."); player.nextChat = 1303; break; @@ -4352,7 +4347,7 @@ public class DialogueHandler { // end of hairstyle cut. case 1306: // dialogue option 3 - sendPlayerChat1("No, thank you."); + sendPlayerChat("No, thank you."); player.nextChat = 1307; break; @@ -4363,7 +4358,7 @@ public class DialogueHandler { break; // END case 1308: // start of shaving - sendPlayerChat1("A shave, please."); + sendPlayerChat("A shave, please."); player.nextChat = 1309; break; @@ -4399,7 +4394,7 @@ public class DialogueHandler { player.nextChat = 1313; break; case 1313: - sendOption3("Red Dye", "Yellow Dye", "Blue Dye"); + sendOption("Red Dye", "Yellow Dye", "Blue Dye"); player.dialogueAction = 144; break; case 1314:// red 1763, yellow 1765, blue 1767 @@ -4407,7 +4402,7 @@ public class DialogueHandler { && player.getItemAssistant().playerHasItem(995, 5)) { player.getItemAssistant().deleteItem(1951, 3); player.getItemAssistant().addOrDropItem(1763, 1); - sendPlayerChat1("Red Dye Please."); + sendPlayerChat("Red Dye Please."); player.nextChat = 0; } else { sendNpcChat1( @@ -4422,7 +4417,7 @@ public class DialogueHandler { && player.getItemAssistant().playerHasItem(995, 5)) { player.getItemAssistant().deleteItem(1957, 2); player.getItemAssistant().addOrDropItem(1765, 1); - sendPlayerChat1("Yellow Dye Please."); + sendPlayerChat("Yellow Dye Please."); player.nextChat = 0; } else { sendNpcChat1( @@ -4437,7 +4432,7 @@ public class DialogueHandler { && player.getItemAssistant().playerHasItem(995, 5)) { player.getItemAssistant().deleteItem(1793, 2); player.getItemAssistant().addOrDropItem(1767, 1); - sendPlayerChat1("Blue Dye Please."); + sendPlayerChat("Blue Dye Please."); player.nextChat = 0; } else { sendNpcChat1( @@ -4518,17 +4513,17 @@ public class DialogueHandler { break; case 1323: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 146; break; case 1324: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 1325: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1326; break; @@ -4553,23 +4548,23 @@ public class DialogueHandler { break; case 1330: - sendOption3("Yes please.", "No Thanks.", + sendOption("Yes please.", "No Thanks.", "I have a frog token I would like to exchange."); player.dialogueAction = 148; break; case 1331: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 1332: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1334; break; case 1333: - sendOption2("A frog mask please!", "A frog outfit, please!"); + sendOption("A frog mask please!", "A frog outfit, please!"); player.dialogueAction = 149; break; @@ -4580,7 +4575,7 @@ public class DialogueHandler { case 1335: if (player.getItemAssistant().playerHasItem(6183, 1)) { - sendPlayerChat1("A frog mask please!"); + sendPlayerChat("A frog mask please!"); player.getItemAssistant().deleteItem(6183, 1); player.getItemAssistant().addOrDropItem(6188, 1); player.nextChat = 0; @@ -4595,14 +4590,14 @@ public class DialogueHandler { case 1336: if (player.getItemAssistant().playerHasItem(6183, 1) && player.playerAppearance[0] == 0) { - sendPlayerChat1("A frog prince outfit, please!"); + sendPlayerChat("A frog prince outfit, please!"); player.getItemAssistant().deleteItem(6183, 1); player.getItemAssistant().addOrDropItem(6184, 1); player.getItemAssistant().addOrDropItem(6185, 1); player.nextChat = 0; } else if (player.getItemAssistant().playerHasItem(6183, 1) && player.playerAppearance[0] == 1) { - sendPlayerChat1("A frog princess outfit, please!"); + sendPlayerChat("A frog princess outfit, please!"); player.getItemAssistant().deleteItem(6183, 1); player.getItemAssistant().addOrDropItem(6186, 1); player.getItemAssistant().addOrDropItem(6187, 1); @@ -4622,29 +4617,29 @@ public class DialogueHandler { break; case 1338: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 166; break; case 1339: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 1340: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1341; break; case 1341: - sendOption3("I will give you 15 coins for 1 rope.", + sendOption("I will give you 15 coins for 1 rope.", "I will give you 4 balls of wool for 1 rope.", "Never mind."); player.dialogueAction = 167; break; case 1342: - sendPlayerChat1("Never mind."); + sendPlayerChat("Never mind."); player.nextChat = 0; break; @@ -4652,7 +4647,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(995, 15)) { player.getItemAssistant().deleteItem(995, 15); player.getItemAssistant().addOrDropItem(954, 1); - sendPlayerChat1("I will give you 15 coins for 1 rope."); + sendPlayerChat("I will give you 15 coins for 1 rope."); player.nextChat = 0; } else { sendNpcChat1("You don't even have 15 coins.", @@ -4666,7 +4661,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(1759, 4)) { player.getItemAssistant().deleteItem(1759, 4); player.getItemAssistant().addOrDropItem(954, 1); - sendPlayerChat1("I will give you 4 balls of wool for 1 rope."); + sendPlayerChat("I will give you 4 balls of wool for 1 rope."); player.nextChat = 0; } else { sendNpcChat1("You don't even have 4 balls of wool.", @@ -4685,12 +4680,12 @@ public class DialogueHandler { break; case 1346: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 170; break; case 1347: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; @@ -4698,7 +4693,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(995, 12)) { player.getItemAssistant().deleteItem(995, 12); player.getItemAssistant().addOrDropItem(3105, 1); - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 0; } else { sendNpcChat1("You need 12 gp to buy these.", player.talkingNpc, @@ -4738,12 +4733,12 @@ public class DialogueHandler { break; case 1350: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 171; break; case 1351: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; @@ -4751,25 +4746,25 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(995, 50) && player.absY > 3485 && player.absY < 3489) { player.getItemAssistant().deleteItem(995, 50); - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPlayerAssistant().startTeleport(2358, 3640, 0, "modern"); player.hasPaid = true; player.nextChat = 0; } else if (player.getItemAssistant().playerHasItem(995, 50)) { player.getItemAssistant().deleteItem(995, 50); - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPlayerAssistant().startTeleport(2367, 3488, 0, "modern"); player.hasPaid = true; player.nextChat = 0; } else if (player.hasPaid && player.absY > 3485 && player.absY < 3489) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPlayerAssistant().startTeleport(2358, 3640, 0, "modern"); } else if (player.hasPaid) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPlayerAssistant().startTeleport(2367, 3488, 0, "modern"); } @@ -4783,17 +4778,17 @@ public class DialogueHandler { break; case 1354: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 172; break; case 1355: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1357; break; case 1356: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; @@ -4810,17 +4805,17 @@ public class DialogueHandler { break; case 1359: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 173; break; case 1360: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1362; break; case 1361: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; @@ -4853,17 +4848,17 @@ public class DialogueHandler { break; case 1364: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 174; break; case 1365: - sendPlayerChat1("No thanks I would like to stay with my task."); + sendPlayerChat("No thanks I would like to stay with my task."); player.nextChat = 0; break; case 1366: - sendPlayerChat1("Yes please I would like an easier task."); + sendPlayerChat("Yes please I would like an easier task."); player.nextChat = 1367; break; @@ -4888,18 +4883,18 @@ public class DialogueHandler { break; case 1370: - sendOption2("Yes please.", "No thanks, I'm not interested."); + sendOption("Yes please.", "No thanks, I'm not interested."); player.dialogueAction = 176; break; case 1371: - sendPlayerChat1("No thanks, I'm not interested."); + sendPlayerChat("No thanks, I'm not interested."); player.nextChat = 0; break; case 1372: if (player.getItemAssistant().playerHasItem(995, 3000)) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getPacketSender().showInterface(3559); player.canChangeAppearance = true; player.getItemAssistant().deleteItem(995, 3000); @@ -4921,17 +4916,17 @@ public class DialogueHandler { break; case 1374: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 177; break; case 1375: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 1376: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 1377; break; @@ -4953,13 +4948,13 @@ public class DialogueHandler { break; case 1379: - sendOption2("Yes please.", "No thank you."); + sendOption("Yes please.", "No thank you."); player.dialogueAction = 179; break; case 1380: if (player.getItemAssistant().playerHasItem(995, 1000)) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getItemAssistant().deleteItem(995, 1000); player.nextChat = 0; } else { @@ -4970,41 +4965,41 @@ public class DialogueHandler { break; case 1381: - sendPlayerChat1("No thank you."); + sendPlayerChat("No thank you."); player.nextChat = 0; break; case 2995: player.canWalkTutorial = false; - sendStatement2( + sendStatement( "Before you start if you would like to skip Tutorial Island,", "now is your chance. If you skip you will be brought to mainland."); player.nextChat = 2996; break; case 2996: - sendStatement2( + sendStatement( "If you don't want to skip Tutorial Island you can stay here.", "Would you like to skip Tutorial Island, or stay here?"); player.nextChat = 2997; break; case 2997: - sendOption2( + sendOption( "I would like to skip Tutorial Island and go to Mainland.", "I would like to stay here and complete Tutorial island."); player.dialogueAction = 151; break; case 2998: - sendPlayerChat1("Yes I would like to skip Tutorial Island."); + sendPlayerChat("Yes I would like to skip Tutorial Island."); player.nextChat = 3115; break; case 2999: if (!player.getItemAssistant().playerHasItem(1549) && player.vampSlayer == 3) { player.getItemAssistant().addOrDropItem(1549, 1); - sendPlayerChat1("Thank you, I will be more careful next time."); + sendPlayerChat("Thank you, I will be more careful next time."); player.nextChat = 0; } break; @@ -5150,9 +5145,9 @@ public class DialogueHandler { break; case 3013: // giving bronze and tinder - sendItemChat2("", + sendItemChat(590, 150, "", "The Survival Guide gives you a @blu@tinderbox @bla@and a", - "@blu@bronze axe!", 590, 150); + "@blu@bronze axe!"); player.getItemAssistant().addOrDropItem(590, 1); player.getItemAssistant().addOrDropItem(1351, 1); player.nextChat = 0; @@ -5169,7 +5164,7 @@ public class DialogueHandler { player.tutorialProgress = 3; break; case 3014: // finished cutting tree - sendItemChat1("", "You got some logs", 1511, 150); + sendItemChat(1511, 150, "", "You got some logs"); PlayerAssistant.removeHintIcon(player); player.nextChat = 3015; break; @@ -5213,8 +5208,8 @@ public class DialogueHandler { break; case 3018: - sendItemChat1("", - "The Survival Guide gives you a @blu@net!", 303, 150); + sendItemChat(303, 150, "", + "The Survival Guide gives you a @blu@net!"); player.getItemAssistant().addOrDropItem(303, 1); player.nextChat = 0; chatboxText( @@ -5266,7 +5261,7 @@ public class DialogueHandler { break; case 3022: - sendPlayerChat2( + sendPlayerChat( "I already know how to cook. Brynna taught me just", "now."); player.nextChat = 3023; break; @@ -5284,12 +5279,11 @@ public class DialogueHandler { player.nextChat = 3025; break; - case 3025: // he gives u bucket of water etc TTUOTRIAL PROG 8 - sendItemChat2( - + case 3025: + sendItemChat(1933, 150, "", "The Cooking Guide gives you a @blu@bucket of water@bla@ and a", - "@blu@pot of flour!", 1933, 150); + "@blu@pot of flour!"); player.getItemAssistant().addOrDropItem(1933, 1); player.getItemAssistant().addOrDropItem(1929, 1); player.nextChat = 0; @@ -5521,7 +5515,7 @@ public class DialogueHandler { break; case 3053:// mining tutor start - sendPlayerChat1("You can call me " + sendPlayerChat("You can call me " + Misc.capitalize(player.playerName) + "."); player.nextChat = 3054; break; @@ -5551,7 +5545,7 @@ public class DialogueHandler { player.tutorialProgress = 15; break; case 3056: // done prospecting - sendPlayerChat2( + sendPlayerChat( "I prospected both types of rocks! One set contains tin", "and the other has copper ore inside."); player.nextChat = 3057; @@ -5575,8 +5569,8 @@ public class DialogueHandler { player.nextChat = 3060; break; case 3060: - sendItemChat1("", - "Dezzick gives you a @blu@bronze pickaxe!", 1265, 300); + sendItemChat(1265, 300, "", + "Dezzick gives you a @blu@bronze pickaxe!"); player.getItemAssistant().addOrDropItem(1265, 1); player.nextChat = 0; chatboxText( @@ -5614,7 +5608,7 @@ public class DialogueHandler { case 3063: player.nextChat = 3064; - sendPlayerChat1("How do I make a weapon out of this?"); + sendPlayerChat("How do I make a weapon out of this?"); break; case 3064: @@ -5625,7 +5619,7 @@ public class DialogueHandler { break; case 3065: // giving you the hammer - sendItemChat1("", "Dezzick gives you a @blu@hammer!", 2347, 300); + sendItemChat(2347, 300, "", "Dezzick gives you a @blu@hammer!"); player.getItemAssistant().addOrDropItem(2347, 1); player.nextChat = 0; chatboxText("To smith you'll need a hammer - like the one you were given by", "Dezzick - access to an anvil like the one with the arrow over it", "and enough metal bars to make what you are trying to smith.", "", "Smithing a dagger"); @@ -5650,7 +5644,7 @@ public class DialogueHandler { * start of melee */ case 3067:// Melee instructor c.tutorialProgress = 22 - sendPlayerChat1("Hi! My name is " + sendPlayerChat("Hi! My name is " + Misc.capitalize(player.playerName) + "."); player.nextChat = 3068; break; @@ -5698,11 +5692,10 @@ public class DialogueHandler { break; case 3073: - sendItemChat2( - + sendItemChat(1171, 300, "",// Gives me sword and shield "The Combat Guide gives you a @blu@bronze sword@bla@ and a", - "@blu@wooden shield!", 1171, 300); + "@blu@wooden shield!"); player.getItemAssistant().addOrDropItem(1171, 1); player.getItemAssistant().addOrDropItem(1277, 1); player.nextChat = 0; @@ -5717,7 +5710,7 @@ public class DialogueHandler { break; case 3074: - sendPlayerChat1("I did it! I killed a giant rat!"); + sendPlayerChat("I did it! I killed a giant rat!"); player.nextChat = 3075; break; @@ -5742,11 +5735,10 @@ public class DialogueHandler { break; case 3077: // gives me bow and arrow - sendItemChat2( - + sendItemChat(841, 300, "", "The Combat Guide gives you some @blu@bronze arrows@bla@ and", - "a @blu@shortbow!", 841, 300); + "a @blu@shortbow!"); player.getItemAssistant().addOrDropItem(841, 1); player.getItemAssistant().addOrDropItem(882, 50); player.nextChat = 0; @@ -5781,7 +5773,7 @@ public class DialogueHandler { break; case 3079: // fiancial dude start - sendPlayerChat1("Hello. Who are you?"); + sendPlayerChat("Hello. Who are you?"); player.nextChat = 3080; break; @@ -5794,7 +5786,7 @@ public class DialogueHandler { break; case 3081: - sendPlayerChat1("Okay. How can I make money then?"); + sendPlayerChat("Okay. How can I make money then?"); player.nextChat = 3082; break; @@ -5867,7 +5859,7 @@ public class DialogueHandler { */ case 3089: // start of dialogue - sendPlayerChat1("Good day, brother, my name's " + sendPlayerChat("Good day, brother, my name's " + Misc.capitalize(player.playerName) + "."); player.nextChat = 3090; break; @@ -5967,7 +5959,7 @@ public class DialogueHandler { break; case 3100: - sendPlayerChat1("Are there rules on in-game behaviour?"); + sendPlayerChat("Are there rules on in-game behaviour?"); player.nextChat = 3101; break; case 3101: @@ -5991,7 +5983,7 @@ public class DialogueHandler { player.nextChat = 3104; break; case 3104: // last one - sendPlayerChat1("Okay thanks. I'll bear that in mind."); + sendPlayerChat("Okay thanks. I'll bear that in mind."); player.getPacketSender().chatbox(6180); chatboxText( @@ -6011,7 +6003,7 @@ public class DialogueHandler { */ case 3105: - sendPlayerChat1("Hello."); + sendPlayerChat("Hello."); player.nextChat = 3106; break; @@ -6023,7 +6015,7 @@ public class DialogueHandler { break; case 3107: - // sendItemChat1(client, "", "", 0, 50); + // sendItemChat(client, "", "", 0, 50); player.getPacketSender().closeAllWindows(); player.getPacketSender().chatbox(6180); chatboxText( @@ -6048,11 +6040,9 @@ public class DialogueHandler { break; case 3109: - sendItemChat1( - + sendItemChat(556, 300, "", - "Terrova gives you five @blu@air runes@bla@ and @blu@five mind runes!", - 556, 300); + "Terrova gives you five @blu@air runes@bla@ and @blu@five mind runes!"); player.getItemAssistant().addOrDropItem(558, 5); player.getItemAssistant().addOrDropItem(556, 5); player.nextChat = 0; @@ -6063,7 +6053,7 @@ public class DialogueHandler { "left. Walk over to the caged chickens, click the Wind Strike icon", "and then select one of the chicken to cast it on.", "Cast Wind Strke at a chicken"); - // sendStatement4("Now you have runes you should see the Wind Strike icon at the", + // sendStatement("Now you have runes you should see the Wind Strike icon at the", // "top left corner of the Magic interface - second in from the", // "left. Walk over to the caged chickens, click the Wind Strike icon", // "and then select one of the chicken to cast it on."); @@ -6081,7 +6071,7 @@ public class DialogueHandler { break; case 3111: - sendOption2("Mainland", "Stay here"); + sendOption("Mainland", "Stay here"); player.dialogueAction = 3111; player.nextChat = 0; break; @@ -6117,7 +6107,7 @@ public class DialogueHandler { case 3115: player.tutorialProgress = 36; - sendStatement4( + sendStatement( "Welcome to Lumbridge! To get more help, simply click on the", "Lumbridge Guide or one of the Tutors - these can be found by", "looking for the question mark icon on your mini-map. If you find", @@ -6149,29 +6139,29 @@ public class DialogueHandler { break; case 3119: - sendOption2("Yes please.", "No Thanks."); + sendOption("Yes please.", "No Thanks."); player.dialogueAction = 152; break; case 3120: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3121: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 3122; break; case 3122: - sendOption4("Asgarnain Ale", "Wizard's Mind Bomb", "Dwarven Stout", + sendOption("Asgarnain Ale", "Wizard's Mind Bomb", "Dwarven Stout", "Never Mind"); player.dialogueAction = 153; break; case 3123: if (player.getItemAssistant().playerHasItem(995, 3)) { - sendPlayerChat1("Asgarnian Ale please."); + sendPlayerChat("Asgarnian Ale please."); player.getItemAssistant().deleteItem(995, 3); player.getItemAssistant().addOrDropItem(1905, 1); player.nextChat = 0; @@ -6183,21 +6173,21 @@ public class DialogueHandler { break; case 3124: - sendPlayerChat1("Wizard's Mind Bomb please."); + sendPlayerChat("Wizard's Mind Bomb please."); player.getItemAssistant().deleteItem(995, 3); player.getItemAssistant().addOrDropItem(1907, 1); player.nextChat = 0; break; case 3125: - sendPlayerChat1("Dwarven Stout please."); + sendPlayerChat("Dwarven Stout please."); player.getItemAssistant().deleteItem(995, 3); player.getItemAssistant().addOrDropItem(1913, 1); player.nextChat = 0; break; case 3126: - sendPlayerChat1("Never mind."); + sendPlayerChat("Never mind."); player.nextChat = 0; break; @@ -6247,13 +6237,13 @@ public class DialogueHandler { break; case 3134: - sendOption2("So... do you know anywhere good to explore?", + sendOption("So... do you know anywhere good to explore?", "Do I get a reward?"); player.dialogueAction = 154; break; case 3135: - sendPlayerChat1("Do I get a reward? For freeing you and all..."); + sendPlayerChat("Do I get a reward? For freeing you and all..."); player.nextChat = 3136; break; @@ -6267,7 +6257,7 @@ public class DialogueHandler { break; case 3137: - sendPlayerChat1("So... do you know anywhere good to explore?"); + sendPlayerChat("So... do you know anywhere good to explore?"); player.nextChat = 3138; break; @@ -6290,17 +6280,17 @@ public class DialogueHandler { break; case 3140: - sendOption2("Yes please!", "No, it's too dangerous for me."); + sendOption("Yes please!", "No, it's too dangerous for me."); player.dialogueAction = 155; break; case 3141: - sendPlayerChat1("No, it's too dangerous for me."); + sendPlayerChat("No, it's too dangerous for me."); player.nextChat = 0; break; case 3142: - sendPlayerChat1("Yes please!"); + sendPlayerChat("Yes please!"); player.nextChat = 3143; break; @@ -6318,17 +6308,17 @@ public class DialogueHandler { break; case 3145: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 156; break; case 3146: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3147: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 3148; break; @@ -6350,17 +6340,17 @@ public class DialogueHandler { break; case 3151: - sendOption2("Yes please.", "No thanks."); + sendOption("Yes please.", "No thanks."); player.dialogueAction = 157; break; case 3152: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3153: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 3154; break; @@ -6370,13 +6360,13 @@ public class DialogueHandler { break; case 3155: - sendOption2("Meat Pie", "Stew"); + sendOption("Meat Pie", "Stew"); player.dialogueAction = 158; break; case 3156: if (player.getItemAssistant().playerHasItem(995, 16)) { - sendPlayerChat1("Meat Pie please."); + sendPlayerChat("Meat Pie please."); player.getItemAssistant().deleteItem(995, 16); player.getItemAssistant().addOrDropItem(2327, 1); player.nextChat = 0; @@ -6389,7 +6379,7 @@ public class DialogueHandler { case 3157: if (player.getItemAssistant().playerHasItem(995, 20)) { - sendPlayerChat1("Stew please."); + sendPlayerChat("Stew please."); player.getItemAssistant().deleteItem(995, 20); player.getItemAssistant().addOrDropItem(2003, 1); player.nextChat = 0; @@ -6406,17 +6396,17 @@ public class DialogueHandler { break; case 3159: - sendOption3("Buy woad leaves.", "Exchange mole skins/claws for nests.", "Nothing."); + sendOption("Buy woad leaves.", "Exchange mole skins/claws for nests.", "Nothing."); player.dialogueAction = 159; break; case 3160: - sendPlayerChat1("I don't want to do anything."); + sendPlayerChat("I don't want to do anything."); player.nextChat = 0; break; case 3161: - sendPlayerChat1("I would like to buy woad leaves."); + sendPlayerChat("I would like to buy woad leaves."); player.nextChat = 3162; break; @@ -6427,7 +6417,7 @@ public class DialogueHandler { break; case 3163: - sendOption4("5 coins", "10 coins", "15 coins", "20 coins"); + sendOption("5 coins", "10 coins", "15 coins", "20 coins"); player.dialogueAction = 160; break; @@ -6473,17 +6463,17 @@ public class DialogueHandler { break; case 3168: - sendOption2("Yes please.", "No Thanks."); + sendOption("Yes please.", "No Thanks."); player.dialogueAction = 162; break; case 3169: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3170: - sendPlayerChat1("Yes please can I get a moonlight mean?"); + sendPlayerChat("Yes please can I get a moonlight mean?"); player.nextChat = 3171; break; @@ -6501,7 +6491,7 @@ public class DialogueHandler { break; case 3172: - sendOption2("Experience Lamp", + sendOption("Experience Lamp", "Magical Lamp that restores your run to full"); player.dialogueAction = 163; break; @@ -6514,17 +6504,17 @@ public class DialogueHandler { break; case 3174: - sendOption2("Yes please.", "No Thanks."); + sendOption("Yes please.", "No Thanks."); player.dialogueAction = 164; break; case 3175: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3176: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 3177; break; @@ -6550,17 +6540,17 @@ public class DialogueHandler { break; case 3179: - sendOption2("Yes please.", "No Thanks."); + sendOption("Yes please.", "No Thanks."); player.dialogueAction = 165; break; case 3180: - sendPlayerChat1("No thanks."); + sendPlayerChat("No thanks."); player.nextChat = 0; break; case 3181: - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.nextChat = 3182; break; @@ -6581,12 +6571,12 @@ public class DialogueHandler { break; case 3184: - sendOption2("Yes please.", "No thank you."); + sendOption("Yes please.", "No thank you."); player.dialogueAction = 178; break; case 3185: - sendPlayerChat1("No thank you, do I look like I'm a cook?"); + sendPlayerChat("No thank you, do I look like I'm a cook?"); player.nextChat = 0; break; @@ -6594,7 +6584,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(995, 25000) && !player.getItemAssistant().playerHasItem(775) && player.playerEquipment[player.playerHands] != 775) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getItemAssistant().deleteItem(995, 25000); player.getPlayerAssistant().removeGloves(); player.getItemAssistant().addOrDropItem(775, 1); @@ -6618,7 +6608,7 @@ public class DialogueHandler { break; case 3188: - sendOption2("Yea! I'm fearless!", "No way! That looks scary!"); + sendOption("Yea! I'm fearless!", "No way! That looks scary!"); player.dialogueAction = 1; player.nextChat = 0; break; @@ -6632,12 +6622,12 @@ public class DialogueHandler { break; case 3190: - sendOption2("Yes please.", "No thank you."); + sendOption("Yes please.", "No thank you."); player.dialogueAction = 175; break; case 3191: - sendPlayerChat1("No thank you, do I look like I'm a smither?"); + sendPlayerChat("No thank you, do I look like I'm a smither?"); player.nextChat = 0; break; @@ -6645,7 +6635,7 @@ public class DialogueHandler { if (player.getItemAssistant().playerHasItem(995, 25000) && !player.getItemAssistant().playerHasItem(776) && player.playerEquipment[player.playerHands] != 776) { - sendPlayerChat1("Yes please."); + sendPlayerChat("Yes please."); player.getItemAssistant().deleteItem(995, 25000); player.getPlayerAssistant().removeGloves(); player.getItemAssistant().addOrDropItem(776, 1); @@ -6682,18 +6672,18 @@ public class DialogueHandler { break; case 3195: - sendPlayerChat1("I would like to exchange mole skins/claws for nests."); + sendPlayerChat("I would like to exchange mole skins/claws for nests."); player.nextChat = 3196; break; case 3196: - sendOption2("Mole skins.", "Mole claws."); + sendOption("Mole skins.", "Mole claws."); player.dialogueAction = 180; break; case 3197: if (MOLE_SKIN > 0) { - sendPlayerChat2("I would like to exchange my " + MOLE_SKIN + " mole skins,", "for bird nests."); + sendPlayerChat("I would like to exchange my " + MOLE_SKIN + " mole skins,", "for bird nests."); player.nextChat = 3198; } else { sendNpcChat1("You don't have any mole skins.", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc)); @@ -6710,7 +6700,7 @@ public class DialogueHandler { case 3199: if (MOLE_CLAW > 0) { - sendPlayerChat2("I would like to exchange my " + MOLE_CLAW + " mole claws,", "for bird nests."); + sendPlayerChat("I would like to exchange my " + MOLE_CLAW + " mole claws,", "for bird nests."); player.nextChat = 3200; } else { sendNpcChat1("You don't have any mole claws.", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc)); @@ -6737,17 +6727,17 @@ public class DialogueHandler { break; case 3203: - sendOption4("I would like to buy shots.", "I would like to exchange my points.", "How am I doing right now?", "Never mind."); + sendOption("I would like to buy shots.", "I would like to exchange my points.", "How am I doing right now?", "Never mind."); player.dialogueAction = 485; break; case 3204: - sendOption2("Pastry Dough", "Bread Dough"); + sendOption("Pastry Dough", "Bread Dough"); player.dialogueAction = 3204;//186 break; case 3205: - sendOption2("Pastry Dough", "Bread Dough"); + sendOption("Pastry Dough", "Bread Dough"); player.dialogueAction = 3205;//187 break; @@ -6757,12 +6747,12 @@ public class DialogueHandler { break; case 3209: - sendOption2("I would like to open my bank.", "I would like to view your shop."); + sendOption("I would like to open my bank.", "I would like to view your shop."); player.dialogueAction = 189; break; case 3210: - sendPlayerChat1("I would like to open my bank."); + sendPlayerChat("I would like to open my bank."); player.nextChat = 3211; break; @@ -6772,7 +6762,7 @@ public class DialogueHandler { break; case 3212: - sendPlayerChat1("I would like to view your shop."); + sendPlayerChat("I would like to view your shop."); player.nextChat = 3213; break; @@ -6782,7 +6772,7 @@ public class DialogueHandler { break; case 3214: - sendPlayerChat1("How's it going?"); + sendPlayerChat("How's it going?"); player.nextChat = 3215; break; @@ -6806,7 +6796,7 @@ public class DialogueHandler { break; case 3218://25 - sendOption2("Yes, I'm not afraid of anything!", "No way, the smell itself turns me away."); + sendOption("Yes, I'm not afraid of anything!", "No way, the smell itself turns me away."); player.dialogueAction = 3218; break; @@ -6817,7 +6807,7 @@ public class DialogueHandler { case 3220://27 player.dialogueAction = 3220; - sendOption2("Yes, I'm a brave warrior!", "Maybe I shouldn't, I could lose my items!"); + sendOption("Yes, I'm a brave warrior!", "Maybe I shouldn't, I could lose my items!"); break; case 3221://28 @@ -6832,7 +6822,7 @@ public class DialogueHandler { break; case 3223://30 - sendOption2("Yes, I've killed all the other brothers!", "No, I still need to kill more brothers"); + sendOption("Yes, I've killed all the other brothers!", "No, I still need to kill more brothers"); player.nextChat = 0; break; @@ -6876,17 +6866,17 @@ public class DialogueHandler { player.nextChat = 3523; break; /*case 3503: - sendOption2( + sendOption( "I seek a Quest!", "I don't, I'm just looking around."); player.dialogueAction = 1000; break;*/ case 3523: - sendPlayerChat1("I Seek a Quest!"); + sendPlayerChat("I Seek a Quest!"); player.nextChat = 3504; break; case 3524: - sendPlayerChat1("I don't, I'm just looking around."); + sendPlayerChat("I don't, I'm just looking around."); player.nextChat = 0; break; case 3504: @@ -6896,11 +6886,11 @@ public class DialogueHandler { player.nextChat = 3506; break; /*case 3505: - sendOption2("I laugh in the face of danger!", "I go and cower in a corner at the fist sign of danger!"); + sendOption("I laugh in the face of danger!", "I go and cower in a corner at the fist sign of danger!"); player.nextChat = 3506; break;*/ case 3506: - sendPlayerChat1("I laugh in the face on danger!");// 9158 + sendPlayerChat("I laugh in the face on danger!");// 9158 player.nextChat = 3507; break; case 3507: @@ -6910,7 +6900,7 @@ public class DialogueHandler { player.nextChat = 3508; break; case 3508: - sendPlayerChat1("Alright, I better get going!"); + sendPlayerChat("Alright, I better get going!"); player.blackKnight = 1; QuestAssistant.sendStages(player); player.nextChat = 3509; @@ -6921,11 +6911,11 @@ public class DialogueHandler { break; case 3510: if (player.getItemAssistant().playerHasItem(291, 30)) { - sendPlayerChat1("Here's all the items!"); + sendPlayerChat("Here's all the items!"); player.blackKnight = 2; player.nextChat = 3511; } else { - sendPlayerChat1("I don't have all the items yet."); + sendPlayerChat("I don't have all the items yet."); player.nextChat = 0; } break; @@ -6946,9 +6936,7 @@ public class DialogueHandler { QuestRewards.blackKnightReward(player); player.nextChat = 0; break; - } - } public void chatboxText(String text, String text1, String text2, @@ -6976,116 +6964,163 @@ public class DialogueHandler { player.getPacketSender().sendFrame126(text3, 6184); player.getPacketSender().sendChatInterface(6179); } - - /* - * Options - */ - - public void sendPlayerChat1(String s) { - player.getPacketSender().sendDialogueAnimation(969, 591); - player.getPacketSender().sendFrame126(player.playerName, 970); - player.getPacketSender().sendFrame126(s, 971); - player.getPacketSender().sendPlayerDialogueHead(969); - player.getPacketSender().sendChatInterface(968); - } - - public void sendPlayerChat2(String s, String s1) { - player.getPacketSender().sendDialogueAnimation(974, 591); - player.getPacketSender().sendFrame126(player.playerName, 975); - player.getPacketSender().sendFrame126(s, 976); - player.getPacketSender().sendFrame126(s1, 977); - player.getPacketSender().sendPlayerDialogueHead(974); - player.getPacketSender().sendChatInterface(973); + + private int getChatAnim(ChatEmotes ce) { + return ChatEmotes.getAnimId(ce); } - private void sendPlayerChat3(String s, String s1, String s2) { - player.getPacketSender().sendDialogueAnimation(980, 591); - player.getPacketSender().sendFrame126(player.playerName, 981); - player.getPacketSender().sendFrame126(s, 982); - player.getPacketSender().sendFrame126(s1, 983); - player.getPacketSender().sendFrame126(s2, 984); - player.getPacketSender().sendPlayerDialogueHead(980); - player.getPacketSender().sendChatInterface(979); + public void sendPlayerChat(String... line) { + switch (line.length) { + case 1: + player.getPacketSender().sendDialogueAnimation(969, getChatAnim(ChatEmotes.DEFAULT)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 970); + player.getPacketSender().sendFrame126(line[0], 971); + player.getPacketSender().sendPlayerDialogueHead(969); + player.getPacketSender().sendChatInterface(968); + break; + case 2: + player.getPacketSender().sendDialogueAnimation(974, getChatAnim(ChatEmotes.DEFAULT)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 975); + player.getPacketSender().sendFrame126(line[0], 976); + player.getPacketSender().sendFrame126(line[1], 977); + player.getPacketSender().sendPlayerDialogueHead(974); + player.getPacketSender().sendChatInterface(973); + break; + case 3: + player.getPacketSender().sendDialogueAnimation(980, getChatAnim(ChatEmotes.DEFAULT)); + player.getPacketSender().sendFrame126(player.playerName, 981); + player.getPacketSender().sendFrame126(line[0], 982); + player.getPacketSender().sendFrame126(line[1], 983); + player.getPacketSender().sendFrame126(line[2], 984); + player.getPacketSender().sendPlayerDialogueHead(980); + player.getPacketSender().sendChatInterface(979); + break; + case 4: + player.getPacketSender().sendDialogueAnimation(987, getChatAnim(ChatEmotes.DEFAULT)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 988); + player.getPacketSender().sendFrame126(line[0], 989); + player.getPacketSender().sendFrame126(line[1], 990); + player.getPacketSender().sendFrame126(line[2], 991); + player.getPacketSender().sendFrame126(line[3], 992); + player.getPacketSender().sendPlayerDialogueHead(987); + player.getPacketSender().sendChatInterface(986); + break; + } } - private void sendPlayerChat4(String s, String s1, String s2, String s3) { - player.getPacketSender().sendDialogueAnimation(987, 591); - player.getPacketSender().sendFrame126(player.playerName, 988); - player.getPacketSender().sendFrame126(s, 989); - player.getPacketSender().sendFrame126(s1, 990); - player.getPacketSender().sendFrame126(s2, 991); - player.getPacketSender().sendFrame126(s3, 992); - player.getPacketSender().sendPlayerDialogueHead(987); - player.getPacketSender().sendChatInterface(986); + public void sendPlayerChat(ChatEmotes e, String... line) { + switch (line.length) { + case 1: + player.getPacketSender().sendDialogueAnimation(969, getChatAnim(e)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 970); + player.getPacketSender().sendFrame126(line[0], 971); + player.getPacketSender().sendPlayerDialogueHead(969); + player.getPacketSender().sendChatInterface(968); + break; + case 2: + player.getPacketSender().sendDialogueAnimation(974, getChatAnim(e)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 975); + player.getPacketSender().sendFrame126(line[0], 976); + player.getPacketSender().sendFrame126(line[1], 977); + player.getPacketSender().sendPlayerDialogueHead(974); + player.getPacketSender().sendChatInterface(973); + break; + case 3: + player.getPacketSender().sendDialogueAnimation(980, getChatAnim(e)); + player.getPacketSender().sendFrame126(player.playerName, 981); + player.getPacketSender().sendFrame126(line[0], 982); + player.getPacketSender().sendFrame126(line[1], 983); + player.getPacketSender().sendFrame126(line[2], 984); + player.getPacketSender().sendPlayerDialogueHead(980); + player.getPacketSender().sendChatInterface(979); + break; + case 4: + player.getPacketSender().sendDialogueAnimation(987, getChatAnim(e)); + player.getPacketSender().sendFrame126(Misc.capitalize(player.playerName), 988); + player.getPacketSender().sendFrame126(line[0], 989); + player.getPacketSender().sendFrame126(line[1], 990); + player.getPacketSender().sendFrame126(line[2], 991); + player.getPacketSender().sendFrame126(line[3], 992); + player.getPacketSender().sendPlayerDialogueHead(987); + player.getPacketSender().sendChatInterface(986); + break; + } } - public void sendOption2(String s, String s1) { - player.getPacketSender().sendFrame126("Select an Option", 2460); - player.getPacketSender().sendFrame126(s, 2461); - player.getPacketSender().sendFrame126(s1, 2462); - player.getPacketSender().sendChatInterface(2459); + /** + * Options + * such as yes/no + */ + + public void sendOption(String... line) { + switch (line.length) { + case 2: + player.getPacketSender().sendFrame126("Select an Option", 2460); + player.getPacketSender().sendFrame126(line[0], 2461); + player.getPacketSender().sendFrame126(line[1], 2462); + player.getPacketSender().sendChatInterface(2459); + break; + case 3: + player.getPacketSender().sendFrame126("Select an Option", 2470); + player.getPacketSender().sendFrame126(line[0], 2471); + player.getPacketSender().sendFrame126(line[1], 2472); + player.getPacketSender().sendFrame126(line[2], 2473); + player.getPacketSender().sendChatInterface(2469); + break; + case 4: + player.getPacketSender().sendFrame126("Select an Option", 2481); + player.getPacketSender().sendFrame126(line[0], 2482); + player.getPacketSender().sendFrame126(line[1], 2483); + player.getPacketSender().sendFrame126(line[2], 2484); + player.getPacketSender().sendFrame126(line[3], 2485); + player.getPacketSender().sendChatInterface(2480); + break; + case 5: + player.getPacketSender().sendFrame126("Select an Option", 2493); + player.getPacketSender().sendFrame126(line[0], 2494); + player.getPacketSender().sendFrame126(line[1], 2495); + player.getPacketSender().sendFrame126(line[2], 2496); + player.getPacketSender().sendFrame126(line[3], 2497); + player.getPacketSender().sendFrame126(line[4], 2498); + player.getPacketSender().sendChatInterface(2492); + break; + } } - public void sendOption3(String s, String s1, String s2) { - player.getPacketSender().sendFrame126("Select an Option", 2470); - player.getPacketSender().sendFrame126(s, 2471); - player.getPacketSender().sendFrame126(s1, 2472); - player.getPacketSender().sendFrame126(s2, 2473); - player.getPacketSender().sendChatInterface(2469); - } - - public void sendOption4(String s, String s1, String s2, String s3) { - player.getPacketSender().sendFrame126("Select an Option", 2481); - player.getPacketSender().sendFrame126(s, 2482); - player.getPacketSender().sendFrame126(s1, 2483); - player.getPacketSender().sendFrame126(s2, 2484); - player.getPacketSender().sendFrame126(s3, 2485); - player.getPacketSender().sendChatInterface(2480); - } - - public void sendOption5(String s, String s1, String s2, String s3, String s4) { - player.getPacketSender().sendFrame126("Select an Option", 2493); - player.getPacketSender().sendFrame126(s, 2494); - player.getPacketSender().sendFrame126(s1, 2495); - player.getPacketSender().sendFrame126(s2, 2496); - player.getPacketSender().sendFrame126(s3, 2497); - player.getPacketSender().sendFrame126(s4, 2498); - player.getPacketSender().sendChatInterface(2492); - } - - /* + /** * Statements + * plain statement message */ - public void sendStatement(String s) { // 1 line click here to continue chat - // box interface - player.getPacketSender().sendFrame126(s, 357); - player.getPacketSender().sendFrame126("Click here to continue", 358); - player.getPacketSender().sendChatInterface(356); - } - - public void sendStatement2(String s, String s1) { - player.getPacketSender().sendFrame126(s, 360); - player.getPacketSender().sendFrame126(s1, 361); - player.getPacketSender().sendFrame126("Click here to continue", 362); - player.getPacketSender().sendChatInterface(359); - } - - public void sendStatement3(String s, String s1, String s2) { - player.getPacketSender().sendFrame126(s, 364); - player.getPacketSender().sendFrame126(s1, 365); - player.getPacketSender().sendFrame126(s1, 366); - player.getPacketSender().sendFrame126("Click here to continue", 367); - player.getPacketSender().sendChatInterface(363); - } - - public void sendStatement4(String s, String s1, String s2, String s3) { - player.getPacketSender().sendFrame126(s, 369); - player.getPacketSender().sendFrame126(s1, 370); - player.getPacketSender().sendFrame126(s2, 371); - player.getPacketSender().sendFrame126(s3, 372); - player.getPacketSender().sendFrame126("Click here to continue", 373); - player.getPacketSender().sendChatInterface(368); + public void sendStatement(String... line) { + switch (line.length) { + case 1: + player.getPacketSender().sendFrame126(line[0], 357); + player.getPacketSender().sendFrame126("Click here to continue", 358); + player.getPacketSender().sendChatInterface(356); + break; + case 2: + player.getPacketSender().sendFrame126(line[0], 360); + player.getPacketSender().sendFrame126(line[1], 361); + player.getPacketSender().sendFrame126("Click here to continue", 362); + player.getPacketSender().sendChatInterface(359); + break; + case 3: + player.getPacketSender().sendFrame126(line[0], 364); + player.getPacketSender().sendFrame126(line[1], 365); + player.getPacketSender().sendFrame126(line[2], 366); + player.getPacketSender().sendFrame126("Click here to continue", 367); + player.getPacketSender().sendChatInterface(363); + break; + case 4: + player.getPacketSender().sendFrame126(line[0], 369); + player.getPacketSender().sendFrame126(line[1], 370); + player.getPacketSender().sendFrame126(line[2], 371); + player.getPacketSender().sendFrame126(line[3], 372); + player.getPacketSender().sendFrame126("Click here to continue", 373); + player.getPacketSender().sendChatInterface(368); + break; + } } public void itemMessage(String title, String message, int itemid, int size) { @@ -7160,126 +7195,6 @@ public class DialogueHandler { * ItemInformation Box */ - public void itemMessage1(String message1, int itemid, int size) { - player.getPacketSender().sendDialogueAnimation(307, 591); - player.getPacketSender().sendFrame126(message1, 308); - player.getPacketSender().sendFrame246(307, size, itemid); - player.getPacketSender().sendChatInterface(306); - player.nextChat = 0; - } - - /* - * Give items - */ - - public void sendGiveItemNpc(String text1, String text2, int item1, int item2) { - player.getPacketSender().sendFrame126(text1, 6232); - player.getPacketSender().sendFrame126(text2, 6233); - player.getPacketSender().sendFrame246(6235, 170, item1); - player.getPacketSender().sendFrame246(6236, 170, item2); - player.getPacketSender().sendChatInterface(6231); - } - - public void sendGiveItemNpc(String text, int item) { - player.getPacketSender().sendFrame126(text, 308); - player.getPacketSender().sendFrame246(307, 200, item); - player.getPacketSender().sendChatInterface(306); - } - - /** - * USAGE: displayTwoItemsOption(c, new String {"Whip", "DDS", new int { - * 4151, 5698}, new int { 150, 150}); Displays two items with a select one - * option. - */ - public void displayTwoItemsOption(String[] s, int items[], - int[] zoom) { - player.getPacketSender().sendFrame126(s[0], 144); - player.getPacketSender().sendFrame126(s[1], 145); - player.getPacketSender().sendFrame246(items[0], zoom[0], 142); - player.getPacketSender().sendFrame246(items[1], zoom[1], 143); - player.getPacketSender().sendChatInterface(139); - } - - /** - * Displays single line text - */ - public void displaySingleLine(String s) { - player.getPacketSender().sendFrame126(s, 357); - player.getPacketSender().sendChatInterface(356); - } - - /** - * Displays two lined text - */ - public void displayTwoLined(String[] s) { - player.getPacketSender().sendFrame126(s[0], 360); - player.getPacketSender().sendFrame126(s[1], 361); - player.getPacketSender().sendChatInterface(359); - } - - /** - * Displays Three lined text - */ - public void displayThreeLined(String[] s) { - player.getPacketSender().sendFrame126(s[0], 364); - player.getPacketSender().sendFrame126(s[1], 365); - player.getPacketSender().sendFrame126(s[2], 366); - player.getPacketSender().sendChatInterface(363); - } - - /** - * Displays Four lined text - */ - public void displayFourLined(String[] s) { - player.getPacketSender().sendFrame126(s[0], 369); - player.getPacketSender().sendFrame126(s[1], 370); - player.getPacketSender().sendFrame126(s[2], 371); - player.getPacketSender().sendFrame126(s[2], 372); - player.getPacketSender().sendChatInterface(368); - } - - /** - * Select Option 2 - */ - public void displaySelectOption2(String[] s) { - player.getPacketSender().sendFrame126(s[0], 2461); - player.getPacketSender().sendFrame126(s[1], 2462); - player.getPacketSender().sendChatInterface(2459); - } - - /** - * Select Option 3 - */ - public void displaySelectOption3(String[] s) { - player.getPacketSender().sendFrame126(s[0], 2471); - player.getPacketSender().sendFrame126(s[1], 2472); - player.getPacketSender().sendFrame126(s[2], 2473); - player.getPacketSender().sendChatInterface(2469); - } - - /** - * Select Option 4 - */ - public void displaySelectOption4(String[] s) { - player.getPacketSender().sendFrame126(s[0], 2482); - player.getPacketSender().sendFrame126(s[1], 2483); - player.getPacketSender().sendFrame126(s[2], 2484); - player.getPacketSender().sendFrame126(s[3], 2485); - player.getPacketSender().sendChatInterface(2480); - } - - /** - * Select Option 5 - */ - public void displaySelectOption5(String[] s) { - player.getPacketSender().sendFrame126(s[0], 2494); - player.getPacketSender().sendFrame126(s[1], 2495); - player.getPacketSender().sendFrame126(s[2], 2496); - player.getPacketSender().sendFrame126(s[3], 2497); - player.getPacketSender().sendFrame126(s[4], 2498); - player.getPacketSender().sendChatInterface(2492); - } - public void itemMessage(String message1, int itemid, int size) { player.getPacketSender().sendDialogueAnimation(307, 591); player.getPacketSender().sendFrame126(message1, 308); @@ -7288,41 +7203,39 @@ public class DialogueHandler { player.nextChat = 0; } - public void sendItemChat1(String header, String one, int item, - int zoom) { - player.getPacketSender().sendFrame246(4883, zoom, item); - player.getPacketSender().sendFrame126(header, 4884); - player.getPacketSender().sendFrame126(one, 4885); - player.getPacketSender().sendChatInterface(4882); + public void sendItemChat(int item, int zoom, String header, String... line) { + switch (line.length) { + case 1: + player.getPacketSender().sendFrame246(4883, zoom, item); + player.getPacketSender().sendFrame126(header, 4884); + player.getPacketSender().sendFrame126(line[0], 4885); + player.getPacketSender().sendChatInterface(4882); + break; + case 2: + player.getPacketSender().sendFrame246(4888, zoom, item); + player.getPacketSender().sendFrame126(header, 4889); + player.getPacketSender().sendFrame126(line[0], 4890); + player.getPacketSender().sendFrame126(line[1], 4891); + player.getPacketSender().sendChatInterface(4887); + break; + case 3: + player.getPacketSender().sendFrame246(4894, zoom, item); + player.getPacketSender().sendFrame126(header, 4895); + player.getPacketSender().sendFrame126(line[0], 4896); + player.getPacketSender().sendFrame126(line[1], 4897); + player.getPacketSender().sendFrame126(line[2], 4898); + player.getPacketSender().sendChatInterface(4893); + break; + case 4: + player.getPacketSender().sendFrame246(4901, zoom, item); + player.getPacketSender().sendFrame126(header, 4902); + player.getPacketSender().sendFrame126(line[0], 4903); + player.getPacketSender().sendFrame126(line[1], 4904); + player.getPacketSender().sendFrame126(line[2], 4905); + player.getPacketSender().sendFrame126(line[3], 4906); + player.getPacketSender().sendChatInterface(4900); + break; + } } - - public void sendItemChat2(String header, String one, String two, - int item, int zoom) { - player.getPacketSender().sendFrame246(4888, zoom, item); - player.getPacketSender().sendFrame126(header, 4889); - player.getPacketSender().sendFrame126(one, 4890); - player.getPacketSender().sendFrame126(two, 4891); - player.getPacketSender().sendChatInterface(4887); - } - - public void sendItemChat3(String header, String one, String two, - String three, int item, int zoom) { - player.getPacketSender().sendFrame246(4894, zoom, item); - player.getPacketSender().sendFrame126(header, 4895); - player.getPacketSender().sendFrame126(one, 4896); - player.getPacketSender().sendFrame126(two, 4897); - player.getPacketSender().sendFrame126(three, 4898); - player.getPacketSender().sendChatInterface(4893); - } - - public void sendItemChat4(String header, String one, String two, - String three, String four, int item, int zoom) { - player.getPacketSender().sendFrame246(4901, zoom, item); - player.getPacketSender().sendFrame126(header, 4902); - player.getPacketSender().sendFrame126(one, 4903); - player.getPacketSender().sendFrame126(two, 4904); - player.getPacketSender().sendFrame126(three, 4905); - player.getPacketSender().sendFrame126(four, 4906); - player.getPacketSender().sendChatInterface(4900); - } -} + +} \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java index 6632202f..56ef7d11 100644 --- a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java +++ b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java @@ -439,11 +439,11 @@ public class DialogueOptions { player.nextChat = 0; return; } else if (player.dialogueAction == 183) { - player.getDialogueHandler().sendPlayerChat1("Well I hope you find it soon."); + player.getDialogueHandler().sendPlayerChat("Well I hope you find it soon."); player.nextChat = 0; return; } else if (player.dialogueAction == 184) { - player.getDialogueHandler().sendPlayerChat1("No, I've got lots of mining work to do."); + player.getDialogueHandler().sendPlayerChat("No, I've got lots of mining work to do."); player.nextChat = 0; return; } else if (player.dialogueAction == 3204) { diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java index b7e9651a..5835cf09 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/Doors.java @@ -8,7 +8,6 @@ import java.util.Scanner; import com.rebotted.GameEngine; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; -import com.rebotted.world.clip.Region; public class Doors { diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java index 37782cb7..33c834bc 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleDoors.java @@ -6,11 +6,9 @@ import java.io.FileReader; import java.util.ArrayList; import java.util.List; import java.util.Scanner; - import com.rebotted.GameEngine; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; -import com.rebotted.world.clip.Region; /** * diff --git a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java index d87990f9..0091c8a8 100644 --- a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java +++ b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java @@ -3,6 +3,7 @@ package com.rebotted.game.items; import com.rebotted.GameConstants; import com.rebotted.GameEngine; import com.rebotted.game.content.minigames.castlewars.CastleWars; +import com.rebotted.game.content.skills.runecrafting.Tiaras; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.players.Client; import com.rebotted.game.players.MainFrameIDs; @@ -50,40 +51,6 @@ public class ItemAssistant { } } - private final int[] TREE_SEEDS = { 5291, 5292, 5293, 5294, 5295, 5296, 5297, - 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5315, 5316, 5313, 5314 }; - - public void handleTreeSeeds(int itemId) { - c.getPacketSender().sendMessage("You search the nest..."); - final int reward = TREE_SEEDS[Misc.random(TREE_SEEDS.length)]; - addItem(reward, 1 + Misc.random(1)); - deleteItem(itemId, 1); - addItem(5075, 1); - c.getPacketSender().sendMessage("You find a " + getItemName(reward) + "."); - } - - private final int[] SEEDS = { 5291, 5292, 5293, 5294, 5295, 5296, 5297, 298, 5299, 5300, 5301, 5302, 5303, 5304 }; - - public void handleNonTreeSeeds(int itemId) { - c.getPacketSender().sendMessage("You search the nest..."); - final int reward = SEEDS[Misc.random(SEEDS.length)]; - addItem(reward, 1 + Misc.random(1)); - deleteItem(itemId, 1); - addItem(5075, 1); - c.getPacketSender().sendMessage("You find a " + getItemName(reward) + "."); - } - - public int[] RINGS = { 1635, 1637, 1639, 1641, 1643 }; - - public void handleRings(int itemId) { - c.getPacketSender().sendMessage("You search the nest..."); - int reward = RINGS[Misc.random(RINGS.length)]; - addItem(reward, 1); - deleteItem(itemId, 1); - addItem(5075, 1); - c.getPacketSender().sendMessage("You find a " + getItemName(reward) + "."); - } - public void updateInventory() { this.resetItems(3214); } @@ -1572,6 +1539,7 @@ public class ItemAssistant { getBonus(); writeBonus(); c.getCombatAssistant().getPlayerAnimIndex(); + Tiaras.handleTiara(c, wearID); c.getPlayerAssistant().requestUpdates(); return true; } else { @@ -1661,7 +1629,7 @@ public class ItemAssistant { c.flushOutStream(); c.updateRequired = true; c.setAppearanceUpdateRequired(true); - Weight.calcWeight(c, wearID, "deleteitem"); + //Weight.calcWeight(c, wearID, "deleteitem"); } } } @@ -2500,6 +2468,7 @@ public class ItemAssistant { c.playerItemsN[i] = 0; } resetItems(3214); + Weight.updateWeight(c); } public int freeSlots() { diff --git a/2006Redone Server/src/com/rebotted/game/items/UseItem.java b/2006Redone Server/src/com/rebotted/game/items/UseItem.java index fc9358f6..a1d83dcd 100644 --- a/2006Redone Server/src/com/rebotted/game/items/UseItem.java +++ b/2006Redone Server/src/com/rebotted/game/items/UseItem.java @@ -12,6 +12,9 @@ import com.rebotted.game.content.skills.fletching.LogCuttingInterface; import com.rebotted.game.content.skills.fletching.Stringing; import com.rebotted.game.content.skills.herblore.GrindingAction; import com.rebotted.game.content.skills.herblore.Herblore; +import com.rebotted.game.content.skills.prayer.Ectofuntus; +import com.rebotted.game.content.skills.prayer.Ectofuntus.EctofuntusData; +import com.rebotted.game.content.skills.runecrafting.Tiaras; import com.rebotted.game.items.impl.CapeDye; import com.rebotted.game.items.impl.GodPages; import com.rebotted.game.items.impl.WeaponPoison; @@ -41,6 +44,17 @@ public class UseItem { if (!c.getItemAssistant().playerHasItem(itemId, 1)) { return; } + if (itemId == Ectofuntus.BUCKET) { + Ectofuntus.fillBucketWithSlime(c, objectID); + } + for (final EctofuntusData ectofuntus : EctofuntusData.values()) { + if (itemId == ectofuntus.getBoneId()) { + Ectofuntus.boneOnLoader(c, objectID, itemId); + } + } + if (Tiaras.bindTiara(c, itemId, objectID)) { + return; + } switch (objectID) { case 733: if (itemId == 946) { diff --git a/2006Redone Server/src/com/rebotted/game/items/impl/Flowers.java b/2006Redone Server/src/com/rebotted/game/items/impl/Flowers.java index f8cfa981..c5d38d7c 100644 --- a/2006Redone Server/src/com/rebotted/game/items/impl/Flowers.java +++ b/2006Redone Server/src/com/rebotted/game/items/impl/Flowers.java @@ -135,7 +135,7 @@ public class Flowers { * @param c */ private void sendOptions(Player c) { - c.getDialogueHandler().sendOption2("Leave Flowers", "Harvest Flowers"); + c.getDialogueHandler().sendOption("Leave Flowers", "Harvest Flowers"); } /** diff --git a/2006Redone Server/src/com/rebotted/game/items/impl/HandleEmpty.java b/2006Redone Server/src/com/rebotted/game/items/impl/HandleEmpty.java index 0404aa76..2ef03216 100644 --- a/2006Redone Server/src/com/rebotted/game/items/impl/HandleEmpty.java +++ b/2006Redone Server/src/com/rebotted/game/items/impl/HandleEmpty.java @@ -19,9 +19,9 @@ public class HandleEmpty { if (!itemName.contains("Ring") && !itemName.contains("necklace")) { if (itemName.contains("(3)") || itemName.contains("(4)") || itemName.contains("(2)") || itemName.contains("(1)") || itemName.contains("Weapon poison")) { if (id != 1712 && id != 1710 && id != 1708 && id != 1706) { - c.getItemAssistant().deleteItem(id, c.getItemAssistant().getItemSlot(id), 1); - c.getItemAssistant().addItem(229, 1); - c.getPacketSender().sendMessage("You empty the vial."); + c.getItemAssistant().deleteItem(id, c.getItemAssistant().getItemSlot(id), 1); + c.getItemAssistant().addItem(229, 1); + c.getPacketSender().sendMessage("You empty the vial."); } } } @@ -36,6 +36,15 @@ public class HandleEmpty { return 229; case 1927: // Buckets case 1929: + case 4687: + case 4286: + case 1784: + case 4693: + case 6712: + case 7471: + case 7622: + case 7624: + case 7626: return 1925; } return -1; diff --git a/2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java b/2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java index ad2469db..fea45d22 100644 --- a/2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java +++ b/2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java @@ -9,7 +9,7 @@ import com.rebotted.game.players.Player; public class RareProtection { - public static final boolean RARES = false, CRACKERS = false; + public static boolean RARES = false, CRACKERS = false; private static final int[] RARE_ITEMS = { 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 962, 963, 1959, 1961, 1989 }; private static final int[] EDIBLE_RARES = { 1959, 1961, 1989 }; @@ -70,4 +70,4 @@ public class RareProtection { } return true; } -} +} \ No newline at end of file diff --git a/2006Redone Server/src/com/rebotted/game/items/impl/Teles.java b/2006Redone Server/src/com/rebotted/game/items/impl/Teles.java index 77939e6f..d2508a3f 100644 --- a/2006Redone Server/src/com/rebotted/game/items/impl/Teles.java +++ b/2006Redone Server/src/com/rebotted/game/items/impl/Teles.java @@ -10,19 +10,19 @@ import com.rebotted.game.players.Player; public class Teles { public static void useAOG(Player player) { - player.getDialogueHandler().sendOption4("Edgeville", "Al Kharid", "Karamja", "Draynor"); + player.getDialogueHandler().sendOption("Edgeville", "Al Kharid", "Karamja", "Draynor"); player.dialogueAction = 51; player.getPacketSender().sendMessage("You rub the Amulet of Glory..."); } public static void useROD(Player player) { - player.getDialogueHandler().sendOption2("Duel Arena", "Castle Wars"); + player.getDialogueHandler().sendOption("Duel Arena", "Castle Wars"); player.dialogueAction = 161; player.getPacketSender().sendMessage("You rub the Ring of Dueling..."); } public static void useGN(Player player) { - player.getDialogueHandler().sendOption2("Burthrope Games Room", "Barbarian Outpost"); + player.getDialogueHandler().sendOption("Burthrope Games Room", "Barbarian Outpost"); player.dialogueAction = 50; player.getPacketSender().sendMessage("You rub the Games Necklace..."); } diff --git a/2006Redone Server/src/com/rebotted/game/npcs/Npc.java b/2006Redone Server/src/com/rebotted/game/npcs/Npc.java index 56de2175..d541f6a5 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/Npc.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/Npc.java @@ -64,17 +64,24 @@ public class Npc { updateRequired = true; } - public boolean requestTransformTime(Player player, int itemId, int animation, final int currentId, final int newId, int transformTime, final int npcId) { - if (!player.getItemAssistant().playerHasItem(itemId)) { - player.getPacketSender().sendMessage("You need " + ItemAssistant.getItemName(itemId).toLowerCase() + " to do that."); - return false; + public void shearSheep(Player player, int itemNeeded, int itemGiven, int animation, final int currentId, final int newId, int transformTime) { + if (!player.getItemAssistant().playerHasItem(itemNeeded)) { + player.getPacketSender().sendMessage("You need " + ItemAssistant.getItemName(itemNeeded).toLowerCase() + " to do that."); + return; } - if (NpcHandler.npcs[npcId].isTransformed) - return false; - if (animation > 0) + if (transformId == newId) { + player.getPacketSender().sendMessage("This sheep has already been shorn."); + return; + } + if (NpcHandler.npcs[npcId].isTransformed) { + return; + } + if (animation > 0) { player.startAnimation(animation); - NpcHandler.npcs[npcId].isTransformed = true; + } requestTransform(newId); + player.getItemAssistant().addItem(itemGiven, 1); + player.getPacketSender().sendMessage("You get some " + ItemAssistant.getItemName(itemGiven).toLowerCase() + "."); CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @Override @@ -88,7 +95,6 @@ public class Npc { NpcHandler.npcs[npcId].isTransformed = false; } }, transformTime); - return true; } public void appendTransformUpdate(Stream str) { diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java index b12c6214..68b14123 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java @@ -25,10 +25,6 @@ public class NpcActions { c.rememberNpcIndex = c.npcClickIndex; c.npcClickIndex = 0; Shops.dialogueShop(c, npcType); - if (Pickpocket.isNPC(c, npcType)) { - Pickpocket.attemptPickpocket(c, npcType); - return; - } if (Fishing.fishingNPC(c, npcType)) { Fishing.fishingNPC(c, 1, npcType); } @@ -202,9 +198,8 @@ public class NpcActions { break; case 844: - if (c.runeMist < 4) { - c.getDialogueHandler().sendStatement( - "You need to beat rune mysteries first to do this."); + if (c.runeMist < 4 && c.playerRights <= 1) { + c.getDialogueHandler().sendStatement("You need to beat rune mysteries first to do this."); c.nextChat = 0; return; } @@ -232,8 +227,7 @@ public class NpcActions { c.getDialogueHandler().sendDialogues(3008, npcType); } if (c.tutorialProgress == 2) { - c.getDialogueHandler().sendNpcChat1("You should move on now.", - npcType, "Runescape Guide"); + c.getDialogueHandler().sendNpcChat1("You should move on now.", npcType, "Runescape Guide"); } break; @@ -623,11 +617,6 @@ public class NpcActions { break; case 284: - if (c.playerLevel[14] < 14) { - c.getDialogueHandler().sendStatement( - "You don't have the requirements to do this quest."); - return; - } if (c.doricQuest == 0) { c.getDialogueHandler().sendDialogues(89, npcType); } else if (c.doricQuest == 1) { @@ -991,11 +980,14 @@ public class NpcActions { c.getPacketSender().sendMessage("This is not your pet."); } } - switch (npcType) { + case 3: + c.getDialogueHandler().sendDialogues(5, npcType); + break; + case 209: - c.getShopAssistant().openShop(144); + c.getShopAssistant().openShop(144); break; @@ -1013,12 +1005,12 @@ public class NpcActions { c.nextChat = 0; } else { if (c.getItemAssistant().playerHasItem(995, 1000)) { - //Sailing.startTravel(c, 17); - c.getPlayerAssistant().startTeleport(2620, 3686, 0, "modern"); - c.getItemAssistant().deleteItem(995, 1000); - c.getDialogueHandler().sendStatement("You arrive safely."); - c.nextChat = 0; - } + //Sailing.startTravel(c, 17); + c.getPlayerAssistant().startTeleport(2620, 3686, 0, "modern"); + c.getItemAssistant().deleteItem(995, 1000); + c.getDialogueHandler().sendStatement("You arrive safely."); + c.nextChat = 0; + } } break; @@ -1028,15 +1020,13 @@ public class NpcActions { if (c.questPoints >= requiredQP) { c.getShopAssistant().openShop(npcType); } else { - c.getPacketSender().sendMessage( - "You need " + requiredQP + " quest points to open this shop."); + c.getPacketSender().sendMessage("You need " + requiredQP + " quest points to open this shop."); } break; case 300: - if (c.runeMist < 4) { - c.getDialogueHandler().sendStatement( - "You need to beat rune mysteries first to do this."); + if (c.runeMist < 4 && c.playerRights <= 1) { + c.getDialogueHandler().sendStatement("You need to beat rune mysteries first to do this."); c.nextChat = 0; return; } @@ -1078,9 +1068,8 @@ public class NpcActions { case 844: case 462: - if (c.runeMist < 4) { - c.getDialogueHandler().sendStatement( - "You need to beat rune mysteries first to do this."); + if (c.runeMist < 4 && c.playerRights <= 1) { + c.getDialogueHandler().sendStatement("You need to beat rune mysteries first to do this."); c.nextChat = 0; return; } @@ -1128,10 +1117,6 @@ public class NpcActions { c.clickNpcType = 0; c.rememberNpcIndex = c.npcClickIndex; c.npcClickIndex = 0; - if (Pickpocket.isNPC(c, npcType)) { - Pickpocket.attemptPickpocket(c, npcType); - return; - } if (Pets.isCat(npcType)) { if (NpcHandler.npcs[c.rememberNpcIndex].spawnedBy == c.playerId) { c.getDialogueHandler().sendDialogues(910, npcType); @@ -1176,9 +1161,8 @@ public class NpcActions { } break; case 553: - if (c.runeMist < 4) { - c.getDialogueHandler().sendStatement( - "You need to beat rune mysteries first to do this."); + if (c.runeMist < 4 && c.playerRights <= 1) { + c.getDialogueHandler().sendStatement("You need to beat rune mysteries first to do this."); return; } String type = c.playerMagicBook == 0 ? "modern" : "ancient"; diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java index 3d503f5a..dd642907 100644 --- a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java +++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java @@ -579,6 +579,31 @@ public class NpcHandler { npcs[i].getNextNPCMovement(i); npcs[i].updateRequired = true; } + if (npcs[i].walkingType >= 0) { + switch(npcs[i].walkingType) { + + case 5: + npcs[i].turnNpc(npcs[i].absX-1, npcs[i].absY); + break; + + case 4: + npcs[i].turnNpc(npcs[i].absX+1, npcs[i].absY); + break; + + case 3: + npcs[i].turnNpc(npcs[i].absX, npcs[i].absY-1); + break; + case 2: + npcs[i].turnNpc(npcs[i].absX, npcs[i].absY+1); + break; + + default: + if (npcs[i].walkingType >= 0) { + npcs[i].turnNpc(npcs[i].absX, npcs[i].absY); + } + break; + } + } if (npcs[i].walkingType == 1) { if (Misc.random(3) == 1 && !npcs[i].walkingHome) { int MoveX = 0; diff --git a/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java b/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java index 6db0e7f8..17c49cb9 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java +++ b/2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java @@ -17,16 +17,16 @@ import com.rebotted.game.content.random.PartyRoom; import com.rebotted.game.content.randomevents.FreakyForester; import com.rebotted.game.content.skills.agility.AgilityShortcut; import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.core.Woodcutting; import com.rebotted.game.content.skills.crafting.Spinning; import com.rebotted.game.content.skills.farming.Farming; -import com.rebotted.game.content.skills.fletching.LogCutting; +import com.rebotted.game.content.skills.prayer.Ectofuntus; import com.rebotted.game.content.skills.runecrafting.AbyssalHandler; import com.rebotted.game.content.skills.runecrafting.RuneCraftingActions; import com.rebotted.game.content.skills.smithing.Smelting; import com.rebotted.game.content.skills.thieving.Stalls; import com.rebotted.game.content.skills.thieving.ThieveOther; -import com.rebotted.game.content.traveling.Desert; +import com.rebotted.game.content.skills.woodcutting.Woodcutting; +import com.rebotted.game.content.traveling.DesertCactus; import com.rebotted.game.globalworldobjects.ClimbOther; import com.rebotted.game.globalworldobjects.DoubleGates; import com.rebotted.game.globalworldobjects.PassDoor; @@ -118,6 +118,13 @@ public class ObjectsActions { return; } switch (objectType) { + case 11163: + Ectofuntus.useBoneGrinder(player); + break; + + case 11164: + Ectofuntus.emptyBin(player); + break; case 6: player.getCannon().clickCannon(objectX, objectY); break; @@ -890,7 +897,7 @@ public class ObjectsActions { break; case 2670: - Desert.cutCactus(player, Desert.getCacCutter(player), objectType, + DesertCactus.cutCactus(player, DesertCactus.getCacCutter(player), objectType, objectX, objectY); break; @@ -917,7 +924,7 @@ public class ObjectsActions { player.absY, 0); player.getPacketSender().createArrow(3078, 3084, player.getH(), 2); - player.getDialogueHandler().sendStatement2( + player.getDialogueHandler().sendStatement( "You have died and have already beat this step", "you may continue."); } else if (player.diedOnTut == false) { @@ -936,7 +943,7 @@ public class ObjectsActions { if (player.tutorialProgress > 9) { PassDoor.passThroughDoor(player, 3018, 1, 2, 0, -1, 0, 0); if (player.diedOnTut) { - player.getDialogueHandler().sendStatement2( + player.getDialogueHandler().sendStatement( "You have died and have already beat this step", "you may continue."); player.getPacketSender().createArrow(3086, 3126, @@ -951,7 +958,7 @@ public class ObjectsActions { if (player.tutorialProgress > 6 || player.diedOnTut) { if (player.diedOnTut && Position.checkPosition(player, 3079, 3084, 0)) { PassDoor.passThroughDoor(player, 3017, 3, 0, 0, -1, 0, 0); - player.getDialogueHandler().sendStatement2("You have died and have already beat this step", "you may continue."); + player.getDialogueHandler().sendStatement("You have died and have already beat this step", "you may continue."); player.getPacketSender().createArrow(3072, 3090, player.getH(), 2); } else if (player.diedOnTut == false && Position.checkPosition(player, 3079, 3084, 0)) { PassDoor.passThroughDoor(player, 3017, 3, 0, 0, -1, 0, 0); @@ -1053,7 +1060,7 @@ public class ObjectsActions { if (player.tutorialProgress >= 11 || player.diedOnTut) { if (player.diedOnTut && Position.checkPosition(player, 3086, 3126, 0)) { PassDoor.passThroughDoor(player, 3019, 2, 3, 0, 0, -1, 0); - player.getDialogueHandler().sendStatement2( + player.getDialogueHandler().sendStatement( "You have died and have already beat this step", "you may continue."); player.getPacketSender().createArrow(3088, 3119, @@ -1074,7 +1081,7 @@ public class ObjectsActions { player.getPacketSender().createArrow(1, 2); } else if (Position.checkPosition(player, 3097, 3107, 0) && player.diedOnTut) { player.getPacketSender().createArrow(3089, 3092, player.getH(), 2); - player.getDialogueHandler().sendStatement2("You have died and have already beat this step", "you may continue."); + player.getDialogueHandler().sendStatement("You have died and have already beat this step", "you may continue."); } else if (player.tutorialProgress < 2 && player.diedOnTut != true) { player.getPacketSender().sendMessage("You aren't on this step yet."); return; @@ -1120,7 +1127,7 @@ public class ObjectsActions { case 3021: if (player.diedOnTut && (player.getY() == 9502 || player.getY() == 9503)) { player.getDialogueHandler() - .sendStatement2( + .sendStatement( "You have died so now all you need to do is continue", "onto the next step."); player.getPacketSender().createArrow(3111, 9518, @@ -1174,7 +1181,7 @@ public class ObjectsActions { || player.diedOnTut) { if (player.diedOnTut) { player.getDialogueHandler() - .sendStatement2("Be more careful this time", + .sendStatement("Be more careful this time", "now continue to kill the rat and talk to the guide."); } player.getPacketSender().chatbox(6180); @@ -1366,7 +1373,7 @@ public class ObjectsActions { player.getPlayerAssistant().movePlayer(3088, 9520, 0); player.getPacketSender().createArrow(3094, 9503, player.getH(), 2); - player.getDialogueHandler().sendStatement2( + player.getDialogueHandler().sendStatement( "You have died and have already beat this step", "you may continue."); } else if (player.diedOnTut == false) { diff --git a/2006Redone Server/src/com/rebotted/game/objects/impl/BrimhavenVines.java b/2006Redone Server/src/com/rebotted/game/objects/impl/BrimhavenVines.java index 372275db..4b076588 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/impl/BrimhavenVines.java +++ b/2006Redone Server/src/com/rebotted/game/objects/impl/BrimhavenVines.java @@ -1,6 +1,6 @@ package com.rebotted.game.objects.impl; -import com.rebotted.game.content.skills.core.Woodcutting; +import com.rebotted.game.content.skills.woodcutting.Woodcutting; import com.rebotted.game.players.Player; /** diff --git a/2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java b/2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java index 1d8e55ed..0ab7544a 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java +++ b/2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java @@ -874,7 +874,7 @@ public class Climbing { } public static void handleLadder(Player player) { - player.getDialogueHandler().sendOption2("Climb Up.", "Climb Down."); + player.getDialogueHandler().sendOption("Climb Up.", "Climb Down."); player.dialogueAction = 147; } diff --git a/2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java b/2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java index 3d137655..6754ebc1 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java +++ b/2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java @@ -124,7 +124,7 @@ public class OtherObjects { @Override public void execute(CycleEventContainer container) { if (random == 1) { - player.getDialogueHandler().sendStatement2("Wow! A needle!", "Now what are the chances of finding that?"); + player.getDialogueHandler().sendStatement("Wow! A needle!", "Now what are the chances of finding that?"); player.nextChat = 0; player.getItemAssistant().addItem(1733, 1); container.stop(); diff --git a/2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java b/2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java index 04481990..38aaff2a 100644 --- a/2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java +++ b/2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java @@ -1,7 +1,8 @@ package com.rebotted.game.objects.impl; import com.rebotted.GameEngine; -import com.rebotted.game.content.traveling.Desert; +import com.rebotted.game.content.traveling.DesertCactus; +import com.rebotted.game.content.traveling.DesertHeat; import com.rebotted.game.players.Player; import com.rebotted.world.clip.Region; @@ -107,7 +108,7 @@ public class SpecialObjects { coords[0] = c.objectX; coords[1] = c.objectY; if (c.desertWarning == false && c.absY == 3117) { - Desert.showWarning(c); + DesertHeat.showWarning(c); c.desertWarning = true; } if (c.absY == 3117) { diff --git a/2006Redone Server/src/com/rebotted/game/players/Player.java b/2006Redone Server/src/com/rebotted/game/players/Player.java index e38f1f34..d10dd01c 100644 --- a/2006Redone Server/src/com/rebotted/game/players/Player.java +++ b/2006Redone Server/src/com/rebotted/game/players/Player.java @@ -48,7 +48,8 @@ import com.rebotted.game.content.skills.runecrafting.Runecrafting; import com.rebotted.game.content.skills.slayer.Slayer; import com.rebotted.game.content.skills.smithing.Smithing; import com.rebotted.game.content.skills.smithing.SmithingInterface; -import com.rebotted.game.content.traveling.Desert; +import com.rebotted.game.content.traveling.DesertCactus; +import com.rebotted.game.content.traveling.DesertHeat; import com.rebotted.game.dialogues.DialogueHandler; import com.rebotted.game.globalworldobjects.DoubleGates; import com.rebotted.game.globalworldobjects.GateHandler; @@ -97,7 +98,7 @@ public abstract class Player { private final Enchanting enchanting = new Enchanting(this); private final Potatoes potatoes = new Potatoes(this); private final PlayerAction playeraction = new PlayerAction(this); - private final Desert desert = new Desert(); + private final DesertCactus desert = new DesertCactus(); private final Specials specials = new Specials(this); private final SoundList sound = new SoundList(this); public String creationAddress = ""; @@ -258,7 +259,7 @@ public abstract class Player { return playeraction; } - public Desert getDesert() { + public DesertCactus getDesert() { return desert; } @@ -741,6 +742,10 @@ public abstract class Player { } public void process() { + if (inDesert() && heightLevel == 0) { + DesertHeat.callHeat(this); + } + if (playerEnergy < 100 && System.currentTimeMillis() - lastIncrease >= getPlayerAssistant().raiseTimer()) { playerEnergy += 1; lastIncrease = System.currentTimeMillis(); @@ -1067,25 +1072,25 @@ public abstract class Player { public void correctCoordinates() { if (inPcGame()) { getPlayerAssistant().movePlayer(2657, 2639, 0); - if (FightPitsArea()) { - getPlayerAssistant().movePlayer(2399, 5178, 0); - if (inFightCaves()) { - getDialogueHandler().sendDialogues(101, 2617); - getPlayerAssistant().movePlayer(absX, absY, playerId * 4); - getPacketSender().sendMessage("Your wave will start in 10 seconds."); - CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { - @Override - public void execute(CycleEventContainer container) { - GameEngine.fightCaves.spawnNextWave((Client) PlayerHandler.players[playerId]); - container.stop(); - } - @Override - public void stop() { - - } - }, 16); + } else if (FightPitsArea()) { + getPlayerAssistant().movePlayer(2399, 5178, 0); + } else if (getX() == 0 && getY() == 0) { + getPlayerAssistant().movePlayer(3222, 3218, 0); + } else if (inFightCaves()) { + getDialogueHandler().sendDialogues(101, 2617); + getPlayerAssistant().movePlayer(absX, absY, playerId * 4); + getPacketSender().sendMessage("Your wave will start in 10 seconds."); + CycleEventHandler.getSingleton().addEvent(this, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + GameEngine.fightCaves.spawnNextWave((Client) PlayerHandler.players[playerId]); + container.stop(); } - } + @Override + public void stop() { + + } + }, 16); } } @@ -1217,6 +1222,8 @@ public abstract class Player { restoreStatsDelay, logoutDelay, buryDelay, foodDelay, potDelay, doorDelay, doubleDoorDelay, buySlayerTimer, lastIncrease, boneDelay, leverDelay = 0, searchObjectDelay = 0, clickDelay = 0; + + public boolean hideYell = false; private Npc specialTarget = null; @@ -1226,6 +1233,8 @@ public abstract class Player { public Npc getSpecialTarget() { return specialTarget; } + + public int miningAxe = -1, woodcuttingAxe = -1; public boolean initialized = false, musicOn = true, luthas, playerIsCooking, disconnected = false, ruleAgreeButton = false, @@ -1373,6 +1382,8 @@ public abstract class Player { private final boolean barrowsNpcDead[] = new boolean[6]; + public int ectofuntusBoneUsed; + public String ectofuntusBoneCrusherState = "Empty"; public Client teleporter = null; public int[] party = new int[8]; public int[] partyN = new int[8]; @@ -1810,9 +1821,12 @@ public abstract class Player { isInArea(2451, 3408, 2425, 3437) || false; } - + public boolean inDesert() { - return absX >= 3137 && absX <= 3321 && absY >= 2880 && absY <= 3115; + if (tutorialProgress >= 0 && tutorialProgress <= 36) { + return false; + } + return (getX() >= 3137 && getX() <= 3321 && getY() >= 2880 && getY() <= 3115); } public boolean duelingArena() { @@ -1824,11 +1838,11 @@ public abstract class Player { public boolean playerIsBusy() { - if(isShopping || inTrade || openDuel || isBanking || duelStatus == 1) { - return true; - } - return false; - } + if (isShopping || inTrade || openDuel || isBanking || duelStatus == 1) { + return true; + } + return false; + } public boolean isInBarrows() { if(absX > 3543 && absX < 3584 && absY > 3265 && absY < 3311) { diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java b/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java index 6783f857..646d0dc6 100644 --- a/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java @@ -118,10 +118,18 @@ public class PlayerAssistant { } else { player.getPacketSender().sendFrame126("\\nYou currently have a bank pin set.\\nBank pins are coming soon!.", 15270); } - player.getPacketSender().sendFrame126("Remember to vote daily to help " + GameConstants.SERVER_NAME + "", 15803); - player.getPacketSender().sendFrame126("Every vote counts! :)", 15804); + int random = Misc.random(3); + player.getPacketSender().sendFrame126(welcomeMessages[random][0], 15803); + player.getPacketSender().sendFrame126(welcomeMessages[random][1], 15804); } + private String[][] welcomeMessages = { + {"Remember to vote daily to help " + GameConstants.SERVER_NAME + "", "Every vote counts! :)"}, + {"Not a member of our discord community?", "Join our discord at: https://discord.gg/Nk9WQUK"}, + {"Do you have any bugs that you would like to report?", "Report them on our discord or message a staff member. :)"}, + {"Want to help the server grow?", "Remember to vote daily and invite your friends!"} + }; + public void showMap() { int posisition = (player.getX() / 64 - 46) + (player.getY() / 64 - 49) * 6; player.getPacketSender().sendConfig(106, posisition); @@ -647,12 +655,12 @@ public class PlayerAssistant { } public void spiritTree() { - player.getDialogueHandler().sendOption3("The Tree Gnome Village", "The Gnome Stronghold", "Varrock"); + player.getDialogueHandler().sendOption("The Tree Gnome Village", "The Gnome Stronghold", "Varrock"); player.dialogueAction = 53; } public void handleCanoe() { - player.getDialogueHandler().sendOption4("Travel the canoe to Barbarian Village.", "Travel the canoe to the Champions Guild.", "Travel the canoe to Lumbridge.", "Travel the canoe to Edgeville."); + player.getDialogueHandler().sendOption("Travel the canoe to Barbarian Village.", "Travel the canoe to the Champions Guild.", "Travel the canoe to Lumbridge.", "Travel the canoe to Edgeville."); player.dialogueAction = 122; } @@ -660,7 +668,7 @@ public class PlayerAssistant { int reqAmount = 10 - player.getItemAssistant().getItemCount(1963); switch (player.getItemAssistant().getItemCount(1963)) { case 0: - player.getDialogueHandler().sendPlayerChat1("I'll go collect " + reqAmount + " bannnas then come back..."); + player.getDialogueHandler().sendPlayerChat("I'll go collect " + reqAmount + " bannnas then come back..."); break; case 1: case 2: @@ -671,7 +679,7 @@ public class PlayerAssistant { case 7: case 8: case 9: - player.getDialogueHandler().sendPlayerChat1( + player.getDialogueHandler().sendPlayerChat( "I'll go collect " + reqAmount + " more bannnas then come back..."); break; @@ -933,7 +941,7 @@ public class PlayerAssistant { } public void handleEmpty() { - player.getDialogueHandler().sendOption2("Yes, empty my inventory please.", + player.getDialogueHandler().sendOption("Yes, empty my inventory please.", "No, don't empty my inventory."); player.dialogueAction = 855; } @@ -1539,7 +1547,7 @@ public class PlayerAssistant { } else if (player.tutorialProgress < 36 || player.isInTut()) { player.getPlayerAssistant().movePlayer(3094, 3107, 0); player.diedOnTut = true; - player.getDialogueHandler().sendStatement2( + player.getDialogueHandler().sendStatement( "Oh dear you died! Go back to the step you", "were on to continue Tutorial Island."); player.getPacketSender().createArrow(3098, 3107, player.getH(), diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java b/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java index 976658ce..19a87239 100644 --- a/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java +++ b/2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java @@ -53,6 +53,18 @@ public class PlayerHandler { public static int getPlayerCount() { return playerCount; } + + public static int getNonPlayerCount() { + int count = 0; + for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) { + if (players[i] != null) { + if (players[i].playerRights >= 1) { + count++; + } + } + } + return count; + } public static int getPlayerShopCount() { return playerShopCount; diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java b/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java index b55e3b41..5c279adb 100644 --- a/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java +++ b/2006Redone Server/src/com/rebotted/game/players/PlayerSave.java @@ -91,6 +91,9 @@ public class PlayerSave { case "isBot": player.isBot = Boolean.parseBoolean(token2); break; + case "hideYell": + player.hideYell = Boolean.parseBoolean(token2); + break; case "blackMarks": player.blackMarks = Integer.parseInt(token2); break; @@ -555,6 +558,8 @@ public class PlayerSave { characterfile.newLine(); characterfile.write("isBot = " + player.isBot); characterfile.newLine(); + characterfile.write("hideYell = " + player.hideYell); + characterfile.newLine(); characterfile.write("hasStarter = " + player.hasStarter); characterfile.newLine(); characterfile.write("bankPin1 = " + player.bankPin1); diff --git a/2006Redone Server/src/com/rebotted/integrations/discord/commands/Players.java b/2006Redone Server/src/com/rebotted/integrations/discord/commands/Players.java index 8138436a..506d3347 100644 --- a/2006Redone Server/src/com/rebotted/integrations/discord/commands/Players.java +++ b/2006Redone Server/src/com/rebotted/integrations/discord/commands/Players.java @@ -12,7 +12,7 @@ public class Players implements MessageCreateListener { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::players")) { if (PlayerHandler.getPlayerCount() != 1) { - event.getChannel().sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online."); + event.getChannel().sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online (" + PlayerHandler.getNonPlayerCount() + " staff online)."); } else { event.getChannel().sendMessage("There is currently " + PlayerHandler.getPlayerCount() + " player online."); } diff --git a/2006Redone Server/src/com/rebotted/net/PacketSender.java b/2006Redone Server/src/com/rebotted/net/PacketSender.java index be9353e7..18222a3d 100644 --- a/2006Redone Server/src/com/rebotted/net/PacketSender.java +++ b/2006Redone Server/src/com/rebotted/net/PacketSender.java @@ -1,13 +1,13 @@ package com.rebotted.net; import java.text.DecimalFormat; - import com.rebotted.Connection; import com.rebotted.GameConstants; import com.rebotted.GameEngine; import com.rebotted.game.content.combat.magic.MagicTeleports; import com.rebotted.game.content.quests.QuestAssistant; import com.rebotted.game.content.skills.SkillHandler; +import com.rebotted.game.content.skills.runecrafting.Tiaras; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.items.Weight; import com.rebotted.game.items.impl.LightSources; @@ -141,6 +141,7 @@ public class PacketSender { player.getItemAssistant().setEquipment(player.playerEquipment[player.playerWeapon], player.playerEquipmentN[player.playerWeapon], player.playerWeapon); player.getCombatAssistant().getPlayerAnimIndex(); player.getPlayerAssistant().logIntoPM(); + Tiaras.handleTiara(player, GameConstants.HAT); player.getItemAssistant().addSpecialBar(player.playerEquipment[player.playerWeapon]); player.saveTimer = GameConstants.SAVE_TIMER; player.saveCharacter = true; 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 81a9a1c7..42d56a7f 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickItem.java @@ -7,8 +7,9 @@ import com.rebotted.game.content.consumables.Kebabs; import com.rebotted.game.content.consumables.Beverages.beverageData; import com.rebotted.game.content.minigames.TreasureTrails; import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.skills.core.Prayer; import com.rebotted.game.content.skills.herblore.Herblore; +import com.rebotted.game.content.skills.prayer.Prayer; +import com.rebotted.game.content.skills.woodcutting.BirdNest; import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.items.impl.ExperienceLamp; import com.rebotted.game.items.impl.Flowers; @@ -167,7 +168,7 @@ public class ClickItem implements PacketType { break; case 4155:// enchanted gem - player.getDialogueHandler().sendOption4("How many kills do I have left?", + player.getDialogueHandler().sendOption("How many kills do I have left?", "Who are you?", "Where are you located?", "How many slayer points do I have?"); player.dialogueAction = 145; @@ -215,18 +216,18 @@ public class ClickItem implements PacketType { player.getPacketSender().sendMessage("You do not have enough inventory space to do that."); } break; - + case 5073: - player.getItemAssistant().handleTreeSeeds(itemId); + BirdNest.handleBirdNest(player, itemId, 0); break; case 5074: - player.getItemAssistant().handleRings(itemId); + BirdNest.handleBirdNest(player, itemId, 1); break; case 7413: - player.getItemAssistant().handleNonTreeSeeds(itemId); - break; + BirdNest.handleBirdNest(player, itemId, 2); + break; case 2297: player.getItemAssistant().addItem(2299, 1); diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java index 3ddf4e31..733e1b33 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java @@ -278,10 +278,6 @@ public class ClickNPC implements PacketType { NpcHandler.npcs[client.npcClickIndex].getY()); NpcHandler.npcs[client.npcClickIndex].facePlayer(client.playerId); client.getNpcs().secondClickNpc(client.npcType); - if (Pickpocket.isNPC(client, client.npcType) && !((client.underAttackBy > 0 || client.underAttackBy2 > 0))) { - Pickpocket.attemptPickpocket(client, client.npcType); - return; - } } else { client.clickNpcType = 2; CycleEventHandler.getSingleton().addEvent(client, new CycleEvent() { diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickObject.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickObject.java index 6fb18350..b10f2a91 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickObject.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickObject.java @@ -7,8 +7,7 @@ import com.rebotted.event.CycleEventContainer; import com.rebotted.event.CycleEventHandler; import com.rebotted.game.content.minigames.castlewars.CastleWarObjects; import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.skills.core.Woodcutting; -import com.rebotted.game.content.skills.thieving.Stalls; +import com.rebotted.game.content.skills.woodcutting.Woodcutting; import com.rebotted.game.globalworldobjects.Doors; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.objects.Objects; diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java index 2e6aeedc..4cf26808 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java @@ -8,10 +8,10 @@ import com.rebotted.game.content.music.Music; import com.rebotted.game.content.music.sound.SoundList; import com.rebotted.game.content.quests.QuestAssistant; import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.randomevents.RandomEventHandler; import com.rebotted.game.content.randomevents.SandwhichLady; import com.rebotted.game.content.skills.cooking.Cooking; import com.rebotted.game.content.skills.cooking.CookingTutorialIsland; +import com.rebotted.game.content.skills.cooking.DairyChurn; import com.rebotted.game.content.skills.crafting.LeatherMaking; import com.rebotted.game.content.skills.crafting.Pottery; import com.rebotted.game.content.skills.crafting.Spinning; @@ -56,6 +56,7 @@ public class ClickingButtons implements PacketType { Climbing.handleLadderButtons(player, actionButtonId); Specials.specialClicking(player, actionButtonId); DialogueOptions.handleDialogueOptions(player, actionButtonId); + DairyChurn.churnItem(player, actionButtonId); if (player.musicOn) { player.getPlayList().handleButton(actionButtonId); } diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java b/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java index 9e579965..9f80e917 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java @@ -7,9 +7,9 @@ import com.rebotted.GameConstants; import com.rebotted.GameEngine; import com.rebotted.game.bots.BotHandler; import com.rebotted.game.content.combat.magic.SpellTeleport; -import com.rebotted.game.items.ItemAssistant; import com.rebotted.game.npcs.NpcHandler; import com.rebotted.game.players.*; +import com.rebotted.game.players.antimacro.AntiSpam; import com.rebotted.net.packets.PacketType; import com.rebotted.util.Misc; import com.rebotted.world.clip.Region; @@ -41,8 +41,46 @@ public class Commands implements PacketType { } public static void playerCommands(Player player, String playerCommand, String[] arguments) { - switch (playerCommand.toLowerCase()) - { + switch (playerCommand.toLowerCase()) { + case "hideYell": + player.hideYell =! player.hideYell; + player.getPacketSender().sendMessage("Your yell visibility preferences have been updated."); + break; + case "yell": + int delay = 0; + if (player.playerRights <= 1) { + delay = 30000; + } + if (!AntiSpam.blockedWords(player, playerCommand.substring(5), true)) { + return; + } + if (Connection.isMuted(player)) { + player.getPacketSender().sendMessage("You are muted and can't speak."); + return; + } + if (System.currentTimeMillis() - player.lastYell < delay) { + player.getPacketSender().sendMessage("You must wait " + delay / 1000 + " seconds before yelling again."); + return; + } + for (int j = 0; j < PlayerHandler.players.length; j++) { + if (PlayerHandler.players[j] != null) { + Client c2 = (Client) PlayerHandler.players[j]; + if (c2.hideYell) { + return; + } + if (player.playerRights == 0) { + c2.getPacketSender().sendMessage("[Player]" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); + } else if (player.playerRights == 1) { + c2.getPacketSender().sendMessage("@blu@[Moderator] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); + } else if (player.playerRights == 2) { + c2.getPacketSender().sendMessage("@gre@[Administator] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); + } else if (player.playerRights == 3) { + c2.getPacketSender().sendMessage("@red@[Developer] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); + } + player.lastYell = System.currentTimeMillis(); + } + } + break; case "claimvote": if(!GameEngine.ersSecret.equals("")) { final String playerName = player.playerName; @@ -101,7 +139,7 @@ public class Commands implements PacketType { case "playershops": int count = playerCommand.equalsIgnoreCase("players") ? PlayerHandler.getPlayerCount() : PlayerHandler.getPlayerShopCount(); if (count != 1) { - player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online."); + player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online (" + PlayerHandler.getNonPlayerCount() + " staff member online)."); } else { player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online."); } @@ -361,20 +399,6 @@ public class Commands implements PacketType { player.getPacketSender().sendMessage("Player Must Be Online."); } break; - case "yell": - for (int j = 0; j < PlayerHandler.players.length; j++) { - if (PlayerHandler.players[j] != null) { - Client c2 = (Client) PlayerHandler.players[j]; - if (player.playerRights == 1) { - c2.getPacketSender().sendMessage("@blu@[Moderator] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); - } else if (player.playerRights == 2) { - c2.getPacketSender().sendMessage("@gre@[Administator] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); - } else if (player.playerRights == 3) { - c2.getPacketSender().sendMessage("@red@[Developer] @bla@" + Misc.optimizeText(player.playerName) + ": " + Misc.optimizeText(String.join(" ", arguments)) + ""); - } - } - } - break; case "mute": try { @@ -472,6 +496,23 @@ public class Commands implements PacketType { } public static void adminCommands(Player player, String playerCommand, String[] arguments) { + if (playerCommand.startsWith("getid")) { + String a[] = playerCommand.split(" "); + String itemName = ""; + int itemCount = 0; + for (int i = 1; i < a.length; i++) + itemName = itemName + a[i]+ " "; + itemName = itemName.substring(0, itemName.length()-1); + player.getPacketSender().sendMessage("Searching: " + itemName); + for (int j = 0; j < GameEngine.itemHandler.ItemList.length; j++) { + if (GameEngine.itemHandler.ItemList[j] != null) + if (GameEngine.itemHandler.ItemList[j].itemName.replace("_", " ").toLowerCase().contains(itemName.toLowerCase())) { + player.getPacketSender().sendMessage("@dre@" + GameEngine.itemHandler.ItemList[j].itemName.replace("_", " ") + " - " + GameEngine.itemHandler.ItemList[j].itemId); + itemCount++; + } + } + player.getPacketSender().sendMessage(itemCount + " IDs found..."); + } switch (playerCommand.toLowerCase()) { case "clearbank": player.getItemAssistant().clearBank(); diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ItemClick3.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ItemClick3.java index 92cffcfe..14db528c 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ItemClick3.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ItemClick3.java @@ -1,5 +1,6 @@ package com.rebotted.net.packets.impl; +import com.rebotted.game.content.skills.runecrafting.Runecrafting; import com.rebotted.game.items.impl.HandleEmpty; import com.rebotted.game.items.impl.Teles; import com.rebotted.game.players.Player; @@ -33,6 +34,24 @@ public class ItemClick3 implements PacketType { player.endCurrentTask(); switch (itemId) { + case 1438:// Air Talisman + Runecrafting.locate(player, 2985, 3292); + break; + case 1440:// Earth Talisman + Runecrafting.locate(player, 3306, 3474); + break; + case 1442:// Fire Talisman + Runecrafting.locate(player, 3313, 3255); + break; + case 1444:// Water Talisman + Runecrafting.locate(player, 3185, 3165); + break; + case 1446:// Body Talisman + Runecrafting.locate(player, 3053, 3445); + break; + case 1448:// Mind Talisman + Runecrafting.locate(player, 2982, 3514); + break; case 4079: player.startAnimation(1460); break; diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnNpc.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnNpc.java index 80af46b9..dc1ab597 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnNpc.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnNpc.java @@ -29,12 +29,8 @@ public class ItemOnNpc implements PacketType { player.faceNpc(i); switch(npcId) { case 43: - if (NpcHandler.npcs[i].requestTransformTime(player, 1735, 893, 43, 42, 50, i)) { - player.getItemAssistant().addItem(1737, 1); - } else { - player.getPacketSender().sendMessage("You need to wait for this sheep's wool to regrow!"); - } - break; + NpcHandler.npcs[i].shearSheep(player, 1735, 1737, 893, 43, 42, 50); + break; } if (player.getItemAssistant().playerHasItem(995, 1) && npcId == 736) { player.getItemAssistant().deleteItem(995, 1); diff --git a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java index 3db0c9c6..0760c796 100644 --- a/2006Redone Server/src/com/rebotted/world/ObjectHandler.java +++ b/2006Redone Server/src/com/rebotted/world/ObjectHandler.java @@ -5,7 +5,7 @@ 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; +import com.rebotted.game.content.skills.woodcutting.Woodcutting; import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Client; import com.rebotted.game.players.Player;