diff --git a/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg b/.godot/editor/boss.tscn-editstate-7649a76be24b0454ff92379a9b1bf3ce.cfg index 35187ed..b01643c 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/Game")]) +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/Boss")]) diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index d9e96e4..fb9dd9d 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")]) +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/Boss")]) diff --git a/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg b/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg index 410e616..30ef7ce 100644 --- a/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.cfg +++ b/.godot/editor/gun.tscn-editstate-e8b70ebe6a89c3504564097573c2ce26.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")]) +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/Boss")]) diff --git a/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg b/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg index c535a09..6539355 100644 --- a/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.cfg +++ b/.godot/editor/player.tscn-editstate-234fb6894ec6226e856ab7f825500d3d.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")]) +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/Boss")]) diff --git a/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg b/.godot/editor/tree.tscn-editstate-a9120a52d578fc4f9832f17b0458a97d.cfg index 9083bcc..942fcc3 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/Game")]) +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/Boss")]) diff --git a/scripts/game.gd b/scripts/game.gd index ed17c55..bd30eff 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -19,11 +19,12 @@ const BOSS = preload("res://scenes/boss.tscn") @export var tree_density := 100000 # Import the GameData and UIData classes -const GameData = preload("res://scripts/game_data.gd") -const UIData = preload("res://scripts/ui_data.gd") +const GameDataResource = preload("res://scripts/game_data.gd") +const UIDataResource = preload("res://scripts/ui_data.gd") +const MobDataResource = preload("res://scripts/mob_data.gd") -var game_data = GameData.new(0, 3, 1, 3, 0) -var ui_data = UIData.new(0, 3, 1, 3, 0) +var game_data = GameDataResource.new(0, 3, 1, 3, 0) +var ui_data = UIDataResource.new(0, 3, 1, 3, 0) func _ready() -> void: background_color.size = map_size @@ -81,11 +82,12 @@ func _on_mob_died(mob_xp: int) -> void: func spawn_boss() -> void: print("Spawn Boss") var new_boss = BOSS.instantiate() + new_boss.mob_data = MobDataResource.new(10, 50, 20) path_follow_2d.progress_ratio = randf() new_boss.global_position = path_follow_2d.global_position new_boss.connect("mob_died", Callable(self, "_on_mob_died")) add_child(new_boss) func _on_level_up() -> void: - spawn_mob_timer.wait_time = 1 - (game_data.level * 0.1) + # spawn_mob_timer.wait_time = 1 - (game_data.level * 0.1) level_up.emit(game_data.level)