diff --git a/Game.tscn b/Game.tscn index c76b4a1..079c6da 100644 --- a/Game.tscn +++ b/Game.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cgsmfi2s51cbd"] -[ext_resource type="Script" path="res://Scripts/World.cs" id="1_xkndl"] +[ext_resource type="Script" uid="uid://br2udyi6t8yvf" path="res://Scripts/World.cs" id="1_xkndl"] [ext_resource type="Script" uid="uid://dqrdb3bvws6b6" path="res://Scripts/SteamworksHandler.cs" id="2_xkndl"] [ext_resource type="Script" uid="uid://c7khr6oist3ku" path="res://Scripts/Camera3d.cs" id="3_u44n3"] @@ -29,7 +29,7 @@ transform = Transform3D(1, 0, 0, 0, 0.89061797, 0.45475236, 0, -0.45475236, 0.89 script = ExtResource("2_xkndl") [node name="Camera3D" type="Camera3D" parent="." unique_id=161504606] -transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 30, 20, 30) +transform = Transform3D(1, 0, 0, 0, 0.25881907, 0.9659258, 0, -0.9659258, 0.25881907, 30, 20, 30) current = true script = ExtResource("3_u44n3") diff --git a/Scripts/Camera3d.cs b/Scripts/Camera3d.cs index fc99e7a..bf5968a 100644 --- a/Scripts/Camera3d.cs +++ b/Scripts/Camera3d.cs @@ -20,21 +20,20 @@ public partial class Camera3d : Camera3D _mouseDelta = Vector2.Zero; Vector3 direction = Vector3.Zero; - if (Input.IsActionPressed("move_forward")&& Position.Z > 0) direction += Transform.Basis.Z; - if (Input.IsActionPressed("move_backward")&& Position.Z < layerSize * 4) direction -= Transform.Basis.Z; + if (Input.IsActionPressed("move_forward") && Position.Z > 0) direction += Transform.Basis.Z; + if (Input.IsActionPressed("move_backward") && Position.Z < layerSize * 4) direction -= Transform.Basis.Z; if (Input.IsActionPressed("move_left") && Position.X > 0) direction -= Transform.Basis.X; if (Input.IsActionPressed("move_right") && Position.X < layerSize * 4) direction += Transform.Basis.X; if (direction != Vector3.Zero) { - direction = direction.Normalized() * (Speed + 3 * Mathf.Log(Position.Y) + 1) * d; + direction = direction.Normalized() * Speed * (Input.IsActionPressed("sprint") ? 2.5f : 1) * d; Translate(direction); } - if (Input.IsActionJustPressed("zoom_in") && Position.Y > 10) - Translate(Transform.Basis.Y * ScrollStrength); - - if (Input.IsActionJustPressed("zoom_out") && Position.Y < 50) - Translate(-Transform.Basis.Y * ScrollStrength); + if (Position.Y != 10 - visibleLayer * 4) + { + Position = new Vector3(Position.X, 10 - visibleLayer * 4, Position.Z); + } } } diff --git a/project.godot b/project.godot index 91496d7..e0b9b32 100644 --- a/project.godot +++ b/project.godot @@ -55,16 +55,6 @@ move_right={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } -zoom_in={ -"deadzone": 0.2, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null) -] -} -zoom_out={ -"deadzone": 0.2, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) -] -} layer_up={ "deadzone": 0.2, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null) @@ -75,6 +65,11 @@ layer_down={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) ] } +sprint={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} [layer_names]