36 files changed, 39 insertions, 67 deletions
diff --git a/client/global.gd b/client/global.gd
index 8fd9e399..48510d17 100644
--- a/client/global.gd
+++ b/client/global.gd
@@ -58,6 +58,7 @@ var default_settings := {
 	"glow": ToggleSetting.new(tr("Enable glow"), true),
 	"debug_info": ToggleSetting.new(tr("Display debug info (Framerate, etc.)"), false),
 	"grass_amount": RangeSetting.new(tr("3D grass amount per grass tile"), 16, 0, 32),
+	"lq_trees": ToggleSetting.new(tr("Low-poly trees"), false),
 	"setup_complete": ToggleSetting.new(tr("Initial setup complete. (Uncheck and restart to reenter)"), false),
 	"tutorial_started": ToggleSetting.new(tr("Tutorial started"), false),
 	"latch_boost": ToggleSetting.new(tr("Always extend boost to maximum duration"), true)
diff --git a/client/map/tiles/exterior_tree.gd b/client/map/tiles/exterior_tree.gd
index 41e35693..edc08df3 100644
--- a/client/map/tiles/exterior_tree.gd
+++ b/client/map/tiles/exterior_tree.gd
@@ -16,9 +16,30 @@
 class_name ExteriorTree
 extends Grass
 
+const SCALE: Vector3 = Vector3(100., 100., 100.)
+const ROT: Vector3 = Vector3(1.5 * PI, 0., 0.)
+
 func _init(rename: String, _neighbors: Array):
 	super(rename, _neighbors)
 	var random = RandomNumberGenerator.new()
 	random.seed = rename.hash()
-	var path = "res://map/tiles/tree_%s.tscn" % random.randi_range(1,5)
-	base.add_child(load(path).instantiate())
+	var tree: int = random.randi_range(1,5)
+	var trunk: Mesh = load("res://map/tiles/tree/trunk_%d.res" % tree)
+	var leaves: Mesh = load("res://map/tiles/tree/leaves_%d_%s.res" % [
+		tree,
+		"lq" if Global.get_setting("lq_trees") else "hq"
+	])
+	var trunk_instance: MeshInstance3D = MeshInstance3D.new()
+	trunk_instance.mesh = trunk
+	trunk_instance.scale = SCALE
+	trunk_instance.rotation = ROT
+	var leaves_instance: MeshInstance3D = MeshInstance3D.new()
+	leaves_instance.mesh = leaves
+	leaves_instance.scale = SCALE
+	leaves_instance.rotation = ROT
+	var tree_node: Node3D = Node3D.new()
+
+	tree_node.add_child(trunk_instance)
+	tree_node.add_child(leaves_instance)
+	tree_node.name = "Tree"
+	base.add_child(tree_node)
diff --git a/client/map/tiles/bark.tres b/client/map/tiles/tree/bark.tres
index 24bc469b..3a6e8a04 100644
--- a/client/map/tiles/bark.tres
+++ b/client/map/tiles/tree/bark.tres
@@ -1,7 +1,7 @@
 [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://beyncaufbtoay"]
 
-[ext_resource type="Texture2D" uid="uid://bgh74bmrp46qc" path="res://map/tiles/bark.webp" id="1_3mn2u"]
-[ext_resource type="Texture2D" uid="uid://bmvab6kdyccm4" path="res://map/tiles/bark_normal.webp" id="2_v3ray"]
+[ext_resource type="Texture2D" uid="uid://bgh74bmrp46qc" path="res://map/tiles/tree/bark.webp" id="1_3mn2u"]
+[ext_resource type="Texture2D" uid="uid://bmvab6kdyccm4" path="res://map/tiles/tree/bark_normal.webp" id="2_v3ray"]
 
 [resource]
 resource_name = "NormalTree_Bark"
diff --git a/client/map/tiles/bark.webp b/client/map/tiles/tree/bark.webp
index 4918e43c..4918e43c 100644
--- a/client/map/tiles/bark.webp
+++ b/client/map/tiles/tree/bark.webp
diff --git a/client/map/tiles/bark.webp.import b/client/map/tiles/tree/bark.webp.import
index 51256c56..b5c9ef9a 100644
--- a/client/map/tiles/bark.webp.import
+++ b/client/map/tiles/tree/bark.webp.import
@@ -3,8 +3,8 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bgh74bmrp46qc"
-path.s3tc="res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.s3tc.ctex"
-path.etc2="res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.etc2.ctex"
+path.s3tc="res://.godot/imported/bark.webp-fe037a44460fce46eda0818b04f6cedf.s3tc.ctex"
+path.etc2="res://.godot/imported/bark.webp-fe037a44460fce46eda0818b04f6cedf.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -12,8 +12,8 @@ metadata={
 
 [deps]
 
-source_file="res://map/tiles/bark.webp"
-dest_files=["res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.s3tc.ctex", "res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.etc2.ctex"]
+source_file="res://map/tiles/tree/bark.webp"
+dest_files=["res://.godot/imported/bark.webp-fe037a44460fce46eda0818b04f6cedf.s3tc.ctex", "res://.godot/imported/bark.webp-fe037a44460fce46eda0818b04f6cedf.etc2.ctex"]
 
 [params]
 
diff --git a/client/map/tiles/bark_normal.webp b/client/map/tiles/tree/bark_normal.webp
index 3bc641e4..3bc641e4 100644
--- a/client/map/tiles/bark_normal.webp
+++ b/client/map/tiles/tree/bark_normal.webp
diff --git a/client/map/tiles/bark_normal.webp.import b/client/map/tiles/tree/bark_normal.webp.import
index 1061f591..2eb53220 100644
--- a/client/map/tiles/bark_normal.webp.import
+++ b/client/map/tiles/tree/bark_normal.webp.import
@@ -3,8 +3,8 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bmvab6kdyccm4"
-path.s3tc="res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.s3tc.ctex"
-path.etc2="res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.etc2.ctex"
+path.s3tc="res://.godot/imported/bark_normal.webp-5975c59765c0b2f447c0e816d9ae7c4e.s3tc.ctex"
+path.etc2="res://.godot/imported/bark_normal.webp-5975c59765c0b2f447c0e816d9ae7c4e.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -12,8 +12,8 @@ metadata={
 
 [deps]
 
-source_file="res://map/tiles/bark_normal.webp"
-dest_files=["res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.s3tc.ctex", "res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.etc2.ctex"]
+source_file="res://map/tiles/tree/bark_normal.webp"
+dest_files=["res://.godot/imported/bark_normal.webp-5975c59765c0b2f447c0e816d9ae7c4e.s3tc.ctex", "res://.godot/imported/bark_normal.webp-5975c59765c0b2f447c0e816d9ae7c4e.etc2.ctex"]
 
 [params]
 
diff --git a/client/map/tiles/leaves.tres b/client/map/tiles/tree/leaves.tres
index 5c2b2082..ad1b14e9 100644
--- a/client/map/tiles/leaves.tres
+++ b/client/map/tiles/tree/leaves.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bwkrkt2cb0wa"]
 
-[ext_resource type="Texture2D" uid="uid://bxxh66na6bumt" path="res://map/tiles/leaves.webp" id="1_jg4r8"]
+[ext_resource type="Texture2D" uid="uid://bxxh66na6bumt" path="res://map/tiles/tree/leaves.webp" id="1_jg4r8"]
 
 [resource]
 resource_name = "NormalTree_Leaves"
diff --git a/client/map/tiles/leaves.webp b/client/map/tiles/tree/leaves.webp
index 2485e489..2485e489 100644
--- a/client/map/tiles/leaves.webp
+++ b/client/map/tiles/tree/leaves.webp
diff --git a/client/map/tiles/leaves.webp.import b/client/map/tiles/tree/leaves.webp.import
index 053516c0..38cc4524 100644
--- a/client/map/tiles/leaves.webp.import
+++ b/client/map/tiles/tree/leaves.webp.import
@@ -3,8 +3,8 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bxxh66na6bumt"
-path.s3tc="res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.s3tc.ctex"
-path.etc2="res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.etc2.ctex"
+path.s3tc="res://.godot/imported/leaves.webp-911dbf6a3efad3989331dad3227e20a1.s3tc.ctex"
+path.etc2="res://.godot/imported/leaves.webp-911dbf6a3efad3989331dad3227e20a1.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -12,8 +12,8 @@ metadata={
 
 [deps]
 
-source_file="res://map/tiles/leaves.webp"
-dest_files=["res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.s3tc.ctex", "res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.etc2.ctex"]
+source_file="res://map/tiles/tree/leaves.webp"
+dest_files=["res://.godot/imported/leaves.webp-911dbf6a3efad3989331dad3227e20a1.s3tc.ctex", "res://.godot/imported/leaves.webp-911dbf6a3efad3989331dad3227e20a1.etc2.ctex"]
 
 [params]
 
diff --git a/client/map/tiles/tree/leaves_1_hq.res b/client/map/tiles/tree/leaves_1_hq.res
new file mode 100644
index 00000000..776aab86
--- /dev/null
+++ b/client/map/tiles/tree/leaves_1_hq.res
diff --git a/client/map/tiles/tree/leaves_1_lq.res b/client/map/tiles/tree/leaves_1_lq.res
new file mode 100644
index 00000000..b701536a
--- /dev/null
+++ b/client/map/tiles/tree/leaves_1_lq.res
diff --git a/client/map/tiles/tree/leaves_2_hq.res b/client/map/tiles/tree/leaves_2_hq.res
new file mode 100644
index 00000000..ce83d2f1
--- /dev/null
+++ b/client/map/tiles/tree/leaves_2_hq.res
diff --git a/client/map/tiles/tree/leaves_2_lq.res b/client/map/tiles/tree/leaves_2_lq.res
new file mode 100644
index 00000000..5064b2bb
--- /dev/null
+++ b/client/map/tiles/tree/leaves_2_lq.res
diff --git a/client/map/tiles/tree/leaves_3_hq.res b/client/map/tiles/tree/leaves_3_hq.res
new file mode 100644
index 00000000..fef80645
--- /dev/null
+++ b/client/map/tiles/tree/leaves_3_hq.res
diff --git a/client/map/tiles/tree/leaves_3_lq.res b/client/map/tiles/tree/leaves_3_lq.res
new file mode 100644
index 00000000..108f9120
--- /dev/null
+++ b/client/map/tiles/tree/leaves_3_lq.res
diff --git a/client/map/tiles/tree/leaves_4_hq.res b/client/map/tiles/tree/leaves_4_hq.res
new file mode 100644
index 00000000..e0657993
--- /dev/null
+++ b/client/map/tiles/tree/leaves_4_hq.res
diff --git a/client/map/tiles/tree/leaves_4_lq.res b/client/map/tiles/tree/leaves_4_lq.res
new file mode 100644
index 00000000..156b18e2
--- /dev/null
+++ b/client/map/tiles/tree/leaves_4_lq.res
diff --git a/client/map/tiles/tree/leaves_5_hq.res b/client/map/tiles/tree/leaves_5_hq.res
new file mode 100644
index 00000000..63839358
--- /dev/null
+++ b/client/map/tiles/tree/leaves_5_hq.res
diff --git a/client/map/tiles/tree/leaves_5_lq.res b/client/map/tiles/tree/leaves_5_lq.res
new file mode 100644
index 00000000..4ed6ae0e
--- /dev/null
+++ b/client/map/tiles/tree/leaves_5_lq.res
diff --git a/client/map/tiles/tree/leaves_lq.res b/client/map/tiles/tree/leaves_lq.res
new file mode 100644
index 00000000..3b5b5549
--- /dev/null
+++ b/client/map/tiles/tree/leaves_lq.res
diff --git a/client/map/tiles/tree/trunk_1.res b/client/map/tiles/tree/trunk_1.res
new file mode 100644
index 00000000..abdbc3ab
--- /dev/null
+++ b/client/map/tiles/tree/trunk_1.res
diff --git a/client/map/tiles/tree/trunk_2.res b/client/map/tiles/tree/trunk_2.res
new file mode 100644
index 00000000..2a66054f
--- /dev/null
+++ b/client/map/tiles/tree/trunk_2.res
diff --git a/client/map/tiles/tree/trunk_3.res b/client/map/tiles/tree/trunk_3.res
new file mode 100644
index 00000000..02cb6023
--- /dev/null
+++ b/client/map/tiles/tree/trunk_3.res
diff --git a/client/map/tiles/tree/trunk_4.res b/client/map/tiles/tree/trunk_4.res
new file mode 100644
index 00000000..87c47b25
--- /dev/null
+++ b/client/map/tiles/tree/trunk_4.res
diff --git a/client/map/tiles/tree/trunk_5.res b/client/map/tiles/tree/trunk_5.res
new file mode 100644
index 00000000..82722415
--- /dev/null
+++ b/client/map/tiles/tree/trunk_5.res
diff --git a/client/map/tiles/tree_1.res b/client/map/tiles/tree_1.res
deleted file mode 100644
index 9b97c062..00000000
--- a/client/map/tiles/tree_1.res
+++ /dev/null
diff --git a/client/map/tiles/tree_1.tscn b/client/map/tiles/tree_1.tscn
deleted file mode 100644
index c8aeade2..00000000
--- a/client/map/tiles/tree_1.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://de2vaemb2p66q"]
-
-[ext_resource type="ArrayMesh" uid="uid://bkilmwqdhtiq2" path="res://map/tiles/tree_1.res" id="1_mgdye"]
-
-[node name="Tree1" type="Node3D"]
-
-[node name="Tree1" type="MeshInstance3D" parent="."]
-transform = Transform3D(100, 0, 0, 0, -4.37114e-06, 100, 0, -100, -4.37114e-06, 0, 0, 0)
-mesh = ExtResource("1_mgdye")
-skeleton = NodePath("")
diff --git a/client/map/tiles/tree_2.res b/client/map/tiles/tree_2.res
deleted file mode 100644
index 52c20e7c..00000000
--- a/client/map/tiles/tree_2.res
+++ /dev/null
diff --git a/client/map/tiles/tree_2.tscn b/client/map/tiles/tree_2.tscn
deleted file mode 100644
index ab5e34bc..00000000
--- a/client/map/tiles/tree_2.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://elpjoxfe3bje"]
-
-[ext_resource type="ArrayMesh" uid="uid://k8t6vgd4o31j" path="res://map/tiles/tree_2.res" id="1_o34ab"]
-
-[node name="Tree2" type="Node3D"]
-
-[node name="Tree2" type="MeshInstance3D" parent="."]
-transform = Transform3D(100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0)
-mesh = ExtResource("1_o34ab")
-skeleton = NodePath("")
diff --git a/client/map/tiles/tree_3.res b/client/map/tiles/tree_3.res
deleted file mode 100644
index 4fd635ca..00000000
--- a/client/map/tiles/tree_3.res
+++ /dev/null
diff --git a/client/map/tiles/tree_3.tscn b/client/map/tiles/tree_3.tscn
deleted file mode 100644
index d553965e..00000000
--- a/client/map/tiles/tree_3.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bw0rhtux5p04x"]
-
-[ext_resource type="ArrayMesh" uid="uid://b2ckqbw7inroj" path="res://map/tiles/tree_3.res" id="1_jt2l7"]
-
-[node name="Tree3" type="Node3D"]
-
-[node name="Tree3" type="MeshInstance3D" parent="."]
-transform = Transform3D(100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0)
-mesh = ExtResource("1_jt2l7")
-skeleton = NodePath("")
diff --git a/client/map/tiles/tree_4.res b/client/map/tiles/tree_4.res
deleted file mode 100644
index f7b322d2..00000000
--- a/client/map/tiles/tree_4.res
+++ /dev/null
diff --git a/client/map/tiles/tree_4.tscn b/client/map/tiles/tree_4.tscn
deleted file mode 100644
index 022cb3df..00000000
--- a/client/map/tiles/tree_4.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bqpl3ogd58klf"]
-
-[ext_resource type="ArrayMesh" uid="uid://cenl3hbfhqagu" path="res://map/tiles/tree_4.res" id="1_ss0d8"]
-
-[node name="Tree4" type="Node3D"]
-
-[node name="Tree4" type="MeshInstance3D" parent="."]
-transform = Transform3D(100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0)
-mesh = ExtResource("1_ss0d8")
-skeleton = NodePath("")
diff --git a/client/map/tiles/tree_5.res b/client/map/tiles/tree_5.res
deleted file mode 100644
index f4ddde72..00000000
--- a/client/map/tiles/tree_5.res
+++ /dev/null
diff --git a/client/map/tiles/tree_5.tscn b/client/map/tiles/tree_5.tscn
deleted file mode 100644
index 9ec34ee8..00000000
--- a/client/map/tiles/tree_5.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://gwj164os66pq"]
-
-[ext_resource type="ArrayMesh" uid="uid://m2wjeka2butc" path="res://map/tiles/tree_5.res" id="1_2mx8y"]
-
-[node name="Tree5" type="Node3D"]
-
-[node name="Tree5" type="MeshInstance3D" parent="."]
-transform = Transform3D(100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0)
-mesh = ExtResource("1_2mx8y")
-skeleton = NodePath("")