Added hud buttons, fixed river generation, v1.2.0

Assets/IMG/Aseprite/CharacterSheetButton.aseprite.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 873682bc55c49be4b9fca16d834d32dd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/IMG/Aseprite/MenuButton.aseprite.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0ea8a2aba6d4cc14091b673cfa35521a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/IMG/Aseprite/QuestlogButton.aseprite.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 147253693c1144643bb74750a4b1a88c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/IMG/CharacterSheetButton.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 18480a45caa3ef44baa79e8f13eac878
+guid: 933686d7661c37c4b879eaf40fd0a016
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/IMG/MenuButton.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 42a12f98324a60845944b16ffaf6db0a
+guid: 893f84e302bddb74597e3eeaa23d5fbc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/IMG/QuestlogButton.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 55f0b3436398ebf47a855d859148d3ed
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/ButtonHandler.cs

@@ -115,17 +115,12 @@ namespace Assets.Scripts
         }
 
         public void closeIntroduction()
-        {
-            audioHandler.playButtonClick();
-            uihandler.openTutorial();
-        }
-
-        public void closeTutorial()
         {
             audioHandler.playButtonClick();
             uihandler.startGame();
             EventSystem.current.SetSelectedGameObject(null);
         }
-    }
 
+
+    }
 }

Assets/Scripts/Controls.cs

@@ -2,6 +2,7 @@ using Assets.Scripts;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 public class Controls : MonoBehaviour
 {
@@ -25,6 +26,7 @@ public class Controls : MonoBehaviour
     {
         if (!player.GetComponent<Player>().takeDamage(0))
         {
+            EventSystem.current.SetSelectedGameObject(null);
             if (!uihandler.isPlayerInFight())
             {
                 checkNormalControls();

Assets/Scripts/NoiseGenerator.cs

@@ -155,7 +155,43 @@ public class NoiseGenerator
 
     private float[] calculateSamplesRiver(GameObject tile)
     {
+        Mesh mesh = tile.GetComponent<MeshFilter>().mesh;
+        Vector3[] vertices = mesh.vertices;
         float[] samples = calculateBasicSamples(tile);
+
+        bool isVertical = (rand.Next(0,2) == 0 ? true : false);
+        int startX = 0;
+        int startZ = 0;
+
+        if (isVertical)
+        {
+            startZ = (rand.Next(0, 2) == 0 ? 4 : -4);
+            startX = rand.Next(-4, 5);
+        }
+        else
+        {
+            startZ = rand.Next(-4, 5);
+            startX = (rand.Next(0, 2) == 0 ? 4 : -4);
+        }
+
+        for (int k = 0; k < vertices.Length; k++)
+        {
+            if (isVertical)
+            {
+                if (Mathf.Round(vertices[k].x) == startX && Mathf.Round(vertices[k].z) != 5 && Mathf.Round(vertices[k].z) != -5)
+                {
+                    samples[k] = samples[k] - rand.Next(2, 4) + 0.5f;
+                }
+            }
+            else
+            {
+                if (Mathf.Round(vertices[k].x) != 5 && Mathf.Round(vertices[k].x) != -5 && Mathf.Round(vertices[k].z) == startZ)
+                {
+                    samples[k] = samples[k] - rand.Next(2, 4) + 0.5f;
+                }
+            }
+        }
+
         Debug.Log("River");
         return samples;
     }

Assets/Scripts/UIHandler.cs

@@ -25,6 +25,7 @@ namespace Assets.Scripts
         public GameObject introduction;
         public GameObject tooltip;
         public GameObject tutorial;
+        public GameObject buttonsHUD;
 
         public UIState state;
 
@@ -42,14 +43,6 @@ namespace Assets.Scripts
             if (state == UIState.GAME)
             {
                 updatePlayerHUD();
-                Cursor.visible = false;
-            }
-            else
-            {
-                if (state != UIState.FIGHT && state != UIState.MAP && state != UIState.QUEST)
-                {
-                    Cursor.visible = true;
-                }
             }
         }
 
@@ -60,7 +53,7 @@ namespace Assets.Scripts
 
         public bool canPlayerMove()
         {
-            if (state == UIState.GAME || state == UIState.MAP || state == UIState.CHARACTER || state == UIState.QUEST)
+            if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.QUEST)
             {
                 return true;
             }
@@ -74,6 +67,7 @@ namespace Assets.Scripts
 
         public void startGame()
         {
+            introduction.transform.localScale = new Vector3(0, 0, 0);
             int index = GameObject.Find("dropSize").GetComponent<Dropdown>().value;
             int cityAmount = 0;
             switch (index)
@@ -93,7 +87,6 @@ namespace Assets.Scripts
             }
             GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().resetGame(cityAmount);
             setPlayerInformation();
-            tutorial.transform.localScale = new Vector3(0,0,0);
             compass.transform.localScale = new Vector3(1, 1, 1);
             showHUD();
             state = UIState.GAME;
@@ -228,6 +221,7 @@ namespace Assets.Scripts
         {
             playerHUD.transform.localScale = new Vector3(1,1,1);
             compass.transform.localScale = new Vector3(1, 1, 1);
+            buttonsHUD.transform.localScale = new Vector3(1, 1, 1);
         }
 
         public void openMainMenu()
@@ -238,7 +232,7 @@ namespace Assets.Scripts
 
         public void switchPauseMenu()
         {
-            if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.MAP || state == UIState.PAUSE || state == UIState.QUEST)
+            if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST)
             {
                 if (state == UIState.PAUSE)
                 {
@@ -546,11 +540,6 @@ namespace Assets.Scripts
             state = UIState.TUTORIAL;
         }
 
-        public void openTutorial()
-        {
-            hideOtherElements(tutorial);
-        }
-
         public void updateCreationInformation()
         {
             setPlayerInformation();

Assets/Scripts/UIState.cs

@@ -12,7 +12,6 @@ namespace Assets.Scripts
         FIGHT,
         CHARACTERCREATION,
         CHARACTER,
-        MAP,
         DEATH,
         OPTIONS,
         GAME,