diff --git a/Root.tscn b/Root.tscn deleted file mode 100644 index 206c2ec..0000000 --- a/Root.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=2] - -[node name="Root" type="Node2D"] diff --git a/Clopinette.tscn b/Scene/Clopinette.tscn similarity index 82% rename from Clopinette.tscn rename to Scene/Clopinette.tscn index bf8f0f6..9d75f9e 100644 --- a/Clopinette.tscn +++ b/Scene/Clopinette.tscn @@ -1,10 +1,9 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Placeholder.png" type="Texture" id=1] -[ext_resource path="res://Clopinette.gd" type="Script" id=2] +[ext_resource path="res://Scripts/Clopinette.gd" type="Script" id=2] [node name="Clopinette" type="Node2D"] -position = Vector2( 458.947, 226.316 ) script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/Scene/HUD.tscn b/Scene/HUD.tscn new file mode 100644 index 0000000..b171e8d --- /dev/null +++ b/Scene/HUD.tscn @@ -0,0 +1,3 @@ +[gd_scene format=2] + +[node name="Node2D" type="Node2D"] diff --git a/Scene/Player.tscn b/Scene/Player.tscn index 3160511..cdf9e85 100644 --- a/Scene/Player.tscn +++ b/Scene/Player.tscn @@ -1,10 +1,16 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Placeholder.png" type="Texture" id=1] [ext_resource path="res://Scripts/Player.gd" type="Script" id=2] -[node name="KinematicBody2D" type="KinematicBody2D"] +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 17.014, 16.4616 ) + +[node name="Player" type="KinematicBody2D"] script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) diff --git a/Scene/TestScene.tscn b/Scene/TestScene.tscn index 7a58de5..04ef653 100644 --- a/Scene/TestScene.tscn +++ b/Scene/TestScene.tscn @@ -1,8 +1,21 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://Scene/Clopinette.tscn" type="PackedScene" id=2] [node name="World" type="Node2D"] [node name="KinematicBody2D" parent="." instance=ExtResource( 1 )] position = Vector2( 121.087, 85.6409 ) + +[node name="Clopinette" parent="." instance=ExtResource( 2 )] +position = Vector2( 128.363, 287.853 ) + +[node name="Clopinette2" parent="." instance=ExtResource( 2 )] +position = Vector2( 419.87, 371.785 ) + +[node name="Clopinette3" parent="." instance=ExtResource( 2 )] +position = Vector2( 364.818, 208.433 ) + +[node name="Clopinette4" parent="." instance=ExtResource( 2 )] +position = Vector2( 476.728, 110.06 ) diff --git a/Clopinette.gd b/Scripts/Clopinette.gd similarity index 99% rename from Clopinette.gd rename to Scripts/Clopinette.gd index 1a022f0..4b2418b 100644 --- a/Clopinette.gd +++ b/Scripts/Clopinette.gd @@ -9,7 +9,7 @@ func _ready(): sprite = get_node("Sprite") area = get_node("Area2D") area.connect("body_entered", self, "onBodyEntered") - + func onBodyEntered(body : PhysicsBody2D): queue_free() diff --git a/project.godot b/project.godot index 9e8e1c7..6c96d20 100644 --- a/project.godot +++ b/project.godot @@ -19,38 +19,6 @@ config/name="Paint Jam 2020" run/main_scene="res://Scene/TestScene.tscn" config/icon="res://icon.png" -[display] - -window/size/width=320 -window/size/height=180 -window/size/test_width=1280 -window/size/test_height=720 -window/stretch/mode="2d" -window/stretch/aspect="keep" - -[importer_defaults] - -texture={ -"compress/bptc_ldr": 0, -"compress/hdr_mode": 0, -"compress/lossy_quality": 0.7, -"compress/mode": 0, -"compress/normal_map": 0, -"detect_3d": false, -"flags/anisotropic": false, -"flags/filter": false, -"flags/mipmaps": false, -"flags/repeat": 0, -"flags/srgb": 2, -"process/HDR_as_SRGB": false, -"process/fix_alpha_border": true, -"process/invert_color": false, -"process/premult_alpha": false, -"size_limit": 0, -"stream": false, -"svg/scale": 1.0 -} - [rendering] quality/driver/driver_name="GLES2"