diff --git a/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav b/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav new file mode 100644 index 0000000..719068f --- /dev/null +++ b/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85907dac550baa897c5cf856a04f5015e992e0b59b42912a083e6d0b4d3d0996 +size 23946990 diff --git a/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav.import b/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav.import new file mode 100644 index 0000000..0942be7 --- /dev/null +++ b/src/base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dg4cq1texkil5" +path="res://.godot/imported/FoM_xavier_therapie_1.wav-5b326af67128f51afe9b270b12a8a195.sample" + +[deps] + +source_file="res://base-environments/volunteer_room/scenes/FoM_xavier_therapie_1.wav" +dest_files=["res://.godot/imported/FoM_xavier_therapie_1.wav-5b326af67128f51afe9b270b12a8a195.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/src/base-environments/volunteer_room/scenes/therapy_uni.tscn b/src/base-environments/volunteer_room/scenes/therapy_uni.tscn index c0b24d6..97ea324 100644 --- a/src/base-environments/volunteer_room/scenes/therapy_uni.tscn +++ b/src/base-environments/volunteer_room/scenes/therapy_uni.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=17 format=3 uid="uid://5dkocippxkwv"] +[gd_scene load_steps=16 format=3 uid="uid://5dkocippxkwv"] [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_uxp36"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_27dlw"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_6qw45"] [ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_pf7gl"] -[ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_6cbuc"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_ecg2n"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_ld7n3"] @@ -107,12 +106,8 @@ tracks/0/path = NodePath("../../../AnimationPlayer/Text") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"clips": [{ -"end_offset": 1.36178, -"start_offset": 0.0, -"stream": ExtResource("5_6cbuc") -}], -"times": PackedFloat32Array(1.16667) +"clips": [], +"times": PackedFloat32Array() } tracks/0/use_blend = true tracks/1/type = "value" @@ -458,7 +453,7 @@ _data = { &"vanish": SubResource("Animation_x0d5q") } -[node name="therapy_1" type="CenterContainer"] +[node name="therapy_uni" type="CenterContainer"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -540,7 +535,7 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 2 mouse_filter = 2 -scroll_vertical = 111 +scroll_vertical = 100 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 @@ -550,7 +545,7 @@ custom_minimum_size = Vector2(800, 10) layout_mode = 2 size_flags_horizontal = 3 bbcode_enabled = true -text = "[p]In hindsight I don't know if going to uni was the right decision. [/p][p][font_size=8] [/font_size][/p][p]I doubt many professors would recommend me to come again. Me, the lazy student that just lacks the discipline to come to their lectures and do their assignments and learn for their exams. Sorry prof, I wanted to come but there was no class for me. [/p][p][font_size=8] [/font_size][/p][p]I didn't sign up to study math, biology and art history. I came here to study education. And my dear Mr. Professor: seeing your lacklustre lectures, I don't think there's much I can learn from you. [/p][p][font_size=8] [/font_size][/p][p]So, rather than wasting my time on advanced algebra, I spend it on the student council to organize support I would have needed but didn't get. I have never worked or learned so much in my entire life. [/p][p][font_size=8] [/font_size][/p][p]This is also where I got diagnosed by peer review. Who would have guessed that creating a social activity without alcohol or noise would attract all the neurodivergent students. [/p][p][font_size=8] [/font_size][/p][p]This is also why I would maybe still do it all over again: Because these beautiful people very probably saved my life by not giving up on me and helping me get professional help. [/p][p][font_size=8] [/font_size][/p][p]My therapist was somewhat old-fashioned and I got to learn from experience why deep psychology isn't recommended for autism or ADHD, but she didn't think I had that anyway. So we talked a lot about my depression, my sense of self and how it evolved from my past. [/p][p][font_size=8] [/font_size][/p][p]She was a very good listener and had a gift for putting her finger on hurtful thoughts. She was never gentle in doing that, but she was right about one thing: Old thoughts are here to stay, but they can be rearranged. [/p]" +text = "[p]In hindsight I don't know if going to uni was the right decision. [/p][p][font_size=8] [/font_size][/p][p]I doubt many professors would recommend me to come again. Me, the lazy student that just lacks the discipline to come to their lectures and do their assignments and learn for their exams. Sorry prof, I wanted to come but there was no class for me. [/p][p][font_size=8] [/font_size][/p][p]I didn't sign up to study math, biology and art history. I came here to study education. And my dear Mr. Professor: seeing your lacklustre lectures, I don't think there's much I can learn from you. [/p][p][font_size=8] [/font_size][/p][p]So, rather than wasting my time on advanced algebra, I spend it on the student council to organize support I would have needed but didn't get. I have never worked or learned so much in my entire life. [/p][p][font_size=8] [/font_size][/p][p]This is also where I got diagnosed by peer review. Who would have guessed that creating a social activity without alcohol or noise would attract all the neurodivergent students. [/p][p][font_size=8] [/font_size][/p][p]This is also why I would maybe still do it all over again: Because these beautiful people very probably saved my life by not giving up on me and helping me get professional help. [/p][p][font_size=8] [/font_size][/p][p]My therapist was somewhat old-fashioned and I got to learn from experience why deep psychology isn't recommended for autism or ADHD, but she didn't think I had that anyway. So we talked a lot about my depression, my sense of self and how it evolved from my past. [/p][p][font_size=8] [/font_size][/p][p]She was a very good listener and had a gift for putting her finger on hurtful thoughts. She was never gentle in doing that, but she was right about one thing: Old thoughts are here to stay, but they can be rearranged. [/p][p][font_size=8] [/font_size][/p][p][/p]" fit_content = true scroll_active = false visible_characters_behavior = 1 diff --git a/src/base-environments/volunteer_room/scenes/terhapy_volunteer.tscn b/src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn similarity index 100% rename from src/base-environments/volunteer_room/scenes/terhapy_volunteer.tscn rename to src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn diff --git a/src/base-environments/volunteer_room/shaders/gem-artwork.gdshader b/src/base-environments/volunteer_room/shaders/gem-artwork.gdshader index 71d3704..6c76938 100644 --- a/src/base-environments/volunteer_room/shaders/gem-artwork.gdshader +++ b/src/base-environments/volunteer_room/shaders/gem-artwork.gdshader @@ -7,7 +7,11 @@ uniform sampler2D texture_normal_detail : hint_default_white, filter_linear_mipm void fragment() { - ALBEDO = texture(texture_albedo, UV).xyz * texture(texture_normal_detail, UV * vec2(336.*.125,278.*.125)).w; - NORMAL = texture(texture_normal_detail, UV * vec2(336.*.125,278.*.125)).xyz; - ROUGHNESS = .2; + ALBEDO = texture(texture_albedo, UV).xyz; + NORMAL_MAP = texture(texture_normal_detail, UV2).xyz; + SPECULAR = 0.3; + ROUGHNESS = .35; + METALLIC = .3; + //EMISSION = vec3(texture(texture_normal_detail, UV2).w); + ALPHA = texture(texture_normal_detail, UV2).w; } diff --git a/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav b/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav new file mode 100644 index 0000000..719068f --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85907dac550baa897c5cf856a04f5015e992e0b59b42912a083e6d0b4d3d0996 +size 23946990 diff --git a/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav.import b/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav.import new file mode 100644 index 0000000..43345aa --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cnhkrhtk4cirx" +path="res://.godot/imported/FoM_xavier_therapie_1.wav-2f89be78e727006098e40dafc1bd12ce.sample" + +[deps] + +source_file="res://base-environments/volunteer_room/sounds/FoM_xavier_therapie_1.wav" +dest_files=["res://.godot/imported/FoM_xavier_therapie_1.wav-2f89be78e727006098e40dafc1bd12ce.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav b/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav new file mode 100644 index 0000000..8eff92d --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbdfcd29026fb94fc9e44ecc5f90e03c041fb1a0b0555073d4aac22b95dce090 +size 17382546 diff --git a/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav.import b/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav.import new file mode 100644 index 0000000..7747cbe --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cw1s2g8wg3120" +path="res://.godot/imported/FoM_xavier_unifood.wav-749e84d4d1fbb75783d4fd7be4b36152.sample" + +[deps] + +source_file="res://base-environments/volunteer_room/sounds/FoM_xavier_unifood.wav" +dest_files=["res://.godot/imported/FoM_xavier_unifood.wav-749e84d4d1fbb75783d4fd7be4b36152.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/src/base-environments/volunteer_room/sounds/opening.ogg b/src/base-environments/volunteer_room/sounds/opening.ogg new file mode 100644 index 0000000..e6da073 --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/opening.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7af92fa4c5fc5ddbd02db77d540d80ef97b020eb788465ff61cb22e8551ef9e5 +size 486930 diff --git a/src/base-environments/volunteer_room/sounds/opening.ogg.import b/src/base-environments/volunteer_room/sounds/opening.ogg.import new file mode 100644 index 0000000..540e9e8 --- /dev/null +++ b/src/base-environments/volunteer_room/sounds/opening.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c67vmyhc5hvcx" +path="res://.godot/imported/opening.ogg-2ea02ba8c15ca9c22006741ccf574ddb.oggvorbisstr" + +[deps] + +source_file="res://base-environments/volunteer_room/sounds/opening.ogg" +dest_files=["res://.godot/imported/opening.ogg-2ea02ba8c15ca9c22006741ccf574ddb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/base-environments/youth_room/chest_revealnim.anim b/src/base-environments/youth_room/chest_revealnim.anim new file mode 100644 index 0000000..4e8e4bb Binary files /dev/null and b/src/base-environments/youth_room/chest_revealnim.anim differ diff --git a/src/base-environments/youth_room/scnees/draven.tscn b/src/base-environments/youth_room/scnees/draven.tscn index 03709bc..74fdf88 100644 --- a/src/base-environments/youth_room/scnees/draven.tscn +++ b/src/base-environments/youth_room/scnees/draven.tscn @@ -95,6 +95,18 @@ tracks/6/keys = { "update": 1, "values": [ExtResource("6_7f2et")] } +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("%AnimationPlayer/Music:playing") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_bgeog"] resource_name = "de" @@ -215,21 +227,18 @@ tracks/6/keys = { "update": 1, "values": [true] } -tracks/7/type = "audio" +tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("%AnimationPlayer/Music") +tracks/7/path = NodePath("%AnimationPlayer/Music:stream") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("6_7f2et") -}], -"times": PackedFloat32Array(0.0333333) +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("6_7f2et")] } -tracks/7/use_blend = true [sub_resource type="Animation" id="Animation_egql5"] resource_name = "debug" @@ -368,21 +377,18 @@ tracks/6/keys = { "update": 1, "values": [true] } -tracks/7/type = "audio" +tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("%AnimationPlayer/Music") +tracks/7/path = NodePath("%AnimationPlayer/Music:stream") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 0.0, -"stream": ExtResource("6_7f2et") -}], -"times": PackedFloat32Array(0.0333333) +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("6_7f2et")] } -tracks/7/use_blend = true [sub_resource type="Animation" id="Animation_d2p1i"] resource_name = "vanish" diff --git a/src/logic-scenes/card_burner/card_burner.tscn b/src/logic-scenes/card_burner/card_burner.tscn index a24e908..c0c5cd3 100644 --- a/src/logic-scenes/card_burner/card_burner.tscn +++ b/src/logic-scenes/card_burner/card_burner.tscn @@ -121,7 +121,6 @@ horizontal_alignment = 1 [node name="Ancor1" type="Control" parent="Control"] unique_name_in_owner = true -layout_mode = 2 anchors_preset = 0 offset_left = -518.0 offset_top = 14.0 @@ -136,7 +135,6 @@ metadata/_custom_type_script = "uid://2loic2eeec5b" [node name="Ancor2" type="Control" parent="Control"] unique_name_in_owner = true -layout_mode = 2 anchors_preset = 0 offset_left = -183.0 offset_top = 35.0 @@ -151,7 +149,6 @@ metadata/_custom_type_script = "uid://2loic2eeec5b" [node name="Ancor3" type="Control" parent="Control"] unique_name_in_owner = true -layout_mode = 2 anchors_preset = 0 offset_left = 153.0 offset_top = 22.0 @@ -166,7 +163,6 @@ metadata/_custom_type_script = "uid://2loic2eeec5b" [node name="Ancor4" type="Control" parent="Control"] unique_name_in_owner = true -layout_mode = 2 anchors_preset = 0 offset_left = 495.0 offset_top = 15.0