diff --git a/src/scenes/Acid.gd b/src/scenes/Acid.gd deleted file mode 100644 index 072a07f56e95325909388a0b851777d10f6a45d5..0000000000000000000000000000000000000000 --- a/src/scenes/Acid.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends KinematicBody2D - - - -func _on_Area2D_body_entered(body): - if body.get("TYPE") == "player": - get_tree().reload_current_scene() - diff --git a/src/scenes/Acid.tscn b/src/scenes/Acid.tscn index d14044a1dc008c8927ce10e780d3752e20e42919..b2d43706e7264e9cc26268f58a716638e892030b 100644 --- a/src/scenes/Acid.tscn +++ b/src/scenes/Acid.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (1).png" type="Texture" id=1] -[ext_resource path="res://src/scenes/Acid.gd" type="Script" id=2] +[ext_resource path="res://src/scripts/Acid.gd" type="Script" id=2] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 0, 0 ) diff --git a/src/scenes/Door.tscn b/src/scenes/Door.tscn index 6582d6b6d40b05c1536e8afa5cbf37bcefa41a21..5d29526f1bc521f8ea4349d40b4d68f58e71a962 100644 --- a/src/scenes/Door.tscn +++ b/src/scenes/Door.tscn @@ -23,7 +23,7 @@ func _physics_process(delta): emit_signal(\"enter_door\") " -[sub_resource type="RectangleShape2D" id=2] +[sub_resource type="RectangleShape2D" id=32] extents = Vector2( 22.71, 7.42306 ) [node name="Door" type="Node2D"] @@ -38,4 +38,4 @@ position = Vector2( 0, -48 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2( 0, 35 ) -shape = SubResource( 2 ) +shape = SubResource( 32 ) diff --git a/src/scenes/Menu.gd b/src/scenes/Menu.gd deleted file mode 100644 index 90355036fd41c8ee8dd1db19a49d57a5023f6011..0000000000000000000000000000000000000000 --- a/src/scenes/Menu.gd +++ /dev/null @@ -1,35 +0,0 @@ -extends Control - - -func _ready(): - pass # Replace with function body. - - -func _on_Start_pressed(): - $buttonSound.play() - yield($buttonSound, "finished") - get_tree().change_scene("res://src/scenes/Game.tscn") - - - - -func _on_Einstellungen_pressed(): - $buttonSound.play() - yield($buttonSound, "finished") - get_tree().change_scene("res://src/scenes/Settings.tscn") - - - -func _on_ENDE_pressed(): - $buttonSound.play() - yield($buttonSound, "finished") - get_tree().quit() - - - - - - - -func _on_buttonSound_finished(): - pass # Replace with function body. diff --git a/src/scenes/Menu.tscn b/src/scenes/Menu.tscn index 6aca5fcb7019c73b803a281347107e19ad4b0850..61a2f58663edb3915941bef521aace2c73b0a5e8 100644 --- a/src/scenes/Menu.tscn +++ b/src/scenes/Menu.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/assets/menu_assets/ButtonTextur.png" type="Texture" id=3] [ext_resource path="res://src/assets/menu_assets/Geist SpriteSheet.png" type="Texture" id=4] [ext_resource path="res://src/assets/menu_assets/ButtonTexturHover.png" type="Texture" id=5] -[ext_resource path="res://src/scenes/Menu.gd" type="Script" id=6] +[ext_resource path="res://src/scripts/Menu.gd" type="Script" id=6] [ext_resource path="res://src/assets/sounds/click1.wav" type="AudioStream" id=7] [sub_resource type="DynamicFont" id=1] @@ -180,7 +180,7 @@ __meta__ = { position = Vector2( 1080, 248 ) scale = Vector2( 2.81113, 2.65621 ) frames = SubResource( 18 ) -frame = 1 +frame = 2 speed_scale = 0.8 playing = true diff --git a/src/scenes/PauseController.gd b/src/scenes/PauseController.gd deleted file mode 100644 index 89d150c15c6a7dd4f0817d6e42b67f5e0b3f700c..0000000000000000000000000000000000000000 --- a/src/scenes/PauseController.gd +++ /dev/null @@ -1,43 +0,0 @@ -extends Node - -export(bool) var can_toggle_pause: bool = true - - -func _ready(): - print("loaded pause controller") - - -func _process(delta): - if Input.is_action_just_pressed("menu_pause"): - print("action pause") - if !get_tree().paused: - $CanvasLayer/PauseBackground.visible = true - $CanvasLayer2/pauseText.visible = true - - pause() - else: - $CanvasLayer/PauseBackground.visible = false - $CanvasLayer2/pauseText.visible = false - - resume() - - -func pause(): - if can_toggle_pause: - get_tree().set_deferred("paused", true) - - - -func resume(): - if can_toggle_pause: - get_tree().set_deferred("paused", false) - - - - - - - - - - diff --git a/src/scenes/PauseController.tscn b/src/scenes/PauseController.tscn index 6f97a617acdc39a4e227227cad8a1f5120657c4a..31d7a86db7d427b6791f977a401a10fc96f0d5e1 100644 --- a/src/scenes/PauseController.tscn +++ b/src/scenes/PauseController.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/scenes/PauseController.gd" type="Script" id=1] +[ext_resource path="res://src/scripts/PauseController.gd" type="Script" id=1] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=2] + [sub_resource type="DynamicFont" id=1] font_data = ExtResource( 2 ) diff --git a/src/scenes/Platforms/Bodenlol.tscn b/src/scenes/Platforms/Bodenlol.tscn new file mode 100644 index 0000000000000000000000000000000000000000..2bda83e493e52f1818eaf0c8705ea592e1d539c4 --- /dev/null +++ b/src/scenes/Platforms/Bodenlol.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=2 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 2328, 16 ) + +[node name="Node2D" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) diff --git a/src/scenes/Platforms/Box.tscn b/src/scenes/Platforms/Box.tscn new file mode 100644 index 0000000000000000000000000000000000000000..9583f9d9ff6fe8057fb0c2c3bb53d5a61e650894 --- /dev/null +++ b/src/scenes/Platforms/Box.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=4 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 80, 8 ) + +[sub_resource type="Curve2D" id=2] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1088, 0, 0, 0, 0, 0, 1088, 192 ) +} + +[sub_resource type="Animation" id=3] +resource_name = "Box" +length = 20.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 10 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 1.0, 0.99 ] +} + +[node name="Box" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) + +[node name="Path2D" type="Path2D" parent="."] +curve = SubResource( 2 ) + +[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] + +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] +remote_path = NodePath("../../../KinematicBody2D") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Box" +playback_process_mode = 0 +anims/Box = SubResource( 3 ) diff --git a/src/scenes/Platforms/Box1.tscn b/src/scenes/Platforms/Box1.tscn new file mode 100644 index 0000000000000000000000000000000000000000..5176943ca2aa2f82375932976f2d6150ac1d9983 --- /dev/null +++ b/src/scenes/Platforms/Box1.tscn @@ -0,0 +1,82 @@ +[gd_scene load_steps=6 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 80, 8 ) + +[sub_resource type="Curve2D" id=2] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, 256, 0, 0, 0, 0, 8, 256 ) +} + +[sub_resource type="Animation" id=3] +resource_name = "Neue Animation1" +length = 80.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 40 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=4] +resource_name = "Neue Animation2" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.99 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=5] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 1.0 ] +} + +[node name="PlatformFunctional" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) + +[node name="Path2D" type="Path2D" parent="."] +curve = SubResource( 2 ) + +[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] +rotate = false + +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] +remote_path = NodePath("../../../KinematicBody2D") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Neue Animation1" +playback_process_mode = 0 +"anims/Neue Animation1" = SubResource( 3 ) +"anims/Neue Animation2" = SubResource( 4 ) +anims/RESET = SubResource( 5 ) diff --git a/src/scenes/Platforms/Box2.tscn b/src/scenes/Platforms/Box2.tscn new file mode 100644 index 0000000000000000000000000000000000000000..966131c45b22c387de24d88c956d32b68180e1a2 --- /dev/null +++ b/src/scenes/Platforms/Box2.tscn @@ -0,0 +1,82 @@ +[gd_scene load_steps=6 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8, 64 ) + +[sub_resource type="Curve2D" id=2] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, 384, 0, 0, 0, 0, 0, 384 ) +} + +[sub_resource type="Animation" id=3] +resource_name = "Neue Animation1" +length = 80.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 40 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=4] +resource_name = "Neue Animation2" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.99 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=5] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 1.0 ] +} + +[node name="PlatformFunctional" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) + +[node name="Path2D" type="Path2D" parent="."] +curve = SubResource( 2 ) + +[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] +rotate = false + +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] +remote_path = NodePath("../../../KinematicBody2D") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Neue Animation1" +playback_process_mode = 0 +"anims/Neue Animation1" = SubResource( 3 ) +"anims/Neue Animation2" = SubResource( 4 ) +anims/RESET = SubResource( 5 ) diff --git a/src/scenes/Platforms/Box3.tscn b/src/scenes/Platforms/Box3.tscn new file mode 100644 index 0000000000000000000000000000000000000000..403c26faae74f8cae81150bb7d268271b7d58907 --- /dev/null +++ b/src/scenes/Platforms/Box3.tscn @@ -0,0 +1,82 @@ +[gd_scene load_steps=6 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8, 64 ) + +[sub_resource type="Curve2D" id=2] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4040, 0, 0, 0, 0, 0, 4040, -384, 0, 0, 0, 0, 8, -384 ) +} + +[sub_resource type="Animation" id=3] +resource_name = "Neue Animation1" +length = 80.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 40 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=4] +resource_name = "Neue Animation2" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.99 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=5] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 1.0 ] +} + +[node name="PlatformFunctional" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) + +[node name="Path2D" type="Path2D" parent="."] +curve = SubResource( 2 ) + +[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] +rotate = false + +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] +remote_path = NodePath("../../../KinematicBody2D") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Neue Animation1" +playback_process_mode = 0 +"anims/Neue Animation1" = SubResource( 3 ) +"anims/Neue Animation2" = SubResource( 4 ) +anims/RESET = SubResource( 5 ) diff --git a/src/scenes/Platforms/Box4.tscn b/src/scenes/Platforms/Box4.tscn new file mode 100644 index 0000000000000000000000000000000000000000..678775211309d8ae3e283ec613196cddb0181125 --- /dev/null +++ b/src/scenes/Platforms/Box4.tscn @@ -0,0 +1,82 @@ +[gd_scene load_steps=6 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 80, 8 ) + +[sub_resource type="Curve2D" id=2] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, -320, 0, 0, 0, 0, 0, -320 ) +} + +[sub_resource type="Animation" id=3] +resource_name = "Neue Animation1" +length = 80.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 40 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=4] +resource_name = "Neue Animation2" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.99 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + +[sub_resource type="Animation" id=5] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 1.0 ] +} + +[node name="PlatformFunctional" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) + +[node name="Path2D" type="Path2D" parent="."] +curve = SubResource( 2 ) + +[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] +rotate = false + +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] +remote_path = NodePath("../../../KinematicBody2D") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Neue Animation1" +playback_process_mode = 0 +"anims/Neue Animation1" = SubResource( 3 ) +"anims/Neue Animation2" = SubResource( 4 ) +anims/RESET = SubResource( 5 ) diff --git a/src/scenes/Platforms/PFHFast.tscn b/src/scenes/Platforms/PFHFast.tscn index 1ef085247b9cdd0ba8ba1f8d1ea987c9f1aea29c..f447bf7abe19559019eb1e8bba6d8611c7715d91 100644 --- a/src/scenes/Platforms/PFHFast.tscn +++ b/src/scenes/Platforms/PFHFast.tscn @@ -10,7 +10,7 @@ _data = { "points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, 0 ) } -[sub_resource type="Animation" id=7] +[sub_resource type="Animation" id=3] resource_name = "Level4" length = 2.0 loop = true @@ -27,8 +27,7 @@ tracks/0/keys = { "values": [ 0.0, 0.99 ] } -[sub_resource type="Animation" id=3] -resource_name = "Neue Animation1" +[sub_resource type="Animation" id=4] length = 2.0 loop = true tracks/0/type = "value" @@ -44,8 +43,7 @@ tracks/0/keys = { "values": [ 0.0 ] } -[sub_resource type="Animation" id=4] -resource_name = "Neue Animation2" +[sub_resource type="Animation" id=5] length = 2.0 loop = true tracks/0/type = "value" @@ -66,7 +64,7 @@ resource_name = "PFHFast" length = 2.0 loop = true -[sub_resource type="Animation" id=5] +[sub_resource type="Animation" id=7] length = 0.001 tracks/0/type = "value" tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset") @@ -84,7 +82,6 @@ tracks/0/keys = { [node name="PlatformFunctional" type="Node2D"] [node name="KinematicBody2D" type="KinematicBody2D" parent="."] -position = Vector2( 200.432, 0 ) motion/sync_to_physics = true [node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] @@ -99,8 +96,6 @@ region_rect = Rect2( 801, 610, 160, 17 ) curve = SubResource( 2 ) [node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] -position = Vector2( 200.432, 0 ) -offset = 200.254 rotate = false [node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"] @@ -108,10 +103,9 @@ remote_path = NodePath("../../../KinematicBody2D") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "Level4" -reset_on_save = false playback_process_mode = 0 -anims/Level4 = SubResource( 7 ) -"anims/Neue Animation1" = SubResource( 3 ) -"anims/Neue Animation2" = SubResource( 4 ) +anims/Level4 = SubResource( 3 ) +"anims/Neue Animation1" = SubResource( 4 ) +"anims/Neue Animation2" = SubResource( 5 ) anims/PFHFast = SubResource( 6 ) -anims/RESET = SubResource( 5 ) +anims/RESET = SubResource( 7 ) diff --git a/src/scenes/Platforms/PFHSlow.tscn b/src/scenes/Platforms/PFHSlow.tscn index 41fb4546232409ad04e438855f2370715e6a66af..ba84ac211e1b9f7bb1309f20d635bf3755034f94 100644 --- a/src/scenes/Platforms/PFHSlow.tscn +++ b/src/scenes/Platforms/PFHSlow.tscn @@ -83,7 +83,6 @@ remote_path = NodePath("../../../KinematicBody2D") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "Neue Animation1" -reset_on_save = false playback_process_mode = 0 "anims/Neue Animation1" = SubResource( 3 ) "anims/Neue Animation2" = SubResource( 4 ) diff --git a/src/scenes/Platforms/Wandlol.tscn b/src/scenes/Platforms/Wandlol.tscn new file mode 100644 index 0000000000000000000000000000000000000000..58633669424c559144edc59d045c4f6e212ed4fe --- /dev/null +++ b/src/scenes/Platforms/Wandlol.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=2 format=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8, 208 ) + +[node name="Node2D" type="Node2D"] + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +motion/sync_to_physics = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] +shape = SubResource( 1 ) diff --git a/src/scenes/Saw.gd b/src/scenes/Saw.gd deleted file mode 100644 index 60e4276925d9a0b0055554381b755c635f6aa960..0000000000000000000000000000000000000000 --- a/src/scenes/Saw.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends KinematicBody2D - - -func _on_Area2D_body_entered(body): - if body.is_in_group("player"): - body.take_damage(2) diff --git a/src/scenes/Saw.tscn b/src/scenes/Saw.tscn index ccd40e50b3dbe1427ef2a33291c5da3c8fe2f0d1..1b61ea69d63d2f07000909b496077bd2b33f8906 100644 --- a/src/scenes/Saw.tscn +++ b/src/scenes/Saw.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=1] -[ext_resource path="res://src/scenes/Saw.gd" type="Script" id=2] -[ext_resource path="res://src/scenes/SawRotation.gd" type="Script" id=3] +[ext_resource path="res://src/scripts/Saw.gd" type="Script" id=2] +[ext_resource path="res://src/scripts/SawRotation.gd" type="Script" id=3] + [sub_resource type="CircleShape2D" id=1] radius = 0.0 diff --git a/src/scenes/SawMove.tscn b/src/scenes/SawMove.tscn index edb7cf10e05ce4e24407919fa9dbb5219bf700c4..2789db25f4ecc3dad3521b52cfb4a3d8430f5c13 100644 --- a/src/scenes/SawMove.tscn +++ b/src/scenes/SawMove.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://src/scenes/SawRotationMove.gd" type="Script" id=1] +[ext_resource path="res://src/scripts/SawRotationMove.gd" type="Script" id=1] [ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=3] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 0, 2 ) diff --git a/src/scenes/SawMoveLR.tscn b/src/scenes/SawMoveLR.tscn index 718796a48deb57124391c1fef2aceda5c985b96c..4e2bf74a92b528cf19d87d1a2a07d71e8d308b44 100644 --- a/src/scenes/SawMoveLR.tscn +++ b/src/scenes/SawMoveLR.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://src/scenes/SawMoveDamage.gd" type="Script" id=1] +[ext_resource path="res://src/scripts/SawMoveDamage.gd" type="Script" id=1] [ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=3] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 0, 2 ) diff --git a/src/scenes/SawRotation.gd b/src/scenes/SawRotation.gd deleted file mode 100644 index 24f0fa54d9f1d17445f3c019c0e6387c96eedaec..0000000000000000000000000000000000000000 --- a/src/scenes/SawRotation.gd +++ /dev/null @@ -1,7 +0,0 @@ -extends Sprite - - - -func _process(delta): - rotation +=5*delta - pass diff --git a/src/scenes/Settings.gd b/src/scenes/Settings.gd deleted file mode 100644 index c085b4ffd517c81b2f1b4ea0100dc195d7755b0d..0000000000000000000000000000000000000000 --- a/src/scenes/Settings.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Control - -func _ready(): - pass - -func _input(event): - if event.is_action_pressed("quit"): - $buttonSound.play() - yield($buttonSound, "finished") - get_tree().change_scene("res://src/scenes/Menu.tscn") diff --git a/src/scenes/Settings.tscn b/src/scenes/Settings.tscn index d40d78403c9294d2dbae93acc12aac24e513e520..2f62cd79631f284dbcf5ea3d7c4f9b4a3c4ceb68 100644 --- a/src/scenes/Settings.tscn +++ b/src/scenes/Settings.tscn @@ -7,9 +7,10 @@ [ext_resource path="res://src/assets/menu_assets/kb_w.png" type="Texture" id=5] [ext_resource path="res://src/assets/menu_assets/kb_a.png" type="Texture" id=6] [ext_resource path="res://src/assets/menu_assets/kb_d.png" type="Texture" id=7] -[ext_resource path="res://src/scenes/Settings.gd" type="Script" id=8] +[ext_resource path="res://src/scripts/Settings.gd" type="Script" id=8] [ext_resource path="res://src/assets/sounds/click1.wav" type="AudioStream" id=9] + [sub_resource type="DynamicFont" id=1] size = 50 outline_size = 9 diff --git a/src/scenes/Sprite.gd b/src/scenes/Sprite.gd deleted file mode 100644 index f0d6cbb63cd09f303ba13d35d8047e1734300e7d..0000000000000000000000000000000000000000 --- a/src/scenes/Sprite.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Sprite - - -func _process(delta): - rotation +=5*delta - pass diff --git a/src/scenes/levels/Level0.tscn b/src/scenes/levels/Level0.tscn index cc5d86b2981d19f861fc9a3fddcb463f591aa497..5c556a34186e664eca74512bfe6dc5b27946d045 100644 --- a/src/scenes/levels/Level0.tscn +++ b/src/scenes/levels/Level0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=46 format=2] +[gd_scene load_steps=55 format=2] [ext_resource path="res://src/assets/backGround/SpaceBackGroundParallax.jpg" type="Texture" id=1] [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=2] @@ -9,11 +9,19 @@ [ext_resource path="res://src/scenes/shards.tscn" type="PackedScene" id=7] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=8] [ext_resource path="res://src/assets/colleticbles/coin/gold_1.png" type="Texture" id=9] -[ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=10] +[ext_resource path="res://src/scripts/Score.gd" type="Script" id=10] [ext_resource path="res://src/actors/enemy/wizard.tscn" type="PackedScene" id=11] [ext_resource path="res://src/actors/enemy/Skeleton.tscn" type="PackedScene" id=12] [ext_resource path="res://src/actors/enemy/ghost.tscn" type="PackedScene" id=13] [ext_resource path="res://src/actors/enemy/enemy_knight.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/scenes/Platforms/Box1.tscn" type="PackedScene" id=15] +[ext_resource path="res://src/scenes/Platforms/Box2.tscn" type="PackedScene" id=16] +[ext_resource path="res://src/scenes/Platforms/Box3.tscn" type="PackedScene" id=17] +[ext_resource path="res://src/scenes/Platforms/Box4.tscn" type="PackedScene" id=18] +[ext_resource path="res://src/scenes/Platforms/Bodenlol.tscn" type="PackedScene" id=19] +[ext_resource path="res://src/scenes/Platforms/Wandlol.tscn" type="PackedScene" id=20] +[ext_resource path="res://src/scripts/DoorExit.gd" type="Script" id=21] +[ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorOpenResized.png" type="Texture" id=22] [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) @@ -347,6 +355,9 @@ func _physics_process(delta): " +[sub_resource type="RectangleShape2D" id=32] +extents = Vector2( 22.71, 7.42306 ) + [sub_resource type="ConvexPolygonShape2D" id=14] points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) @@ -788,16 +799,32 @@ tile_data = PoolIntArray( 524369, 1, 0, 524370, 1, 0, 524371, 1, 0, 524372, 1, 0 [node name="Objects" type="Node2D" parent="Level0"] +[node name="PlatformFunctional" parent="Level0/Objects" instance=ExtResource( 16 )] +position = Vector2( 458.805, 416.494 ) + +[node name="PlatformFunctional2" parent="Level0/Objects" instance=ExtResource( 17 )] +position = Vector2( 316.589, 417.178 ) + [node name="Door0" parent="Level0/Objects" instance=ExtResource( 5 )] position = Vector2( 384, 480 ) script = SubResource( 13 ) level_number = 4 door_name = "Door0" -[node name="DoorExit" parent="Level0/Objects" instance=ExtResource( 5 )] +[node name="DoorExit" type="Node2D" parent="Level0/Objects"] position = Vector2( 4353, 480 ) -level_number = 4 -door_name = "DoorExit" +script = ExtResource( 21 ) + +[node name="Sprite" type="Sprite" parent="Level0/Objects/DoorExit"] +position = Vector2( 0, -48 ) +texture = ExtResource( 22 ) + +[node name="Area2D" type="Area2D" parent="Level0/Objects/DoorExit"] +position = Vector2( 0, -48 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Level0/Objects/DoorExit/Area2D"] +position = Vector2( 0, 35 ) +shape = SubResource( 32 ) [node name="shards" parent="Level0/Objects" instance=ExtResource( 7 )] position = Vector2( 1189.47, -422.58 ) @@ -807,6 +834,12 @@ position = Vector2( 1189.47, -422.58 ) [node name="coin" parent="Level0/Objects/Coins" instance=ExtResource( 6 )] position = Vector2( 857, -410.017 ) +[node name="PlatformFunctional3" parent="Level0/Objects" instance=ExtResource( 18 )] +position = Vector2( 388.206, 344.908 ) + +[node name="Node2D" parent="Level0/Objects" instance=ExtResource( 19 )] +position = Vector2( 2212.28, 523.169 ) + [node name="Enemies" type="Node2D" parent="Level0"] [node name="wizard" parent="Level0/Enemies" instance=ExtResource( 11 )] @@ -872,4 +905,13 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="PlatformFunctional" parent="." instance=ExtResource( 15 )] +position = Vector2( 387.174, 488.561 ) + +[node name="Node2D" parent="." instance=ExtResource( 20 )] +position = Vector2( 4537.26, 323.665 ) + +[node name="Node2D2" parent="." instance=ExtResource( 20 )] +position = Vector2( -110.718, 320.836 ) + [connection signal="coin_collected" from="Level0/Objects/Coins/coin" to="Level0/Score" method="_on_coin_collected"] diff --git a/src/scenes/levels/Level1.tscn b/src/scenes/levels/Level1.tscn index c11e38606786bae6fa536bfe60b11d5a113ddd65..3db7d409638d4bb3bf3f2644d77fafe4dcb4eead 100644 --- a/src/scenes/levels/Level1.tscn +++ b/src/scenes/levels/Level1.tscn @@ -8,7 +8,7 @@ [ext_resource path="res://src/scenes/Acid.tscn" type="PackedScene" id=6] [ext_resource path="res://src/scenes/coin.tscn" type="PackedScene" id=7] [ext_resource path="res://src/scenes/PauseController.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=9] +[ext_resource path="res://src/scripts/Score.gd" type="Script" id=9] [ext_resource path="res://src/assets/colleticbles/coin/gold_1.png" type="Texture" id=10] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=11] [ext_resource path="res://src/actors/enemy/Skeleton.tscn" type="PackedScene" id=12] @@ -1150,7 +1150,7 @@ position = Vector2( 2097, 422 ) position = Vector2( 3412, 326 ) [node name="Node2D3" parent="Level1/Enemies/Skelletons" instance=ExtResource( 12 )] -position = Vector2( 4230.96, 396.324 ) +position = Vector2( 3720, 325 ) [node name="Node2D4" parent="Level1/Enemies/Skelletons" instance=ExtResource( 12 )] position = Vector2( 3536, 198 ) diff --git a/src/scenes/levels/Level2.tscn b/src/scenes/levels/Level2.tscn index 3d7946f177530245cfd885bb028ce15f13bda1e7..69a2e77310f429b0af37dfb666a5adfcc7b5147d 100644 --- a/src/scenes/levels/Level2.tscn +++ b/src/scenes/levels/Level2.tscn @@ -9,7 +9,7 @@ [ext_resource path="res://src/scenes/shards.tscn" type="PackedScene" id=7] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=8] [ext_resource path="res://src/assets/colleticbles/coin/gold_1.png" type="Texture" id=9] -[ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=10] +[ext_resource path="res://src/scripts/Score.gd" type="Script" id=10] [ext_resource path="res://src/scenes/Acid.tscn" type="PackedScene" id=11] [ext_resource path="res://src/scenes/Saw.tscn" type="PackedScene" id=12] [ext_resource path="res://src/scenes/spike.tscn" type="PackedScene" id=13] @@ -20,6 +20,7 @@ [ext_resource path="res://src/assets/sounds/coin1.wav" type="AudioStream" id=18] [ext_resource path="res://src/assets/backGround/SpaceBackGroundParallax.jpg" type="Texture" id=19] + [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) diff --git a/src/scenes/levels/Level3.tscn b/src/scenes/levels/Level3.tscn index 5c1a16abe348dba2a6ccdd67e17e51fd419df7d5..220d925ccf8b47167849d38c6f06b9e1ab896297 100644 --- a/src/scenes/levels/Level3.tscn +++ b/src/scenes/levels/Level3.tscn @@ -9,7 +9,7 @@ [ext_resource path="res://src/scenes/shards.tscn" type="PackedScene" id=7] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=8] [ext_resource path="res://src/assets/colleticbles/coin/gold_1.png" type="Texture" id=9] -[ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=10] +[ext_resource path="res://src/scripts/Score.gd" type="Script" id=10] [ext_resource path="res://src/scenes/spike.tscn" type="PackedScene" id=11] [ext_resource path="res://src/scenes/Saw.tscn" type="PackedScene" id=12] [ext_resource path="res://src/actors/enemy/ghost.tscn" type="PackedScene" id=13] diff --git a/src/scenes/levels/Level4.tscn b/src/scenes/levels/Level4.tscn index 95411ec1ffe39010782ede7e1c50688e93b6e72e..8a51262b2a6d612d664ed14ae8fbf7a3d033a941 100644 --- a/src/scenes/levels/Level4.tscn +++ b/src/scenes/levels/Level4.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://src/scenes/Acid.tscn" type="PackedScene" id=15] [ext_resource path="res://src/scenes/SawMove.tscn" type="PackedScene" id=16] [ext_resource path="res://src/scenes/Platforms/PFHSlow.tscn" type="PackedScene" id=17] -[ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=18] +[ext_resource path="res://src/scripts/Score.gd" type="Script" id=18] [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=19] [ext_resource path="res://src/assets/backGround/SpaceBackGroundParallax.jpg" type="Texture" id=20] [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=21] diff --git a/src/scenes/shards.gd b/src/scenes/shards.gd deleted file mode 100644 index 4dfe0ae44fddb8ecd522d03c5e19d228e364f6ac..0000000000000000000000000000000000000000 --- a/src/scenes/shards.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Area2D - -signal shard_collected - - -func _on_shards_body_entered(body): - queue_free() - emit_signal("shard_collected") - - diff --git a/src/scenes/shards.tscn b/src/scenes/shards.tscn index 13be72e5160267fdc8c9a20a7f6238808868a874..882f5097b7d94d53f5e98d853d757f337600955a 100644 --- a/src/scenes/shards.tscn +++ b/src/scenes/shards.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=13 format=2] [ext_resource path="res://src/assets/colleticbles/crystal-qubodup-ccby3-32-green.png" type="Texture" id=1] -[ext_resource path="res://src/scenes/shards.gd" type="Script" id=2] +[ext_resource path="res://src/scripts/shards.gd" type="Script" id=2] + [sub_resource type="CircleShape2D" id=1] radius = 25.2982 diff --git a/src/scenes/spike.gd b/src/scenes/spike.gd deleted file mode 100644 index 18ce4d3d3d975b7b15ebdbdac35d62659a382407..0000000000000000000000000000000000000000 --- a/src/scenes/spike.gd +++ /dev/null @@ -1,7 +0,0 @@ -extends KinematicBody2D - - - -func _on_Area2D_body_entered(body): - if body.get("TYPE") == "player": - get_tree().reload_current_scene() diff --git a/src/scenes/spike.tscn b/src/scenes/spike.tscn index 137756a5a1e8d470f8ca6872202ebf63872a7adc..daa0e4906b81a8c6b8493a09e3311157ab07d810 100644 --- a/src/scenes/spike.tscn +++ b/src/scenes/spike.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Tiles/Spike.png" type="Texture" id=1] -[ext_resource path="res://src/scenes/spike.gd" type="Script" id=2] +[ext_resource path="res://src/scripts/spike.gd" type="Script" id=2] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 0, 0 ) diff --git a/src/scripts/DoorExit.gd b/src/scripts/DoorExit.gd new file mode 100644 index 0000000000000000000000000000000000000000..8a404e2f3b25666314fe280cd2393fe548b246ca --- /dev/null +++ b/src/scripts/DoorExit.gd @@ -0,0 +1,16 @@ +extends Node2D + +signal enter_door + +export(int) var level_number +export(String) var door_name + +onready var area = $Area2D + +func _ready(): + pass + +func _physics_process(delta): + for body in area.get_overlapping_bodies(): + if body.name == "Player" and Input.is_action_just_pressed("move_up"): + get_tree().change_scene("res://src/scenes/Menu.tscn") diff --git a/src/scripts/Menu.gd b/src/scripts/Menu.gd index 875470a548b51bbbf1bfaac73ffadf49725c957e..46830c3d9f30ae5a463cc53deb7210b1b564ac57 100644 --- a/src/scripts/Menu.gd +++ b/src/scripts/Menu.gd @@ -6,13 +6,25 @@ func _ready(): func _on_Start_pressed(): + $buttonSound.play() + yield($buttonSound, "finished") get_tree().change_scene("res://src/scenes/Game.tscn") + func _on_Einstellungen_pressed(): + $buttonSound.play() + yield($buttonSound, "finished") get_tree().change_scene("res://src/scenes/Settings.tscn") + func _on_ENDE_pressed(): + $buttonSound.play() + yield($buttonSound, "finished") get_tree().quit() + + +func _on_buttonSound_finished(): + pass # Replace with function body. diff --git a/src/scenes/SawMoveDamage.gd b/src/scripts/SawMoveDamage.gd similarity index 100% rename from src/scenes/SawMoveDamage.gd rename to src/scripts/SawMoveDamage.gd diff --git a/src/scenes/SawMoveKill.gd b/src/scripts/SawMoveKill.gd similarity index 100% rename from src/scenes/SawMoveKill.gd rename to src/scripts/SawMoveKill.gd diff --git a/src/scripts/SawRotation.gd b/src/scripts/SawRotation.gd index f0d6cbb63cd09f303ba13d35d8047e1734300e7d..24f0fa54d9f1d17445f3c019c0e6387c96eedaec 100644 --- a/src/scripts/SawRotation.gd +++ b/src/scripts/SawRotation.gd @@ -1,6 +1,7 @@ extends Sprite + func _process(delta): rotation +=5*delta pass diff --git a/src/scenes/SawRotationMove.gd b/src/scripts/SawRotationMove.gd similarity index 100% rename from src/scenes/SawRotationMove.gd rename to src/scripts/SawRotationMove.gd diff --git a/src/scenes/levels/Score.gd b/src/scripts/Score.gd similarity index 100% rename from src/scenes/levels/Score.gd rename to src/scripts/Score.gd diff --git a/src/scripts/Settings.gd b/src/scripts/Settings.gd index e4f386d929ccfab2b28d0ce3db1318fbe99e0eeb..c085b4ffd517c81b2f1b4ea0100dc195d7755b0d 100644 --- a/src/scripts/Settings.gd +++ b/src/scripts/Settings.gd @@ -5,4 +5,6 @@ func _ready(): func _input(event): if event.is_action_pressed("quit"): + $buttonSound.play() + yield($buttonSound, "finished") get_tree().change_scene("res://src/scenes/Menu.tscn") diff --git a/src/scripts/shards.gd b/src/scripts/shards.gd index 0c51719a9dd1c0f5de4a2d4f6c09d1c8f03fa32b..4dfe0ae44fddb8ecd522d03c5e19d228e364f6ac 100644 --- a/src/scripts/shards.gd +++ b/src/scripts/shards.gd @@ -1,7 +1,10 @@ extends Area2D - +signal shard_collected func _on_shards_body_entered(body): queue_free() + emit_signal("shard_collected") + +