Diffstat (limited to 'player/scenes/Ship.tscn')
| -rw-r--r-- | player/scenes/Ship.tscn | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/player/scenes/Ship.tscn b/player/scenes/Ship.tscn index ba2e288..f7e69ae 100644 --- a/player/scenes/Ship.tscn +++ b/player/scenes/Ship.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=35 format=2] -[ext_resource path="res://ui/scenes/MobileControls.tscn" type="PackedScene" id=1] +[ext_resource path="res://ui/scenes/mobile/MobileControls.tscn" type="PackedScene" id=1] [ext_resource path="res://sounds/thrust.wav" type="AudioStream" id=2] [ext_resource path="res://effects/Trail.tscn" type="PackedScene" id=3] [ext_resource path="res://sprites/ship.png" type="Texture" id=4] @@ -8,7 +8,7 @@ [ext_resource path="res://sounds/thrust_end.wav" type="AudioStream" id=6] [ext_resource path="res://player/scripts/ShipArea2d.gd" type="Script" id=7] [ext_resource path="res://sounds/ShipHit.wav" type="AudioStream" id=8] -[ext_resource path="res://ui/scenes/MobileJoystick.tscn" type="PackedScene" id=9] +[ext_resource path="res://ui/scenes/mobile/MobileJoystick.tscn" type="PackedScene" id=9] [ext_resource path="res://effects/Fire.tscn" type="PackedScene" id=10] [ext_resource path="res://player/scripts/Ship.gd" type="Script" id=11] [ext_resource path="res://sprites/spot.png" type="Texture" id=12] @@ -229,7 +229,7 @@ start_node = "Idle" [sub_resource type="CircleShape2D" id=39] radius = 374.065 -[node name="KinematicBody2D" type="KinematicBody2D" groups=["Player"]] +[node name="Ship" type="KinematicBody2D" groups=["Player"]] z_index = 2 z_as_relative = false collision_layer = 17 @@ -325,12 +325,11 @@ scale_amount_random = 0.2 stream = ExtResource( 8 ) volume_db = -20.0 -[node name="MobileJoystick" parent="." instance=ExtResource( 9 )] +[node name="MobileControls" type="CanvasLayer" parent="."] -[node name="MobileControls" parent="MobileJoystick" instance=ExtResource( 1 )] +[node name="MobileButtons" parent="MobileControls" instance=ExtResource( 1 )] -[node name="Change gun" parent="MobileJoystick/MobileControls" index="1"] -action = "change_gun_1" +[node name="MobileJoystick" parent="MobileControls" groups=["mobile"] instance=ExtResource( 9 )] [node name="damage" type="Area2D" parent="." groups=["Player", "player"]] @@ -385,6 +384,3 @@ position = Vector2( 5, 0 ) [connection signal="area_entered" from="damage" to="." method="_on_Ship_area_entered"] [connection signal="body_entered" from="damage" to="." method="_on_Ship_body_entered"] [connection signal="target" from="target_getter" to="." method="_on_target_getter_target"] - -[editable path="MobileJoystick"] -[editable path="MobileJoystick/MobileControls"] |