diff --git a/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg b/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg index f174b91..c692eb9 100644 --- a/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg +++ b/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg @@ -189,4 +189,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18607/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@10371/@VSplitContainer@10195/@HSplitContainer@10197/@HSplitContainer@10199/@Control@10200/@SubViewportContainer@10201/@SubViewport@10202/Tree")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 1d013ea..01dc456 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -26,10 +26,10 @@ dock_5="Inspector,Node,History" [EditorNode] open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/player.tscn", "res://scenes/gun.tscn", "res://scenes/boss.tscn", "res://scenes/tree.tscn") -current_scene="res://scenes/game.tscn" +current_scene="res://scenes/player.tscn" center_split_offset=-317 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=0 +selected_main_editor_idx=2 selected_bottom_panel_item=0 [EditorWindow] diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index f4ec7f4..a4aba3e 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -4,3 +4,6 @@ res://scenes/player.tscn res://scenes/gun.tscn res://scenes/boss.tscn res://scenes/tree.tscn +res://scripts/gun.gd +res://scripts/game.gd +res://scripts/player.gd diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index d77c7fd..9fa89f4 100644 --- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -189,4 +189,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18607/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@10371/@VSplitContainer@10195/@HSplitContainer@10197/@HSplitContainer@10199/@Control@10200/@SubViewportContainer@10201/@SubViewport@10202/Game/Map/BackgroundColor")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg b/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg index f01c7ad..a88ca57 100644 --- a/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg +++ b/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-2073.91, -1275.8), +"ofs": Vector2(-598.838, -538.264), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -34,7 +34,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.385543 +"zoom": 0.826446 } 3D={ "fov": 70.01, @@ -189,4 +189,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18607/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@10371/@VSplitContainer@10195/@HSplitContainer@10197/@HSplitContainer@10199/@Control@10200/@SubViewportContainer@10201/@SubViewport@10202/Tree")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/gun.tscn-folding-e8b70ebe6a89c3504564097573c2ce26.cfg b/.godot/editor/gun.tscn-folding-e8b70ebe6a89c3504564097573c2ce26.cfg index d7c5dcc..9a6d0b4 100644 --- a/.godot/editor/gun.tscn-folding-e8b70ebe6a89c3504564097573c2ce26.cfg +++ b/.godot/editor/gun.tscn-folding-e8b70ebe6a89c3504564097573c2ce26.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("CollisionShape2D"), PackedStringArray("shape"), NodePath("Pivot/Pistol"), PackedStringArray("Transform"), NodePath("Pivot/Pistol/ShootingPoint"), PackedStringArray("Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("CollisionShape2D"), PackedStringArray("shape", "Transform"), NodePath("Pivot/Pistol"), PackedStringArray("Transform"), NodePath("Pivot/Pistol/ShootingPoint"), PackedStringArray("Transform")] resource_unfolds=["res://scenes/gun.tscn::CircleShape2D_o2wld", PackedStringArray("Resource")] nodes_folded=[] diff --git a/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg b/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg index c131ad5..d361b56 100644 --- a/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg +++ b/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-11019.3, -5745.12), +"ofs": Vector2(-705, -508), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -34,7 +34,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.0762776 +"zoom": 1.0 } 3D={ "fov": 70.01, @@ -189,4 +189,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18607/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@10371/@VSplitContainer@10195/@HSplitContainer@10197/@HSplitContainer@10199/@Control@10200/@SubViewportContainer@10201/@SubViewport@10202/Tree")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 395b1e4..ced28be 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -14,7 +14,7 @@ recent_presets=PackedColorArray(0.552941, 0.0980392, 0.843137, 1, 0.768627, 0.11 create_new_node=Rect2(3390, 370, 900, 700) project_settings=Rect2(3240, 370, 1200, 700) export=Rect2(2996, 300, 1144, 810) -editor_settings=Rect2(3067, 304, 900, 700) +editor_settings=Rect2(3067, 304, 1148, 872) search_help=Rect2(3200, 360, 1280, 720) [recent_files] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index add00d1..707d98c 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,3 +1,5 @@ +/usr/share/fonts/TTF +/home/sascha/Godot/Inter /home/sascha/Godot/godot-minimal-theme res://scripts res://scenes diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 3dd68eb..0edc4b6 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -73,11 +73,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 39, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 33, -"scroll_position": 0.0, +"row": 55, +"scroll_position": 46.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -87,10 +87,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 41, +"column": 27, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 20, +"row": 22, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -129,10 +129,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 47, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 18, +"row": 4, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg b/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg index d3433f1..ffe5e13 100644 --- a/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg +++ b/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg @@ -189,4 +189,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18607/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@10371/@VSplitContainer@10195/@HSplitContainer@10197/@HSplitContainer@10199/@Control@10200/@SubViewportContainer@10201/@SubViewport@10202/Tree")]) +selected_nodes=Array[NodePath]([]) diff --git a/scenes/gun.tscn b/scenes/gun.tscn index b48b2cf..a7a32ef 100644 --- a/scenes/gun.tscn +++ b/scenes/gun.tscn @@ -19,7 +19,7 @@ shape = SubResource("CircleShape2D_o2wld") [node name="Pivot" type="Marker2D" parent="."] [node name="Pistol" type="Sprite2D" parent="Pivot"] -position = Vector2(95, -12) +position = Vector2(172, -14) texture = ExtResource("1_swcir") [node name="ShootingPoint" type="Marker2D" parent="Pivot/Pistol"] diff --git a/scripts/game.gd b/scripts/game.gd index dca5614..23119ad 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -1,7 +1,7 @@ extends Node2D signal game_over -signal level_up() +signal level_up signal boss signal update_ui(ui_data: UIDataResource) @@ -77,8 +77,7 @@ func spawn_boss() -> void: add_child(new_boss) func _on_level_up() -> void: - # spawn_mob_timer.wait_time = 1 - (game_data.level * 0.1) - level_up.emit(game_data.level) + spawn_mob_timer.wait_time *= 0.95 update_ui_data() func update_ui_data() -> void: diff --git a/scripts/gun.gd b/scripts/gun.gd index 13c6d66..1597ae1 100644 --- a/scripts/gun.gd +++ b/scripts/gun.gd @@ -3,21 +3,22 @@ extends Area2D signal shooted @export var bullet: PackedScene @onready var timer: Timer = %Timer +var is_shooting := false func _physics_process(_delta: float) -> void: var enemies_in_range = get_overlapping_bodies() - if enemies_in_range.size() > 0: + is_shooting = enemies_in_range.size() > 0 + if is_shooting: var target = enemies_in_range.front() look_at(target.global_position) func shoot() -> void: - var new_bullet = bullet.instantiate() - new_bullet.global_position = %ShootingPoint.global_position - new_bullet.global_rotation = %ShootingPoint.global_rotation - %ShootingPoint.add_child(new_bullet) - shooted.emit() + if is_shooting: + var new_bullet = bullet.instantiate() + new_bullet.global_position = %ShootingPoint.global_position + new_bullet.global_rotation = %ShootingPoint.global_rotation + %ShootingPoint.add_child(new_bullet) + shooted.emit() - -func _on_player_level_up(_level: int) -> void: - pass - # timer.wait_time = 0.5 - (level * 0.1) +func _on_player_level_up() -> void: + timer.wait_time *= 0.95 diff --git a/scripts/player.gd b/scripts/player.gd index 201d234..e159915 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -3,7 +3,7 @@ extends CharacterBody2D signal health_depleted signal player_takes_damage signal shooted -signal level_up(level: int) +signal level_up @export var SPEED := 600 @export var DAMAGE_RATE := 10.0 @@ -35,5 +35,5 @@ func _physics_process(delta: float) -> void: func _on_gun_shooted() -> void: shooted.emit() -func _on_game_level_up(level: int) -> void: - level_up.emit(level) +func _on_game_level_up() -> void: + level_up.emit()