diff --git a/design/board games/Sintel_The_Game_Logo_Small.svg b/design/board games/Sintel_The_Game_Logo_Small.svg
new file mode 100644
index 0000000..2583427
--- /dev/null
+++ b/design/board games/Sintel_The_Game_Logo_Small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/design/board games/board games.svg b/design/board games/board games.svg
new file mode 100644
index 0000000..5a8cf02
--- /dev/null
+++ b/design/board games/board games.svg
@@ -0,0 +1,20367 @@
+
+
+
+
diff --git a/design/board games/unknown_horizons.svg b/design/board games/unknown_horizons.svg
new file mode 100644
index 0000000..37a6076
--- /dev/null
+++ b/design/board games/unknown_horizons.svg
@@ -0,0 +1,1299 @@
+
+
+
\ No newline at end of file
diff --git a/design/board games/unknown_horizons_homepage-background.jpg b/design/board games/unknown_horizons_homepage-background.jpg
new file mode 100644
index 0000000..e607192
Binary files /dev/null and b/design/board games/unknown_horizons_homepage-background.jpg differ
diff --git a/design/contributions.md b/design/contributions.md
index f159274..14cd5d4 100644
--- a/design/contributions.md
+++ b/design/contributions.md
@@ -24,12 +24,19 @@
## Wikimedia Commons
- [Gebäude in Darmstadt](https://commons.wikimedia.org/wiki/File:Geb%C3%A4ude_in_Darmstadt.jpg) by [Neq00](https://commons.wikimedia.org/wiki/User:Neq00) CC-BY-SA 4.0
-## Comic Illustrations
+## Illustrations
- by [Fernand0FC](https://www.deviantart.com/fernand0fc), CC-BY-3.0
+ [Corporate level bodyguard](https://www.deviantart.com/fernand0fc/art/Corporate-level-bodyguard-803579124)
+ [Into the glowing sea](https://www.deviantart.com/fernand0fc/art/Into-the-glowing-sea-834238466)
+ [Anti-Hero](https://www.deviantart.com/fernand0fc/art/Anti-Hero-555054767)
+ + [Unknown Horizons](https://unknown-horizons.org/) Artwork, provided by a [GPL-2.0 license](https://github.com/unknown-horizons/unknown-horizons.github.io/blob/source/LICENSE)
+ + [Strange Adventures in Infinite Space](https://rich.itch.io/strangeadventures) by [Digital Eel](https://rich.itch.io), CC-BY-NC 4.0
+ + [Star Ruler 2](https://github.com/BlindMindStudios/StarRuler2-Source), CC-BY-NC 2.0
+ + [MegaGlest](https://megaglest.org/), GPL
+ + [Splash Screen Neo](https://inkscape.org/de/~MuhamadAliAkbar/%E2%98%85splash-screen-neon) by [Muhamad Ali Akbar](https://inkscape.org/de/~MuhamadAliAkbar/), CC-BY-SA
+ + [Oh My Git](https://ohmygit.org/) by [bleeptrack](https://bleeptrack.de/) and [blinry](https://morr.cc/), Blue Oak Model License
+ + [Ghostwriter]() by kde****
## Music
- [Foundations I by Azure Studios](https://azurestudios.bandcamp.com/album/foundations-i-24bit), CC-BY 3.0
@@ -42,6 +49,6 @@
## Fonts all using OFL
- - Nanum Script by [Sandoll](https://fonts.google.com/?query=Sandoll)
+ - Nanum Fonts by [Sandoll](https://fonts.google.com/?query=Sandoll)
- Atkinson Hyperlegible by Braille Institute, Applied Design Works, Elliott Scott, Megan Eiswerth, Linus Boman, Theodore Petrosky
-
\ No newline at end of file
diff --git a/design/steam-assets/linkedin-banner.png b/design/steam-assets/linkedin-banner.png
new file mode 100644
index 0000000..d787e61
Binary files /dev/null and b/design/steam-assets/linkedin-banner.png differ
diff --git a/src/base-environments/youth_room/Collectable.gd b/src/base-environments/youth_room/Collectable.gd
index 8d82b84..a132702 100644
--- a/src/base-environments/youth_room/Collectable.gd
+++ b/src/base-environments/youth_room/Collectable.gd
@@ -11,8 +11,8 @@ var revealed: bool = false:
wrapper.show()
ui.show()
else:
- wrapper.hide()
ui.hide()
+ wrapper.hide()
var has_mouse: bool = false
diff --git a/src/base-environments/youth_room/import/materials/starlight_shader.material b/src/base-environments/youth_room/import/materials/starlight_shader.material
index aea0cb6..a108595 100644
Binary files a/src/base-environments/youth_room/import/materials/starlight_shader.material and b/src/base-environments/youth_room/import/materials/starlight_shader.material differ
diff --git a/src/base-environments/youth_room/import/textures/desk-atlas-albedo.png b/src/base-environments/youth_room/import/textures/desk-atlas-albedo.png
index 7532b5e..8aa52ef 100644
Binary files a/src/base-environments/youth_room/import/textures/desk-atlas-albedo.png and b/src/base-environments/youth_room/import/textures/desk-atlas-albedo.png differ
diff --git a/src/base-environments/youth_room/import/windows.glb b/src/base-environments/youth_room/import/windows.glb
new file mode 100644
index 0000000..5e09b05
Binary files /dev/null and b/src/base-environments/youth_room/import/windows.glb differ
diff --git a/src/base-environments/youth_room/import/windows.glb.import b/src/base-environments/youth_room/import/windows.glb.import
new file mode 100644
index 0000000..1633ca8
--- /dev/null
+++ b/src/base-environments/youth_room/import/windows.glb.import
@@ -0,0 +1,55 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cxpali5h6rtvy"
+path="res://.godot/imported/windows.glb-e9e12fe354df28782c5ffaffee432d1d.scn"
+
+[deps]
+
+source_file="res://base-environments/youth_room/import/windows.glb"
+dest_files=["res://.godot/imported/windows.glb-e9e12fe354df28782c5ffaffee432d1d.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={
+"materials": {
+"door": {
+"use_external/enabled": true,
+"use_external/path": "res://base-environments/youth_room/import/materials/door.tres"
+},
+"window_glass": {
+"use_external/enabled": true,
+"use_external/path": "res://base-environments/youth_room/shaders/window.material"
+}
+},
+"meshes": {
+"windows_windows": {
+"generate/lightmap_uv": 0,
+"generate/lods": 0,
+"generate/shadow_meshes": 0,
+"lods/normal_merge_angle": 30.0,
+"lods/normal_split_angle": 15.0,
+"save_to_file/enabled": false,
+"save_to_file/make_streamable": "",
+"save_to_file/path": ""
+}
+}
+}
+gltf/embedded_image_handling=1
diff --git a/src/base-environments/youth_room/shaders/window.material b/src/base-environments/youth_room/shaders/window.material
new file mode 100644
index 0000000..e88393b
Binary files /dev/null and b/src/base-environments/youth_room/shaders/window.material differ
diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn
index e39d9a4..5b86b3e 100644
--- a/src/base-environments/youth_room/youth_room.tscn
+++ b/src/base-environments/youth_room/youth_room.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=116 format=3 uid="uid://b3b0gyvklqn50"]
+[gd_scene load_steps=114 format=3 uid="uid://b3b0gyvklqn50"]
[ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"]
[ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"]
@@ -33,8 +33,7 @@
[ext_resource type="PackedScene" uid="uid://bpjympn3ps3wo" path="res://logic-scenes/luna/luna_imported.tscn" id="27_pb1jl"]
[ext_resource type="Material" uid="uid://ct7uc5i5yp5qf" path="res://base-environments/youth_room/import/materials/wall.tres" id="28_oiweb"]
[ext_resource type="PackedScene" uid="uid://bwc2wp7tckm7t" path="res://base-environments/youth_room/outside.tscn" id="32_2vgep"]
-[ext_resource type="Shader" path="res://base-environments/youth_room/rainy-window.gdshader" id="32_y0f8t"]
-[ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="33_ju0ni"]
+[ext_resource type="Material" uid="uid://bmu72cnsr8c5e" path="res://base-environments/youth_room/shaders/window.material" id="32_pwbgf"]
[sub_resource type="BoxShape3D" id="BoxShape3D_j3mqx"]
size = Vector3(0.711297, 2.53136, 1.74815)
@@ -830,7 +829,7 @@ tracks/11/keys = {
[sub_resource type="Animation" id="Animation_1kp3w"]
resource_name = "draeven"
-length = 160.0
+length = 151.0
tracks/0/type = "audio"
tracks/0/imported = false
tracks/0/enabled = true
@@ -1576,7 +1575,8 @@ func play_scene(id: int, repeat = false):
play(\"draeven\")
func _on_ini_room():
- play(\"intro\")
+ pass
+
func on_childhood_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_CHILDHOOD, is_repeating)
@@ -1597,6 +1597,7 @@ func on_draeven_done():
get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_DRAEVEN, is_repeating)
$draeven.hide()
State.lock_focus = is_repeating
+ queue(\"intro\")
func scene_finished(_id):
queue(\"RESET\")
@@ -1936,7 +1937,8 @@ _data = {
script/source = "extends AnimationPlayer
func _on_ini_room():
- play(\"light_up\")
+ pass
+ #play(\"light_up\")
func play_scene(_id: int, _repeat):
queue(\"lights_out\")
@@ -2039,19 +2041,35 @@ func _on_picker_cards_picked(_cards):
focus_env()
"
-[sub_resource type="ViewportTexture" id="ViewportTexture_dwpvi"]
-viewport_path = NodePath("WorldEnvironment/window/SubViewport")
+[sub_resource type="ArrayMesh" id="ArrayMesh_laf32"]
+_surfaces = [{
+"aabb": AABB(0.355029, 1.19176, -0.629457, 2.99104, 0.841152, 3.50781),
+"format": 4097,
+"index_count": 162,
+"index_data": PackedByteArray(11, 0, 10, 0, 32, 0, 0, 0, 2, 0, 34, 0, 11, 0, 0, 0, 10, 0, 9, 0, 11, 0, 24, 0, 8, 0, 7, 0, 25, 0, 7, 0, 11, 0, 9, 0, 11, 0, 2, 0, 0, 0, 2, 0, 1, 0, 26, 0, 1, 0, 30, 0, 3, 0, 30, 0, 38, 0, 5, 0, 38, 0, 6, 0, 4, 0, 6, 0, 8, 0, 33, 0, 8, 0, 11, 0, 7, 0, 11, 0, 1, 0, 2, 0, 1, 0, 38, 0, 30, 0, 38, 0, 8, 0, 6, 0, 8, 0, 1, 0, 11, 0, 1, 0, 8, 0, 38, 0, 20, 0, 19, 0, 27, 0, 21, 0, 23, 0, 31, 0, 20, 0, 21, 0, 19, 0, 18, 0, 20, 0, 35, 0, 36, 0, 18, 0, 16, 0, 28, 0, 36, 0, 17, 0, 13, 0, 28, 0, 15, 0, 14, 0, 13, 0, 29, 0, 12, 0, 14, 0, 37, 0, 23, 0, 22, 0, 39, 0, 22, 0, 14, 0, 12, 0, 14, 0, 28, 0, 13, 0, 28, 0, 18, 0, 36, 0, 18, 0, 21, 0, 20, 0, 21, 0, 22, 0, 23, 0, 22, 0, 28, 0, 14, 0, 28, 0, 21, 0, 18, 0, 21, 0, 28, 0, 22, 0, 51, 0, 50, 0, 56, 0, 40, 0, 42, 0, 58, 0, 51, 0, 40, 0, 50, 0, 49, 0, 51, 0, 52, 0, 48, 0, 47, 0, 53, 0, 47, 0, 51, 0, 49, 0, 51, 0, 42, 0, 40, 0, 42, 0, 41, 0, 54, 0, 41, 0, 55, 0, 43, 0, 55, 0, 59, 0, 45, 0, 59, 0, 46, 0, 44, 0, 46, 0, 48, 0, 57, 0, 48, 0, 51, 0, 47, 0, 51, 0, 41, 0, 42, 0, 41, 0, 59, 0, 55, 0, 59, 0, 48, 0, 46, 0, 48, 0, 41, 0, 51, 0, 41, 0, 48, 0, 59, 0),
+"name": "window_glass",
+"primitive": 3,
+"vertex_count": 60,
+"vertex_data": PackedByteArray(67, 167, 142, 63, 154, 140, 152, 63, 64, 47, 56, 64, 47, 77, 141, 63, 200, 211, 153, 63, 64, 47, 56, 64, 37, 115, 141, 63, 62, 177, 152, 63, 217, 54, 56, 64, 96, 124, 141, 63, 13, 170, 246, 63, 64, 47, 56, 64, 177, 215, 142, 63, 112, 241, 247, 63, 64, 47, 56, 64, 112, 163, 141, 63, 220, 202, 247, 63, 229, 54, 56, 64, 39, 216, 216, 63, 68, 241, 247, 63, 64, 47, 56, 64, 218, 49, 218, 63, 227, 169, 246, 63, 64, 47, 56, 64, 57, 14, 218, 63, 172, 202, 247, 63, 217, 54, 56, 64, 247, 210, 217, 63, 239, 211, 153, 63, 64, 47, 56, 64, 211, 118, 216, 63, 197, 140, 152, 63, 64, 47, 56, 64, 47, 173, 217, 63, 99, 177, 152, 63, 211, 54, 56, 64, 68, 44, 187, 62, 191, 140, 152, 63, 64, 47, 56, 64, 100, 198, 181, 62, 238, 211, 153, 63, 64, 47, 56, 64, 39, 92, 182, 62, 100, 177, 152, 63, 217, 54, 56, 64, 24, 63, 183, 62, 230, 169, 246, 63, 64, 47, 56, 64, 204, 174, 188, 62, 76, 241, 247, 63, 64, 47, 56, 64, 123, 221, 183, 62, 183, 202, 247, 63, 230, 54, 56, 64, 79, 247, 113, 63, 61, 241, 247, 63, 64, 47, 56, 64, 239, 171, 116, 63, 217, 169, 246, 63, 64, 47, 56, 64, 155, 99, 116, 63, 168, 202, 247, 63, 217, 54, 56, 64, 65, 77, 116, 63, 251, 211, 153, 63, 64, 47, 56, 64, 54, 150, 113, 63, 206, 140, 152, 63, 64, 47, 56, 64, 204, 2, 116, 63, 104, 177, 152, 63, 209, 54, 56, 64, 56, 211, 217, 63, 105, 57, 153, 63, 64, 47, 56, 64, 85, 51, 218, 63, 189, 66, 247, 63, 64, 47, 56, 64, 191, 77, 141, 63, 63, 57, 153, 63, 64, 47, 56, 64, 72, 174, 116, 63, 180, 66, 247, 63, 64, 47, 56, 64, 2, 69, 183, 62, 195, 66, 247, 63, 64, 47, 56, 64, 110, 199, 181, 62, 100, 57, 153, 63, 64, 47, 56, 64, 141, 125, 141, 63, 232, 66, 247, 63, 64, 47, 56, 64, 97, 78, 116, 63, 115, 57, 153, 63, 64, 47, 56, 64, 5, 37, 217, 63, 212, 139, 152, 63, 64, 47, 56, 64, 91, 134, 217, 63, 82, 240, 247, 63, 64, 47, 56, 64, 7, 251, 141, 63, 168, 139, 152, 63, 64, 47, 56, 64, 182, 83, 115, 63, 75, 240, 247, 63, 64, 47, 56, 64, 210, 253, 185, 62, 90, 240, 247, 63, 64, 47, 56, 64, 84, 123, 184, 62, 205, 139, 152, 63, 64, 47, 56, 64, 115, 43, 142, 63, 127, 240, 247, 63, 64, 47, 56, 64, 153, 242, 114, 63, 220, 139, 152, 63, 64, 47, 56, 64, 158, 37, 86, 64, 225, 254, 194, 63, 224, 190, 32, 189, 59, 174, 85, 64, 144, 222, 195, 63, 192, 248, 234, 188, 113, 29, 86, 64, 5, 35, 195, 63, 192, 118, 244, 188, 246, 205, 51, 64, 90, 171, 1, 64, 64, 197, 246, 188, 127, 86, 51, 64, 67, 27, 2, 64, 224, 204, 38, 189, 205, 105, 51, 64, 168, 19, 2, 64, 160, 68, 0, 189, 144, 86, 51, 64, 52, 27, 2, 64, 182, 109, 30, 191, 6, 206, 51, 64, 76, 171, 1, 64, 30, 33, 33, 191, 214, 105, 51, 64, 143, 19, 2, 64, 222, 217, 32, 191, 45, 174, 85, 64, 170, 222, 195, 63, 86, 99, 32, 191, 143, 37, 86, 64, 255, 254, 194, 63, 14, 171, 29, 191, 97, 29, 86, 64, 22, 35, 195, 63, 198, 23, 32, 191, 144, 230, 85, 64, 6, 117, 195, 63, 218, 99, 32, 191, 63, 150, 51, 64, 140, 223, 1, 64, 22, 36, 33, 191, 159, 230, 85, 64, 233, 116, 195, 63, 192, 28, 235, 188, 47, 150, 51, 64, 154, 223, 1, 64, 192, 16, 247, 188, 231, 37, 86, 64, 90, 254, 194, 63, 118, 7, 31, 191, 232, 86, 51, 64, 226, 26, 2, 64, 30, 202, 31, 191, 247, 37, 86, 64, 60, 254, 194, 63, 96, 55, 11, 189, 216, 86, 51, 64, 241, 26, 2, 64, 224, 68, 17, 189)
+}]
+blend_shape_mode = 0
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_dsyg4"]
-resource_local_to_scene = true
-render_priority = 0
-shader = ExtResource("32_y0f8t")
-shader_parameter/destretch = Vector2(3.044, 1.728)
-shader_parameter/viewport_tex = SubResource("ViewportTexture_dwpvi")
-shader_parameter/noise = ExtResource("33_ju0ni")
-
-[sub_resource type="QuadMesh" id="QuadMesh_bmra5"]
-size = Vector2(1.522, 0.864)
+[sub_resource type="ArrayMesh" id="ArrayMesh_o1lpn"]
+resource_name = "windows_window_glass"
+_surfaces = [{
+"aabb": AABB(0.355029, 1.19176, -0.629457, 2.99104, 0.841152, 3.50781),
+"attribute_data": PackedByteArray(187, 98, 24, 63, 237, 106, 194, 63, 21, 21, 28, 63, 94, 173, 192, 63, 10, 175, 27, 63, 88, 59, 194, 63, 16, 21, 28, 63, 176, 247, 3, 63, 227, 98, 24, 63, 64, 120, 0, 63, 61, 175, 27, 63, 254, 223, 0, 63, 179, 93, 70, 190, 12, 18, 0, 63, 247, 34, 85, 190, 180, 141, 3, 63, 95, 164, 83, 190, 138, 118, 0, 63, 59, 26, 83, 190, 22, 120, 192, 63, 129, 72, 68, 190, 128, 55, 194, 63, 167, 144, 81, 190, 66, 6, 194, 63, 80, 98, 24, 63, 68, 213, 255, 62, 2, 19, 28, 63, 6, 223, 248, 62, 103, 174, 27, 63, 228, 22, 255, 62, 45, 147, 27, 63, 248, 242, 0, 191, 88, 223, 23, 63, 116, 114, 4, 191, 227, 43, 27, 63, 176, 10, 4, 191, 95, 90, 70, 190, 8, 217, 4, 191, 87, 38, 85, 190, 86, 93, 1, 191, 225, 161, 83, 190, 142, 116, 4, 191, 85, 38, 85, 190, 54, 9, 248, 62, 105, 91, 70, 190, 244, 6, 255, 62, 201, 162, 83, 190, 18, 66, 254, 62, 95, 32, 83, 190, 243, 74, 193, 63, 215, 47, 85, 190, 130, 236, 1, 63, 182, 18, 28, 63, 66, 128, 193, 63, 213, 47, 85, 190, 136, 254, 2, 191, 249, 143, 27, 63, 50, 148, 2, 191, 118, 17, 28, 63, 154, 42, 252, 62, 176, 18, 28, 63, 124, 86, 2, 63, 213, 47, 85, 190, 190, 84, 251, 62, 75, 182, 75, 190, 81, 56, 194, 63, 149, 203, 77, 190, 177, 19, 0, 63, 204, 56, 26, 63, 175, 108, 194, 63, 59, 200, 77, 190, 100, 215, 4, 191, 116, 181, 25, 63, 240, 110, 4, 191, 104, 56, 26, 63, 78, 220, 255, 62, 255, 56, 26, 63, 193, 123, 0, 63, 43, 201, 77, 190, 60, 10, 255, 62, 172, 6, 133, 63, 130, 253, 153, 63, 229, 6, 135, 63, 46, 27, 152, 63, 170, 207, 134, 63, 0, 202, 153, 63, 229, 6, 135, 63, 168, 79, 239, 61, 198, 6, 133, 63, 168, 4, 209, 61, 200, 207, 134, 63, 88, 135, 212, 61, 204, 159, 61, 62, 200, 143, 205, 61, 110, 162, 45, 62, 184, 185, 235, 61, 122, 64, 47, 62, 240, 245, 208, 61, 10, 214, 47, 62, 126, 225, 151, 63, 206, 224, 63, 62, 214, 197, 153, 63, 26, 128, 49, 62, 138, 144, 153, 63, 100, 207, 47, 62, 195, 197, 152, 63, 106, 148, 45, 62, 112, 156, 221, 61, 156, 5, 135, 63, 124, 255, 152, 63, 156, 5, 135, 63, 128, 50, 225, 61, 244, 213, 55, 62, 181, 198, 153, 63, 242, 148, 53, 62, 168, 157, 205, 61, 29, 5, 134, 63, 108, 255, 153, 63, 59, 5, 134, 63, 72, 35, 209, 61),
+"format": 4119,
+"index_count": 162,
+"index_data": PackedByteArray(11, 0, 10, 0, 32, 0, 0, 0, 2, 0, 34, 0, 11, 0, 0, 0, 10, 0, 9, 0, 11, 0, 24, 0, 8, 0, 7, 0, 25, 0, 7, 0, 11, 0, 9, 0, 11, 0, 2, 0, 0, 0, 2, 0, 1, 0, 26, 0, 1, 0, 30, 0, 3, 0, 30, 0, 38, 0, 5, 0, 38, 0, 6, 0, 4, 0, 6, 0, 8, 0, 33, 0, 8, 0, 11, 0, 7, 0, 11, 0, 1, 0, 2, 0, 1, 0, 38, 0, 30, 0, 38, 0, 8, 0, 6, 0, 8, 0, 1, 0, 11, 0, 1, 0, 8, 0, 38, 0, 20, 0, 19, 0, 27, 0, 21, 0, 23, 0, 31, 0, 20, 0, 21, 0, 19, 0, 18, 0, 20, 0, 35, 0, 36, 0, 18, 0, 16, 0, 28, 0, 36, 0, 17, 0, 13, 0, 28, 0, 15, 0, 14, 0, 13, 0, 29, 0, 12, 0, 14, 0, 37, 0, 23, 0, 22, 0, 39, 0, 22, 0, 14, 0, 12, 0, 14, 0, 28, 0, 13, 0, 28, 0, 18, 0, 36, 0, 18, 0, 21, 0, 20, 0, 21, 0, 22, 0, 23, 0, 22, 0, 28, 0, 14, 0, 28, 0, 21, 0, 18, 0, 21, 0, 28, 0, 22, 0, 51, 0, 50, 0, 56, 0, 40, 0, 42, 0, 58, 0, 51, 0, 40, 0, 50, 0, 49, 0, 51, 0, 52, 0, 48, 0, 47, 0, 53, 0, 47, 0, 51, 0, 49, 0, 51, 0, 42, 0, 40, 0, 42, 0, 41, 0, 54, 0, 41, 0, 55, 0, 43, 0, 55, 0, 59, 0, 45, 0, 59, 0, 46, 0, 44, 0, 46, 0, 48, 0, 57, 0, 48, 0, 51, 0, 47, 0, 51, 0, 41, 0, 42, 0, 41, 0, 59, 0, 55, 0, 59, 0, 48, 0, 46, 0, 48, 0, 41, 0, 51, 0, 41, 0, 48, 0, 59, 0),
+"material": ExtResource("32_pwbgf"),
+"name": "window_glass",
+"primitive": 3,
+"vertex_count": 60,
+"vertex_data": PackedByteArray(67, 167, 142, 63, 154, 140, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 67, 0, 32, 192, 47, 77, 141, 63, 200, 211, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 23, 0, 10, 192, 37, 115, 141, 63, 62, 177, 152, 63, 217, 54, 56, 64, 255, 255, 255, 255, 2, 0, 254, 191, 96, 124, 141, 63, 13, 170, 246, 63, 64, 47, 56, 64, 255, 255, 255, 255, 73, 0, 36, 192, 177, 215, 142, 63, 112, 241, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 64, 0, 31, 192, 112, 163, 141, 63, 220, 202, 247, 63, 229, 54, 56, 64, 255, 255, 255, 255, 65, 1, 94, 191, 39, 216, 216, 63, 68, 241, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 66, 0, 32, 192, 218, 49, 218, 63, 227, 169, 246, 63, 64, 47, 56, 64, 255, 255, 255, 255, 144, 3, 54, 190, 57, 14, 218, 63, 172, 202, 247, 63, 217, 54, 56, 64, 255, 255, 255, 255, 62, 0, 223, 191, 247, 210, 217, 63, 239, 211, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 30, 4, 14, 194, 211, 118, 216, 63, 197, 140, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 66, 0, 32, 192, 47, 173, 217, 63, 99, 177, 152, 63, 211, 54, 56, 64, 255, 255, 255, 255, 189, 0, 93, 192, 68, 44, 187, 62, 191, 140, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 67, 0, 32, 192, 100, 198, 181, 62, 238, 211, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 123, 3, 65, 190, 39, 92, 182, 62, 100, 177, 152, 63, 217, 54, 56, 64, 255, 255, 255, 255, 60, 0, 224, 191, 24, 63, 183, 62, 230, 169, 246, 63, 64, 47, 56, 64, 255, 255, 255, 255, 0, 0, 255, 191, 204, 174, 188, 62, 76, 241, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 65, 0, 31, 192, 123, 221, 183, 62, 183, 202, 247, 63, 230, 54, 56, 64, 255, 255, 255, 255, 64, 1, 95, 191, 79, 247, 113, 63, 61, 241, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 120, 0, 59, 192, 239, 171, 116, 63, 217, 169, 246, 63, 64, 47, 56, 64, 255, 255, 255, 255, 167, 3, 43, 190, 155, 99, 116, 63, 168, 202, 247, 63, 217, 54, 56, 64, 255, 255, 255, 255, 34, 0, 16, 192, 65, 77, 116, 63, 251, 211, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 75, 0, 37, 192, 54, 150, 113, 63, 206, 140, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 37, 0, 18, 192, 204, 2, 116, 63, 104, 177, 152, 63, 209, 54, 56, 64, 255, 255, 255, 255, 12, 0, 5, 192, 56, 211, 217, 63, 105, 57, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 3, 4, 1, 194, 85, 51, 218, 63, 189, 66, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 128, 3, 63, 190, 191, 77, 141, 63, 63, 57, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 170, 3, 42, 190, 72, 174, 116, 63, 180, 66, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 132, 3, 61, 190, 2, 69, 183, 62, 195, 66, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 4, 0, 253, 191, 110, 199, 181, 62, 100, 57, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 164, 3, 44, 190, 141, 125, 141, 63, 232, 66, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 4, 0, 252, 191, 97, 78, 116, 63, 115, 57, 153, 63, 64, 47, 56, 64, 255, 255, 255, 255, 252, 3, 253, 193, 5, 37, 217, 63, 212, 139, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 60, 0, 29, 192, 91, 134, 217, 63, 82, 240, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 60, 0, 29, 192, 7, 251, 141, 63, 168, 139, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 72, 0, 35, 192, 182, 83, 115, 63, 75, 240, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 60, 0, 29, 192, 210, 253, 185, 62, 90, 240, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 4, 0, 253, 191, 84, 123, 184, 62, 205, 139, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 72, 0, 35, 192, 115, 43, 142, 63, 127, 240, 247, 63, 64, 47, 56, 64, 255, 255, 255, 255, 3, 0, 253, 191, 153, 242, 114, 63, 220, 139, 152, 63, 64, 47, 56, 64, 255, 255, 255, 255, 61, 0, 29, 192, 158, 37, 86, 64, 225, 254, 194, 63, 224, 190, 32, 189, 22, 66, 233, 61, 206, 127, 22, 192, 59, 174, 85, 64, 144, 222, 195, 63, 192, 248, 234, 188, 22, 66, 233, 61, 238, 127, 7, 192, 113, 29, 86, 64, 5, 35, 195, 63, 192, 118, 244, 188, 22, 66, 233, 61, 0, 128, 254, 191, 246, 205, 51, 64, 90, 171, 1, 64, 64, 197, 246, 188, 22, 66, 233, 61, 118, 127, 63, 192, 127, 86, 51, 64, 67, 27, 2, 64, 224, 204, 38, 189, 22, 66, 233, 61, 208, 127, 21, 192, 205, 105, 51, 64, 168, 19, 2, 64, 160, 68, 0, 189, 22, 66, 233, 61, 231, 128, 146, 191, 144, 86, 51, 64, 52, 27, 2, 64, 182, 109, 30, 191, 22, 66, 233, 61, 206, 127, 22, 192, 6, 206, 51, 64, 76, 171, 1, 64, 30, 33, 33, 191, 22, 66, 233, 61, 143, 130, 203, 190, 214, 105, 51, 64, 143, 19, 2, 64, 222, 217, 32, 191, 22, 66, 233, 61, 44, 128, 234, 191, 45, 174, 85, 64, 170, 222, 195, 63, 86, 99, 32, 191, 22, 66, 233, 61, 5, 125, 100, 193, 143, 37, 86, 64, 255, 254, 194, 63, 14, 171, 29, 191, 22, 66, 233, 61, 206, 127, 22, 192, 97, 29, 86, 64, 22, 35, 195, 63, 198, 23, 32, 191, 22, 66, 233, 61, 117, 127, 63, 192, 144, 230, 85, 64, 6, 117, 195, 63, 218, 99, 32, 191, 22, 66, 233, 61, 26, 125, 90, 193, 63, 150, 51, 64, 140, 223, 1, 64, 22, 36, 33, 191, 22, 66, 233, 61, 123, 130, 213, 190, 159, 230, 85, 64, 233, 116, 195, 63, 192, 28, 235, 188, 22, 66, 233, 61, 160, 130, 196, 190, 47, 150, 51, 64, 154, 223, 1, 64, 192, 16, 247, 188, 22, 66, 233, 61, 2, 128, 253, 191, 231, 37, 86, 64, 90, 254, 194, 63, 118, 7, 31, 191, 22, 66, 233, 61, 209, 127, 20, 192, 232, 86, 51, 64, 226, 26, 2, 64, 30, 202, 31, 191, 22, 66, 233, 61, 209, 127, 20, 192, 247, 37, 86, 64, 60, 254, 194, 63, 96, 55, 11, 189, 22, 66, 233, 61, 201, 127, 24, 192, 216, 86, 51, 64, 241, 26, 2, 64, 224, 68, 17, 189, 22, 66, 233, 61, 1, 128, 254, 191)
+}]
+blend_shape_mode = 0
+shadow_mesh = SubResource("ArrayMesh_laf32")
[sub_resource type="GDScript" id="GDScript_rfgs6"]
script/source = "extends Camera3D
@@ -2497,8 +2515,9 @@ When our Mr Funny then decided to ape her attempts instead of just minding his o
After this, we suddenly were besties. And my class finally started to just leave me be. Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.
"
autowrap_mode = 3
+visible_characters = 0
visible_characters_behavior = 1
-visible_ratio = -0.000798722
+visible_ratio = 0.0
[node name="StartBottom" type="TextureRect" parent="logic/ScenePlayer/Voice Training/PanelContainer/VBoxContainer"]
custom_minimum_size = Vector2(0, 64)
@@ -2597,7 +2616,7 @@ He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cr
That was good. He was a sweet angel. Why must he be so bad at comforting?
"
autowrap_mode = 3
-visible_characters = 43
+visible_characters = 42
visible_characters_behavior = 1
visible_ratio = 0.0169291
@@ -3141,21 +3160,27 @@ environment = SubResource("Environment_pllnm")
camera_attributes = SubResource("CameraAttributesPractical_26mp0")
script = SubResource("GDScript_wb8kg")
-[node name="window" type="MeshInstance3D" parent="WorldEnvironment"]
-transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, 1.0196, 1.54536, 2.86288)
-material_override = SubResource("ShaderMaterial_dsyg4")
-mesh = SubResource("QuadMesh_bmra5")
+[node name="window_frames" type="MeshInstance3D" parent="WorldEnvironment"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.013145)
+lod_bias = 15.0
+skeleton = NodePath("")
-[node name="SubViewport" type="SubViewport" parent="WorldEnvironment/window"]
+[node name="window_glass" type="MeshInstance3D" parent="WorldEnvironment"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.013145)
+material_override = ExtResource("32_pwbgf")
+mesh = SubResource("ArrayMesh_o1lpn")
+skeleton = NodePath("")
+
+[node name="SubViewport" type="SubViewport" parent="WorldEnvironment/window_glass"]
own_world_3d = true
handle_input_locally = false
size = Vector2i(1920, 1080)
-[node name="Camera3D" type="Camera3D" parent="WorldEnvironment/window/SubViewport"]
+[node name="Camera3D" type="Camera3D" parent="WorldEnvironment/window_glass/SubViewport"]
transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.906618, 1.33684, 2.65628)
script = SubResource("GDScript_rfgs6")
-[node name="outside" parent="WorldEnvironment/window/SubViewport" instance=ExtResource("32_2vgep")]
+[node name="outside" parent="WorldEnvironment/window_glass/SubViewport" instance=ExtResource("32_2vgep")]
transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.906618, 1.33684, 2.65628)
[node name="SceneUI" type="Control" parent="."]
diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn
index 0b857c3..b0548e8 100644
--- a/src/dev-util/board of devs.tscn
+++ b/src/dev-util/board of devs.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://bvowj4l8dtceu"]
+[gd_scene load_steps=5 format=3 uid="uid://bvowj4l8dtceu"]
[ext_resource type="Script" path="res://dev-util/devs_board.gd" id="1_ols6o"]
[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="1_xrckx"]
[ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/post-it.tscn" id="2_ucudl"]
+[ext_resource type="PackedScene" uid="uid://dp4eps03igd3w" path="res://logic-scenes/board/void_card.tscn" id="4_b7cny"]
[node name="board of devs" type="Control"]
layout_mode = 3
@@ -115,7 +116,7 @@ text = "My body just didn't feel right"
position = Vector2(-32, 140)
text = "I just hate being treated like a girl"
-[node name="c_void" parent="juijutsu" instance=ExtResource("1_xrckx")]
+[node name="c_void" parent="juijutsu" instance=ExtResource("4_b7cny")]
position = Vector2(0, 600)
[node name="p_wet" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")]
diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd
index 91eb564..bbd6319 100644
--- a/src/logic-scenes/board/card-board.gd
+++ b/src/logic-scenes/board/card-board.gd
@@ -130,6 +130,7 @@ func is_in_dropzone(to_check: Node) -> bool:
# called if a mouse button is pressed
func handle_mouse_button(to_handle: Area2D, input: InputEvent):
+
# No two areas can be dragged at the same time.
# Make sure that only the same area is dragged.
# Otherwise overlapping areas are dragged at the same time.
@@ -141,11 +142,8 @@ func handle_mouse_button(to_handle: Area2D, input: InputEvent):
to_handle.is_dragged = input.pressed
is_area_dragged = input.pressed
- # TODO: We need a better way to recognize whether "to_handle" is a Card or a Post-It.
- # (Tried checking for a script, didn't work, because script has no name attached.
- # Alternative might be to check for specific values within the script ("is_card" f.e))
+ # Check what is being dragged
if to_handle is Card:
-
active_context = ui_context.DROPZONE
if input.is_pressed():
reorder_areas("dropzone_content")
@@ -154,13 +152,17 @@ func handle_mouse_button(to_handle: Area2D, input: InputEvent):
dropzone.move_child(currently_dragged_area, -1)
currently_dragged_area = null
elif to_handle is PostIt:
- if input.is_pressed():
+ if input.is_action_pressed("mouse_left"):
to_handle.reparent(dropzone)
to_handle.on_board = true
to_handle.set_owner(self) # needs to be here otherwise the owner disappears
area_dict["post_its_in_list"].erase(to_handle)
area_dict["dropzone_content"].push_back(to_handle)
- # TODO (if needed): Add function to rearrange the array based on positions in the dropzone
+ elif input.is_action_pressed("mouse_right"):
+ _return_postit_to_panels(to_handle)
+ to_handle.is_dragged = false
+ is_area_dragged = false
+ currently_dragged_area = null
else:
if is_in_dropzone(to_handle):
if to_handle.has_overlapping_areas():
@@ -180,32 +182,35 @@ func handle_mouse_button(to_handle: Area2D, input: InputEvent):
# Logic for attaching a postit to a card. Also reset postit positions if the card cannot be attached
func attach_postit_to_card(postit: Area2D, card: Area2D, update_dict = false):
- if postit.is_in_group(card.name):
+ if card.has_postit_attached():
+ if active_context == ui_context.ASSIGN_POST_IT:
+ _return_postit_to_panels(postit) # don't attach if card has already a post-it attached
+ return
- if card.has_postit_attached():
- if active_context == ui_context.ASSIGN_POST_IT:
- _return_postit_to_panels(postit) # don't attach if card has already a post-it attached
- return
-
- postit.reparent(card)
- postit.on_board = false
- postit.set_owner(self)
- postit.position = card.get_child(3).position
-
- if update_dict:
- area_dict["post_its_in_list"].erase(postit)
- area_dict["dropzone_content"].push_back(postit)
-
- reorder_areas("dropzone_content")
- reorder_areas("cards")
- reorder_areas("post_its_in_list")
-
- if mementos_collected == 4:
- for fluff in area_dict["dropzone_content"]:
- if fluff is Card:
- if not fluff.has_postit_attached():
- return
- emit_signal("board_completed")
+
+ postit.set_owner(self)
+
+ if update_dict:
+ area_dict["post_its_in_list"].erase(postit)
+ area_dict["dropzone_content"].push_back(postit)
+
+ reorder_areas("dropzone_content")
+ reorder_areas("cards")
+ reorder_areas("post_its_in_list")
+
+ if mementos_collected == 4:
+ for fluff in area_dict["dropzone_content"]:
+ if fluff is Card:
+ if not fluff.has_postit_attached():
+ return
+ emit_signal("board_completed")
+
+func is_board_lore() -> bool:
+ for post_it in area_dict["dropzone_content"]:
+ if post_it is PostIt:
+ var card = post_it.get_parent().get_parent()
+ if not post_it.is_in_group(card.name): return false
+ return true
# Mark area that was hovered over as currently selected
func handle_hover(to_handle: Area2D):
@@ -243,6 +248,7 @@ func _input(event):
if event.is_action_pressed("ui_cancel"):
State.leave_stage(self)
+
# Return, if the input is a mouse event (mouse events are handled separately)
if event is InputEventMouse or !has_stage or not is_instance_valid(currently_selected_node): return
@@ -266,7 +272,7 @@ func _input(event):
elif event.is_action_pressed("ui_left"): # left to switch context to the left
active_context -= 1
- if active_context < -1:
+ if active_context <= -1:
active_context = ui_context.POST_IT_LIST
elif event.is_action_pressed("ui_right"): # right to switch context to the right
@@ -282,8 +288,6 @@ func _input(event):
else:
_enter_assignment_context()
- # TODO: I forgor the HECKING RIGHT-CLICK!!!!111 AAAAAAAAAAAAAAAAAAAA
-
# do some adjustments to loop elements (after last element, select first one etc.)
if selected_dropzone_element < 0:
selected_dropzone_element = area_dict["dropzone_content"].size()-1
@@ -345,7 +349,7 @@ func _enter_assignment_context():
# move the post it so it floats next to the card where it should be attached
func _select_card_for_assigning(post_it: Area2D, card: Area2D):
- post_it.tween_transform_to(card.get_child(3).global_position + Vector2(0, 50))
+ post_it.tween_transform_to(card.get_child(3).global_position)
# leaves the context for assigning postit via button controls
func _leave_assignment_context():
@@ -356,15 +360,14 @@ func _leave_assignment_context():
# handles everything to return a post it to the panels
func _return_postit_to_panels(post_it: Area2D):
for panel in area_dict["post_it_panels"]:
- print(area_dict["post_it_panels"])
if panel.get_child_count() == 1:
area_dict["dropzone_content"].erase(post_it)
post_it.on_board = false
area_dict["post_its_in_list"].push_back(post_it)
- #post_it.tween_transform_to(panel.get_child(0).position)
post_it.reparent(panel)
post_it.transform = panel.get_child(0).transform
post_it.set_owner(self)
+ #post_it.position = Vector2(0,0)
reorder_areas("dropzone_content")
reorder_areas("post_its_in_list")
break
diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd
index 2ecbc43..203f1a0 100644
--- a/src/logic-scenes/board/card.gd
+++ b/src/logic-scenes/board/card.gd
@@ -4,6 +4,11 @@ extends Area2D
class_name Card
var compatible_postits: Array[PostIt] = []
var own_postits: Array[PostIt] = []
+var current_post_it: PostIt = null
+var is_in_preview: bool = false:
+ set(preview):
+ is_in_preview = preview
+ highlighted = preview
var wiggle_pos: float = 0
var wiggle_intensity: float = 0
var noise: Noise = FastNoiseLite.new()
@@ -52,6 +57,7 @@ var scale_tween
@export var voice_line: AudioStream = null
@export var is_dragable: bool = false
@onready var diameter = $CollisionShape2D.shape.height
+@onready var postit_anchor = get_child(3)
var is_dragged: bool = false:
set(dragged):
@@ -124,7 +130,7 @@ func _on_mouse_entered():
is_mouse_entered = true
if not Input.is_action_pressed("mouse_left"):
if has_postit_attached():
- if get_child(-1).highlighted:
+ if postit_anchor.get_child(-1).highlighted:
return
highlighted = true
if "handle_hover" in owner:
@@ -151,12 +157,29 @@ func _move_card():
position += (get_viewport().get_mouse_position() - position) - mouse_offset
func has_postit_attached() -> bool:
- var all_children = get_children()
- for child in all_children:
- if child is PostIt:
- return true
- return false
+ return is_instance_valid(current_post_it) and not is_in_preview
+func preview_postit(postit: PostIt) -> bool:
+ is_in_preview = attach_postit(postit)
+ return is_in_preview
+
+func attach_postit(postit: PostIt) -> bool:
+ if is_instance_valid(current_post_it):
+ return false
+ postit.reparent(get_child(3, true))
+ postit.position = Vector2(0,0)
+ postit.on_board = false
+ if not is_in_preview: current_post_it = postit
+ return true
+
+func remove_postit() -> PostIt:
+ var former_child:PostIt = current_post_it
+ current_post_it = null
+ former_child.reparent(get_parent())
+ former_child.on_board = true
+ is_in_preview = false
+ return former_child
+
func check_hover():
if is_mouse_entered:
_on_mouse_entered()
diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn
index 75733c6..b0c780a 100644
--- a/src/logic-scenes/board/card.tscn
+++ b/src/logic-scenes/board/card.tscn
@@ -83,7 +83,7 @@ theme_type_variation = &"card_text"
autowrap_mode = 3
[node name="postit anchor" type="Node2D" parent="."]
-position = Vector2(-65.6478, 60.3852)
+position = Vector2(-66, 83)
[connection signal="input_event" from="." to="." method="_on_input_event"]
[connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"]
diff --git a/src/logic-scenes/board/physics-board.tscn b/src/logic-scenes/board/physics-board.tscn
index 6935433..63e52d8 100644
--- a/src/logic-scenes/board/physics-board.tscn
+++ b/src/logic-scenes/board/physics-board.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=11 format=3 uid="uid://bnskiyx1sksww"]
+[gd_scene load_steps=10 format=3 uid="uid://bnskiyx1sksww"]
[ext_resource type="Texture2D" uid="uid://bi3xqdknw5tpe" path="res://logic-scenes/board/board-texture/Cork002_2K_Color.png" id="1_8brxc"]
[ext_resource type="Shader" path="res://logic-scenes/board/physics-board.gdshader" id="1_ggnth"]
[ext_resource type="Script" path="res://logic-scenes/board/card-board.gd" id="3_8v4c4"]
-[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="3_mg053"]
[ext_resource type="PackedScene" uid="uid://bvowj4l8dtceu" path="res://dev-util/board of devs.tscn" id="4_sskx2"]
-[ext_resource type="PackedScene" uid="uid://chwf61qpn2sqw" path="res://logic-scenes/board/empty_postIt_panel.tscn" id="5_dr0qs"]
+[ext_resource type="PackedScene" path="res://logic-scenes/board/empty_postIt_panel.tscn" id="5_dr0qs"]
[ext_resource type="Script" path="res://logic-scenes/board/card collider.gd" id="6_wpxls"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ttqei"]
@@ -41,20 +40,6 @@ layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 1
-[node name="card3" parent="HBoxContainer/dropzone" instance=ExtResource("3_mg053")]
-process_mode = 4
-visible = false
-z_as_relative = false
-position = Vector2(371, 290)
-collision_layer = 2147483649
-is_dragable = true
-
-[node name="card" parent="HBoxContainer/dropzone" instance=ExtResource("3_mg053")]
-process_mode = 4
-visible = false
-position = Vector2(640, 659)
-is_dragable = true
-
[node name="ScrollContainer" type="ScrollContainer" parent="HBoxContainer"]
layout_mode = 2
horizontal_scroll_mode = 0
diff --git a/src/logic-scenes/board/post-it.gd b/src/logic-scenes/board/post-it.gd
index 4df1b0f..d28d648 100644
--- a/src/logic-scenes/board/post-it.gd
+++ b/src/logic-scenes/board/post-it.gd
@@ -106,7 +106,7 @@ func _on_input_event(viewport, event, shape_idx):
_move_post_it()
if event is InputEventMouseButton:
- if event.button_index == MOUSE_BUTTON_LEFT:
+ if event.button_index == MOUSE_BUTTON_LEFT or event.button_index == MOUSE_BUTTON_RIGHT:
if "handle_mouse_button" in owner:
mouse_offset = (get_viewport().get_mouse_position() - global_position)
owner.handle_mouse_button(self, event)
@@ -116,9 +116,8 @@ func _move_post_it():
position += (get_viewport().get_mouse_position() - position) - mouse_offset
func is_postit_attached() -> bool:
- if self.get_parent() is Card:
- return true
- return false
+ # there is probably a nicer way to do this
+ return self.get_parent().get_parent() is Card
func tween_transform_to(target: Vector2):
var transform_tween = create_tween()
diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd
index aadca15..1edbc68 100644
--- a/src/logic-scenes/card_picker/card_picker.gd
+++ b/src/logic-scenes/card_picker/card_picker.gd
@@ -32,7 +32,10 @@ var selection_state = INI:
selection_state = state
_input_locked = !(state == CARDS or state == POSTS)
- if state == DONE:
+ if state == CARDS_SELECTED:
+ var tween = get_tree().create_tween()
+ tween.tween_property($thought_prompt, "modulate", Color(1, 1, 1, 0), 0.5)
+ elif state == DONE:
reset()
var anim_players:Array = []
diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn
index b361fc7..4a2be12 100644
--- a/src/logic-scenes/card_picker/card_picker.tscn
+++ b/src/logic-scenes/card_picker/card_picker.tscn
@@ -1627,3 +1627,14 @@ text = "Post 4"
[node name="board of devs" parent="." instance=ExtResource("4_1kvte")]
visible = false
layout_mode = 2
+
+[node name="thought_prompt" type="Control" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="thought_prompt"]
+layout_mode = 2
+offset_left = -225.0
+offset_top = -196.0
+offset_right = 225.0
+offset_bottom = -158.0
+text = "Why does that story mean so much to me?"
diff --git a/src/logic-scenes/collectable/collectable_ui.gd b/src/logic-scenes/collectable/collectable_ui.gd
index 973cc85..de5b24e 100644
--- a/src/logic-scenes/collectable/collectable_ui.gd
+++ b/src/logic-scenes/collectable/collectable_ui.gd
@@ -88,7 +88,8 @@ func _ready():
func _hide_buttons():
if is_inside_tree():
- if not State.reduce_motion: $AnimationPlayer.play_backwards("show_buttons")
+ if not State.reduce_motion:
+ $AnimationPlayer.play_backwards("show_buttons")
func _show_buttons():
if is_inside_tree():
@@ -103,7 +104,7 @@ func hide():
if visible:
_hide_buttons()
var tween = create_tween()
- tween.tween_property(self, "modulate", 0, 0.4)
+ tween.tween_property(self, "modulate", Color(0, 0, 0), 0.4)
_hide_buttons()
await tween.finished
visible = false
diff --git a/src/logic-scenes/player_controller/player_controller.gd b/src/logic-scenes/player_controller/player_controller.gd
index 3df5264..29ce7b3 100644
--- a/src/logic-scenes/player_controller/player_controller.gd
+++ b/src/logic-scenes/player_controller/player_controller.gd
@@ -67,12 +67,15 @@ func _ready():
func _on_ini_room():
State.take_stage(self)
+ get_tree().call_group("animation_player", "play_scene", Scenes.id.YOUTH_DRAEVEN, false)
+ State.queue_for_stage(self)
func _process(_delta):
if focus_ray.get_collider() != null:
emit_signal("ui_entered")
has_entered = true
+ focus_ray.get_collider().reveal()
if has_entered and has_stage:
if focus_ray.get_collider() == null:
diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn
index b686f5d..2f071bb 100644
--- a/src/logic-scenes/startup/startup.tscn
+++ b/src/logic-scenes/startup/startup.tscn
@@ -410,7 +410,7 @@ size_flags_horizontal = 3
size_flags_vertical = 4
max_value = 1.0
step = 0.05
-value = 1.0
+value = 0.5
ticks_on_borders = true
script = ExtResource("3_q2gbh")
diff --git a/src/project.godot b/src/project.godot
index ace50e8..8e0368d 100644
--- a/src/project.godot
+++ b/src/project.godot
@@ -31,7 +31,7 @@ gdscript/warnings/native_method_override=0
[display]
window/size/viewport_width=1440
-window/size/viewport_height=1080
+window/size/viewport_height=960
window/stretch/mode="canvas_items"
window/stretch/aspect="expand"
mouse_cursor/custom_image="res://import/interface-elements/cursor.png"
@@ -83,6 +83,11 @@ mouse_left={
"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
]
}
+mouse_right={
+"deadzone": 0.5,
+"events": [null, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
+]
+}
look_right={
"deadzone": 0.5,
"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null)
@@ -118,4 +123,5 @@ skip={
[rendering]
+scaling_3d/scale=0.6
anti_aliasing/quality/screen_space_aa=1
diff --git a/src/vfx/collectable_particles.tscn b/src/vfx/collectable_particles.tscn
index dd3d745..79c8d77 100644
--- a/src/vfx/collectable_particles.tscn
+++ b/src/vfx/collectable_particles.tscn
@@ -111,7 +111,7 @@ shader = SubResource("Shader_p2314")
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/point_size = 1.0
shader_parameter/roughness = 1.0
-shader_parameter/metallic_texture_channel = Plane(1, 0, 0, 0)
+shader_parameter/metallic_texture_channel = null
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.0
shader_parameter/particles_anim_h_frames = 1