diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index 3372fb4..3f9f735 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -145,7 +145,7 @@ Transform: m_GameObject: {fileID: 1887677565572348} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1} m_Children: - {fileID: 4193287044024648} - {fileID: 4528190223728408} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 082c5f3..53f2126 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -482,7 +482,7 @@ MonoBehaviour: turnSpeed: 2 drift: 1 brake: 2 - maxBrakeTime: 15 + maxBrakeTime: 20 accelerationTime: 2.115 decelerationTime: 1.2346 --- !u!198 &198306026557504490 diff --git a/Assets/Prefabs/SlimeBullet.prefab b/Assets/Prefabs/SlimeBullet.prefab index 5e38fb9..42a015b 100644 --- a/Assets/Prefabs/SlimeBullet.prefab +++ b/Assets/Prefabs/SlimeBullet.prefab @@ -38,7 +38,7 @@ Transform: m_GameObject: {fileID: 1340970730445882} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 1} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -99,7 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} m_Name: m_EditorClassIdentifier: - speed: 8 + speed: 5 damage: 0 start: 0 --- !u!212 &212627463552776370 diff --git a/Assets/Prefabs/Tiles/rock.prefab b/Assets/Prefabs/Tiles/rock.prefab index 4df6c92..03cce7a 100644 --- a/Assets/Prefabs/Tiles/rock.prefab +++ b/Assets/Prefabs/Tiles/rock.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61891926131160174} m_Layer: 0 m_Name: rock - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockD.prefab b/Assets/Prefabs/Tiles/rockD.prefab index c80a1a1..3b3f577 100644 --- a/Assets/Prefabs/Tiles/rockD.prefab +++ b/Assets/Prefabs/Tiles/rockD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61798303579644032} m_Layer: 0 m_Name: rockD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDL.prefab b/Assets/Prefabs/Tiles/rockDL.prefab index 9ce7eb4..4328552 100644 --- a/Assets/Prefabs/Tiles/rockDL.prefab +++ b/Assets/Prefabs/Tiles/rockDL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61362440249651478} m_Layer: 0 m_Name: rockDL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDLU.prefab b/Assets/Prefabs/Tiles/rockDLU.prefab index 2ecc283..7f6f8c1 100644 --- a/Assets/Prefabs/Tiles/rockDLU.prefab +++ b/Assets/Prefabs/Tiles/rockDLU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61364379581901728} m_Layer: 0 m_Name: rockDLU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDLUR.prefab b/Assets/Prefabs/Tiles/rockDLUR.prefab index 2e0c08d..2f66869 100644 --- a/Assets/Prefabs/Tiles/rockDLUR.prefab +++ b/Assets/Prefabs/Tiles/rockDLUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61031428949727204} m_Layer: 0 m_Name: rockDLUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDU.prefab b/Assets/Prefabs/Tiles/rockDU.prefab index 508358c..6476f48 100644 --- a/Assets/Prefabs/Tiles/rockDU.prefab +++ b/Assets/Prefabs/Tiles/rockDU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61867638451973766} m_Layer: 0 m_Name: rockDU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockL.prefab b/Assets/Prefabs/Tiles/rockL.prefab index 1322fc9..6ee6939 100644 --- a/Assets/Prefabs/Tiles/rockL.prefab +++ b/Assets/Prefabs/Tiles/rockL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61829153926485560} m_Layer: 0 m_Name: rockL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLR.prefab b/Assets/Prefabs/Tiles/rockLR.prefab index 3652e33..db8b76c 100644 --- a/Assets/Prefabs/Tiles/rockLR.prefab +++ b/Assets/Prefabs/Tiles/rockLR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61236632091580028} m_Layer: 0 m_Name: rockLR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLU.prefab b/Assets/Prefabs/Tiles/rockLU.prefab index 8694778..d44f3c9 100644 --- a/Assets/Prefabs/Tiles/rockLU.prefab +++ b/Assets/Prefabs/Tiles/rockLU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61902424584989724} m_Layer: 0 m_Name: rockLU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLUR.prefab b/Assets/Prefabs/Tiles/rockLUR.prefab index 4cb797f..6cfae4c 100644 --- a/Assets/Prefabs/Tiles/rockLUR.prefab +++ b/Assets/Prefabs/Tiles/rockLUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61035825138540804} m_Layer: 0 m_Name: rockLUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockR.prefab b/Assets/Prefabs/Tiles/rockR.prefab index 2a7d5a0..c06fa39 100644 --- a/Assets/Prefabs/Tiles/rockR.prefab +++ b/Assets/Prefabs/Tiles/rockR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61456461862167858} m_Layer: 0 m_Name: rockR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockRD.prefab b/Assets/Prefabs/Tiles/rockRD.prefab index b36a94e..1d053d5 100644 --- a/Assets/Prefabs/Tiles/rockRD.prefab +++ b/Assets/Prefabs/Tiles/rockRD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61341370786779490} m_Layer: 0 m_Name: rockRD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockRDL.prefab b/Assets/Prefabs/Tiles/rockRDL.prefab index 6f38382..94d329b 100644 --- a/Assets/Prefabs/Tiles/rockRDL.prefab +++ b/Assets/Prefabs/Tiles/rockRDL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61487560770014174} m_Layer: 0 m_Name: rockRDL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockU.prefab b/Assets/Prefabs/Tiles/rockU.prefab index 2a32832..1e7f1aa 100644 --- a/Assets/Prefabs/Tiles/rockU.prefab +++ b/Assets/Prefabs/Tiles/rockU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61699217941965386} m_Layer: 0 m_Name: rockU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockUR.prefab b/Assets/Prefabs/Tiles/rockUR.prefab index f9e31d7..6cca9dd 100644 --- a/Assets/Prefabs/Tiles/rockUR.prefab +++ b/Assets/Prefabs/Tiles/rockUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61699965863900698} m_Layer: 0 m_Name: rockUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockURD.prefab b/Assets/Prefabs/Tiles/rockURD.prefab index 7b6889c..a796c1e 100644 --- a/Assets/Prefabs/Tiles/rockURD.prefab +++ b/Assets/Prefabs/Tiles/rockURD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61660594946959392} m_Layer: 0 m_Name: rockURD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 26bb521..acaeac4 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -1543,7 +1543,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 39.24086 + value: 38.603355 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} diff --git a/Assets/Scripts/Entities/Attack/SingleShot.cs b/Assets/Scripts/Entities/Attack/SingleShot.cs index dbf1129..1eabfed 100644 --- a/Assets/Scripts/Entities/Attack/SingleShot.cs +++ b/Assets/Scripts/Entities/Attack/SingleShot.cs @@ -38,6 +38,10 @@ namespace Assets.Scripts.Entities.Attack { this.bulletPrefab = bullet; } + public void SetRange(int range) { + this.range = range; + } + public void Attack() { if ( bulletPrefab == null ) { Debug.Log("SingleShot: No Prefab defined for Bullet!"); diff --git a/Assets/Scripts/Entities/Bug.cs b/Assets/Scripts/Entities/Bug.cs index 968db50..dc6bd49 100644 --- a/Assets/Scripts/Entities/Bug.cs +++ b/Assets/Scripts/Entities/Bug.cs @@ -17,7 +17,8 @@ namespace Assets.Scripts.Entities { protected override void Start() { base.Start(); - SingleShot s = new SingleShot(this.gameObject, 12, 3, 8 ); + SingleShot s = new SingleShot(this.gameObject, 8, 3, 8 ); + s.SetRange(3); s.SetPrefab(bullet); s.SetSpawn(bulletSpawn); SetAttack(s); diff --git a/Assets/Scripts/Entities/Player.cs b/Assets/Scripts/Entities/Player.cs index 1baa1ab..d439235 100644 --- a/Assets/Scripts/Entities/Player.cs +++ b/Assets/Scripts/Entities/Player.cs @@ -50,7 +50,12 @@ public class Player : Mob { if ( collision.collider.tag == "wall" ) { //InflictDamage(maxHP / 2); Death(); - } else if ( collision.collider.tag == "Enemy" ) { + } else if (collision.collider.tag == "rock") + { + InflictDamage(maxHP / 10); + //Death(); + } + else if ( collision.collider.tag == "Enemy" ) { Mob m = collision.collider.GetComponent(typeof(Mob)) as Mob; if ( m != null ) { //m.InflictDamage(carDamage); diff --git a/Assets/Scripts/Entities/Spider.cs b/Assets/Scripts/Entities/Spider.cs index ae738a5..55d9b81 100644 --- a/Assets/Scripts/Entities/Spider.cs +++ b/Assets/Scripts/Entities/Spider.cs @@ -11,13 +11,14 @@ namespace Assets.Scripts.Entities { [SerializeField] private GameObject bullet; - public Spider() : base(25) { + public Spider() : base(15) { } protected override void Start() { base.Start(); SingleShot s = new SingleShot(this.gameObject, 25, 4, 2); + s.SetRange(10); s.SetPrefab(bullet); s.SetSpawn(bulletSpawn); SetAttack(s); diff --git a/Assets/Scripts/Generation/DungeonGenerator.cs b/Assets/Scripts/Generation/DungeonGenerator.cs index 1bf1eb6..033f62c 100644 --- a/Assets/Scripts/Generation/DungeonGenerator.cs +++ b/Assets/Scripts/Generation/DungeonGenerator.cs @@ -444,10 +444,10 @@ public class DungeonGenerator { } float prob2 = 0.04f; if (UnityEngine.Random.value > 1 - prob2 - && x > r.bounds.x +1 - && x < r.bounds.x + r.bounds.width-1 - && y > r.bounds.y+1 - && y < r.bounds.y + r.bounds.height-1) + && x > r.bounds.x + 2 + && x < r.bounds.x + r.bounds.width-2 + && y > r.bounds.y+ 2 + && y < r.bounds.y + r.bounds.height-2) { r.spawnpoints.Add(pos); } @@ -463,11 +463,10 @@ public class DungeonGenerator { int rand = UnityEngine.Random.Range(0, 7); switch (rand) { - case 0: - case 1: { + case 0: { // Scorpion Attack!!!!: List lg = new List(); - int count = Math.Min(UnityEngine.Random.Range(1, ( int ) Mathf.Floor(r.GetSpawnpoints().Count)), 4); + int count = UnityEngine.Random.Range(1, ( int ) Math.Min(Mathf.Floor(r.GetSpawnpoints().Count), 4)); for ( int c = 0; c < count; c++ ) { lg.Add(enemyPrefabs[Entity.Entities.SCORPION]); } @@ -501,9 +500,10 @@ public class DungeonGenerator { o = eo; } break; - case 6: + case 6: + case 1: { - // Coins!!!!: + // Siders!!!!: List lg = new List(); int count = Math.Min(UnityEngine.Random.Range(1, (int)Mathf.Floor(r.GetSpawnpoints().Count)), 3); for (int c = 0; c < count; c++) diff --git a/Assets/sound/AudioMixer.mixer b/Assets/sound/AudioMixer.mixer index 11b4d77..2c86733 100644 --- a/Assets/sound/AudioMixer.mixer +++ b/Assets/sound/AudioMixer.mixer @@ -80,13 +80,14 @@ AudioMixerSnapshotController: m_SnapshotID: d3789ccdbdc046a448f1887d94c3f7f5 m_FloatValues: aa6b64c186541834a990dc7d71ef0490: -9.833286 - 2531afd284b58274a93052c093565106: -9.960263 + 9f873922b4189f746a4d13a9b60e6375: 2.4583216 + 2531afd284b58274a93052c093565106: -8.963343 25123d234de4ec84aafee1d0c380f3ad: 0.025578512 af748c25161478f4c933cb5cf60cf925: -4.560346 - 8b04b72683f112d418bf818b2395ba51: -9.833286 + 8b04b72683f112d418bf818b2395ba51: -9.332112 ce741f86488e78548ad32eec9ad31803: -13.0627575 3085c47799436ad43a18d4ae4adb712d: -9.833286 - 7e224658afaf14242ba3996793ac12a1: -0.02577656 + 7e224658afaf14242ba3996793ac12a1: -5.3230715 644f6589fc60a074a98ad67d609f2bfb: 5.1526957 5da050aa578318a4f8f1fed71a509fce: -14.816608 bf89843b5f1f52248935471e56d764be: -9.833286 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bafd5bc..1d332da 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - DoorRoot - SpawnlistRoot - Enemy + - rock layers: - Default - TransparentFX