a1.1 : add player's respawn

bindglam · Jan 8, 2024 · 6478b4b · 6478b4b
1 parent e725662
commit 6478b4b
Show file tree

Hide file tree

Showing 19 changed files with 110 additions and 44 deletions.
diff --git a/.godot/editor/M23.tscn-editstate-79c4b31e19f8f083946814c8d1942614.cfg b/.godot/editor/M23.tscn-editstate-79c4b31e19f8f083946814c8d1942614.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/MainMenu/SettingsPanel/ScrollContainer/Options/GraphicsSettings/UseAA")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/YH-001.tscn-editstate-63a557bf271b65999f1037bd2d1835b5.cfg b/.godot/editor/YH-001.tscn-editstate-63a557bf271b65999f1037bd2d1835b5.cfg
@@ -8,7 +8,7 @@ Anim={
 "grid_snap_active": false,
 "grid_step": Vector2(8, 8),
 "grid_visibility": 1,
-"ofs": Vector2(-19.3371, -18.8381),
+"ofs": Vector2(-24.8024, -23.8678),
 "primary_grid_step": Vector2i(8, 8),
 "show_edit_locks": true,
 "show_guides": true,
@@ -32,7 +32,7 @@ Anim={
 "snap_rotation_step": 0.261799,
 "snap_scale": false,
 "snap_scale_step": 0.1,
-"zoom": 23.9729
+"zoom": 19.0273
 }
 3D={
 "fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/MainMenu/SettingsPanel/ScrollContainer/Options/GraphicsSettings/UseAA")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
@@ -19,25 +19,25 @@ dock_filesystem_split=0
 dock_filesystem_display_mode=0
 dock_filesystem_file_sort=0
 dock_filesystem_file_list_display_mode=1
-dock_filesystem_selected_paths=PackedStringArray("res://dialogues/tutorial_en.dialogue")
+dock_filesystem_selected_paths=PackedStringArray("res://scenes/item/weapon/gun/M23.tscn")
 dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scripts/translation/", "res://scripts/item/weapon/", "res://scripts/item/weapon/gun/", "res://scenes/", "res://scenes/map/", "res://scenes/light/", "res://scenes/item/", "res://scenes/item/weapon/", "res://scenes/item/weapon/gun/", "res://scenes/character/", "res://dialogues/", "res://data/", "res://assets/", "res://assets/sounds/", "res://assets/fonts/", "res://assets/arts/", "res://assets/arts/util/", "res://assets/arts/util/bullet/", "res://assets/arts/ui/", "res://assets/arts/tileset/Cyberpunk Tileset/", "res://assets/arts/tileset/Cyberpunk Tileset/Tileset/", "res://assets/arts/tileset/Cyberpunk Tileset/Animation/", "res://assets/arts/item/", "res://assets/arts/item/weapon/", "res://assets/arts/item/weapon/gun/", "res://assets/arts/icons/", "res://assets/arts/icons/item/", "res://assets/arts/icons/item/weapon/", "res://assets/arts/icons/item/weapon/gun/", "res://assets/arts/character/", "res://addons/dialogue_manager/example_balloon/")
 dock_3="Scene,Import"
 dock_4="FileSystem"
 dock_5="Inspector,Node,History"
 
 [EditorNode]
 
-open_scenes=PackedStringArray("res://scenes/ui/main_menu.tscn", "res://scenes/game.tscn", "res://scenes/character/player.tscn", "res://scenes/ui/player_ui.tscn", "res://scenes/map/tutorial_map.tscn", "res://scenes/ui/ending_credits.tscn")
-current_scene="res://scenes/ui/player_ui.tscn"
+open_scenes=PackedStringArray("res://scenes/ui/main_menu.tscn", "res://scenes/game.tscn", "res://scenes/character/player.tscn", "res://scenes/ui/player_ui.tscn", "res://scenes/map/tutorial_map.tscn", "res://scenes/item/weapon/gun/YH-001.tscn", "res://scenes/item/weapon/gun/M23.tscn")
+current_scene="res://scenes/game.tscn"
 center_split_offset=-244
 selected_default_debugger_tab_idx=0
-selected_main_editor_idx=0
+selected_main_editor_idx=2
 selected_bottom_panel_item=0
 
 [ScriptEditor]
 
 open_scripts=["res://scripts/util/BaljeonGi.gd", "res://scripts/ui/balloon.gd", "res://scripts/character/player/camera.gd", "res://scripts/character/Character.gd", "res://scripts/ui/ending_credits.gd", "res://scripts/character/enemy.gd", "res://scripts/character/player/EquipmentSlots.gd", "res://scripts/game.gd", "res://scripts/autoload/Global.gd", "res://scripts/item/weapon/gun/GunItem.gd", "res://scripts/character/player/Inventory.gd", "res://scripts/item/Item.gd", "res://scripts/autoload/ItemDB.gd", "res://scripts/ui/MainMenu.gd", "res://scripts/character/player.gd", "res://scripts/character/player/player_ui.gd", "res://scripts/ui/SettingsPanel.gd", "res://scripts/util/TutorialDoor.gd", "res://scripts/map/tutorial_map.gd", "res://scripts/item/UsableItem.gd", "res://scripts/item/weapon/WeaponItem.gd"]
-selected_script="res://scripts/character/player/player_ui.gd"
+selected_script="res://scripts/character/player.gd"
 open_help=[]
 script_split_offset=70
 list_split_offset=0

diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
@@ -13,3 +13,7 @@ res://scripts/character/player/Inventory.gd
 res://scripts/character/player/player_ui.gd
 res://scenes/ui/ending_credits.tscn
 res://scripts/ui/ending_credits.gd
+res://scenes/item/weapon/gun/YH-001.tscn
+res://scripts/item/weapon/gun/GunItem.gd
+res://scenes/item/weapon/gun/M23.tscn
+res://scripts/item/UsableItem.gd
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/TutorialMap/Door/AudioStreamPlayer2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/main_menu.tscn-editstate-79dd3ab530fc0aed4f9ba21f09ab2efd.cfg b/.godot/editor/main_menu.tscn-editstate-79dd3ab530fc0aed4f9ba21f09ab2efd.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/TutorialMap/Door/AudioStreamPlayer2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/player.tscn-editstate-979140155e1343bb5b984fdca099e138.cfg b/.godot/editor/player.tscn-editstate-979140155e1343bb5b984fdca099e138.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/TutorialMap/Door/AudioStreamPlayer2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/player_ui.tscn-editstate-04181cc18f3bfa2dec0bbca313eaf7f6.cfg b/.godot/editor/player_ui.tscn-editstate-04181cc18f3bfa2dec0bbca313eaf7f6.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/PlayerUI/Label")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
@@ -51,7 +51,7 @@ RichTextLabel:scale=true
 
 [recent_files]
 
-scenes=["res://scenes/ui/ending_credits.tscn", "res://scenes/map/tutorial_map.tscn", "res://scenes/ui/player_ui.tscn", "res://scenes/character/player.tscn", "res://scenes/game.tscn", "res://scenes/ui/main_menu.tscn", "res://dialogues/balloon.tscn", "res://addons/dialogue_manager/example_balloon/example_balloon.tscn", "res://scenes/map/test_map.tscn", "res://scenes/light/flashlight.tscn"]
+scenes=["res://scenes/item/weapon/gun/M23.tscn", "res://scenes/item/weapon/gun/YH-001.tscn", "res://scenes/ui/ending_credits.tscn", "res://scenes/map/tutorial_map.tscn", "res://scenes/ui/player_ui.tscn", "res://scenes/character/player.tscn", "res://scenes/game.tscn", "res://scenes/ui/main_menu.tscn", "res://dialogues/balloon.tscn", "res://addons/dialogue_manager/example_balloon/example_balloon.tscn"]
 scripts=["res://scripts/ui/balloon.gd", "res://scripts/ui/ending_credits.gd", "res://scripts/character/player/Inventory.gd", "res://scripts/util/TutorialDoor.gd", "res://scripts/util/BaljeonGi.gd", "res://addons/dialogue_manager/dialogue_manager.gd", "res://addons/dialogue_manager/dialogue_label.gd", "Object", "res://addons/dialogue_manager/example_balloon/example_balloon.gd", "res://scripts/map/tutorial_map.gd"]
 
 [script_setup]

diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
@@ -3,11 +3,11 @@
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 19,
+"column": 1,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 11,
-"scroll_position": 0.0,
+"row": 57,
+"scroll_position": 50.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -17,12 +17,16 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 2,
+"column": 18,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 43,
-"scroll_position": 30.0,
-"selection": false,
+"row": 176,
+"scroll_position": 0.0,
+"selection": true,
+"selection_from_column": 21,
+"selection_from_line": 175,
+"selection_to_column": 18,
+"selection_to_line": 176,
 "syntax_highlighter": "GDScript"
 }
 
@@ -31,12 +35,16 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 27,
+"column": 28,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 10,
-"scroll_position": 14.0,
-"selection": false,
+"row": 5,
+"scroll_position": 0.0,
+"selection": true,
+"selection_from_column": 12,
+"selection_from_line": 5,
+"selection_to_column": 28,
+"selection_to_line": 5,
 "syntax_highlighter": "GDScript"
 }
 
@@ -45,10 +53,10 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 60,
+"column": 36,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 5,
+"row": 12,
 "scroll_position": 0.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
@@ -87,11 +95,11 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 12,
+"column": 24,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 29,
-"scroll_position": 0.0,
+"row": 13,
+"scroll_position": 13.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -115,11 +123,11 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 23,
+"column": 34,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 58,
-"scroll_position": 0.0,
+"row": 103,
+"scroll_position": 96.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -329,7 +337,7 @@ state={
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
 "row": 53,
-"scroll_position": 43.0,
+"scroll_position": 42.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }

diff --git a/.godot/editor/tutorial_map.tscn-editstate-a9f2f9e422311e08aaf2ef944321f9de.cfg b/.godot/editor/tutorial_map.tscn-editstate-a9f2f9e422311e08aaf2ef944321f9de.cfg
@@ -8,7 +8,7 @@ Anim={
 "grid_snap_active": false,
 "grid_step": Vector2(8, 8),
 "grid_visibility": 1,
-"ofs": Vector2(-141.762, -100.216),
+"ofs": Vector2(-209.96, -120.246),
 "primary_grid_step": Vector2i(8, 8),
 "show_edit_locks": true,
 "show_guides": true,
@@ -32,7 +32,7 @@ Anim={
 "snap_rotation_step": 0.261799,
 "snap_scale": false,
 "snap_scale_step": 0.1,
-"zoom": 3.36359
+"zoom": 1.88775
 }
 3D={
 "fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/TutorialMap/Door/AudioStreamPlayer2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/CanvasModulate")])
diff --git a/scenes/character/player.tscn b/scenes/character/player.tscn
@@ -152,6 +152,10 @@ polygon = PackedVector2Array(-4, 0, -4, -1, 4, -1, 4, 0)
 [node name="Player" type="CharacterBody2D"]
 light_mask = 4
 script = ExtResource("1_rdkek")
+walk_speed = null
+sprint_speed = null
+health = null
+max_health = null
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 texture_filter = 1

diff --git a/scenes/item/weapon/gun/M23.tscn b/scenes/item/weapon/gun/M23.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=11 format=3 uid="uid://b7wjbsp018vl7"]
+[gd_scene load_steps=12 format=3 uid="uid://b7wjbsp018vl7"]
 
 [ext_resource type="Script" path="res://scripts/item/weapon/gun/GunItem.gd" id="1_d35gu"]
 [ext_resource type="Texture2D" uid="uid://cro6q1rkjftx" path="res://assets/arts/item/weapon/gun/M23.png" id="1_yisb3"]
 [ext_resource type="Texture2D" uid="uid://b38cfnhx4te4k" path="res://assets/arts/icons/item/weapon/gun/M23.png" id="2_s0hud"]
 [ext_resource type="AudioStream" uid="uid://cipif5g6d878e" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Pistol Shot 2.wav" id="4_guivc"]
 [ext_resource type="AudioStream" uid="uid://bndo0nsskn6jk" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Mag In 4.wav" id="5_e7y3r"]
+[ext_resource type="AudioStream" uid="uid://dtms4mrjgkr4f" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Mag Out.wav" id="6_pf22e"]
 
 [sub_resource type="Animation" id="Animation_y08rj"]
 length = 0.001
@@ -133,6 +134,7 @@ max_ammo = 8
 reload_time = 2.5
 shoot_type = 1
 camera_shake_amount = 1.0
+aim_amount = 0.09
 damage = 12.0
 cooldown = 325.0
 use_slot = 1
@@ -158,5 +160,8 @@ position = Vector2(17, -8)
 stream = ExtResource("4_guivc")
 volume_db = 10.0
 
-[node name="ReloadSound" type="AudioStreamPlayer2D" parent="."]
+[node name="MagInSound" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_e7y3r")
+
+[node name="MagOutSound" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("6_pf22e")
diff --git a/scenes/item/weapon/gun/YH-001.tscn b/scenes/item/weapon/gun/YH-001.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=11 format=3 uid="uid://dgjjgxivd30ua"]
+[gd_scene load_steps=12 format=3 uid="uid://dgjjgxivd30ua"]
 
 [ext_resource type="Script" path="res://scripts/item/weapon/gun/GunItem.gd" id="1_mx1wm"]
 [ext_resource type="Texture2D" uid="uid://b7u5mr4q8um5h" path="res://assets/arts/icons/item/weapon/gun/YH-001.png" id="2_vq6yq"]
 [ext_resource type="Texture2D" uid="uid://c5qnlwrl36roq" path="res://assets/arts/item/weapon/gun/YH-001.png" id="3_frm3q"]
 [ext_resource type="AudioStream" uid="uid://b7px7maj36xyy" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Assault Rifle Shot 1.wav" id="4_boe8b"]
 [ext_resource type="AudioStream" uid="uid://d2a1cg8ul1cc0" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Mag In.wav" id="5_fbtrv"]
+[ext_resource type="AudioStream" uid="uid://dtms4mrjgkr4f" path="res://assets/sounds/Gun Sounds Pro - HD Remake/Mag Out.wav" id="6_0fsa2"]
 
 [sub_resource type="Animation" id="Animation_mfil0"]
 length = 0.001
@@ -133,6 +134,7 @@ ammo = 20
 max_ammo = 20
 reload_time = 2.0
 camera_shake_amount = 2.0
+aim_amount = 0.1
 damage = 15.0
 cooldown = 800.0
 item_name = "YH-001"
@@ -156,5 +158,8 @@ position = Vector2(20, -6.66667)
 stream = ExtResource("4_boe8b")
 volume_db = 10.0
 
-[node name="ReloadSound" type="AudioStreamPlayer2D" parent="."]
+[node name="MagInSound" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_fbtrv")
+
+[node name="MagOutSound" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("6_0fsa2")
diff --git a/scenes/ui/player_ui.tscn b/scenes/ui/player_ui.tscn
@@ -71,7 +71,7 @@ script = ExtResource("1_tc0tr")
 layout_mode = 1
 offset_right = 120.0
 offset_bottom = 16.0
-text = "Version: a1.0"
+text = "Version: a1.1"
 label_settings = SubResource("LabelSettings_3jbuy")
 
 [node name="Inventory" type="Control" parent="."]

diff --git a/scripts/character/Character.gd b/scripts/character/Character.gd
@@ -177,3 +177,8 @@ func input_item(type):
 	if is_dead: return
 	if selected_item != null:
 		selected_item.input(type)
+
+func tick_item(user):
+	if selected_item != null:
+		if not selected_item is UsableItem: return
+		selected_item.tick(user)
diff --git a/scripts/character/player.gd b/scripts/character/player.gd
@@ -42,6 +42,8 @@ func _process(_delta: float) -> void:
 
 	player_ui.health = health
 	player_ui.max_health = max_health
+
+	tick_item(self)
 
 func _input(event: InputEvent) -> void:
 	if event.is_action_pressed("inv_toggle"):
@@ -61,3 +63,9 @@ func on_damage(damage, damager):
 	super.on_damage(damage, damager)
 
 	player_ui.on_damage(damage, damager)
+
+	if health <= 0:
+		player_ui.switch_screen(Color.RED, Color.TRANSPARENT, 5.0)
+		await get_tree().create_timer(5.0).timeout
+		get_tree().change_scene_to_file("res://scenes/game.tscn")
+		#get_tree().current_scene.queue_free.call_deferred()
diff --git a/scripts/item/UsableItem.gd b/scripts/item/UsableItem.gd
@@ -29,3 +29,6 @@ func use():
 
 func input(_type):
 	pass
+
+func tick(user):
+	pass
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,3 +29,6 @@ func use(): @@
     func input(_type):
     	pass
+    func tick(user):
+    	pass