sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	Assets/Scripts/PlayerController.cs
This commit is contained in:
dhain 2022-05-10 00:04:07 +02:00
commit 66756be23b
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Assets/Scripts/PlayerController.cs
View file

@ -1,9 +1,10 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class PlayerController : MonoBehaviour { public class PlayerController : MonoBehaviour {
private List<Item> inventory; private Dictionary<Item, int> inventory;
private int money; private int money;
private UsableItem selectedItem; private UsableItem selectedItem;
@ -17,17 +18,25 @@ public class PlayerController : MonoBehaviour {
// Start is called before the first frame update // Start is called before the first frame update
void Start() { void Start()
inventory ??= new List<Item>(); {
inventory ??= new Dictionary<Item, int>();
money = startMoney; money = startMoney;
instance = this; instance = this;
} }
// Update is called once per frame // Update is called once per frame
void Update() { void Update()
{
} }
public void setSelectedItem(UsableItem item) { public void setSelectedItem(UsableItem item) {
selectedItem = item; if (inventory.ContainsKey(item)) {
selectedItem = item;
Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto);
} else {
Debug.Log("An item requested to select isn't in the inventory" + item);
}
} }
} }