small fixes

.~lock.Работы по химии TODO.docx#

@@ -1 +1 @@
-,rendo,kompikrendo,28.06.2026 19:23,file:///home/rendo/.config/libreoffice/4;
+,rendo,kompikrendo,29.06.2026 00:21,file:///home/rendo/.config/libreoffice/4;

assets/models/Drip.glb.import

@@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/Drip.glb-91c932019939c0c57a2bbeb7aa92f14a.scn
 nodes/root_type=""
 nodes/root_name=""
 nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
@@ -44,7 +46,37 @@ _subresources={
 "use_external/fallback_path": "res://assets/materials/mat_glass.tres",
 "use_external/path": "uid://64m17act0kwu"
 }
+},
+"meshes": {
+"Drip_Cylinder": {
+"generate/lightmap_uv": 0,
+"generate/lods": 0,
+"generate/shadow_meshes": 0,
+"lods/normal_merge_angle": 20.0,
+"save_to_file/enabled": true,
+"save_to_file/fallback_path": "res://assets/meshes/Drip_Cylinder.res",
+"save_to_file/path": "uid://bca7m12sa3g48"
+},
+"Drip_Cylinder_001": {
+"generate/lightmap_uv": 0,
+"generate/lods": 0,
+"generate/shadow_meshes": 0,
+"lods/normal_merge_angle": 20.0,
+"save_to_file/enabled": true,
+"save_to_file/fallback_path": "res://assets/meshes/Drip_Cylinder_001.res",
+"save_to_file/path": "uid://dv7q66xtqi55t"
+},
+"Drip_Cylinder_004": {
+"generate/lightmap_uv": 0,
+"generate/lods": 0,
+"generate/shadow_meshes": 0,
+"lods/normal_merge_angle": 20.0,
+"save_to_file/enabled": true,
+"save_to_file/fallback_path": "res://assets/meshes/Drip_Cylinder_004.res",
+"save_to_file/path": "uid://dwg7r8hor517p"
+}
 }
 }
 gltf/naming_version=2
 gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/reactions/hcl_p_naoh.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="Reaction" load_steps=11 format=3 uid="uid://17oljvqj8f33"]
+[gd_resource type="Resource" script_class="Reaction" format=3 uid="uid://17oljvqj8f33"]
 
 [ext_resource type="Script" uid="uid://bb8o8l6u6fiai" path="res://src/resources/reaction_substance.gd" id="1_bffrj"]
 [ext_resource type="Resource" uid="uid://30ym4xb0uu3y" path="res://assets/substances/NaOH.tres" id="2_1nb8s"]

assets/reagents/Phenolphtalein.tres

@@ -1,9 +1,11 @@
-[gd_resource type="Resource" script_class="Reagent" load_steps=3 format=3 uid="uid://dia0grmva8062"]
+[gd_resource type="Resource" script_class="Reagent" format=3 uid="uid://dia0grmva8062"]
 
 [ext_resource type="Script" uid="uid://bditqax8ibmxw" path="res://src/resources/reagent.gd" id="1_v8ev6"]
 [ext_resource type="Resource" uid="uid://brih4gryc1acx" path="res://assets/substances/Phenolphtalein.tres" id="2_ikqma"]
+[ext_resource type="PackedScene" uid="uid://t432slq7xiyg" path="res://scenes/substance_jar_alt.tscn" id="2_ta4t0"]
 
 [resource]
 script = ExtResource("1_v8ev6")
 substance = ExtResource("2_ikqma")
+storage = ExtResource("2_ta4t0")
 metadata/_custom_type_script = "uid://b8q5buwgvppyh"

scenes/substance_jar_alt.tscn

@@ -0,0 +1,65 @@
+[gd_scene format=3 uid="uid://t432slq7xiyg"]
+
+[ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_ojiag"]
+[ext_resource type="ArrayMesh" uid="uid://b5bxc1qinl3gw" path="res://assets/meshes/Drip_Cylinder.res" id="2_ojiag"]
+[ext_resource type="ArrayMesh" uid="uid://5aw6ifbhbmu4" path="res://assets/meshes/Drip_Cylinder_001.res" id="3_kbrga"]
+[ext_resource type="Script" uid="uid://c8epd7gguvyop" path="res://src/substance_holder.gd" id="4_bxvcb"]
+[ext_resource type="Script" uid="uid://bl0ojhc0thk1p" path="res://src/interactible/interactible.gd" id="5_mhyp3"]
+[ext_resource type="Script" uid="uid://bhnptwotw5bs8" path="res://src/interactible/substance_jar_interaction.gd" id="6_p0fvg"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pcpcb"]
+resource_local_to_scene = true
+transparency = 1
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_kfk5m"]
+height = 0.6569824
+radius = 0.32421875
+
+[node name="SubstanceJar" type="Area3D" unique_id=904812958 node_paths=PackedStringArray("interactible")]
+collision_layer = 5
+script = ExtResource("1_ojiag")
+interactible = NodePath("Interaction")
+mask = PackedStringArray("flask")
+
+[node name="Jar" type="MeshInstance3D" parent="." unique_id=985146813]
+transform = Transform3D(0.14479385, 0.13796644, 0, -0.13796644, 0.14479385, 0, 0, 0, 0.2, 0.022179853, 0.41104287, 0)
+mesh = ExtResource("2_ojiag")
+
+[node name="JarFill" type="MeshInstance3D" parent="." unique_id=1364277535]
+transform = Transform3D(0.14479385, 0.13796644, 0, -0.13796644, 0.14479385, 0, 0, 0, 0.2, 0.050798316, 0.33528638, 0)
+material_override = SubResource("StandardMaterial3D_pcpcb")
+mesh = ExtResource("3_kbrga")
+
+[node name="DragArea" type="CollisionShape3D" parent="." unique_id=960002167]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3272705, 0)
+shape = SubResource("CylinderShape3D_kfk5m")
+
+[node name="SubstanceData" type="Node" parent="." unique_id=1379108671]
+script = ExtResource("4_bxvcb")
+
+[node name="Interaction" type="ConfirmationDialog" parent="." unique_id=1225848265]
+title = "Добавить вещество?"
+ok_button_text = "Добавить"
+cancel_button_text = "Не добавлять"
+script = ExtResource("5_mhyp3")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="Interaction" unique_id=1504866588]
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="ProgressBar" type="HSlider" parent="Interaction/HBoxContainer" unique_id=1037338095]
+layout_mode = 2
+size_flags_horizontal = 3
+allow_greater = true
+
+[node name="SpinBox" type="SpinBox" parent="Interaction/HBoxContainer" unique_id=194740698]
+layout_mode = 2
+allow_greater = true
+suffix = "мл."
+
+[node name="Interaction" type="Node" parent="Interaction" unique_id=729724369]
+script = ExtResource("6_p0fvg")
+
+[connection signal="interacted" from="Interaction" to="Interaction/Interaction" method="_on_interaction_interacted"]
+[connection signal="value_changed" from="Interaction/HBoxContainer/ProgressBar" to="Interaction/Interaction" method="_on_progress_bar_value_changed"]
+[connection signal="value_changed" from="Interaction/HBoxContainer/SpinBox" to="Interaction/Interaction" method="_on_spin_box_value_changed"]