From f89179d3467ec57d43eb7c4333db7264ecb0449d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 22 Mar 2015 15:18:24 -0400 Subject: [PATCH] v0.2.4d: applied beacon tweaks --- assets/items.png | Bin 12471 -> 12943 bytes .../ShatteredPixelDungeon.java | 5 +++++ .../actors/mobs/Goo.java | 2 +- .../items/MerchantsBeacon.java | 9 ++++----- .../items/{ => artifacts}/LloydsBeacon.java | 8 ++++---- .../sprites/ItemSpriteSheet.java | 1 + 6 files changed, 15 insertions(+), 10 deletions(-) rename src/com/shatteredpixel/shatteredpixeldungeon/items/{ => artifacts}/LloydsBeacon.java (95%) diff --git a/assets/items.png b/assets/items.png index 75d0887af562d22b64bf8c88831060058bd96b61..5dec4a0ce730d3856a80ffe64a338bbce454668d 100644 GIT binary patch literal 12943 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 HO!$8QgJM`S literal 12471 zcma)j2UL?y*X^Vbij>f#n}C9dC`b`ROhOY2NL4_EAWE^&6lsPe2ue|!4WuIqSW!W- zK|&LxBTb|vbOaGX4G@z1_`cu$|Nq{#?pk-Uk~x_(lPAx#?7inC&i0t4h>*Mx06^sM zA#-~GV2}v|0w^dueYwaB$^-)rxm*EYljPqg45VkuLWTT6hpjF683+-i+}6jk-9u0j z%Hyb|IpF<$CBzOb^iN_=}d{@ zqnv$eOjYtN!EIXHtmKJftI=OBbPw%tmmi;qxXD0_6ecNb*V^~{wUl-Osn7c!Wq2Rs zRM@bKjOJ0htb-LZB?Ls9g%(0srQ6UWp_j}jP|0Y;!OKfedo~SbA>QrVd2p#Pe5C3_P=~akILhCt4=N5 z@+!1dDQ;<9*OU&ps%Tz5RqC?iUcDvzeXBag+?waFIxk)^quV-Sii$0N(e&rJbRSE8 z!R36_pRx^bev3hT4)@Ha9QNu1ASt^$rqFe_c#0aK*({Mk@elLr3H3(+kd(OY2z&rw zwgo!zF(vR-USK!NL2?p}m=mYPYIZ!SGx8m&K)GL-y6+DzBb{WCyAdMb#;bSwS0(EQ zVA!>;5wCM-2a_-1t@;w$cUH^$=8}J%|0Q;P!53b{IN7{dx)}3&_5z$8kIBQxRt#I- zu2Q2eqBDa^HyVq;x#;uk6SO5=kU>8yLa>a5^^#0?eWN-$6C2pgbBrPV-dPK*?w(1?f?(Ec{Gk%%1byf7w(UT z)>gC_c7`&7xm9(rGXKZY`BYdg)9&|LP&RBb7v;WYWdM+|(jNt0AkhaAvXKckse5Fp zvGts#dZwp5!ORGj;6b~tCt@lBYF^#K7rxJ}qs!+XZsL%_6ODL)*-dD8Ei`ocY|1NBX z{S?-gqZ4wHjR*k+fkK=FwO5DfSBF#YuQuvYb=Ks5uFF%6GEs|uJcss+!y)pqhv#5@ zXQjUINJfhRq8YPmB>bMvPa{G-9L<2@=Y>ZBAl~A zUjzn7`ROFQ{|wtFfBI992gZCSXZ)b7N%`72=eb?kN>gFz2k)EbSMaGj$Pp%;Pij*5 ziE{h_!e!y{*px?vj>ogPQKP#?>L%b1#JOUsb{(#+uJ$pniN79v;r+RM-t?B@shM=C ztv5$Zll*|Sy zTd@K|(l6;po--vhxRv@H_J&qi6GW_DK-H;yb@ghl;<9r7I znm5pOpQfFWPVnKg?L-PGfOyR6&(boOz~#>ui(qu}hgE+Wb$VzbOqhXl-NiG@P5q^M z9K?A6xy9v74Ol^|_H-1}gyXdAXpaD_v#QiCf}7;^c!md3xyz?Iv{B2@O|Wy@X|}Mk zX5qsjT~|(h3`>#h`?avDC*>kA`=(tblB+4HJ^*r6d`e-b1AiHKjzx9}X=i%_>}2G= zj_Yk9^NtU_f!=g=TMr;`*zS@WSS9CW-wWWH#w&4_6Xm9aq3}~!Q`q#F)Pei!9pjOQ zk?O(aAI06_aZfJnXlQ(SlJGbx!+U40`}ywf1Ojj7o`1udq3_VFIOX7PUb}y0i$195 zqHEXT9@bdt1Hr&vcTOK5eMON=Fnam#pUrxC5da%*K3Exr0*?v^Z~S}Tszx>Fmt>*P zr(jb0(5`e{9tdC}?_cL0*vq;WOz=u9KYUlMa84U0)B4R4mSN6o>EI7npnfx^GOm30 z?nk+6@=O+EQ&z*qWR_w5L9A{20=ifhRs_+k%U6p8&-I@uMw%KW`}F0UK)9i_zmM1P zpOoEwI*`m?y1r8^sB!kRPJ1IDv?UE*eWMt@;dNsMpQ+U@OI~_T+%YurdJyIQ`SiY4 zaETsF!`bLk_15$2e<7@dQOP}-_QT~LKW#*8TK82$H*Fm`IFlA#T(j=qH+C;y)X^*z z25ct{ACuBj{XzIwgS6}Uy4upcH;8h?8sxI!)Eif2wd4aE2KF%7WBlPS@ur;KW1W{K zh;t#iun!HEdQeXwMcV;k&gjTqYV>;^tM|qy)+Y_{vxPrx+^%h=M;9-I?*>J&X2SHZ zh_h{0*y_4viW{H%B!AIR{+zCwc2%oB^|qjo9C21AAP5z&mQMINSXjtYH#L`aUOTlj z(z(J5KtH~Y9POrQg?e3J*yDe_7U*Opvj>7)D^R%}18O_&stPS?(l5>q>@uL~TUI*4 z(uC=bFt(73rQH_!sIhAjse-a^X({-P$tYdLlj6*Yy-ISe>y|;N?pmaA2EtPh_981X zug@(Pj(#A7{iX}l*WU=v72E83CcaJDD^8m5DC_v4`Vj8|UlcVf+>vuXJM1Yemwjff z2tFzj&ZL%MQnI4>->1@P==OT?4ka{clDNZ{OSBNet#o-UCA$#^%U_Sd0iA%e7^xMb@2c@1TC2eREnV?IOIQ z&-MZPN(O3=i=uUIy|jx-IZMeNmRoP?{s}FBx=f&wFKz0`0)O3y3T%j?TCLfRX{ zx3n5k-NK)Sr~6ng9`}Xy?sVcrJ}f)IAeEi)AcVeO?Az4*Jo2#2Co%2 zoYtO&Fs!2*xQT_g9u4=>BC@tOqj{1&nFNvCBKF-owcD+R`M=C}Qtw2&qrOFPn+c(<%@|3D99U9@>E!#}2J-VJ9KZu~G zI)C*_IbFyK~*%F73Ue$HDs5Fe*4lhSU6fO1gt=t-!OlarV6*upXTZoHg;da8rx}HT)zBM zo^_UDoyfju1<)lM$zxX`j-ZYuCwj?73VgYHD;|?N^Xpd%fUq)~#T3z|9&lpoyKsJ5 z;7q11Su4xSM_wS^uN|t(b>Li?Xu0p58F+Ko6{Fg+GhgQxxgO&P8a3>Icsbx^^OUXuMy$828=`$837W3_3H2(`0vIMHAOz8G&=-%dpWj z!rWRVGJ3+=!UrTS2fNT1w{m)-O<5yX`7Xf~cd3$-T6RvaIIkhD_lPyah9->>?ORKq zsj|<=@{wsN{=GNlStC2Y{6HGY?_Q%v8Pp?R+t3T+1x`~E*nGcA7fA#!7aBgv|MV7N zf)=m$Z#A;iVS45C#zv`}`$dF|Gwof;_j5v5*ESAEvvsY(_w`ma`ko6lT8h$yr^D4R z#C%HGx8~nYb_jaJ0AR(tS}zh~`=D&0;7 z@mh(qqz%mYY?GD>pU~>A3B-!W#E_ZR;ODTv}Cg3L->@l%z;6Y?w zfN}d|3uYrqFJV2s?O}P(;f~P3ioUgnJPm&S=zjJRz9AM<(6chD495<=W4`el~0%X zWtCcIux&Ojy^%0ba$7KP7(HGhnp)6mr9#?hR~8Iiu5=o^He0?uqlPWd%oPkeE@R26CTWAC4p?bCoM@3q4RZ(k z{5f{R5LP#_qMq%PqpDp#$>+Y@npWM}boPye>!|jzyo{*b?ouCT+sN_R^tierna&))iAsV740d7gB#Eh`_ z(dP>a%v(8^KvwrMW)G}>u2hI{mb#kG)|IAzbin25?2cCg9(93i;RkPy0|Um#6KIueRD^diSMbZ;+Wza;&&g?vzG*7kzmV#7Bzi!)&4 z2M&DO)GtewALeLlwSsvoY6i&ifFBRchq+59@7O3@-pA)7N%L3uxsCgz?A81qfhZg( z7j!?rqEH6=$pKRM+bgHTpRV|pV}pS-&pRp8Z@}Mn{Oo6l;=9Xbz}iBz?V+EmiV@d@ zr-HfS0qZn`HB}xYWQx+8LeeyV2WataYm6uoXvtVn^2fO=`I1(O@~@ALMR^S;i~ zvw3-W%6zi3Qwi8N@x@R0;Y>x*i1RpRH~3^7#- zK@$6y#O0v~`#FjSc={-&(Iz^o?F@=qm2@87=0H(K0cjw>eYGU^RC$pb;|L!8c(-_A zAKKVL0K?~h9u+DFglMs_Ng4Q<9Kmhb8!<^wq{CJ03lY{n$<*nOV&++8c#}6WA7rp= z5`KC>GRcPTax6-Ky5hR9oU z_{#|u4|ZcQ%?ir=U!77D-@{Q78~mF!OnFL(zuPD_-X?Ch&YPM&WG+luXp4{#uf}8s zKZP2vKcBr1Wkcygbx%6;p_^UYD%P7SL-r)ii6Yy#@*d2#Y#NW6OkspHnN*U{2j+RC zD$DDu*zi%}mG61~l+c!(EKv(4i}kZy5_`>L@z-)IUZ2EsvdH^JA)59>4CamQqH+O|}54{^xS&Rsy zG|0z_WdCg?Mm=5n$tMQ={G8&`9>lmXz zd2PH-eR4vVcQSAbbQw}TXTSkx`u8et5A<7}`H=DUY^|11JQ2d}>gr@WTh620zaZn* z^mn`TcIIE(AVmTRkZ<2fFG! z@u?9_-duG9D*Pc)s)_T+eO!i5m!_V!YEjvwCFDi6(_XlB{eQZ0Jt>8r+#r4_G;LVs zzn;7~n5-7LRtw7=LKwPns{1fn+@TH3KSh6w|8*gMMEY{mC5q@t-nfPR4_hn$N7{fl zdE?5a`#2Z2qz5SYmwZ<`Le+GgH!@w&S<)5hP_UlXt(ioA*xj20KT(wwv~w zL(yDbpH)z=q2$`{sEO&gb_p(y0#%mV&Mpg*sc->|ow#Jx>hYni8VXeyY+iKIp-)w- zSduv#ft5hxJZeXxhNk(4wkA%Cjz`UjkJJ#fG0{ovDZ#_+*)nf8M=W$U13>wn1Fz807s$!LN{QP37GY%>%=Z@SIZ{#0B zct9UO(8NTG#g136i`-=|Ma{t?NqfPMGjqpi_!s-Ie7$kd82F5rz?dy&J&yYW`a*el z>S~ie5vM?XU%jZ*KpIc-!YP1V8Ng6!o?km>)wjVLk-OinFHCUZA--W%@e%vhj)$$B z;PEQ~|7Qv^4^q%h-x^0KDT|ECClB*Rx8rw+C+v;fbN1^twR`Hh@_#aa@gF71R&3qj zqjDj9oIEi98`09pr&$fDnjx$t1%urP8%g!da@*g9R{P$r-D6ZstJxSk8d+7-jiR^2B+nZuqZT5ACnjHQfvX*z}(fWs|4%WG^ zp?uDMt9%Y)YZfI-GlvTP=r->lBNc$^)#sCRtF4Y{SkAgW5zCwF9vK zDB1Yl`TYJs!B=Y(NPYQT!DUiUxEC18djJSMgzyb%Q{{(dX|smgtxT&lDXaI&?@gL; z+~EtKmm8kLb%uL%X@1Cb!E+V-B6P=hJ}9geictGXfzW!G|M~1!A@E%26)-&60D>SI z@>-4%J13%+ya%{))Fid#fHeO0+3v#LoOD7qEYuMkL>T_Ma`t&^0fQK)BtmV;A0O5M z=}TwoQS|n=sJR>Y$4cbsWX%400cIQG;rk7f-;fMseCB)McQ2|J{3*O|2X}Dj6r>#-5u5Xr}kbx6W+|?%-t4hn`l*vQK2s2Z_oP}AR z(7hl`S0mpQY+LFG#z~Wxbo0eO2m{?kH_V!?miUENFv3?$DtkvRTsu;Pn(rw>zq9cY z1+E|bQDc*uhjPETKB13@6?}{W_o?3m+&`@sv5v3}HT%F~3BZ!d&nE8#iFUn$MGByn z_alTj?cE6;kODuHF$&>^%dxEQ=RkNd9&RCK4Is%U?+@9tLpKVKmbi(t2IZ1y5yC8T zanE1D3l7Z$vo&BULXcUu%gKHfZ4;vgQr~an!9mJr4eFId?$(ohkG)|Lw?VkJWN-4em`eCbIgh2tGZq$#SmqvO+Jg9U zr;iZI;e;WCur$F#2Q)2qf=Od%(P*2RoIO;f{nLuX_}w&B&$;|=_R!D6OsVoUW2r=I!c2=zL8fNerQS!; zMieeb-gtHNuEc{kf}!r;x7E(}uIC>Fmb#?@G`{xiiFw_NJy} za)DO_FR{Y?m&g|(1vlni z>j_*uvFSyH;+Z63&2n;pt9-gOB8&pq8a$ms5ZJFRW}HrJTI#dW{;JtEu1PA z1BAEU{#!7*_*i_jm^6r&`8kXA(bvk!iRZnOu@I)sh~%mVMH0imvV_|dvT0c+8{{bzFPP#`+4KI+CSY7`P3 zm`p4ArAr6Kb!iE!n%v6D?T_#AvNt&&{NY!34!6*Ew-q%z zWlGcX2-)DFwgQ0)VR&^EcZnmRm1uAI>MelYR&$yW0E=Fw>%DK=c+$3aTFE zE)j4^@L26BN3ch(R9YA;yI$h6b0k=lF}iP`cjU7z6-2+`{Q#HX8tJgJ8nKVyJ~z|| zDY)np=c5c3c-2C=ChJKexo)Vo7l;qNS=8nW@Y^V|y z&WO1~y_D990{bVn<3H_z`Y2eL4}xs+>`Q=JyJ@`sv;QoFwYCbkj-36crZQU%J-%Q~ z_}?r}@d++G4uXOPxJ{J*U?ww+cN6C=+rhhjsibvcqsJMiK>wPc5CRW2es}oK&*e1I zNP>SO#g-yEZrcwPD+Hgc$Dd zV>s!GN@ONUgA^rbxa!D8Ne0Y6g#apZ)L}@$ieAq9i&mL~WR?H&Gm8pgxj*=83%@HT zu5%)vGE-v@RHp=DaPbj7PDG=cf2{AP?*4Vp+5JB3*@~`hhWg^g%SACb>2lG%RMa_23|rEBxmAWT+`tuO zZGZK97XANemcTkY0AX^&l4Lh!Ms->xN{4$^y=MMGGpqUYoK7^Qu0fWQX>q3dQr>lb zOfN@&t!u&zVdvglpJi;3PJ7QAGE|(FlRLp{Tach1PfeHs;SO z{_tGo-zLOTpOnrRu$h8@_{pp4jtEJq&!Ya^*dJHf^A2yO=SK7YT6VvUNUQ3>N);r? zOT@*yLc1YUJ2lCpr?Qt8838sAUCXI>Bf!Y<-(11_wY6lfd=)BM*j2SMekyvlxlDkO z;V)icz)&IiS6Hw$xd+p!%v&~Ttunm-lNtW|?)INU=5HpR*UsIQ=sxvzx#w(Fe|~ej z+c0GzCnwb?de&m!@zWv8=LD%v`Uv;_DjSP=pE2_4_oG^#V8H`vytvLds#Kx2`14}1 z#X!|b_jO5|fPhZ?bm5~M{i7ADD-6sQFKcY7n8)nKa1F#~5r|+iR?dYCipNHR0#B2CMe zUz;HF`TWU=44s1Ait%5T93andN*QBGhw7aZaiX#=K&1@t#P0LUJdTJG4+yw-ddi{l z?0A_1K_ff^3Z(ijtSwL78FlCKPv*C+tZ+|AH_6ct7G(u4Qd zLXnyOof6x>Z<$!u<+qgN`=P!^gywZSdM<32+}DdLwM=W3@lLr6e*R5FvTcOZ1C$*t zCj8ukj_6rqvEofR@^pHT_~o(8wTjBZ?!zDhSk?(qCVR9LlocmR7!fP3f}yKpsnYI) z4fl6uxp21k+3dr0Rv&%)ra_Fi7dh>6yWfTp1&hmoWdK6gJ*!cA{p9_k$ko|4r0@m zto%9gL?L%)($?X+BUtr|7olJfu>d{33pF-7!CqLR-9_NY#$Hl_s3qylhis)190Yv_ ztARahWo6~)3#5k?Auj7Cg-A$XkJ+l^5LcA-k7Xb)0mc09AUdx)@d4D67yW!-DGsb^ zw0V;AYxhW3k~t?9NFK7<00p>6V+0{GA4X+U(l~)%0aF(mL%SZNwk%;>H;SFW$S+%e z3WKEWf?v6DL}WUlKnz=K*4Bm8zQ2KDmB0dSw;Ur32negv7WA@rlj}K#rH-&paG|2L z8u@*hLVpOR^S?d)JC;hG$O0S?4>ZW|1GuWj#wJn8LqTt*s|tsES_BMt!ZzbA>yE=8 zJvNy48P+OwMM>7j2d`~;;~=mx{HP~W2KCgFrH8!*9f^L(yEpIZ15ebbily&FtlGPa zCT=daz5X%MiSKei!0Sk8Bhxb_c~(Sz=(XMq%^Qsu{u{po1=0Jw;iKAAX!>28 z=8A-ABJXvw6n0KZb_V(>E zYPCNqBsz_7xqY{f21!n!>obh2Ten+zrr_GN=!YobOF0p`W|*=k_ATLUec*sV>S$_NOCAls_s$LZBN z``?4**R~TvGmXrK&UQOJBsv#YJr~DY6(3kR=Lxo`C1>snWTSFt@a*(dLC5Bo1#rXX zJMF4?teZshhlJQ7sK0mlgQNqY{$Ig+zkw+osw2mdoi3QBHL|hntV+@#N5=?m^MU)* zHr}76%{dkd_8)lt{Rcl)4V=-A{H|m4S2P+x0z_K|Fz1{=)JxL5;QG@@Nx)(lUi&10 z(}Q_fxkIrZE#p)RlAPp+Ki3q#Jg3U;fo4SM3-*mClG=613vX$p@>B1YbcY!o%LWiY zQ+gr{tf?mu%4+EEiuJmY&0VMNMOa}Sn@&TmF0E45XUd$4CbbOx8J=wS7RxPRk3G(# zI%6?9h5{eHf(xx+G@WosmD#5l@DMBujy@#Zh6O;EgDLWEB#~@<4BF_%LtMFrMopN#n}8&8172a2!l{o$i>)RGy0XbJnmM~z?( z2bX+B1&EUM`*p!|U802^ya)XNI)VMA22Q}+gahQL*)s`ME4tvhpzS0o*&7~y1>96& z_M$!sf*=GTSNy}xeqp9h?=b?%T+VNMh0tciUzGUl!WkUaeMr6F=2N~_pmW+^lqnsh zEfu*UZ!1X+JVm5x85*AKMw<6$MBF*OHTLu44_}c%tc-?$mtT%qLx)|ly`p-s4Cqz^ z?(uMyO;_PnfkrKNJRKxKEPQ1z`tK?X(EH|ia%jKdzbSo-?R zijHSBRkr_8bC-mIjp=Wpy+v`CJhl@JeR2lN!9Ws!8Axn zJfIJZlA@yW`4C2Iw6Yq#vU1OnbRY$tuPZA3Kx!||Wmo}!sbPm}ii-K2z)CHbu>;aR zp-RHc$E^w0H*D&j3ciMJEy$J+8oq`RCevpj*Bf>TBB4bIJTbjJwsR&!6l>@o2H>#8 LG4ofZ?$`ep17cUt diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 7131e6fa2..120150fb8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -50,6 +50,11 @@ public class ShatteredPixelDungeon extends Game { com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion.class, "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfWeaponUpgrade" ); + // 0.2.4d + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon.class, + "com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon" ); + } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 03509b815..3b2d82cf0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -32,7 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; -import com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java index fafe3ed1a..694741846 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java @@ -18,7 +18,7 @@ public class MerchantsBeacon extends Item { { name = "merchant's beacon"; - image = ItemSpriteSheet.BEACON; //TODO: make sprite + image = ItemSpriteSheet.BEACON; stackable = true; @@ -56,15 +56,14 @@ public class MerchantsBeacon extends Item { @Override public int price() { - return 10 * quantity; + return 5 * quantity; } @Override - //todo add description public String info() { - return "This odd piece of dwarvern technology allows you to communicate from great distances." + + return "This odd piece of dwarven technology allows you to communicate from great distances." + "\n\nAfter being activated, this beacon will let you sell items to Pixel Mart from anywhere in the dungeon." + - "\n\nOnce activated, the magic within the beacon will only last for one session though, so use it wisely."; + "\n\nHowever, the magic within the beacon will only last for one session, so use it wisely."; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java similarity index 95% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index de810e7ab..80e946e11 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -15,7 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.shatteredpixel.shatteredpixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items.artifacts; +//If it weren't super obvious, this is going to become an artifact soon. import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -23,8 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; -import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose; -import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; @@ -65,7 +65,7 @@ public class LloydsBeacon extends Item { { name = "lloyd's beacon"; - image = ItemSpriteSheet.BEACON; + image = ItemSpriteSheet.ARTIFACT_BEACON; unique = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 84861980f..e5b4389c8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -147,6 +147,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_HOURGLASS = ROW8+4; public static final int ARTIFACT_TOOLKIT = ROW8+5; public static final int ARTIFACT_SPELLBOOK = ROW8+6; + public static final int ARTIFACT_BEACON = ROW8+7; //Row Nine: Artifacts with Dynamic Images public static final int ARTIFACT_HORN1 = ROW9+0;