From bc0e3cd2dc735dbea107d07b0d9c2ea2fc973aba Mon Sep 17 00:00:00 2001 From: ProtoSharkk Date: Mon, 21 Oct 2024 21:38:32 -0700 Subject: [PATCH] Up to date with main --- Assets/Teo.cs | 16 +++- Assets/whiteteotiles.jpg.meta | 143 ++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 Assets/whiteteotiles.jpg.meta diff --git a/Assets/Teo.cs b/Assets/Teo.cs index 3552a9e..5bd181d 100644 --- a/Assets/Teo.cs +++ b/Assets/Teo.cs @@ -9,9 +9,10 @@ public class Teo : MonoBehaviour public float swingDistance = 10; public float damageStrength = 10; public float attackCooldownSeconds = 10; - public float dashDistance = 5; + public float dashDistance = 0.5F; public float dashCooldownSeconds = 5; public float lastAttackTime = 0; + public float lastDashTime = 0; Rigidbody2D controller; GameState gameState; // Start is called once before the first execution of Update after the MonoBehaviour is created @@ -32,6 +33,9 @@ public class Teo : MonoBehaviour Attack(); lastAttackTime = Time.fixedTime; } + if (Input.GetMouseButtonDown(1)) { + StartCoroutine("Dash"); + } } void Attack() { if (Time.fixedTime-lastAttackTime < attackCooldownSeconds) { @@ -53,4 +57,14 @@ public class Teo : MonoBehaviour ratbot.Damage(damageStrength); } } + void Dash() { + if (Time.fixedTime-lastDashTime < dashCooldownSeconds) return; + GetComponent().simulated = false; + controller.linearVelocity = new Vector2( + Screen.width/2 - Input.mousePosition.x, + Screen.height/2 - Input.mousePosition.y + ) * dashDistance; + new WaitForSeconds (0.5F); + GetComponent().simulated = true; + } } diff --git a/Assets/whiteteotiles.jpg.meta b/Assets/whiteteotiles.jpg.meta new file mode 100644 index 0000000..5a77725 --- /dev/null +++ b/Assets/whiteteotiles.jpg.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b565bfdb85a3b444796e15075243e9db +TextureImporter: + internalIDToNameTable: + - first: + 213: 7415648711516331556 + second: whiteteotiles_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: whiteteotiles_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 626 + height: 412 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 42e930d963da9e660800000000000000 + internalID: 7415648711516331556 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + whiteteotiles_0: 7415648711516331556 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: