diff --git a/assets/dead_cam.tscn b/assets/dead_cam.tscn index 80e97e0..5c5244e 100644 --- a/assets/dead_cam.tscn +++ b/assets/dead_cam.tscn @@ -9,7 +9,7 @@ dof_blur_near_transition = 4.0 dof_blur_amount = 0.2 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_m5ien"] -blend_mode = 1 +blend_mode = 3 [sub_resource type="Animation" id="Animation_4scpm"] resource_name = "whiteout" @@ -25,7 +25,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 0.05), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] +"values": [Color(1, 1, 1, 0), Color(0, 0, 0, 1)] } tracks/1/type = "method" tracks/1/imported = false @@ -58,14 +58,14 @@ fov = 15.0 target_position = Vector3(0, 0, -1) [node name="Timer" type="Timer" parent="."] -wait_time = 0.2 +wait_time = 0.25 one_shot = true [node name="Whiteout" type="ColorRect" parent="."] material = SubResource("CanvasItemMaterial_m5ien") offset_right = 40.0 offset_bottom = 40.0 -color = Color(1, 1, 1, 0) +color = Color(0.8, 0.8, 0.8, 0.2) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { diff --git a/scripts/LevelManager.gd b/scripts/LevelManager.gd index 665014d..64473a3 100644 --- a/scripts/LevelManager.gd +++ b/scripts/LevelManager.gd @@ -146,7 +146,7 @@ func die(): instance_dead.camera.current = true player.dead = true player.crt_filter.visible = true - player.toggle_hud() + player.toggle_hud(false) player.gun.visible = false player.crosshair.visible = false @@ -162,13 +162,13 @@ func pause_menu(): if paused: Engine.time_scale = engine_time_scale_cache Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - player.toggle_hud() + player.toggle_hud(true) player.pause_menu.hide() else: engine_time_scale_cache = Engine.time_scale Engine.time_scale = 0 Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) - player.toggle_hud() + player.toggle_hud(false) player.pause_menu.show() paused = !paused diff --git a/scripts/dead_cam.gd b/scripts/dead_cam.gd index 7726558..92dadb0 100644 --- a/scripts/dead_cam.gd +++ b/scripts/dead_cam.gd @@ -73,11 +73,7 @@ func _process(delta): camera.fov = lerp(camera.fov, 40.0, delta * 5) elif respawn == true: - position = lerp(position,respawn_position,delta * MOVE_SPEED) - camera.global_transform.basis = lerp(camera.global_transform.basis,respawn_rotation,delta * CAMERA_LOOK_SPEED * 1.5) - camera.fov = lerp(camera.fov, respawn_fov, delta * 10) - if global_position.distance_to(respawn_position) <= .5: - animation_player.play("whiteout") + animation_player.play("whiteout") func _on_timer_timeout(): diff --git a/scripts/player.gd b/scripts/player.gd index d945a14..23d6179 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -401,9 +401,13 @@ func enemy_hit(): await get_tree().create_timer(.1).timeout hitmarker.visible = false -func toggle_hud(): - crosshair.visible = !hud_visible - ammo_counter.visible = !hud_visible - stamina_counter.visible = !hud_visible +func toggle_hud(hud_on): + if dead: + crt_filter.visible = hud_on + else: + crosshair.visible = hud_on + ammo_counter.visible = hud_on + stamina_counter.visible = hud_on + hud_visible = !hud_visible