Преглед на файлове

:bug: fixed victory showing after game over

Felix Bytow преди 10 месеца
родител
ревизия
550d4fb39f
променени са 3 файла, в които са добавени 21 реда и са изтрити 21 реда
  1. 2 2
      assets/scenes/demon.tscn
  2. 18 18
      assets/scenes/game_over.tscn
  3. 1 1
      screens/game.gd

+ 2 - 2
assets/scenes/demon.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://gq6u7iesbchb"]
 
+[ext_resource type="Script" path="res://assets/scenes/demon.gd" id="1_7dbuk"]
 [ext_resource type="Texture2D" uid="uid://dl8yyrdb8o001" path="res://assets/textures/survivors/purple/demon_idle.png" id="1_efcu4"]
-[ext_resource type="Script" path="res://assets/scenes/demon.gd" id="1_h64o5"]
 [ext_resource type="Texture2D" uid="uid://bf3ayj1blr6bk" path="res://assets/textures/survivors/purple/demon_shoot_1.png" id="2_yw5ej"]
 [ext_resource type="Texture2D" uid="uid://c3kee723fcojn" path="res://assets/textures/survivors/purple/demon_shoot_2.png" id="3_nvdqw"]
 [ext_resource type="Texture2D" uid="uid://gg4oygilqclm" path="res://assets/textures/survivors/purple/demon_shoot_3.png" id="4_g3y15"]
@@ -47,7 +47,7 @@ z_as_relative = false
 scale = Vector2(0.17, 0.17)
 collision_layer = 128
 collision_mask = 64
-script = ExtResource("1_h64o5")
+script = ExtResource("1_7dbuk")
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 position = Vector2(0, -117.647)

+ 18 - 18
assets/scenes/game_over.tscn

@@ -53,8 +53,8 @@ tracks/2/keys = {
 "values": [false]
 }
 
-[sub_resource type="Animation" id="Animation_a40w7"]
-resource_name = "open"
+[sub_resource type="Animation" id="Animation_yytoc"]
+resource_name = "close"
 length = 0.5
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -66,7 +66,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
 "update": 1,
-"values": [ExtResource("2_icodc"), ExtResource("1_g6qpv"), ExtResource("3_kkw3b"), ExtResource("4_bii53"), ExtResource("5_cw6tv"), ExtResource("6_bpy0b"), ExtResource("7_mbl13"), ExtResource("8_pnhfj"), ExtResource("9_3cacg"), ExtResource("10_0jp7g"), ExtResource("11_vpf65")]
+"values": [ExtResource("11_vpf65"), ExtResource("10_0jp7g"), ExtResource("9_3cacg"), ExtResource("8_pnhfj"), ExtResource("7_mbl13"), ExtResource("6_bpy0b"), ExtResource("5_cw6tv"), ExtResource("4_bii53"), ExtResource("3_kkw3b"), ExtResource("1_g6qpv"), ExtResource("2_icodc")]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -75,10 +75,10 @@ tracks/1/path = NodePath("CloseButton:visible")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.5),
-"transitions": PackedFloat32Array(1, 1),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [false, true]
+"values": [false]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -87,14 +87,14 @@ tracks/2/path = NodePath("MessageLabel:visible")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.5),
-"transitions": PackedFloat32Array(1, 1),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [false, true]
+"values": [false]
 }
 
-[sub_resource type="Animation" id="Animation_yytoc"]
-resource_name = "close"
+[sub_resource type="Animation" id="Animation_a40w7"]
+resource_name = "open"
 length = 0.5
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -106,7 +106,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
 "update": 1,
-"values": [ExtResource("11_vpf65"), ExtResource("10_0jp7g"), ExtResource("9_3cacg"), ExtResource("8_pnhfj"), ExtResource("7_mbl13"), ExtResource("6_bpy0b"), ExtResource("5_cw6tv"), ExtResource("4_bii53"), ExtResource("3_kkw3b"), ExtResource("1_g6qpv"), ExtResource("2_icodc")]
+"values": [ExtResource("2_icodc"), ExtResource("1_g6qpv"), ExtResource("3_kkw3b"), ExtResource("4_bii53"), ExtResource("5_cw6tv"), ExtResource("6_bpy0b"), ExtResource("7_mbl13"), ExtResource("8_pnhfj"), ExtResource("9_3cacg"), ExtResource("10_0jp7g"), ExtResource("11_vpf65")]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -115,10 +115,10 @@ tracks/1/path = NodePath("CloseButton:visible")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [false]
+"values": [false, true]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -127,10 +127,10 @@ tracks/2/path = NodePath("MessageLabel:visible")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [false]
+"values": [false, true]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_fmmxf"]

+ 1 - 1
screens/game.gd

@@ -70,7 +70,7 @@ func _process(_delta: float) -> void:
 	if Input.is_action_pressed("ui_cancel"):
 		go_to_main_menu()
 	if phase == Phase.PHASE_COMBAT:
-		if get_foes().is_empty():
+		if get_foes().is_empty() and health_bar.health != 0:
 			end_combat()
 
 func go_to_main_menu() -> void: