Large diffs are not rendered by default.

@@ -15,7 +15,8 @@ void Start()
public void RandomizeContent()
{
List<Item> combinedList = new List<Item>();
combinedList.AddRange(ItemDB.Instance.GetBoozeItems());
combinedList.AddRange(ItemDB.Instance.GetBeerItems());
combinedList.AddRange(ItemDB.Instance.GetLiquorItems());

// Random amount of stuff in store
for (int i = 0; i < combinedList.Count; i++)
@@ -8,7 +8,8 @@ public class ItemDB : MonoBehaviour

[SerializeField] private List<Item> foodItems;
[SerializeField] private List<Item> generalItems;
[SerializeField] private List<Item> boozeItems;
[SerializeField] private List<Item> beerItems;
[SerializeField] private List<Item> liquorItems;
[SerializeField] private List<SpecialItem> specialItems;

void Awake()
@@ -22,11 +23,14 @@ public List<Item> GetFoodItems()
return foodItems;
}

public List<Item> GetBoozeItems()
public List<Item> GetBeerItems()
{
return boozeItems;
return beerItems;
}

public List<Item> GetLiquorItems()
{
return liquorItems;
}
public List<Item> GetGeneralItems()
{
return generalItems;
@@ -42,6 +46,7 @@ public enum ItemType
{
Food,
Booze,
Liquor,
General,
Special
}
@@ -17,7 +17,8 @@ public void RandomizeContent()
List<Item> combinedList = new List<Item>();
combinedList.AddRange(ItemDB.Instance.GetFoodItems());
combinedList.AddRange(ItemDB.Instance.GetGeneralItems());
combinedList.AddRange(ItemDB.Instance.GetBoozeItems());
combinedList.AddRange(ItemDB.Instance.GetBeerItems());
combinedList.AddRange(ItemDB.Instance.GetLiquorItems());

// min and max items
int maximum = combinedList.Count;
@@ -48,6 +48,11 @@ private void Buy()
var i = item as SpecialItem;
i.IsOwned = true;
}
if (item.GetType () == typeof(Item)) {

Debug.Log (item.DisplayName);
}

// Add item to inventory
ResourceManager.Instance.AddToInventory(item);
}
@@ -13,6 +13,9 @@ public static ResourceManager Instance
public int daysLeft = 7;
public float CurrentMoney = 300;
public float CurrentWood = 100;
public float CurrentFood = 0;
public float CurrentBeer = 0;
public float CurrentLiquor = 0;
public float TimeLeftForRound = 100;
public bool fenceBroken = false;
private List<Item> CurrentItems = new List<Item>();
@@ -33,7 +36,7 @@ public void AddToInventory(Item item)
if (ItemExists(item))
{
var curItem = CurrentItems.First(i => i.DisplayName == item.DisplayName);
curItem.OwnedItems +=item.OwnedItems;
curItem.OwnedItems ++;
}
else
{
@@ -46,6 +49,15 @@ public void AddToInventory(Item item)
foreach (var it in CurrentItems)
{
Debug.Log(it.ItemType + " : " + it.DisplayName + " count: " + it.OwnedItems);
if (it.ItemType == ItemType.Booze) {
ResourceManager.Instance.CurrentBeer = it.OwnedItems;
}
if (it.ItemType == ItemType.Liquor) {
ResourceManager.Instance.CurrentLiquor = it.OwnedItems;
}
if (it.ItemType == ItemType.Food) {
ResourceManager.Instance.CurrentFood = it.OwnedItems;
}
}
}

@@ -124,11 +136,24 @@ public int GetCurrentFood()
public int GetCurrentBeer()
{
int c = 0;
foreach (var i in ItemDB.Instance.GetBoozeItems())
foreach (var i in ItemDB.Instance.GetBeerItems())
{
if (i.ItemType == ItemType.Booze)
{
c = c + (i.OwnedItems == 0 ? 1 : i.OwnedItems);
c++;
}
}

return c;
}
public int GetCurrentLiquor()
{
int c = 0;
foreach (var i in ItemDB.Instance.GetLiquorItems())
{
if (i.ItemType == ItemType.Liquor)
{
c++;
}
}

@@ -7,10 +7,16 @@ public class TopMenuUI : MonoBehaviour
{
public Text daysLeft;
public Text CurrentMoney;
public Text foodLeft;
public Text beerLeft;
public Text liquorLeft;

void Update()
{
daysLeft.text = ResourceManager.Instance.daysLeft.ToString();
CurrentMoney.text = string.Format("{0:0.00} €", ResourceManager.Instance.CurrentMoney);
foodLeft.text = ResourceManager.Instance.CurrentFood.ToString();
beerLeft.text = ResourceManager.Instance.CurrentBeer.ToString();
liquorLeft.text = ResourceManager.Instance.CurrentLiquor.ToString();
}
}

Large diffs are not rendered by default.