Conjure/DeathBook
6
0
Fork 0
mirror of https://github.com/ConjureETS/DeathBook.git synced 2026-03-24 04:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

Browse Source
This commit is contained in:
Patrice Vignola 2015-08-16 21:26:23 -04:00
commit f661bbede2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Models/Person.cs
View File

@ -104,7 +104,7 @@ namespace DeathBook.Model
public bool Kill() public bool Kill()
{ {
if (Online || (LevelManager.Instance.GameLevel.tutorialInt < 4)) if (Online || ((LevelManager.Instance.GameLevel.tutorialInt < 4) && (LevelManager.Instance.GameLevel.tutorialInt >= 0)))
return false; return false;
//Debug.Log("Person " + id + " died!"); //Debug.Log("Person " + id + " died!");

2
Assets/Scripts/NetworkingSphere.cs
View File

@ -167,7 +167,7 @@ public class NetworkingSphere : MonoBehaviour
if (!_isRotatingTowardsNode || node != _selectedNode) if (!_isRotatingTowardsNode || node != _selectedNode)
{ {
if (lvl.tutorialInt > 1) if ((lvl.tutorialInt > 1) || (lvl.tutorialInt > 1))
FocusOnNode(node); FocusOnNode(node);
} }