Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed controls, texts and added image, v1.4.1

Browse Source
This commit is contained in:
TAASONI3 2023-07-05 17:42:35 +02:00
parent 0dc2ff831f
commit d0d9a6847a
33 changed files with 11964 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/AddressableAssetsData/Linux.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 005a54dfcaa4d39de903e69acfd2e20c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/AddressableAssetsData/Linux/addressables_content_state.bin Normal file
View File

Binary file not shown.

7
Assets/AddressableAssetsData/Linux/addressables_content_state.bin.meta Normal file
View File

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

BIN
Assets/IMG/controller-1827840_1920.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

123
Assets/IMG/controller-1827840_1920.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 1f08fe6fdda50ba26b49fb95d69139a1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 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: 0
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
cookieLightType: 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: Server
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

104
Assets/Input.inputactions
View File

@ -89,7 +89,7 @@
{
"name": "Charsheet",
"type": "Button",
"id": "772a3f30-c5b5-4782-9d08-9fcfb6e45902",
"id": "d3e2f9b4-83df-4229-bdab-166ea722b672",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@ -98,7 +98,7 @@
{
"name": "Inventory",
"type": "Button",
"id": "6f41ca97-ac56-4d15-831b-5d1ee56fc561",
"id": "2a815faf-7f83-4f8e-b0c0-fb3c27e050f0",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@ -107,7 +107,7 @@
{
"name": "Questlog",
"type": "Button",
"id": "89f16da1-10b9-4d1c-9437-70dd3c0e4d54",
"id": "56496e33-3b2a-4950-8e12-0c66d769d3b9",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@ -116,7 +116,7 @@
{
"name": "Pause",
"type": "Button",
"id": "24eaf9a7-426f-48ca-a870-20b209478a2b",
"id": "42da73ec-1cff-4563-a69e-b79d164ae159",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@ -335,7 +335,7 @@
},
{
"name": "",
"id": "44c2c619-f0b6-42c4-9f6e-d5be7cc9bd2a",
"id": "c3215b19-e6e2-4b38-be31-cb78772547c0",
"path": "<Keyboard>/c",
"interactions": "",
"processors": "",
@ -346,7 +346,29 @@
},
{
"name": "",
"id": "2d20ea2e-d6fb-4c55-9f20-da09821adcfa",
"id": "198d5b2b-78fa-479f-8a06-ca71e1e8c914",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Charsheet",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "99797d2f-fccb-4165-b1ee-3032683a3e21",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Charsheet",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
@ -357,7 +379,29 @@
},
{
"name": "",
"id": "0866f5f0-431c-4019-b23d-d829500d5dce",
"id": "c3be3c24-9ccb-4919-a516-48ea4f5f6a1e",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Inventory",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9ab4f699-2279-472d-a0c5-cd45c4e2fbce",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Inventory",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5ecbd7b6-c10e-41d7-8338-064fac48d268",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
@ -368,7 +412,29 @@
},
{
"name": "",
"id": "d548504c-b1de-4505-a23b-2503dcf6f23e",
"id": "2dfaf5e4-6477-4304-9ffd-e0ac589c279f",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Questlog",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "783ace97-9d13-44ed-a722-6b446a33ac08",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Questlog",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6288ecc6-0303-4eb2-a008-3e572a3b9437",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
@ -376,6 +442,28 @@
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8e61b6fe-ed27-435d-b841-64d36d25fc47",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3810d8e5-0249-48dd-a379-3efd589b1996",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
}
]
},

57
Assets/Locals/StringTable/MyTexts Shared Data.asset
View File

@ -1243,6 +1243,63 @@ MonoBehaviour:
m_Key: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlGameplay/dropLanguage
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlGameplay/dropLanguage
1
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Key: to
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Key: all
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy)
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (1)
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (2)
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (3)
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (4)
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (5)
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (6)
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (7)
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:

54
Assets/Locals/StringTable/MyTexts_de.asset
View File

@ -659,7 +659,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204669767643136
m_Localized: "Aufl\xF6sung:"
m_Localized: 'Sprache:'
m_Metadata:
m_Items: []
- m_Id: 204708862750720
@ -1014,7 +1014,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235782057750528
m_Localized: Reise nach
m_Localized: Reise
m_Metadata:
m_Items: []
- m_Id: 235830590042112
@ -1022,7 +1022,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235864236748800
m_Localized: "Finde alle St\xE4dte"
m_Localized: "St\xE4dte"
m_Metadata:
m_Items: []
- m_Id: 235946084397056
@ -1261,6 +1261,54 @@ MonoBehaviour:
m_Localized: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Localized: Deutsch
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Localized: Englisch
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Localized: nach
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Localized: alle
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Localized: Steuerung
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Localized: Questbuch
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Localized: Pause
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Localized: Umschauen
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Localized: Spingen / Auswahl
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Localized: Interagieren
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Localized: Inventar
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Localized: Charakterfenster
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

54
Assets/Locals/StringTable/MyTexts_en.asset
View File

@ -682,7 +682,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204669767643136
m_Localized: Resolution
m_Localized: 'Language:'
m_Metadata:
m_Items: []
- m_Id: 204708862750720
@ -1057,7 +1057,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235782057750528
m_Localized: Travel to
m_Localized: Travel
m_Metadata:
m_Items: []
- m_Id: 235830590042112
@ -1065,7 +1065,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235864236748800
m_Localized: Find all cities
m_Localized: cities
m_Metadata:
m_Items: []
- m_Id: 235946084397056
@ -1304,6 +1304,54 @@ MonoBehaviour:
m_Localized: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Localized: German
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Localized: English
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Localized: to
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Localized: all
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Localized: Movement
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Localized: Questlog
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Localized: Pause
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Localized: Camera
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Localized: Jump/Select
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Localized: Interact
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Localized: Inventory
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Localized: Charactersheet
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

32
Assets/Prefabs/newSlot.prefab
View File

@ -177,6 +177,38 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- eventID: 9
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1023590545195096446}
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
m_MethodName: showTooltipSelect
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- eventID: 10
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1023590545195096446}
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
m_MethodName: hideTooltip
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1023590545195096446
MonoBehaviour:
m_ObjectHideFlags: 0

5619
Assets/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

5690
Assets/Scenes/MenuScene.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/Controls.cs
View File

@ -40,6 +40,9 @@ public class Controls : MonoBehaviour
if(Cursor.lockState != CursorLockMode.Locked){
Cursor.lockState = CursorLockMode.Locked;
}
GameObject.Find("txtInteract").GetComponent<Text>().text = GameObject.Find("txtInteract").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text = GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtTutorialGoal").GetComponent<Text>().text = GameObject.Find("txtTutorialGoal").GetComponent<Text>().text.Replace("[ESC]", "[Start]");
}
else{
if(uihandler.canPlayerRotate()){
@ -48,6 +51,9 @@ public class Controls : MonoBehaviour
else{
Cursor.lockState = CursorLockMode.Confined;
}
GameObject.Find("txtInteract").GetComponent<Text>().text = GameObject.Find("txtInteract").GetComponent<Text>().text.Replace("[ButtonEast]", "[E]");
GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text = GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtTutorialGoal").GetComponent<Text>().text = GameObject.Find("txtTutorialGoal").GetComponent<Text>().text.Replace("[Start]", "[ESC]");
}
if(uihandler.state == UIState.GAME && playerInput.currentActionMap.name != "MainGame"){
playerInput.SwitchCurrentActionMap("MainGame");

6
Assets/Scripts/Handler/AudioHandler.cs
View File

@ -20,8 +20,6 @@ public class AudioHandler : MonoBehaviour
AudioSource cameraAudio;
AudioSource playerAudio;
string filepath = "./audiosettings.txt";
// Start is called before the first frame update
public void Start()
{
@ -118,8 +116,8 @@ public class AudioHandler : MonoBehaviour
string result = "";
float music = GameObject.Find("slideMusic").GetComponent<Slider>().value;
float effects = GameObject.Find("slideEffects").GetComponent<Slider>().value;
result = result + TextHandler.getText("music") + ": " + music + "\r\n";
result = result + TextHandler.getText("effects") + ": " + effects;
result = result + TextHandler.getText("music") + ":" + music + "\r\n";
result = result + TextHandler.getText("effects") + ":" + effects;
return result;
}
}

1
Assets/Scripts/Handler/ButtonHandler.cs
View File

@ -82,6 +82,7 @@ namespace Assets.Scripts
string saveText = "";
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;

10
Assets/Scripts/Handler/FileHandler.cs
View File

@ -8,6 +8,7 @@ using UnityEngine;
using UnityEngine.UI;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using UnityEngine.Localization.Settings;
namespace Assets.Scripts
{
@ -54,8 +55,9 @@ namespace Assets.Scripts
sw = File.CreateText(settingsPath);
sw.WriteLine("Music:0.5");
sw.WriteLine("Effects:0.5");
sw.WriteLine("Resolution:0");
sw.WriteLine("Resolution:1");
sw.WriteLine("Mode:0");
sw.WriteLine("Language:en");
sw.WriteLine("SensitivityMouse:1");
sw.WriteLine("SensitivityController:1");
sw.Flush();
@ -96,6 +98,9 @@ namespace Assets.Scripts
break;
}
break;
case "Language":
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale(line.Split(":")[1]);
break;
case "SensitivityMouse":
if(isIngame){
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = float.Parse(line.Split(':')[1]);
@ -126,6 +131,9 @@ namespace Assets.Scripts
case "Mode":
GameObject.Find("dropMode").GetComponent<Dropdown>().value = int.Parse(line.Split(':')[1]);
break;
case "Language":
GameObject.Find("dropLanguage").GetComponent<Dropdown>().value = line.Split(':')[1].Equals("en") ? 1 : 0;
break;
case "SensitivityMouse":
GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
break;

16
Assets/Scripts/Handler/TextHandler.cs
View File

@ -34,8 +34,20 @@ public class TextHandler : MonoBehaviour
public static string translate(string text){
string result = "";
for(int i = 0; i < text.Split(" ").Length; i++){
result += getText(text.Split(" ")[i]) + " ";
string[] parts = text.Split(" ");
for(int i = 0; i < parts.Length; i++){
try{
int.Parse(parts[i]);
result += parts[i] + " ";
}
catch(Exception ex){
if(parts[i].Contains("/")){
result += parts[i] + " ";
}
else{
result += getText(parts[i]) + " ";
}
}
}
return result;
}

32
Assets/Scripts/Handler/UIHandler.cs
View File

@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Localization.Settings;
using UnityEngine.UI;
namespace Assets.Scripts
@ -127,7 +128,6 @@ namespace Assets.Scripts
public void openOptions()
{
options.SetActive(true);
FileHandler.loadOptionDisplay();
hideOtherElements(options);
state = UIState.PAUSEOPTIONS;
@ -137,7 +137,6 @@ namespace Assets.Scripts
public void closeOptions()
{
options.SetActive(false);
state = UIState.PAUSE;
openPauseMenu();
}
@ -304,6 +303,22 @@ namespace Assets.Scripts
return result;
}
public string saveLanguage(){
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
{
case 0:
result = "de";
break;
case 1:
result = "en";
break;
}
result = "Language:"+result;
return result;
}
public void openPauseMenu()
{
hideOtherElements(pauseMenu);
@ -576,5 +591,18 @@ namespace Assets.Scripts
}
}
}
public void switchLanguage(){
GameObject language = GameObject.Find("dropLanguage");
switch (language.GetComponent<Dropdown>().value)
{
case 0:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("de");
break;
case 1:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en");
break;
}
}
}
}

24
Assets/Scripts/InventorySlot.cs
View File

@ -75,7 +75,29 @@ namespace Assets.Scripts
}
}
private Item getItemForTooltip()
public void showTooltipSelect(){
GameObject current = EventSystem.current.currentSelectedGameObject;
Item item = current.GetComponent<InventorySlot>().getItemForTooltip();
if (item != null)
{
inventory.itemDisplay.transform.Find("itemImage").GetComponent<RawImage>().texture = item.image;
inventory.itemDisplay.transform.Find("itemImage").GetComponent<RawImage>().color = item.rarityColor;
inventory.itemDisplay.transform.Find("itemName").GetComponent<Text>().text = TextHandler.translate(item.getName());
inventory.itemDisplay.transform.Find("itemStats").GetComponent<Text>().text = item.getInformation();
int changeY = 0;
if (inventory.itemDisplay.transform.localScale == new Vector3(0,0,0))
{
if (Input.mousePosition.y < Screen.height / 2)
{
changeY = -150;
}
inventory.itemDisplay.transform.position = new Vector3(current.transform.position.x - 250, current.transform.position.y + changeY, 0);
}
inventory.itemDisplay.transform.localScale = new Vector3(1, 1, 1);
}
}
public Item getItemForTooltip()
{
Item item = null;
if (place == ItemPlace.BAG)

1
Assets/Scripts/Items/Equipment.cs
View File

@ -31,7 +31,6 @@ namespace Assets.Scripts
place = (ItemPlace)rand.Next(8);
editName();
loadImage();
Debug.Log(itemName);
}
public Equipment(JToken json) : base(json)

8
Assets/Scripts/Menu/ButtonHandlerMenu.cs
View File

@ -17,7 +17,12 @@ namespace Assets.Scripts.Menu
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandlerMenu>();
audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
sceneHandler = GameObject.Find("SceneHandlerLoaded").GetComponent<SceneHandler>();
GameObject.Find("btnLoad").SetActive(FileHandler.hasSaveFile());
if(FileHandler.hasSaveFile()){
GameObject.Find("btnLoad").GetComponent<Button>().interactable = true;
}
else{
GameObject.Find("btnLoad").GetComponent<Button>().interactable = false;
}
}
public void startGame()
@ -64,6 +69,7 @@ namespace Assets.Scripts.Menu
string saveText = "";
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;

56
Assets/Scripts/Menu/UIHandlerMenu.cs
View File

@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Localization.Settings;
using UnityEngine.UI;
namespace Assets.Scripts.Menu
@ -18,9 +19,9 @@ namespace Assets.Scripts.Menu
void Start()
{
FileHandler.loadOptions(false);
options.SetActive(false);
characterCreation.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
SteamWorksHandler.getStandardAchievement("StartAchievement");
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
@ -95,22 +96,25 @@ namespace Assets.Scripts.Menu
public void openCharacterCreation()
{
characterCreation.SetActive(true);
mainMenu.SetActive(false);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(1,1,1);
mainMenu.transform.localScale = new Vector3(0,0,0);
EventSystem.current.SetSelectedGameObject(GameObject.Find("inName"));
}
public void closeCharacterCreation()
{
characterCreation.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
public void openOptions()
{
options.SetActive(true);
mainMenu.SetActive(false);
options.transform.localScale = new Vector3(1,1,1);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(0,0,0);
FileHandler.loadOptionDisplay();
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnAudio"));
showOptionView("audio");
@ -118,8 +122,9 @@ namespace Assets.Scripts.Menu
public void closeOptions()
{
options.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
@ -166,6 +171,22 @@ namespace Assets.Scripts.Menu
return result;
}
public string saveLanguage(){
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
{
case 0:
result = "de";
break;
case 1:
result = "en";
break;
}
result = "Language:"+result;
return result;
}
public void updateCreationInformation()
{
setPlayerInformation();
@ -202,5 +223,18 @@ namespace Assets.Scripts.Menu
}
}
}
public void switchLanguage(){
GameObject language = GameObject.Find("dropLanguage");
switch (language.GetComponent<Dropdown>().value)
{
case 0:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("de");
break;
case 1:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en");
break;
}
}
}
}

24
Assets/Scripts/Quests/CollectQuest.cs
View File

@ -11,52 +11,52 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(10) + 1;
questname = TextHandler.getText("collect") + goal + " ";
questname = "Collect " + goal + " ";
int index = getRandomNumber(11);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("slimeball");
questname = questname + "slimeball";
keyword = "Slimeball";
break;
case 1:
questname = questname + TextHandler.getText("rock");
questname = questname + "rock";
keyword = "Rock";
break;
case 2:
questname = questname + TextHandler.getText("wood");
questname = questname + "wood";
keyword = "Wood";
break;
case 3:
questname = questname + TextHandler.getText("common") + " " + TextHandler.getText("item");
questname = questname + "common item";
keyword = "Common";
break;
case 4:
questname = questname + TextHandler.getText("rare") + " " + TextHandler.getText("item");
questname = questname + "rare item";
keyword = "Rare";
break;
case 5:
questname = questname + TextHandler.getText("epic") + " " + TextHandler.getText("item");
questname = questname + "epic item";
keyword = "Epic";
break;
case 6:
questname = questname + TextHandler.getText("legendary") + " " + TextHandler.getText("item");
questname = questname + "legendary item";
keyword = "Legendary";
break;
case 7:
questname = questname + TextHandler.getText("iron") + " " + TextHandler.getText("ore");
questname = questname + "Iron ore";
keyword = "Iron";
break;
case 8:
questname = questname + TextHandler.getText("gold") + " " + TextHandler.getText("ore");
questname = questname + "Gold ore";
keyword = "Gold";
break;
case 9:
questname = questname + TextHandler.getText("copper") + " " + TextHandler.getText("ore");
questname = questname + "Copper ore";
keyword = "Copper";
break;
case 10:
questname = questname + TextHandler.getText("tin") + " " + TextHandler.getText("ore");
questname = questname + "Tin ore";
keyword = "Tin";
break;
}

2
Assets/Scripts/Quests/ExploreQuest.cs
View File

@ -13,7 +13,7 @@ namespace Assets.Scripts
float coordX = getRandomNumber(1000) - 500;
float coordZ = getRandomNumber(1000) - 500;
coordinates = new Vector3(playerPos.x + coordX, 0, playerPos.z + coordZ);
questname = TextHandler.getText("travel") + " " + Mathf.Floor(coordinates.x) + "/" + Mathf.Floor(coordinates.z) + "(X/Z)";
questname = "Travel to " + Mathf.Floor(coordinates.x) + "/" + Mathf.Floor(coordinates.z) + " (X/Z)";
}
public ExploreQuest(JToken token, GameObject display) : base(token, display) { }

14
Assets/Scripts/Quests/FindQuest.cs
View File

@ -11,28 +11,28 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(10) + 1;
questname = TextHandler.getText("find") + " " + goal + " ";
questname = "Find " + goal + " ";
int index = getRandomNumber(5);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("plane");
questname = questname + "plane";
keyword = "Plane";
break;
case 1:
questname = questname + TextHandler.getText("mountain");
questname = questname + "mountain";
keyword = "Mountain";
break;
case 2:
questname = questname + TextHandler.getText("forest");
questname = questname + "forest";
keyword = "Forest";
break;
case 3:
questname = questname + TextHandler.getText("river");
questname = questname + "river";
keyword = "River";
break;
case 4:
questname = questname + TextHandler.getText("lake");
questname = questname + "lake";
keyword = "Lake";
break;
}
@ -42,7 +42,7 @@ namespace Assets.Scripts
public void generateCityQuest()
{
questname = TextHandler.getText("cities");
questname = "Find all cities";
keyword = "City";
current = 0;
goal = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().getCityAmount();

8
Assets/Scripts/Quests/KillQuest.cs
View File

@ -11,20 +11,20 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(20) + 1;
questname = TextHandler.getText("kill")+ " " + goal + " ";
questname = "Kill " + goal + " ";
int index = getRandomNumber(3);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("slime");
questname = questname + "slime";
keyword = "slime";
break;
case 1:
questname = questname + TextHandler.getText("bossSlime");
questname = questname + "boss slime";
keyword = "boss";
break;
case 2:
questname = questname + TextHandler.getText("minibossSlime");
questname = questname + "miniBoss slime";
keyword = "miniboss";
break;
}

2
ProjectSettings/LocalizationSettings.asset
View File

@ -18,4 +18,4 @@ MonoBehaviour:
m_AssetTable:
m_TableReference:
m_TableCollectionName: GUID:be998aea26820a30aa2217983d31b9c7
m_TrackingChanges: 1
m_TrackingChanges: 0

2
ProjectSettings/ProjectSettings.asset
View File

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 1.4.0
bundleVersion: 1.4.1
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0

4
UserSettings/EditorUserSettings.asset
View File

@ -6,10 +6,10 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-1:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

326
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- {fileID: 14}
- {fileID: 15}
m_Position:
serializedVersion: 2
x: 0
@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 74
controlID: 101154
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -47,7 +47,7 @@ MonoBehaviour:
serializedVersion: 2
x: 1920
y: 771
width: 1523
width: 1518
height: 268
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -67,22 +67,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Prefabs
- Assets/Scenes
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs
- Assets/Scenes
m_LastFoldersGridSize: -1
m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ce600000
m_LastClickedID: 24782
m_ExpandedIDs: 000000004a600000d060000000ca9a3b
scrollPos: {x: 0, y: 60}
m_SelectedIDs: bc5d0000
m_LastClickedID: 23996
m_ExpandedIDs: 000000001c5d0000b05d0000be5d000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -98,7 +98,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 0}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@ -110,7 +110,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000004a600000
m_ExpandedIDs: 000000001c5d00001e5d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -135,8 +135,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_SelectedInstanceIDs: 604f0800
m_LastClickedInstanceID: 544608
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f010000000000b25b0000005d0000
m_RenameOverlay:
@ -180,17 +180,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 4}
- {fileID: 12}
- {fileID: 13}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1524
width: 1519
height: 966
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 75
controlID: 101155
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -210,12 +210,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1524
width: 1519
height: 677
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 23
controlID: 101204
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@ -274,9 +274,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: 604f0800
m_LastClickedID: 0
m_ExpandedIDs: 1a4effff644efffffa4effffac4ffffff27fffff4080ffffbe80ffff06dcffff34fbffff74580000
m_ExpandedIDs: bed6f7ff0ce9f7ff6ae9f7ff72ecf7ff84ecf7ffe0eef7ffcafdf7ff8000f8ff6602f8ff7e03f8ffde03f8ff0e07f8ff1607f8ff5807f8ff640bf8ffb40cf8ff180df8ff3810f8ff4a10f8ffcc12f8ffb41af8ff581cf8ff9222f8ffbc38f8ff4e3bf8ff0e3cf8fff85ff8ff1872f8ff20b6f8ffc6d0f8ff74a5fbff86bafbffec09fcffc852fcff5c86fcfffe92fcff34a0fcff968efeffe28efeff30fbfffff4ffffff3e56000096560000d6560000ee56000016570000205700003e57000094570000325800005c580000725800007a580000c8580000e25800000a5900001c5900004a59000054590000de590000025a00006a5a00007e5a0000885a0000c25a0000cc5a0000f65a0000125b0000aa5b0000f45b0000285c0000305c0000385c00006a9900006a9a0000bc9a0000d09b0000e0940200da97020046980200e0c90200e4cb0200b2cc0200d8cd020022cf020026cb030062d20300e6d30300fef103003af90300befa03001e1204005a190400de1a0400ae2b0400ea3204006e3404000a530400449f0400909f04005e410500104205001843050044430500624305000044050014440500e24405008a45050094450500d2450500dc45050008460500524705005a470500fe6f05005270050076720500ec730500ee740500e275050034760500f07605000277050062770500207805006478050064790500247a05002e7a0500207b0500327b0500d4e70500a6ea0500cceb050016ed05001eed050092fa050010fb050064fd05008afe050048ff0500d4ff0500a0310600783606005e380600be3806006a390600c239060056630600da6306006866060080680600106906003a7f060052800600aae80600826207007a6b0700fa6e0700906f070076fc07006e050800ae490800
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -317,7 +317,7 @@ MonoBehaviour:
serializedVersion: 2
x: 306
y: 0
width: 1218
width: 1213
height: 677
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
@ -327,6 +327,7 @@ MonoBehaviour:
- {fileID: 9}
- {fileID: 10}
- {fileID: 11}
- {fileID: 12}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &8
@ -351,7 +352,7 @@ MonoBehaviour:
serializedVersion: 2
x: 2226
y: 94
width: 1216
width: 1211
height: 656
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -588,9 +589,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 896.22076, y: 579.88257, z: -53.203003}
m_Target: {x: 951.7466, y: 478.40512, z: -758.90234}
speed: 2
m_Value: {x: 896.22076, y: 579.88257, z: -53.203003}
m_Value: {x: 951.7466, y: 478.40512, z: -758.90234}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -637,13 +638,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.083149865, y: 0.0043540765, z: -0.00020984779, w: -0.996463}
m_Target: {x: -0.05109402, y: 0.15945746, z: -0.008060311, w: -0.9857905}
speed: 2
m_Value: {x: -0.083155215, y: 0.0043543563, z: -0.00020986127, w: -0.9965271}
m_Value: {x: -0.051096957, y: 0.15946662, z: -0.008060774, w: -0.9858471}
m_Size:
m_Target: 418.71185
m_Target: 239.48093
speed: 2
m_Value: 418.71185
m_Value: 239.48093
m_Ortho:
m_Target: 0
speed: 2
@ -690,7 +691,7 @@ MonoBehaviour:
serializedVersion: 2
x: 2226
y: 94
width: 1216
width: 1211
height: 656
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -700,7 +701,7 @@ MonoBehaviour:
m_SerializedViewNames: []
m_SerializedViewValues: []
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_ShowGizmos: 1
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1920, y: 1080}
@ -710,7 +711,7 @@ MonoBehaviour:
m_EnterPlayModeBehavior: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
m_Gizmos: 1
m_Stats: 0
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
m_ZoomArea:
@ -739,23 +740,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1216
width: 1211
height: 635
m_Scale: {x: 0.587963, y: 0.587963}
m_Translation: {x: 608, y: 317.5}
m_Translation: {x: 605.5, y: 317.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -1034.0787
x: -1029.8268
y: -540
width: 2068.1575
width: 2059.6536
height: 1080
m_MinimalGUI: 1
m_defaultScale: 0.587963
m_LastWindowPixelSize: {x: 1216, y: 656}
m_LastWindowPixelSize: {x: 1211, y: 656}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@ -781,10 +782,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 306
y: 121
width: 1217
height: 637
x: 2226
y: 94
width: 1211
height: 656
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -814,9 +815,9 @@ MonoBehaviour:
m_SearchString:
m_ActionsTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: c8e63480c8e63480c8e63480c8e63480
m_LastClickedID: -2144016696
m_ExpandedIDs: 3ecfad9feb02e1a0dd8938a4190353a9403893bde74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9b26490f5dc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd2434cf28955125f496396ab02714c14b372
m_SelectedIDs: 7f681926
m_LastClickedID: 639199359
m_ExpandedIDs: 71f36b8d3ecfad9feb02e1a0dd8938a4190353a9bb00a4a9403893bd402ec6c0a3bbefc3240ffec3f8e146d4e74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9698c8af5b26490f5ae166efdf46bf20cdc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd243b044d04d0df6274e4cf289554fd69156a712cc5d125f496396ab02714c14b37240bb7e7bab03247c
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -841,7 +842,7 @@ MonoBehaviour:
selectedIndex: 0
scroll: {x: 0, y: 0}
- itemId: 656259478
selectedIndex: 2
selectedIndex: 0
scroll: {x: 0, y: 0}
- itemId: 378383742
selectedIndex: -1
@ -878,22 +879,6 @@ MonoBehaviour:
\"type\": \"Value\",\n \"id\": \"d36a79bc-d0ab-45f9-bfe1-4461d720ced1\",\n
\"expectedControlType\": \"Stick\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": true\n
},\n {\n \"name\": \"Pause\",\n
\"type\": \"Button\",\n \"id\": \"b9559137-4f95-46a2-8cd4-e18ae6ec22f5\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Questlog\",\n
\"type\": \"Button\",\n \"id\": \"fd426738-73ab-4e62-a0ca-ef567570b87a\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Inventory\",\n
\"type\": \"Button\",\n \"id\": \"f6d61338-a53e-40b0-b736-3639958fae4c\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Charsheet\",\n
\"type\": \"Button\",\n \"id\": \"aa6739b9-2063-4bec-ae42-7a3e01708fcb\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Select\",\n
\"type\": \"Button\",\n \"id\": \"f5d4b87c-d3a2-46c3-8359-1200837b9488\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
@ -926,6 +911,22 @@ MonoBehaviour:
\"type\": \"Button\",\n \"id\": \"92be85ab-a708-4a61-8d71-19a0f4e1a3a4\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Charsheet\",\n
\"type\": \"Button\",\n \"id\": \"d3e2f9b4-83df-4229-bdab-166ea722b672\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Inventory\",\n
\"type\": \"Button\",\n \"id\": \"2a815faf-7f83-4f8e-b0c0-fb3c27e050f0\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Questlog\",\n
\"type\": \"Button\",\n \"id\": \"56496e33-3b2a-4950-8e12-0c66d769d3b9\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
},\n {\n \"name\": \"Pause\",\n
\"type\": \"Button\",\n \"id\": \"42da73ec-1cff-4563-a69e-b79d164ae159\",\n
\"expectedControlType\": \"Button\",\n \"processors\": \"\",\n
\"interactions\": \"\",\n \"initialStateCheck\": false\n
}\n ],\n \"bindings\": [\n {\n
\"name\": \"2D Vector\",\n \"id\": \"2d4968ad-f128-4410-9ca1-7c0b003b76cb\",\n
\"path\": \"2DVector\",\n \"interactions\": \"Press(behavior=1)\",\n
@ -1025,45 +1026,65 @@ MonoBehaviour:
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"SkillSix\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"fd380b9a-d40c-4281-b056-4974b072598b\",\n
\"name\": \"\",\n \"id\": \"c3215b19-e6e2-4b38-be31-cb78772547c0\",\n
\"path\": \"<Keyboard>/c\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Charsheet\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"198d5b2b-78fa-479f-8a06-ca71e1e8c914\",\n
\"path\": \"<Gamepad>/buttonNorth\",\n \"interactions\":
\"\",\n \"processors\": \"\",\n \"groups\":
\"Controller\",\n \"action\": \"Charsheet\",\n
\"KeyboardMouse\",\n \"action\": \"Charsheet\",\n
\"isComposite\": false,\n \"isPartOfComposite\": false\n
},\n {\n \"name\": \"\",\n
\"id\": \"b11e25f9-6276-46dc-8e0c-ce15699dbf8c\",\n \"path\":
\"<Keyboard>/c\",\n \"interactions\": \"\",\n
\"id\": \"99797d2f-fccb-4165-b1ee-3032683a3e21\",\n \"path\":
\"<Gamepad>/buttonNorth\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"action\": \"Charsheet\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"8afb383d-b0b6-4d14-bf8d-674fd50af456\",\n
\"name\": \"\",\n \"id\": \"41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa\",\n
\"path\": \"<Keyboard>/i\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Inventory\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"c3be3c24-9ccb-4919-a516-48ea4f5f6a1e\",\n
\"path\": \"<Gamepad>/buttonWest\",\n \"interactions\":
\"\",\n \"processors\": \"\",\n \"groups\":
\"Controller\",\n \"action\": \"Inventory\",\n
\"KeyboardMouse\",\n \"action\": \"Inventory\",\n
\"isComposite\": false,\n \"isPartOfComposite\": false\n
},\n {\n \"name\": \"\",\n
\"id\": \"e30d6070-0a93-418f-a5ef-821336b04ad4\",\n \"path\":
\"<Keyboard>/i\",\n \"interactions\": \"\",\n
\"id\": \"9ab4f699-2279-472d-a0c5-cd45c4e2fbce\",\n \"path\":
\"<Gamepad>/buttonWest\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"action\": \"Inventory\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"8d366f8e-0182-4f13-b97f-de32936a6359\",\n
\"name\": \"\",\n \"id\": \"5ecbd7b6-c10e-41d7-8338-064fac48d268\",\n
\"path\": \"<Keyboard>/q\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Questlog\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"2dfaf5e4-6477-4304-9ffd-e0ac589c279f\",\n
\"path\": \"<Gamepad>/select\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Questlog\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"783ace97-9d13-44ed-a722-6b446a33ac08\",\n
\"path\": \"<Gamepad>/select\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"action\": \"Questlog\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"20c1c45f-3ae8-467e-b851-23c81ab47cd6\",\n
\"path\": \"<Keyboard>/q\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"action\": \"Questlog\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"500c2ab8-605f-4c93-836d-03ad0c02935c\",\n
\"path\": \"<Gamepad>/start\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"name\": \"\",\n \"id\": \"6288ecc6-0303-4eb2-a008-3e572a3b9437\",\n
\"path\": \"<Keyboard>/escape\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Pause\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"37267bda-f095-4abf-b830-cd5d75b170f8\",\n
\"path\": \"<Keyboard>/escape\",\n \"interactions\": \"\",\n
\"name\": \"\",\n \"id\": \"8e61b6fe-ed27-435d-b841-64d36d25fc47\",\n
\"path\": \"<Gamepad>/start\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n
\"action\": \"Pause\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n },\n {\n
\"name\": \"\",\n \"id\": \"3810d8e5-0249-48dd-a379-3efd589b1996\",\n
\"path\": \"<Gamepad>/start\",\n \"interactions\": \"\",\n
\"processors\": \"\",\n \"groups\": \"Controller\",\n
\"action\": \"Pause\",\n \"isComposite\": false,\n
\"isPartOfComposite\": false\n }\n ]\n },\n
@ -1360,6 +1381,35 @@ MonoBehaviour:
m_ClientGUIView: {fileID: 0}
m_SearchString:
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
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: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 900, y: 600}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Localization Tables
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 2226
y: 94
width: 1214
height: 656
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -1376,17 +1426,17 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 677
width: 1524
width: 1519
height: 289
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 2}
- {fileID: 13}
- {fileID: 14}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &13
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -1408,14 +1458,94 @@ MonoBehaviour:
serializedVersion: 2
x: 1920
y: 771
width: 1523
width: 1518
height: 268
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
--- !u!114 &14
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 16}
- {fileID: 18}
m_Position:
serializedVersion: 2
x: 1519
y: 0
width: 401
height: 966
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 101226
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneControlsWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 401
height: 136
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
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: 4d0eea65a4b934e48b2b8115dcfbac57, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Localization Scene Controls
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 3439
y: 94
width: 400
height: 115
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -1430,18 +1560,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1524
y: 0
width: 396
height: 966
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 15}
x: 0
y: 136
width: 401
height: 830
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 15}
- {fileID: 19}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &15
--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@ -1461,10 +1591,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 3444
y: 94
width: 395
height: 945
x: 3439
y: 230
width: 400
height: 809
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -1477,7 +1607,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastVerticalScrollValue: 55
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:

2
audiosettings.txt
View File

@ -1,2 +0,0 @@
Music:0
Effects:0.5068976

68
save.json
View File

@ -1,6 +1,6 @@
{
"player": {
"playername": "test",
"playername": "",
"maxHealth": 110,
"maxSecondary": 10,
"secondary": 10,
@ -22,11 +22,17 @@
"difficulty": 0
},
"world": {
"cityAmount": 5,
"cityAmount": 3,
"maxCityAmount": 5,
"currentTile": "0/0/1",
"currentTile": "-2/0/5",
"map": {
"tile0": "./save/tile0.json"
"tile0": "./save/tile0.json",
"tile1": "./save/tile1.json",
"tile2": "./save/tile2.json",
"tile3": "./save/tile3.json",
"tile4": "./save/tile4.json",
"tile5": "./save/tile5.json",
"tile6": "./save/tile6.json"
}
},
"inventory": {
@ -42,7 +48,11 @@
},
"bags": {
"slot0": {
"bag1": "empty",
"bag1": {
"rarity": "COMMON",
"itemName": "Iron ore",
},
"bag2": "empty",
"bag3": "empty"
},
@ -138,17 +148,57 @@
"quest0": {
"questname": "Find all cities",
"keyword": "City",
"current": 0,
"current": 2,
"goal": 5,
"isFinished": "False",
"coordinates": "0/0"
}
},
"explore": {
"quest0": {
"questname": "Travel to 386/-209 (X/Z)",
"keyword": "",
"current": 0,
"goal": 0,
"isFinished": "False",
"coordinates": "386.2796/-208.8457"
},
"quest1": {
"questname": "Find 8 rivers",
"keyword": "River",
"questname": "Travel to -92/-245 (X/Z)",
"keyword": "",
"current": 0,
"goal": 8,
"goal": 0,
"isFinished": "False",
"coordinates": "-91.73314/-244.6622"
},
"quest2": {
"questname": "Travel to 427/61 (X/Z)",
"keyword": "",
"current": 0,
"goal": 0,
"isFinished": "False",
"coordinates": "427.9097/61.34143"
},
"quest3": {
"questname": "Travel to -335/214 (X/Z)",
"keyword": "",
"current": 0,
"goal": 0,
"isFinished": "False",
"coordinates": "-334.0099/214.4944"
}
},
"collect": {
"quest0": {
"questname": "Collect 6 rock",
"keyword": "Rock",
"current": 0,
"goal": 6,
"isFinished": "False",
"coordinates": "0/0"

9
settings.txt
View File

@ -1,6 +1,7 @@
Resolution:0
Resolution:1
Mode:0
Music:0
Effects:0
Language:en
Music:0.2077685
Effects:0.9040101
SensitivityMouse:1
SensitivityController:1
SensitivityController:2