diff --git a/Assets/IMG/Aseprite/Inv_Book.aseprite b/Assets/IMG/Aseprite/Inv_Book.aseprite new file mode 100644 index 0000000..25f9f61 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Book.aseprite differ 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 0000000..7c13fe2 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Slimeball.aseprite differ 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 0000000..0720c7d Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Stone.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Stone.aseprite.meta b/Assets/IMG/Aseprite/Inv_Stone.aseprite.meta new file mode 100644 index 0000000..80970b1 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Stone.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 540b33e18230d974e956b490744889ba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Wood.aseprite b/Assets/IMG/Aseprite/Inv_Wood.aseprite new file mode 100644 index 0000000..28991ba Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Wood.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Wood.aseprite.meta b/Assets/IMG/Aseprite/Inv_Wood.aseprite.meta new file mode 100644 index 0000000..40e309d --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Wood.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2e19fac0aad09b4487de5e151aa6888 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Items.meta b/Assets/Resources/Items.meta new file mode 100644 index 0000000..44aab45 --- /dev/null +++ b/Assets/Resources/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60b6a8d6b9127954281509010f10a374 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Items/Inv_Book.png b/Assets/Resources/Items/Inv_Book.png new file mode 100644 index 0000000..91da973 Binary files /dev/null and b/Assets/Resources/Items/Inv_Book.png differ 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 0000000..20544ff Binary files /dev/null and b/Assets/Resources/Items/Inv_Slimeball.png differ 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 0000000..04ae6b8 Binary files /dev/null and b/Assets/Resources/Items/Inv_Stone.png differ diff --git a/Assets/Resources/Items/Inv_Stone.png.meta b/Assets/Resources/Items/Inv_Stone.png.meta new file mode 100644 index 0000000..690b908 --- /dev/null +++ b/Assets/Resources/Items/Inv_Stone.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: b09bda01d68d297459a9bc6063feaad8 +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_Wood.png b/Assets/Resources/Items/Inv_Wood.png new file mode 100644 index 0000000..4519ae6 Binary files /dev/null and b/Assets/Resources/Items/Inv_Wood.png differ 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