fixed options, fixed save, new Screenshots, v.140
This commit is contained in:
@@ -14,13 +14,20 @@ namespace Assets.Scripts
|
||||
public Texture image;
|
||||
public Color32 rarityColor;
|
||||
|
||||
public Item(int luck)
|
||||
public Item(int luck, bool isEquipment)
|
||||
{
|
||||
luck = luck + GameObject.Find("Inventory").GetComponent<Inventory>().getEquipmentBonus()["LCK"];
|
||||
calculateRarity(luck);
|
||||
chooseItem();
|
||||
setColor();
|
||||
loadImage();
|
||||
if(isEquipment){
|
||||
luck = luck + GameObject.Find("Inventory").GetComponent<Inventory>().getEquipmentBonus()["LCK"];
|
||||
calculateRarity(luck);
|
||||
setColor();
|
||||
}
|
||||
else{
|
||||
chooseItem();
|
||||
rarity = ItemRarity.COMMON;
|
||||
rarityColor = Color.white;
|
||||
loadImage();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public Item(string name)
|
||||
@@ -35,7 +42,12 @@ namespace Assets.Scripts
|
||||
{
|
||||
rarity = (ItemRarity)Enum.Parse(typeof(ItemRarity), json["rarity"].ToString());
|
||||
itemName = json["itemName"].ToString();
|
||||
setColor();
|
||||
if(json["place"] != null){
|
||||
setColor();
|
||||
}
|
||||
else{
|
||||
rarityColor = Color.white;
|
||||
}
|
||||
loadImage();
|
||||
}
|
||||
|
||||
@@ -92,6 +104,18 @@ namespace Assets.Scripts
|
||||
case "Rock":
|
||||
image = Resources.Load<Texture>("Items/Inv_Stone");
|
||||
break;
|
||||
case "Iron ore":
|
||||
image = Resources.Load<Texture>("Items/Inv_Iron");
|
||||
break;
|
||||
case "Gold ore":
|
||||
image = Resources.Load<Texture>("Items/Inv_Gold");
|
||||
break;
|
||||
case "Copper ore":
|
||||
image = Resources.Load<Texture>("Items/Inv_Copper");
|
||||
break;
|
||||
case "Tin ore":
|
||||
image = Resources.Load<Texture>("Items/Inv_Tin");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,6 +156,18 @@ namespace Assets.Scripts
|
||||
case "Rock":
|
||||
result = "Is it... Dwayne?";
|
||||
break;
|
||||
case "Iron ore":
|
||||
result = "The most basic ore";
|
||||
break;
|
||||
case "Gold ore":
|
||||
result = "Wooooow... Shiny.";
|
||||
break;
|
||||
case "Copper ore":
|
||||
result = "Cool";
|
||||
break;
|
||||
case "Tin ore":
|
||||
result = "Got inspired by Minecraft, huh?";
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -159,25 +195,20 @@ namespace Assets.Scripts
|
||||
|
||||
private void chooseItem()
|
||||
{
|
||||
/* Common: Slimeball
|
||||
* Rare:
|
||||
* Epic:
|
||||
* Legendary:
|
||||
*/
|
||||
int index = rand.Next(10);
|
||||
switch (rarity)
|
||||
int index = rand.Next(4);
|
||||
switch (index)
|
||||
{
|
||||
case ItemRarity.COMMON:
|
||||
case 0:
|
||||
itemName = "Slimeball";
|
||||
break;
|
||||
case ItemRarity.RARE:
|
||||
itemName = "Slimeball";
|
||||
case 1:
|
||||
itemName = "Rock";
|
||||
break;
|
||||
case ItemRarity.EPIC:
|
||||
itemName = "Slimeball";
|
||||
case 2:
|
||||
itemName = "Iron ore";
|
||||
break;
|
||||
case ItemRarity.LEGENDARY:
|
||||
itemName = "Slimeball";
|
||||
case 3:
|
||||
itemName = "Gold ore";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user