Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/turtle-takeover-reloaded

Assets/_Game/Graphics/Particles/PS_Teleport.prefab

@@ -27,7 +27,7 @@ PrefabInstance:
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.06
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
@@ -37,12 +37,12 @@ PrefabInstance:
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1.05
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.7071068
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
@@ -57,7 +57,7 @@ PrefabInstance:
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
@@ -67,7 +67,7 @@ PrefabInstance:
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
         type: 3}
@@ -79,6 +79,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b0f14b53e42262242b95e3e5892baf9f, type: 3}
 --- !u!1 &436640341521505314 stripped

Assets/_Game/Graphics/UI/MinimapTileMap.png.meta

+fileFormatVersion: 2
+guid: edb1ccab70547614e83f76e9d42b5723
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 7462607957742354146
+    second: MinimapTileMap_0
+  - first:
+      213: -265039900271653478
+    second: MinimapTileMap_1
+  - first:
+      213: -5495016870515242573
+    second: MinimapTileMap_2
+  - first:
+      213: 8769727491769910242
+    second: MinimapTileMap_3
+  - first:
+      213: 1449938809970383084
+    second: MinimapTileMap_4
+  - first:
+      213: 5331665896576850131
+    second: MinimapTileMap_5
+  - first:
+      213: 4387955621010575744
+    second: MinimapTileMap_6
+  - first:
+      213: -6892041152497203600
+    second: MinimapTileMap_7
+  - first:
+      213: -1081069445391597211
+    second: MinimapTileMap_8
+  - first:
+      213: -6177966974798719106
+    second: MinimapTileMap_9
+  - first:
+      213: 6892645823986202014
+    second: MinimapTileMap_10
+  - first:
+      213: -5213997041846152463
+    second: MinimapTileMap_11
+  - first:
+      213: -5800989138566313338
+    second: MinimapTileMap_12
+  - first:
+      213: -7487148633355955395
+    second: MinimapTileMap_13
+  - first:
+      213: 3693307517389520566
+    second: MinimapTileMap_14
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: MinimapTileMap_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 12
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6fd3be7f35188254bbec78fd163b19a3
+      internalID: 7462607957742354146
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_1
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 12
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 3452fc2e7f4d9d44b9ca0ff8a0c699e1
+      internalID: -265039900271653478
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_2
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 12
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0f1602eca9e380d43aa5763934f20cfd
+      internalID: -5495016870515242573
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_3
+      rect:
+        serializedVersion: 2
+        x: 12
+        y: 12
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: bc9e7d5cbc173914bb20970c78e90a0a
+      internalID: 8769727491769910242
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_4
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 8
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 073fdd5472b33a14cb9d6ca87f7ff204
+      internalID: 1449938809970383084
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_5
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 8
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 9a69031a77addd04fb76cea587335e9d
+      internalID: 5331665896576850131
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_6
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 8
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 28ec8851a2a92ad4bae5440832eae209
+      internalID: 4387955621010575744
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_7
+      rect:
+        serializedVersion: 2
+        x: 12
+        y: 8
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5ec4704de4c8f8a439e7292818c90668
+      internalID: -6892041152497203600
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_8
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 4
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 20d77d3d29749dd4db9f37a2efa27ae2
+      internalID: -1081069445391597211
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_9
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 4
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4e8cbb0741e585441b1a48455706d2ef
+      internalID: -6177966974798719106
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_10
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 4
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 09d208f8148c2f44b901820fdf6a86f0
+      internalID: 6892645823986202014
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_11
+      rect:
+        serializedVersion: 2
+        x: 12
+        y: 4
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 183c2975857a31a41b182095f54d775d
+      internalID: -5213997041846152463
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_12
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 0
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8b159545a7b378546b22c0443f2907b9
+      internalID: -5800989138566313338
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_13
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 0
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: dda6dce418352a441bb0c662e913b88d
+      internalID: -7487148633355955395
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MinimapTileMap_14
+      rect:
+        serializedVersion: 2
+        x: 12
+        y: 0
+        width: 4
+        height: 4
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: e50f51124c396e54dab8012e8f9b9a4d
+      internalID: 3693307517389520566
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: dbdcd4fb49c564d4eac00267b10cb73c
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Prefabs/Entities/TurtleSeeker.prefab

@@ -23,7 +23,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 141141649259298211}
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
+  m_LocalRotation: {x: 0, y: 0.7072302, z: 0.7069834, w: 0}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 100, y: 100, z: 100}
   m_Children:
@@ -31,7 +31,7 @@ Transform:
   - {fileID: 308448015626709997}
   m_Father: {fileID: 4549998171761708480}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -89.98, y: 180, z: 0}
 --- !u!1 &167988787682844359
 GameObject:
   m_ObjectHideFlags: 0
@@ -74,9 +74,10 @@ GameObject:
   - component: {fileID: 5885875939041878202}
   - component: {fileID: -7032714091151265289}
   - component: {fileID: -597582237068271772}
+  - component: {fileID: 4780192179537917166}
   m_Layer: 0
   m_Name: TurtleSeeker
-  m_TagString: Untagged
+  m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -90,7 +91,7 @@ Transform:
   m_GameObject: {fileID: 684422770152341459}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
   m_Children:
   - {fileID: 5360712816303871490}
   - {fileID: 1469172663092512014}
@@ -109,7 +110,7 @@ Animator:
   m_GameObject: {fileID: 684422770152341459}
   m_Enabled: 1
   m_Avatar: {fileID: 9000000, guid: 19dc04366e85f6b42aa59d37818d7653, type: 3}
-  m_Controller: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: aaa53b31d94f92e4081cb70a0721fbf7, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -146,13 +147,26 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5171ed1e23f0f304494186a7e109be60, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  vel: 2.5
+  vel: 5
   vomit: {fileID: 0}
-  rotationVel: 2.5
+  rotationVel: 200
   TurretAnchor:
   - {fileID: 1387220612188179555}
   - {fileID: 2620027465756984677}
   firerate: 0.5
+--- !u!65 &4780192179537917166
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 684422770152341459}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 7, y: 5, z: 7}
+  m_Center: {x: 0, y: 2, z: 0}
 --- !u!1 &1387220612188179555
 GameObject:
   m_ObjectHideFlags: 0
@@ -482,7 +496,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7949495823156106357}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
   m_Children: []
@@ -599,8 +613,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8489481556079216237}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6515847041453359535}
@@ -610,7 +624,7 @@ Transform:
   - {fileID: 5708452920995750931}
   m_Father: {fileID: 5360712816303871490}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1 &8660106765129751097
 GameObject:
   m_ObjectHideFlags: 0

Assets/_Game/Scripts/AI/SeekerAI.cs

@@ -54,7 +54,7 @@ public class SeekerAI : MonoBehaviour
 	public void activate()
 	{
 		alive = true;
-		StartCoroutine("ShotDelay");
+		StartCoroutine("DelayFire");
 	}
 
 	// Update is called once per frame
@@ -66,7 +66,7 @@ public class SeekerAI : MonoBehaviour
 
 			if (Vector3.Distance(transform.position, navpoints[dest].position) == 0 && dest < navpoints.Length - 1)
 			{
-				dest