From a26674fc7d01fb3dd53c23caba0348ba97741b02 Mon Sep 17 00:00:00 2001
From: ee6-wz3-u1 <adam.galinski@stud.hs-hannover.de>
Date: Fri, 17 Dec 2021 15:24:37 +0100
Subject: [PATCH] progress level 0
---
src/scenes/Acid.gd | 8 ----
src/scenes/Acid.tscn | 3 +-
src/scenes/Door.tscn | 4 +-
src/scenes/Menu.gd | 35 ------------------
src/scenes/Menu.tscn | 39 ++++++++++----------
src/scenes/PauseController.gd | 43 ----------------------
src/scenes/PauseController.tscn | 3 +-
src/scenes/Saw.gd | 6 ---
src/scenes/Saw.tscn | 5 ++-
src/scenes/SawMove.tscn | 3 +-
src/scenes/SawMoveLR.tscn | 3 +-
src/scenes/SawRotation.gd | 7 ----
src/scenes/Settings.gd | 10 -----
src/scenes/Settings.tscn | 3 +-
src/scenes/Sprite.gd | 6 ---
src/scenes/levels/Level0.tscn | 27 +++++++++++---
src/scenes/levels/Level1.tscn | 3 +-
src/scenes/levels/Level2.tscn | 3 +-
src/scenes/levels/Level3.tscn | 2 +-
src/scenes/levels/Level4.tscn | 2 +-
src/scenes/shards.gd | 10 -----
src/scenes/shards.tscn | 3 +-
src/scenes/spike.gd | 7 ----
src/scenes/spike.tscn | 3 +-
src/scripts/DoorExit.gd | 16 ++++++++
src/scripts/Global.gd | 2 +-
src/scripts/Menu.gd | 12 ++++++
src/{scenes => scripts}/SawMoveDamage.gd | 0
src/{scenes => scripts}/SawMoveKill.gd | 0
src/scripts/SawRotation.gd | 1 +
src/{scenes => scripts}/SawRotationMove.gd | 0
src/{scenes/levels => scripts}/Score.gd | 0
src/scripts/Settings.gd | 2 +
src/scripts/shards.gd | 5 ++-
34 files changed, 102 insertions(+), 174 deletions(-)
delete mode 100644 src/scenes/Acid.gd
delete mode 100644 src/scenes/Menu.gd
delete mode 100644 src/scenes/PauseController.gd
delete mode 100644 src/scenes/Saw.gd
delete mode 100644 src/scenes/SawRotation.gd
delete mode 100644 src/scenes/Settings.gd
delete mode 100644 src/scenes/Sprite.gd
delete mode 100644 src/scenes/shards.gd
delete mode 100644 src/scenes/spike.gd
create mode 100644 src/scripts/DoorExit.gd
rename src/{scenes => scripts}/SawMoveDamage.gd (100%)
rename src/{scenes => scripts}/SawMoveKill.gd (100%)
rename src/{scenes => scripts}/SawRotationMove.gd (100%)
rename src/{scenes/levels => scripts}/Score.gd (100%)
diff --git a/src/scenes/Acid.gd b/src/scenes/Acid.gd
deleted file mode 100644
index 072a07f..0000000
--- 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 d14044a..b2d4370 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 6582d6b..5d29526 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 9035503..0000000
--- 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 0c265f0..61a2f58 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]
@@ -17,6 +17,13 @@ font_data = ExtResource( 2 )
[sub_resource type="Theme" id=2]
+[sub_resource type="DynamicFont" id=6]
+size = 32
+outline_size = 4
+outline_color = Color( 0, 0, 0, 1 )
+extra_spacing_bottom = 6
+font_data = ExtResource( 2 )
+
[sub_resource type="StyleBoxTexture" id=3]
texture = ExtResource( 5 )
region_rect = Rect2( 0, 0, 361, 101 )
@@ -29,11 +36,12 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=6]
-size = 32
+[sub_resource type="DynamicFont" id=10]
+size = 22
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 6
+extra_spacing_bottom = 3
+extra_spacing_char = 2
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxTexture" id=7]
@@ -48,12 +56,12 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=10]
-size = 22
+[sub_resource type="DynamicFont" id=14]
+size = 32
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 3
-extra_spacing_char = 2
+extra_spacing_bottom = 5
+extra_spacing_char = 5
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxTexture" id=11]
@@ -68,14 +76,6 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=14]
-size = 32
-outline_size = 4
-outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 5
-extra_spacing_char = 5
-font_data = ExtResource( 2 )
-
[sub_resource type="AtlasTexture" id=15]
flags = 4
atlas = ExtResource( 4 )
@@ -139,10 +139,10 @@ margin_top = -108.0
margin_right = 449.0
margin_bottom = -40.0
theme = SubResource( 2 )
+custom_fonts/font = SubResource( 6 )
custom_styles/hover = SubResource( 3 )
custom_styles/pressed = SubResource( 4 )
custom_styles/normal = SubResource( 5 )
-custom_fonts/font = SubResource( 6 )
text = "START"
__meta__ = {
"_edit_use_anchors_": false
@@ -153,10 +153,10 @@ margin_left = 130.0
margin_top = 384.0
margin_right = 450.0
margin_bottom = 448.0
+custom_fonts/font = SubResource( 10 )
custom_styles/hover = SubResource( 7 )
custom_styles/pressed = SubResource( 8 )
custom_styles/normal = SubResource( 9 )
-custom_fonts/font = SubResource( 10 )
text = "EINSTELLUNGEN"
__meta__ = {
"_edit_use_anchors_": false
@@ -167,10 +167,10 @@ margin_left = 128.0
margin_top = 512.0
margin_right = 448.0
margin_bottom = 576.0
+custom_fonts/font = SubResource( 14 )
custom_styles/hover = SubResource( 11 )
custom_styles/pressed = SubResource( 12 )
custom_styles/normal = SubResource( 13 )
-custom_fonts/font = SubResource( 14 )
text = "ENDE"
__meta__ = {
"_edit_use_anchors_": false
@@ -180,6 +180,7 @@ __meta__ = {
position = Vector2( 1080, 248 )
scale = Vector2( 2.81113, 2.65621 )
frames = SubResource( 18 )
+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 89d150c..0000000
--- 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 6f97a61..31d7a86 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/Saw.gd b/src/scenes/Saw.gd
deleted file mode 100644
index 60e4276..0000000
--- 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 ccd40e5..1b61ea6 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 edb7cf1..2789db2 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 718796a..4e2bf74 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 24f0fa5..0000000
--- 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 c085b4f..0000000
--- 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 d40d784..2f62cd7 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 f0d6cbb..0000000
--- 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 e61834e..5c556a3 100644
--- a/src/scenes/levels/Level0.tscn
+++ b/src/scenes/levels/Level0.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=52 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,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/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]
@@ -20,6 +20,8 @@
[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 )
@@ -353,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 )
@@ -806,10 +811,20 @@ 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 )
@@ -882,8 +897,8 @@ margin_left = 1144.0
margin_top = 24.0
margin_right = 1264.0
margin_bottom = 56.0
-custom_fonts/font = SubResource( 31 )
custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 )
+custom_fonts/font = SubResource( 31 )
align = 1
valign = 1
__meta__ = {
diff --git a/src/scenes/levels/Level1.tscn b/src/scenes/levels/Level1.tscn
index c11e386..c6ad680 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]
@@ -17,6 +17,7 @@
[ext_resource path="res://src/assets/sounds/coin1.wav" type="AudioStream" id=15]
[ext_resource path="res://src/assets/backGround/SpaceBackGroundParallax.jpg" type="Texture" id=16]
+
[sub_resource type="ConvexPolygonShape2D" id=1]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
diff --git a/src/scenes/levels/Level2.tscn b/src/scenes/levels/Level2.tscn
index 3d7946f..69a2e77 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 5c1a16a..220d925 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 95411ec..8a51262 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 4dfe0ae..0000000
--- 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 13be72e..882f509 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 18ce4d3..0000000
--- 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 137756a..daa0e49 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 0000000..8a404e2
--- /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/Global.gd b/src/scripts/Global.gd
index 8903cb7..80d8fb8 100644
--- a/src/scripts/Global.gd
+++ b/src/scripts/Global.gd
@@ -1,7 +1,7 @@
extends Node
var next_level_door = null
-var next_level_number = 1
+var next_level_number = 0
func _ready():
pass
diff --git a/src/scripts/Menu.gd b/src/scripts/Menu.gd
index 875470a..46830c3 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 f0d6cbb..24f0fa5 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 e4f386d..c085b4f 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 0c51719..4dfe0ae 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")
+
+
--
GitLab