aboutsummaryrefslogtreecommitdiff
path: root/client/map/tiles
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-06-29 23:06:20 +0200
committermetamuffin <metamuffin@disroot.org>2024-06-29 23:06:20 +0200
commit12b06f3b8769467b957986e2b2601f6dfb7f9dc6 (patch)
tree9422a0cab2e8991de04c01813136d9c4e1ef25e1 /client/map/tiles
parentb93a28ee71f25061d473777565549d90b6325996 (diff)
parentebf98091026017e7c410e8c2aeaa5e7c7d326a6c (diff)
downloadhurrycurry-12b06f3b8769467b957986e2b2601f6dfb7f9dc6.tar
hurrycurry-12b06f3b8769467b957986e2b2601f6dfb7f9dc6.tar.bz2
hurrycurry-12b06f3b8769467b957986e2b2601f6dfb7f9dc6.tar.zst
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/map/tiles')
-rw-r--r--client/map/tiles/grass.tscn6
-rw-r--r--client/map/tiles/grass_generation.gd15
2 files changed, 2 insertions, 19 deletions
diff --git a/client/map/tiles/grass.tscn b/client/map/tiles/grass.tscn
index dd0ef53c..31ff6a69 100644
--- a/client/map/tiles/grass.tscn
+++ b/client/map/tiles/grass.tscn
@@ -1,10 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://ce14cj7exkvas"]
+[gd_scene load_steps=2 format=3 uid="uid://bi6o7lbvhunj1"]
-[ext_resource type="ArrayMesh" uid="uid://dyu8iuolwqr5l" path="res://map/tiles/grass.res" id="1_pjjrj"]
-[ext_resource type="Script" path="res://map/tiles/grass_generation.gd" id="1_u7p1u"]
+[ext_resource type="ArrayMesh" path="res://map/tiles/grass.res" id="1_pjjrj"]
[node name="Grass" type="Node3D"]
-script = ExtResource("1_u7p1u")
[node name="Mesh" type="MeshInstance3D" parent="."]
transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
diff --git a/client/map/tiles/grass_generation.gd b/client/map/tiles/grass_generation.gd
deleted file mode 100644
index 02f9bf83..00000000
--- a/client/map/tiles/grass_generation.gd
+++ /dev/null
@@ -1,15 +0,0 @@
-extends Node3D
-
-const GRASS_COUNT = 16
-
-@onready var grass_side = preload("res://map/tiles/grass_side.tscn")
-
-func _ready():
- var random = RandomNumberGenerator.new()
- random.randomize()
-
- for _i in Global.settings["grass_amount"]["value"]:
- var g: Node3D = grass_side.instantiate()
- add_child(g)
- g.position = Vector3(random.randf_range(-.5, .5), 0, random.randf_range(-.5, .5))
- g.rotation = Vector3(0, random.randf_range(0, PI), 0)