diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index d952b47..3e29382 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -370,7 +370,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Einfach + m_Text: Easy --- !u!222 &22113748 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1006,7 +1006,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.55} + m_AnchorMin: {x: 0.1, y: 0.55} m_AnchorMax: {x: 0.5, y: 0.65} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -1038,7 +1038,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2314,7 +2314,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.65} + m_AnchorMin: {x: 0.1, y: 0.65} m_AnchorMax: {x: 0.5, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -2346,7 +2346,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3352,7 +3352,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Krieger + m_Text: Warrior --- !u!222 &385059081 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3566,37 +3566,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402060856} m_CullTransparentMesh: 1 ---- !u!1 &446493448 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 446493449} - m_Layer: 0 - m_Name: GameData - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &446493449 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446493448} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 959.6816, y: 0, z: 3891.7393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &447210028 GameObject: m_ObjectHideFlags: 0 @@ -7072,7 +7041,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "Klein (5 St\xE4dte)" + m_Text: K --- !u!222 &929276014 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7760,7 +7729,7 @@ RectTransform: m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.65} - m_AnchorMax: {x: 1, y: 0.75} + m_AnchorMax: {x: 0.9, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -8892,7 +8861,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.35} + m_AnchorMin: {x: 0.1, y: 0.35} m_AnchorMax: {x: 0.5, y: 0.45} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -8924,7 +8893,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -9633,7 +9602,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Deutsch + m_Text: 800x600 --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10348,7 +10317,7 @@ RectTransform: m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.35} - m_AnchorMax: {x: 1, y: 0.45} + m_AnchorMax: {x: 0.9, y: 0.45} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -10601,7 +10570,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Mensch + m_Text: Human --- !u!222 &1332405179 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11246,7 +11215,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.45} + m_AnchorMin: {x: 0.1, y: 0.45} m_AnchorMax: {x: 0.5, y: 0.55} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -11278,7 +11247,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -11364,7 +11333,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.75} + m_AnchorMin: {x: 0.1, y: 0.75} m_AnchorMax: {x: 0.5, y: 0.85} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -11396,7 +11365,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -14153,7 +14122,7 @@ RectTransform: m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.55} - m_AnchorMax: {x: 1, y: 0.65} + m_AnchorMax: {x: 0.9, y: 0.65} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -15750,7 +15719,7 @@ RectTransform: m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.75} - m_AnchorMax: {x: 1, y: 0.85} + m_AnchorMax: {x: 0.9, y: 0.85} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -16483,7 +16452,7 @@ RectTransform: m_Father: {fileID: 2093776663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.45} - m_AnchorMax: {x: 1, y: 0.55} + m_AnchorMax: {x: 0.9, y: 0.55} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -16701,7 +16670,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Fenster + m_Text: Window --- !u!222 &1955851823 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17553,7 +17522,7 @@ RectTransform: m_Father: {fileID: 1481292146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.75, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -18003,5 +17972,4 @@ SceneRoots: - {fileID: 1311414698} - {fileID: 356515707} - {fileID: 990713968} - - {fileID: 446493449} - {fileID: 1338623869} diff --git a/Assets/Scripts/ContentGenerator.cs b/Assets/Scripts/ContentGenerator.cs index dfda4f5..967dc30 100644 --- a/Assets/Scripts/ContentGenerator.cs +++ b/Assets/Scripts/ContentGenerator.cs @@ -45,11 +45,11 @@ public class ContentGenerator : MonoBehaviour public GameObject generateTileContent() { int chance = rand.Next(1, 101); - if (chance < 50) + if (chance < 25) { return null; } - else if (chance >= 50 && chance < 90) + else if (chance >= 25 && chance < 80) { if (rand.Next(0, 2) == 0) { @@ -60,11 +60,11 @@ public class ContentGenerator : MonoBehaviour return stones[rand.Next(0, stones.Length)]; } } - else if (chance >= 90 && chance < 95) + else if (chance >= 80 && chance < 90) { return generateEnemy(); } - else if (chance >= 95 && chance < 99) + else if (chance >= 90 && chance < 95) { return boss; } diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index fa81d5b..3df0116 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -157,9 +157,9 @@ namespace Assets.Scripts.Player } //Generating player instance for stat preview during creation - public void generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty) + public PlayerObject generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty) { - player = new PlayerObject(name, playerRace, playerClass, difficulty); + return new PlayerObject(name, playerRace, playerClass, difficulty); } public void move(Vector3 input) diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index f1b0d55..b3f1007 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -62,7 +62,7 @@ public class Tile : MonoBehaviour newPoint = new Vector3(rand.Next(-40, 40) + 100 * position.x, 50, rand.Next(-40, 40) + 100 * position.z); foreach (Vector3 vector in list) { - if (Vector3.Distance(vector, newPoint) < 12.5f) + if (Vector3.Distance(vector, newPoint) < 2.5f) { canSpawn = false; break; @@ -85,7 +85,7 @@ public class Tile : MonoBehaviour { int chance = rand.Next(1, 101); - if (chance >= 25) + if (chance >= 20) { GameObject content = contentGenerator.GetComponent().generateContent(tiletype); if (content != null) diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index b16fdb5..188d538 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: 3840 y: 28 width: 1920 height: 998 @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 115 + controlID: 39 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 116 + controlID: 40 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 66 + controlID: 41 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,11 +192,11 @@ MonoBehaviour: x: 0 y: 0 width: 1585 - height: 666 + height: 665 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 41 + controlID: 42 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -216,7 +216,7 @@ MonoBehaviour: x: 0 y: 0 width: 272 - height: 666 + height: 665 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 14} @@ -234,7 +234,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -242,15 +242,15 @@ MonoBehaviour: x: 272 y: 0 width: 1313 - height: 666 - m_MinSize: {x: 102, y: 126} + height: 665 + m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 15} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,9 +267,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 666 + y: 665 width: 1585 - height: 276 + height: 277 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 16} @@ -325,10 +325,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 272 - y: 91 + x: 273 + y: 24 width: 1311 - height: 660 + height: 639 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -855,9 +855,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 956.78033, y: 695.2206, z: -952.8458} + m_Target: {x: 822.4296, y: 595.892, z: -958.3059} speed: 2 - m_Value: {x: 956.78033, y: 695.2206, z: -952.8458} + m_Value: {x: 822.4296, y: 595.892, z: -958.3059} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -903,13 +903,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.07120285, y: -0.00030142665, z: 0.000060114395, w: -0.9974253} + m_Target: {x: -0.035555147, y: 0.010187352, z: -0.0003071978, w: -0.9992763} speed: 2 - m_Value: {x: -0.07120285, y: -0.00030142665, z: 0.0000601144, w: -0.9974254} + m_Value: {x: -0.035555147, y: 0.010187352, z: -0.0003071978, w: -0.9992763} m_Size: - m_Target: 49.981224 + m_Target: 141.42136 speed: 2 - m_Value: 49.981224 + m_Value: 141.42136 m_Ortho: m_Target: 0 speed: 2 @@ -967,7 +967,7 @@ MonoBehaviour: x: 0 y: 24 width: 271 - height: 640 + height: 639 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -984,7 +984,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 12fbffff + m_ExpandedIDs: 18f9ffff12fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1030,10 +1030,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 273 - y: 24 + x: 2192 + y: 91 width: 1311 - height: 640 + height: 659 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1080,7 +1080,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1134,9 +1134,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 690 + y: 689 width: 1584 - height: 250 + height: 251 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1175,10 +1175,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 46} - m_SelectedIDs: ce930000 - m_LastClickedID: 37838 - m_ExpandedIDs: 00000000f0920000f2920000f4920000f6920000f8920000 + scrollPos: {x: 0, y: 78} + m_SelectedIDs: e0930000 + m_LastClickedID: 37856 + m_ExpandedIDs: 00000000029300000493000006930000089300000a930000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f0920000f2920000f4920000f6920000f8920000 + m_ExpandedIDs: 00000000029300000493000006930000089300000a930000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1235,7 +1235,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1253,7 +1253,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1287,9 +1287,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 777 + y: 776 width: 1584 - height: 257 + height: 258 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/save.json b/save.json index 63fc7bb..23679e5 100644 --- a/save.json +++ b/save.json @@ -1,31 +1,31 @@ { "player": { -"playername": "test", +"playername": "", "maxHealth": 110, -"maxSecondary": 10, -"secondary": 10, -"health": 110, -"strength": 7, +"maxSecondary": 20, +"secondary": 26, +"health": 76, +"strength": 8, "dexterity": 5, "intelligence": 3, -"level": 0, -"experience": 0, -"maxExperience": 10, +"level": 1, +"experience": 10, +"maxExperience": 20, "race": "Human", "role": "Warrior", "points": 0, "secondaryRegen": 5, "isDodging": "False", -"killcount": 0, -"treecount": 1, -"orecount": 0, -"luck": 20, +"killcount": 2, +"treecount": 0, +"orecount": 3, +"luck": 22, "difficulty": 0 }, "world": { "cityAmount": 5, "maxCityAmount": 5, -"currentTile": "0/0/0", +"currentTile": "-1/0/0", "map": { "tile0": "./save/tile0.json", "tile1": "./save/tile1.json", @@ -35,7 +35,10 @@ "tile5": "./save/tile5.json", "tile6": "./save/tile6.json", "tile7": "./save/tile7.json", -"tile8": "./save/tile8.json" +"tile8": "./save/tile8.json", +"tile9": "./save/tile9.json", +"tile10": "./save/tile10.json", +"tile11": "./save/tile11.json" } }, "inventory": { @@ -46,35 +49,58 @@ "amulet": "empty", "feet": "empty", "chest": "empty", -"ring": "empty" +"ring": { +"rarity": "EPIC", +"place": "RING", +"itemName": "Ring of mana attribute (epic)", +"MP": 11, +"INT": 1, +"HP": 8 +} }, "bags": { "slot0": { "bag1": { "rarity": "COMMON", -"itemName": "Wood", +"itemName": "Copper ore", }, "bag2": "empty", "bag3": "empty" }, "slot1": { -"bag1": "empty", +"bag1": { +"rarity": "COMMON", +"itemName": "Rock", + +}, "bag2": "empty", "bag3": "empty" }, "slot2": { -"bag1": "empty", +"bag1": { +"rarity": "COMMON", +"itemName": "Tin ore", + +}, "bag2": "empty", "bag3": "empty" }, "slot3": { -"bag1": "empty", +"bag1": { +"rarity": "COMMON", +"itemName": "Copper ore", + +}, "bag2": "empty", "bag3": "empty" }, "slot4": { -"bag1": "empty", +"bag1": { +"rarity": "COMMON", +"itemName": "Iron ore", + +}, "bag2": "empty", "bag3": "empty" }, diff --git a/settings.txt b/settings.txt index 9aa90c4..e0b7dc6 100644 --- a/settings.txt +++ b/settings.txt @@ -3,4 +3,4 @@ Mode:0 Language:de Music:0 Effects:0 -SensitivityMouse:50.37529/69.14286 \ No newline at end of file +SensitivityMouse:77.80521/60.62223 \ No newline at end of file