implement texture switching and adding thank-you prompt #2

Merged
tiger merged 5 commits from laurins-lair into development 2026-03-12 13:07:54 +00:00
4 changed files with 70 additions and 2 deletions
Showing only changes of commit ffcb9ba174 - Show all commits

BIN
src/logic-scenes/board/board-texture/cardbord-box.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://diviesbhf6p77"
path="res://.godot/imported/cardbord-box.png-3bbc1757a80e471bf9aee1299244b5c7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://logic-scenes/board/board-texture/cardbord-box.png"
dest_files=["res://.godot/imported/cardbord-box.png-3bbc1757a80e471bf9aee1299244b5c7.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@ -7,6 +7,12 @@ signal closed
@export var dropzone_padding : int = 100
@export var sticky_width : float = 400.0
@export var sticky_height : float = 110.0
@export var is_memory_board: bool = false:
set(is_memory):
is_memory_board = is_memory
if is_node_ready():
%CardboardBox.visible = is_memory
var all_names : Array[StringName] = []
var notes : Array[StickyNote] = []
@ -39,6 +45,7 @@ func _delayed_ready() ->void:
var board_room := State.room as RoomWithBoard
assert(board_room, "CardBoard spawned in room that's not a RoomWithboard.")
board_room.card_board = self
is_memory_board = is_memory_board
## Updates prompt label based on the interaction type and collected state
@ -460,7 +467,7 @@ func initialise_from_save(savegame: SaveGame) -> void:
return
print("CardBoard: Loading board state from save...")
print(" Positions: %d, Attachments: %d" % [
print(" sositions: %d, Attachments: %d" % [
savegame.board_positions.size(),
savegame.board_attachments.size()
])

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=3 uid="uid://bnskiyx1sksww"]
[gd_scene load_steps=23 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" uid="uid://kyd37e0s6fdu" path="res://logic-scenes/board/physics-board.gdshader" id="1_ggnth"]
@ -10,6 +10,8 @@
[ext_resource type="AudioStream" uid="uid://swlo6elqs4vx" path="res://base-environments/youth_room/audio/board_incomplete_de.wav" id="7_2qppy"]
[ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="8_ni75f"]
[ext_resource type="AudioStream" uid="uid://y8fg3wjscvci" path="res://base-environments/youth_room/audio/board_unfitting_de.wav" id="10_kvxnu"]
[ext_resource type="Texture2D" uid="uid://diviesbhf6p77" path="res://logic-scenes/board/board-texture/cardbord-box.png" id="11_ni75f"]
[ext_resource type="FontFile" uid="uid://ch1p8h6ayxbqk" path="res://import/fonts/Caveat-VariableFont_wght.ttf" id="12_2qppy"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ttqei"]
shader = ExtResource("1_ggnth")
@ -160,6 +162,13 @@ mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_m1g7s")
script = ExtResource("3_8v4c4")
[node name="TextureRect" type="TextureRect" parent="."]
clip_contents = true
layout_direction = 3
layout_mode = 2
texture = ExtResource("11_ni75f")
expand_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 2
@ -188,3 +197,12 @@ volume_db = 10.0
mix_target = 2
bus = &"text"
script = ExtResource("8_ni75f")
[node name="Label" type="Label" parent="."]
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 0
theme_override_colors/font_color = Color(0, 0, 0, 1)
theme_override_fonts/font = ExtResource("12_2qppy")
theme_override_font_sizes/font_size = 70
text = "take away "