1
0
Fork 0

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Saibotk 2018-04-24 20:35:39 +02:00
commit 0cd9a91d66

View file

@ -444,10 +444,10 @@ public class DungeonGenerator {
} }
float prob2 = 0.04f; float prob2 = 0.04f;
if (UnityEngine.Random.value > 1 - prob2 if (UnityEngine.Random.value > 1 - prob2
&& x > r.bounds.x +1 && x > r.bounds.x +2
&& x < r.bounds.x + r.bounds.width-1 && x < r.bounds.x + r.bounds.width-2
&& y > r.bounds.y+1 && y > r.bounds.y+2
&& y < r.bounds.y + r.bounds.height-1) && y < r.bounds.y + r.bounds.height-2)
{ {
r.spawnpoints.Add(pos); r.spawnpoints.Add(pos);
} }
@ -463,7 +463,6 @@ public class DungeonGenerator {
int rand = UnityEngine.Random.Range(0, 7); int rand = UnityEngine.Random.Range(0, 7);
switch (rand) { switch (rand) {
case 0:
case 1: { case 1: {
// Scorpion Attack!!!!: // Scorpion Attack!!!!:
List<GameObject> lg = new List<GameObject>(); List<GameObject> lg = new List<GameObject>();
@ -501,7 +500,8 @@ public class DungeonGenerator {
o = eo; o = eo;
} }
break; break;
case 6: case 6:
case 0:
{ {
// Coins!!!!: // Coins!!!!:
List<GameObject> lg = new List<GameObject>(); List<GameObject> lg = new List<GameObject>();