From 4fa95617c23915a757c04c441c3c8035271e1bf8 Mon Sep 17 00:00:00 2001 From: Nicola Sovic Date: Wed, 16 Mar 2022 19:57:26 +0100 Subject: [PATCH] Added rivers and lakes, fixed generation, fixed map colors, v.1.2.0 --- Assets/IMG/Aseprite/MapCity.aseprite | Bin 0 -> 1281 bytes Assets/IMG/Aseprite/MapCity.aseprite.meta | 7 + Assets/IMG/Aseprite/MapForest.aseprite | Bin 0 -> 834 bytes Assets/IMG/Aseprite/MapForest.aseprite.meta | 7 + Assets/IMG/Aseprite/MapLake.aseprite | Bin 0 -> 832 bytes Assets/IMG/Aseprite/MapLake.aseprite.meta | 7 + Assets/IMG/Aseprite/MapRiver.aseprite | Bin 0 -> 1376 bytes Assets/IMG/Aseprite/MapRiver.aseprite.meta | 7 + Assets/IMG/Aseprite/MapRiver2.aseprite | Bin 0 -> 1518 bytes Assets/IMG/Aseprite/MapRiver2.aseprite.meta | 7 + Assets/IMG/Aseprite/MapRiver3.aseprite | Bin 0 -> 1151 bytes Assets/IMG/Aseprite/MapRiver3.aseprite.meta | 7 + Assets/IMG/Aseprite/MapStone.aseprite | Bin 0 -> 832 bytes Assets/IMG/Aseprite/MapStone.aseprite.meta | 7 + Assets/IMG/MapCity.png | Bin 0 -> 572 bytes Assets/IMG/MapCity.png.meta | 96 ++++ Assets/IMG/MapForest.png | Bin 0 -> 437 bytes Assets/IMG/MapForest.png.meta | 96 ++++ Assets/IMG/MapLake.png | Bin 0 -> 439 bytes Assets/IMG/MapLake.png.meta | 96 ++++ Assets/IMG/MapRiver.png | Bin 0 -> 874 bytes Assets/IMG/MapRiver.png.meta | 96 ++++ Assets/IMG/MapRiver2.png | Bin 0 -> 895 bytes Assets/IMG/MapRiver2.png.meta | 96 ++++ Assets/IMG/MapRiver3.png | Bin 0 -> 739 bytes Assets/IMG/MapRiver3.png.meta | 96 ++++ Assets/IMG/MapStone.png | Bin 0 -> 436 bytes Assets/IMG/MapStone.png.meta | 96 ++++ Assets/IMG/Materials/MapCity.mat | 78 +++ Assets/IMG/Materials/MapCity.mat.meta | 8 + Assets/IMG/Materials/MapForest.mat | 78 +++ Assets/IMG/Materials/MapForest.mat.meta | 8 + Assets/IMG/Materials/MapLake.mat | 78 +++ Assets/IMG/Materials/MapLake.mat.meta | 8 + Assets/IMG/Materials/MapRiver.mat | 78 +++ Assets/IMG/Materials/MapRiver.mat.meta | 8 + Assets/IMG/Materials/MapRiver2.mat | 78 +++ Assets/IMG/Materials/MapRiver2.mat.meta | 8 + Assets/IMG/Materials/MapRiver3.mat | 78 +++ Assets/IMG/Materials/MapRiver3.mat.meta | 8 + Assets/IMG/Materials/MapStone.mat | 78 +++ Assets/IMG/Materials/MapStone.mat.meta | 8 + Assets/Prefabs/CityTile.prefab | 2 +- Assets/Prefabs/LakeTile.prefab | 111 +++++ Assets/Prefabs/LakeTile.prefab.meta | 7 + Assets/Prefabs/RiverTile1.prefab | 111 +++++ Assets/Prefabs/RiverTile1.prefab.meta | 7 + Assets/Prefabs/RiverTile2.prefab | 111 +++++ Assets/Prefabs/RiverTile2.prefab.meta | 7 + Assets/Prefabs/RiverTile3.prefab | 111 +++++ Assets/Prefabs/RiverTile3.prefab.meta | 7 + Assets/Prefabs/StoneTile.prefab | 6 +- Assets/Prefabs/TreeTile.prefab | 7 +- Assets/Scenes/GameScene.unity | 505 +++++++++++++++++++- Assets/Scripts/Map.cs | 14 + Assets/Scripts/NoiseGenerator.cs | 24 + Assets/Scripts/WorldGenerator.cs | 75 ++- 57 files changed, 2361 insertions(+), 67 deletions(-) create mode 100644 Assets/IMG/Aseprite/MapCity.aseprite create mode 100644 Assets/IMG/Aseprite/MapCity.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapForest.aseprite create mode 100644 Assets/IMG/Aseprite/MapForest.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapLake.aseprite create mode 100644 Assets/IMG/Aseprite/MapLake.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapRiver.aseprite create mode 100644 Assets/IMG/Aseprite/MapRiver.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapRiver2.aseprite create mode 100644 Assets/IMG/Aseprite/MapRiver2.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapRiver3.aseprite create mode 100644 Assets/IMG/Aseprite/MapRiver3.aseprite.meta create mode 100644 Assets/IMG/Aseprite/MapStone.aseprite create mode 100644 Assets/IMG/Aseprite/MapStone.aseprite.meta create mode 100644 Assets/IMG/MapCity.png create mode 100644 Assets/IMG/MapCity.png.meta create mode 100644 Assets/IMG/MapForest.png create mode 100644 Assets/IMG/MapForest.png.meta create mode 100644 Assets/IMG/MapLake.png create mode 100644 Assets/IMG/MapLake.png.meta create mode 100644 Assets/IMG/MapRiver.png create mode 100644 Assets/IMG/MapRiver.png.meta create mode 100644 Assets/IMG/MapRiver2.png create mode 100644 Assets/IMG/MapRiver2.png.meta create mode 100644 Assets/IMG/MapRiver3.png create mode 100644 Assets/IMG/MapRiver3.png.meta create mode 100644 Assets/IMG/MapStone.png create mode 100644 Assets/IMG/MapStone.png.meta create mode 100644 Assets/IMG/Materials/MapCity.mat create mode 100644 Assets/IMG/Materials/MapCity.mat.meta create mode 100644 Assets/IMG/Materials/MapForest.mat create mode 100644 Assets/IMG/Materials/MapForest.mat.meta create mode 100644 Assets/IMG/Materials/MapLake.mat create mode 100644 Assets/IMG/Materials/MapLake.mat.meta create mode 100644 Assets/IMG/Materials/MapRiver.mat create mode 100644 Assets/IMG/Materials/MapRiver.mat.meta create mode 100644 Assets/IMG/Materials/MapRiver2.mat create mode 100644 Assets/IMG/Materials/MapRiver2.mat.meta create mode 100644 Assets/IMG/Materials/MapRiver3.mat create mode 100644 Assets/IMG/Materials/MapRiver3.mat.meta create mode 100644 Assets/IMG/Materials/MapStone.mat create mode 100644 Assets/IMG/Materials/MapStone.mat.meta create mode 100644 Assets/Prefabs/LakeTile.prefab create mode 100644 Assets/Prefabs/LakeTile.prefab.meta create mode 100644 Assets/Prefabs/RiverTile1.prefab create mode 100644 Assets/Prefabs/RiverTile1.prefab.meta create mode 100644 Assets/Prefabs/RiverTile2.prefab create mode 100644 Assets/Prefabs/RiverTile2.prefab.meta create mode 100644 Assets/Prefabs/RiverTile3.prefab create mode 100644 Assets/Prefabs/RiverTile3.prefab.meta diff --git a/Assets/IMG/Aseprite/MapCity.aseprite b/Assets/IMG/Aseprite/MapCity.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..fe5c40018eba3bcb9ce52335f16833c06bcc34a2 GIT binary patch literal 1281 zcmds#Ur19?9LLX6n-!70R1)PSBBYnL5!%o&GkeGak#I=CEX#7sP19y$Z7ZpSLHbfe z{^`#{Q1oX{I&j#E83r+Rh^=kllFI9l?Pgb;y1U)JcPjdz(n~L$!~O8%oO{prbADV= z3L)Q~i^xq(iiijy7w{|%tO<)G4f9`&TgimXO^Oq#Vgzi%Bc>9O%i?^f(e_o`#|s0N-*qf1*5;Sz(+reLDf46n0;RZ7F8VpON#b_ zvRpZsmsbx;${WEmno+Q#jR%#kAK+&{2l5z%w7s!`w@po8l}ZJcm6m|IqZaVBOa^)t z6`;q^4YoWy0a~;YUWE%J3w@_h;1ak2^x+P1SVI}UkcBBU;Rr$4K@DDzf)R8C7oLX& z6p)W_BqJ7?2t*p9GK3^530xddAYyXzoc`ifO1k#8><|=FsQEAXb&Dqmf6evwkXyR- zJ@%wU^}T5Yh3D^C#(Rx-Ge5Nsl;OoAKD&538yIuA%x!!YUmf>zwps0eyby~CKXN!C zO5Zei>{+63B9e-^)VCT^BlOLizp=4+$8qsxu7pprJuI)AMcd+9VR}3?qkzZ~IjjjQ{tyBs>sH@R9d zL^GVOxC~(rYR+C6q`9o*qNC$nkdbbh08(~BnvdCnL;GF&!j13gHmD?B|Em1 zg=j@t)4p={;Zlo^#IUO%Sc(Tw6 z?{{Zm^vMNhuB%{R!ww6l+F^x1A68dnLuauYmXvfud*cYKZ@+}Th=vUZS8)IA9coG> zva$xl!=un22*A3UYS`l)gUe1QJgN1;w6GsHGLk%yaFha+0(HaXB$S0g+V#y?sG@@)qlH$343I(xBWm8{EmvXpqu&A#+ z&7*vk@muuH-5q+8x0HyZES#J9;BjiRD{Wx%b}^~{XfTBjCsyaT_ukiDJD$&PHV=Xk V?b2-@XaBen)ZA7mI`ks`w@(f%QWyXL literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/MapForest.aseprite.meta b/Assets/IMG/Aseprite/MapForest.aseprite.meta new file mode 100644 index 0000000..db35a62 --- /dev/null +++ b/Assets/IMG/Aseprite/MapForest.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59adc6a6c9a78d04ca58bae02dcadb51 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/MapLake.aseprite b/Assets/IMG/Aseprite/MapLake.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..7d4b634d8db826ca6d461cfb8734bcb3487491d1 GIT binary patch literal 832 zcmds#%PT}t9LIlyo7EH>vT{a}ota4_QzK>LQL-4x0*yzekVhghl2RxsC1w^9JF}j$ z@W@gYN_k8g3MqN7JaT;QjPMWG_?^zD)9>E;et!4dl0=cSRf~+WlvqThnf+7r%%-HU z{-U-LL|z|_SgJul8ar9VB7eo5aL!QbtCRWbN$jXavQ$1S%XPulA_tuD6vJqD4m@6J zg?BrP@a?GpE?iba--aC)&UM0y_B>cqkqw=$BItJaL3`sEtnWOB-hhS;dlzsw@(wj6 z5(tIi_{aoo_xWI*rv~(6CT%k;o;CaoS83&lU;W0V}K;{yDJV1!35~zjyTpR zYlx+HcoqkR$f~P-9OlM$4BHn{L=Ltz1rOK V2Xw*zZA7Aeral`^Up{Kf{sbNdQ4Ih9 literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/MapLake.aseprite.meta b/Assets/IMG/Aseprite/MapLake.aseprite.meta new file mode 100644 index 0000000..5c7a9b6 --- /dev/null +++ b/Assets/IMG/Aseprite/MapLake.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d4cf8103da72960449e5d7bfc4a33d37 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/MapRiver.aseprite b/Assets/IMG/Aseprite/MapRiver.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..8e6e8751f66be09f2c39ececc7dc43fe272d85cd GIT binary patch literal 1376 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 literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/MapRiver3.aseprite.meta b/Assets/IMG/Aseprite/MapRiver3.aseprite.meta new file mode 100644 index 0000000..6dc3265 --- /dev/null +++ b/Assets/IMG/Aseprite/MapRiver3.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fa0d747fdc4fcff429208fa958109208 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/MapStone.aseprite b/Assets/IMG/Aseprite/MapStone.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..c0cc108c3159f0f7c23dd5438e283c502ca8e26c GIT binary patch literal 832 zcmds#%_~Gv7>8fXG&aggS>TXlXJ!&j)QD^hB@2>;kMYrr%;X~xAt{=TjS^#F!A7j7 z5Xw@suoCiB*dZ)5499b4gnz)sdpb|2_ul$F?>)CHN#t@hK_*yA5=5k({ZsUerlhj| zqV^I+ULVb|R5Jl-Y>SFT{)#){oUYVYC+pXf*inn*s6tqoUkW=NHaJ^f0xx>=;PG-N zyx(7hZ%;*V;ieXPcdW2@&Ietd0$AtDh4xYhbUFv1wPg}E`L3Wls9|&X8XlZRp{7KF z8zDF~HVr*qFKn!@gM;M(xNf(@;|4c88rg)i^Hnh5w`wl~n2hhPI4}egppQG^Sfh+D zvY4WYBZAnWh8I#8p<}pcjRgwi6HYR*WD-akQCUWk;<~>J1+hqV>u^V(vK8ZCR`F+= zONp29TMRAT9okYPTf|o5Y@0DfAGVY8`ZCs*`$xNs7d_qn%-h}Ycu*JVo{!ULDB^#< T_{WW{cMDUWza*VitVBKmsP|6| literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/MapStone.aseprite.meta b/Assets/IMG/Aseprite/MapStone.aseprite.meta new file mode 100644 index 0000000..3c98ca1 --- /dev/null +++ b/Assets/IMG/Aseprite/MapStone.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e749cd3e97d5f04786b47b576237532 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapCity.png b/Assets/IMG/MapCity.png new file mode 100644 index 0000000000000000000000000000000000000000..c9bc50d0e7fd3ea7cdc5932ddb135b177e5c7995 GIT binary patch literal 572 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zzj?YihE&XX zd&@BEPJoC*;7w2I0tMG?hEH=&q7hH=A|VZ7SbGk$;+pF(2%b!KEIO9q)z$F zT>hkcSKt2pvS&hR?HAqx9mXS^3VsZQOdY}wa~K}k@VKWWQf@AqCZ+~Tf`}aSW zW#cKg3r})b45u(W!r>B_Ub7~(bmfkPIV`^C+ytD#-kry!_FS`Jp$)6gxnKr}5Htj^ znw74cQDoL6L8^^y`7E|~|IW8uf4?QL*zLT1R$s3|7;)-lqElzIvQ}?(INk-UV4#Oi<#Un=O*y6^_iznvp%tH%;_@4c2 V2Qoz^cLU>r!PC{xWt~$(69DP0g7N?W literal 0 HcmV?d00001 diff --git a/Assets/IMG/MapForest.png.meta b/Assets/IMG/MapForest.png.meta new file mode 100644 index 0000000..547e8d2 --- /dev/null +++ b/Assets/IMG/MapForest.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 927e222c3f32db144a7fff730dc37998 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapLake.png b/Assets/IMG/MapLake.png new file mode 100644 index 0000000000000000000000000000000000000000..c1d0fccd7f44b320ec8b9cae5a26ec4e81846ccb GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%z3q4&NLn`LH zy|PiTDL}x%QB-QunKBNI?n!S>T;x-jB){kG7rh-1&feXA{d2YQYr|g*$Alc_Fg#)r zP;ancJi@7vXBYir&3o;45B!(aTF&{+P{`CFjH1AABnq8P=f1ozrjWh)2fFY7GRX9> WE!+8VT`({v7(8A5T-G@yGywqBB!+ze literal 0 HcmV?d00001 diff --git a/Assets/IMG/MapLake.png.meta b/Assets/IMG/MapLake.png.meta new file mode 100644 index 0000000..f1ec859 --- /dev/null +++ b/Assets/IMG/MapLake.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0e5e323b399c5544aa154a2f363f674a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapRiver.png b/Assets/IMG/MapRiver.png new file mode 100644 index 0000000000000000000000000000000000000000..04b07b59199951881b74d02662082a9bba5a9895 GIT binary patch literal 874 zcmYjQYfMrB6h8L?dI6bN3o=T(8Z{?b*qXVDx|oDoGcxCcUN>v5W@%YlN~>M46=5Y> z*}EvEHAQ2tkis>}S}LvRt<{p=56fwhR#bLvtM%iY@9aEwcD{XQr#ej~;E8zvAV^70 zN@tKBGAw}cEi;$989+9qs}iB%=ID0-EJ;d|BBS`|$480+v0}LLwko%c-^Xj6@VJdQ z(i_pj%f>3JS9e-^*Y;(o zPG)}w8X|0A7=-4_PN|vrZB{Z9d+KbUAv^57Os3=X6p-L+7Q{fP>dGSv%Y$B?X5kPz zYIi!zln@#bE2l+RPhAjj*#j9o`fA0x{8w;}v{@UOu?ee1WdE2Vy;o})Vdm)Fv8ZVa zM}jYI&qXvuLSY=ulM;P#eO*=&CB~jQx#WJ~DxIqs(ez*i0qV6JNg=zR?oX1y>R9NEWXl>M)bLf#Sgv6Z_54dWvn0p@=l1jEP)7*WX#IM%* z2Y_L+5^s$EP-afWC!clo7NUwF&T2IIrg|JSoslaS>loS?jFHfpr6%rdyATsln(;x0 z@ESxG%ik7cVS9|b2sf`LfVeitbkYYk4priIVKibEhA4cgi0OHx;S%}^lKb$a1_{IB zTq&POuPE2uVUGEh$}(i!6GjKqLdVh)s4zNE5tDZ3fZ5#%hDP-E9%K~w2CZO2-{c_X z&mcP!Eu{j9_BedpbntD0u_uE^>3z|9xf>#2swRW@I+P_ e=WoY9HTwmra^JD;VH+Em=YbSuT2ezIrT-1~k5C@~ literal 0 HcmV?d00001 diff --git a/Assets/IMG/MapRiver.png.meta b/Assets/IMG/MapRiver.png.meta new file mode 100644 index 0000000..e09699a --- /dev/null +++ b/Assets/IMG/MapRiver.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: bae61b2c000dd9342998c1264942fc79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapRiver2.png b/Assets/IMG/MapRiver2.png new file mode 100644 index 0000000000000000000000000000000000000000..66f23a0853e2efd0ccd876ecb094ab8e2f3d9b82 GIT binary patch literal 895 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V7ByhaSW-L z^Y+&1TxmxE*Nf9s9U3*5vYwahDG)k$RB@)DfdG@yo281}S88sAe$BdP8_jvh=lt7O z3lFrvkN2-<%c)(tkKu|ELorK2AHx~J21_ObcZO&4rqw-TG*}rimdsyWkKnjDh8j%xETz-F1c$aFw9^oc3r0~d>|$QC~CRr`b5qIJrjmy2WpM3^>Zp{ zWq)pAKOl197>mG^otZ&Q30yCdm^x10(_u-_(`D#uOcl*O!eTI8iXr&HwpCjbnPw<6 z6u)FF;He4OspbQUx^*f*RrRZ`H*qGc(`k71NmOGEqwoP4#u?hY4v8#bfji69KrtIG z*KkVX%#xDxPZ<}8F{%XL`kO4!VB5)XrL0xBlOaZ<&5z+3heGG0ck<2}3|CpLtY$I< zG&2Zk_?xd}m?Hja#S$h5J0=5l@dFq87{C6W$jz{m17yi$9*4hoVpbon^z*X}S2C{csm3N!gHYmV~L;#`GpcVLcU N@O1TaS?83{1OTXNcf$Yx literal 0 HcmV?d00001 diff --git a/Assets/IMG/MapRiver2.png.meta b/Assets/IMG/MapRiver2.png.meta new file mode 100644 index 0000000..ed24025 --- /dev/null +++ b/Assets/IMG/MapRiver2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: c14f940b0d535d349aaef75517494183 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapRiver3.png b/Assets/IMG/MapRiver3.png new file mode 100644 index 0000000000000000000000000000000000000000..2440655cdf0704f4c6acc34ab289fa51482d083a GIT binary patch literal 739 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V4Cac;uumf z=k1-dzK0zI93FBi1agSBNb_D~Nq@DNiOaEzWx2w?J@+K4%lEvm4HpuuzGtP9Qe07E zv9Eo@x+;5yuc-_LYz*meqTIN;IsLwxMrCzv=0EHF_kCBl+uF)@*?;FkDB55={SRZr zVTK1h59Fivv&2+?b(dh6$Eb7VG4BFh35Ge0IuriBz3&ZT#biu*{?C~CM&nw&|AK4< z6EB9Rpa5Z_2FV z-)Fj>AwEU2ZuM39M27hthx-j0I!+k>k^8`yB31YLsyriqgWVsF0*0Aw_l1obat^=W z`b)Wi(c;hh03dPS07&dtWGeV^xsCt8!|A-T4TtBO=P>Z?Klf&TbGCoVHRdx5j_#Z} z>vHKG@%P(rJ!dp(os{`?eeIrX`RLF5Ek3dbqSUj_AAbMw#^oBN6(t|GsvEujU~Ic? z{w0+3q|7Li$Y4U{^ TK`bkPsg}Xh)z4*}Q$iB}u&OFT literal 0 HcmV?d00001 diff --git a/Assets/IMG/MapRiver3.png.meta b/Assets/IMG/MapRiver3.png.meta new file mode 100644 index 0000000..0f9b7e7 --- /dev/null +++ b/Assets/IMG/MapRiver3.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d3fdf477b420a3f458bcb74bc5a5fb26 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/MapStone.png b/Assets/IMG/MapStone.png new file mode 100644 index 0000000000000000000000000000000000000000..0332aabd9679911c6b810af447a05975a817b041 GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%z^E_P~Ln`LH zy|PiT*@1__G5NB9BJa*nC#|FccC{w{JoBkctmd=!y)N2!qN?AnVIzxxdV>Yy5l#g^ zhC-%}+3UsZPX9V0d*{iG?fZ-6A%emVa~K|>svA*4JAP(8ys=&VU4j65fb5WeaFZh~ UAo5x~Fd7& tiles, GameObject currentTile) @@ -62,6 +64,18 @@ public class Map : MonoBehaviour case "TreeTile": color = forest.color; break; + case "RiverTile1": + color = river.color; + break; + case "RiverTile2": + color = river.color; + break; + case "RiverTile3": + color = river.color; + break; + case "LakeTile": + color = lake.color; + break; default: color = spawn.color; break; diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 7f86e92..5170309 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -40,6 +40,30 @@ public class NoiseGenerator applyMesh(tile, vertices, mesh); } + public void applyRiverTileNoise(GameObject tile) + { + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + float[] samples = calculateSamples(tile); + for (int i = 0; i < samples.Length; i++) + { + vertices[i].y = samples[i] * 7.5f; + } + applyMesh(tile, vertices, mesh); + } + + public void applyLakeTileNoise(GameObject tile) + { + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + float[] samples = calculateSamples(tile); + for (int i = 0; i < samples.Length; i++) + { + vertices[i].y = samples[i] * 7.5f; + } + applyMesh(tile, vertices, mesh); + } + public void applyCityTileNoise(GameObject tile) { //Currently no noise. (Objects floating) diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index 5364a51..612ec3c 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -7,7 +7,10 @@ using UnityEngine.UI; public class WorldGenerator : MonoBehaviour { public GameObject player; - public GameObject[] prefabs; + public GameObject[] prefabsHighProbability; // 50% + public GameObject[] prefabsMiddleProbability; // 35% + public GameObject[] prefabsLowProbability; // 10% + public GameObject[] prefabsLowestProbability; // 5% Dictionary tiles; GameObject currentTile; List renderedTiles; @@ -81,48 +84,30 @@ public class WorldGenerator : MonoBehaviour Vector3 pos = currentTile.GetComponent().needConnectedTile(playerX, playerZ); if (!tiles.ContainsKey(pos) && pos.y == 0) { - int index; int chance = rand.Next(1,101); - - while (true) + GameObject[] usedArray; + if (chance > 50) { - if (chance < 50) - { - index = 0; - } - else if (chance >= 50 && chance < 70) - { - index = 1; - } - else if (chance >= 70 && chance < 90) - { - index = 2; - } - else - { - index = 3; - } - - if (index == 3) - { - if (cityAmount > 0) - { - cityAmount--; - break; - } - else - { - chance = rand.Next(1, 101); - } - } - else - { - break; - } + usedArray = prefabsHighProbability; } + else if (chance > 15 && chance <= 50) + { + usedArray = prefabsMiddleProbability; + } + else if (chance > 5 && chance <= 15) + { + usedArray = prefabsLowProbability; + } + else + { + usedArray = prefabsLowestProbability; + } + + int index = rand.Next(0, usedArray.Length); + Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100); - GameObject newTile = Instantiate(prefabs[index], mapPos, Quaternion.identity); - string name = prefabs[index].name; + GameObject newTile = Instantiate(usedArray[index], mapPos, Quaternion.identity); + string name = usedArray[index].name; if (name.Contains("_")) { name = name.Split('_')[0]; @@ -162,6 +147,18 @@ public class WorldGenerator : MonoBehaviour case "citytile": noise.applyCityTileNoise(tile); break; + case "rivertile1": + noise.applyRiverTileNoise(tile); + break; + case "rivertile2": + noise.applyRiverTileNoise(tile); + break; + case "rivertile3": + noise.applyRiverTileNoise(tile); + break; + case "laketile": + noise.applyLakeTileNoise(tile); + break; } }