From 7380fedd7b6506311315b4976279e8b9c3ba4aa5 Mon Sep 17 00:00:00 2001 From: nokoe Date: Tue, 25 Jun 2024 18:53:01 +0200 Subject: lower progress bar --- client/map/items/item.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/map/items') diff --git a/client/map/items/item.gd b/client/map/items/item.gd index cb0cf0b7..cd8fd75e 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -22,7 +22,7 @@ var base: Node3D = Node3D.new() var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate() func _init(owned_by_: Node3D): - progress_instance.position.y = 2. + progress_instance.position.y = 1 progress_instance.visible = false add_child(progress_instance) base.position = base_position() -- cgit v1.2.3-70-g09d2 From 3cc7f045193d8511646349aeb836fb7896a830b1 Mon Sep 17 00:00:00 2001 From: tpart Date: Tue, 25 Jun 2024 21:21:18 +0200 Subject: Improve processing particles --- client/map/items/processing.tscn | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'client/map/items') diff --git a/client/map/items/processing.tscn b/client/map/items/processing.tscn index f8deb6be..9e15116a 100644 --- a/client/map/items/processing.tscn +++ b/client/map/items/processing.tscn @@ -1,26 +1,34 @@ -[gd_scene load_steps=3 format=3 uid="uid://sk5i14bxi0qr"] +[gd_scene load_steps=5 format=3 uid="uid://sk5i14bxi0qr"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tqrr3"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yoo4e"] vertex_color_use_as_albedo = true -[sub_resource type="SphereMesh" id="SphereMesh_baneh"] -material = SubResource("StandardMaterial3D_tqrr3") +[sub_resource type="SphereMesh" id="SphereMesh_0mtl0"] +material = SubResource("StandardMaterial3D_yoo4e") radius = 0.1 height = 0.2 +[sub_resource type="Curve" id="Curve_gpg1j"] +_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.196507, 1), 0.0, 0.0, 0, 0, Vector2(0.803493, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 4 + +[sub_resource type="Gradient" id="Gradient_rmdnt"] +colors = PackedColorArray(0.616519, 0.384559, 0.191367, 1, 0.963566, 0.531545, 0.452402, 1) + [node name="Processing" type="CPUParticles3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) -emitting = false amount = 15 -local_coords = true -mesh = SubResource("SphereMesh_baneh") +mesh = SubResource("SphereMesh_0mtl0") emission_shape = 6 emission_ring_axis = Vector3(0, 1, 0) -emission_ring_height = 0.2 +emission_ring_height = 0.3 emission_ring_radius = 0.1 emission_ring_inner_radius = 0.0 direction = Vector3(0, 1, 0) spread = 180.0 gravity = Vector3(0, 0, 0) +radial_accel_min = -1.0 scale_amount_min = 0.75 scale_amount_max = 1.1 +scale_amount_curve = SubResource("Curve_gpg1j") +color_initial_ramp = SubResource("Gradient_rmdnt") -- cgit v1.2.3-70-g09d2 From b1695155df09a48d801dfb3b0e806f83303a3268 Mon Sep 17 00:00:00 2001 From: tpart Date: Tue, 25 Jun 2024 21:27:13 +0200 Subject: Revert "Improve processing particles" This reverts commit 3cc7f045193d8511646349aeb836fb7896a830b1. --- client/map/items/processing.tscn | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'client/map/items') diff --git a/client/map/items/processing.tscn b/client/map/items/processing.tscn index 9e15116a..f8deb6be 100644 --- a/client/map/items/processing.tscn +++ b/client/map/items/processing.tscn @@ -1,34 +1,26 @@ -[gd_scene load_steps=5 format=3 uid="uid://sk5i14bxi0qr"] +[gd_scene load_steps=3 format=3 uid="uid://sk5i14bxi0qr"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yoo4e"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tqrr3"] vertex_color_use_as_albedo = true -[sub_resource type="SphereMesh" id="SphereMesh_0mtl0"] -material = SubResource("StandardMaterial3D_yoo4e") +[sub_resource type="SphereMesh" id="SphereMesh_baneh"] +material = SubResource("StandardMaterial3D_tqrr3") radius = 0.1 height = 0.2 -[sub_resource type="Curve" id="Curve_gpg1j"] -_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.196507, 1), 0.0, 0.0, 0, 0, Vector2(0.803493, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] -point_count = 4 - -[sub_resource type="Gradient" id="Gradient_rmdnt"] -colors = PackedColorArray(0.616519, 0.384559, 0.191367, 1, 0.963566, 0.531545, 0.452402, 1) - [node name="Processing" type="CPUParticles3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) +emitting = false amount = 15 -mesh = SubResource("SphereMesh_0mtl0") +local_coords = true +mesh = SubResource("SphereMesh_baneh") emission_shape = 6 emission_ring_axis = Vector3(0, 1, 0) -emission_ring_height = 0.3 +emission_ring_height = 0.2 emission_ring_radius = 0.1 emission_ring_inner_radius = 0.0 direction = Vector3(0, 1, 0) spread = 180.0 gravity = Vector3(0, 0, 0) -radial_accel_min = -1.0 scale_amount_min = 0.75 scale_amount_max = 1.1 -scale_amount_curve = SubResource("Curve_gpg1j") -color_initial_ramp = SubResource("Gradient_rmdnt") -- cgit v1.2.3-70-g09d2