move code to create trees from TileMap in TreesLayer

theludovyc · Nov 26, 2024 · b9c7a24 · b9c7a24
1 parent 67c1e85
commit b9c7a24
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/Script/World/TreesLayer.gd b/Script/World/TreesLayer.gd
@@ -0,0 +1,16 @@
+extends TileMapLayer
+
+@onready var tileMap := get_parent()
+
+func create_trees():
+	var noise := FastNoiseLite.new()
+	noise.frequency = 0.3
+
+	for i in range(tileMap.minimap.size()):
+		if tileMap.minimap[i] == MyTileMap.Minimap_Cell_Type.Ground:
+			var pos = tileMap.minimap_get_pos(i)
+
+			if noise.get_noise_2dv(pos) > 0.1:
+				set_cell(pos, 1, Vector2(0, 1))
+
+				tileMap.minimap[i] = MyTileMap.Minimap_Cell_Type.Tree
diff --git a/theLudovyc/Game2D.tscn b/theLudovyc/Game2D.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://bbbuj3ne5rupv"]
+[gd_scene load_steps=17 format=3 uid="uid://bbbuj3ne5rupv"]
 
 [ext_resource type="Script" path="res://theLudovyc/Game2D.gd" id="1_i3wk0"]
 [ext_resource type="Script" path="res://theLudovyc/EventBus.gd" id="2_jbfdl"]
@@ -15,6 +15,7 @@
 [ext_resource type="TileSet" uid="uid://dprvpcto8mhgv" path="res://theLudovyc/tile_set_trees.tres" id="12_25naw"]
 [ext_resource type="Script" path="res://Script/World/GroundLayer.gd" id="12_dmqkb"]
 [ext_resource type="PackedScene" uid="uid://cdwvtbtwmrqbn" path="res://Scene/RGT/PauseMenu.tscn" id="13_xikc4"]
+[ext_resource type="Script" path="res://Script/World/TreesLayer.gd" id="14_wtd65"]
 
 [node name="Game2D" type="Node"]
 script = ExtResource("1_i3wk0")
@@ -67,6 +68,7 @@ script = ExtResource("12_dmqkb")
 z_index = 2
 y_sort_enabled = true
 tile_set = ExtResource("12_25naw")
+script = ExtResource("14_wtd65")
 
 [node name="Entities" type="Node2D" parent="ZSorter"]
 unique_name_in_owner = true

diff --git a/theLudovyc/TileMap.gd b/theLudovyc/TileMap.gd
@@ -103,18 +103,7 @@ func create_island(map_file:String) -> int:
 		json.data["ground_tiles"]
 	)
 
-	# spawn trees
-	var noise := FastNoiseLite.new()
-	noise.frequency = 0.3
-
-	for i in range(minimap.size()):
-		if minimap[i] == Minimap_Cell_Type.Ground:
-			var pos = minimap_get_pos(i)
-
-			if noise.get_noise_2dv(pos) > 0.1:
-				trees_layer.set_cell(pos, 1, Vector2(0, 1))
-
-				minimap[i] = Minimap_Cell_Type.Tree
+	trees_layer.create_trees()
 
 	return OK