From b5eadea9c08327ccd35f8855841e4fd01d066031 Mon Sep 17 00:00:00 2001
From: DIvan2000 <divan2000@noreply.localhost>
Date: Sun, 8 Dec 2024 03:17:52 +0400
Subject: [PATCH] Update world.gd

---
 world.gd | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/world.gd b/world.gd
index 10dbd25..f19b91a 100644
--- a/world.gd
+++ b/world.gd
@@ -26,8 +26,7 @@ func _ready():
 enum instruments {
 	NULL,
 	DESTROY,
-	BUILD_ROOM,
-	BUILD_WAY,
+	CONSTRUCT,
 	BUILD_ROAD
 }
 
@@ -45,9 +44,15 @@ func _physics_process(delta: float) -> void:
 	if Input.is_action_just_released("left_mouse") and lmb:
 		selected_tile = select_tile(ground.local_to_map(get_global_mouse_position()-tileMap.global_position))
 		selected = true
+		if(selected_tile==selected_tile2):
+			selected_tile2 = Vector2i(-128,-128)
+			selected2 = false
 	if Input.is_action_just_released("right_mouse") and rmb:
 		selected_tile2 = select_tile(ground.local_to_map(get_global_mouse_position()-tileMap.global_position))
-		selected2 = true
+		if(selected_tile!=selected_tile2): selected2 = true
+		else:
+			selected_tile2 = Vector2i(-128,-128)
+			selected2 = false
 
 	if Input.is_action_just_pressed("ui_cancel"):
 		change_instrument(instruments.NULL)
@@ -62,12 +67,11 @@ func _physics_process(delta: float) -> void:
 		instruments.DESTROY:
 			if Input.is_action_just_pressed("ui_accept") and selected:
 				tileMap.destroy_building(selected_tile)
-		instruments.BUILD_ROOM:
-			if Input.is_action_just_pressed("ui_accept") and selected:
-				tileMap.place_struct(selected_tile, tileMap.StructType.EMPTY_ROOM)
-		instruments.BUILD_WAY:
-			if Input.is_action_just_pressed("ui_accept") and selected:
+		instruments.CONSTRUCT:
+			if Input.is_action_just_pressed("ui_accept") and selected and selected2:
 				tileMap.place_way(selected_tile, selected_tile2)
+			elif Input.is_action_just_pressed("ui_accept") and selected:
+				tileMap.place_struct(selected_tile, tileMap.StructType.EMPTY_ROOM)
 		instruments.BUILD_ROAD:
 			selected_tile = ground.local_to_map(get_global_mouse_position()-tileMap.global_position)
 			if Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
@@ -91,14 +95,11 @@ func change_instrument(new: instruments):
 		instruments.DESTROY:
 			lmb = true
 			rmb = false
-		instruments.BUILD_ROOM:
-			lmb = true
-			rmb = false
-		instruments.BUILD_WAY:
+		instruments.CONSTRUCT:
 			lmb = true
 			rmb = true
 		instruments.BUILD_ROAD:
-			lmb = true
+			lmb = false
 			rmb = false
 
 func _input(event):