diff --git a/Assets/Prefabs/50 shades of green.prefab b/Assets/Prefabs/50 shades of green.prefab new file mode 100644 index 0000000..f6326ea Binary files /dev/null and b/Assets/Prefabs/50 shades of green.prefab differ diff --git a/Assets/Prefabs/50 shades of green.prefab.meta b/Assets/Prefabs/50 shades of green.prefab.meta new file mode 100644 index 0000000..df16375 --- /dev/null +++ b/Assets/Prefabs/50 shades of green.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29f7cbb2436204c48bded5876f6209f3 +timeCreated: 1458099801 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AHHHH.prefab b/Assets/Prefabs/AHHHH.prefab new file mode 100644 index 0000000..ed4ca43 Binary files /dev/null and b/Assets/Prefabs/AHHHH.prefab differ diff --git a/Assets/Prefabs/AHHHH.prefab.meta b/Assets/Prefabs/AHHHH.prefab.meta new file mode 100644 index 0000000..121671d --- /dev/null +++ b/Assets/Prefabs/AHHHH.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84cf1744453f8b246ae2c915b438124f +timeCreated: 1458099983 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/COD.prefab b/Assets/Prefabs/COD.prefab new file mode 100644 index 0000000..69b139b Binary files /dev/null and b/Assets/Prefabs/COD.prefab differ diff --git a/Assets/Prefabs/COD.prefab.meta b/Assets/Prefabs/COD.prefab.meta new file mode 100644 index 0000000..a913b30 --- /dev/null +++ b/Assets/Prefabs/COD.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7bea459125852942832ad138d6c6ded +timeCreated: 1458099979 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes.meta b/Assets/Prefabs/Memes.meta new file mode 100644 index 0000000..40feebd --- /dev/null +++ b/Assets/Prefabs/Memes.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 78ff5c1f5af177045a2bbb76bfd44b0f +folderAsset: yes +timeCreated: 1458099779 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/50 shades of green.jpg b/Assets/Prefabs/Memes/50 shades of green.jpg new file mode 100644 index 0000000..5988175 Binary files /dev/null and b/Assets/Prefabs/Memes/50 shades of green.jpg differ diff --git a/Assets/Prefabs/Memes/50 shades of green.jpg.meta b/Assets/Prefabs/Memes/50 shades of green.jpg.meta new file mode 100644 index 0000000..a8fb837 --- /dev/null +++ b/Assets/Prefabs/Memes/50 shades of green.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 8e9fcb3c16152484c9f77f7eca7408b2 +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/AHHHH.jpg b/Assets/Prefabs/Memes/AHHHH.jpg new file mode 100644 index 0000000..d96744c Binary files /dev/null and b/Assets/Prefabs/Memes/AHHHH.jpg differ diff --git a/Assets/Prefabs/Memes/AHHHH.jpg.meta b/Assets/Prefabs/Memes/AHHHH.jpg.meta new file mode 100644 index 0000000..57f1a63 --- /dev/null +++ b/Assets/Prefabs/Memes/AHHHH.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 1a07ac52f3645a246ba7d69a72e32d9f +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/COD.jpg b/Assets/Prefabs/Memes/COD.jpg new file mode 100644 index 0000000..bfdb299 Binary files /dev/null and b/Assets/Prefabs/Memes/COD.jpg differ diff --git a/Assets/Prefabs/Memes/COD.jpg.meta b/Assets/Prefabs/Memes/COD.jpg.meta new file mode 100644 index 0000000..b4a4289 --- /dev/null +++ b/Assets/Prefabs/Memes/COD.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 404003cdef0edc644b0f601747f17c09 +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/Whoa.jpg b/Assets/Prefabs/Memes/Whoa.jpg new file mode 100644 index 0000000..d4d1631 Binary files /dev/null and b/Assets/Prefabs/Memes/Whoa.jpg differ diff --git a/Assets/Prefabs/Memes/Whoa.jpg.meta b/Assets/Prefabs/Memes/Whoa.jpg.meta new file mode 100644 index 0000000..3139e33 --- /dev/null +++ b/Assets/Prefabs/Memes/Whoa.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 77d55c132123639438a53c208ca0ab76 +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/ayylmao.jpg b/Assets/Prefabs/Memes/ayylmao.jpg new file mode 100644 index 0000000..83529cc Binary files /dev/null and b/Assets/Prefabs/Memes/ayylmao.jpg differ diff --git a/Assets/Prefabs/Memes/ayylmao.jpg.meta b/Assets/Prefabs/Memes/ayylmao.jpg.meta new file mode 100644 index 0000000..cf2e537 --- /dev/null +++ b/Assets/Prefabs/Memes/ayylmao.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: e56e0774efa558f4895b107d61b417c4 +timeCreated: 1458099780 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/ball-is-life.jpg b/Assets/Prefabs/Memes/ball-is-life.jpg new file mode 100644 index 0000000..81e3ad4 Binary files /dev/null and b/Assets/Prefabs/Memes/ball-is-life.jpg differ diff --git a/Assets/Prefabs/Memes/ball-is-life.jpg.meta b/Assets/Prefabs/Memes/ball-is-life.jpg.meta new file mode 100644 index 0000000..473338f --- /dev/null +++ b/Assets/Prefabs/Memes/ball-is-life.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: fc400266ca91e4a4985d979b7410e20d +timeCreated: 1458099780 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/fool.jpg b/Assets/Prefabs/Memes/fool.jpg new file mode 100644 index 0000000..a5633ac Binary files /dev/null and b/Assets/Prefabs/Memes/fool.jpg differ diff --git a/Assets/Prefabs/Memes/fool.jpg.meta b/Assets/Prefabs/Memes/fool.jpg.meta new file mode 100644 index 0000000..2eaeafa --- /dev/null +++ b/Assets/Prefabs/Memes/fool.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: bae96dcda258a0b449e0056273ceead6 +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Memes/git gud.png b/Assets/Prefabs/Memes/git gud.png new file mode 100644 index 0000000..57f4f19 Binary files /dev/null and b/Assets/Prefabs/Memes/git gud.png differ diff --git a/Assets/Prefabs/Memes/git gud.png.meta b/Assets/Prefabs/Memes/git gud.png.meta new file mode 100644 index 0000000..5b5ee75 --- /dev/null +++ b/Assets/Prefabs/Memes/git gud.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: d798f997dee7f26419e9077d922b857c +timeCreated: 1458099779 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Whoa.prefab b/Assets/Prefabs/Whoa.prefab new file mode 100644 index 0000000..1c01d7b Binary files /dev/null and b/Assets/Prefabs/Whoa.prefab differ diff --git a/Assets/Prefabs/Whoa.prefab.meta b/Assets/Prefabs/Whoa.prefab.meta new file mode 100644 index 0000000..64fd328 --- /dev/null +++ b/Assets/Prefabs/Whoa.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c45d5c55e6dbe740ab0488eb2504726 +timeCreated: 1458099974 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ayylmao.prefab b/Assets/Prefabs/ayylmao.prefab new file mode 100644 index 0000000..6a8b00d Binary files /dev/null and b/Assets/Prefabs/ayylmao.prefab differ diff --git a/Assets/Prefabs/ayylmao.prefab.meta b/Assets/Prefabs/ayylmao.prefab.meta new file mode 100644 index 0000000..c2cc3b0 --- /dev/null +++ b/Assets/Prefabs/ayylmao.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6b4dbda69f836a4aba9f918a8a5c071 +timeCreated: 1458099804 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ball-is-life.prefab b/Assets/Prefabs/ball-is-life.prefab new file mode 100644 index 0000000..13297e8 Binary files /dev/null and b/Assets/Prefabs/ball-is-life.prefab differ diff --git a/Assets/Prefabs/ball-is-life.prefab.meta b/Assets/Prefabs/ball-is-life.prefab.meta new file mode 100644 index 0000000..792270e --- /dev/null +++ b/Assets/Prefabs/ball-is-life.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 489ba44ec3eaf674788d0126a2c7ad5e +timeCreated: 1458099981 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/fool.prefab b/Assets/Prefabs/fool.prefab new file mode 100644 index 0000000..3b30951 Binary files /dev/null and b/Assets/Prefabs/fool.prefab differ diff --git a/Assets/Prefabs/fool.prefab.meta b/Assets/Prefabs/fool.prefab.meta new file mode 100644 index 0000000..b0a3f99 --- /dev/null +++ b/Assets/Prefabs/fool.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70cb3246b5346f8428572f4c64e8883d +timeCreated: 1458099977 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/git gud.prefab b/Assets/Prefabs/git gud.prefab new file mode 100644 index 0000000..b3d3e47 Binary files /dev/null and b/Assets/Prefabs/git gud.prefab differ diff --git a/Assets/Prefabs/git gud.prefab.meta b/Assets/Prefabs/git gud.prefab.meta new file mode 100644 index 0000000..2458532 --- /dev/null +++ b/Assets/Prefabs/git gud.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 926a4c309bd4db640a67397c70afeb0e +timeCreated: 1458099976 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GenerationTestScene.unity b/Assets/Scenes/GenerationTestScene.unity index 0b4e1bf..7d96e19 100644 Binary files a/Assets/Scenes/GenerationTestScene.unity and b/Assets/Scenes/GenerationTestScene.unity differ diff --git a/Assets/Scripts/ProcGen/BoardCreator.cs b/Assets/Scripts/ProcGen/BoardCreator.cs index a72ac72..76d1ad7 100644 --- a/Assets/Scripts/ProcGen/BoardCreator.cs +++ b/Assets/Scripts/ProcGen/BoardCreator.cs @@ -21,6 +21,7 @@ public enum TileType public GameObject[] outerWallTiles; // An array of outer wall tile prefabs. public GameObject player; public GameObject PuzzelRoom; // The prefab for the puzzel room + public GameObject PuzzleCorridor; public int CorridorPercChance = 50; private float roll; // Variable to hold the roll on the randomly instantiated puzzel rooms @@ -33,6 +34,10 @@ public enum TileType private Corridor[] corridors; // All the corridors that connect the rooms. private GameObject boardHolder; // GameObject that acts as a container for all other tiles. + public GameObject[] RandomPrefabs; //An array o + + public int element = 0; + private void Start() { @@ -132,8 +137,11 @@ void CreateRoomsAndCorridors() //If the roll is between 0 and the PercentChance value if (roll <= PercentChance) { - //Spawn the prefab - Instantiate (PuzzelRoom, new Vector3 (roomToBePlaced.xPos+roomToBePlaced.roomWidth, roomToBePlaced.yPos+roomToBePlaced.roomHeight, 0), Quaternion.identity); + element = Random.Range(0, 7); //Only used 8 elements to test, this can change later + + //Spawn the prefab + //NOTE: when spawing in the random prefabs from the elements, i needed to divide the points by 2 so that each prefab AKA the images are spawned in the center of the room. + Instantiate (RandomPrefabs[element], new Vector3 (roomToBePlaced.xPos+roomToBePlaced.roomWidth / 2, roomToBePlaced.yPos+roomToBePlaced.roomHeight / 2, 0), Quaternion.identity); } } } diff --git a/Assets/Scripts/ProcGen/BoardCreator.cs.meta b/Assets/Scripts/ProcGen/BoardCreator.cs.meta index e236310..bacc7a9 100644 --- a/Assets/Scripts/ProcGen/BoardCreator.cs.meta +++ b/Assets/Scripts/ProcGen/BoardCreator.cs.meta @@ -1,10 +1,13 @@ fileFormatVersion: 2 guid: 0e07e45ae6ed27e4ea45288d862e596d -timeCreated: 1455386253 +timeCreated: 1458098311 licenseType: Free MonoImporter: serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - player: {instanceID: 0} + - PuzzelRoom: {instanceID: 0} + - PuzzleCorridor: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index e7d4ce8..7c0ac3c 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5cc3b78..bb60c06 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.2p3 +m_EditorVersion: 5.3.2f1 m_StandardAssetsVersion: 0