From c9697b866d8910e38cbcf89f2cf4977616eb2154 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 4 Aug 2019 19:57:06 +0300 Subject: [PATCH] Start setting up bodyparts --- Assets/CrabEnemy.png.meta | 91 ---- Assets/{ => Graphics}/CrabEnemy.png | Bin Assets/Graphics/CrabEnemy.png.meta | 187 ++++++++ Assets/{ => Graphics}/GoreParts.png | Bin Assets/Graphics/GoreParts.png.meta | 451 ++++++++++++++++++ .../Bodyparts/{Player.meta => Big.meta} | 0 .../BigBodyPart.prefab} | 179 ++++--- .../BigBodyPart.prefab.meta} | 2 +- .../Bodyparts/Player/PlayerBody.prefab.meta | 7 - .../Bodyparts/Player/PlayerHand.prefab | 162 ------- .../Bodyparts/Player/PlayerHead.prefab | 162 ------- .../Bodyparts/Player/PlayerHead.prefab.meta | 7 - Assets/Scenes/MainScene.unity | 14 +- Assets/Scripts/Explodable.cs | 7 +- 14 files changed, 731 insertions(+), 538 deletions(-) delete mode 100644 Assets/CrabEnemy.png.meta rename Assets/{ => Graphics}/CrabEnemy.png (100%) create mode 100644 Assets/Graphics/CrabEnemy.png.meta rename Assets/{ => Graphics}/GoreParts.png (100%) create mode 100644 Assets/Graphics/GoreParts.png.meta rename Assets/Prefabs/Bodyparts/{Player.meta => Big.meta} (100%) rename Assets/Prefabs/Bodyparts/{Player/PlayerBody.prefab => Big/BigBodyPart.prefab} (71%) rename Assets/Prefabs/Bodyparts/{Player/PlayerHand.prefab.meta => Big/BigBodyPart.prefab.meta} (74%) delete mode 100644 Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab.meta delete mode 100644 Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab delete mode 100644 Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab delete mode 100644 Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab.meta diff --git a/Assets/CrabEnemy.png.meta b/Assets/CrabEnemy.png.meta deleted file mode 100644 index ac177fe..0000000 --- a/Assets/CrabEnemy.png.meta +++ /dev/null @@ -1,91 +0,0 @@ -fileFormatVersion: 2 -guid: 8d816068e3260f54f9cb041dcd165103 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/CrabEnemy.png b/Assets/Graphics/CrabEnemy.png similarity index 100% rename from Assets/CrabEnemy.png rename to Assets/Graphics/CrabEnemy.png diff --git a/Assets/Graphics/CrabEnemy.png.meta b/Assets/Graphics/CrabEnemy.png.meta new file mode 100644 index 0000000..7bdc1fb --- /dev/null +++ b/Assets/Graphics/CrabEnemy.png.meta @@ -0,0 +1,187 @@ +fileFormatVersion: 2 +guid: 8d816068e3260f54f9cb041dcd165103 +TextureImporter: + internalIDToNameTable: + - first: + 213: 6754164815184778395 + second: CrabEnemy_0 + - first: + 213: -8236523633242920872 + second: CrabEnemy_1 + - first: + 213: 3837973818445772063 + second: CrabEnemy_2 + 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: 0 + 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: 32 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CrabEnemy_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 454da7596b63a0847a9710d0b3eeaacb + internalID: 6754164815184778395 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CrabEnemy_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eb8e7d288fd76b04e89247f64e3a07b2 + internalID: -8236523633242920872 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CrabEnemy_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0494f9cba5b5e843bf843f0003d895a + internalID: 3837973818445772063 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoreParts.png b/Assets/Graphics/GoreParts.png similarity index 100% rename from Assets/GoreParts.png rename to Assets/Graphics/GoreParts.png diff --git a/Assets/Graphics/GoreParts.png.meta b/Assets/Graphics/GoreParts.png.meta new file mode 100644 index 0000000..0cf1af6 --- /dev/null +++ b/Assets/Graphics/GoreParts.png.meta @@ -0,0 +1,451 @@ +fileFormatVersion: 2 +guid: f68259633136b6c4bad937f60d3546bc +TextureImporter: + internalIDToNameTable: + - first: + 213: 4126751842953345123 + second: GoreParts_0 + - first: + 213: -8580675090303374382 + second: GoreParts_1 + - first: + 213: 261822481497576611 + second: GoreParts_2 + - first: + 213: -6252851290386275527 + second: GoreParts_3 + - first: + 213: 5731680368321206013 + second: GoreParts_4 + - first: + 213: -5231856131614477843 + second: GoreParts_5 + - first: + 213: -6242151680703846737 + second: GoreParts_6 + - first: + 213: 1962299555912905269 + second: GoreParts_7 + - first: + 213: -7519243567415347376 + second: GoreParts_8 + - first: + 213: -2421042766075643958 + second: GoreParts_9 + - first: + 213: -9091614722349096936 + second: GoreParts_10 + - first: + 213: 3616007578753528513 + second: GoreParts_11 + - first: + 213: 7850456612049191571 + second: GoreParts_12 + - first: + 213: -1576615821977192078 + second: GoreParts_13 + 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: 0 + 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: 32 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: GoreParts_0 + rect: + serializedVersion: 2 + x: 0 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fff32b0315461e04195a7c018de7ad29 + internalID: 4126751842953345123 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_1 + rect: + serializedVersion: 2 + x: 32 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 02aae89745e7e51469a0a71b1c22fcbc + internalID: -8580675090303374382 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_2 + rect: + serializedVersion: 2 + x: 64 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5b29493c94dc1c14aa9712df959c15f9 + internalID: 261822481497576611 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_3 + rect: + serializedVersion: 2 + x: 96 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ded5db15cc92789419e079a722ae8a65 + internalID: -6252851290386275527 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_4 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dd6d67fdb985e3b4a8871f283344047f + internalID: 5731680368321206013 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_5 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 02c699afb152fd04791f96eaefdc2e12 + internalID: -5231856131614477843 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_6 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 90f20bb4d1e5f034cb591e291e25bbd0 + internalID: -6242151680703846737 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_7 + rect: + serializedVersion: 2 + x: 96 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f254d1ad24e7b3d4f945027c81010607 + internalID: 1962299555912905269 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_8 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 62c9948911708c645b08920ecbd5d9c3 + internalID: -7519243567415347376 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_9 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0f010c2d7cc55bd449be2a778588a898 + internalID: -2421042766075643958 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_10 + rect: + serializedVersion: 2 + x: 64 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3e3b791f60b2b7b4a9eebc6c4581660f + internalID: -9091614722349096936 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_11 + rect: + serializedVersion: 2 + x: 96 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f1c2c6c76f4691c4986fd79d8f6ec610 + internalID: 3616007578753528513 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_12 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 19181c8541d743e499bfe0e4ef5d8e27 + internalID: 7850456612049191571 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GoreParts_13 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c4bef1954d970a14aa408e63ce73a7fa + internalID: -1576615821977192078 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: eaecea5c9499faa49820248415ba1b42 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bodyparts/Player.meta b/Assets/Prefabs/Bodyparts/Big.meta similarity index 100% rename from Assets/Prefabs/Bodyparts/Player.meta rename to Assets/Prefabs/Bodyparts/Big.meta diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab b/Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab similarity index 71% rename from Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab rename to Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab index 30829e3..fca420b 100644 --- a/Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab +++ b/Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1543682799616924516 +--- !u!1 &90224928841595158 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,36 +8,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4761118102515640853} - - component: {fileID: 2675645987946702114} + - component: {fileID: 2403023919827435617} + - component: {fileID: 9009886668846231246} + - component: {fileID: 3469277225519186156} m_Layer: 0 - m_Name: Placeholder + m_Name: BigBodyPart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4761118102515640853 +--- !u!4 &2403023919827435617 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1543682799616924516} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 90224928841595158} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1.2, z: 1} - m_Children: [] - m_Father: {fileID: 1968525068849414980} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5020727160165152633} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2675645987946702114 +--- !u!50 &9009886668846231246 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90224928841595158} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 0.4 + m_LinearDrag: 5 + m_AngularDrag: 12 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &3469277225519186156 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90224928841595158} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.3 +--- !u!1 &6896674716750741819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5020727160165152633} + - component: {fileID: 4557997538418576662} + m_Layer: 0 + m_Name: GoreParts_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5020727160165152633 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6896674716750741819} + 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: 2403023919827435617} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4557997538418576662 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1543682799616924516} + m_GameObject: {fileID: 6896674716750741819} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -69,94 +139,15 @@ SpriteRenderer: m_SortingLayerID: -947994997 m_SortingLayer: 3 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 472874229c563e241bddc073ec2dbb90, type: 3} + m_Sprite: {fileID: 4126751842953345123, guid: f68259633136b6c4bad937f60d3546bc, + type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.5, y: 0.5} + m_Size: {x: 0.32, y: 0.32} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2029918227067566688 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1968525068849414980} - - component: {fileID: 6271233648422607270} - - component: {fileID: 3233969654977984557} - m_Layer: 0 - m_Name: PlayerBody - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1968525068849414980 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029918227067566688} - 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: - - {fileID: 4761118102515640853} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &6271233648422607270 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029918227067566688} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 0.5 - m_LinearDrag: 5 - m_AngularDrag: 5 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &3233969654977984557 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029918227067566688} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.5, y: 0.6} - m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab.meta b/Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab.meta similarity index 74% rename from Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab.meta rename to Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab.meta index d96069f..da15c1e 100644 --- a/Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab.meta +++ b/Assets/Prefabs/Bodyparts/Big/BigBodyPart.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 478119ba1f7f78243afb4b5ae9a8b99c +guid: fdbfbe32f3b9e014e9a8da46701b8c40 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab.meta b/Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab.meta deleted file mode 100644 index 45d29f9..0000000 --- a/Assets/Prefabs/Bodyparts/Player/PlayerBody.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b496cfa87cd1d5c40af61d1604a06788 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab b/Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab deleted file mode 100644 index 25e9579..0000000 --- a/Assets/Prefabs/Bodyparts/Player/PlayerHand.prefab +++ /dev/null @@ -1,162 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2377613320307128713 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8789438134215924977} - - component: {fileID: -8936384925857337445} - - component: {fileID: 2538986196310265997} - m_Layer: 0 - m_Name: PlayerHand - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8789438134215924977 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2377613320307128713} - 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: - - {fileID: 5059531764510297270} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &-8936384925857337445 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2377613320307128713} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 0.5 - m_LinearDrag: 5 - m_AngularDrag: 5 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &2538986196310265997 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2377613320307128713} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.2, y: 0.4} - m_EdgeRadius: 0 ---- !u!1 &8235449444435043987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5059531764510297270} - - component: {fileID: 8256751900412107108} - m_Layer: 0 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5059531764510297270 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8235449444435043987} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.4, y: 0.8, z: 1} - m_Children: [] - m_Father: {fileID: 8789438134215924977} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8256751900412107108 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8235449444435043987} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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: -947994997 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 472874229c563e241bddc073ec2dbb90, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.5, y: 0.5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab b/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab deleted file mode 100644 index 714e5cc..0000000 --- a/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab +++ /dev/null @@ -1,162 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6432268662194301778 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7640064467765385667} - - component: {fileID: 6395016560117985742} - - component: {fileID: 2296557693197646769} - m_Layer: 0 - m_Name: PlayerHead - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7640064467765385667 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6432268662194301778} - 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: - - {fileID: 5201551985167316095} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &6395016560117985742 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6432268662194301778} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 0.5 - m_LinearDrag: 5 - m_AngularDrag: 5 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &2296557693197646769 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6432268662194301778} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.35, y: 0.35} - m_EdgeRadius: 0 ---- !u!1 &8039557975306003641 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5201551985167316095} - - component: {fileID: 5347853748539302261} - m_Layer: 0 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5201551985167316095 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8039557975306003641} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} - m_Children: [] - m_Father: {fileID: 7640064467765385667} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5347853748539302261 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8039557975306003641} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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: -947994997 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 472874229c563e241bddc073ec2dbb90, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.5, y: 0.5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab.meta b/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab.meta deleted file mode 100644 index 667bc89..0000000 --- a/Assets/Prefabs/Bodyparts/Player/PlayerHead.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 262f47ce8e16b5d4599796ee37c9b637 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index c5569a2..0379cfb 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -369,10 +369,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2110188365a59e4cb31d0e84789fbbd, type: 3} m_Name: m_EditorClassIdentifier: - BodypartPrefabs: - - {fileID: 2029918227067566688, guid: b496cfa87cd1d5c40af61d1604a06788, type: 3} - - {fileID: 2377613320307128713, guid: 478119ba1f7f78243afb4b5ae9a8b99c, type: 3} - - {fileID: 6432268662194301778, guid: 262f47ce8e16b5d4599796ee37c9b637, type: 3} + BodypartPrefabs: [] DebugExplode: 0 --- !u!1 &188743841 GameObject: @@ -7075,10 +7072,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2110188365a59e4cb31d0e84789fbbd, type: 3} m_Name: m_EditorClassIdentifier: - BodypartPrefabs: - - {fileID: 2029918227067566688, guid: b496cfa87cd1d5c40af61d1604a06788, type: 3} - - {fileID: 2377613320307128713, guid: 478119ba1f7f78243afb4b5ae9a8b99c, type: 3} - - {fileID: 6432268662194301778, guid: 262f47ce8e16b5d4599796ee37c9b637, type: 3} + BodypartPrefabs: [] DebugExplode: 0 --- !u!1 &895097232 GameObject: @@ -7121,9 +7115,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: BodypartPrefabs: - - {fileID: 2029918227067566688, guid: b496cfa87cd1d5c40af61d1604a06788, type: 3} - - {fileID: 2377613320307128713, guid: 478119ba1f7f78243afb4b5ae9a8b99c, type: 3} - - {fileID: 6432268662194301778, guid: 262f47ce8e16b5d4599796ee37c9b637, type: 3} + - {fileID: 90224928841595158, guid: fdbfbe32f3b9e014e9a8da46701b8c40, type: 3} DebugExplode: 0 --- !u!61 &895097234 BoxCollider2D: diff --git a/Assets/Scripts/Explodable.cs b/Assets/Scripts/Explodable.cs index baed870..ec11a45 100644 --- a/Assets/Scripts/Explodable.cs +++ b/Assets/Scripts/Explodable.cs @@ -28,6 +28,8 @@ namespace Saltosion.OneWeapon { public void Explode(bool destroyGameObject) { foreach (GameObject Obj in BodypartPrefabs) { // No body parts flying in censored mode + float DirectionRadians = Random.value * Mathf.PI * 2.0f; + Vector2 Direction = new Vector2(Mathf.Cos(DirectionRadians), Mathf.Sin(DirectionRadians)); if (!Options.CensorGore) { GameObject NewObj = Instantiate(Obj, transform.position, new Quaternion(), null); Rigidbody2D Bodypart = NewObj.GetComponent(); @@ -35,13 +37,12 @@ namespace Saltosion.OneWeapon { continue; } float Force = 0.5f + Random.value * 0.5f; - float DirectionRadians = Random.value * Mathf.PI * 2.0f; - Bodypart.AddForce(new Vector2(Mathf.Cos(DirectionRadians), Mathf.Sin(DirectionRadians)) * Force, ForceMode2D.Impulse); + Bodypart.AddForce(Direction * Force, ForceMode2D.Impulse); Bodypart.AddTorque((Random.value - 0.5f) * Force, ForceMode2D.Impulse); } // Blood is replaced by flowers though, no problem with that - BloodLauncher.Splatter(transform.position, Vector2.zero, 70, 50f, 360f); + BloodLauncher.Splatter(transform.position + (Vector3)Direction * 0.2f, Vector2.zero, 70, 50f, 360f); } if (destroyGameObject) {