From 9eececc296d055ce69a320ab7f813d9b83f09794 Mon Sep 17 00:00:00 2001 From: rendo Date: Wed, 18 Feb 2026 11:16:40 +0500 Subject: [PATCH] Lab kinetic --- assets/reagents/H2SO4.tres | 10 ++++++++ assets/reagents/Na2S2O3.tres | 10 ++++++++ assets/substances/H2SO4.tres | 9 +++++++ assets/substances/Na2S2O3.tres | 11 +++++++++ labs/lab-4-kinetic.tres | 24 +++++++++++++++++++ ...lectrolyte.tres => lab-8-electrolyte.tres} | 0 labs/lab-kinetic/experiment-1.tres | 7 ++++++ labs/lab-kinetic/experiment-2.tres | 7 ++++++ labs/lab-kinetic/experiment-3.tres | 7 ++++++ labs/lab-kinetic/test-1.tres | 8 +++++++ project.godot | 2 +- src/lab_runtime.gd | 4 ++-- 12 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 assets/reagents/H2SO4.tres create mode 100644 assets/reagents/Na2S2O3.tres create mode 100644 assets/substances/H2SO4.tres create mode 100644 assets/substances/Na2S2O3.tres create mode 100644 labs/lab-4-kinetic.tres rename labs/{lab-electrolyte.tres => lab-8-electrolyte.tres} (100%) create mode 100644 labs/lab-kinetic/experiment-1.tres create mode 100644 labs/lab-kinetic/experiment-2.tres create mode 100644 labs/lab-kinetic/experiment-3.tres create mode 100644 labs/lab-kinetic/test-1.tres diff --git a/assets/reagents/H2SO4.tres b/assets/reagents/H2SO4.tres new file mode 100644 index 0000000..d8a2809 --- /dev/null +++ b/assets/reagents/H2SO4.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="Reagent" format=3 uid="uid://3oobdagbv3gw"] + +[ext_resource type="Script" uid="uid://bditqax8ibmxw" path="res://src/resources/reagent.gd" id="1_yxgtg"] +[ext_resource type="PackedScene" uid="uid://cw6v8kbi76qak" path="res://scenes/substance_jar.tscn" id="2_wj4gb"] +[ext_resource type="Resource" uid="uid://dr1i3u5f2cl5b" path="res://assets/substances/H2SO4.tres" id="3_wj4gb"] + +[resource] +script = ExtResource("1_yxgtg") +substance = ExtResource("3_wj4gb") +metadata/_custom_type_script = "uid://bditqax8ibmxw" diff --git a/assets/reagents/Na2S2O3.tres b/assets/reagents/Na2S2O3.tres new file mode 100644 index 0000000..1c7b9dd --- /dev/null +++ b/assets/reagents/Na2S2O3.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="Reagent" format=3 uid="uid://qyhihxq3c7ad"] + +[ext_resource type="Script" uid="uid://bditqax8ibmxw" path="res://src/resources/reagent.gd" id="1_ya17r"] +[ext_resource type="PackedScene" uid="uid://cw6v8kbi76qak" path="res://scenes/substance_jar.tscn" id="2_wp5lr"] +[ext_resource type="Resource" uid="uid://b5sbtnoedw82d" path="res://assets/substances/Na2S2O3.tres" id="3_wp5lr"] + +[resource] +script = ExtResource("1_ya17r") +substance = ExtResource("3_wp5lr") +metadata/_custom_type_script = "uid://bditqax8ibmxw" diff --git a/assets/substances/H2SO4.tres b/assets/substances/H2SO4.tres new file mode 100644 index 0000000..631a16b --- /dev/null +++ b/assets/substances/H2SO4.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" script_class="Substance" format=3 uid="uid://dr1i3u5f2cl5b"] + +[ext_resource type="Script" uid="uid://b8q5buwgvppyh" path="res://src/resources/substance.gd" id="1_710m6"] + +[resource] +script = ExtResource("1_710m6") +formula = &"H2SO4" +scientific_name = &"Серная кислота" +metadata/_custom_type_script = "uid://b8q5buwgvppyh" diff --git a/assets/substances/Na2S2O3.tres b/assets/substances/Na2S2O3.tres new file mode 100644 index 0000000..66b9b27 --- /dev/null +++ b/assets/substances/Na2S2O3.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" script_class="Substance" format=3 uid="uid://b5sbtnoedw82d"] + +[ext_resource type="Script" uid="uid://b8q5buwgvppyh" path="res://src/resources/substance.gd" id="1_jono7"] + +[resource] +script = ExtResource("1_jono7") +formula = &"Na2S2O3" +scientific_name = &"Тиосульфат натрия" +color = Color(1, 1, 1, 1) +prefer_scientific_name = true +metadata/_custom_type_script = "uid://b8q5buwgvppyh" diff --git a/labs/lab-4-kinetic.tres b/labs/lab-4-kinetic.tres new file mode 100644 index 0000000..244069e --- /dev/null +++ b/labs/lab-4-kinetic.tres @@ -0,0 +1,24 @@ +[gd_resource type="Resource" script_class="Labwork" format=3 uid="uid://bdqs1el7oa4h0"] + +[ext_resource type="Script" uid="uid://pwvqjgwse0wk" path="res://src/resources/lab/experiment.gd" id="1_v3blc"] +[ext_resource type="Script" uid="uid://bditqax8ibmxw" path="res://src/resources/reagent.gd" id="2_4cfts"] +[ext_resource type="Resource" uid="uid://bwh5y745anmry" path="res://labs/lab-kinetic/experiment-1.tres" id="2_mejai"] +[ext_resource type="Resource" uid="uid://wqliu3fcc4vq" path="res://labs/lab-kinetic/experiment-2.tres" id="3_2v66m"] +[ext_resource type="Resource" uid="uid://bbbrxgvfp4jvg" path="res://assets/reagents/H2O.tres" id="3_3dlrw"] +[ext_resource type="Resource" uid="uid://dky5v1oq2axto" path="res://labs/lab-kinetic/experiment-3.tres" id="4_h27q8"] +[ext_resource type="Resource" uid="uid://3oobdagbv3gw" path="res://assets/reagents/H2SO4.tres" id="4_x8kdo"] +[ext_resource type="Resource" uid="uid://qyhihxq3c7ad" path="res://assets/reagents/Na2S2O3.tres" id="5_mejai"] +[ext_resource type="Script" uid="uid://cfxmgxmy24xf7" path="res://src/resources/lab/lab_work.gd" id="6_2v66m"] +[ext_resource type="Script" uid="uid://dpacehourck22" path="res://src/resources/lab/test.gd" id="7_h27q8"] +[ext_resource type="Script" uid="uid://b3i73cilpra74" path="res://src/resources/draggable.gd" id="8_r500m"] +[ext_resource type="Resource" uid="uid://cay05wpketmny" path="res://assets/draggables/flask.tres" id="9_8id35"] +[ext_resource type="Resource" uid="uid://dbc7bgsudu3h3" path="res://labs/lab-kinetic/test-1.tres" id="11_r500m"] + +[resource] +script = ExtResource("6_2v66m") +lab_name = "Лабораторная работа №4 - Кинетика химических реакций" +experiments = Array[ExtResource("1_v3blc")]([ExtResource("2_mejai"), ExtResource("3_2v66m"), ExtResource("4_h27q8")]) +tests = Array[ExtResource("7_h27q8")]([ExtResource("11_r500m")]) +reagents = Array[ExtResource("2_4cfts")]([ExtResource("3_3dlrw"), ExtResource("4_x8kdo"), ExtResource("5_mejai")]) +tools = Array[ExtResource("8_r500m")]([ExtResource("9_8id35")]) +metadata/_custom_type_script = "uid://cfxmgxmy24xf7" diff --git a/labs/lab-electrolyte.tres b/labs/lab-8-electrolyte.tres similarity index 100% rename from labs/lab-electrolyte.tres rename to labs/lab-8-electrolyte.tres diff --git a/labs/lab-kinetic/experiment-1.tres b/labs/lab-kinetic/experiment-1.tres new file mode 100644 index 0000000..640d0ef --- /dev/null +++ b/labs/lab-kinetic/experiment-1.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="LabExperiment" format=3 uid="uid://bwh5y745anmry"] + +[ext_resource type="Script" uid="uid://pwvqjgwse0wk" path="res://src/resources/lab/experiment.gd" id="1_mgyxm"] + +[resource] +script = ExtResource("1_mgyxm") +metadata/_custom_type_script = "uid://pwvqjgwse0wk" diff --git a/labs/lab-kinetic/experiment-2.tres b/labs/lab-kinetic/experiment-2.tres new file mode 100644 index 0000000..493b885 --- /dev/null +++ b/labs/lab-kinetic/experiment-2.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="LabExperiment" format=3 uid="uid://wqliu3fcc4vq"] + +[ext_resource type="Script" uid="uid://pwvqjgwse0wk" path="res://src/resources/lab/experiment.gd" id="1_sf45p"] + +[resource] +script = ExtResource("1_sf45p") +metadata/_custom_type_script = "uid://pwvqjgwse0wk" diff --git a/labs/lab-kinetic/experiment-3.tres b/labs/lab-kinetic/experiment-3.tres new file mode 100644 index 0000000..7d548c9 --- /dev/null +++ b/labs/lab-kinetic/experiment-3.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="LabExperiment" format=3 uid="uid://dky5v1oq2axto"] + +[ext_resource type="Script" uid="uid://pwvqjgwse0wk" path="res://src/resources/lab/experiment.gd" id="1_ua60a"] + +[resource] +script = ExtResource("1_ua60a") +metadata/_custom_type_script = "uid://pwvqjgwse0wk" diff --git a/labs/lab-kinetic/test-1.tres b/labs/lab-kinetic/test-1.tres new file mode 100644 index 0000000..b4798b2 --- /dev/null +++ b/labs/lab-kinetic/test-1.tres @@ -0,0 +1,8 @@ +[gd_resource type="Resource" script_class="LabTest" format=3 uid="uid://dbc7bgsudu3h3"] + +[ext_resource type="Script" uid="uid://dpacehourck22" path="res://src/resources/lab/test.gd" id="1_h262x"] + +[resource] +script = ExtResource("1_h262x") +options = Array[String]([""]) +metadata/_custom_type_script = "uid://dpacehourck22" diff --git a/project.godot b/project.godot index 84308c8..e7c25d1 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="lab-electrolyte" -run/main_scene="uid://c7r4rhgj3ucao" +run/main_scene="uid://c2ciwyjf7au6l" config/features=PackedStringArray("4.6", "Mobile") config/icon="res://icon.svg" diff --git a/src/lab_runtime.gd b/src/lab_runtime.gd index 8462426..ceaa539 100644 --- a/src/lab_runtime.gd +++ b/src/lab_runtime.gd @@ -1,9 +1,9 @@ extends Node const LAB_PREFAB: PackedScene = preload("uid://c7r4rhgj3ucao") -const MENU_PREFAB: PackedScene = preload("uid://c7r4rhgj3ucao") +const MENU_PREFAB: PackedScene = preload("uid://c2ciwyjf7au6l") -var current_lab: Labwork = preload("res://labs/lab-electrolyte.tres") +var current_lab: Labwork var anwsers: Array[int] var correctness: Array[bool]