From 9927ab2d6fe5622a68677f8893d86a32125e037f Mon Sep 17 00:00:00 2001 From: unfa Date: Thu, 3 Jun 2021 22:34:36 +0200 Subject: [PATCH] Refactored Main.gd a bit, moved HUD out of Level --- Game/Assets/HUD/HUD.tscn | 142 +++++++++++++++++++++++++++++++++++++++ Game/Level.tscn | 138 +------------------------------------ Game/Main.gd | 23 ++++--- Game/Main.tscn | 9 ++- 4 files changed, 160 insertions(+), 152 deletions(-) create mode 100644 Game/Assets/HUD/HUD.tscn diff --git a/Game/Assets/HUD/HUD.tscn b/Game/Assets/HUD/HUD.tscn new file mode 100644 index 0000000..919ed89 --- /dev/null +++ b/Game/Assets/HUD/HUD.tscn @@ -0,0 +1,142 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Assets/HUD/Vignette.png" type="Texture2D" id=1] +[ext_resource path="res://Assets/HUD/Crosshair.png" type="Texture2D" id=2] +[ext_resource path="res://Assets/SFX/UI_Confirm_Kill.wav" type="AudioStream" id=3] +[ext_resource path="res://Assets/SFX/UI_Confirm_Hit.wav" type="AudioStream" id=4] +[ext_resource path="res://Assets/HUD/Crosshair.gd" type="Script" id=5] + +[sub_resource type="Animation" id=1] +resource_name = "Default" +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Crosshair:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PackedFloat32Array( 0 ), +"transitions": PackedFloat32Array( 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ) ] +} + +[sub_resource type="Animation" id=2] +length = 0.2 +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("Crosshair:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PackedFloat32Array( 0, 0.1, 0.2 ), +"transitions": PackedFloat32Array( 1, 1, 1 ), +"update": 0, +"values": [ Color( 1, 0.716667, 0, 1 ), Color( 1, 0.716667, 0, 1 ), Color( 1, 1, 1, 1 ) ] +} +tracks/1/type = "audio" +tracks/1/path = NodePath("Hit_Confirmation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"clips": [ { +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource( 4 ) +} ], +"times": PackedFloat32Array( 0 ) +} + +[sub_resource type="Animation" id=3] +length = 0.5 +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("Crosshair:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PackedFloat32Array( 0, 0.25, 0.5 ), +"transitions": PackedFloat32Array( 1, 1, 1 ), +"update": 0, +"values": [ Color( 1, 0.0532926, 0, 1 ), Color( 1, 0.0532926, 0, 1 ), Color( 1, 1, 1, 1 ) ] +} +tracks/1/type = "audio" +tracks/1/path = NodePath("Hit_Confirmation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"clips": [ { +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource( 3 ) +} ], +"times": PackedFloat32Array( 0 ) +} + +[node name="HUD" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = null +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Crosshair" type="Control" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +script = ExtResource( 5 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Crosshair" type="TextureRect" parent="Crosshair"] +texture_filter = 2 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -32.0 +offset_top = -32.0 +offset_right = 96.0 +offset_bottom = 96.0 +rect_scale = Vector2( 0.5, 0.5 ) +texture = ExtResource( 2 ) +expand = true +script = null +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Crosshair"] +autoplay = "Default" +anims/Default = SubResource( 1 ) +anims/Hit = SubResource( 2 ) +anims/Kill = SubResource( 3 ) +blend_times = [ ] +script = null + +[node name="Hit_Confirmation" type="AudioStreamPlayer" parent="Crosshair"] +stream = ExtResource( 3 ) +script = null + +[node name="Vignette" type="TextureRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 1 ) +expand = true +stretch_mode = 7 +script = null +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/Game/Level.tscn b/Game/Level.tscn index 11af552..d89dfbe 100644 --- a/Game/Level.tscn +++ b/Game/Level.tscn @@ -1,10 +1,5 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://Assets/HUD/Crosshair.png" type="Texture2D" id=1] -[ext_resource path="res://Assets/SFX/UI_Confirm_Kill.wav" type="AudioStream" id=2] -[ext_resource path="res://Assets/SFX/UI_Confirm_Hit.wav" type="AudioStream" id=3] -[ext_resource path="res://Assets/HUD/Crosshair.gd" type="Script" id=4] -[ext_resource path="res://Assets/HUD/Vignette.png" type="Texture2D" id=5] [ext_resource path="res://Assets/Maps/DM1/DM1.glb" type="PackedScene" id=6] [ext_resource path="res://Assets/Characters/Player.tscn" type="PackedScene" id=7] [ext_resource path="res://Assets/Props/BeerCan.tscn" type="PackedScene" id=8] @@ -44,82 +39,6 @@ volumetric_fog_gi_inject = 0.1 [sub_resource type="ConcavePolygonShape3D" id=5] data = PackedVector3Array( -6, 4, -10, -13, 4, -6, -9, 4, -13, -6, 4, -10, -10, 4, -6, -13, 4, -6, 6, 0, 3, 10, 0, 6, 6, 0, 10, 6, 0, 3, 10, 0, 3, 10, 0, 6, 10, 4, -6, 9, 4, -13, 13, 4, -6, 10, 4, -6, 6, 4, -10, 9, 4, -13, -10, 4, 6, -9, 4, 13, -13, 4, 6, -10, 4, 6, -6, 4, 10, -9, 4, 13, 6, 4, 10, 13, 4, 6, 9, 4, 13, 6, 4, 10, 10, 4, 6, 13, 4, 6, -10, 2, 3, -13, 4, 6, -13, 2, 3, -10, 2, 3, -10, 4, 6, -13, 4, 6, -2, 8, -10, -9, 4, -13, -2, 8, -13, -2, 8, -10, -6, 5.7, -10, -9, 4, -13, 2, 8, 10, 9, 8, 13, 2, 8, 13, 2, 8, 10, 6, 8, 10, 9, 8, 13, 2, 0, -3, 6, 0, -10, 6, 0, -3, 2, 0, -3, 2, 0, -10, 6, 0, -10, -10, 0, -3, -6, 0, -10, -6, 0, -3, -10, 0, -3, -10, 0, -6, -6, 0, -10, -6, 0, -3, -2, 0, -10, -2, 0, -3, -6, 0, -3, -6, 0, -10, -2, 0, -10, -2, 0, -3, 2, 0, -10, 2, 0, -3, -2, 0, -3, -2, 0, -10, 2, 0, -10, -6, 5.714, 10, -2, 8, 13, -9, 4, 13, -6, 5.714, 10, -2, 8, 10, -2, 8, 13, 0, 8, 10, 2, 8, 13, 0, 8, 13, 0, 8, 10, 2, 8, 10, 2, 8, 13, -2, 7, 9, 2, 6, 10, 2, 7, 9, -2, 7, 9, -2, 6, 10, 2, 6, 10, -2, 0, 10, 2, 0, 3, 2, 0, 10, -2, 0, 10, -2, 0, 3, 2, 0, 3, -2, 0, 3, 2, 0, -3, 2, 0, 3, -2, 0, 3, -2, 0, -3, 2, 0, -3, -6, 0, 10, -2, 0, 3, -2, 0, 10, -6, 0, 10, -6, 0, 3, -2, 0, 3, -6, 0, 3, -2, 0, -3, -2, 0, 3, -6, 0, 3, -6, 0, -3, -2, 0, -3, -10, 0, 6, -6, 0, 3, -6, 0, 10, -10, 0, 6, -10, 0, 3, -6, 0, 3, 2, 0, 10, 6, 0, 3, 6, 0, 10, 2, 0, 10, 2, 0, 3, 6, 0, 3, 2, 0, 3, 6, 0, -3, 6, 0, 3, 2, 0, 3, 2, 0, -3, 6, 0, -3, -10, 4, -6, -13, 2, -3, -13, 4, -6, -10, 4, -6, -10, 2, -3, -13, 2, -3, -10, 2, -3, -13, 2, 3, -13, 2, -3, -10, 2, -3, -10, 2, 3, -13, 2, 3, 10, 3, 2, 18, 3, -2, 10, 3, -2, 10, 3, 2, 18, 3, 2, 18, 3, -2, 6, 0, -10, 10, 0, -3, 6, 0, -3, 6, 0, -10, 10, 0, -6, 10, 0, -3, 6, 0, -3, 10, 0, 3, 6, 0, 3, 6, 0, -3, 10, 0, -3, 10, 0, 3, 10, 0, -3, 18, 0, 3, 10, 0, 3, 10, 0, -3, 18, 0, -3, 18, 0, 3, -10, 2, 3, -6, 0, -3, -6, 0, 3, -10, 2, 3, -10, 2, -3, -6, 0, -3, 18, 0, -3, 22, 0, 3, 18, 0, 3, 18, 0, -3, 22, 0, -3, 22, 0, 3, 22, 0, -3, 28, 2, 3, 22, 0, 3, 22, 0, -3, 28, 2, -3, 28, 2, 3, 28, 2, 3, 22, 0, 6, 22, 0, 3, 28, 2, 3, 28, 2, 6, 22, 0, 6, 22, 0, 3, 18, 0, 6, 18, 0, 3, 22, 0, 3, 22, 0, 6, 18, 0, 6, 22, 0, -3, 28, 2, -6, 28, 2, -3, 22, 0, -3, 22, 0, -6, 28, 2, -6, 18, 0, -3, 22, 0, -6, 22, 0, -3, 18, 0, -3, 18, 0, -6, 22, 0, -6, 18, 4, 6, 9, 4, 13, 13, 4, 6, 18, 4, 6, 18, 4, 13, 9, 4, 13, 13, 4, -6, 18, 4, -13, 18, 4, -6, 13, 4, -6, 9, 4, -13, 18, 4, -13, 28, 2, -6, 33, 2, -3, 28, 2, -3, 28, 2, -6, 33, 2, -6, 33, 2, -3, 28, 2, 3, 33, 2, 6, 28, 2, 6, 28, 2, 3, 33, 2, 3, 33, 2, 6, 28, 2, -3, 33, 2, 3, 28, 2, 3, 28, 2, -3, 33, 2, -3, 33, 2, 3, 22, 4, 6, 18, 4, 13, 18, 4, 6, 22, 4, 6, 22, 4, 13, 18, 4, 13, 28, 2, 6, 22, 4, 13, 22, 4, 6, 28, 2, 6, 28, 2, 13, 22, 4, 13, 18, 4, -6, 22, 4, -13, 22, 4, -6, 18, 4, -6, 18, 4, -13, 22, 4, -13, 22, 4, -6, 28, 2, -13, 28, 2, -6, 22, 4, -6, 22, 4, -13, 28, 2, -13, 28, 2, 6, 33, 2, 13, 28, 2, 13, 28, 2, 6, 33, 2, 6, 33, 2, 13, 28, 2, -13, 33, 2, -6, 28, 2, -6, 28, 2, -13, 33, 2, -13, 33, 2, -6, -2, 8, 18, -9, 4, 13, -2, 8, 13, -2, 8, 18, -9, 4, 18, -9, 4, 13, -2, 8, -15.5, -9, 4, -18, -2, 8, -18, -2, 8, -15.5, -9, 4, -15.5, -9, 4, -18, 6, 8, 18, 2, 8, 13, 9, 8, 13, 6, 8, 18, 2, 8, 18, 2, 8, 13, 0, 8, 18, -2, 8, 13, 0, 8, 13, 0, 8, 18, -2, 8, 18, -2, 8, 13, -9, 4, 13, -19, 4, 6, -13, 4, 6, -9, 4, 13, -15, 4, 13, -19, 4, 6, -13, 2, 3, -19, 2, -3, -13, 2, -3, -13, 2, 3, -19, 2, 3, -19, 2, -3, -13, 4, 6, -19, 2, 3, -13, 2, 3, -13, 4, 6, -19, 4, 6, -19, 2, 3, -13, 4, -6, -15, 4, -13, -9, 4, -13, -13, 4, -6, -19, 4, -6, -15, 4, -13, -13, 2, -3, -19, 4, -6, -13, 4, -6, -13, 2, -3, -19, 2, -3, -19, 4, -6, -12, 4, 18, -9, 4, 13, -9, 4, 18, -9, 4, 13, -12.45, 4, 17.25, -15, 4, 13, -9, 4, 13, -12, 4, 18, -12.45, 4, 17.25, 0, 13.5, 18, 2, 11.5, 21, 2, 13.5, 18, 0, 13.5, 18, 0, 11.5, 21, 2, 11.5, 21, -2, 13.5, 18, 0, 11.5, 21, 0, 13.5, 18, -13.5, 4, -15.5, -9, 4, -18, -9, 4, -15.5, -9, 4, -18, -12.45, 4, -17.25, -12, 4, -18, -9, 4, -18, -13.5, 4, -15.5, -12.45, 4, -17.25, 2, 8, -22, 6, 11.5, -22, 6, 8, -22, 2, 8, -22, 2, 11.5, -22, 6, 11.5, -22, 2, 8, 18, 0, 8, 21, 0, 8, 18, 2, 8, 18, 2, 8, 21, 0, 8, 21, 6, 11.5, -18, 2, 11.5, -22, 2, 11.5, -18, 6, 11.5, -18, 6, 11.5, -22, 2, 11.5, -22, 18, 7.5, -22, 15, 11.5, -18, 18, 7.5, -18, 18, 7.5, -22, 15, 11.5, -22, 15, 11.5, -18, 6, 8, 18, 2, 8, 21, 2, 8, 18, 6, 8, 18, 4, 8, 21, 2, 8, 21, 2, 13.5, 18, 4, 11.5, 21, 6, 13.5, 18, 2, 13.5, 18, 2, 11.5, 21, 4, 11.5, 21, 0, 8, 18, 0, 8, 21, -2, 8, 18, 18, 7.5, -18, 22, 7.5, -22, 18, 7.5, -22, 18, 7.5, -18, 22, 7.5, -18, 22, 7.5, -22, 8, 8, -22, 6, 8, -22, 6, 11.5, -22, 18, 7.5, -22, 8, 8, -22, 6, 11.5, -22, 18, 7.5, -22, 16, 4, -22, 8, 8, -22, 22, 4, -18, 22, 7.5, -22, 22, 7.5, -18, 22, 4, -18, 22, 4, -22, 22, 7.5, -22, 18, 7.5, -22, 22, 4, -22, 18, 4, -22, 18, 7.5, -22, 22, 7.5, -22, 22, 4, -22, 22, 7.5, -18, 22, 4, -13, 22, 4, -18, 22, 7.5, -18, 22, 7.5, -13, 22, 4, -13, 18, 4, -18, 18, 7.5, -13, 18, 7.5, -18, 18, 4, -18, 18, 4, -13, 18, 7.5, -13, 18, 7.5, -18, 22, 7.5, -13, 22, 7.5, -18, 18, 7.5, -18, 18, 7.5, -13, 22, 7.5, -13, 6, 11.5, -18, 15, 11.5, -22, 6, 11.5, -22, 6, 11.5, -18, 15, 11.5, -18, 15, 11.5, -22, 15, 11.5, -22, 18, 7.5, -22, 6, 11.5, -22, 15, 11.5, -18, 6, 11.5, -18, 18, 7.5, -18, 16, 4, -22, 18, 7.5, -22, 18, 4, -22, 18, 7.5, -18, 8, 8, -18, 16, 4, -18, 18, 7.5, -18, 6, 11.5, -18, 8, 8, -18, 18, 7.5, -18, 16, 4, -18, 18, 4, -18, 8, 8, -18, 6, 11.5, -18, 6, 8, -18, -9, 4, -13, -13.5, 4, -15.5, -9, 4, -15.5, -9, 4, -13, -15, 4, -13, -13.5, 4, -15.5, -2, 8, -13, -9, 4, -15.5, -2, 8, -15.5, -2, 8, -13, -9, 4, -13, -9, 4, -15.5, 2, 8, 18, 0, 8, 13, 2, 8, 13, 2, 8, 18, 0, 8, 18, 0, 8, 13, -2, 8, 10, 0, 8, 13, -2, 8, 13, -2, 8, 10, 0, 8, 10, 0, 8, 13, 2, 11.5, -22, 0, 11.5, -18, 2, 11.5, -18, 0, 8, -18, 2, 11.5, -22, 2, 8, -22, 0, 8, -18, 0, 11.5, -18, 2, 11.5, -22, 7, 7, 11, 11, 7, 13, 11, 7, 11, 7, 7, 11, 9, 7, 13, 11, 7, 13, 11, 8, 11, 9, 8, 13, 7, 8, 11, 11, 8, 11, 11, 8, 13, 9, 8, 13, 11, 7, 13, 18, 4.424, 11, 11, 7, 11, 11, 7, 13, 18, 4.424, 13, 18, 4.424, 11, 11, 8, 11, 22, 4, 13, 11, 8, 13, 11, 8, 11, 22, 4, 11, 22, 4, 13, 10, 2, -3, 18, 3, -2, 18, 2, -3, 10, 2, -3, 10, 3, -2, 18, 3, -2, 10, 3, 2, 18, 2, 3, 18, 3, 2, 10, 3, 2, 10, 2, 3, 18, 2, 3, -2, 6, -10, 2, 7, -9, 2, 6, -10, -2, 6, -10, -2, 7, -9, 2, 7, -9, -2, 7, -9, 2, 7, 9, 2, 7, -9, -2, 7, -9, -2, 7, 9, 2, 7, 9, -19, 21, 6, -14.1675, 25, 3, -19, 21, 3, -19, 21, 6, -14.1675, 25, 4.7167, -14.1675, 25, 3, 28, 21, 13, 22, 25, 8, 22, 21, 13, 28, 21, 13, 28, 25, 8, 22, 25, 8, -19, 21, -3, -14.1675, 25, -4.7167, -19, 21, -6, -19, 21, -3, -14.1675, 25, -3, -14.1675, 25, -4.7167, 22, 21, 13, 18, 25, 8, 18, 21, 13, 22, 21, 13, 22, 25, 8, 18, 25, 8, 18, 21, 13, 6.5365, 25, 8, 9, 21, 13, 18, 21, 13, 18, 25, 8, 6.5365, 25, 8, -19, 21, 3, -14.1675, 25, -3, -19, 21, -3, -19, 21, 3, -14.1675, 25, 3, -14.1675, 25, -3, -19, 21, -6, -10.6854, 25, -10.4733, -15, 21, -13, -19, 21, -6, -14.1675, 25, -4.7167, -10.6854, 25, -10.4733, 33, 21, -6.48, 28, 25, 6, 33, 21, 6.48, 33, 21, -6.48, 28, 25, -6, 28, 25, 6, -2, 21, -18, 0, 25, -13, 0, 21, -18, -2, 21, -18, -2, 25, -13, 0, 25, -13, -15, 21, 13, -14.1675, 25, 4.7167, -19, 21, 6, -15, 21, 13, -10.6854, 25, 10.4733, -14.1675, 25, 4.7167, 22, 21, -13, 28, 25, -8, 28, 21, -13, 22, 21, -13, 22, 25, -8, 28, 25, -8, 6, 21, 18, 2, 25, 13, 2, 21, 18, -12, 21, -18, -9.2125, 25, -12.9275, -9, 21, -18, 18, 21, -13, 22, 25, -8, 22, 21, -13, 18, 21, -13, 18, 25, -8, 22, 25, -8, -9, 21, 18, -9, 25, 13, -12, 21, 18, 9, 21, -13, 18, 25, -8, 18, 21, -13, 9, 21, -13, 7.2979, 25, -8, 18, 25, -8, 0, 21, -18, 2, 25, -13, 2, 21, -18, 0, 21, -18, 0, 25, -13, 2, 25, -13, -9, 21, -18, -2, 25, -13, -2, 21, -18, -9, 21, -18, -9.2125, 25, -12.9275, -2, 25, -13, -15, 21, -13, -9.2125, 25, -12.9275, -13.5, 21, -15.5, -15, 21, -13, -10.6854, 25, -10.4733, -9.2125, 25, -12.9275, 33, 21, 6.48, 28, 25, 8, 33, 21, 13, 33, 21, 6.48, 28, 25, 6, 28, 25, 8, -9, 25, 13, -12.45, 21, 17.25, -12, 21, 18, -12.45, 21, 17.25, -10.6854, 25, 10.4733, -15, 21, 13, -12.45, 21, 17.25, -9, 25, 13, -10.6854, 25, 10.4733, 33, 21, -13, 28, 25, -6, 33, 21, -6.48, 33, 21, -13, 28, 25, -8, 28, 25, -6, -2, 21, 18, -9, 25, 13, -9, 21, 18, -2, 21, 18, -2, 25, 13, -9, 25, 13, 0, 21, 18, -2, 25, 13, -2, 21, 18, 0, 21, 18, 0, 25, 13, -2, 25, 13, -13.5, 21, -15.5, -9.2125, 25, -12.9275, -12.45, 21, -17.25, -12.45, 21, -17.25, -9.2125, 25, -12.9275, -12, 21, -18, 6, 21, -15.5, 7.2979, 25, -8, 9, 21, -13, 6, 21, -15.5, 2, 25, -13, 7.2979, 25, -8, 28, 21, -13, 28, 25, -8, 33, 21, -13, 2, 21, 18, 0, 25, 13, 0, 21, 18, 2, 21, 18, 2, 25, 13, 0, 25, 13, 9, 21, 13, 2, 25, 13, 6, 21, 18, 9, 21, 13, 6.5365, 25, 8, 2, 25, 13, 33, 21, 13, 28, 25, 8, 28, 21, 13, 2, 21, -18, 2, 25, -13, 6, 21, -18, 6, 21, -18, 2, 25, -13, 6, 21, -15.5, -19, 14, -1, -16, 15, -2, -19, 15, -2, -19, 14, -1, -17, 14, -1, -16, 15, -2, -17, 14, -1, -16, 15, 2, -16, 15, -2, -17, 14, -1, -17, 14, 1, -16, 15, 2, -17, 14, 1, -19, 15, 2, -16, 15, 2, -17, 14, 1, -19, 14, 1, -19, 15, 2, -19, 14, -1, -17, 14, 1, -17, 14, -1, -19, 14, -1, -19, 14, 1, -17, 14, 1, 9, 13.5, -16, 18, 21, -16, 18, 13.5, -16, 9, 13.5, -16, 9, 21, -16, 18, 21, -16, 33, 13.5, 16, 28, 21, 16, 28, 13.5, 16, 33, 13.5, 16, 33, 21, 16, 28, 21, 16, 22, 13.5, 16, 18, 21, 16, 18, 13.5, 16, 22, 13.5, 16, 22, 21, 16, 18, 21, 16, 28, 13.5, -16, 33, 21, -16, 33, 13.5, -16, 28, 13.5, -16, 28, 21, -16, 33, 21, -16, 22, 13.5, -16, 28, 21, -16, 28, 13.5, -16, 22, 13.5, -16, 22, 21, -16, 28, 21, -16, 18, 13.5, -16, 22, 21, -16, 22, 13.5, -16, 18, 13.5, -16, 18, 21, -16, 22, 21, -16, 18, 13.5, 16, 9, 21, 16, 9, 13.5, 16, 18, 13.5, 16, 18, 21, 16, 9, 21, 16, 28, 13.5, 16, 22, 21, 16, 22, 13.5, 16, 28, 13.5, 16, 28, 21, 16, 22, 21, 16, 28, 21, 13, 33, 21, 16, 33, 21, 13, 28, 21, 13, 28, 21, 16, 33, 21, 16, 28, 13.5, -13, 33, 13.5, -16, 33, 13.5, -13, 28, 13.5, -13, 28, 13.5, -16, 33, 13.5, -16, 22, 21, 13, 28, 21, 16, 28, 21, 13, 22, 21, 13, 22, 21, 16, 28, 21, 16, 22, 13.5, 13, 18, 13.5, 16, 18, 13.5, 13, 22, 13.5, 13, 22, 13.5, 16, 18, 13.5, 16, 18, 21, 13, 22, 21, 16, 22, 21, 13, 18, 21, 13, 18, 21, 16, 22, 21, 16, 33, 13.5, 13, 28, 13.5, 16, 28, 13.5, 13, 33, 13.5, 13, 33, 13.5, 16, 28, 13.5, 16, 9, 21, 13, 18, 21, 16, 18, 21, 13, 9, 21, 13, 9, 21, 16, 18, 21, 16, 9, 21, -13, 9, 13.5, -16, 9, 13.5, -13, 9, 21, -13, 9, 21, -16, 9, 13.5, -16, 9, 13.5, -13, 18, 13.5, -16, 18, 13.5, -13, 9, 13.5, -13, 9, 13.5, -16, 18, 13.5, -16, 28, 21, -13, 22, 21, -16, 22, 21, -13, 28, 21, -13, 28, 21, -16, 22, 21, -16, 28, 13.5, 13, 22, 13.5, 16, 22, 13.5, 13, 28, 13.5, 13, 28, 13.5, 16, 22, 13.5, 16, 9, 13.5, 13, 9, 21, 16, 9, 21, 13, 9, 13.5, 13, 9, 13.5, 16, 9, 21, 16, 22, 21, -13, 18, 21, -16, 18, 21, -13, 22, 21, -13, 22, 21, -16, 18, 21, -16, 18, 13.5, 13, 9, 13.5, 16, 9, 13.5, 13, 18, 13.5, 13, 18, 13.5, 16, 9, 13.5, 16, 33, 13.5, -13, 33, 21, -16, 33, 21, -13, 33, 13.5, -13, 33, 13.5, -16, 33, 21, -16, 18, 21, -13, 9, 21, -16, 9, 21, -13, 18, 21, -13, 18, 21, -16, 9, 21, -16, 18, 13.5, -13, 22, 13.5, -16, 22, 13.5, -13, 18, 13.5, -13, 18, 13.5, -16, 22, 13.5, -16, 33, 21, 13, 33, 13.5, 16, 33, 13.5, 13, 33, 21, 13, 33, 21, 16, 33, 13.5, 16, 33, 21, -13, 28, 21, -16, 28, 21, -13, 33, 21, -13, 33, 21, -16, 28, 21, -16, 22, 13.5, -13, 28, 13.5, -16, 28, 13.5, -13, 22, 13.5, -13, 22, 13.5, -16, 28, 13.5, -16, -28.9827, -7.4685, 31.0822, -28.9827, 25, -31.0822, -28.9827, 25, 31.0822, -28.9827, -7.4685, 31.0822, -28.9827, -7.4685, -31.0822, -28.9827, 25, -31.0822, -28.9827, -7.4685, -31.0822, 44.9827, 25, -31.0822, -28.9827, 25, -31.0822, -28.9827, -7.4685, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, 25, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, 25, 31.0822, 44.9827, 25, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, -7.4685, 31.0822, 44.9827, 25, 31.0822, 44.9827, -7.4685, 31.0822, -28.9827, 25, 31.0822, 44.9827, 25, 31.0822, 44.9827, -7.4685, 31.0822, -28.9827, -7.4685, 31.0822, -28.9827, 25, 31.0822, -28.9827, -7.4685, -31.0822, 44.9827, -7.4685, 31.0822, 44.9827, -7.4685, -31.0822, -28.9827, -7.4685, -31.0822, -28.9827, -7.4685, 31.0822, 44.9827, -7.4685, 31.0822, 44.9827, 25, 31.0822, 28, 25, 8, 28, 25, 6, 44.9827, 25, 31.0822, 28, 25, -8, 44.9827, 25, -31.0822, 28, 25, -6, 28, 25, -8, 44.9827, 25, 31.0822, 44.9827, 25, -31.0822, 28, 25, -8, 22, 25, -8, 44.9827, 25, -31.0822, 22, 25, -8, 18, 25, -8, 44.9827, 25, -31.0822, 18, 25, -8, 7.2979, 25, -8, 44.9827, 25, -31.0822, 7.2979, 25, -8, 2, 25, -13, -28.9827, 25, -31.0822, 44.9827, 25, -31.0822, 2, 25, -13, -28.9827, 25, -31.0822, 0, 25, -13, -2, 25, -13, -28.9827, 25, -31.0822, -2, 25, -13, -9.2125, 25, -12.9275, -28.9827, 25, -31.0822, -9.2125, 25, -12.9275, -10.6854, 25, -10.4733, -28.9827, 25, -31.0822, -10.6854, 25, -10.4733, -14.1675, 25, -4.7167, -28.9827, 25, -31.0822, -14.1675, 25, -4.7167, -14.1675, 25, -3, -28.9827, 25, -31.0822, -14.1675, 25, -3, -14.1675, 25, 3, -28.9827, 25, 31.0822, -14.1675, 25, 3, -14.1675, 25, 4.7167, -28.9827, 25, 31.0822, -14.1675, 25, 4.7167, -10.6854, 25, 10.4733, -28.9827, 25, 31.0822, -10.6854, 25, 10.4733, -9, 25, 13, -28.9827, 25, 31.0822, -9, 25, 13, -2, 25, 13, -28.9827, 25, 31.0822, -2, 25, 13, 0, 25, 13, -28.9827, 25, 31.0822, 0, 25, 13, 2, 25, 13, 44.9827, 25, 31.0822, 2, 25, 13, 6.5365, 25, 8, 44.9827, 25, 31.0822, 6.5365, 25, 8, 18, 25, 8, 44.9827, 25, 31.0822, 18, 25, 8, 22, 25, 8, 44.9827, 25, 31.0822, 22, 25, 8, 28, 25, 8, 28, 25, 6, 28, 25, -6, 44.9827, 25, 31.0822, -28.9827, 25, -31.0822, 2, 25, -13, 0, 25, -13, -28.9827, 25, -31.0822, -14.1675, 25, 3, -28.9827, 25, 31.0822, -28.9827, 25, 31.0822, 2, 25, 13, 44.9827, 25, 31.0822, -2, 5, -10, -6, 4, -10, -2, 6, -10, -2, 5, -10, -6, 3, -10, -6, 4, -10, 10, 0, -6, 10, 2, -3, 10, 0, -3, 10, 2, -3, 10, 3, -6, 10, 3, -4, 10, 2, -3, 10, 0, -6, 10, 3, -6, 2, 5, 10, 6, 4, 10, 2, 6, 10, 2, 5, 10, 6, 3, 10, 6, 4, 10, -10, 2, 3, -10, 3, 6, -10, 4, 6, -6, 3, -10, -10, 4, -6, -6, 4, -10, -6, 3, -10, -10, 3, -6, -10, 4, -6, 10, 3, -6, 6, 4, -10, 10, 4, -6, 10, 3, -6, 6, 3, -10, 6, 4, -10, 6, 3, 10, 10, 4, 6, 6, 4, 10, 6, 3, 10, 10, 3, 6, 10, 4, 6, -10, 3, 6, -6, 4, 10, -10, 4, 6, -10, 3, 6, -6, 3, 10, -6, 4, 10, 6, 4, -10, 9, 8, -13, 9, 4, -13, 6, 4, -10, 6, 8, -10, 9, 8, -13, -6, 4, 10, -6, 5.714, 10, -9, 4, 13, 9, 4, 13, 6, 8, 10, 6, 4, 10, 9, 4, 13, 9, 8, 13, 6, 8, 10, 2, 6, -10, 6, 8, -10, 6, 4, -10, 2, 6, -10, 2, 8, -10, 6, 8, -10, -2, 6, 10, -6, 5.714, 10, -6, 4, 10, -2, 6, 10, -2, 8, 10, -6, 5.714, 10, -9, 4, -13, -6, 5.7, -10, -6, 4, -10, 9, 8, -13, 18, 4, -13, 9, 4, -13, 9, 8, -13, 18, 7.5, -13, 18, 4, -13, 28, 2, 13, 33, 8, 13, 28, 8, 13, 28, 2, 13, 33, 2, 13, 33, 8, 13, 22, 4, 13, 28, 8, 13, 22, 8, 13, 22, 4, 13, 28, 2, 13, 28, 8, 13, 6, 4, 10, 2, 8, 10, 2, 6, 10, 6, 4, 10, 6, 8, 10, 2, 8, 10, 18, 4, 13, 22, 8, 13, 18, 8, 13, 18, 4, 13, 22, 4, 13, 22, 8, 13, 9, 4, 13, 18, 8, 13, 9, 8, 13, 9, 4, 13, 18, 4, 13, 18, 8, 13, -6, 4, -10, -2, 8, -10, -2, 6, -10, -6, 4, -10, -6, 5.7, -10, -2, 8, -10, 2, 7, 9, 2, 8, 10, 2, 8, 9, 2, 7, 9, 2, 6, 10, 2, 8, 10, -6, 3, 10, -2, 6, 10, -6, 4, 10, -6, 3, 10, -2, 5, 10, -2, 6, 10, -2, 5, 10, 2, 6, 10, -2, 6, 10, -2, 5, 10, 2, 5, 10, 2, 6, 10, 6, 3, -10, 2, 6, -10, 6, 4, -10, 6, 3, -10, 2, 5, -10, 2, 6, -10, 2, 5, -10, -2, 6, -10, 2, 6, -10, 2, 5, -10, -2, 5, -10, -2, 6, -10, -2, 8, 9, -2, 6, 10, -2, 7, 9, -2, 8, 9, -2, 8, 10, -2, 6, 10, -10, 2, -3, -10, 0, -3, -6, 0, -3, -10, 3, -6, -10, 2, -3, -10, 4, -6, 10, 2, -3, 18, 0, -3, 10, 0, -3, 10, 2, -3, 18, 2, -3, 18, 0, -3, 10, 3, 2, 10, 4, -3, 10, 4, 3, 10, 3, 2, 10, 3, -2, 10, 4, -3, -10, 0, -6, -10, 2, -3, -10, 3, -6, -10, 0, -6, -10, 0, -3, -10, 2, -3, 2, 0, -10, -2, 5, -10, 2, 5, -10, 2, 0, -10, -2, 0, -10, -2, 5, -10, 6, 0, -10, 2, 5, -10, 6, 3, -10, 6, 0, -10, 2, 0, -10, 2, 5, -10, -2, 0, 10, 2, 5, 10, -2, 5, 10, -2, 0, 10, 2, 0, 10, 2, 5, 10, -6, 0, 10, -2, 5, 10, -6, 3, 10, -6, 0, 10, -2, 0, 10, -2, 5, 10, -10, 0, 6, -6, 3, 10, -10, 3, 6, -10, 0, 6, -6, 0, 10, -6, 3, 10, 6, 0, 10, 10, 3, 6, 6, 3, 10, 6, 0, 10, 10, 0, 6, 10, 3, 6, 10, 0, -6, 6, 3, -10, 10, 3, -6, 10, 0, -6, 6, 0, -10, 6, 3, -10, -6, 0, -10, -10, 3, -6, -6, 3, -10, -6, 0, -10, -10, 0, -6, -10, 3, -6, -10, 0, 3, -10, 3, 6, -10, 2, 3, -10, 0, 3, -10, 0, 6, -10, 3, 6, 2, 0, 10, 6, 3, 10, 2, 5, 10, 2, 0, 10, 6, 0, 10, 6, 3, 10, 18, 4, -6, 18, 3, -4, 18, 4, -3, 18, 4, -6, 18, 3, -6, 18, 3, -4, -2, 0, -10, -6, 3, -10, -2, 5, -10, -2, 0, -10, -6, 0, -10, -6, 3, -10, 18, 0, -6, 18, 3, -4, 18, 3, -6, 18, 3, -4, 18, 0, -3, 18, 2, -3, 18, 3, -4, 18, 0, -6, 18, 0, -3, 10, 0, 3, 10, 3, 6, 10, 0, 6, 10, 3, 6, 10, 2, 3, 10, 3, 4, 10, 3, 6, 10, 0, 3, 10, 2, 3, 10, 3, 6, 10, 4, 3, 10, 4, 6, 10, 3, 6, 10, 3, 4, 10, 4, 3, 10, 3, -4, 10, 4, -6, 10, 4, -3, 10, 3, -4, 10, 3, -6, 10, 4, -6, 18, 3, -2, 18, 4, 3, 18, 4, -3, 18, 3, -2, 18, 3, 2, 18, 4, 3, 18, 4, 3, 18, 3, 6, 18, 4, 6, 18, 4, 3, 18, 3, 4, 18, 3, 6, 18, 0, 3, 18, 3, 4, 18, 2, 3, 18, 3, 4, 18, 0, 6, 18, 3, 6, 18, 3, 4, 18, 0, 3, 18, 0, 6, 18, 3, 6, 22, 4, 6, 18, 4, 6, 18, 3, 6, 22, 3, 6, 22, 4, 6, 18, 4, -6, 22, 3, -6, 18, 3, -6, 18, 4, -6, 22, 4, -6, 22, 3, -6, 22, 3, 6, 28, 2, 6, 22, 4, 6, 22, 3, 6, 22, 0, 6, 28, 2, 6, 22, 4, -6, 22, 0, -6, 22, 3, -6, 22, 4, -6, 28, 2, -6, 22, 0, -6, 18, 0, 6, 22, 3, 6, 18, 3, 6, 18, 0, 6, 22, 0, 6, 22, 3, 6, 22, 0, -6, 18, 3, -6, 22, 3, -6, 22, 0, -6, 18, 0, -6, 18, 3, -6, 22, 7.5, -13, 28, 2, -13, 22, 4, -13, 22, 7.5, -13, 28, 8, -13, 28, 2, -13, 28, 8, -13, 33, 2, -13, 28, 2, -13, 28, 8, -13, 33, 8, -13, 33, 2, -13, 33, 2, -6, 33, 8, -6.48, 33, 2, -3, 33, 2, 6, 33, 8, 13, 33, 2, 13, 33, 2, 6, 33, 8, 6.48, 33, 8, 13, 33, 2, -3, 33, 8, 6.48, 33, 2, 3, 33, 2, -3, 33, 8, -6.48, 33, 8, 6.48, 33, 2, -13, 33, 8, -6.48, 33, 2, -6, 33, 2, -13, 33, 8, -13, 33, 8, -6.48, 33, 2, 3, 33, 8, 6.48, 33, 2, 6, 33, 13.5, -13, 33, 21, -6.48, 33, 8, -6.48, 33, 13.5, -13, 33, 21, -13, 33, 21, -6.48, 33, 13.5, 13, 31.5, 21, 13, 31.5, 13.5, 13, 33, 13.5, 13, 33, 21, 13, 31.5, 21, 13, 33, 8, 6.48, 33, 21, 13, 33, 13.5, 13, 33, 8, 6.48, 33, 21, 6.48, 33, 21, 13, 9, 13.5, 13, 6, 8, 18, 9, 8, 13, 9, 13.5, 13, 6, 13.5, 18, 6, 8, 18, 6, 12.5, -15.5, 6, 21, -18, 6, 21, -15.5, 6, 12.5, -15.5, 6, 11.5, -18, 6, 21, -18, 0, 11.5, -18, 2, 21, -18, 2, 11.5, -18, 0, 11.5, -18, 0, 21, -18, 2, 21, -18, -9, 11.5, 18, -12, 21, 18, -12, 11.5, 18, -9, 11.5, 18, -9, 21, 18, -12, 21, 18, 0, 13.5, 18, -2, 21, 18, -2, 13.5, 18, 0, 13.5, 18, 0, 21, 18, -2, 21, 18, -12.45, 11.5, -17.25, -12, 21, -18, -12, 11.5, -18, -12.45, 11.5, -17.25, -12.45, 21, -17.25, -12, 21, -18, -2, 13.5, 18, -9, 21, 18, -9, 11.5, 18, -2, 13.5, 18, -2, 21, 18, -9, 21, 18, -9, 11.5, -18, -2, 21, -18, -2, 11.5, -18, -9, 11.5, -18, -9, 21, -18, -2, 21, -18, 6, 13.5, 18, 2, 21, 18, 2, 13.5, 18, 6, 13.5, 18, 6, 21, 18, 2, 21, 18, 2, 11.5, -18, 6, 21, -18, 6, 11.5, -18, 2, 11.5, -18, 2, 21, -18, 6, 21, -18, -12, 11.5, -18, -9, 21, -18, -9, 11.5, -18, -12, 11.5, -18, -12, 21, -18, -9, 21, -18, -12, 4, -18, -9, 11.5, -18, -9, 4, -18, -12, 4, -18, -12, 11.5, -18, -9, 11.5, -18, 6, 13.5, 18, 4, 8, 21, 6, 8, 18, 6, 13.5, 18, 4, 11.5, 21, 4, 8, 21, -9, 4, -18, -2, 11.5, -18, -2, 8, -18, -9, 4, -18, -9, 11.5, -18, -2, 11.5, -18, -2, 8, 18, -9, 11.5, 18, -9, 4, 18, -2, 8, 18, -2, 13.5, 18, -9, 11.5, 18, -12.45, 4, -17.25, -12, 11.5, -18, -12, 4, -18, -12.45, 4, -17.25, -12.45, 11.5, -17.25, -12, 11.5, -18, -9, 4, 18, -12, 11.5, 18, -12, 4, 18, -9, 4, 18, -9, 11.5, 18, -12, 11.5, 18, -19, 4, 6, -19, 4, 3, -19, 2, 3, 9, 21, 13, 6, 13.5, 18, 9, 13.5, 13, 9, 21, 13, 6, 21, 18, 6, 13.5, 18, 28, 8, 13, 22, 13.5, 13, 22, 8, 13, 28, 8, 13, 28, 13.5, 13, 22, 13.5, 13, 33, 8, 6.48, 33, 13.5, 13, 33, 8, 13, 18, 8, 13, 9, 13.5, 13, 9, 8, 13, 18, 8, 13, 18, 13.5, 13, 9, 13.5, 13, 18, 7.5, -13, 22, 13.5, -13, 22, 7.5, -13, 18, 7.5, -13, 18, 13.5, -13, 22, 13.5, -13, 22, 7.5, -13, 28, 13.5, -13, 28, 8, -13, 22, 7.5, -13, 22, 13.5, -13, 28, 13.5, -13, 28, 8, -13, 33, 13.5, -13, 33, 8, -13, 28, 8, -13, 28, 13.5, -13, 33, 13.5, -13, 22, 8, 13, 18, 13.5, 13, 18, 8, 13, 22, 8, 13, 22, 13.5, 13, 18, 13.5, 13, 33, 8, 13, 28, 13.5, 13, 28, 8, 13, 33, 8, 13, 33, 13.5, 13, 28, 13.5, 13, 9, 8, -13, 18, 13.5, -13, 18, 7.5, -13, 9, 8, -13, 9, 13.5, -13, 18, 13.5, -13, 33, 8, -13, 33, 13.5, -13, 33, 8, -6.48, 2, 8, 21, 0, 11.5, 21, 0, 8, 21, 2, 8, 21, 2, 11.5, 21, 0, 11.5, 21, 4, 8, 21, 2, 11.5, 21, 2, 8, 21, 4, 8, 21, 4, 11.5, 21, 2, 11.5, 21, -2, 8, 18, 0, 11.5, 21, -2, 13.5, 18, -2, 8, 18, 0, 8, 21, 0, 11.5, 21, -10, 0, 3, -10, 2, 3, -6, 0, 3, 9, 8, -13, 6, 12.5, -15.5, 9, 13.5, -13, 9, 8, -13, 6, 8, -15.5, 6, 12.5, -15.5, 9, 13.5, -13, 6, 21, -15.5, 9, 21, -13, 9, 13.5, -13, 6, 12.5, -15.5, 6, 21, -15.5, 2, 13.5, 18, 0, 21, 18, 0, 13.5, 18, 2, 13.5, 18, 2, 21, 18, 0, 21, 18, 6, 8, -15.5, 6, 11.5, -18, 6, 12.5, -15.5, 6, 8, -15.5, 6, 8, -18, 6, 11.5, -18, -2, 11.5, -18, 0, 21, -18, 0, 11.5, -18, -2, 11.5, -18, -2, 21, -18, 0, 21, -18, 0, 11.5, -18, -2, 8, -18, -2, 11.5, -18, 0, 11.5, -18, 0, 8, -18, -2, 8, -18, 7, 7, 11, 11, 8, 11, 7, 8, 11, 7, 7, 11, 11, 7, 11, 11, 8, 11, 18, 4.424, 13, 18, 3.9697, 11, 18, 4.424, 11, 18, 4.424, 13, 18, 3.9697, 13, 18, 3.9697, 11, 11, 7, 11, 22, 4, 11, 11, 8, 11, 11, 7, 11, 18, 4.424, 11, 22, 4, 11, 18, 4.424, 11, 18, 3.9697, 11, 22, 4, 11, 10, 3, 2, 10, 3, 4, 10, 2, 3, 10, 3, 2, 10, 4, 3, 10, 3, 4, 10, 2, -3, 10, 4, -3, 10, 3, -2, 10, 2, -3, 10, 3, -4, 10, 4, -3, 18, 3, -2, 18, 3, -4, 18, 2, -3, 18, 3, -2, 18, 4, -3, 18, 3, -4, 18, 2, 3, 18, 4, 3, 18, 3, 2, 18, 2, 3, 18, 3, 4, 18, 4, 3, 10, 0, 3, 18, 2, 3, 10, 2, 3, 10, 0, 3, 18, 0, 3, 18, 2, 3, -2, 8, -10, -2, 7, -9, -2, 6, -10, -2, 8, -10, -2, 8, -9, -2, 7, -9, -2, 8, -9, -2, 7, 9, -2, 7, -9, -2, 8, -9, -2, 8, 9, -2, 7, 9, 2, 6, -10, 2, 8, -9, 2, 8, -10, 2, 6, -10, 2, 7, -9, 2, 8, -9, 2, 7, -9, 2, 8, 9, 2, 8, -9, 2, 7, -9, 2, 7, 9, 2, 8, 9, -19, 2, 3, -19, 4, -3, -19, 2, -3, -19, 2, 3, -19, 4, 3, -19, 4, -3, -19, 2, -3, -19, 4, -3, -19, 4, -6, -12, 4, 18, -12.45, 11.5, 17.25, -12.45, 4, 17.25, -12, 4, 18, -12, 11.5, 18, -12.45, 11.5, 17.25, -12, 11.5, 18, -12.45, 21, 17.25, -12.45, 11.5, 17.25, -12, 11.5, 18, -12, 21, 18, -12.45, 21, 17.25, 31.5, 13.5, -13, 33, 21, -13, 33, 13.5, -13, 31.5, 13.5, -13, 31.5, 21, -13, 33, 21, -13, 33, 8, 6.48, 33, 21, -6.48, 33, 21, 6.48, 33, 8, 6.48, 33, 8, -6.48, 33, 21, -6.48, -19, 11.5, 6, -19, 21, 3, -19, 11.5, 3, -19, 11.5, 6, -19, 21, 6, -19, 21, 3, -19, 11.5, -3, -19, 21, -6, -19, 11.5, -6, -19, 11.5, -3, -19, 21, -3, -19, 21, -6, -19, 11.5, 3, -19, 21, -3, -19, 11.5, -3, -19, 11.5, 3, -19, 21, 3, -19, 21, -3, -19, 11.5, -6, -15, 21, -13, -15, 11.5, -13, -19, 11.5, -6, -19, 21, -6, -15, 21, -13, -12.45, 11.5, 17.25, -15, 21, 13, -15, 11.5, 13, -12.45, 11.5, 17.25, -12.45, 21, 17.25, -15, 21, 13, -15, 11.5, 13, -19, 21, 6, -19, 11.5, 6, -15, 11.5, 13, -15, 21, 13, -19, 21, 6, -15, 4, 13, -19, 11.5, 6, -19, 4, 6, -15, 4, 13, -15, 11.5, 13, -19, 11.5, 6, -12.45, 4, 17.25, -15, 11.5, 13, -15, 4, 13, -12.45, 4, 17.25, -12.45, 11.5, 17.25, -15, 11.5, 13, -19, 4, -6, -15, 11.5, -13, -15, 4, -13, -19, 4, -6, -19, 11.5, -6, -15, 11.5, -13, -19, 4, 3, -19, 11.5, -3, -19, 4, -3, -19, 4, 3, -19, 11.5, 3, -19, 11.5, -3, -19, 4, -6, -19, 11.5, -3, -19, 11.5, -6, -19, 4, -6, -19, 4, -3, -19, 11.5, -3, -15, 4, -13, -13.5, 11.5, -15.5, -13.5, 4, -15.5, -15, 4, -13, -15, 11.5, -13, -13.5, 11.5, -15.5, -15, 11.5, -13, -13.5, 21, -15.5, -13.5, 11.5, -15.5, -15, 11.5, -13, -15, 21, -13, -13.5, 21, -15.5, -19, 11.5, 6, -19, 4, 3, -19, 4, 6, -19, 11.5, 6, -19, 11.5, 3, -19, 4, 3, -13.5, 4, -15.5, -12.45, 11.5, -17.25, -12.45, 4, -17.25, -13.5, 4, -15.5, -13.5, 11.5, -15.5, -12.45, 11.5, -17.25, -13.5, 11.5, -15.5, -12.45, 21, -17.25, -12.45, 11.5, -17.25, -13.5, 11.5, -15.5, -13.5, 21, -15.5, -12.45, 21, -17.25, 28, 13.5, -13, 31.5, 21, -13, 31.5, 13.5, -13, 28, 13.5, -13, 28, 21, -13, 31.5, 21, -13, 9, 13.5, -13, 18, 21, -13, 18, 13.5, -13, 9, 13.5, -13, 9, 21, -13, 18, 21, -13, 31.5, 13.5, 13, 28, 21, 13, 28, 13.5, 13, 31.5, 13.5, 13, 31.5, 21, 13, 28, 21, 13, 22, 13.5, 13, 18, 21, 13, 18, 13.5, 13, 22, 13.5, 13, 22, 21, 13, 18, 21, 13, 22, 13.5, -13, 28, 21, -13, 28, 13.5, -13, 22, 13.5, -13, 22, 21, -13, 28, 21, -13, 18, 13.5, -13, 22, 21, -13, 22, 13.5, -13, 18, 13.5, -13, 18, 21, -13, 22, 21, -13, 18, 13.5, 13, 9, 21, 13, 9, 13.5, 13, 18, 13.5, 13, 18, 21, 13, 9, 21, 13, 28, 13.5, 13, 22, 21, 13, 22, 13.5, 13, 28, 13.5, 13, 28, 21, 13, 22, 21, 13, 10, 4, -3, 13, 4, -6, 13, 4, -3, 10, 4, -3, 10, 4, -6, 13, 4, -6, 0, 8, 9, -2, 8, 10, -2, 8, 9, 0, 8, 9, 0, 8, 10, -2, 8, 10, 6, 8, -10, 2, 8, -13, 9, 8, -13, 6, 8, -10, 2, 8, -10, 2, 8, -13, 0, 8, -10, -2, 8, -13, 0, 8, -13, 0, 8, -10, -2, 8, -10, -2, 8, -13, 10, 4, 6, 13, 4, 3, 13, 4, 6, 10, 4, 6, 10, 4, 3, 13, 4, 3, 10, 4, 3, 13, 4, -3, 13, 4, 3, 10, 4, 3, 10, 4, -3, 13, 4, -3, 13, 4, -3, 18, 4, 3, 13, 4, 3, 13, 4, -3, 18, 4, -3, 18, 4, 3, 13, 4, 3, 18, 4, 6, 13, 4, 6, 13, 4, 3, 18, 4, 3, 18, 4, 6, 13, 4, -6, 18, 4, -3, 13, 4, -3, 13, 4, -6, 18, 4, -6, 18, 4, -3, 6, 8, -15.5, 2, 8, -18, 6, 8, -18, 6, 8, -15.5, 2, 8, -15.5, 2, 8, -18, 0, 8, -15.5, -2, 8, -18, 0, 8, -18, 0, 8, -15.5, -2, 8, -15.5, -2, 8, -18, 2, 8, -13, 0, 8, -15.5, 2, 8, -15.5, 2, 8, -13, 0, 8, -13, 0, 8, -15.5, 2, 8, -18, 6, 8, -22, 6, 8, -18, 2, 8, -18, 2, 8, -22, 6, 8, -22, 6, 8, -22, 8, 8, -18, 6, 8, -18, 6, 8, -22, 8, 8, -22, 8, 8, -18, 18, 4, -22, 22, 4, -18, 18, 4, -18, 18, 4, -22, 22, 4, -22, 22, 4, -18, 22, 4, -18, 18, 4, -13, 18, 4, -18, 22, 4, -18, 22, 4, -13, 18, 4, -13, 18, 4, -18, 16, 4, -22, 18, 4, -22, 18, 4, -18, 16, 4, -18, 16, 4, -22, 8, 8, -18, 16, 4, -22, 16, 4, -18, 8, 8, -18, 8, 8, -22, 16, 4, -22, 0, 8, -13, -2, 8, -15.5, 0, 8, -15.5, 0, 8, -13, -2, 8, -13, -2, 8, -15.5, 9, 8, -13, 2, 8, -15.5, 6, 8, -15.5, 9, 8, -13, 2, 8, -13, 2, 8, -15.5, 2, 8, -10, 0, 8, -13, 2, 8, -13, 2, 8, -10, 0, 8, -10, 0, 8, -13, 2, 8, 9, 0, 8, 10, 0, 8, 9, 2, 8, 9, 2, 8, 10, 0, 8, 10, 2, 8, -18, 0, 8, -18, 2, 8, -22, 2, 8, -10, 0, 8, -9, 0, 8, -10, 2, 8, -10, 2, 8, -9, 0, 8, -9, 2, 8, -9, 0, 8, 9, 0, 8, -9, 2, 8, -9, 2, 8, 9, 0, 8, 9, 0, 8, -10, -2, 8, -9, -2, 8, -10, 0, 8, -10, 0, 8, -9, -2, 8, -9, 0, 8, -9, -2, 8, 9, -2, 8, -9, 0, 8, -9, 0, 8, 9, -2, 8, 9, -16, 15, -2, -19, 15, 2, -19, 15, -2, -16, 15, -2, -16, 15, 2, -19, 15, 2, 2, 8, -15.5, 0, 8, -18, 2, 8, -18, 2, 8, -15.5, 0, 8, -15.5, 0, 8, -18 ) -[sub_resource type="Animation" id=6] -resource_name = "Default" -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Crosshair:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ) ] -} - -[sub_resource type="Animation" id=7] -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Crosshair:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.1, 0.2 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 0.716667, 0, 1 ), Color( 1, 0.716667, 0, 1 ), Color( 1, 1, 1, 1 ) ] -} -tracks/1/type = "audio" -tracks/1/path = NodePath("Hit_Confirmation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"clips": [ { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource( 3 ) -} ], -"times": PackedFloat32Array( 0 ) -} - -[sub_resource type="Animation" id=8] -length = 0.5 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Crosshair:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.25, 0.5 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 0.0532926, 0, 1 ), Color( 1, 0.0532926, 0, 1 ), Color( 1, 1, 1, 1 ) ] -} -tracks/1/type = "audio" -tracks/1/path = NodePath("Hit_Confirmation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"clips": [ { -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource( 2 ) -} ], -"times": PackedFloat32Array( 0 ) -} - [node name="Level" type="Node3D"] script = null @@ -155,61 +74,6 @@ script = null shape = SubResource( 5 ) script = null -[node name="HUD" type="CanvasLayer" parent="."] -script = null - -[node name="Crosshair" type="Control" parent="HUD"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -rect_pivot_offset = Vector2( 25, 25 ) -script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Crosshair" type="TextureRect" parent="HUD/Crosshair"] -texture_filter = 2 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -32.0 -offset_top = -32.0 -offset_right = 96.0 -offset_bottom = 96.0 -rect_scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) -expand = true -script = null -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="AnimationPlayer" type="AnimationPlayer" parent="HUD/Crosshair"] -autoplay = "Default" -anims/Default = SubResource( 6 ) -anims/Hit = SubResource( 7 ) -anims/Kill = SubResource( 8 ) -blend_times = [ ] -script = null - -[node name="Hit_Confirmation" type="AudioStreamPlayer" parent="HUD/Crosshair"] -stream = ExtResource( 2 ) -script = null - -[node name="Vignette" type="TextureRect" parent="HUD"] -anchor_right = 1.0 -anchor_bottom = 1.0 -texture = ExtResource( 5 ) -expand = true -stretch_mode = 7 -script = null -__meta__ = { -"_edit_use_anchors_": false -} - [node name="Player" parent="." instance=ExtResource( 7 )] [node name="ReflectionProbe" type="ReflectionProbe" parent="."] diff --git a/Game/Main.gd b/Game/Main.gd index 817026f..3fabb6b 100644 --- a/Game/Main.gd +++ b/Game/Main.gd @@ -1,18 +1,21 @@ extends Node -enum GameFocus {IN_MENU, PLAYING, TYPING, AFK} +enum GameFocus {MENU, GAME, CHAT, AWAY} -var mode = GameFocus.IN_MENU +@onready var gui = $GUI +@onready var player = $Level/Player + +var focus = GameFocus.MENU func _input(event) -> void: if Input.is_action_just_pressed("ui_cancel"): - if mode == GameFocus.PLAYING: + if focus == GameFocus.GAME: Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) - $CanvasLayer/GUI.show() - $Level/Player.input_active = false - mode = GameFocus.IN_MENU - elif mode == GameFocus.IN_MENU: + gui.show() + player.input_active = false + focus = GameFocus.MENU + elif focus == GameFocus.MENU: Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - $CanvasLayer/GUI.hide() - $Level/Player.input_active = true - mode = GameFocus.PLAYING + gui.hide() + player.input_active = true + focus = GameFocus.GAME diff --git a/Game/Main.tscn b/Game/Main.tscn index 2f748eb..ca05c90 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Level.tscn" type="PackedScene" id=1] [ext_resource path="res://GUI.tscn" type="PackedScene" id=2] [ext_resource path="res://Main.gd" type="Script" id=3] +[ext_resource path="res://Assets/HUD/HUD.tscn" type="PackedScene" id=4] [node name="Main" type="Node"] script = ExtResource( 3 ) -[node name="CanvasLayer" type="CanvasLayer" parent="."] -layer = 5 -script = null +[node name="HUD" parent="." instance=ExtResource( 4 )] -[node name="GUI" parent="CanvasLayer" instance=ExtResource( 2 )] +[node name="GUI" parent="." instance=ExtResource( 2 )] [node name="Level" parent="." instance=ExtResource( 1 )]