From e06b17cba9c4d4575e33f54476b12d0858814230 Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 22 Apr 2021 15:17:47 -0500 Subject: [PATCH] Increased lava damage --- MuseumGame/Assets/Prefabs/Player.prefab | 1 + .../Assets/Scenes/DemoLevels/Spawn.unity | 90 +++++++---------- MuseumGame/Assets/Scripts/Health.cs | 3 +- .../Sprites/Glide Powerup Icon.png.meta | 96 +++++++++++++++++++ .../Sprites/Shrink Powerup Icon.png.meta | 96 +++++++++++++++++++ .../Sprites/UI Powerup Palette.png.meta | 96 +++++++++++++++++++ 6 files changed, 327 insertions(+), 55 deletions(-) create mode 100644 MuseumGame/Assets/Sprites/Glide Powerup Icon.png.meta create mode 100644 MuseumGame/Assets/Sprites/Shrink Powerup Icon.png.meta create mode 100644 MuseumGame/Assets/Sprites/UI Powerup Palette.png.meta diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index a3e8071..ca7179f 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -127,6 +127,7 @@ MonoBehaviour: m_EditorClassIdentifier: currentHealth: 0 maxHealth: 100 + lavaDamage: 40 healthBar: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3} --- !u!70 &3275569032751403274 CapsuleCollider2D: diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index d952c74..84e8338 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -2192,6 +2192,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: -5793387185563800375, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: lavaDamage + value: 40 + objectReference: {fileID: 0} - target: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_Name value: Player @@ -4546,62 +4550,36 @@ CompositeCollider2D: m_ColliderPaths: - - X: 130000000 Y: 10000000 - - X: 120000100 + - X: 120000000 Y: 10000000 - - X: 120000100 - Y: 50000041 - - X: 120000041 - Y: 50000100 - - X: 109999959 - Y: 50000100 - - X: 109999900 - Y: 50000041 - - X: 109999900 - Y: 9999959 - - X: 109999959 - Y: 9999900 + - X: 120000000 + Y: 50000000 - X: 110000000 - Y: 9999900 + Y: 50000000 - X: 110000000 - Y: -9999900 - - X: 120000041 - Y: -9999900 - - X: 120000100 - Y: -9999959 - - X: 120000100 Y: -10000000 - X: 130000000 Y: -10000000 - - X: 130000000 Y: -30000000 - - X: 120000100 + - X: -39999900 Y: -30000000 - - X: 120000100 - Y: -30000041 - - X: 120000041 - Y: -30000100 - - X: 109999959 - Y: -30000100 - - X: 109999900 - Y: -30000041 - - X: 109999900 + - X: -39999900 + Y: -29999959 + - X: -39999959 + Y: -29999900 + - X: -50000041 + Y: -29999900 + - X: -50000100 + Y: -29999959 + - X: -50000100 Y: -30000000 - - X: -99999900 + - X: -100000000 Y: -30000000 - - X: -99999900 - Y: 40000041 - - X: -99999959 - Y: 40000100 - - X: -110000041 - Y: 40000100 - - X: -110000100 - Y: 40000041 - - X: -110000100 - Y: -30000041 - - X: -110000041 - Y: -30000100 + - X: -100000000 + Y: 40000000 - X: -110000000 - Y: -30000100 + Y: 40000000 - X: -110000000 Y: -60000000 - X: 130000000 @@ -4610,15 +4588,15 @@ CompositeCollider2D: m_Paths: - - {x: 12.99997, y: -1} - {x: 12.99997, y: 1} - - {x: 12.00001, y: 1.0000294} - - {x: 11.999974, y: 5.00001} - - {x: 10.99999, y: 4.9999747} - - {x: 11.00003, y: -0.99999} + - {x: 12, y: 1.0000294} + - {x: 11.99997, y: 5} + - {x: 11, y: 4.999971} + - {x: 11.00003, y: -1} - - {x: 12.99997, y: -6} - {x: 12.99997, y: -3} - - {x: -9.99999, y: -2.9999707} - - {x: -10.000026, y: 4.00001} - - {x: -11.00001, y: 3.9999747} + - {x: -10, y: -2.9999707} + - {x: -10.00003, y: 4} + - {x: -11, y: 3.999971} - {x: -10.99997, y: -6} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 @@ -4970,7 +4948,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -5050,9 +5028,11 @@ Tilemap: m_Data: {fileID: 11400000, guid: 4826a21bbf62344789c5a85d6b3caa1e, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: fe96176227dcf410ca6287f8c496538c, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 1 - m_Data: {fileID: 1179228082648646792, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 5872352070049357795, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 @@ -5063,6 +5043,8 @@ Tilemap: m_Data: {fileID: 8084122590755731974, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 2 m_Data: {fileID: 8237030123978364060, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1179228082648646792, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - m_RefCount: 7 m_Data: diff --git a/MuseumGame/Assets/Scripts/Health.cs b/MuseumGame/Assets/Scripts/Health.cs index b683d23..61aac94 100644 --- a/MuseumGame/Assets/Scripts/Health.cs +++ b/MuseumGame/Assets/Scripts/Health.cs @@ -6,6 +6,7 @@ public class Health : MonoBehaviour { public int currentHealth; public int maxHealth = 100; + public int lavaDamage = 10; public HealthBarCustom healthBar; @@ -25,7 +26,7 @@ public class Health : MonoBehaviour if (collider2D.gameObject.CompareTag("EnemyPlatform")) { Debug.Log("lava"); - DamagePlayer(10); + DamagePlayer(lavaDamage); rb2d.velocity = new Vector2(rb2d.velocity.x, 0); rb2d.AddForce(new Vector2(0, 200)); } diff --git a/MuseumGame/Assets/Sprites/Glide Powerup Icon.png.meta b/MuseumGame/Assets/Sprites/Glide Powerup Icon.png.meta new file mode 100644 index 0000000..17f4dd0 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Glide Powerup Icon.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b5b2b00149700420cb91ce2e6cd30049 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Shrink Powerup Icon.png.meta b/MuseumGame/Assets/Sprites/Shrink Powerup Icon.png.meta new file mode 100644 index 0000000..b12258d --- /dev/null +++ b/MuseumGame/Assets/Sprites/Shrink Powerup Icon.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: fedbd5825a33346fa96498465bb740e7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/UI Powerup Palette.png.meta b/MuseumGame/Assets/Sprites/UI Powerup Palette.png.meta new file mode 100644 index 0000000..c10e915 --- /dev/null +++ b/MuseumGame/Assets/Sprites/UI Powerup Palette.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 811c15ef179db4da3a729b6961444656 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: