diff --git a/Assets/CarScript.cs b/Assets/CarScript.cs new file mode 100644 index 0000000..50eb9ce --- /dev/null +++ b/Assets/CarScript.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CarScript : MonoBehaviour { + public float speed = 3f; + + private Rigidbody2D rb; + public Vector2 startPositionRelativeToTransform; + public Vector2 endPositionRelativeToTransform; + + private Vector2 absStartPosition, absEndPosition; + + void Start() { + rb = this.GetComponent(); + absStartPosition = startPositionRelativeToTransform + rb.position; + absEndPosition = endPositionRelativeToTransform + rb.position; + } + + void FixedUpdate() { + if (Movement.pause) return; + // Calculate distance to end + Vector2 distanceToFinish = absEndPosition - rb.position; + + if (distanceToFinish.magnitude < 1) { + // If we're close enough to the end, reverse direction + Vector2 temp = absStartPosition; + absStartPosition = absEndPosition; + absEndPosition = temp; + transform.localScale = new Vector3(-transform.localScale.x, 1, 1); + } + + Vector2 direction = absEndPosition - rb.position; + + moveMe(direction.normalized); + } + void moveMe(Vector2 direction) { + rb.MovePosition(rb.position + direction * speed * Time.fixedDeltaTime); + } +} diff --git a/Assets/CarScript.cs.meta b/Assets/CarScript.cs.meta new file mode 100644 index 0000000..cbc3500 --- /dev/null +++ b/Assets/CarScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f3468d2cd767147b1be034bbad8afcb5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Health.cs b/Assets/Health.cs index 4abf499..91dcec2 100644 --- a/Assets/Health.cs +++ b/Assets/Health.cs @@ -17,9 +17,9 @@ public class Health : MonoBehaviour { } void Update() { - if (Input.GetKeyDown(KeyCode.E)) { - takeHit(); - } + // if (Input.GetKeyDown(KeyCode.)) { + // takeHit(); + // } } public void takeHit() { diff --git a/Assets/Prefabs/Car.prefab b/Assets/Prefabs/Car.prefab new file mode 100644 index 0000000..9deda32 --- /dev/null +++ b/Assets/Prefabs/Car.prefab @@ -0,0 +1,217 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &724325279326117494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 724325279326117497} + - component: {fileID: 724325279326117499} + - component: {fileID: 724325279326117496} + - component: {fileID: 724325279326117498} + - component: {fileID: 724325279326117501} + m_Layer: 0 + m_Name: Hitbox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &724325279326117497 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325279326117494} + 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: 724325280980919345} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &724325279326117499 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325279326117494} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 5495412397436416559, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.5625, y: 1.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &724325279326117496 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325279326117494} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0d281a10890e2440ab11c3805ec9165d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!61 &724325279326117498 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325279326117494} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.23, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.5625, y: 1.625} + newSize: {x: 1.5625, y: 1.625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.17, y: 0.75} + m_EdgeRadius: 0 +--- !u!58 &724325279326117501 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325279326117494} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.43, y: -0.34} + serializedVersion: 2 + m_Radius: 0.275 +--- !u!1 &724325280980919310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 724325280980919345} + - component: {fileID: 724325280980919347} + - component: {fileID: 724325280980919344} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &724325280980919345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325280980919310} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.09, y: -0.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 724325279326117497} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &724325280980919347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325280980919310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3468d2cd767147b1be034bbad8afcb5, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 6 + startPositionRelativeToTransform: {x: -3, y: 0} + endPositionRelativeToTransform: {x: 3, y: 0} +--- !u!50 &724325280980919344 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 724325280980919310} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 diff --git a/Assets/Prefabs/Car.prefab.meta b/Assets/Prefabs/Car.prefab.meta new file mode 100644 index 0000000..aed1710 --- /dev/null +++ b/Assets/Prefabs/Car.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b274944a91eb84d54a7346908db30791 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game Scenes/Dark Level.unity b/Assets/Scenes/Game Scenes/Dark Level.unity index c02a361..6e9b8c3 100644 --- a/Assets/Scenes/Game Scenes/Dark Level.unity +++ b/Assets/Scenes/Game Scenes/Dark Level.unity @@ -6291,7 +6291,7 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} diff --git a/Assets/Scenes/Nyctophobia.unity b/Assets/Scenes/Nyctophobia (test).unity similarity index 100% rename from Assets/Scenes/Nyctophobia.unity rename to Assets/Scenes/Nyctophobia (test).unity diff --git a/Assets/Scenes/Nyctophobia.unity.meta b/Assets/Scenes/Nyctophobia (test).unity.meta similarity index 100% rename from Assets/Scenes/Nyctophobia.unity.meta rename to Assets/Scenes/Nyctophobia (test).unity.meta diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d2ce6fb..1782236 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -5,6 +5,24 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 + flags: 0 + RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b + flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e662e23e7e53078cee220eceb742a323016f6 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0