diff --git a/Game.tscn b/Game.tscn index a0fb3fe..70cb5da 100644 --- a/Game.tscn +++ b/Game.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://d3hul8b7hlmj7" path="res://scenes/Map.tscn" id="1_nnb57"] [ext_resource type="PackedScene" uid="uid://dha8pa1les53a" path="res://scenes/Gui.tscn" id="2_d5c8m"] [ext_resource type="Script" path="res://scripts/camera.gd" id="3_7olyu"] -[ext_resource type="PackedScene" path="res://objects/Planter.tscn" id="3_qx0o7"] +[ext_resource type="PackedScene" uid="uid://qpdlnll5pihe" path="res://objects/Planter.tscn" id="3_qx0o7"] [node name="Game" type="Node2D"] @@ -13,10 +13,11 @@ [node name="Gui" parent="Interface" instance=ExtResource("2_d5c8m")] -[node name="Planter" parent="." instance=ExtResource("3_qx0o7")] - [node name="Camera2D" type="Camera2D" parent="."] position = Vector2(709, 382) script = ExtResource("3_7olyu") +[node name="Planter" parent="." node_paths=PackedStringArray("camera") instance=ExtResource("3_qx0o7")] +camera = NodePath("../Camera2D") + [connection signal="scanner_selected" from="Interface/Gui" to="Map" method="_on_gui_scanner_selected"] diff --git a/objects/Planter.tscn b/objects/Planter.tscn index c3889c3..87ec324 100644 --- a/objects/Planter.tscn +++ b/objects/Planter.tscn @@ -8,7 +8,7 @@ [node name="Planter" type="Node"] script = ExtResource("1_l7lry") -plants = Array[ExtResource("2_7h3ga")]([ExtResource("3_lgbrc"), ExtResource("4_tmfl1"), ExtResource("5_j34av")]) +plants = Array[ExtResource("2_7h3ga")]([ExtResource("3_lgbrc"), ExtResource("5_j34av"), ExtResource("4_tmfl1")]) [node name="Timer" type="Timer" parent="."] wait_time = 0.2 diff --git a/scenes/TestMapV.tscn b/scenes/TestMapV.tscn index 2c8d29c..de3864b 100644 --- a/scenes/TestMapV.tscn +++ b/scenes/TestMapV.tscn @@ -1,11 +1,6 @@ -[gd_scene load_steps=6 format=3 uid="uid://bus7qrxwn2ck1"] +[gd_scene load_steps=2 format=3 uid="uid://bus7qrxwn2ck1"] [ext_resource type="Script" path="res://scripts/planter.gd" id="1_l04h8"] -[ext_resource type="Script" path="res://scripts/plant_type.gd" id="2_6g58k"] -[ext_resource type="Resource" uid="uid://bgi2lo7kb3d2v" path="res://objects/plant_types/chardon.tres" id="3_vfbum"] -[ext_resource type="Resource" uid="uid://dnahox31xqy6l" path="res://objects/plant_types/peuplier.tres" id="4_aqqqx"] -[ext_resource type="Resource" uid="uid://b6ufxuqdcgwmx" path="res://objects/plant_types/chene.tres" id="5_n7xs7"] [node name="TestMap" type="Node2D"] script = ExtResource("1_l04h8") -plants = Array[ExtResource("2_6g58k")]([ExtResource("3_vfbum"), ExtResource("4_aqqqx"), ExtResource("5_n7xs7")]) diff --git a/scripts/planter.gd b/scripts/planter.gd index 2b9c8e1..3ef4c2f 100644 --- a/scripts/planter.gd +++ b/scripts/planter.gd @@ -7,6 +7,8 @@ extends Node @onready var plant_scene = preload("res://objects/Plant.tscn") @onready var timer: Timer = $Timer +@export var camera: Camera2D + func _unhandled_input(event: InputEvent) -> void: if Input.is_action_just_pressed("plant") and timer.is_stopped(): @@ -14,5 +16,5 @@ func _unhandled_input(event: InputEvent) -> void: var plant = plant_scene.instantiate() add_child(plant) plant.init(chosen_type) - plant.plant(event.position) + plant.plant(camera.get_global_mouse_position()) timer.start()