OpenCodeBox/robber-and-dobber
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Birb-Games-Studio/Robber-and-Dobber

Browse source
This commit is contained in:
Ignis 2021-08-28 12:25:16 +02:00
commit 3e5ea074fe
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Input/PlayerControls.cs
View file

@ -172,9 +172,9 @@ public class @PlayerControls : IInputActionCollection, IDisposable
},
{
""name"": ""Interact"",
""type"": ""Button"",
""type"": ""Value"",
""id"": ""441a993f-cce4-4bfb-93b1-5a5a64659cc2"",
""expectedControlType"": ""Button"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
},

4
Assets/Input/PlayerControls.inputactions
View file

@ -159,9 +159,9 @@
},
{
"name": "Interact",
"type": "Button",
"type": "Value",
"id": "441a993f-cce4-4bfb-93b1-5a5a64659cc2",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": ""
},

15
Assets/Scripts/Trap.cs
View file

@ -6,10 +6,6 @@ using NaughtyAttributes;
public class Trap : MonoBehaviour
{
[Header("Debug")]
public bool showReachRangeSphere;
@ -26,7 +22,7 @@ public class Trap : MonoBehaviour
public bool isActivated;
public bool playerInRange;
public bool robberInRange;
public PlayerControls.DobberControlsActions dobberControls;
public PlayerControls dobberControls;
public InputReferences inputReferences;
public Material unsetMaterial;
public Material setMaterial;
@ -101,7 +97,7 @@ public class Trap : MonoBehaviour
private void Awake()
{
dobberControls = new PlayerControls.DobberControlsActions();
dobberControls = new PlayerControls();
dobberControls.Enable();
}
@ -109,11 +105,10 @@ public class Trap : MonoBehaviour
{
if (Physics.CheckSphere(transform.position + trapInteractionRadiusOffset, trapInteractionRadius))
{
switch (interacted)
{
case 1:
case 1:
Debug.Log("trap collected");
isSet = false;
GetComponent<MeshRenderer>().sharedMaterial = setMaterial;
@ -139,7 +134,7 @@ public class Trap : MonoBehaviour
{
Debug.Log("The robber set off the trap.");
isActivated = false;
this.GetComponent<MeshRenderer>().sharedMaterial = unsetMaterial;
GetComponent<MeshRenderer>().sharedMaterial = unsetMaterial;
}
}