diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 34a52fdb..fef190fd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -25,6 +25,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: fd3b7e58d78774942a2e15115a8a391f + m_Address: Puzzles/CementFactory + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 11da9bb90d9dd5848b4f7629415a6937, type: 2} m_SchemaSet: diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png new file mode 100644 index 00000000..c1020ffa Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png differ diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png.meta b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png.meta new file mode 100644 index 00000000..d9a50533 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/Cabinet.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 2af691f2629db5448a9bd8ac7cf084a0 +TextureImporter: + internalIDToNameTable: + - first: + 213: 5481919849797688533 + second: Cabinet_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 + - serializedVersion: 4 + buildTarget: Android + 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: WebGL + 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: WindowsStoreApps + 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: Cabinet_0 + rect: + serializedVersion: 2 + x: 252 + y: 108 + width: 439 + height: 361 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5dc9a561f01b31c40800000000000000 + internalID: 5481919849797688533 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Cabinet_0: 5481919849797688533 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png new file mode 100644 index 00000000..763ad76a Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png differ diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png.meta b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png.meta new file mode 100644 index 00000000..c98d862f --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/CabinetOpen.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 34088887bfb636b4690e7d6a922d2e4a +TextureImporter: + internalIDToNameTable: + - first: + 213: -6821455872960238318 + second: CabinetOpen_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 + - serializedVersion: 4 + buildTarget: Android + 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: WebGL + 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: WindowsStoreApps + 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: CabinetOpen_0 + rect: + serializedVersion: 2 + x: 26 + y: 36 + width: 665 + height: 433 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 21de33176025551a0800000000000000 + internalID: -6821455872960238318 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + CabinetOpen_0: -6821455872960238318 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Wheel_Pickup.asset b/Assets/Data/Items/CementFactory/Pickup_CementWheel.asset similarity index 95% rename from Assets/Data/Items/CementFactory/Wheel_Pickup.asset rename to Assets/Data/Items/CementFactory/Pickup_CementWheel.asset index 75635778..3704d4b3 100644 --- a/Assets/Data/Items/CementFactory/Wheel_Pickup.asset +++ b/Assets/Data/Items/CementFactory/Pickup_CementWheel.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} - m_Name: Wheel_Pickup + m_Name: Pickup_CementWheel m_EditorClassIdentifier: AppleHillsScripts::PickupItemData _itemId: MachineWheel itemName: MachineWheel diff --git a/Assets/Data/Items/CementFactory/Wheel_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Pickup_CementWheel.asset.meta similarity index 100% rename from Assets/Data/Items/CementFactory/Wheel_Pickup.asset.meta rename to Assets/Data/Items/CementFactory/Pickup_CementWheel.asset.meta diff --git a/Assets/Data/Items/CementFactory/Cookie_Pickup.asset b/Assets/Data/Items/CementFactory/Pickup_CookieGear.asset similarity index 95% rename from Assets/Data/Items/CementFactory/Cookie_Pickup.asset rename to Assets/Data/Items/CementFactory/Pickup_CookieGear.asset index 9b1bfff6..7ffdd951 100644 --- a/Assets/Data/Items/CementFactory/Cookie_Pickup.asset +++ b/Assets/Data/Items/CementFactory/Pickup_CookieGear.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} - m_Name: Cookie_Pickup + m_Name: Pickup_CookieGear m_EditorClassIdentifier: AppleHillsScripts::PickupItemData _itemId: CookieGear itemName: CookieGear diff --git a/Assets/Data/Items/CementFactory/Cookie_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Pickup_CookieGear.asset.meta similarity index 100% rename from Assets/Data/Items/CementFactory/Cookie_Pickup.asset.meta rename to Assets/Data/Items/CementFactory/Pickup_CookieGear.asset.meta diff --git a/Assets/Data/Items/CementFactory/Belt_Pickup.asset b/Assets/Data/Items/CementFactory/Pickup_FancyBelt.asset similarity index 95% rename from Assets/Data/Items/CementFactory/Belt_Pickup.asset rename to Assets/Data/Items/CementFactory/Pickup_FancyBelt.asset index 6ed3d292..e8deee61 100644 --- a/Assets/Data/Items/CementFactory/Belt_Pickup.asset +++ b/Assets/Data/Items/CementFactory/Pickup_FancyBelt.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} - m_Name: Belt_Pickup + m_Name: Pickup_FancyBelt m_EditorClassIdentifier: AppleHillsScripts::PickupItemData _itemId: FancyBelt itemName: FancyBelt diff --git a/Assets/Data/Items/CementFactory/Belt_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Pickup_FancyBelt.asset.meta similarity index 100% rename from Assets/Data/Items/CementFactory/Belt_Pickup.asset.meta rename to Assets/Data/Items/CementFactory/Pickup_FancyBelt.asset.meta diff --git a/Assets/Data/Items/CementFactory/Flower_Pickup.asset b/Assets/Data/Items/CementFactory/Pickup_FlowerPropeller.asset similarity index 95% rename from Assets/Data/Items/CementFactory/Flower_Pickup.asset rename to Assets/Data/Items/CementFactory/Pickup_FlowerPropeller.asset index 06b015dc..f6db26e6 100644 --- a/Assets/Data/Items/CementFactory/Flower_Pickup.asset +++ b/Assets/Data/Items/CementFactory/Pickup_FlowerPropeller.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} - m_Name: Flower_Pickup + m_Name: Pickup_FlowerPropeller m_EditorClassIdentifier: AppleHillsScripts::PickupItemData _itemId: FlowerPropeller itemName: FlowerPropeller diff --git a/Assets/Data/Items/CementFactory/Flower_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Pickup_FlowerPropeller.asset.meta similarity index 100% rename from Assets/Data/Items/CementFactory/Flower_Pickup.asset.meta rename to Assets/Data/Items/CementFactory/Pickup_FlowerPropeller.asset.meta diff --git a/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset b/Assets/Data/Items/CementFactory/Slot_CardPrintingMachine.asset similarity index 94% rename from Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset rename to Assets/Data/Items/CementFactory/Slot_CardPrintingMachine.asset index 1e18de90..5d2e07ec 100644 --- a/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset +++ b/Assets/Data/Items/CementFactory/Slot_CardPrintingMachine.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} - m_Name: Card_Printing_Machine_Slot + m_Name: Slot_CardPrintingMachine m_EditorClassIdentifier: AppleHillsScripts::PickupItemData _itemId: CardPrintingMachine itemName: CardPrintingMachine diff --git a/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset.meta b/Assets/Data/Items/CementFactory/Slot_CardPrintingMachine.asset.meta similarity index 100% rename from Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset.meta rename to Assets/Data/Items/CementFactory/Slot_CardPrintingMachine.asset.meta diff --git a/Assets/Data/Puzzles/Cement Factory.meta b/Assets/Data/Puzzles/CementFactory.meta similarity index 100% rename from Assets/Data/Puzzles/Cement Factory.meta rename to Assets/Data/Puzzles/CementFactory.meta diff --git a/Assets/Data/Puzzles/Cement Factory/BeltPuzzle.meta b/Assets/Data/Puzzles/CementFactory/BeltPuzzle.meta similarity index 100% rename from Assets/Data/Puzzles/Cement Factory/BeltPuzzle.meta rename to Assets/Data/Puzzles/CementFactory/BeltPuzzle.meta diff --git a/Assets/Data/Puzzles/CementFactory/CementFactory.asset b/Assets/Data/Puzzles/CementFactory/CementFactory.asset new file mode 100644 index 00000000..4e1d5ffc --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CementFactory.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a79780a5a0d498084afd737d4515e3b, type: 3} + m_Name: CementFactory + m_EditorClassIdentifier: AppleHillsScripts::PuzzleS.PuzzleLevelDataSO + levelId: CementFactory + displayName: CementFactory + allSteps: + - {fileID: 11400000, guid: 26157d1f6c87c0244b222fba41fd41ca, type: 2} + - {fileID: 11400000, guid: f45aaf14dd93ff7439fcd8372f3a3a1f, type: 2} + - {fileID: 11400000, guid: 3ec763150f668574582e172c922cdde8, type: 2} + initialSteps: + - {fileID: 11400000, guid: f45aaf14dd93ff7439fcd8372f3a3a1f, type: 2} diff --git a/Assets/Data/Puzzles/CementFactory/CementFactory.asset.meta b/Assets/Data/Puzzles/CementFactory/CementFactory.asset.meta new file mode 100644 index 00000000..40785acb --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CementFactory.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd3b7e58d78774942a2e15115a8a391f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/CookiePuzzle.meta b/Assets/Data/Puzzles/CementFactory/CookiePuzzle.meta similarity index 100% rename from Assets/Data/Puzzles/Cement Factory/CookiePuzzle.meta rename to Assets/Data/Puzzles/CementFactory/CookiePuzzle.meta diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset new file mode 100644 index 00000000..4c660286 --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PuzStep_CemFac_BiteCookie + m_EditorClassIdentifier: AppleHillsScripts::PuzzleStepSO + stepId: BiteStaleCookie + displayName: BiteStaleCookie + description: Bite on the stale cookie and make a cookie gear + icon: {fileID: 0} + unlocks: + - {fileID: 11400000, guid: 3ec763150f668574582e172c922cdde8, type: 2} diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset.meta b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset.meta new file mode 100644 index 00000000..34afcbb8 --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_BiteCookie.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26157d1f6c87c0244b222fba41fd41ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset new file mode 100644 index 00000000..62e78d04 --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PuzStep_CemFac_IntWKitchenCabinet + m_EditorClassIdentifier: AppleHillsScripts::PuzzleStepSO + stepId: InteractWCabinet + displayName: InteractWCabinet + description: Open the cabinet revealing Stale Cookie + icon: {fileID: 0} + unlocks: + - {fileID: 11400000, guid: 26157d1f6c87c0244b222fba41fd41ca, type: 2} diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset.meta b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset.meta new file mode 100644 index 00000000..8750c57e --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_IntWKitchenCabinet.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f45aaf14dd93ff7439fcd8372f3a3a1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset new file mode 100644 index 00000000..0657662a --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PuzStep_CemFac_PlaceCookieGear + m_EditorClassIdentifier: AppleHillsScripts::PuzzleStepSO + stepId: PlaceCookieGear + displayName: PlaceCookieGear + description: Place the Stale Cookie Gear in the card printing machine. + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset.meta b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset.meta new file mode 100644 index 00000000..6cf6f461 --- /dev/null +++ b/Assets/Data/Puzzles/CementFactory/CookiePuzzle/PuzStep_CemFac_PlaceCookieGear.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ec763150f668574582e172c922cdde8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/FlowerPuzzle.meta b/Assets/Data/Puzzles/CementFactory/FlowerPuzzle.meta similarity index 100% rename from Assets/Data/Puzzles/Cement Factory/FlowerPuzzle.meta rename to Assets/Data/Puzzles/CementFactory/FlowerPuzzle.meta diff --git a/Assets/Data/Puzzles/Cement Factory/WheelPuzzle.meta b/Assets/Data/Puzzles/CementFactory/WheelPuzzle.meta similarity index 100% rename from Assets/Data/Puzzles/Cement Factory/WheelPuzzle.meta rename to Assets/Data/Puzzles/CementFactory/WheelPuzzle.meta diff --git a/Assets/Scenes/Levels/CementFactory.unity b/Assets/Scenes/Levels/CementFactory.unity index 0e14231e..cdd335fd 100644 --- a/Assets/Scenes/Levels/CementFactory.unity +++ b/Assets/Scenes/Levels/CementFactory.unity @@ -125,27 +125,27 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1446398607} m_Modifications: - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.z - value: 0.125 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x - value: -62.3 + value: -4.209999 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y - value: -37.4 + value: -3.8899994 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.z @@ -157,15 +157,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -179,6 +179,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1211405249555763817, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1211405249555763817, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1211405249555763817, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: itemData value: @@ -191,9 +203,13 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.oldSize.y value: 2.26 objectReference: {fileID: 0} + - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: stepData + value: + objectReference: {fileID: 11400000, guid: 3ec763150f668574582e172c922cdde8, type: 2} - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Sprite @@ -203,6 +219,10 @@ PrefabInstance: propertyPath: m_Name value: CookieGear objectReference: {fileID: 0} + - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -230,11 +250,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x - value: -29.7 + value: -23.6 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y - value: -16.4 + value: -18.2 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.z @@ -472,7 +492,7 @@ GameObject: - component: {fileID: 472112133} - component: {fileID: 472112132} m_Layer: 10 - m_Name: CardMAchine + m_Name: CardMachine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -636,7 +656,7 @@ Transform: m_GameObject: {fileID: 472112131} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -40.47, y: -29.24, z: 0} + m_LocalPosition: {x: -37, y: -29.37, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -664,11 +684,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x - value: -53.4 + value: -51.73 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y - value: -17.8 + value: -17.22 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.z @@ -723,6 +743,188 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68fe09242bd73f34bad304c509872d90, type: 3} +--- !u!1 &670677124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670677125} + - component: {fileID: 670677129} + - component: {fileID: 670677128} + - component: {fileID: 670677126} + - component: {fileID: 670677130} + m_Layer: 10 + m_Name: StaleCookie + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &670677125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670677124} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.84, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1763748446} + m_Father: {fileID: 1741806665} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &670677126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670677124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::PuzzleS.ObjectiveStepBehaviour + stepData: {fileID: 11400000, guid: 26157d1f6c87c0244b222fba41fd41ca, type: 2} + puzzleIndicator: {fileID: 0} + drawPromptRangeGizmo: 1 +--- !u!61 &670677128 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670677124} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.38, y: 2.35} + newSize: {x: 2.38, y: 2.35} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 3, y: 3} + m_EdgeRadius: 0 +--- !u!212 &670677129 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670677124} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 8553060752048985723, guid: 1ba8c676eaadc824cadfd87107dbe801, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.38, y: 2.35} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &670677130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670677124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.OneClickInteraction + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!1 &811077196 GameObject: m_ObjectHideFlags: 0 @@ -429128,6 +429330,52 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &904412052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 904412053} + - component: {fileID: 904412054} + m_Layer: 0 + m_Name: TrafalgarMoveTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &904412053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904412052} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.27, y: -2.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1796517994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &904412054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904412052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bcf343b3ef74f0fb3c64be6fd2893b6, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.CharacterMoveToTarget + characterType: 1 + positionOffset: {x: 1, y: 0, z: 0} --- !u!1 &965383877 GameObject: m_ObjectHideFlags: 0 @@ -429269,6 +429517,110 @@ Transform: m_CorrespondingSourceObject: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} m_PrefabInstance: {fileID: 1340106124} m_PrefabAsset: {fileID: 0} +--- !u!1 &1446398606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1446398607} + - component: {fileID: 1446398609} + - component: {fileID: 1446398608} + m_Layer: 0 + m_Name: CabinetOpenEmpty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1446398607 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446398606} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.73495483, y: -0.039180756, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1656956420} + m_Father: {fileID: 2068573207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1446398608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446398606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState +--- !u!212 &1446398609 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446398606} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -6821455872960238318, guid: 34088887bfb636b4690e7d6a922d2e4a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.65, y: 4.33} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1639315574 PrefabInstance: m_ObjectHideFlags: 0 @@ -429291,11 +429643,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x - value: -10.1 + value: -12.54 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y - value: -32.7 + value: -37.39 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.z @@ -429350,6 +429702,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68fe09242bd73f34bad304c509872d90, type: 3} +--- !u!4 &1656956420 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + m_PrefabInstance: {fileID: 86866171} + m_PrefabAsset: {fileID: 0} --- !u!1 &1676982112 GameObject: m_ObjectHideFlags: 0 @@ -429523,6 +429880,486 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} +--- !u!1 &1741806663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1741806665} + - component: {fileID: 1741806664} + - component: {fileID: 1741806666} + m_Layer: 0 + m_Name: CabinetOpen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &1741806664 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741806663} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -6821455872960238318, guid: 34088887bfb636b4690e7d6a922d2e4a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.65, y: 4.33} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1741806665 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741806663} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.73495483, y: -0.039180756, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 670677125} + m_Father: {fileID: 2068573207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1741806666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741806663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState +--- !u!1 &1763748445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1763748446} + - component: {fileID: 1763748447} + m_Layer: 0 + m_Name: TrafalgarMoveTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1763748446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763748445} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: -2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 670677125} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1763748447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763748445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bcf343b3ef74f0fb3c64be6fd2893b6, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.CharacterMoveToTarget + characterType: 1 + positionOffset: {x: 1, y: 0, z: 0} +--- !u!1 &1796517989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1796517994} + - component: {fileID: 1796517993} + - component: {fileID: 1796517991} + - component: {fileID: 1796517990} + - component: {fileID: 1796517995} + - component: {fileID: 1796517996} + m_Layer: 10 + m_Name: Cabinet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1796517990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::PuzzleS.ObjectiveStepBehaviour + stepData: {fileID: 11400000, guid: f45aaf14dd93ff7439fcd8372f3a3a1f, type: 2} + puzzleIndicator: {fileID: 0} + drawPromptRangeGizmo: 1 +--- !u!61 &1796517991 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 4.39, y: 3.61} + newSize: {x: 4.39, y: 3.61} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 5, y: 4} + m_EdgeRadius: 0 +--- !u!212 &1796517993 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 5481919849797688533, guid: 2af691f2629db5448a9bd8ac7cf084a0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.39, y: 3.61} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1796517994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.8749542, y: 0.32081985, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 904412053} + m_Father: {fileID: 2068573207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1796517995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.OneClickInteraction + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2068573206} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1796517996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1796517989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState +--- !u!1 &2068573206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2068573207} + - component: {fileID: 2068573209} + - component: {fileID: 2068573208} + - component: {fileID: 2068573210} + m_Layer: 0 + m_Name: CabinetStateMachine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2068573207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068573206} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.73495483, y: 0.039180756, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1796517994} + - {fileID: 1741806665} + - {fileID: 1446398607} + m_Father: {fileID: 2139181996} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2068573208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068573206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine + defaultState: {fileID: 1796517989} + currentState: {fileID: 0} + _unityEventsFolded: 0 + verbose: 0 + allowReentry: 0 + returnToDefaultOnDisable: 1 + OnStateExited: + m_PersistentCalls: + m_Calls: [] + OnStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateExited: + m_PersistentCalls: + m_Calls: [] + OnLastStateEntered: + m_PersistentCalls: + m_Calls: [] + OnLastStateExited: + m_PersistentCalls: + m_Calls: [] + customSaveId: +--- !u!114 &2068573209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068573206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} + m_Name: + m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.Initialization +--- !u!114 &2068573210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068573206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83577240b1fb0574682b01ab09acb43e, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::CabinetStateMachine + defaultState: {fileID: 0} + currentState: {fileID: 0} + _unityEventsFolded: 0 + verbose: 0 + allowReentry: 0 + returnToDefaultOnDisable: 1 + OnStateExited: + m_PersistentCalls: + m_Calls: [] + OnStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateExited: + m_PersistentCalls: + m_Calls: [] + OnLastStateEntered: + m_PersistentCalls: + m_Calls: [] + OnLastStateExited: + m_PersistentCalls: + m_Calls: [] + customSaveId: --- !u!1 &2086197326 GameObject: m_ObjectHideFlags: 0 @@ -429687,6 +430524,38 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2139181995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2139181996} + m_Layer: 0 + m_Name: StaleCookieCabinet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2139181996 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139181995} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -63.4, y: -39.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2068573207} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -429698,8 +430567,8 @@ SceneRoots: - {fileID: 2088261497} - {fileID: 1340106124} - {fileID: 1726246516} - - {fileID: 86866171} - {fileID: 136289266} - {fileID: 1639315574} - {fileID: 478035408} - {fileID: 472112135} + - {fileID: 2139181996} diff --git a/Assets/Scripts/DamianExperiments/CementFactory.meta b/Assets/Scripts/DamianExperiments/CementFactory.meta new file mode 100644 index 00000000..0826ab1f --- /dev/null +++ b/Assets/Scripts/DamianExperiments/CementFactory.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4406ac0eabea9a24fb82b6d0ccc4688b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle.meta b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle.meta new file mode 100644 index 00000000..23b27765 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11d71fcdfd210a548b1031698c34e6f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs new file mode 100644 index 00000000..24690f5d --- /dev/null +++ b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs @@ -0,0 +1,12 @@ +using Core.SaveLoad; +using Core; +using UnityEngine; + +public class CabinetStateMachine : AppleMachine +{ + public void stateSwitch(string StateName) + { + Logging.Debug("State Switch to: " + StateName); + ChangeState(StateName); + } +} diff --git a/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs.meta b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs.meta new file mode 100644 index 00000000..fe061a9c --- /dev/null +++ b/Assets/Scripts/DamianExperiments/CementFactory/CookiePuzzle/CabinetStateMachine.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 83577240b1fb0574682b01ab09acb43e \ No newline at end of file diff --git a/Assets/Scripts/DamianExperiments/Minigame.meta b/Assets/Scripts/DamianExperiments/DivingForPicturesMinigame.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/Minigame.meta rename to Assets/Scripts/DamianExperiments/DivingForPicturesMinigame.meta diff --git a/Assets/Scripts/DamianExperiments/Minigame/FlashBehaviour.cs b/Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/FlashBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/Minigame/FlashBehaviour.cs rename to Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/FlashBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/Minigame/FlashBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/FlashBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/Minigame/FlashBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/FlashBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/Minigame/TrashSpawner.cs b/Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/TrashSpawner.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/Minigame/TrashSpawner.cs rename to Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/TrashSpawner.cs diff --git a/Assets/Scripts/DamianExperiments/Minigame/TrashSpawner.cs.meta b/Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/TrashSpawner.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/Minigame/TrashSpawner.cs.meta rename to Assets/Scripts/DamianExperiments/DivingForPicturesMinigame/TrashSpawner.cs.meta diff --git a/Assets/Scripts/DamianExperiments/Quarry.meta b/Assets/Scripts/DamianExperiments/Quarry.meta new file mode 100644 index 00000000..5405a821 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Quarry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3bc58a9fd9464854bbf95516d28ca304 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots.meta b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots.meta rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots.meta diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/AnneLiseBushPopBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/DistanceMeasurer.cs b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/DistanceMeasurer.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/DistanceMeasurer.cs rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/DistanceMeasurer.cs diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/DistanceMeasurer.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/DistanceMeasurer.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/DistanceMeasurer.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/DistanceMeasurer.cs.meta diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/LureSpot.cs b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/LureSpot.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/LureSpot.cs rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/LureSpot.cs diff --git a/Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/LureSpot.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/LureSpot.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/AnnaLiseAnd Lurespots/LureSpot.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/AnnaLiseAnd Lurespots/LureSpot.cs.meta diff --git a/Assets/Scripts/DamianExperiments/ButterFlyBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/ButterFlyBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterFlyBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/ButterFlyBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/ButterFlyBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/ButterFlyBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterFlyBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/ButterFlyBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/ButterFlyState.cs b/Assets/Scripts/DamianExperiments/Quarry/ButterFlyState.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterFlyState.cs rename to Assets/Scripts/DamianExperiments/Quarry/ButterFlyState.cs diff --git a/Assets/Scripts/DamianExperiments/ButterFlyState.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/ButterFlyState.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterFlyState.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/ButterFlyState.cs.meta diff --git a/Assets/Scripts/DamianExperiments/ButterflyFreeBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/ButterflyFreeBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterflyFreeBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/ButterflyFreeBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/ButterflyFreeBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/ButterflyFreeBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/ButterflyFreeBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/ButterflyFreeBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/EagleEyeBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/EagleEyeBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/EagleEyeBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/EagleEyeBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/EagleEyeBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/EagleEyeBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/EagleEyeBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/EagleEyeBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/LawnMowerMowing.anim b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/LawnMowerMowing.anim similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/LawnMowerMowing.anim rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/LawnMowerMowing.anim diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/LawnMowerMowing.anim.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/LawnMowerMowing.anim.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/LawnMowerMowing.anim.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/LawnMowerMowing.anim.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Animations/_Lawnmower_Anim.controller.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Gardener.prefab b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Gardener.prefab similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Gardener.prefab rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Gardener.prefab diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Gardener.prefab.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Gardener.prefab.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/Gardener.prefab.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/Gardener.prefab.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/GardenerBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/GardenerBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/GardenerBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/GardenerBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/GardenerBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/GardenerBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/GardenerBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/GardenerBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab.meta b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab.meta rename to Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab.meta diff --git a/Assets/Scripts/DamianExperiments/Picnic.meta b/Assets/Scripts/DamianExperiments/Quarry/Picnic.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/Picnic.meta rename to Assets/Scripts/DamianExperiments/Quarry/Picnic.meta diff --git a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/Picnic/PicnicBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/Picnic/PicnicBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/Picnic/PicnicBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/Picnic/PicnicBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_AnimControler.controller.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_Idle.anim.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_flying.anim b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_flying.anim similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_flying.anim rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_flying.anim diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_flying.anim.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_flying.anim.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_flying.anim.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_flying.anim.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Animations/soundBird_spooked.anim.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Bark.mp3 b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Bark.mp3 similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Bark.mp3 rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Bark.mp3 diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Bark.mp3.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Bark.mp3.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Bark.mp3.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Bark.mp3.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Cuack.mp3 b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Cuack.mp3 similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Cuack.mp3 rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Cuack.mp3 diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Cuack.mp3.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Cuack.mp3.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Cuack.mp3.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Cuack.mp3.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/DuckCuack.mp3 b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/DuckCuack.mp3 similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/DuckCuack.mp3 rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/DuckCuack.mp3 diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/DuckCuack.mp3.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/DuckCuack.mp3.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/DuckCuack.mp3.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/DuckCuack.mp3.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Honk.mp3 b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Honk.mp3 similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Honk.mp3 rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Honk.mp3 diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Honk.mp3.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Honk.mp3.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Honk.mp3.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Honk.mp3.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Sound Generator.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Sound Generator.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Sound Generator.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/Sound Generator.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcher.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcher.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcher.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcher.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcher.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcher.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcher.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcher.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcherNests.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcherNests.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcherNests.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/cameraSwitcherNests.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_CanFly.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_CanFly.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_CanFly.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_CanFly.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_CanFly.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_CanFly.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_CanFly.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_CanFly.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_FlyingBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_LandingBehaviour1.cs.meta diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs.meta diff --git a/Assets/Scripts/DamianExperiments/WarpTextExample.cs b/Assets/Scripts/DamianExperiments/Quarry/WarpTextExample.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/WarpTextExample.cs rename to Assets/Scripts/DamianExperiments/Quarry/WarpTextExample.cs diff --git a/Assets/Scripts/DamianExperiments/WarpTextExample.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/WarpTextExample.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/WarpTextExample.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/WarpTextExample.cs.meta diff --git a/Assets/Scripts/DamianExperiments/WolterSpawn.meta b/Assets/Scripts/DamianExperiments/Quarry/WolterSpawn.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/WolterSpawn.meta rename to Assets/Scripts/DamianExperiments/Quarry/WolterSpawn.meta diff --git a/Assets/Scripts/DamianExperiments/WolterSpawn/WolterStateMachine.cs b/Assets/Scripts/DamianExperiments/Quarry/WolterSpawn/WolterStateMachine.cs similarity index 100% rename from Assets/Scripts/DamianExperiments/WolterSpawn/WolterStateMachine.cs rename to Assets/Scripts/DamianExperiments/Quarry/WolterSpawn/WolterStateMachine.cs diff --git a/Assets/Scripts/DamianExperiments/WolterSpawn/WolterStateMachine.cs.meta b/Assets/Scripts/DamianExperiments/Quarry/WolterSpawn/WolterStateMachine.cs.meta similarity index 100% rename from Assets/Scripts/DamianExperiments/WolterSpawn/WolterStateMachine.cs.meta rename to Assets/Scripts/DamianExperiments/Quarry/WolterSpawn/WolterStateMachine.cs.meta diff --git a/Assets/Settings/Developer/DebugSettings.asset b/Assets/Settings/Developer/DebugSettings.asset index 0fa6f0dd..0779a2cf 100644 --- a/Assets/Settings/Developer/DebugSettings.asset +++ b/Assets/Settings/Developer/DebugSettings.asset @@ -16,7 +16,7 @@ MonoBehaviour: pauseTimeOnPauseGame: 0 useSaveLoadSystem: 1 autoClearSaves: 0 - dontSaveOnQuit: 0 + dontSaveOnQuit: 1 bootstrapLogVerbosity: 0 settingsLogVerbosity: 0 gameManagerLogVerbosity: 0