From 209e41cff8ef8ede1a75ebb5d6e45f5d9716e2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C4=83zvan=20C=2E=20R=C4=83dulescu?= Date: Sun, 19 May 2019 14:07:15 +0300 Subject: [PATCH] Fix Game scene & project file --- prototypes/1.hook-movement/project.godot | 13 +++++++++---- prototypes/1.hook-movement/src/Events.tscn | 7 ------- prototypes/1.hook-movement/{ => src}/Game.gd | 0 prototypes/1.hook-movement/src/Game.tscn | 16 +++++++--------- .../{ => src}/InputContinuous.gd | 0 .../src/{Actors => }/Player/Body.gd | 0 .../src/{Actors => }/Player/CameraRig.gd | 2 +- .../{ => src/Player}/CameraRig.tscn | 4 +++- .../src/{Actors => }/Player/FloorDetector.gd | 0 .../src/{Actors => }/Player/Hook/Arrow.gd | 0 .../src/{Actors => }/Player/Hook/Arrow.tscn | 3 ++- .../src/{Actors => }/Player/Hook/Hook.gd | 0 .../src/{Actors => }/Player/Hook/Hook.tscn | 11 ++++++----- .../Player/Hook/SnapDetector/HookingHint.tscn | 0 .../Player/Hook/SnapDetector/SnapDetector.gd | 0 .../Hook/SnapDetector/SnapDetector.tscn | 5 +++-- .../{Actors => }/Player/Hook/TargetCircle.gd | 0 .../src/{Actors => }/Player/HookingPoint.gd | 0 .../src/{Actors => }/Player/LedgeDetector.gd | 0 .../{Actors => }/Player/LedgeDetector.tscn | 3 ++- .../src/{Actors => }/Player/Player.gd | 0 .../src/{Actors => }/Player/Player.tscn | 19 +++++++++---------- .../src/{Actors => }/Player/Skin.gd | 0 prototypes/1.hook-movement/src/Settings.tscn | 7 ------- .../src/{ => singletons}/ControlUtils.gd | 1 + .../src/{ => singletons}/Events.gd | 1 + .../src/{ => singletons}/Settings.gd | 0 27 files changed, 44 insertions(+), 48 deletions(-) delete mode 100644 prototypes/1.hook-movement/src/Events.tscn rename prototypes/1.hook-movement/{ => src}/Game.gd (100%) rename prototypes/1.hook-movement/{ => src}/InputContinuous.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Body.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/CameraRig.gd (92%) rename prototypes/1.hook-movement/{ => src/Player}/CameraRig.tscn (82%) rename prototypes/1.hook-movement/src/{Actors => }/Player/FloorDetector.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/Arrow.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/Arrow.tscn (90%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/Hook.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/Hook.tscn (63%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/SnapDetector/HookingHint.tscn (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/SnapDetector/SnapDetector.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/SnapDetector/SnapDetector.tscn (85%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Hook/TargetCircle.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/HookingPoint.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/LedgeDetector.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/LedgeDetector.tscn (85%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Player.gd (100%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Player.tscn (67%) rename prototypes/1.hook-movement/src/{Actors => }/Player/Skin.gd (100%) delete mode 100644 prototypes/1.hook-movement/src/Settings.tscn rename prototypes/1.hook-movement/src/{ => singletons}/ControlUtils.gd (97%) rename prototypes/1.hook-movement/src/{ => singletons}/Events.gd (99%) rename prototypes/1.hook-movement/src/{ => singletons}/Settings.gd (100%) diff --git a/prototypes/1.hook-movement/project.godot b/prototypes/1.hook-movement/project.godot index 6f52bb3..3eef89c 100644 --- a/prototypes/1.hook-movement/project.godot +++ b/prototypes/1.hook-movement/project.godot @@ -17,7 +17,7 @@ _global_script_classes=[ { "base": "Position2D", "class": "Hook", "language": "GDScript", -"path": "res://src/Actors/Player/Hook/Hook.gd" +"path": "res://src/Player/Hook/Hook.gd" }, { "base": "Area2D", "class": "HookTarget", @@ -38,9 +38,9 @@ config/icon="res://icon.png" [autoload] -Settings="*res://src/Settings.gd" -Events="*res://src/Events.gd" -ControlUtils="*res://src/ControlUtils.gd" +Settings="*res://src/singletons/Settings.gd" +Events="*res://src/singletons/Events.gd" +ControlUtils="*res://src/singletons/ControlUtils.gd" [debug] @@ -115,6 +115,11 @@ aim={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) ] } +restart={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null) + ] +} [layer_names] diff --git a/prototypes/1.hook-movement/src/Events.tscn b/prototypes/1.hook-movement/src/Events.tscn deleted file mode 100644 index 3a6658a..0000000 --- a/prototypes/1.hook-movement/src/Events.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://Events.gd" type="Script" id=1] - -[node name="Events" type="Node"] -script = ExtResource( 1 ) - diff --git a/prototypes/1.hook-movement/Game.gd b/prototypes/1.hook-movement/src/Game.gd similarity index 100% rename from prototypes/1.hook-movement/Game.gd rename to prototypes/1.hook-movement/src/Game.gd diff --git a/prototypes/1.hook-movement/src/Game.tscn b/prototypes/1.hook-movement/src/Game.tscn index 811458f..5362e05 100644 --- a/prototypes/1.hook-movement/src/Game.tscn +++ b/prototypes/1.hook-movement/src/Game.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://assets/theme/gdquest.theme" type="Theme" id=1] -[ext_resource path="res://src/UI/Title.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/UI/InfoLabel.gd" type="Script" id=3] -[ext_resource path="res://src/Actors/Player/Player.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/HookTarget.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Game.gd" type="Script" id=1] +[ext_resource path="res://assets/theme/gdquest.theme" type="Theme" id=2] +[ext_resource path="res://src/UI/Title.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/UI/InfoLabel.gd" type="Script" id=4] +[ext_resource path="res://src/Player/Player.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/HookTarget.tscn" type="PackedScene" id=6] [sub_resource type="GDScript" id=1] script/source = "extends Label @@ -39,7 +40,6 @@ script = ExtResource( 1 ) editor/display_folded = true [node name="UI" type="Control" parent="TopLayer"] -editor/display_folded = true anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 @@ -95,7 +95,7 @@ margin_bottom = 138.0 text = "Controls" script = SubResource( 2 ) -[node name="Player" parent="." instance=ExtResource( 4 )] +[node name="Player" parent="." instance=ExtResource( 5 )] position = Vector2( 2080, -80 ) collision_mask = 6 @@ -243,7 +243,6 @@ position = Vector2( 1960, 190 ) position = Vector2( 1640, -240 ) [node name="Flag" type="Node2D" parent="."] -editor/display_folded = true position = Vector2( 2216, 0 ) [node name="Line2D2" type="Line2D" parent="Flag"] @@ -263,7 +262,6 @@ begin_cap_mode = 2 end_cap_mode = 2 [node name="ZeroGravityArea" type="Area2D" parent="."] -editor/display_folded = true visible = false position = Vector2( 2720, -280 ) __meta__ = { diff --git a/prototypes/1.hook-movement/InputContinuous.gd b/prototypes/1.hook-movement/src/InputContinuous.gd similarity index 100% rename from prototypes/1.hook-movement/InputContinuous.gd rename to prototypes/1.hook-movement/src/InputContinuous.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Body.gd b/prototypes/1.hook-movement/src/Player/Body.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Body.gd rename to prototypes/1.hook-movement/src/Player/Body.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/CameraRig.gd b/prototypes/1.hook-movement/src/Player/CameraRig.gd similarity index 92% rename from prototypes/1.hook-movement/src/Actors/Player/CameraRig.gd rename to prototypes/1.hook-movement/src/Player/CameraRig.gd index 1f571a1..b648160 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/CameraRig.gd +++ b/prototypes/1.hook-movement/src/Player/CameraRig.gd @@ -21,7 +21,7 @@ func update_position(velocity:Vector2) -> void: _camera.position = distance_ratio * mouse_position.normalized() * offset Settings.GAMEPAD: - var joystick_direction: = get_aim_joystick_direction() + var joystick_direction: Vector2 = ControlUtils.get_aim_joystick_direction() if Input.is_action_pressed("move_right") or Input.is_action_pressed("move_left"): _camera.position.x = sign(velocity.x) * offset.x _camera.position.y = joystick_direction.y * offset.y diff --git a/prototypes/1.hook-movement/CameraRig.tscn b/prototypes/1.hook-movement/src/Player/CameraRig.tscn similarity index 82% rename from prototypes/1.hook-movement/CameraRig.tscn rename to prototypes/1.hook-movement/src/Player/CameraRig.tscn index 67533e9..7758e87 100644 --- a/prototypes/1.hook-movement/CameraRig.tscn +++ b/prototypes/1.hook-movement/src/Player/CameraRig.tscn @@ -1,6 +1,8 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://CameraRig.gd" type="Script" id=1] +[ext_resource path="res://src/Player/CameraRig.gd" type="Script" id=1] + + [node name="CameraRig" type="Position2D"] position = Vector2( 0, -30 ) diff --git a/prototypes/1.hook-movement/src/Actors/Player/FloorDetector.gd b/prototypes/1.hook-movement/src/Player/FloorDetector.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/FloorDetector.gd rename to prototypes/1.hook-movement/src/Player/FloorDetector.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/Arrow.gd b/prototypes/1.hook-movement/src/Player/Hook/Arrow.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/Arrow.gd rename to prototypes/1.hook-movement/src/Player/Hook/Arrow.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/Arrow.tscn b/prototypes/1.hook-movement/src/Player/Hook/Arrow.tscn similarity index 90% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/Arrow.tscn rename to prototypes/1.hook-movement/src/Player/Hook/Arrow.tscn index ab8e229..611ac5b 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/Hook/Arrow.tscn +++ b/prototypes/1.hook-movement/src/Player/Hook/Arrow.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/Actors/Player/Hook/Arrow.gd" type="Script" id=1] +[ext_resource path="res://src/Player/Hook/Arrow.gd" type="Script" id=1] + diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/Hook.gd b/prototypes/1.hook-movement/src/Player/Hook/Hook.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/Hook.gd rename to prototypes/1.hook-movement/src/Player/Hook/Hook.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/Hook.tscn b/prototypes/1.hook-movement/src/Player/Hook/Hook.tscn similarity index 63% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/Hook.tscn rename to prototypes/1.hook-movement/src/Player/Hook/Hook.tscn index e1b9130..13a843a 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/Hook/Hook.tscn +++ b/prototypes/1.hook-movement/src/Player/Hook/Hook.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://src/Actors/Player/Hook/Hook.gd" type="Script" id=1] -[ext_resource path="res://src/Actors/Player/Hook/TargetCircle.gd" type="Script" id=2] -[ext_resource path="res://src/Actors/Player/Hook/Arrow.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/Actors/Player/HookingPoint.gd" type="Script" id=4] -[ext_resource path="res://src/Actors/Player/Hook/SnapDetector/SnapDetector.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Player/Hook/Hook.gd" type="Script" id=1] +[ext_resource path="res://src/Player/Hook/TargetCircle.gd" type="Script" id=2] +[ext_resource path="res://src/Player/Hook/Arrow.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Player/HookingPoint.gd" type="Script" id=4] +[ext_resource path="res://src/Player/Hook/SnapDetector/SnapDetector.tscn" type="PackedScene" id=5] + [node name="Hook" type="Position2D"] script = ExtResource( 1 ) diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/HookingHint.tscn b/prototypes/1.hook-movement/src/Player/Hook/SnapDetector/HookingHint.tscn similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/HookingHint.tscn rename to prototypes/1.hook-movement/src/Player/Hook/SnapDetector/HookingHint.tscn diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/SnapDetector.gd b/prototypes/1.hook-movement/src/Player/Hook/SnapDetector/SnapDetector.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/SnapDetector.gd rename to prototypes/1.hook-movement/src/Player/Hook/SnapDetector/SnapDetector.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/SnapDetector.tscn b/prototypes/1.hook-movement/src/Player/Hook/SnapDetector/SnapDetector.tscn similarity index 85% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/SnapDetector.tscn rename to prototypes/1.hook-movement/src/Player/Hook/SnapDetector/SnapDetector.tscn index 727a87b..6616020 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/Hook/SnapDetector/SnapDetector.tscn +++ b/prototypes/1.hook-movement/src/Player/Hook/SnapDetector/SnapDetector.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://src/Actors/Player/Hook/SnapDetector/SnapDetector.gd" type="Script" id=1] -[ext_resource path="res://src/Actors/Player/Hook/SnapDetector/HookingHint.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/Player/Hook/SnapDetector/SnapDetector.gd" type="Script" id=1] +[ext_resource path="res://src/Player/Hook/SnapDetector/HookingHint.tscn" type="PackedScene" id=2] + [sub_resource type="CapsuleShape2D" id=1] radius = 90.0002 diff --git a/prototypes/1.hook-movement/src/Actors/Player/Hook/TargetCircle.gd b/prototypes/1.hook-movement/src/Player/Hook/TargetCircle.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Hook/TargetCircle.gd rename to prototypes/1.hook-movement/src/Player/Hook/TargetCircle.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/HookingPoint.gd b/prototypes/1.hook-movement/src/Player/HookingPoint.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/HookingPoint.gd rename to prototypes/1.hook-movement/src/Player/HookingPoint.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/LedgeDetector.gd b/prototypes/1.hook-movement/src/Player/LedgeDetector.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/LedgeDetector.gd rename to prototypes/1.hook-movement/src/Player/LedgeDetector.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/LedgeDetector.tscn b/prototypes/1.hook-movement/src/Player/LedgeDetector.tscn similarity index 85% rename from prototypes/1.hook-movement/src/Actors/Player/LedgeDetector.tscn rename to prototypes/1.hook-movement/src/Player/LedgeDetector.tscn index aff41cd..ecf32b9 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/LedgeDetector.tscn +++ b/prototypes/1.hook-movement/src/Player/LedgeDetector.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/Actors/Player/LedgeDetector.gd" type="Script" id=1] +[ext_resource path="res://src/Player/LedgeDetector.gd" type="Script" id=1] + [node name="LedgeDetector" type="Position2D"] diff --git a/prototypes/1.hook-movement/src/Actors/Player/Player.gd b/prototypes/1.hook-movement/src/Player/Player.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Player.gd rename to prototypes/1.hook-movement/src/Player/Player.gd diff --git a/prototypes/1.hook-movement/src/Actors/Player/Player.tscn b/prototypes/1.hook-movement/src/Player/Player.tscn similarity index 67% rename from prototypes/1.hook-movement/src/Actors/Player/Player.tscn rename to prototypes/1.hook-movement/src/Player/Player.tscn index 9d95f8c..37c37cc 100644 --- a/prototypes/1.hook-movement/src/Actors/Player/Player.tscn +++ b/prototypes/1.hook-movement/src/Player/Player.tscn @@ -1,17 +1,18 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://src/Actors/Player/Player.gd" type="Script" id=1] -[ext_resource path="res://src/Actors/Player/Hook/Hook.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/Actors/Player/LedgeDetector.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/Actors/Player/FloorDetector.gd" type="Script" id=4] -[ext_resource path="res://src/Actors/Player/Skin.gd" type="Script" id=5] -[ext_resource path="res://src/Actors/Player/Body.gd" type="Script" id=6] -[ext_resource path="res://src/Actors/Player/CameraRig.gd" type="Script" id=7] +[ext_resource path="res://src/Player/Player.gd" type="Script" id=1] +[ext_resource path="res://src/Player/Hook/Hook.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/Player/LedgeDetector.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Player/FloorDetector.gd" type="Script" id=4] +[ext_resource path="res://src/Player/Skin.gd" type="Script" id=5] +[ext_resource path="res://src/Player/Body.gd" type="Script" id=6] +[ext_resource path="res://src/Player/CameraRig.gd" type="Script" id=7] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 30, 30 ) -[node name="Character" type="KinematicBody2D"] +[node name="Player" type="KinematicBody2D"] script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] @@ -22,8 +23,6 @@ shape = SubResource( 1 ) position = Vector2( 0, -30 ) [node name="LedgeDetector" parent="." instance=ExtResource( 3 )] -active = true -ray_length = 30.0 [node name="FloorDetector" type="RayCast2D" parent="."] position = Vector2( 0, -30 ) diff --git a/prototypes/1.hook-movement/src/Actors/Player/Skin.gd b/prototypes/1.hook-movement/src/Player/Skin.gd similarity index 100% rename from prototypes/1.hook-movement/src/Actors/Player/Skin.gd rename to prototypes/1.hook-movement/src/Player/Skin.gd diff --git a/prototypes/1.hook-movement/src/Settings.tscn b/prototypes/1.hook-movement/src/Settings.tscn deleted file mode 100644 index a79fc8d..0000000 --- a/prototypes/1.hook-movement/src/Settings.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://Settings.gd" type="Script" id=1] - -[node name="Settings" type="Node"] -script = ExtResource( 1 ) - diff --git a/prototypes/1.hook-movement/src/ControlUtils.gd b/prototypes/1.hook-movement/src/singletons/ControlUtils.gd similarity index 97% rename from prototypes/1.hook-movement/src/ControlUtils.gd rename to prototypes/1.hook-movement/src/singletons/ControlUtils.gd index 1694aaa..472765c 100644 --- a/prototypes/1.hook-movement/src/ControlUtils.gd +++ b/prototypes/1.hook-movement/src/singletons/ControlUtils.gd @@ -1,3 +1,4 @@ +extends Node """Global utility methods to extend what's available from the Input singleton""" diff --git a/prototypes/1.hook-movement/src/Events.gd b/prototypes/1.hook-movement/src/singletons/Events.gd similarity index 99% rename from prototypes/1.hook-movement/src/Events.gd rename to prototypes/1.hook-movement/src/singletons/Events.gd index 4cc5caa..3112602 100644 --- a/prototypes/1.hook-movement/src/Events.gd +++ b/prototypes/1.hook-movement/src/singletons/Events.gd @@ -1,5 +1,6 @@ extends Node + signal player_info_updated(dict) signal player_state_changed(state_name) diff --git a/prototypes/1.hook-movement/src/Settings.gd b/prototypes/1.hook-movement/src/singletons/Settings.gd similarity index 100% rename from prototypes/1.hook-movement/src/Settings.gd rename to prototypes/1.hook-movement/src/singletons/Settings.gd