From 72dc40f3a55ffea2c0786f5f40c3a10c8d173960 Mon Sep 17 00:00:00 2001 From: Saibotk Date: Mon, 23 Apr 2018 19:32:36 +0200 Subject: [PATCH] Added bugs --- Assets/Prefabs/{Enemy.prefab => Bug.prefab} | 152 +++++++++--------- .../{Enemy.prefab.meta => Bug.prefab.meta} | 2 +- Assets/Prefabs/Player.prefab | 2 +- Assets/Scenes/CodeDEV.unity | 47 ++++++ Assets/Scripts/GameController.cs | 5 +- Assets/Scripts/Generation/DungeonGenerator.cs | 38 +++-- .../textures/Entities/Enemies/Spider.png.meta | 35 +++- .../Entities/Enemies/maikäfer.png.meta | 35 +++- 8 files changed, 221 insertions(+), 95 deletions(-) rename Assets/Prefabs/{Enemy.prefab => Bug.prefab} (65%) rename Assets/Prefabs/{Enemy.prefab.meta => Bug.prefab.meta} (79%) diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Bug.prefab similarity index 65% rename from Assets/Prefabs/Enemy.prefab rename to Assets/Prefabs/Bug.prefab index 534ae52..1217291 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -9,162 +9,154 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1971451785855062} + m_RootGameObject: {fileID: 1887677565572348} m_IsPrefabParent: 1 ---- !u!1 &1336247710664522 +--- !u!1 &1310248020783766 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4011283098147256} + - component: {fileID: 212750371912380942} + m_Layer: 9 + m_Name: New Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1426189685467450 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4340855217109864} - m_Layer: 0 + - component: {fileID: 4193287044024648} + m_Layer: 9 m_Name: Graphics m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1659126864891018 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4161383188196848} - - component: {fileID: 212571453617041228} - m_Layer: 0 - m_Name: enemyTMP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1971451785855062 +--- !u!1 &1887677565572348 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4702455771231736} - - component: {fileID: 50727245938404542} - - component: {fileID: 61080315530130294} - - component: {fileID: 114170512691432560} - m_Layer: 0 - m_Name: Enemy - m_TagString: Player + - component: {fileID: 4665188581213052} + - component: {fileID: 50033980456084712} + - component: {fileID: 70142526866238118} + - component: {fileID: 114843041321231988} + m_Layer: 9 + m_Name: Bug + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4161383188196848 +--- !u!4 &4011283098147256 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1659126864891018} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1310248020783766} + 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_Children: [] - m_Father: {fileID: 4340855217109864} + m_Father: {fileID: 4193287044024648} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4340855217109864 +--- !u!4 &4193287044024648 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1336247710664522} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -2.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4161383188196848} - m_Father: {fileID: 4702455771231736} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4702455771231736 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1971451785855062} + m_GameObject: {fileID: 1426189685467450} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4340855217109864} + - {fileID: 4011283098147256} + m_Father: {fileID: 4665188581213052} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4665188581213052 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + 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_Children: + - {fileID: 4193287044024648} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &50727245938404542 +--- !u!50 &50033980456084712 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1971451785855062} + m_GameObject: {fileID: 1887677565572348} m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 0.1 - m_AngularDrag: 0.01 - m_GravityScale: 0 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 m_Material: {fileID: 0} - m_Interpolate: 1 + m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!61 &61080315530130294 -BoxCollider2D: +--- !u!70 &70142526866238118 +CapsuleCollider2D: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1971451785855062} + m_GameObject: {fileID: 1887677565572348} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.30773532, y: -2.1199532} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 5.3082895, y: 6.402458} - m_EdgeRadius: 0 ---- !u!114 &114170512691432560 + m_Offset: {x: 0.008751139, y: -0.0116683245} + m_Size: {x: 0.49416587, y: 0.5916126} + m_Direction: 0 +--- !u!114 &114843041321231988 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1971451785855062} + m_GameObject: {fileID: 1887677565572348} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 582bfd99a32c0ea45a7d09ef4f308d88, type: 3} + m_Script: {fileID: 11500000, guid: c5616b0c23c6dce40b9019a2217bc1a8, type: 3} m_Name: m_EditorClassIdentifier: - speed: 0.7 + speed: 2 rotationSpeed: 1 ---- !u!212 &212571453617041228 + victim: {fileID: 0} + body: {fileID: 50033980456084712} +--- !u!212 &212750371912380942 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1659126864891018} + m_GameObject: {fileID: 1310248020783766} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -194,12 +186,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c1bebd5f42b808e45a7ab9f786c4319b, type: 3} + m_Sprite: {fileID: 21300000, guid: 4452f4d6c09a1464c9869c0496d528a4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 10, y: 10} + m_Size: {x: 7.36, y: 6.21} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Prefabs/Enemy.prefab.meta b/Assets/Prefabs/Bug.prefab.meta similarity index 79% rename from Assets/Prefabs/Enemy.prefab.meta rename to Assets/Prefabs/Bug.prefab.meta index 6d322c3..58ed70e 100644 --- a/Assets/Prefabs/Enemy.prefab.meta +++ b/Assets/Prefabs/Bug.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff87b9de73979cd40a9853419833a91f +guid: dd625f75dbf83194392a299951cf04fb NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 9d4b7fb..5e10681 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -141,7 +141,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1136532900431144} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.23, z: 0} + m_LocalPosition: {x: 0, y: 1.12, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4079161515917916} diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index cbc177e..8177247 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -751,6 +751,52 @@ MonoBehaviour: - {fileID: 1908750963} - {fileID: 368878861} - {fileID: 1908750963} +--- !u!1001 &934296221 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: dd625f75dbf83194392a299951cf04fb, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1028937042 GameObject: m_ObjectHideFlags: 0 @@ -1381,6 +1427,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scorpion: {fileID: 1303102899095328, guid: 4c5ecfd27b4038941a6e493a8117ea0a, type: 2} + bug: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2} BorderOuter: {fileID: 1062532744197412, guid: bc306521f11be424f9833117977b4319, type: 2} BorderInner: {fileID: 1893245914782828, guid: 7326753bf2b213d4e8c2ee93d78ba7d9, diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 76dd800..8dad3b4 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -16,6 +16,8 @@ public class GameController : MonoBehaviour { [Header("Enemys")] [SerializeField] GameObject scorpion; + [SerializeField] + GameObject bug; [Space(10)] // Generation Settings @@ -122,7 +124,8 @@ public class GameController : MonoBehaviour { { GenerationProcessor.ExtendedTileType.DoorOuter, DoorOuter } }; enemyPrefabs = new Dictionary { - { Enemy.Enemys.SCORPION, scorpion } + { Enemy.Enemys.SCORPION, scorpion }, + { Enemy.Enemys.BUG, bug } }; } diff --git a/Assets/Scripts/Generation/DungeonGenerator.cs b/Assets/Scripts/Generation/DungeonGenerator.cs index 80db011..913859d 100644 --- a/Assets/Scripts/Generation/DungeonGenerator.cs +++ b/Assets/Scripts/Generation/DungeonGenerator.cs @@ -443,17 +443,35 @@ public class DungeonGenerator { public static void GenerateObjective(Room r) { Dictionary enemyPrefabs = GameController.instance.GetEnemyPrefabs(); // TODO not so cool - // TODO add more types - Objective o; - - // ENTITYOBJECTIVE ENEMYS: - List lg = new List(); - //GameObject scorp = enemyPrefabs[Enemy.Enemys.SCORPION]; - lg.Add(enemyPrefabs[Enemy.Enemys.SCORPION]); - EntityObjective eo = new EntityObjective(r, lg); - o = eo; - + + Objective o = null; + int rand = UnityEngine.Random.Range(0, 2); + switch (rand) { + case 0: { + // Scorpion Attack!!!!: + List lg = new List(); + int count = UnityEngine.Random.Range(1, r.GetSpawnpoints().Count); + for ( int c = 0; c < count; c++ ) { + lg.Add(enemyPrefabs[Enemy.Enemys.SCORPION]); + } + EntityObjective eo = new EntityObjective(r, lg); + o = eo; + } + break; + case 1: { + // Bug Attack!!!!: + List lg = new List(); + int count = UnityEngine.Random.Range(1, r.GetSpawnpoints().Count); + for ( int c = 0; c < count; c++ ) { + lg.Add(enemyPrefabs[Enemy.Enemys.BUG]); + } + EntityObjective eo = new EntityObjective(r, lg); + o = eo; + } + break; + } + r.SetObjective(o); } } \ No newline at end of file diff --git a/Assets/graphics/textures/Entities/Enemies/Spider.png.meta b/Assets/graphics/textures/Entities/Enemies/Spider.png.meta index b81ddaa..be7cafb 100644 --- a/Assets/graphics/textures/Entities/Enemies/Spider.png.meta +++ b/Assets/graphics/textures/Entities/Enemies/Spider.png.meta @@ -43,7 +43,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1000 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -67,6 +67,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/graphics/textures/Entities/Enemies/maikäfer.png.meta b/Assets/graphics/textures/Entities/Enemies/maikäfer.png.meta index be53a2e..d5e5b32 100644 --- a/Assets/graphics/textures/Entities/Enemies/maikäfer.png.meta +++ b/Assets/graphics/textures/Entities/Enemies/maikäfer.png.meta @@ -43,7 +43,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1000 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -67,6 +67,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []