From efcf707f2dbc2cc1bd25fc9c0d8b41b7e28f6c18 Mon Sep 17 00:00:00 2001 From: gc <30398469+gc@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:39:22 +1100 Subject: [PATCH 1/6] Wiki changes and new changelog --- docs/public/images/huey.webp | Bin 0 -> 10042 bytes docs/src/components/Update.astro | 77 +++++++++ docs/src/content/docs/getting-started/FAQ.md | 31 ++++ .../{changelog.md => changelog.mdx} | 61 +++++++- docs/src/content/docs/getting-started/wiki.md | 8 +- .../content/docs/osb/Getting Started/clues.md | 147 ------------------ docs/src/content/docs/osb/Skills/mining.md | 2 +- docs/src/content/docs/osb/clues.md | 139 +++++++++++++++++ docs/src/plugins/authors.ts | 3 +- docs/src/plugins/items.ts | 9 +- docs/src/styles/main.css | 28 +++- scripts/wiki.ts | 26 ++++ src/mahoji/commands/clue.ts | 6 +- 13 files changed, 367 insertions(+), 170 deletions(-) create mode 100644 docs/public/images/huey.webp create mode 100644 docs/src/components/Update.astro rename docs/src/content/docs/getting-started/{changelog.md => changelog.mdx} (78%) delete mode 100644 docs/src/content/docs/osb/Getting Started/clues.md create mode 100644 docs/src/content/docs/osb/clues.md diff --git a/docs/public/images/huey.webp b/docs/public/images/huey.webp new file mode 100644 index 0000000000000000000000000000000000000000..153495c584c7376c31b9922d06e6dd12aac8f17f GIT binary patch literal 10042 zcmV-AC&k!ONk&F8CjbCfMM6+kP&iB`CjbC1W55s)4LEGuMv~UD_vQwk?Z4pJr-g|A zPk^o^KNdnNm4InwTt*WXJr}bLQe`M|sUr%mMaG3%m#kO55#U}@K zo3q}g^B;}vob@LjkH_T!Nw#g($->>WO)>vbP_$_}#697q_`F=GFa4hY80=|jZvleu zvz0za7cmXIuXA>I?vtS=oaoosp_MyHJc(5A>30GrNlE=Ka+ph9i&~z^8d*1^_0uxl zHQqxZIJ*yb|CE$Iu}hJ^)U5T(1IBQ1FY&r0bVccw15GKD0~$Y{HZwO27vRfWj&O!0?Zf5-?>7Ajlwr z8dmUfZ$yG+M+i~J5P_#P0MvPaqk~ILJ#8X<-QpqSXl7O2md2d`a zDiRcl5L6sJ0n9-Pz|B%}Wca6NT9f!!z{N=5Qz>L7OlvAYC?kcb7o2gS$2tHPjb>%a zAlq+XxeFM=>pBFRB%pNa-dWeL3|TU4*!0+l2Lgh&ZIgsQ>uo=Uh?oFCppxF9qMdg& zhf7zP-GkZe)v{N3H;*E zzqKESZCh7sQG#UKv~AUxYn^A?wr%6vwp+Gs+qP}n=2Pq2HqKgeI&d3FkzC7+cfDWm zWZSkXNw#gZKE_-k3I@*Zq0P*D2Y1lGZg=lLCG|*nki)_fJtCVm=3IiNx%$0J@0e&^c~5zYTLGLd6e4v z> z{~B(=v$gGMB-*z1iOdelh>Xs?4`ya&W@hFwilYeSQ5$6{@fbHSipnBL6HxMDs5+Ts!Ld-pzr_c8E$hkIt`_j@?k zOxvXHD~@AJdis$h$+d0Uw#+@UqqX{g3vCPvuy@@yzp2e_Zq{iRW^)S;*jtNmO0;bm zvaNX{^4Ydqe&4ojqi6PP+qP}?ZQHi3s?3N00j|06XbA!U0PbCr&T|0DcQ(v=f@k~O zYo7!BvdTIV@Hha#=YFMQu2>0!PQR&r|BtQ^K+k9UrKrD)x?-Rwww!xnVHZC;5(K7? zmUYX0J~|hD1o#Eu@uQrSJ0DsbgHzBTm)HjGJFVYudsO|hlXBtV^w%5LwearE_ui@B z#05>Cpg{xO?9~lN)-}c6zI&yHt_~DZguMA~5>#O}t*U#wQn) zBt75(1a%P7PGqZi%V7gkGI|Zgkh*T1bFA2IvFye)GtHt){W<@16;;{@0q8|1Nu`an=zwY0(pRJoIu? zx1k%e9Q8;EmjWh1C6y)&&E^8zD^gfotrD9NZZ8K3wdyq$fU@EyOaP3Z^S4EVvzJwp z&ASI3%YoerTc;K4gjy%14P-}%2-I!1WWYmygqMC{MnCVJOaq{~|JUuHB7d?mXMUpN zll`lBrI1=tq;$zPl%w9Kzm;?Z+YK29iy;w`QXoFbVf`q`;w(tQIM=g4UDVV>lXw1Y z7(i-Ux(O8-{;zbeb;MO2Ab#rN{YhIdV5peoV*GgH@hko=p|7Xp~e~JhWfDVTiEsjAW z5-9D_G<)}kRDbA$6w{RdZ=1LT)9cG~44=2Jx{Nb(m=kqR} z|3j{RgTp)b{()liX3ztNi_sU;OhfB!mNJ zU>(8S!U&822OwUJO$cKBgz)ypSM>7%yD`HM*IMdshGol=7f^ zknAJWdy0EiawdFDCPBRPtS-S5p%YaGf&u`*8*{#{k^lAxzZG8BWU}8ae0|~R$cbDj?t)mj|-CA!3Lq5(t~3RjC(}59SfxiWi|^mT9TDHM##h0dOL~ z+uyAvvd~^ocEdI?OxLINSz7=ewMhg1@-I3$Io4GIDgXd@+qeDZOqfn{ThxubFM$*#2Wd)#(tS-WZ}_Kv!ogV=SwX`eSwQyb$m| z001<;oW_6u?S?NLyuKXOb6CIcJsoSrVTLte&&(ugHC5NE@~J!Z50H7Z7j1LDA8R_$ z`1i*9@4IIS^dGJp#K{Ef9=oCWCzc*%Nsu1#_^llEd|%(Uu|YQC%*a7xW4~1A|Iqln zNOq~cKA4VFA+;46zhDMpR?KE0X3csBjfiFWwi^TGrV0-DPvvd`3v7 zPLQ9Dybg85&#Y4abakCP2FgjUw3Q^E-{MrZck-T2K!ZN#f9wbUI^w;re_BERKhpv; zTgPNALs#16urwW3T!u*1Qn_`eO5rL*=tBH3xwmwNAhcdZtqp+NhIryHmr>ELEH$NX z{;JP^!YM<3#PYLxzKM??;PXeyw@C>Me-MVh@(lSgq&(V*C*}zcZxMP}g&cERN8&ChkI7kq( zm<;1CjeYf|XOSwXnw#IC6eftFI3l`;7_6iPhRx0W7gxpd$ft-Fma?AVP_?;^x)6%8 z_}Pk}rmL4K^h2VKd|l~?LzX~v> zf)@QL{m*Xf_woM`rA=WmASL3YZJfJ=+!#J!d_P4m4#d5%!Nu@_(ib70sT>lqAiyO9TF$WRk1=)l%lW^~IOiqqsClLgL*hKkcT+AT^aVmBqEQ6`& zu%Yn_CWufdG6LB|$xT3_NeG9fFi==xg&UA@h?jP4`YH9Mk`bXdbfO!+ei~ykBs3gQ z(`OPyjF^p5vPJ-;)O{eo}7m@5kf6%S8q-E4R<12(Q#COc-4lTF|=2O}q-~-zfbw zq+kdN5J(dcSPVj_aH-Lw%7rhnxYX>`v0@r z`N{qC|ElGiV=t@q*xOk;D%8dQnq_hDstKdJEH1+VqXI@$>87KQPg~*qKf7um3>k_B z0D=Mlz-DBWY5FvyS zWB>vL00Kfl0er)s{~t;C0-~CFtagXJ_TSgo@x|asjfD|dZq+{yQi)2NDx|4T?6BO& zaIJD#oVZfNY|!C`iVZ46F}^ZWHC9hmHXc4-bj%XzRBoZTgvKBG7sI{}Y!mv57&4L=FT1AOJxS zBr1GL-Y=d*$li9lilo498D~$*Hj61sCQw-RPNp&eY@e&9~ZxZczn^^vqw zNyh^rI>yzs40j5xO*D1_dXXTYawqM=>eZ1icKT$q|CAe`Mure#mv#x+<&K~if}&Ko zU!VrSd~CY7^yaq@z-BcAwacS|;S-no@{!Z)L-dS*Ro{94B&H+(7i$q4ZK*|MP*o(r z0EQ5y079~pO6cb7nR1!ql zfPrZdUl;o&9LnK-F3&+Z`daM^;Mj|OC?Du0%<=6j1Axg?aj0@Lp{h3JoTtk1^@hu8adA5Aj8SpJ zyEl_1%D+c(bRs@3-5(&Mgnk6GNWcb6LR|7~#C}QrnfKvDq#zY!D)OrZF7}fbQl%VI zbMxK*lHB@P$gF(ap(9A`OtV4BH##$N!!I6U@0QJ~FmKsB<-`3hd@ZGh2 zVQ=_KnM>oMJ%7CG<9*QeuYZ$hD1PcxbVZ%C&HRBI9+dAczj@xl`ZbLY5|EfoHt>V_ zR7|w-nYct~!vrG3iw#<03?FQ>ht$fbi>7EzE!=`tk{AL8l@*bLQ8u4OlA^8T|1;Un z3P;|*YI(>*vVQZ*y5CVB-{XBj_u>5!zE<}O@@sb0{WG1n@$n<^oxc9)7Mbd&?C<>= zfY?x8Av1xK23p=&5s;hg3W;JE>}Vd7Xx;3fl{WtaegD4ZOi2LE#muV@c0Ln(#_Pkb zCX)3fg4?XFgKc->)$-TdveQ5K&ugI5uofgswkktHkm40Rd|{|WB)C}mSZcY&HqjY# zktGqS48Fm{6Z<_#Z7`@DgBk-T*-{%xh9JC;i&^a7H77y(kWi`{)BVim<7>SO@jiou zt9*)+?h66=um!(({?8v+`crNKe7pND%`0e*0EzMLl05!ujfzc-X%QSUlT(|A$TUpt zYeoMDl&Ag*s&A|LE6#oaS3ml)rH&2N>ckx)tr}BEL-V|-uO8U;-VfeV?mCpGF0F1& zstg%U5D_nyn<13k1j>Ef!F?4{kcq6ZL<^^QMxR8;NW5Gepqq#k6AFO@0)u4=p&}#% zC3;+bHCOzRhomOayymy(S-rh+sS!&6N9^)Gfd?Z@9=7KsKi7clv3{-4Spa>1x~-Sc zEJWhQ?!V3RS9+w<9W2w$v{1&WwrW}@Y`Kk^Q-Iu51Qmez|F44q-p)nb=qb4(^a$1F zF#Sn6AFez5|K+nM{Qeht%DmJ@xKgEdY~A0*6rSt zK`gowS3!yhm0<8054?e4%3F_)Xh>b1zhYbfZymARR0UEd^X5 zG1x54#jZ;^i?{T4_Ii7}x3@HRqZ)}K&h01%0TaZ7L*rm1_%};#Xmq7V=DmE%HZPLT zkH40-8JT0IH*ToRaTopYkkzc!^(lrt1c49~3`HU6d9>TtGy9==6!4k~05B46_I3#O z*%=;|O>Jm&trPAxslHVaMmo-evw=ROAQAAAS$WBT?%=RqJoL2FcTi;IG>pycoQ=*w z8=J}|OZM;9`o7I|oR|O%hIW!&@f=MiOqh_eJtMPjx``3t9_OwAqMI8t=zkbQXUP=z z3(X0(hP#OeWc-w+vi5G<OSBK*wnWOLf{L!Dn=_1Z^!`8Z!aS#H)k&sA2 z0=Rv?J+|lE1HZSA$q)cchG$^}tOmCG+5TY-l*2rqo>gt4!dNo|$bL@>4y@aR%YnmEMC zR5o3O^=6Uny$bT?VTri8-0X-T6XX^Ta0rOV7#U7Y9u0nFc#(}qTAPvD3egJoCCB_{ zEgoI{F8~MXd5zOOd=MEF0T2SAh)~2?@1Azs89%k1UIBPgflx@TRM`K-eOj1Q^(LKV zHOIk?sTbQi91xNJ?aL!Y(?3+;ck*)oy_OI67R`B`)x9adWOH@P{^ZA>R=d91tXOG+ucK`OLOeL$fI9*)C0=gv)YL`;CSU;nzJfCk$MsWpa38!0^V}7pSlfAn+MRf8^6If4t)p?^sF=uA<^%Z*g%At%Q^zr34Tc zU7|!07$GS+LLRAxV?3yew-I&6W0a2Z$`Omy(q(&i^2_zl7waqco55%WqvA#&5fq6AMIkr>AybSu;E^2(z;cYh zv!ic>D!VeqfU!Z9zklKWjt{-fBSs6RPAtZ3cCX4a@mo6pfC>Nr6`<4gF{J+}GJ*gQ z0f@$@%tF59a9~=NfKb*eh64bPtu0^ghXjCo;W{n&Wy0r*z5cG8h!^q*5o#q9sRL4h zL?l2GLqP$BklbvS!wZzij|?|tQO5y4!md1Zxw>>@GXm34IDt2mGqYW`CnuZjj%HqK zo;%Ao68mGv`7{5!0)18y04DDO|BAhpSz=9XRm%Syj7vosRaG_e+qxcJ?`+9{Qy!KK zAnCDs>P*YmQTusG{R%-DZh-5}4x(sMcU(k?2pkZEBH;uGDVuoaeQ*qZ4f3j>z;)S| z7xDF1zW6=Ax_KG1x9yoQ1&>4=#%4X~!Y-8t<4EKPHdST_U=RR+7LZ@x`%3S|J&l~8 zYCy&=H8MbMBgkIXpSfWj4LJGre*&<<@v-r%_w9n5hzOQ(Q#WPe&R$;IqefwfE+qo4 zzBl)niUBg&D571(wiLACoiF^-{Orfn8wYs-{40FR=`YQ*H=vBgqlS<%Z9;0y<1p5O zD(FZC0~s*@000{Tu$ENTwcEL9T|x*$D1$xgqKH1 z1p%s*6bz%VhKyo#j7qHwBCPtL|L$9t`~!YYL`+=&e~mqaAb(w`vBRv;|A2Lqy1 z!vNqez)!{!zyV4Oqly7M9G&I~a#FWTW3n}rb?aZ`(6K}BM*;ctuRP0hf$)*8%;L## z#Aei;LVR`Zp;L^ zG)zc!B3fr`<8Kc!I+@f0vh+hfh5?W=ibNogBX%QiW!=c%7dGu>z@r-*nMt;$N()LH zUS0$Q`LX1O=rsTm6Kj$KFbDzwQ1)RT7<>0xEsyZ|i6lnrFM+@1)foP(wbTA4A zI7OlY(bCMitGp!GN4>Ya*x4O%xEy<;sbq66endBbAP4|MIUqd3>s#zm&;|gYVWe5c zU*akRfe8k!-T*R1kuzv3kKdjG;K#>aXV}Pa%?$Kc+f?c9P`YsD4#yPH)~%QgHc$C&)k3WiEj_yNjTC7 z3<#J=8<5Q74HSg`Z~&R^a6J7scF90OV^iMEYk(o5pH%Vi(D&~KKn4E)pCEu_tOT%| zizf_FfFHvi1jYcD3Z!G46b2Nh#?U|nN|c?qUEKTjzirR|Iz=sGjLda8!M5Xj;v4^U zk1w%77R7H66BuB4b1#;E&)?C5A^<@Epv*F+Wn9=HN6^*YbrjVp9}2djR}TPi=JVa4HZR-FodPYtwW|TaJIx!Aw&2?rXu#3meUgA!c-t) z)l888PQTD!FS#>b*s$0=fU%4t4j_nq@aug4J(nS<2!aI2Q5{F*W*8O6|Q$# zKnJ7^3E*wN_VvbQdjq1Rq|hEoC?FyvpeU{-zrO+lQ*5A1Y^oGw9CLZ+Iq1k8iYP+B zoIp*9MFW9gVGIB-3UNmYJRPlJ44i+5?Tvm}0X+$aM-BVH)#Wc}mgiD z0S-p1q9TsY>^D`MHes#t{+$Gz1_FWYppO zB2y^z!}W937^XIbVSJcA@DCdOc~tj+U0ZJmP=oK_02T-eL5Pv4Wga;I!^nvwht_?^ zXMfC)lc!~k12Qd2Lxurk%rY2ARBB9eSUU9J1H&C$Ryj(U)vOXw002OtZc=I-V!(@0 zGE42P9{fy=-l6wn`Nu>5O5C52t`F`<=|3g`7*jB`Sxb)`1OVXx$Avu*3f=%SEyzoC{Q84a)y<`Ap8G#rA5H#juC=gIMM-flH-PHDP z-S&QQE`dA0GRfVPEsqnpKV}1STF{#Yvo8blE6Z18MvN%T9m~O3o@~Y#VE`EAW^6`# zQHu@-^umF_Y{Dl#_)y{lW{knX)F6>Dg&$Br_~hK70D(CSg+RzqFa$vXLM?wi{3Fq- z4Kp1F!0=yNyStVa0bR-VE264!D97-T*XOBxN~52QG8{|vgO}Tfai^IfF_y9ixD$jU z;`Xqd5Or`&9ooU-aKkP}-8g^@haef>GC~HlA$aI8Muz|x7NA{$|M@dd#ug^PnjPQ4 zT=2mgp2}HUbpS2;D`$0XrKo#)PhD2*uBLqyzU#}3QLZ_<^v#N^m@u2d9%W8k4TS;Y zXl4Mzn9zp9uvi$}fr%G!1_s*e@+QCs_e=u_3@nJ@00jVCTm*#x42`NV&^9OZfJw={ zH+$z(K|DN1Q~&R2mMLD851D`ZphvR27eXnBO8}&0@Jlc_0}Q)zFA7IPSjthOMh)MY zJ9e)_!lj~(HoSwy7hQB`bw!0!A%)gK(UNSEz<~Q>dr%|n#{!2opny=+5uzXfpfR|D zNoVakb^=TYND&y(b;u#7m7Pd2o9{w>2>37;cI5cNGt@d%dRd z{!~jYA@5w=>-6Z}Ys|e=L@mb&YsiTeztLuB!iWs+e zwBzo1a4p;GE3E(50 zj*IWv7Z5m*Cg4yz){XyL9bc+A3oLv#64XQ}k2nz{ZeO=%lU!7q~Po2}O7yOZ92#C1gzdN-_bw z&z6@0Qsu`3`vi6OnpxRKZA+da&pa^sn@YUqx_?0`d+gdn*U_CuVU#?o4Z!DN@60wo zwPp+fb1+AocLYOLyt90^Z;;Wg%sNop$L+_#V|%^%4#6WfXAi~Z%LTpV#>9w!(3PV{ z;XybQ$kW|+LwmD_YUYrvFlEFbWdE9o>PS~gXmDDrB#H@4iYX+Kmmph`Z}52nJ_JYv zq|;s;Fy>>1Ed~kscc*YcZeO72M1iM-9+O?3?3sVa)nl>yj_b+oQwt_t-qsn?KaRDw zzTQ3Jj?JFlKJFg7_}2uu6~2Tw0QUhddE{x``haP>tLbv&g@c#cM_crod(&^|r2q3ZBF6P>z-CoLV+r9QjwncW>TjSOZ zcC<X0_Es(`R(R2+A1I zP3--zX+UX|MaF?TK|fL{Kp=4_&Ka3J<> zCMR@CPpF|B9H^2k6L01UTe#-s(RM#>V;1O!kAf1G%dpaK8@F8}~g+$9IU^SFAc>Ay3|2d|F! z(|^AJc*r-OM;&v`J8ls!)c9I8hzcT=NElQ|mB}#}(4pu-jhJLPtPDR-C7=SpY!tM@ zYD#L1#IBP-ee%c2Co(^lMqLqyM_k;!F*7FQARt_-jt~5$0AO-z58L_jxP))`_Ijt| z2+1+g2>qie_2_3x`WvVbKu-tU^>EIPz6!wKf4h+_deJ(!ecki7H@K%8&8LH9|90Z_ QeB!v>WEKNn2f*tD0F8PQpa1{> literal 0 HcmV?d00001 diff --git a/docs/src/components/Update.astro b/docs/src/components/Update.astro new file mode 100644 index 00000000000..1e76da7be7b --- /dev/null +++ b/docs/src/components/Update.astro @@ -0,0 +1,77 @@ +--- +const {firstHash, secondHash, isNew,date} = Astro.props; +--- +
+
+ {isNew ?
+ New +
: null} +
+ Released {date} +
+ +
+ + + +
+ +
+
+ + + \ No newline at end of file diff --git a/docs/src/content/docs/getting-started/FAQ.md b/docs/src/content/docs/getting-started/FAQ.md index e396e4264df..8a78c95004a 100644 --- a/docs/src/content/docs/getting-started/FAQ.md +++ b/docs/src/content/docs/getting-started/FAQ.md @@ -89,3 +89,34 @@ Here's an example: `/create dharoks armour set` to turn items into a set, or `/u The bot says it needs permission to ‘Manage messages’ in order to use a command. ### How do I do this? Server settings > Roles > Old School Bot (The auto assigned one) > Turn `Manage Messages` on. + +### How do I create a Ornate Jewellery Box? + +_The recharge spell has a minimum quantity of 25, so we'll be creating 25 of the dragonstone items (26 for RoW)._ + +Bolt of cloth `/buy name:Bolt of cloth` + +Gold Leaf `/buy name:Gold leaf quantity:3` + +Ring of Dueling `/craft name:Emerald ring quantity:20` \ +`/activities enchant name:Emerald ring quantity:20` + +Games necklace(8) `/craft name:Sapphire necklace quantity:20` \ +`/activities enchant name:Sapphire necklac equantity:20` + +Skills necklace(4) `/craft name:Dragon necklacequantity:25` \ +`/activities enchant name:Dragon necklacequantity:25` \ +`/activities cast spell:Recharge Skills Necklace quantity:1` + +Combat Bracelet(4) `/craft name:Dragonstone braceletquantity:25` \ +`/activities enchant name:Dragonstone bracelet quantity:25` \ +`/activities castspell:Recharge Combat Bracelet quantity:1` + +Ring of wealth (5) `/craft name:Dragonstone ringquantity:26` \ +`/activities enchant name:Dragonstone ringquantity:26` \ +`/activities charge item:Ring of wealthquantity:1` + +Amulet of glory(4) `/craft name:Dragonstone amulet (u)quantity:25` \ +`/craft name:Dragonstone amuletquantity:25` \ +`/activities enchant name:Dragonstone amuletquantity:25` \ +`/activities castspell:Recharge Gloryquantity:1` diff --git a/docs/src/content/docs/getting-started/changelog.md b/docs/src/content/docs/getting-started/changelog.mdx similarity index 78% rename from docs/src/content/docs/getting-started/changelog.md rename to docs/src/content/docs/getting-started/changelog.mdx index 12948144a83..7cdb441d837 100644 --- a/docs/src/content/docs/getting-started/changelog.md +++ b/docs/src/content/docs/getting-started/changelog.mdx @@ -2,10 +2,61 @@ title: "Changelog" sidebar: order: 3 +tableOfContents: false --- +import Update from '../../../components/Update.astro'; -## Update 13/11/2024 [[4fbfe429e9a1bdf817175cf497177e47fefc6be6...e03afd628fd7e1aa460acc417d822c2d697f9087]] + +**Clue scrolls** have received several updates/changes in this update, view our [Clue Scrolls](/osb/clues/#implings) page for updated information. + +### [[Arodab]] + +- Rebalanced clue scroll speeds to more closely match OSRS rates + - Beginner, Easy, Medium, Elite clues got a fairly significant buff (are now faster to complete) + - Added some more boosts, see the [Clue Scrolls](/osb/clues/#boosts) page to see all boosts + - You can now get a larger boost from your minions experience doing clues + +### [[gc]] + +- You can now stack clue scrolls, view the clue scrolls page for more information. Although the bot lets you stack clues in your bank, we are just emulating the mechanic of clue juggling. In other words, your minion keeps the clues in your bank juggled, allowing you to hold them - and your minion can only juggle a maximum of 100 clues. If you receive more clues while at the limit of 100 clues, your minion will drop the lowest tier ones you have to fit higher tier ones (e.g. it will drop an easy clue to pick up an elite clue). +- Boosts to clue scrolls now apply *per clue* instead of to the entire trip, allowing you to complete more clues per trip. +- *'Engine Changes:'* I have integrated the packages we use into the main repo as a monorepo, with the simple explanation being it makes it easier for myself and others to add new things, like bosses. +- The Pharaoh's sceptre is now tradeable + +#### The Hueycoatl +[[huey.webp]] + +The Hueycoatl boss can now be killed using [[/k]]! + +The combat achievements, collection log, and pet have all been added. + +To see the boosts, requirements and all information on the boss, see our [The Hueycoatl on Monster Page](/osb/monsters/#the-hueycoatl) + +### [[themrrobert]] + +- Fixed an issue where black masks (and other items) became unequippable + +### [[DayV-git]] + +- Added [[Book of the dead]] to [[/buy]] +- Improved the messages the bot shows for ammo/charge usage in [[/k]] +- Removed the max quantity of killing 1 Skotizo per trip (as clues can now stack) +- Added nightmare wiki page +- Ensure repeat trips remember your chosen combat methods +- Fix xp received from cannoning +- Prevent cannoning in catacombs +- Fixed a bug with the clue stacking update + +### [[TastyPumPum]] + +- Fixed the messaging/formatting of the mining command + +### [[Luunae]] + +- Fixed/improved some wiki pages + + - Hacktoberfest has finished, and everyone has been sent out their custom merch and other prizes! Thank you to all who participated. - OSB Bingo #3 has finished! Read the page for it for more information: [OSB Bingo #3](/osb/miscelleanous/bingo/#osb-bingo-3-finished) @@ -22,7 +73,7 @@ sidebar: ### [[DayV-git]] -- Fix araxxor boss task requirements +- Fix araxxor boss task requidrements - Allow buying genie lamps with frog tokens - Fixed a bug with agility-alching sometimes picking the wrong item - Improved the formatting of some messages @@ -69,7 +120,7 @@ sidebar: - Added [[Diving apparatus]] [[Fishbowl helmet]] to [[/buy]] - Added [[Crab helmet]] [[Crab claw]] to [[/create]] -## Update 16/10/2024 [[68b130088f5e365ec2a341cae48bc5b353ccc2ff...4fbfe429e9a1bdf817175cf497177e47fefc6be6]] + Bingo! We are running the 3rd official OSB bingo. See the [Bingo Page](/getting-started/bingo) for information. @@ -121,7 +172,7 @@ Bingo! We are running the 3rd official OSB bingo. See the [Bingo Page](/getting- - Updated agility xp/hr rates based on the osrs update (buffed) - Added [[Clue scroll (elite)]] drop to Araxxor -## Update 9/10/2024 [[8de72b2de5a275497c67123904a280981415c553...68b130088f5e365ec2a341cae48bc5b353ccc2ff]] + ### Hacktoberfest @@ -150,7 +201,7 @@ I am running our own Hacktoberfest! Check out the [Hacktoberfest](/getting-start - The [[Emberlight]], [[Scorching bow]] and [[Purging staff]] weapons now act as demonbane weapons. - [[Emberlight]] boosts at all demon mobs, Scorching Bow, Purging Staff and Burning Claws only affect TDs (with the exception of Scorching Bow also being BIS at K'ril) -## Update 6/10/2024 +## We now have a new wiki at https://wiki.oldschool.gg/, and the BSO Wiki is now combined together with the OSB wiki. Many pages are out of date, I'm trying to update pages when I have time. Currently, the only way to contribute to the new wiki is by editing files in [this folder on github](https://github.com/oldschoolgg/oldschoolbot/tree/master/docs/src/content/docs). diff --git a/docs/src/content/docs/getting-started/wiki.md b/docs/src/content/docs/getting-started/wiki.md index fefc43a754c..1c31861c2ee 100644 --- a/docs/src/content/docs/getting-started/wiki.md +++ b/docs/src/content/docs/getting-started/wiki.md @@ -271,7 +271,7 @@ This is an automatically generated list of pages with possible issues to be look [/getting-started/BSO.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/BSO.mdx): Doesnt use the new command formatting -[/getting-started/changelog.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/changelog.md): Doesnt use the new command formatting +[/getting-started/changelog.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/changelog.mdx): Doesnt use the new command formatting [/getting-started/developing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/developing.md): Doesnt use the new command formatting @@ -313,8 +313,12 @@ This is an automatically generated list of pages with possible issues to be look [/osb/Bosses/nex.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/nex.md): Doesnt use the new command formatting +[/osb/Bosses/the-nightmare.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/the-nightmare.md): Doesnt use the new command formatting + [/osb/Bosses/wildy.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/wildy.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. ``) +[/osb/clues.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/clues.md): Doesnt use the new command formatting + [/osb/combat-achievements.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/combat-achievements.mdx): Doesnt use the new command formatting [/osb/Getting Started/advanced-resources.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/advanced-resources.md): Doesnt use the new command formatting @@ -325,8 +329,6 @@ This is an automatically generated list of pages with possible issues to be look [/osb/Getting Started/beginner-guide.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/beginner-guide.md): Doesnt use the new command formatting -[/osb/Getting Started/clues.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/clues.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. ``) - [/osb/Getting Started/combat-skills.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/combat-skills.md): Doesnt use the new command formatting [/osb/Getting Started/gear.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/gear.md): Doesnt use the new command formatting diff --git a/docs/src/content/docs/osb/Getting Started/clues.md b/docs/src/content/docs/osb/Getting Started/clues.md deleted file mode 100644 index 68ce2f51d04..00000000000 --- a/docs/src/content/docs/osb/Getting Started/clues.md +++ /dev/null @@ -1,147 +0,0 @@ ---- -title: "Clue Scrolls" ---- - -## Multiple Clue Trips - -It is possible to run multiple clues in the one trip through opening banked implings. This is the **ONLY** way to run multiple clues in one trip. Using the `/clue` command, you can select your desired clue type, and then the tier of impling which you wish to use. For example: - -`/clue tier:Medium (0x Owned)implings:Eclectic impling jar (69x Owned)` - -Here is a list of the possible clues you can get from implings: - -## Where To Get Clues - -### Beginner Clues - -Obor/Bryophyta for guaranteed beginners (requires Giant key/Mossy key respectively). - -Alternatively can kill men/goblins for easies and beginners. It is advised to send shorter trips. - -### Easy Clues - -Pickpocketing Male HAM Members, send trips of \~50. Average easy clue takes \~1-2 minutes to obtain this way. - -### Medium Clues - -Puro puro is 330 eclectics/hr at high level, resulting in a medium clue every \~5 minutes for time spent. [Tier 2 Patrons](https://www.patreon.com/oldschoolbot) can use "open_until" for the medium clues making this very quick and easy. - -> The **'open_until'** filter will cap at 100 opens. Meaning, you won't open more than 100 of any item at anytime. You will also get a warning if you have a clue in your bank already. - -Killing \~100 guards at a time with a cannon is an alternative for slightly slower meds/hour, but doesn't require opening a bunch of implings for the clue. - -### Hard Clues - -As many hard clues come passively, doing slayer with a good [blocklist](../../skills/slayer/) is the recommended way to obtain hard clues, as superiors will result in quite a few totem pieces for the guaranteed hard clues from skotizo. - -If you'd rather not do slayer, the best method for hard clues/hr is to barrage Warped Jellies. - -### Elite Clues - -Elite clues generally come passively through pvm, as virtually every boss drops elite clues. It's generally not recommended to camp specifically for elite clues, however, Vorkath is the best pure elite clues per hour at roughly every 2 hours with all boosts. - -### Master Clues - -Master clues can be created using an easy, medium, hard, and elite clue scroll. - -- `/create item:Master clue` - -However, this is generally not recommended, as getting masters passively through other clue completions is a much more efficient way to obtain them, especially due to the length of time required to obtain the elite clues. It's usually better to do either mediums or hard clues, and do the masters obtained from those, rather than specifically create master clues. - -Chance of master clues from other clues: - -- **Easy clues** - 1/50 -- **Medium clues** - 1/30 -- **Hard clues** - 1/15 -- **Elite clues** - 1/5 - -## Global Boosts - -- Max Cape - 10% **or** Construction cape - 6% -- Ornate jewellery box - 10% **or** Basic/Fancy jewellery box - 5% -- Weekend - 10% - -## Master clues - -- Achievement diary cape - 10% -- Kandarin headgear 4 - 6% (Doesn't stack with Achievement diary cape) -- Music cape - 5% -- Eternal teleport crystal - 3% -- Toxic blowpipe - 2% -- Dragon claws - 1% - -## Elite clues - -- Achievement diary cape - 10% -- Kandarin headgear 4 - 7% (Doesn't stack with Achievement diary cape) -- Fremennik sea boots 4 - 3% (Doesn't stack with Achievement diary cape) -- Pharaoh's sceptre - 4% -- Toxic blowpipe - 4% - -## Hard clues - -- Achievement diary cape - 10% -- Wilderness sword 3 - 8% (Doesn't stack with Achievement diary cape) -- Royal seed pod - 6% -- Eternal teleport crystal - 4% -- Pharaoh's sceptre - 4% -- Toxic blowpipe - 4% - -## Medium clues - -- Ring of the elements - 8% -- **Mounted in PoH:** Xeric Talisman - 2% - -## Easy clues - -- Achievement diary cape - 10% -- Ring of the elements - 6% - -## Beginner clues - -- Ring of the elements - 10% - -## Sources - -
ItemSourceReq
Max cape (combined varients won't work)/buy name:Max cape99 all skills
Construction cape/buy name:Construction cape99 Construction
Music cape/buy name:Music capeSee Music cape page for reqs
Jewellery boxSee below
Achievement diary cape/buy name: Achievement diary capeAll elite diarys complete
Kandarin headgear 4/buy name: Kandarin headgear 4Kandarin elite diary complete
Fremennik sea boots 4/buy name: Fremennik sea boots 4Fremennik elite diary complete
Wilderness sword 3/buy name: Wilderness sword 3Wilderness hard diary complete
Eternal teleport crystal /create name: Eternal teleport crystal150 QP, 80 Smithing, 80 Crafting. 100 Crystal shard, 1 Enhanced crystal teleport seed
BlowpipeSee Zulrah page for creation
Dragon clawsChambers of Xeric
Pharaoh's sceptrePyramid plunder
Ring of the elements/buy name:Ring of the elements400 Abyssal pearls from Guardians of the Rift
- -## Jewellery box - -Create jewellery boxes with `/poh buildname:[tier] jewellery box` - -You must create in order and upgrade, below are tiers and materials: - -- Basic(81 Construction): 20x Ring of dueling(8), 20x Games necklace(8), 1x Steel bar, 1x Bolt of cloth -- Fancy(86 Construction): 20x Skills necklace(4), 20x Combat bracelet(4), 1x Gold leaf -- Ornate(91 Construction): 20x Amulet of glory(4), 2x Gold leaf, 1x Ring of wealth (5) - -### Commands for Ornate Jewellery Box - -_The recharge spell has a minimum quantity of 25, so we'll be creating 25 of the dragonstone items (26 for RoW)._ - -Bolt of cloth `/buy name:Bolt of cloth` - -Gold Leaf `/buy name:Gold leaf quantity:3` - -Ring of Dueling `/craftname:Emerald ringquantity:20` \ -`/activities enchantname:Emerald ringquantity:20` - -Games necklace(8) `/craftname:Sapphire necklacequantity:20` \ -`/activities enchantname:Sapphire necklacequantity:20` - -Skills necklace(4) `/craftname:Dragon necklacequantity:25` \ -`/activities enchantname:Dragon necklacequantity:25` \ -`/activities castspell:Recharge Skills Necklacequantity:1` - -Combat Bracelet(4) `/craftname:Dragonstone braceletquantity:25` \ -`/activities enchantname:Dragonstone braceletquantity:25` \ -`/activities castspell:Recharge Combat Braceletquantity:1` - -Ring of wealth (5) `/craftname:Dragonstone ringquantity:26` \ -`/activities enchantname:Dragonstone ringquantity:26` \ -`/activities chargeitem:Ring of wealthquantity:1` - -Amulet of glory(4) `/craftname:Dragonstone amulet (u)quantity:25` \ -`/craftname:Dragonstone amuletquantity:25` \ -`/activities enchantname:Dragonstone amuletquantity:25` \ -`/activities castspell:Recharge Gloryquantity:1` diff --git a/docs/src/content/docs/osb/Skills/mining.md b/docs/src/content/docs/osb/Skills/mining.md index a142857b823..d17940fd2ec 100644 --- a/docs/src/content/docs/osb/Skills/mining.md +++ b/docs/src/content/docs/osb/Skills/mining.md @@ -108,7 +108,7 @@ The only other thing unidentified minerals can be used to purchase are: | --- | --- | --- | | [[6983]] | 125,000 | Yes | | [[6975]] | 93,000 | Yes | -| [[6975]] | 83,000 | No | +| [[6975]] | 84,000 | No | | [[440]] | 82,000 | Yes | | [[6983]] | 66,000 | No | | [[440]] | 58,000 | No | diff --git a/docs/src/content/docs/osb/clues.md b/docs/src/content/docs/osb/clues.md new file mode 100644 index 00000000000..c57aec21378 --- /dev/null +++ b/docs/src/content/docs/osb/clues.md @@ -0,0 +1,139 @@ +--- +title: "Clue Scrolls" +sidebar: + order: 4 +--- + +You can send your minion to complete clue scrolls in your bank using [[/clue]]. For a list of clue scrolls, their rewards, and their sources, refer to the [OSRS Wiki Clues Page](https://oldschool.runescape.wiki/w/Clue_scroll). + +## Clue Stacking/Juggling + +In OSRS, you can "juggle" clues as a method to stack them. Your minion will stack clues in your bank up to a total maximum of 100 clues of any tier, these clues are seen as being juggled by your minion, which is what allows them to stack in your bank. + +You can only have a maximum of 100 clues (all clues combined), if you receive more clues after hitting this limit, your minion will automatically drop lower tier clues to make way for higher tier clues. For example, if you have 50 Easy Clues and 50 Medium clues in your bank, you are at the limit of 100, however if your minion gets a hard clue drop, it will drop an easy clue, so it can fit the hard clue within the limit. + +## Where To Get Clues + +### Beginner Clues + +Obor/Bryophyta for guaranteed beginners (requires Giant key/Mossy key respectively). + +Alternatively can kill men/goblins for easies and beginners. It is advised to send shorter trips. + +### Easy Clues + +Pickpocketing Male HAM Members, send trips of \~50. Average easy clue takes ~1-2 minutes to obtain this way. + +### Medium Clues + +Puro puro is 330 eclectics/hr at high level, resulting in a medium clue every ~5 minutes for time spent. [Tier 2 Patrons](https://www.patreon.com/oldschoolbot) can use `open_until` for the medium clues making this very quick and easy. The `open_until` filter will cap at 100 opens. Meaning, you won't open more than 100 of any item at anytime. You will also get a warning if you have a clue in your bank already. + +Killing ~100 guards at a time with a cannon is an alternative for slightly slower meds/hour, but doesn't require opening a bunch of implings for the clue. + +### Hard Clues + +As many hard clues come passively, doing slayer with a good [blocklist](../../skills/slayer/) is the recommended way to obtain hard clues, as superiors will result in quite a few totem pieces for the guaranteed hard clues from skotizo. If you'd rather not do slayer, the best method for hard clues/hr is to barrage Warped Jellies. + +### Elite Clues + +Elite clues generally come passively through pvm, as virtually every boss drops elite clues. Vorkath is the best pure elite clues per hour at roughly every 2 hours with all boosts. + +### Master Clues + +Master clues can be created using an easy, medium, hard, and elite clue scroll: [[/create item\:Master clue]]. However, this is generally not recommended, as getting masters passively through other clue completions is a much more efficient way to obtain them. + +## Implings + +It is possible to run multiple clues in one trip using banked implings, your minion will complete a clue, then open jars during the trip to do more clues. You can select your desired clue type, and then the tier of impling which you wish to use. For example: [[/clue tier\:Medium implings\:Eclectic impling jar]] + +## Boosts + +[[embed.clueboosts.start]] +{/_ DO NOT EDIT - This section is auto-generated by the build script _/} + +### Global Boosts + +These boosts apply to all clues. + +- 10% for Weekend + +- 10% for Max cape + +- 6% for Construction cape + +- 10% for Ornate jewellery box + +- 5% for Basic/Fancy jewellery box + +- 10% for Achievement diary cape + +- You get a boost for having relevant stash units filled + +- For Hard/Elite/Master, you get a boost for your attack/strength/ranged levels being higher + +### Beginner Clues Boosts + +- 10% for Ring of the elements + +- 5% for Skull sceptre + +### Easy Clues Boosts + +- 10% for Ring of the elements + +- 5% for Skull sceptre + +- 5% for Music cape + +### Medium Clues Boosts + +- 5% for Mounted Xeric's Talisman + +- 10% for Ring of the elements + +- 5% for Skull sceptre + +- 5% for Music cape + +### Hard Clues Boosts + +- 5% for Book of the dead + +- 5% for Wilderness sword 3 + +- 5% for Royal seed pod + +- 5% for Eternal teleport crystal + +- 5% for Pharaoh's sceptre + +- 5% for Toxic blowpipe + +### Elite Clues Boosts + +- 5% for Book of the dead + +- 5% for Pharaoh's sceptre + +- 5% for Kandarin headgear 4 + +- 3% for Fremennik sea boots 4 + +- 4% for Toxic blowpipe + +### Master Clues Boosts + +- 6% for Kandarin headgear 4 + +- 5% for Book of the dead + +- 5% for Music cape + +- 3% for Eternal teleport crystal + +- 2% for Toxic blowpipe + +- 1% for Dragon claws + +{/_ DO NOT EDIT - This section is auto-generated by the build script _/} +[[embed.clueboosts.end]] diff --git a/docs/src/plugins/authors.ts b/docs/src/plugins/authors.ts index 797aae826ab..217de687591 100644 --- a/docs/src/plugins/authors.ts +++ b/docs/src/plugins/authors.ts @@ -19,7 +19,8 @@ const authors: Author[] = [ { gitIDs: ['DayV-git'], displayName: 'DayV', avatar: 'dayv.webp' }, { gitIDs: ['Felris'], displayName: 'Felris', avatar: 'felris.webp' }, { gitIDs: ['Lajnux'], displayName: 'Fishy', avatar: 'fishy.webp' }, - { gitIDs: ['DarkWorldsArtist'], displayName: 'DarkWorldsArtist', avatar: 'dark.webp' } + { gitIDs: ['DarkWorldsArtist'], displayName: 'DarkWorldsArtist', avatar: 'dark.webp' }, + { gitIDs: ['Luunae'], displayName: 'Luunae' } ]; export const authorsMap = new Map(); diff --git a/docs/src/plugins/items.ts b/docs/src/plugins/items.ts index d12a1082a7b..80e0c12d74f 100644 --- a/docs/src/plugins/items.ts +++ b/docs/src/plugins/items.ts @@ -68,8 +68,13 @@ export function remarkItems(_options: any) { node.value = node.value.replace(`[[${match}]]`, customHtml); continue; } else if (match.includes('...')) { - const test = ``; - const customHtml = `${test}`; + const githubIcon = ``; + const customHtml = ` +
+ ${githubIcon} + Commits +
+ `; node.type = 'html'; node.value = node.value.replace(`[[${match}]]`, customHtml); continue; diff --git a/docs/src/styles/main.css b/docs/src/styles/main.css index 69ce41212a3..7dc98ba4eb4 100644 --- a/docs/src/styles/main.css +++ b/docs/src/styles/main.css @@ -402,8 +402,9 @@ ol + ol li blockquote { margin: 3px 0px!important; } -.osrs_item_name, .osrs_item_image{ +.osrs_item_name, .osrs_item_image, .osrs_item_name a { margin: 0!important; + text-decoration: none!important; } .discord_command { @@ -479,17 +480,16 @@ sl-sidebar-state-persist > ul > li:nth-child(3) > details > summary > svg { justify-content: center; justify-items: center; } + .contributor .contributor_name { - margin-top: 0 + margin-top: 0; + font-weight: 500; } + .contributor_avatar { - height: 38px!important; + height: 29px!important; border-radius: 64px; -} - -.git_hash { - font-size: 20px; - margin-top: 0px; + margin-right: 3px; } .edit_this_page { @@ -518,4 +518,16 @@ sl-sidebar-state-persist > ul > li:nth-child(3) > details > summary > svg { cursor: pointer; background: rgb(50, 50, 55); } +} + + + +.sl-badge { + font-family: "Inter", sans-serif; +} + +.danger:where(.astro-ixkmpc6r) { + --sl-badge-danger-bg: #b80e0e; + --sl-badge-danger-border: #3b0d0d; + --sl-badge-danger-text: #fff; } \ No newline at end of file diff --git a/scripts/wiki.ts b/scripts/wiki.ts index 406b26c2340..88374a33bce 100644 --- a/scripts/wiki.ts +++ b/scripts/wiki.ts @@ -6,12 +6,14 @@ import { Bank } from 'oldschooljs'; import '../src/lib/safeglobals'; import process from 'node:process'; import { groupBy } from 'remeda'; +import { ClueTiers } from '../src/lib/clues/clueTiers'; import { type CombatAchievement, CombatAchievements } from '../src/lib/combat_achievements/combatAchievements'; import { COXMaxMageGear, COXMaxMeleeGear, COXMaxRangeGear, itemBoosts } from '../src/lib/data/cox'; import { wikiMonsters } from '../src/lib/minions/data/killableMonsters'; import { quests } from '../src/lib/minions/data/quests'; import { sorts } from '../src/lib/sorts'; import { itemNameFromID } from '../src/lib/util'; +import { clueGlobalBoosts, clueTierBoosts } from '../src/mahoji/commands/clue'; import { Markdown, Tab, Tabs } from './markdown/markdown'; import { miningXpHr } from './wiki/miningXphr'; @@ -434,11 +436,35 @@ function wikiIssues() { handleMarkdownEmbed('wikiissues', 'getting-started/wiki.md', markdown.toString()); } +function clueBoosts() { + const markdown = new Markdown(); + + markdown.addLine('### Global Boosts'); + markdown.add('These boosts apply to all clues.'); + for (const x of clueGlobalBoosts) { + markdown.addLine(`- ${x.boost}`); + } + markdown.addLine('- You get a boost for having relevant stash units filled'); + markdown.addLine('- For Hard/Elite/Master, you get a boost for your attack/strength/ranged levels being higher'); + + const clueTierBoostsEntries = Object.entries(clueTierBoosts); + for (const clueTier of ClueTiers) { + markdown.addLine(`### ${clueTier.name} Clues Boosts`); + const entry = clueTierBoostsEntries.find(([key]) => key === clueTier.name)!; + for (const boost of entry[1]) { + markdown.addLine(`- ${boost.boost}`); + } + } + + handleMarkdownEmbed('clueboosts', 'osb/clues.md', markdown.toString()); +} + async function wiki() { renderQuestsMarkdown(); rendeCoxMarkdown(); wikiIssues(); miningXpHr(); + clueBoosts(); await Promise.all([renderCAMarkdown(), renderMonstersMarkdown()]); process.exit(0); } diff --git a/src/mahoji/commands/clue.ts b/src/mahoji/commands/clue.ts index 6a4d9501545..649d88cd655 100644 --- a/src/mahoji/commands/clue.ts +++ b/src/mahoji/commands/clue.ts @@ -21,7 +21,7 @@ import { getPOH } from '../lib/abstracted_commands/pohCommand'; import type { OSBMahojiCommand } from '../lib/util'; import { addToOpenablesScores, getMahojiBank, mahojiUsersSettingsFetch } from '../mahojiSettings'; -const clueTierBoosts: Record< +export const clueTierBoosts: Record< ClueTier['name'], { condition: (user: MUser, poh: PlayerOwnedHouse) => boolean; boost: string; durationMultiplier: number }[] > = { @@ -174,7 +174,7 @@ const clueTierBoosts: Record< ] }; -const globalBoosts: { +export const clueGlobalBoosts: { condition: (user: MUser, poh: PlayerOwnedHouse) => boolean; boost: string; durationMultiplier: number; @@ -332,7 +332,7 @@ export const clueCommand: OSBMahojiCommand = { timePerClue *= 1 - combatBoost / 100; } - for (const { condition, boost, durationMultiplier } of globalBoosts) { + for (const { condition, boost, durationMultiplier } of clueGlobalBoosts) { if (condition(user, poh)) { boosts.push(boost); timePerClue *= durationMultiplier; From b934f0e1df425bed7026340b90a0fa9efef46dee Mon Sep 17 00:00:00 2001 From: gc <30398469+gc@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:58:25 +1100 Subject: [PATCH 2/6] Remove divine super combat cost from huey --- src/lib/minions/data/killableMonsters/bosses/misc.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lib/minions/data/killableMonsters/bosses/misc.ts b/src/lib/minions/data/killableMonsters/bosses/misc.ts index 0b474298ccc..0b463678f62 100644 --- a/src/lib/minions/data/killableMonsters/bosses/misc.ts +++ b/src/lib/minions/data/killableMonsters/bosses/misc.ts @@ -899,10 +899,6 @@ const killableBosses: KillableMonster[] = [ } ] }, - { - itemCost: new Bank().add('Divine super combat potion(4)'), - qtyPerKill: 0.125 - }, { itemCost: new Bank().add('Cooked karambwan'), qtyPerKill: 0.24 From b5c260855415b613c2c89845016eef8674eef269 Mon Sep 17 00:00:00 2001 From: wontonstrips <71031994+wontonstrips@users.noreply.github.com> Date: Tue, 26 Nov 2024 00:31:34 -0500 Subject: [PATCH 3/6] Fix wiki links/typos (#6231) --- docs/src/content/docs/osb/Activities/aerial-fishing.md | 4 ++-- .../content/docs/osb/Activities/fountain-of-rune.md | 8 ++++---- .../docs/osb/Activities/guardians-of-the-rift.md | 2 +- .../content/docs/osb/Activities/hallowed-sepulchre.md | 10 +++++----- .../content/docs/osb/Activities/mage-training-arena.md | 6 +++--- docs/src/content/docs/osb/Activities/mahogany-homes.md | 6 +++--- .../src/content/docs/osb/Activities/motherlode-mine.md | 8 +++++--- docs/src/content/docs/osb/Activities/shooting-stars.md | 4 ++-- docs/src/content/docs/osb/Activities/volcanic-mine.md | 8 ++++---- docs/src/content/docs/osb/Activities/wintertodt.md | 2 +- 10 files changed, 30 insertions(+), 28 deletions(-) diff --git a/docs/src/content/docs/osb/Activities/aerial-fishing.md b/docs/src/content/docs/osb/Activities/aerial-fishing.md index edd5ef2a1f1..6b9552a1522 100644 --- a/docs/src/content/docs/osb/Activities/aerial-fishing.md +++ b/docs/src/content/docs/osb/Activities/aerial-fishing.md @@ -4,9 +4,9 @@ title: "Aerial Fishing" Requirements: 35 Hunter, 43 fishing. -You can start aerial fishing with either `/activities aerial_fishing` +You can start aerial fishing with either [[/activities aerial_fishing]] -You can purchase buyables via `/buy name:[itemName]` +You can purchase buyables via [[/buy name\:[itemName]]] You can sell Golden Tenches for 100 Molch pearls via [[/sell items\:golden tench]] diff --git a/docs/src/content/docs/osb/Activities/fountain-of-rune.md b/docs/src/content/docs/osb/Activities/fountain-of-rune.md index ea9dd3d07c0..fa26e3b52fb 100644 --- a/docs/src/content/docs/osb/Activities/fountain-of-rune.md +++ b/docs/src/content/docs/osb/Activities/fountain-of-rune.md @@ -6,7 +6,7 @@ You can use the Fountain of Rune to charge Rings of wealth and Amulets of glory. To charge at the Fountain of Rune, use the following command: -- `/activities charge item:[Amulet of glory/Ring of wealth]` +- [[/activities charge item\:[Amulet of glory/Ring of wealth]]] **Note:** quantity refers to 1 inventory (1 invent = 26 items) @@ -17,13 +17,13 @@ To charge at the Fountain of Rune, use the following command: ### Charging Glories -- Amulet of glory(6) are only used in the [Gnome Restaurant](https://wiki.oldschool.gg/minigames/gnome-restaurant) minigame. +- Amulet of glory(6) are only used in the [Gnome Restaurant](https://wiki.oldschool.gg/osb/minigames/gnome-restaurant) minigame. - Gnome Restaurant is currently the only way to remove charges from a glory. -- If you want to create Amulet of glory(4), use the `/activities cast spell:recharge glory` command. However, these are not used in Gnome restaurant and are only used to create the Ornate jewelley box in your POH. +- If you want to create Amulet of glory(4), use the [[/activities cast spell\:recharge glory]] command. However, these are not used in Gnome restaurant and are only used to create the Ornate jewelley box in your POH. ### Amulet of Eternal Glory - You can obtain this amulet at a 1/25,000 chance when charging glories here. - Possessing the stats for the Wilderness elite diary provides a 3x speed boost. - It is **not recommended** to charge glories unless you have this unlocked. -- Currently, the only use of the Eternal glory is at the [Gnome Restaurant](https://wiki.oldschool.gg/minigames/gnome-restaurant) minigame. +- Currently, the only use of the Eternal glory is at the [Gnome Restaurant](https://wiki.oldschool.gg/osb/minigames/gnome-restaurant) minigame. diff --git a/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md b/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md index 9d94b3d6935..ca37ce30764 100644 --- a/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md +++ b/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md @@ -20,7 +20,7 @@ Mining xp scales with mined fragments. **Raiments of the eye** outfit will boost the number of runes created during the minigame. -- 10% extra runes for each piece or 60% extra runes for the full outfit _(MUSTbe equipped in skilling)_ +- 10% extra runes for each piece or 60% extra runes for the full outfit _(MUST be equipped in skilling)_ - This extra runes effect also applies to other runes outside of GOTR **Fragments** diff --git a/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md b/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md index 7eb348f3b1f..a01551fe75a 100644 --- a/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md +++ b/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md @@ -34,7 +34,7 @@ Most of the boosts will come from items purchased from the shop. ## Hallowed Sepulchre Shop -The following items can be purchased with hallowed marks by using the `/buy` command. +The following items can be purchased with hallowed marks by using the [[/buy]] command. | **Item** | **Hallowed marks required** | **Uses** | | ---------------------- | :-------------------------: | ------------------------------------------- | @@ -49,7 +49,7 @@ The following items can be purchased with hallowed marks by using the `/buy` com | Dark dye | 300 | Used to dye graceful | | Dark acorn | 3,000 | Used to transmogrify the Dark squirrel pet. | -- If you have obtained a Giant Squirrel agility pet, you can `/buyname: ``Dark squirrel` after purchasing the dark acorn from the shop to transmogrify the pet. Be advised that you **CANNOT**revert the dark squirrel. +- If you have obtained a Giant Squirrel agility pet, you can [[/buy name\: Dark squirrel]] after purchasing the dark acorn from the shop to transmogrify the pet. Be advised that you **CANNOT** revert the dark squirrel. ## Mysterious Pages @@ -61,8 +61,8 @@ You **cannot** revert Dark graceful! If you are trying to obtain all graceful se - The dark graceful set can be acquired through purchasing the dark dye from the shop. It requires a full set of the base graceful and 1 dark dye per piece. - To create the set, simply type: - - `/createitem:Dark graceful [piece]` - piece by piece - - `/createitem:Dark graceful` - whole set in one command + - [[/create item\:Dark graceful [piece]]] - piece by piece + - [[/create item\:Dark graceful]] - whole set in one command - You need 6 dark dyes to create the full set, totaling 1800 hallowed marks. ## **Strange Old Lockpick** @@ -87,7 +87,7 @@ The Ring of endurance also provides boosts to several activities within the bot. To create the charged Ring of endurance, use the following command: -- `/createitem:Ring of endurance` +- [[/create item\:Ring of endurance]] - Requires 125 Stamina potion(4) The boosts apply to the following activities: diff --git a/docs/src/content/docs/osb/Activities/mage-training-arena.md b/docs/src/content/docs/osb/Activities/mage-training-arena.md index adaf50584cc..963c4244b60 100644 --- a/docs/src/content/docs/osb/Activities/mage-training-arena.md +++ b/docs/src/content/docs/osb/Activities/mage-training-arena.md @@ -4,15 +4,15 @@ title: "Mage Training Arena" Your minion can train magic in the Mage Training Arena and buy all the regular rewards such as infinity gear, wands, and the mages book. -To start a trip, use `/minigames mage_training_arena start` +To start a trip, use [[/minigames mage_training_arena start]] -To check your points, use `/minigames mage_training_arena points` +To check your points, use [[/minigames mage_training_arena points]] The Mage Training Arena is combined into 1 room, and 1 set of points. A single room costs 45 fire-, 20 nature-, 18 cosmic- and 14 law runes. Each room takes 14 minutes to complete and awards 23 Pizazz points (100/hr). Training in the Mage Training Arena grants between 23,750-26,250 magic XP/hr. ### Rewards -Rewards can be bought using `/minigames mage_training_arena buy` +Rewards can be bought using [[/minigames mage_training_arena buy]] Rewards take approximately the same amount of time to get. Earning 5659 Pizazz points to buy one of every item from the rewards shop, takes approximately 56½ hours. diff --git a/docs/src/content/docs/osb/Activities/mahogany-homes.md b/docs/src/content/docs/osb/Activities/mahogany-homes.md index fe87bfd45ae..62e2e2bb764 100644 --- a/docs/src/content/docs/osb/Activities/mahogany-homes.md +++ b/docs/src/content/docs/osb/Activities/mahogany-homes.md @@ -4,7 +4,7 @@ title: "Mahogany Homes" Mahogany Homes is the construction minigame and it provides more xp per plank as well as some rewards which will improve your construction experience. -To start a contract, use the `/minigames mahogany_homes start` command. +To start a contract, use the [[/minigames mahogany_homes start]] command. Your minion will automatically complete the highest level contract. @@ -31,9 +31,9 @@ All contracts use a random amount of steel bars and planks, scaled to the amount ## **Mahogany Homes Buyables** -You can buy the following items with the `/minigames mahogany_homes buy` command. +You can buy the following items with the [[/minigames mahogany_homes buy]] command. -To view how many points you have, use `/minigames mahogany_homes points` +To view how many points you have, use [[/minigames mahogany_homes points]] - The full carpenter's outfit provides a 2.5% boost to construction XP diff --git a/docs/src/content/docs/osb/Activities/motherlode-mine.md b/docs/src/content/docs/osb/Activities/motherlode-mine.md index cbb49819d1e..b5e9aac862c 100644 --- a/docs/src/content/docs/osb/Activities/motherlode-mine.md +++ b/docs/src/content/docs/osb/Activities/motherlode-mine.md @@ -4,6 +4,8 @@ title: "Motherlode Mine" You can select to mine here for a chance to receive golden nuggets and a vast array of ores. You cannot receive clue scrolls from mining here, and you cannot powermine here. The Varrock armour effect does not work here. The xp with all boosts before collecting 100 golden nuggets and 99 mining is roughly 44k xp/h, whereas after unlocking the upper level, it is around 54k xp/h. +[[/mine name\:Motherlode mine]] + ## Requirements - 30 Mining @@ -13,8 +15,8 @@ You can select to mine here for a chance to receive golden nuggets and a vast ar - Approx 20% faster mining for having 100 golden nuggets in your skilling CL + 72 mining - Falador elite diary provides slightly increased better ores - Invisible 4 mining levels boost for Celestial ring/Celestial signet - Works from bank -- Pickaxe boost (see [Mining page](./#pickaxes)) -- Prospector outfit (see [Mining page](./#prospectors-outfit)) - **MUST BE EQUIPPED IN SKILLING SETUP** +- Pickaxe boost (see [Mining page](https://wiki.oldschool.gg/osb/skills/mining/#pickaxes)) +- Prospector outfit (see [Mining page](https://wiki.oldschool.gg/osb/skills/mining//#prospectors-outfit)) - **MUST BE EQUIPPED IN SKILLING SETUP** ## Golden Nuggets @@ -22,7 +24,7 @@ Motherlode mine is the only place where you can obtain Golden nuggets. They are ## Golden Nugget Shop -You can use golden nuggets to purchase the Prospector's outfit through the `/buy` command. The outfit must be equipped in the **skilling setup**, and provides bonus xp on the return of your trip. +You can use golden nuggets to purchase the Prospector's outfit through the [[/buy]] command. The outfit must be equipped in the **skilling setup**, and provides bonus xp on the return of your trip. | **Item** | **XP Boost** | **Golden Nugget Cost** | | ----------------- | ------------ | ---------------------- | diff --git a/docs/src/content/docs/osb/Activities/shooting-stars.md b/docs/src/content/docs/osb/Activities/shooting-stars.md index b2352691f9f..be5951ce362 100644 --- a/docs/src/content/docs/osb/Activities/shooting-stars.md +++ b/docs/src/content/docs/osb/Activities/shooting-stars.md @@ -20,7 +20,7 @@ Shooting stars is a mining event, that you can join after a activity trip. ## **Rewards** -Each star you mine will give you star dust. This can be used to buy rewards such as star fragments and the celestial ring. You can buy items using the `/buy` command. +Each star you mine will give you star dust. This can be used to buy rewards such as star fragments and the celestial ring. You can buy items using the [[/buy]] command. | Item name | Cost of dust | | -------------------------- | ------------ | @@ -33,4 +33,4 @@ Each star you mine will give you star dust. This can be used to buy rewards such The Celestial ring can be combined with the Elven signet to make the Celestial signet. The Celestial signet performs in the exact same way the Celestial ring does, giving an invisible +4 boost to the players mining level. Charging the ring doesn't add any extra effects or give any benefits, however, the ring needs to have at least 1 charge to be able to combine it with the Elven signet. It also requires an additional 1,000 stardust and 100 crystal shards to combine. -- `/createitem: ``Celestial signet` +- [[/create item\: Celestial signet]] diff --git a/docs/src/content/docs/osb/Activities/volcanic-mine.md b/docs/src/content/docs/osb/Activities/volcanic-mine.md index 7fd05699ddc..d7bc7a5448a 100644 --- a/docs/src/content/docs/osb/Activities/volcanic-mine.md +++ b/docs/src/content/docs/osb/Activities/volcanic-mine.md @@ -6,7 +6,7 @@ title: "Volcanic Mine" OSRS Wiki page: [https://oldschool.runescape.wiki/w/Volcanic_Mine](https://oldschool.runescape.wiki/w/Volcanic_Mine) -You can do the Volcanic Mine using: `/minigames volcanic_mine start` +You can do the Volcanic Mine using: [[/minigames volcanic_mine start]] --- @@ -23,7 +23,7 @@ You can do the Volcanic Mine using: `/minigames volcanic_mine start` Boosts must be equipped in the skilling setup. - 30% more points & XP for 61+ mining and dragon pickaxe -- 50% more points & XP for 71+ mining and [crystal pickaxe](zalcano.md) +- 50% more points & XP for 71+ mining and [crystal pickaxe](https://wiki.oldschool.gg/osb/miscelleanous/zalcano/) - 2.5% XP for full prospector If you have all the boosts you should get the following message upon starting a trip. Supply usage can vary depending on your maximum trip length. @@ -45,9 +45,9 @@ These costs can be reduced with: ## Volcanic Mine Shop -You can buy everything you can buy in OSRS with the `/minigames volcanic_mine` command. +You can buy everything you can buy in OSRS with the [[/minigames volcanic_mine buy]] command. -E.g. `/minigames volcanic_mine buyitem:Gold orequantity:1000` +E.g. [[/minigames volcanic_mine buy item\:Gold ore quantity\:1000]]
ItemPoint Cost
Iron ore30
Silver ore55
Coal60
Gold ore150
Mithril ore150
Adamantite ore300
Runite ore855
Volcanic ash40
Calcite70
Pyrophosphite70
Ore pack (Volcanic mine)4,000
Volcanic mine teleport200
Large water container10,000
Ash covered tome40,000
diff --git a/docs/src/content/docs/osb/Activities/wintertodt.md b/docs/src/content/docs/osb/Activities/wintertodt.md index 0fb1a81a2c8..d360362234e 100644 --- a/docs/src/content/docs/osb/Activities/wintertodt.md +++ b/docs/src/content/docs/osb/Activities/wintertodt.md @@ -20,7 +20,7 @@ You can train Firemaking via the Wintertodt minigame using the command below. Yo ## Warm Clothing -While optional, it is highly advised to equip **at least 4 pieces** of warm clothing **in your skilling setup**to reduce your food consumption by up to 37.5%. This will take your food consumption down from 160hp/kill, to 100hp/kill. The easiest warm gear you can obtain on the bot is Clue hunter, to do this see [Crack The Clue](../../miscellaneous/crack-the-clue.md). Warm clothes can be a combination of anything from the following list: +While optional, it is highly advised to equip **at least 4 pieces** of warm clothing **in your skilling setup**to reduce your food consumption by up to 37.5%. This will take your food consumption down from 160hp/kill, to 100hp/kill. The easiest warm gear you can obtain on the bot is Clue hunter, to do this see [Crack The Clue](https://wiki.oldschool.gg/osb/miscelleanous/crack-the-clue/). Warm clothes can be a combination of anything from the following list:
From bb31691b803fb81a63458670fa3fcaa98b6fae29 Mon Sep 17 00:00:00 2001 From: DayV <69717452+DayV-git@users.noreply.github.com> Date: Tue, 26 Nov 2024 05:41:18 +0000 Subject: [PATCH 4/6] Allow clue trip to be repeated if still have clues in bank (#6229) --- src/lib/util/repeatStoredTrip.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/lib/util/repeatStoredTrip.ts b/src/lib/util/repeatStoredTrip.ts index ee5e56399be..2a2b7a98b39 100644 --- a/src/lib/util/repeatStoredTrip.ts +++ b/src/lib/util/repeatStoredTrip.ts @@ -5,6 +5,7 @@ import { ButtonBuilder, ButtonStyle } from 'discord.js'; import { Time } from 'e'; import { autocompleteMonsters } from '../../mahoji/commands/k'; +import { ClueTiers } from '../clues/clueTiers'; import type { PvMMethod } from '../constants'; import { SlayerActivityConstants } from '../minions/data/combatConstants'; import { darkAltarRunes } from '../minions/functions/darkAltarCommand'; @@ -67,10 +68,13 @@ import type { NightmareZoneActivityTaskOptions, UnderwaterAgilityThievingTaskOpt import getOSItem from './getOSItem'; import { interactionReply } from './interactionReply'; -const taskCanBeRepeated = (activity: Activity) => { +const taskCanBeRepeated = (activity: Activity, user: MUser) => { if (activity.type === activity_type_enum.ClueCompletion) { const realActivity = convertStoredActivityToFlatActivity(activity) as ClueActivityTaskOptions; - return realActivity.implingID !== undefined; + return ( + realActivity.implingID !== undefined || + user.owns(ClueTiers.find(clue => clue.id === realActivity.ci)!.scrollID) + ); } return !( [ @@ -90,7 +94,10 @@ const taskCanBeRepeated = (activity: Activity) => { const tripHandlers = { [activity_type_enum.ClueCompletion]: { commandName: 'clue', - args: (data: ClueActivityTaskOptions) => ({ tier: data.ci, implings: getOSItem(data.implingID!).name }) + args: (data: ClueActivityTaskOptions) => ({ + tier: data.ci, + implings: data.implingID ? getOSItem(data.implingID!).name : undefined + }) }, [activity_type_enum.SpecificQuest]: { commandName: 'm', @@ -692,8 +699,9 @@ export async function fetchRepeatTrips(userID: string) { type: activity_type_enum; data: Prisma.JsonValue; }[] = []; + const user = await mUserFetch(userID); for (const trip of res) { - if (!taskCanBeRepeated(trip)) continue; + if (!taskCanBeRepeated(trip, user)) continue; if (trip.type === activity_type_enum.Farming && !(trip.data as any as FarmingActivityTaskOptions).autoFarmed) { continue; } From c3a1112aeb578ad594b3f5b139a6383b0d102885 Mon Sep 17 00:00:00 2001 From: DayV <69717452+DayV-git@users.noreply.github.com> Date: Tue, 26 Nov 2024 05:46:10 +0000 Subject: [PATCH 5/6] Apply clue score boost (#6225) --- src/mahoji/commands/clue.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mahoji/commands/clue.ts b/src/mahoji/commands/clue.ts index 649d88cd655..00088e76829 100644 --- a/src/mahoji/commands/clue.ts +++ b/src/mahoji/commands/clue.ts @@ -301,7 +301,10 @@ export const clueCommand: OSBMahojiCommand = { 25 ); - if (learningReductionPercent >= 1) boosts.push(`${learningReductionPercent}% for Clue score`); + if (learningReductionPercent >= 1) { + timePerClue *= 1 - learningReductionPercent / 100; + boosts.push(`${learningReductionPercent}% for Clue score`); + } const maxTripLength = calcMaxTripLength(user, 'ClueCompletion'); From 3ac0ba7706e629a5810a7c213b03e0d2bd804de8 Mon Sep 17 00:00:00 2001 From: gc <30398469+gc@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:48:49 +1100 Subject: [PATCH 6/6] Lint/cleanup --- .editorconfig | 2 +- docs/src/content/docs/getting-started/wiki.md | 4 ---- docs/src/content/docs/osb/monsters.mdx | 2 -- src/mahoji/commands/activities.ts | 3 ++- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1ab7e44873c..cdbe5bc6ceb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[*.{js,ts}] +[*.{js,ts,.astro,.md,.tsx,.jsx}] charset = utf-8 indent_style = tab indent_size = 4 diff --git a/docs/src/content/docs/getting-started/wiki.md b/docs/src/content/docs/getting-started/wiki.md index 1c31861c2ee..4e439412346 100644 --- a/docs/src/content/docs/getting-started/wiki.md +++ b/docs/src/content/docs/getting-started/wiki.md @@ -287,8 +287,6 @@ This is an automatically generated list of pages with possible issues to be look [/index.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/index.mdx): Doesnt use the new command formatting -[/osb/Activities/aerial-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/aerial-fishing.md): Doesnt use the new command formatting - [/osb/Activities/fountain-of-rune.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/fountain-of-rune.md): Doesnt use the new command formatting [/osb/Activities/guardians-of-the-rift.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md): Doesnt use the new command formatting @@ -301,8 +299,6 @@ This is an automatically generated list of pages with possible issues to be look [/osb/Activities/motherlode-mine.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/motherlode-mine.md): Doesnt use the new command formatting -[/osb/Activities/shooting-stars.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/shooting-stars.md): Doesnt use the new command formatting - [/osb/Activities/volcanic-mine.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/volcanic-mine.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. ``) [/osb/Activities/wintertodt.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/wintertodt.md): Doesnt use the new command formatting diff --git a/docs/src/content/docs/osb/monsters.mdx b/docs/src/content/docs/osb/monsters.mdx index 5920a40b3ed..d209ba9485f 100644 --- a/docs/src/content/docs/osb/monsters.mdx +++ b/docs/src/content/docs/osb/monsters.mdx @@ -3902,8 +3902,6 @@ Wildy gear boosts: - [[Super restore(4)]] or [[Prayer potion(4)]] -- [[Divine super combat potion(4)]] - - [[Cooked karambwan]] diff --git a/src/mahoji/commands/activities.ts b/src/mahoji/commands/activities.ts index 205ca1ffaa4..3b4ca7c2244 100644 --- a/src/mahoji/commands/activities.ts +++ b/src/mahoji/commands/activities.ts @@ -180,8 +180,9 @@ export const activitiesCommand: OSBMahojiCommand = { let list = quests .filter(i => !mUser.user.finished_quest_ids.includes(i.id)) .map(i => ({ name: i.name, value: i.name })); - if (list.length === 0) + if (list.length === 0) { list = quests.map(i => ({ name: `${i.name} (completed)`, value: i.name })); + } return list; }, required: false