Merge pull request #14 from Noarkhh/kubak2

szypko

DangerScheduler.gd

@@ -5,7 +5,9 @@ var segments_scenes = [
 	preload("res://obstacles/segments/segment_barrel_stack.tscn"),
 	preload("res://obstacles/segments/segment_crate_stack.tscn"),
 	preload("res://obstacles/segments/segment_market.tscn"),
-	preload("res://obstacles/segments/segment_scaffolding_triangle.tscn")
+	preload("res://obstacles/segments/segment_scaffolding_triangle.tscn"),
+	preload("res://obstacles/segments/segment_barrel_on_crate.tscn"),
+	preload("res://obstacles/segments/segment_crate_trap.tscn"),
 	]
 
 var dragons = []

assets/death_sequence.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://wdslogi2xcp3"
+uid="uid://r3u1g6500efr"
 
 path="res://.godot/imported/death_sequence.png-be2f23bf5f8d365506f809a91fbc336e.ctex"
 metadata={

assets/fireball.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://d30ikbe4lis2p"
+uid="uid://d1yjmre0rb48l"
 
 path="res://.godot/imported/fireball.png-ed7e398784db012da0948497b00257d1.ctex"
 metadata={

assets/you_died.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ohjgtr51jvga"
+uid="uid://d07rhbbg7d14g"
 
 path="res://.godot/imported/you_died.png-5f8b5c92545abce5b3729ea027c3073d.ctex"
 metadata={

danger_scheduler.tscn

@@ -1,4 +1,5 @@
-[gd_scene load_steps=2 format=3 uid="uid://bc8f76w6nme4d"]
+[gd_scene load_steps=2 format=3 uid="uid://sxxthl7fu7gi"]
+
 
 [ext_resource type="Script" path="res://DangerScheduler.gd" id="1_bh304"]
 

main_scene.tscn

@@ -1,3 +1,4 @@
+
 [gd_scene load_steps=10 format=3 uid="uid://b04gcujmvf2fx"]
 
 [ext_resource type="PackedScene" uid="uid://c3ywqasnt5osa" path="res://src/Player/Player.tscn" id="2_27tub"]

obstacles/segments/segment_barrel_on_crate.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=4 format=3 uid="uid://cu00g518yj841"]
+
+[ext_resource type="PackedScene" uid="uid://dfn1idoddv7um" path="res://obstacles/segments/segment_obstacles.tscn" id="1_pvlnd"]
+[ext_resource type="PackedScene" uid="uid://b4x7i0m28nkh6" path="res://obstacles/obstacle_crate.tscn" id="2_10l44"]
+[ext_resource type="PackedScene" uid="uid://b14ocn7wd7dtl" path="res://obstacles/obstacle_barrel.tscn" id="3_fso7s"]
+
+[node name="SegmentObstacles" instance=ExtResource("1_pvlnd")]
+
+[node name="ObstacleCrate" parent="." index="0" instance=ExtResource("2_10l44")]
+position = Vector2(49, 3)
+
+[node name="ObstacleBarrel3" parent="." index="1" instance=ExtResource("3_fso7s")]
+position = Vector2(66, -154)
+
+[node name="ObstacleBarrel" parent="." index="2" instance=ExtResource("3_fso7s")]
+position = Vector2(9, -154)
+
+[node name="ObstacleBarrel2" parent="." index="3" instance=ExtResource("3_fso7s")]
+position = Vector2(-48, -37)

obstacles/segments/segment_crate_stack.tscn

@@ -13,6 +13,3 @@ position = Vector2(49, 3)
 
 [node name="ObstacleCrate3" parent="." index="2" instance=ExtResource("2_j8equ")]
 position = Vector2(-10, -115)
-
-[node name="ObstacleCrate4" parent="." index="3" instance=ExtResource("2_j8equ")]
-position = Vector2(-8, -229)

obstacles/segments/segment_crate_trap.tscn

@@ -0,0 +1,15 @@
+[gd_scene load_steps=3 format=3 uid="uid://ckv8qoejcrxep"]
+
+[ext_resource type="PackedScene" uid="uid://dfn1idoddv7um" path="res://obstacles/segments/segment_obstacles.tscn" id="1_pdfye"]
+[ext_resource type="PackedScene" uid="uid://b4x7i0m28nkh6" path="res://obstacles/obstacle_crate.tscn" id="2_plcrh"]
+
+[node name="SegmentObstacles" instance=ExtResource("1_pdfye")]
+
+[node name="ObstacleCrate" parent="." index="0" instance=ExtResource("2_plcrh")]
+position = Vector2(257, 4)
+
+[node name="ObstacleCrate2" parent="." index="1" instance=ExtResource("2_plcrh")]
+position = Vector2(-138, 2)
+
+[node name="ObstacleCrate3" parent="." index="2" instance=ExtResource("2_plcrh")]
+position = Vector2(257, -110)

src/Player/CharacterBody2D.gd

@@ -27,6 +27,7 @@ var is_sliding = false
 var dash_velocity = 0
 var last_anim = ""
 var is_rolling = false
+var is_alive = true
 
 var health = 3.0
 var is_invincible = false
@@ -42,7 +43,10 @@ func _ready():
 	$AnimatedSprite2D.play()
 
 func _physics_process(delta):
-
+	if not is_alive:
+		pass
+
+
 	if is_dashing:
 		velocity.x += dash_velocity
 		time_since_last_dash += 1
@@ -151,6 +155,7 @@ func _animation_finished():
 		$AnimatedSprite2D.animation = "run"
 		$AnimatedSprite2D.play()
 
+
 func player_hit(impact: float) -> void:
 	if is_invincible:
 		return