From d898a1c5fd02d1947aedfd83681279622518de67 Mon Sep 17 00:00:00 2001 From: Nicola Sovic Date: Tue, 12 Jul 2022 12:11:32 +0200 Subject: [PATCH] Added interaction for trees and stones, added items wood, stone, book and slimeball, v1.4.0 --- Assets/IMG/Aseprite/Inv_Book.aseprite | Bin 0 -> 1658 bytes Assets/IMG/Aseprite/Inv_Book.aseprite.meta | 7 + Assets/IMG/Aseprite/Inv_Slimeball.aseprite | Bin 0 -> 1544 bytes .../IMG/Aseprite/Inv_Slimeball.aseprite.meta | 7 + Assets/IMG/Aseprite/Inv_Stone.aseprite | Bin 0 -> 1060 bytes Assets/IMG/Aseprite/Inv_Stone.aseprite.meta | 7 + Assets/IMG/Aseprite/Inv_Wood.aseprite | Bin 0 -> 2502 bytes Assets/IMG/Aseprite/Inv_Wood.aseprite.meta | 7 + Assets/Resources/Items.meta | 8 ++ Assets/Resources/Items/Inv_Book.png | Bin 0 -> 1562 bytes Assets/Resources/Items/Inv_Book.png.meta | 120 ++++++++++++++++++ Assets/Resources/Items/Inv_Slimeball.png | Bin 0 -> 1595 bytes Assets/Resources/Items/Inv_Slimeball.png.meta | 120 ++++++++++++++++++ Assets/Resources/Items/Inv_Stone.png | Bin 0 -> 964 bytes Assets/Resources/Items/Inv_Stone.png.meta | 120 ++++++++++++++++++ Assets/Resources/Items/Inv_Wood.png | Bin 0 -> 2796 bytes Assets/Resources/Items/Inv_Wood.png.meta | 120 ++++++++++++++++++ Assets/Scripts/Controls.cs | 12 ++ Assets/Scripts/Items/Book.cs | 10 +- Assets/Scripts/Items/Equipment.cs | 31 +++-- Assets/Scripts/Items/Item.cs | 71 ++++++++++- Assets/Scripts/Slimes/BasicSlime.cs | 18 ++- audiosettings.txt | 2 +- 23 files changed, 643 insertions(+), 17 deletions(-) create mode 100644 Assets/IMG/Aseprite/Inv_Book.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Book.aseprite.meta create mode 100644 Assets/IMG/Aseprite/Inv_Slimeball.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Slimeball.aseprite.meta create mode 100644 Assets/IMG/Aseprite/Inv_Stone.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Stone.aseprite.meta create mode 100644 Assets/IMG/Aseprite/Inv_Wood.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Wood.aseprite.meta create mode 100644 Assets/Resources/Items.meta create mode 100644 Assets/Resources/Items/Inv_Book.png create mode 100644 Assets/Resources/Items/Inv_Book.png.meta create mode 100644 Assets/Resources/Items/Inv_Slimeball.png create mode 100644 Assets/Resources/Items/Inv_Slimeball.png.meta create mode 100644 Assets/Resources/Items/Inv_Stone.png create mode 100644 Assets/Resources/Items/Inv_Stone.png.meta create mode 100644 Assets/Resources/Items/Inv_Wood.png create mode 100644 Assets/Resources/Items/Inv_Wood.png.meta diff --git a/Assets/IMG/Aseprite/Inv_Book.aseprite b/Assets/IMG/Aseprite/Inv_Book.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..25f9f617047192964cc84a882aa072e3f12c131d GIT binary patch literal 1658 zcmdUreM}Q~7{`wRHA^I0wrNB%+Ds>-i4zQC!BQJcgng`#_7P8T1SB{7VO-dU4lTQLoC=;V}T&Gx3=l~akr;TGqe4@KlZ!aCr_T= zlly+2YoZ~@gG&(z5`jc800?pj-oFp@!cF95c>aqMj7E^4GkPr*N@OFv>lka1&&AC_ z9m`-m?a-gQSt}_7d4rJx-1}BKke8MWloqpq)}z~i=JPzD41!M?4)o#|;n4(9|gsp=%K?8rml!5#`&Ibj2i&l5lj4ubTkb->SCz5?hA1VS1_(ZflMNZ_*r3dlNS|AEHpV~pgZ zQ3w*vfOWxydg0l~dE`gr)7~eu$;aZ-UfY{r$A5+Uej~l&r&=Rg|F~+Kte~V8iTPud zmitNMxP4>bL{tHtPN!PlYu~zjj|_w~-(_k{M8#@4Mg@zRq}QHE3(V^hHra%@GR`KX zm~l4zv~sfz?_~l8l(9B^lnJ=4++@S=GXeH#TA*;6f#qzri2zI0rgw{SFI%!=Tsm$xwuL70 z`P@dIS~VEz&miUHo#7jwU1{GfIAb`>t@h=&5^OzFF9kbuky+fCK?_Jh}oJD)UPbg$hB%N4Bjvi;_D;6-D*dZ#IdNEd2pG$9`wC_e7m>FvUdN? zs%KO<(lVv#Ef-4+T0&eeW#K*SrFe{3rGgt--;z98AF&|%IAAUxTa2#}5gz#%A$zDX z?m5+YXDQ{QT~EF?ptxa+C5?lgb{VbxH&ohVzX>}nf$?BjeKBnDHU&b^9xR@Fnj z-kWqRuPwZki1a_&VTi;U3kj#M!;dx;H7p4whR1T1ebU;DRo1!Q&Ldc!%W8g-jmN)IFx&t-EDqqMB5EO!$Q*pvQ5+sk3M$dt`xfr0a$fNC)<1cgfV@ z8+VUShwyl^bZUsjE4x4ZyJ^WFUX`@u+J}dN-7t4+QoF&D#?6xTv7KDdmAJdCpBY9I z$;s`o+h_#oXAQ%ci{@v|D&!lmoLh=^XWtlh8YUMBSSZThBO{VDMQG(AK z^ZHE#nRaJitYq#{o(Qd8@o9tvzk~~YWhwMG3`1YL^1V^PyIUjWObBkqW8HW9*<^5} zIcs^A%0&rh*N~BpW&c%JJuCjeqtLW`WPbnC&WG6c+2)qpg$-o~q=rVa^h&^VP=0lu zi4qe|(eOhRT5PSm1Ro?kyYz!xi&X#@Zr!|z5aP^-@O`VLU#MbvCvC77pf$G E0yxDd$^ZZW literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/Inv_Book.aseprite.meta b/Assets/IMG/Aseprite/Inv_Book.aseprite.meta new file mode 100644 index 0000000..b4bc14e --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Book.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 61286a9c10c7f4c4eb77a6e7d33aac88 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Slimeball.aseprite b/Assets/IMG/Aseprite/Inv_Slimeball.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..7c13fe22c3dd0415bf5daf37d8995e83e168f103 GIT binary patch literal 1544 zcmcJOeN<9+7{{+QX>HPWcAPJ9EOO1$Y&CSKsnI>Ib=ov_<=fJe$+>C)fteapDo&#p zS1YVszTm`dN6i=7S|Xi9%{&9kh|^3bAmC<`Lm;f7_=d1YT&MorKl|NtKj*p6effTV z_x|pyI0PB3_dpO2#DfSxkZjmr4CpO3kvC!cKSrr1g3LYhbf-dz_`tq`=#G3TP7Sp` zk@#p>k$@59 zEMOe%1K^&x^}x`rkw6qJ1d_781ZJ>)2Vw#jaKGXSuwUZ_82?KnjdNXVJyw0t--pdI*iD4>Bv&H-LqxbXMBVIR0MfrJqR-Y-%HeRZDOX=C=x}o=2 zJ~P%EHNUq;rEdwBHFTz{{rQ|t6Q%Nn)FU=7*O8Pys1KXzxM|C{tNOU&s$SHJC({b1 zw-oH~VVc`XX<3ix5^?k@47)D-z7w_31JpP2>hqnlT$FjAPsrnUNc^!E?5`&?%W%f5MfgUu^pzgE?>njO(nbhEOS zfms{GEZ?L;mRTzu!eiAs0_TmUqW;Qe46{x z{9p3g%ha{r0@gZWN{GHaqH3fo1n4G*6h2GKu@Sao|~F zw(r8Mz9mlVRXk6=c?E6@Ha;Qr)!zRj@t$td!2L0nW8;!I!F=@HvBZ0;=CH)xsH`#+ zf8KrE^~}IV@uHjun#L-4l;b^rZmdjr8Oi{znU?;oo;ov7K9dycEdSbl{eLT4sTN+0 z;u^+BOzK+>OkJQj$z=DFqeuBMcw-$LuXmQ4TTxt*_-d1{ zQ+hIZBA(-DYHM-&Jys<+tW&t=)+=`D$=f5RB}&4z{(Wt7;pUVHeoTNU$8ZYGt4m19 zhQ4IuvH5D;fH0AfcF1}j#SOOP)Zfwj@{G!+FhcfXXNtY)ozqUgWXVeVOp@eNsD8~H z$eOb;BDp^p@X1P@7uPG8#_v&N+*!jVNJ>#$#G!SZZu#ia7cKVMCLOwfsk^SvPS``518C9;Pj6BmanGdO9is0TSqzn?lqN2#Js+3^F-Y+bN$jzY literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/Inv_Slimeball.aseprite.meta b/Assets/IMG/Aseprite/Inv_Slimeball.aseprite.meta new file mode 100644 index 0000000..cee352a --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Slimeball.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0644771adf7299244bb2b0c146ab8339 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Stone.aseprite b/Assets/IMG/Aseprite/Inv_Stone.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..0720c7d70e126b3c222838883cdcdcda4689c730 GIT binary patch literal 1060 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Items/Inv_Book.png.meta b/Assets/Resources/Items/Inv_Book.png.meta new file mode 100644 index 0000000..ac38dec --- /dev/null +++ b/Assets/Resources/Items/Inv_Book.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 8d5033562923ed0428ddde91034a6ab5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Items/Inv_Slimeball.png b/Assets/Resources/Items/Inv_Slimeball.png new file mode 100644 index 0000000000000000000000000000000000000000..20544ffadabcb47aef78cc8519957d72be6bdd41 GIT binary patch literal 1595 zcmb7EYc$k(82-)Q7&8new-g!K#nfVGw#NOgA{mA;lrp)tj*V93R^~#kt#YZ9U5(Vr zC{!f(L9w|f#!4}g)O6XAOS6o><#f)T{o3>8eV_Nd?{nVse0VZEJ@zQdZ$65#+A5DK5kHDvHVg&zRn?1%?WqNVHH~k9Fe#~FX`|3|!fMsJiF(1Qsdn6{ z`J!$8Hn~`030A6o=A^1pL}ctHiN#W+r&5^pp;Y*9Cj4PG82&PXpGa6C*pP8)X4(6b zClUuno^QY=L;0I&j|5TO4D&S=ykylCOS* zOQc*Mm`T@>Rw7%?)g*rRldtWV_tr>d+uEeJ>C8-tOO;`|0>{2m$KGq1B(XwsVzz|^ z=CwzON3LL?Gh-Q!i<3Mi7~{{XMcdI=l1EY5C2`A*TauEQ=ae0|=gHKEKL;!jgS6i6 zYZZ{B8&#ndg22)jWjFKs1-;djVpg;X4ocyN%g<&_65Y`5%PXQl295?p z%H0-o2Ed?hX=Ku<)Ia$)Z1zIFF*9klSKPS)>JJKxBT4V3@QLFxEJjY*NWjX}D3p|* z*xDOtnlUnE}Eg;s_o4#6ZN21oU{#4|P=V%d> z?~(RHg_b91&9N$w&^2O^M7&Gp$=UydoQb}fcq;)|ySm2-T;Jz(Av`VXENG*LdD?(7 znEU(3+ys3Cz@pP+xF5PYLfsa9hCy6z_2APzZv8%3R<3I=u4}>f@!Bl+_59@lt7#cf z;A;%J?i|II`kbdJunaLjXm|3)oo>nii94{ba-&$s*OSYe>yKBEDcJ31R=WV&0O%F~ z7J~+Hhr;i_aLgzwR{@kp#NH@cA}<7hZuEaE5a7@xmL-)S=4wPB<^jUq6aiY10I3Ra zYvSKV8W!eybmB~O)5;gE`GQD*+y8%s+aaJazEi6iBwWOIMqBA8RJZ}4_4OOS zjO7BkW)=5X^%h8)rwBM0fcCWnyrfgz@w_jdHGmKk)lucP;8z2HF98pR>E_va16JxX z+@Z`4&##{4TzEZyagem;Z2&c21Al=ZL!7VoqmuUli`Ysc%2bZ_Y@w0A( zgcnxpl<9!byuxSspNd5Yv7YgyzsX&)3dB9ZiMjQ;DGvvTDtSfy)Wqwj+iWE80^Zsz zU0{%A7qm-{41{Uv`H2h#q3h@2mYPOI-8YO;Bi^1tNa!Lev@>58v<-e@A7n?rD_^A? zCra2jbf|=x(IU$V$tnB7*T8iQulj#bVCo_rHDUTwBFx4S`ot|WHY|*-9(mJyqSY&ojVh3fCLEtRTZDUP(cW^7?zzblTN{}D%IG^JDoj%A&7Dr+v#_hSnbp}i&Gg9$O0ghO3%Y~h-0wMEL#I@7 z{l?JjEKRssEfQagG`#ouOKJ4-C`#!KkE#9meee$C0afHdV@XuwQmmouhwfbi8Rf8r z+C955zEZ`~47Fzp%~8j~JJlBa@J`&F4prjghnD7ba?pUo37cDatj*!&7=g__f2^x@c-TsNem(2I b1*R!X1PK)^i!oeUTEBC3@o=tiWN`ik7;c$2 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Items/Inv_Slimeball.png.meta b/Assets/Resources/Items/Inv_Slimeball.png.meta new file mode 100644 index 0000000..02697aa --- /dev/null +++ b/Assets/Resources/Items/Inv_Slimeball.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: fddfe91ec79b5d942b0caad085ec5e09 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Items/Inv_Stone.png b/Assets/Resources/Items/Inv_Stone.png new file mode 100644 index 0000000000000000000000000000000000000000..04ae6b853ad2adb753918e997c4417fc3c96b000 GIT binary patch literal 964 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Items/Inv_Wood.png.meta b/Assets/Resources/Items/Inv_Wood.png.meta new file mode 100644 index 0000000..d2e0842 --- /dev/null +++ b/Assets/Resources/Items/Inv_Wood.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 274b6fd388925774e9b6459c142397f0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 14471ea..1de3685 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -53,6 +53,18 @@ public class Controls : MonoBehaviour case "Enemy": fight.GetComponent().startFight(worldGen.GetComponent().getCurrentTile(), target, player); break; + case "Tree": + GameObject.Find("Inventory").GetComponent().addItem(new Item("Wood")); + Destroy(target); + break; + case "Stone": + GameObject.Find("Inventory").GetComponent().addItem(new Item("Stone")); + Destroy(target); + break; + case "NPC": + break; + case "House": + break; } } } diff --git a/Assets/Scripts/Items/Book.cs b/Assets/Scripts/Items/Book.cs index 5d09b62..e725e02 100644 --- a/Assets/Scripts/Items/Book.cs +++ b/Assets/Scripts/Items/Book.cs @@ -9,13 +9,21 @@ namespace Assets.Scripts { public Book(int luck) : base(luck) { - + itemName = "The kings diary #1"; + loadImage(); + rarityColor = Color.white; } public Book(JToken json) : base(json) { } + + override + protected void loadImage() + { + image = Resources.Load("Items/Inv_Book"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Items/Equipment.cs b/Assets/Scripts/Items/Equipment.cs index 2cf771b..280511a 100644 --- a/Assets/Scripts/Items/Equipment.cs +++ b/Assets/Scripts/Items/Equipment.cs @@ -357,19 +357,32 @@ namespace Assets.Scripts Item endItem = endDrag.getItem(endDrag.getCurrentBag()); if (endItem != null) { - if (((Equipment)endItem).getPlace() != startDrag.place) + if (endItem is Equipment) { - return; - } - if (startDrag.place == ItemPlace.BAG) - { - startDrag.setItem(endItem, endDrag.getCurrentBag()); + if (((Equipment)endItem).getPlace() != startDrag.place) + { + return; + } } else { - startDrag.setEquip((Equipment)endItem); - inventory.calculateStatBoost(attributes, false); - inventory.calculateStatBoost(((Equipment)endItem).getAttributes(), true); + if (startDrag.place == ItemPlace.BAG) + { + startDrag.setItem(endItem, endDrag.getCurrentBag()); + } + else + { + if (endItem is Equipment) + { + startDrag.setEquip((Equipment)endItem); + inventory.calculateStatBoost(attributes, false); + inventory.calculateStatBoost(((Equipment)endItem).getAttributes(), true); + } + else + { + return; + } + } } isSwap = true; } diff --git a/Assets/Scripts/Items/Item.cs b/Assets/Scripts/Items/Item.cs index aac375c..9933820 100644 --- a/Assets/Scripts/Items/Item.cs +++ b/Assets/Scripts/Items/Item.cs @@ -18,10 +18,19 @@ namespace Assets.Scripts { luck = luck + GameObject.Find("Inventory").GetComponent().getEquipmentBonus()["LCK"]; calculateRarity(luck); + chooseItem(); setColor(); loadImage(); } + public Item(string name) + { + rarity = ItemRarity.COMMON; + itemName = name; + rarityColor = Color.white; + loadImage(); + } + public Item(JToken json) { rarity = (ItemRarity)Enum.Parse(typeof(ItemRarity), json["rarity"].ToString()); @@ -72,7 +81,18 @@ namespace Assets.Scripts protected virtual void loadImage() { - + switch (itemName) + { + case "Slimeball": + image = Resources.Load("Items/Inv_Slimeball"); + break; + case "Wood": + image = Resources.Load("Items/Inv_Wood"); + break; + case "Stone": + image = Resources.Load("Items/Inv_Stone"); + break; + } } public virtual string saveGame() @@ -100,7 +120,20 @@ namespace Assets.Scripts public virtual string getInformation() { - return ""; + string result = ""; + switch (itemName) + { + case "Slimeball": + result = "Soft and sticky... Does it have a use?"; + break; + case "Wood": + result = "Quite a nice piece of wood"; + break; + case "Stone": + result = "A small stone to craft with"; + break; + } + return result; } public virtual void move(InventorySlot startDrag, Inventory inventory, InventorySlot endDrag) @@ -114,9 +147,39 @@ namespace Assets.Scripts if (item != null) { - endDrag.setItem(this, startDrag.getCurrentBag()); + startDrag.setItem(item, endDrag.getCurrentBag()); + } + else + { + startDrag.removeItem(); + } + + endDrag.setItem(this, startDrag.getCurrentBag()); + } + + private void chooseItem() + { + /* Common: Slimeball + * Rare: + * Epic: + * Legendary: + */ + int index = rand.Next(10); + switch (rarity) + { + case ItemRarity.COMMON: + itemName = "Slimeball"; + break; + case ItemRarity.RARE: + itemName = "Slimeball"; + break; + case ItemRarity.EPIC: + itemName = "Slimeball"; + break; + case ItemRarity.LEGENDARY: + itemName = "Slimeball"; + break; } - startDrag.setItem(item, endDrag.getCurrentBag()); } } diff --git a/Assets/Scripts/Slimes/BasicSlime.cs b/Assets/Scripts/Slimes/BasicSlime.cs index 6612037..fb2712e 100644 --- a/Assets/Scripts/Slimes/BasicSlime.cs +++ b/Assets/Scripts/Slimes/BasicSlime.cs @@ -100,9 +100,23 @@ namespace Assets.Scripts.Slimes public Item getItem() { - if (new System.Random().Next(100) + 1 < 10 + luck) + int rand = new System.Random().Next(100) + 1; + if (rand < 10000)//10 + luck) { - item = new Equipment(luck); + int type = new System.Random().Next(3); + switch (type) + { + case 0: + item = new Equipment(luck); + break; + case 1: + item = new Book(luck); + break; + case 2: + item = new Item(luck); + break; + } + } return item; } diff --git a/audiosettings.txt b/audiosettings.txt index 3406059..8ab4f34 100644 --- a/audiosettings.txt +++ b/audiosettings.txt @@ -1,2 +1,2 @@ Music:0 -Effects:0 +Effects:0.5068976