From b109b34251425f50e641d3c49183317de9eced55 Mon Sep 17 00:00:00 2001 From: nokoe Date: Thu, 18 Jul 2024 14:17:01 +0200 Subject: low poly trees --- client/global.gd | 1 + client/map/tiles/bark.tres | 14 ---------- client/map/tiles/bark.webp | Bin 7132 -> 0 bytes client/map/tiles/bark.webp.import | 36 -------------------------- client/map/tiles/bark_normal.webp | Bin 8614 -> 0 bytes client/map/tiles/bark_normal.webp.import | 36 -------------------------- client/map/tiles/exterior_tree.gd | 25 ++++++++++++++++-- client/map/tiles/leaves.tres | 11 -------- client/map/tiles/leaves.webp | Bin 15222 -> 0 bytes client/map/tiles/leaves.webp.import | 36 -------------------------- client/map/tiles/tree/bark.tres | 14 ++++++++++ client/map/tiles/tree/bark.webp | Bin 0 -> 7132 bytes client/map/tiles/tree/bark.webp.import | 36 ++++++++++++++++++++++++++ client/map/tiles/tree/bark_normal.webp | Bin 0 -> 8614 bytes client/map/tiles/tree/bark_normal.webp.import | 36 ++++++++++++++++++++++++++ client/map/tiles/tree/leaves.tres | 11 ++++++++ client/map/tiles/tree/leaves.webp | Bin 0 -> 15222 bytes client/map/tiles/tree/leaves.webp.import | 36 ++++++++++++++++++++++++++ client/map/tiles/tree/leaves_1_hq.res | Bin 0 -> 181369 bytes client/map/tiles/tree/leaves_1_lq.res | Bin 0 -> 20745 bytes client/map/tiles/tree/leaves_2_hq.res | Bin 0 -> 133320 bytes client/map/tiles/tree/leaves_2_lq.res | Bin 0 -> 29092 bytes client/map/tiles/tree/leaves_3_hq.res | Bin 0 -> 105688 bytes client/map/tiles/tree/leaves_3_lq.res | Bin 0 -> 28661 bytes client/map/tiles/tree/leaves_4_hq.res | Bin 0 -> 136841 bytes client/map/tiles/tree/leaves_4_lq.res | Bin 0 -> 16915 bytes client/map/tiles/tree/leaves_5_hq.res | Bin 0 -> 40691 bytes client/map/tiles/tree/leaves_5_lq.res | Bin 0 -> 28905 bytes client/map/tiles/tree/leaves_lq.res | Bin 0 -> 1034 bytes client/map/tiles/tree/trunk_1.res | Bin 0 -> 152953 bytes client/map/tiles/tree/trunk_2.res | Bin 0 -> 169549 bytes client/map/tiles/tree/trunk_3.res | Bin 0 -> 155114 bytes client/map/tiles/tree/trunk_4.res | Bin 0 -> 110556 bytes client/map/tiles/tree/trunk_5.res | Bin 0 -> 43147 bytes client/map/tiles/tree_1.res | Bin 332485 -> 0 bytes client/map/tiles/tree_1.tscn | 10 ------- client/map/tiles/tree_2.res | Bin 305658 -> 0 bytes client/map/tiles/tree_2.tscn | 10 ------- client/map/tiles/tree_3.res | Bin 259939 -> 0 bytes client/map/tiles/tree_3.tscn | 10 ------- client/map/tiles/tree_4.res | Bin 247791 -> 0 bytes client/map/tiles/tree_4.tscn | 10 ------- client/map/tiles/tree_5.res | Bin 82811 -> 0 bytes client/map/tiles/tree_5.tscn | 10 ------- 44 files changed, 157 insertions(+), 185 deletions(-) delete mode 100644 client/map/tiles/bark.tres delete mode 100644 client/map/tiles/bark.webp delete mode 100644 client/map/tiles/bark.webp.import delete mode 100644 client/map/tiles/bark_normal.webp delete mode 100644 client/map/tiles/bark_normal.webp.import delete mode 100644 client/map/tiles/leaves.tres delete mode 100644 client/map/tiles/leaves.webp delete mode 100644 client/map/tiles/leaves.webp.import create mode 100644 client/map/tiles/tree/bark.tres create mode 100644 client/map/tiles/tree/bark.webp create mode 100644 client/map/tiles/tree/bark.webp.import create mode 100644 client/map/tiles/tree/bark_normal.webp create mode 100644 client/map/tiles/tree/bark_normal.webp.import create mode 100644 client/map/tiles/tree/leaves.tres create mode 100644 client/map/tiles/tree/leaves.webp create mode 100644 client/map/tiles/tree/leaves.webp.import create mode 100644 client/map/tiles/tree/leaves_1_hq.res create mode 100644 client/map/tiles/tree/leaves_1_lq.res create mode 100644 client/map/tiles/tree/leaves_2_hq.res create mode 100644 client/map/tiles/tree/leaves_2_lq.res create mode 100644 client/map/tiles/tree/leaves_3_hq.res create mode 100644 client/map/tiles/tree/leaves_3_lq.res create mode 100644 client/map/tiles/tree/leaves_4_hq.res create mode 100644 client/map/tiles/tree/leaves_4_lq.res create mode 100644 client/map/tiles/tree/leaves_5_hq.res create mode 100644 client/map/tiles/tree/leaves_5_lq.res create mode 100644 client/map/tiles/tree/leaves_lq.res create mode 100644 client/map/tiles/tree/trunk_1.res create mode 100644 client/map/tiles/tree/trunk_2.res create mode 100644 client/map/tiles/tree/trunk_3.res create mode 100644 client/map/tiles/tree/trunk_4.res create mode 100644 client/map/tiles/tree/trunk_5.res delete mode 100644 client/map/tiles/tree_1.res delete mode 100644 client/map/tiles/tree_1.tscn delete mode 100644 client/map/tiles/tree_2.res delete mode 100644 client/map/tiles/tree_2.tscn delete mode 100644 client/map/tiles/tree_3.res delete mode 100644 client/map/tiles/tree_3.tscn delete mode 100644 client/map/tiles/tree_4.res delete mode 100644 client/map/tiles/tree_4.tscn delete mode 100644 client/map/tiles/tree_5.res delete mode 100644 client/map/tiles/tree_5.tscn (limited to 'client') 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/bark.tres b/client/map/tiles/bark.tres deleted file mode 100644 index 24bc469b..00000000 --- a/client/map/tiles/bark.tres +++ /dev/null @@ -1,14 +0,0 @@ -[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"] - -[resource] -resource_name = "NormalTree_Bark" -albedo_texture = ExtResource("1_3mn2u") -metallic = 0.4 -roughness = 0.301511 -normal_enabled = true -normal_texture = ExtResource("2_v3ray") -distance_fade_min_distance = 2.0 -distance_fade_max_distance = 4.0 diff --git a/client/map/tiles/bark.webp b/client/map/tiles/bark.webp deleted file mode 100644 index 4918e43c..00000000 Binary files a/client/map/tiles/bark.webp and /dev/null differ diff --git a/client/map/tiles/bark.webp.import b/client/map/tiles/bark.webp.import deleted file mode 100644 index 51256c56..00000000 --- a/client/map/tiles/bark.webp.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -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" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[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"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/client/map/tiles/bark_normal.webp b/client/map/tiles/bark_normal.webp deleted file mode 100644 index 3bc641e4..00000000 Binary files a/client/map/tiles/bark_normal.webp and /dev/null differ diff --git a/client/map/tiles/bark_normal.webp.import b/client/map/tiles/bark_normal.webp.import deleted file mode 100644 index 1061f591..00000000 --- a/client/map/tiles/bark_normal.webp.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -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" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[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"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=1 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=1 -roughness/src_normal="res://map/tiles/Trees_NormalTree_Bark_Normal.webp" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 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/leaves.tres b/client/map/tiles/leaves.tres deleted file mode 100644 index 5c2b2082..00000000 --- a/client/map/tiles/leaves.tres +++ /dev/null @@ -1,11 +0,0 @@ -[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"] - -[resource] -resource_name = "NormalTree_Leaves" -transparency = 4 -albedo_texture = ExtResource("1_jg4r8") -metallic_specular = 0.0 -distance_fade_min_distance = 2.0 -distance_fade_max_distance = 4.0 diff --git a/client/map/tiles/leaves.webp b/client/map/tiles/leaves.webp deleted file mode 100644 index 2485e489..00000000 Binary files a/client/map/tiles/leaves.webp and /dev/null differ diff --git a/client/map/tiles/leaves.webp.import b/client/map/tiles/leaves.webp.import deleted file mode 100644 index 053516c0..00000000 --- a/client/map/tiles/leaves.webp.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -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" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[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"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/client/map/tiles/tree/bark.tres b/client/map/tiles/tree/bark.tres new file mode 100644 index 00000000..3a6e8a04 --- /dev/null +++ b/client/map/tiles/tree/bark.tres @@ -0,0 +1,14 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://beyncaufbtoay"] + +[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" +albedo_texture = ExtResource("1_3mn2u") +metallic = 0.4 +roughness = 0.301511 +normal_enabled = true +normal_texture = ExtResource("2_v3ray") +distance_fade_min_distance = 2.0 +distance_fade_max_distance = 4.0 diff --git a/client/map/tiles/tree/bark.webp b/client/map/tiles/tree/bark.webp new file mode 100644 index 00000000..4918e43c Binary files /dev/null and b/client/map/tiles/tree/bark.webp differ diff --git a/client/map/tiles/tree/bark.webp.import b/client/map/tiles/tree/bark.webp.import new file mode 100644 index 00000000..b5c9ef9a --- /dev/null +++ b/client/map/tiles/tree/bark.webp.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bgh74bmrp46qc" +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 +} + +[deps] + +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] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/client/map/tiles/tree/bark_normal.webp b/client/map/tiles/tree/bark_normal.webp new file mode 100644 index 00000000..3bc641e4 Binary files /dev/null and b/client/map/tiles/tree/bark_normal.webp differ diff --git a/client/map/tiles/tree/bark_normal.webp.import b/client/map/tiles/tree/bark_normal.webp.import new file mode 100644 index 00000000..2eb53220 --- /dev/null +++ b/client/map/tiles/tree/bark_normal.webp.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmvab6kdyccm4" +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 +} + +[deps] + +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] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://map/tiles/Trees_NormalTree_Bark_Normal.webp" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/client/map/tiles/tree/leaves.tres b/client/map/tiles/tree/leaves.tres new file mode 100644 index 00000000..ad1b14e9 --- /dev/null +++ b/client/map/tiles/tree/leaves.tres @@ -0,0 +1,11 @@ +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bwkrkt2cb0wa"] + +[ext_resource type="Texture2D" uid="uid://bxxh66na6bumt" path="res://map/tiles/tree/leaves.webp" id="1_jg4r8"] + +[resource] +resource_name = "NormalTree_Leaves" +transparency = 4 +albedo_texture = ExtResource("1_jg4r8") +metallic_specular = 0.0 +distance_fade_min_distance = 2.0 +distance_fade_max_distance = 4.0 diff --git a/client/map/tiles/tree/leaves.webp b/client/map/tiles/tree/leaves.webp new file mode 100644 index 00000000..2485e489 Binary files /dev/null and b/client/map/tiles/tree/leaves.webp differ diff --git a/client/map/tiles/tree/leaves.webp.import b/client/map/tiles/tree/leaves.webp.import new file mode 100644 index 00000000..38cc4524 --- /dev/null +++ b/client/map/tiles/tree/leaves.webp.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bxxh66na6bumt" +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 +} + +[deps] + +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] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_1_hq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_1_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_2_hq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_2_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_3_hq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_3_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_4_hq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_4_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_5_hq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_5_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/leaves_lq.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/trunk_1.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/trunk_2.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/trunk_3.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/trunk_4.res differ 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 Binary files /dev/null and b/client/map/tiles/tree/trunk_5.res differ diff --git a/client/map/tiles/tree_1.res b/client/map/tiles/tree_1.res deleted file mode 100644 index 9b97c062..00000000 Binary files a/client/map/tiles/tree_1.res and /dev/null differ 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 Binary files a/client/map/tiles/tree_2.res and /dev/null differ 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 Binary files a/client/map/tiles/tree_3.res and /dev/null differ 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 Binary files a/client/map/tiles/tree_4.res and /dev/null differ 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 Binary files a/client/map/tiles/tree_5.res and /dev/null differ 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("") -- cgit v1.2.3-70-g09d2 From 524da57737b295930a64df1b0f1a90a09568ddc1 Mon Sep 17 00:00:00 2001 From: nokoe Date: Thu, 18 Jul 2024 15:03:51 +0200 Subject: update german translation --- client/po/de.po | 51 ++++++++++++++++++++++++++++++++++++++++++--------- client/project.godot | 2 +- 2 files changed, 43 insertions(+), 10 deletions(-) (limited to 'client') diff --git a/client/po/de.po b/client/po/de.po index cf541e05..b190f2b2 100644 --- a/client/po/de.po +++ b/client/po/de.po @@ -107,6 +107,10 @@ msgstr "" msgid "Enable shadows" msgstr "Schatten aktivieren" +#: global.gd +msgid "Enable glow" +msgstr "Glow aktivieren" + #: global.gd msgid "Display debug info (Framerate, etc.)" msgstr "Diagnosedaten anzeigen (Bildrate, etc.)" @@ -115,6 +119,10 @@ msgstr "Diagnosedaten anzeigen (Bildrate, etc.)" msgid "3D grass amount per grass tile" msgstr "3D-Grasmenge pro Tile" +#: global.gd +msgid "Low-poly trees" +msgstr "Low-poly-Bäume" + #: global.gd msgid "Initial setup complete. (Uncheck and restart to reenter)" msgstr "" @@ -122,10 +130,8 @@ msgstr "" "Neueinrichten)" #: global.gd -msgid "Tutorial started. (Uncheck and restart to replay)" -msgstr "" -"Anleitung abgeschlossen. (Deaktivieren und Spiel neu starten zum erneuten " -"Spielen)" +msgid "Tutorial started" +msgstr "Anleitung gestartet" #: global.gd msgid "Always extend boost to maximum duration" @@ -315,7 +321,7 @@ msgstr "Zurück zum Hauptmenü" msgid "Leave Game" msgstr "Spiel verlassen" -#: menu/ingame.tscn menu/lobby.tscn menu/ingame.gd menu/lobby.gd +#: menu/ingame.tscn menu/ingame.gd msgid "Join Game" msgstr "Spiel beitreten" @@ -368,8 +374,12 @@ msgid "%d players recommended" msgstr "%d Spieler empfohlen" #: menu/lobby.tscn menu/lobby.gd -msgid "Start Game" -msgstr "Spiel starten" +msgid "Join game" +msgstr "Spiel beitreten" + +#: menu/lobby.tscn menu/lobby.gd +msgid "Spectate" +msgstr "Zuschauen" #: menu/lobby.tscn msgid "Map name" @@ -512,6 +522,20 @@ msgstr "" "Die Anzeige von Nutzernamen kann in den Einstellungen ein- und ausgeschaltet " "werden" +#: menu/popup_message.gd +msgid "Press %s and click \"Join\" to join the game while it is running" +msgstr "" +"Drücken Sie %s und klicken Sie „Beitreten“, um beizutreten, während das " +"Spiel läuft" + +#: menu/popup_message.gd +msgid "ESCAPE" +msgstr "ESCAPE" + +#: menu/popup_message.gd +msgid "Menu button" +msgstr "Menü-Knopf" + #: multiplayer.gd msgid "WebSocket closed with code: %d, reason %s. Clean: %s" msgstr "Web-Socket wurde geschlossen mit Code: %d, Grund %s. Sauber: %s" @@ -525,8 +549,17 @@ msgstr "" "%d.\n" "Ist das Spiel auf der neusten Version?" -#~ msgid "Hairstyle 1" -#~ msgstr "Frisur 1" +#: menu/hairstyle_preview.gd +msgid "Hairstyle %d" +msgstr "Frisur %d" + +#~ msgid "Tutorial started. (Uncheck and restart to replay)" +#~ msgstr "" +#~ "Anleitung abgeschlossen. (Deaktivieren und Spiel neu starten zum erneuten " +#~ "Spielen)" + +#~ msgid "Start Game" +#~ msgstr "Spiel starten" #~ msgid "Hairstyle 2" #~ msgstr "Frisur 2" diff --git a/client/project.godot b/client/project.godot index cdbe6362..d1f93456 100644 --- a/client/project.godot +++ b/client/project.godot @@ -185,7 +185,7 @@ zoom_out_discrete={ [internationalization] locale/translations=PackedStringArray("res://po/de.po") -locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/credits.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd") +locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/credits.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd") [rendering] -- cgit v1.2.3-70-g09d2