Merge pull request #19 from DimonNeAdekvat/Michael

fixed signals and timer
snail-with-tea · Jul 9, 2023 · 7a7096b · 7a7096b
2 parents a9829f6 + 86c5366
commit 7a7096b
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 11 deletions.
diff --git a/Components/health_component.gd b/Components/health_component.gd
@@ -21,7 +21,7 @@ signal health_changed_r(health : float)
 			cur_health = 0.0
 			emit_signal("death")
 		emit_signal("health_changed_a",cur_health)
-		emit_signal("health_changed_a",cur_health/max_health)
+		emit_signal("health_changed_r",cur_health/max_health)
 
 func damage(ammount : float):
 	cur_health -= ammount

diff --git a/Levels/level1.tscn b/Levels/level1.tscn
@@ -26,6 +26,10 @@ texture = ExtResource("1_ttw4w")
 
 [node name="ControlableLog" parent="." instance=ExtResource("2_s23q5")]
 
+[node name="HealthComponent" parent="ControlableLog" index="2"]
+max_health = 10.0
+cur_health = 10.0
+
 [node name="Axe" parent="ControlableLog" instance=ExtResource("4_7amhu")]
 position = Vector2(3, -113)
 rotation = 1.74533
@@ -37,7 +41,9 @@ monitoring = false
 
 [node name="KnifeSpawner" parent="." instance=ExtResource("3_7qehu")]
 knives = Array[PackedScene]([ExtResource("6_wmavp"), ExtResource("4_pkscq"), ExtResource("6_emabd"), ExtResource("6_07jcx"), ExtResource("6_iiakj"), ExtResource("6_4i1hi"), ExtResource("6_c2d6i"), ExtResource("6_bpaxc"), ExtResource("6_y8onp"), ExtResource("6_qri2c"), ExtResource("6_o0n02")])
-positions = Array[Vector2]([Vector2(0, 1)])
+positions = Array[Vector2]([Vector2(0.5, 0.5)])
 types = Array[int]([0])
+spawn_time = 2.0
 
+[editable path="ControlableLog"]
 [editable path="ControlableLog/Axe"]
diff --git a/Levels/level2.tscn b/Levels/level2.tscn
@@ -0,0 +1,49 @@
+[gd_scene load_steps=17 format=3 uid="uid://bayc8rm5vuoec"]
+
+[ext_resource type="Script" path="res://Scripts/level.gd" id="1_7u2yh"]
+[ext_resource type="Texture2D" uid="uid://c311p8qlyy43p" path="res://Assets/background.png" id="2_fmdxp"]
+[ext_resource type="PackedScene" uid="uid://bg358owmjt0nd" path="res://Prefabs/controlable_log.tscn" id="3_xcqmr"]
+[ext_resource type="PackedScene" uid="uid://c117y2p32fcoe" path="res://Prefabs/axe.tscn" id="4_n50q0"]
+[ext_resource type="PackedScene" uid="uid://37gimblvsp3a" path="res://Prefabs/knife_spawner.tscn" id="5_v0cjk"]
+[ext_resource type="PackedScene" uid="uid://dpfvaog00h344" path="res://Prefabs/knife1.tscn" id="6_cycv1"]
+[ext_resource type="PackedScene" uid="uid://cd33nwuvka2iv" path="res://Prefabs/knife2.tscn" id="7_b3jxx"]
+[ext_resource type="PackedScene" uid="uid://dcprufup3r8po" path="res://Prefabs/knife3.tscn" id="8_2b0w0"]
+[ext_resource type="PackedScene" uid="uid://c2csg304hwj0h" path="res://Prefabs/knife4.tscn" id="9_eniqd"]
+[ext_resource type="PackedScene" uid="uid://dkqsu5lq8vbdp" path="res://Prefabs/knife5.tscn" id="10_at34j"]
+[ext_resource type="PackedScene" uid="uid://drtqj5smegp0g" path="res://Prefabs/knife6.tscn" id="11_460hv"]
+[ext_resource type="PackedScene" uid="uid://7ojmonacclix" path="res://Prefabs/knife7.tscn" id="12_ngvsc"]
+[ext_resource type="PackedScene" uid="uid://dlref010ihaa" path="res://Prefabs/knife8.tscn" id="13_bxtu0"]
+[ext_resource type="PackedScene" uid="uid://co6tueynsyh3a" path="res://Prefabs/knife9.tscn" id="14_m25vr"]
+[ext_resource type="PackedScene" uid="uid://tqd4r078786i" path="res://Prefabs/knife10.tscn" id="15_ec1t1"]
+[ext_resource type="PackedScene" uid="uid://bbs35tb06o5t4" path="res://Prefabs/knife11.tscn" id="16_af0ww"]
+
+[node name="Node2D" type="Node2D"]
+script = ExtResource("1_7u2yh")
+
+[node name="Background" type="Sprite2D" parent="."]
+scale = Vector2(1.905, 1.905)
+texture = ExtResource("2_fmdxp")
+
+[node name="ControlableLog" parent="." instance=ExtResource("3_xcqmr")]
+
+[node name="HealthComponent" parent="ControlableLog" index="2"]
+max_health = 10.0
+cur_health = 10.0
+
+[node name="Axe" parent="ControlableLog" instance=ExtResource("4_n50q0")]
+position = Vector2(3, -113)
+rotation = 1.74533
+
+[node name="DamageboxComponent" parent="ControlableLog/Axe" index="0"]
+monitoring = false
+
+[node name="Camera2D" type="Camera2D" parent="."]
+
+[node name="KnifeSpawner" parent="." instance=ExtResource("5_v0cjk")]
+knives = Array[PackedScene]([ExtResource("6_cycv1"), ExtResource("7_b3jxx"), ExtResource("8_2b0w0"), ExtResource("9_eniqd"), ExtResource("10_at34j"), ExtResource("11_460hv"), ExtResource("12_ngvsc"), ExtResource("13_bxtu0"), ExtResource("14_m25vr"), ExtResource("15_ec1t1"), ExtResource("16_af0ww")])
+positions = Array[Vector2]([Vector2(0.5, 0.5), Vector2(0.5, 0.5), Vector2(0.5, 0.5)])
+types = Array[int]([0, 0, 0])
+spawn_time = 2.0
+
+[editable path="ControlableLog"]
+[editable path="ControlableLog/Axe"]
diff --git a/Levels/level3.tscn b/Levels/level3.tscn
@@ -0,0 +1,49 @@
+[gd_scene load_steps=17 format=3 uid="uid://bi7w8w4b6y2vb"]
+
+[ext_resource type="Script" path="res://Scripts/level.gd" id="1_3fm70"]
+[ext_resource type="Texture2D" uid="uid://c311p8qlyy43p" path="res://Assets/background.png" id="2_6kxlf"]
+[ext_resource type="PackedScene" uid="uid://bg358owmjt0nd" path="res://Prefabs/controlable_log.tscn" id="3_ihuhd"]
+[ext_resource type="PackedScene" uid="uid://c117y2p32fcoe" path="res://Prefabs/axe.tscn" id="4_vi5yn"]
+[ext_resource type="PackedScene" uid="uid://37gimblvsp3a" path="res://Prefabs/knife_spawner.tscn" id="5_ypeop"]
+[ext_resource type="PackedScene" uid="uid://dpfvaog00h344" path="res://Prefabs/knife1.tscn" id="6_xlj6b"]
+[ext_resource type="PackedScene" uid="uid://cd33nwuvka2iv" path="res://Prefabs/knife2.tscn" id="7_85828"]
+[ext_resource type="PackedScene" uid="uid://dcprufup3r8po" path="res://Prefabs/knife3.tscn" id="8_4dyb5"]
+[ext_resource type="PackedScene" uid="uid://c2csg304hwj0h" path="res://Prefabs/knife4.tscn" id="9_21v5d"]
+[ext_resource type="PackedScene" uid="uid://dkqsu5lq8vbdp" path="res://Prefabs/knife5.tscn" id="10_a2hyi"]
+[ext_resource type="PackedScene" uid="uid://drtqj5smegp0g" path="res://Prefabs/knife6.tscn" id="11_vurtu"]
+[ext_resource type="PackedScene" uid="uid://7ojmonacclix" path="res://Prefabs/knife7.tscn" id="12_7k3pl"]
+[ext_resource type="PackedScene" uid="uid://dlref010ihaa" path="res://Prefabs/knife8.tscn" id="13_wbv3v"]
+[ext_resource type="PackedScene" uid="uid://co6tueynsyh3a" path="res://Prefabs/knife9.tscn" id="14_wisdn"]
+[ext_resource type="PackedScene" uid="uid://tqd4r078786i" path="res://Prefabs/knife10.tscn" id="15_op6ht"]
+[ext_resource type="PackedScene" uid="uid://bbs35tb06o5t4" path="res://Prefabs/knife11.tscn" id="16_454pb"]
+
+[node name="Node2D" type="Node2D"]
+script = ExtResource("1_3fm70")
+
+[node name="Background" type="Sprite2D" parent="."]
+scale = Vector2(1.905, 1.905)
+texture = ExtResource("2_6kxlf")
+
+[node name="ControlableLog" parent="." instance=ExtResource("3_ihuhd")]
+
+[node name="HealthComponent" parent="ControlableLog" index="2"]
+max_health = 10.0
+cur_health = 10.0
+
+[node name="Axe" parent="ControlableLog" instance=ExtResource("4_vi5yn")]
+position = Vector2(3, -113)
+rotation = 1.74533
+
+[node name="DamageboxComponent" parent="ControlableLog/Axe" index="0"]
+monitoring = false
+
+[node name="Camera2D" type="Camera2D" parent="."]
+
+[node name="KnifeSpawner" parent="." instance=ExtResource("5_ypeop")]
+knives = Array[PackedScene]([ExtResource("6_xlj6b"), ExtResource("7_85828"), ExtResource("8_4dyb5"), ExtResource("9_21v5d"), ExtResource("10_a2hyi"), ExtResource("11_vurtu"), ExtResource("12_7k3pl"), ExtResource("13_wbv3v"), ExtResource("14_wisdn"), ExtResource("15_op6ht"), ExtResource("16_454pb")])
+positions = Array[Vector2]([Vector2(0.5, 0.5), Vector2(1.5, 1.5), Vector2(1, 1), Vector2(0, 0)])
+types = Array[int]([0, 0, 0, 0])
+spawn_time = 2.0
+
+[editable path="ControlableLog"]
+[editable path="ControlableLog/Axe"]
diff --git a/Levels/level4.tscn b/Levels/level4.tscn
@@ -0,0 +1,49 @@
+[gd_scene load_steps=17 format=3 uid="uid://mh08aaji7ak1"]
+
+[ext_resource type="Script" path="res://Scripts/level.gd" id="1_ikdyd"]
+[ext_resource type="Texture2D" uid="uid://c311p8qlyy43p" path="res://Assets/background.png" id="2_3nnb2"]
+[ext_resource type="PackedScene" uid="uid://bg358owmjt0nd" path="res://Prefabs/controlable_log.tscn" id="3_7y7ns"]
+[ext_resource type="PackedScene" uid="uid://c117y2p32fcoe" path="res://Prefabs/axe.tscn" id="4_smium"]
+[ext_resource type="PackedScene" uid="uid://37gimblvsp3a" path="res://Prefabs/knife_spawner.tscn" id="5_ba2ku"]
+[ext_resource type="PackedScene" uid="uid://dpfvaog00h344" path="res://Prefabs/knife1.tscn" id="6_mi32s"]
+[ext_resource type="PackedScene" uid="uid://cd33nwuvka2iv" path="res://Prefabs/knife2.tscn" id="7_4scax"]
+[ext_resource type="PackedScene" uid="uid://dcprufup3r8po" path="res://Prefabs/knife3.tscn" id="8_22lp4"]
+[ext_resource type="PackedScene" uid="uid://c2csg304hwj0h" path="res://Prefabs/knife4.tscn" id="9_l6ieu"]
+[ext_resource type="PackedScene" uid="uid://dkqsu5lq8vbdp" path="res://Prefabs/knife5.tscn" id="10_sciys"]
+[ext_resource type="PackedScene" uid="uid://drtqj5smegp0g" path="res://Prefabs/knife6.tscn" id="11_und03"]
+[ext_resource type="PackedScene" uid="uid://7ojmonacclix" path="res://Prefabs/knife7.tscn" id="12_nxk50"]
+[ext_resource type="PackedScene" uid="uid://dlref010ihaa" path="res://Prefabs/knife8.tscn" id="13_ilhgo"]
+[ext_resource type="PackedScene" uid="uid://co6tueynsyh3a" path="res://Prefabs/knife9.tscn" id="14_5hbxh"]
+[ext_resource type="PackedScene" uid="uid://tqd4r078786i" path="res://Prefabs/knife10.tscn" id="15_bm207"]
+[ext_resource type="PackedScene" uid="uid://bbs35tb06o5t4" path="res://Prefabs/knife11.tscn" id="16_egapj"]
+
+[node name="Node2D" type="Node2D"]
+script = ExtResource("1_ikdyd")
+
+[node name="Background" type="Sprite2D" parent="."]
+scale = Vector2(1.905, 1.905)
+texture = ExtResource("2_3nnb2")
+
+[node name="ControlableLog" parent="." instance=ExtResource("3_7y7ns")]
+
+[node name="HealthComponent" parent="ControlableLog" index="2"]
+max_health = 10.0
+cur_health = 10.0
+
+[node name="Axe" parent="ControlableLog" instance=ExtResource("4_smium")]
+position = Vector2(3, -113)
+rotation = 1.74533
+
+[node name="DamageboxComponent" parent="ControlableLog/Axe" index="0"]
+monitoring = false
+
+[node name="Camera2D" type="Camera2D" parent="."]
+
+[node name="KnifeSpawner" parent="." instance=ExtResource("5_ba2ku")]
+knives = Array[PackedScene]([ExtResource("6_mi32s"), ExtResource("7_4scax"), ExtResource("8_22lp4"), ExtResource("9_l6ieu"), ExtResource("10_sciys"), ExtResource("11_und03"), ExtResource("12_nxk50"), ExtResource("13_ilhgo"), ExtResource("14_5hbxh"), ExtResource("15_bm207"), ExtResource("16_egapj")])
+positions = Array[Vector2]([Vector2(0.3, 0.7), Vector2(0.5, 1), Vector2(0.8, 1.3), Vector2(1.5, 2)])
+types = Array[int]([0, 0, 0, 0])
+spawn_time = 2.0
+
+[editable path="ControlableLog"]
+[editable path="ControlableLog/Axe"]
diff --git a/Prefabs/controlable_log.tscn b/Prefabs/controlable_log.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://bg358owmjt0nd"]
 
 [ext_resource type="Script" path="res://Scripts/ControlableLog.gd" id="1_6f3ik"]
-[ext_resource type="Texture2D" uid="uid://c3tsxu6qgpmck" path="res://Assets/boss-Orange.png" id="2_kia1x"]
+[ext_resource type="Texture2D" uid="uid://d2jvcl4gk5m6q" path="res://Assets/log-basic.png" id="2_an24g"]
 [ext_resource type="Script" path="res://Components/health_component.gd" id="3_w1wge"]
 [ext_resource type="Script" path="res://Components/hitbox_component.gd" id="4_48ujn"]
 
@@ -16,8 +16,8 @@ angular_damp = 20.0
 
 [node name="Boss-orange" type="Sprite2D" parent="."]
 z_index = 1
-scale = Vector2(0.5, 0.5)
-texture = ExtResource("2_kia1x")
+scale = Vector2(0.39, 0.39)
+texture = ExtResource("2_an24g")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
@@ -34,3 +34,5 @@ health = NodePath("../HealthComponent")
 [node name="CollisionShape2D" type="CollisionShape2D" parent="HitboxComponent"]
 z_index = 1
 shape = SubResource("CircleShape2D_revv6")
+
+[connection signal="area_entered" from="HitboxComponent" to="HitboxComponent" method="_on_area_entered"]
diff --git a/Scripts/KnifeSpawner.gd b/Scripts/KnifeSpawner.gd
@@ -9,6 +9,7 @@ extends Node2D
 #@export var knife_scene: PackedScene = preload("res://Prefabs/knife.tscn")
 @export var warning_scene: PackedScene = preload("res://Prefabs/warning.tscn")
 @export var distance: float = 600.0
+@export var spawn_time: float = 3.0
 
 signal victory
 signal score_changed(score : int)
@@ -17,11 +18,18 @@ var cur_index : int = 0
 var score : int = 0
 
 func new_game():
+	$MobTimer.wait_time = spawn_time
 	$MobTimer.start()
 
 func _ready():
 	new_game()
 
+func _physics_process(_delta):
+	if(cur_index <= positions.size() - 1):
+		return
+	if(get_child_count() == 1):
+		emit_signal("victory")
+		set_physics_process(false)
 
 func _on_mob_timer_timeout():
 	spawn_on_circle()
@@ -43,6 +51,5 @@ func spawn_on_circle():
 	attack.add_child(warning)
 	if(cur_index == positions.size() - 1):
 		$MobTimer.stop()
-		emit_signal("victory")
 	cur_index += 1
 
diff --git a/Scripts/level.gd b/Scripts/level.gd
@@ -7,6 +7,8 @@ signal health_changed(health : float)
 # Called when the node enters the scene tree for the first time.
 @onready var ui_scene : PackedScene = preload("res://UI/in_game_ui.tscn")
 
+var canWin : bool = true
+
 func _ready():
 	$ControlableLog/HealthComponent.connect("health_changed_r", on_health_changed)
 	$ControlableLog/HealthComponent.connect("death", on_game_over)
@@ -23,9 +25,12 @@ func on_score_changed(score : int):
 	emit_signal("score_changed", score)
 
 func on_victory():
+	if(!canWin):
+		return
 	emit_signal("victory")
 
 func on_game_over():
+	canWin = false
 	emit_signal("game_over")
 
 func connect_ui():

diff --git a/UI/levels.tscn b/UI/levels.tscn
@@ -1,10 +1,13 @@
-[gd_scene load_steps=6 format=3 uid="uid://bhgqt7x7sb888"]
+[gd_scene load_steps=9 format=3 uid="uid://bhgqt7x7sb888"]
 
 [ext_resource type="Theme" uid="uid://b5sam0xashck5" path="res://UI/ui_default.tres" id="1_jqpsc"]
 [ext_resource type="Script" path="res://UI/levels.gd" id="1_mutc8"]
 [ext_resource type="PackedScene" uid="uid://dkri62q20y46i" path="res://UI/main_menu.tscn" id="2_g3jyf"]
-[ext_resource type="PackedScene" uid="uid://bmbo0fggcsr5e" path="res://UI/level1.tscn" id="4_mrjmj"]
+[ext_resource type="PackedScene" uid="uid://bmbo0fggcsr5e" path="res://Levels/level1.tscn" id="4_mrjmj"]
 [ext_resource type="Texture2D" uid="uid://c311p8qlyy43p" path="res://Assets/background.png" id="5_2lo4r"]
+[ext_resource type="PackedScene" uid="uid://bayc8rm5vuoec" path="res://Levels/level2.tscn" id="5_bds0f"]
+[ext_resource type="PackedScene" uid="uid://bi7w8w4b6y2vb" path="res://Levels/level3.tscn" id="6_umiks"]
+[ext_resource type="PackedScene" uid="uid://mh08aaji7ak1" path="res://Levels/level4.tscn" id="7_w6kkq"]
 
 [node name="Levels" type="Control"]
 layout_mode = 3
@@ -16,9 +19,7 @@ grow_vertical = 2
 theme = ExtResource("1_jqpsc")
 script = ExtResource("1_mutc8")
 go_back = ExtResource("2_g3jyf")
-
-levels = Array[PackedScene]([ExtResource("4_mrjmj")])
-
+levels = Array[PackedScene]([ExtResource("4_mrjmj"), ExtResource("5_bds0f"), ExtResource("6_umiks"), ExtResource("7_w6kkq")])
 
 [node name="TextureRect" type="TextureRect" parent="."]
 layout_mode = 1