Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 269 additions & 0 deletions Assets/Prefabs/TeleportingDrone 2.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1000012257850208}
m_IsPrefabParent: 1
--- !u!1 &1000011474914294
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 4000010386809890}
- 212: {fileID: 212000012919329460}
- 114: {fileID: 114000013589110126}
m_Layer: 0
m_Name: teleporter
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1000012257850208
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 4000013324720224}
- 212: {fileID: 212000013891990514}
- 114: {fileID: 114000011091788646}
- 58: {fileID: 58000013630687860}
- 50: {fileID: 50000014181638532}
m_Layer: 0
m_Name: TeleportingDrone 2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1000013930240636
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 4000012757846168}
- 212: {fileID: 212000012668795526}
m_Layer: 0
m_Name: Face
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4000010386809890
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000011474914294}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -40.839798, y: -25.633308, z: 0}
m_LocalScale: {x: 3.347418, y: 3.3474178, z: 3.3474178}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 4000013324720224}
m_RootOrder: 1
--- !u!4 &4000012757846168
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000013930240636}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.8, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 4000013324720224}
m_RootOrder: 0
--- !u!4 &4000013324720224
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012257850208}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.5104694, y: 1.6344544, z: 0}
m_LocalScale: {x: 0.2987377, y: 0.29873773, z: 0.29873773}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 4000012757846168}
- {fileID: 4000010386809890}
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!50 &50000014181638532
Rigidbody2D:
serializedVersion: 2
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012257850208}
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_IsKinematic: 1
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!58 &58000013630687860
CircleCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012257850208}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 10
--- !u!114 &114000011091788646
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012257850208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0272f0cff0421194e808bab12d471912, type: 3}
m_Name:
m_EditorClassIdentifier:
shooting: 1
bulletPrefab: {fileID: 1000013371463570, guid: 263d8d17f3d9b6d4086b984107c40ccb,
type: 2}
bulletSpeed: 0
visionRange: 15
visionConeAngle: 45
--- !u!114 &114000013589110126
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000011474914294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1c6ca26bf5c24a747a9f445a5dc55af8, type: 3}
m_Name:
m_EditorClassIdentifier:
canTeleport: 0
runOnce: 0
enemy: {fileID: 1000012257850208}
xPos: 0
yPos: 0
--- !u!212 &212000012668795526
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000013930240636}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 0a5f33bc1bfe1b94d8401d2c8163eca3, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
--- !u!212 &212000012919329460
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000011474914294}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: d199b2f51ad91f54192c30d0d8bd837f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_FlipX: 0
m_FlipY: 0
--- !u!212 &212000013891990514
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000012257850208}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ddeb71b8297343f4d95f80fefbe01098, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
8 changes: 8 additions & 0 deletions Assets/Prefabs/TeleportingDrone 2.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Assets/Scripts/DroneVision.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class DroneVision : MonoBehaviour
//public static event FollowPlayerAction FollowPlayer;

GameObject bullet;
Teleporter tScript;
public GameObject bulletPrefab;
public int bulletSpeed;

Expand All @@ -28,6 +29,7 @@ void Start ()
droneCollider = GetComponent<CircleCollider2D>();
droneCollider.radius = visionRange; // set the radius of the collider to vision range
droneMovement = GetComponent<DroneMovementAI>();
tScript = gameObject.GetComponentInChildren<Teleporter> ();
}


Expand All @@ -43,6 +45,11 @@ void OnTriggerEnter2D(Collider2D _player)
isLookingForPlayer = true;
StartCoroutine(LookForPlayer());

if (tScript != null)
{
tScript.canTeleport = false;
Debug.Log ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
}
if(shooting)
{
StartCoroutine(Attack());
Expand All @@ -61,10 +68,16 @@ void OnTriggerExit2D(Collider2D _player)
{
if (_player.CompareTag("Player"))
{
//player = null;
player = null;
StopCoroutine(LookForPlayer());
StopCoroutine(Attack());
isLookingForPlayer = false;

if (tScript != null)
{
Debug.Log ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
tScript.canTeleport = true;
}
}
}

Expand Down Expand Up @@ -102,6 +115,7 @@ IEnumerator Attack()
{
StartCoroutine(Attack());
}

}

public static GameObject GetPlayer()
Expand Down
2 changes: 1 addition & 1 deletion Assets/Teleporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void Update () {
// so that new coordinates are generated
StartCoroutine(TeleportEnemy(3.0f));
}
else
else if(transform.position == new Vector3(xPos, yPos, 0) && !canTeleport)
{
// If the teleporter ended up in another object, generate new Coordinates quicker
StartCoroutine(GenerateNewCoordinates(2.0f));
Expand Down