3 Commits

Author SHA1 Message Date
3eca322fdd Updated menu
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 1m23s
2026-02-01 10:07:14 +01:00
4d43e7067f trying to fix mask visibility in build
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 1m23s
2026-02-01 09:49:59 +01:00
db4aa83224 debug build
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 1m20s
2026-02-01 09:46:20 +01:00
4 changed files with 70 additions and 27 deletions

View File

@@ -4,6 +4,10 @@
[ext_resource type="Script" uid="uid://cgj703gjwdvs1" path="res://menus/scenes/menus/main_menu/main_menu_with_animations.gd" id="2_ytpwg"] [ext_resource type="Script" uid="uid://cgj703gjwdvs1" path="res://menus/scenes/menus/main_menu/main_menu_with_animations.gd" id="2_ytpwg"]
[ext_resource type="PackedScene" uid="uid://xkqu58vkydps" path="res://menus/scenes/windows/main_menu_options_window.tscn" id="3_8i6b8"] [ext_resource type="PackedScene" uid="uid://xkqu58vkydps" path="res://menus/scenes/windows/main_menu_options_window.tscn" id="3_8i6b8"]
[ext_resource type="PackedScene" uid="uid://cvweffl7bo7bj" path="res://menus/scenes/windows/main_menu_credits_window.tscn" id="4_t55r5"] [ext_resource type="PackedScene" uid="uid://cvweffl7bo7bj" path="res://menus/scenes/windows/main_menu_credits_window.tscn" id="4_t55r5"]
[ext_resource type="Texture2D" uid="uid://c60m6ulhqcbga" path="res://assets/decor/BG.png" id="5_t55r5"]
[ext_resource type="Texture2D" uid="uid://dbpdehppn5h8v" path="res://assets/decor/entrance_bg_objects.png" id="6_cgy0s"]
[ext_resource type="Texture2D" uid="uid://ce7wdct4e27e1" path="res://assets/decor/reception.png" id="7_l4hix"]
[ext_resource type="Texture2D" uid="uid://crjrcjpfo53t0" path="res://assets/decor/menu.png" id="8_cgy0s"]
[sub_resource type="Animation" id="1"] [sub_resource type="Animation" id="1"]
resource_name = "Intro" resource_name = "Intro"
@@ -327,25 +331,84 @@ tree_root = SubResource("AnimationNodeStateMachine_vikuh")
anim_player = NodePath("../MenuAnimationPlayer") anim_player = NodePath("../MenuAnimationPlayer")
parameters/conditions/intro_done = false parameters/conditions/intro_done = false
[node name="Bg" type="Sprite2D" parent="." index="3" unique_id=1561676140]
position = Vector2(2417.25, 540)
scale = Vector2(0.5, 0.5)
texture = ExtResource("5_t55r5")
[node name="EntranceBgObjects" type="Sprite2D" parent="." index="4" unique_id=545575527]
position = Vector2(967.25, 410)
scale = Vector2(0.5, 0.5)
texture = ExtResource("6_cgy0s")
[node name="Reception" type="Sprite2D" parent="." index="5" unique_id=513064627]
position = Vector2(1063.85, 700)
scale = Vector2(0.5, 0.5)
texture = ExtResource("7_l4hix")
[node name="Menu" type="Sprite2D" parent="." index="6" unique_id=639397146]
position = Vector2(955, 552.25)
scale = Vector2(0.6, 0.6)
texture = ExtResource("8_cgy0s")
[node name="TitleMargin" parent="MenuContainer" index="0"]
theme_override_constants/margin_left = 232
theme_override_constants/margin_top = 141
[node name="TitleContainer" parent="MenuContainer/TitleMargin" index="0"] [node name="TitleContainer" parent="MenuContainer/TitleMargin" index="0"]
modulate = Color(1, 1, 1, 0) modulate = Color(1, 1, 1, 0)
[node name="TitleLabel" parent="MenuContainer/TitleMargin/TitleContainer" index="0"] [node name="TitleLabel" parent="MenuContainer/TitleMargin/TitleContainer" index="0"]
text = "GGJ26" custom_minimum_size = Vector2(200, 0)
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -268.5
offset_right = 67.359985
offset_bottom = 137.0
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "A majordomo in Venice"
autowrap_mode = 3
script = null
[node name="SubTitleMargin" parent="MenuContainer" index="1"]
theme_override_constants/margin_top = 256
theme_override_constants/margin_right = 84
[node name="SubTitleContainer" parent="MenuContainer/SubTitleMargin" index="0"] [node name="SubTitleContainer" parent="MenuContainer/SubTitleMargin" index="0"]
modulate = Color(1, 1, 1, 0) modulate = Color(1, 1, 1, 0)
[node name="SubTitleLabel" parent="MenuContainer/SubTitleMargin/SubTitleContainer" index="0"]
custom_minimum_size = Vector2(200, 0)
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -100.0
offset_right = 200.0
offset_bottom = 145.0
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "Make tables plans for the best night possible"
autowrap_mode = 3
[node name="MenuButtonsMargin" parent="MenuContainer" index="2"]
theme_override_constants/margin_top = -177
[node name="MenuButtonsContainer" parent="MenuContainer/MenuButtonsMargin" index="0"] [node name="MenuButtonsContainer" parent="MenuContainer/MenuButtonsMargin" index="0"]
modulate = Color(1, 1, 1, 0) modulate = Color(1, 1, 1, 0)
[node name="MenuButtonsBoxContainer" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer" index="0"] [node name="MenuButtonsBoxContainer" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer" index="0"]
lock = true lock = true
[node name="OptionsButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="1"]
visible = false
[node name="CreditsButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="2"]
visible = false
[node name="VersionContainer" parent="VersionMargin" index="0"] [node name="VersionContainer" parent="VersionMargin" index="0"]
modulate = Color(1, 1, 1, 0) modulate = Color(1, 1, 1, 0)
[node name="MouseFilter" type="Control" parent="." index="6" unique_id=420264660] [node name="MouseFilter" type="Control" parent="." index="10" unique_id=420264660]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0

View File

@@ -388,7 +388,6 @@ lvl2_guest_1 = ExtResource("27_62f45")
lvl2_guest_2 = ExtResource("30_6g32y") lvl2_guest_2 = ExtResource("30_6g32y")
lvl3_guest_1 = ExtResource("33_f4j1x") lvl3_guest_1 = ExtResource("33_f4j1x")
lvl3_guest_2 = ExtResource("29_62f45") lvl3_guest_2 = ExtResource("29_62f45")
current_level = 2
[node name="Camera2D" type="Camera2D" parent="." unique_id=1166192115] [node name="Camera2D" type="Camera2D" parent="." unique_id=1166192115]
limit_left = -960 limit_left = -960

View File

@@ -12,28 +12,9 @@ class_name Mask
func _on_mask_resource_changed() -> void: func _on_mask_resource_changed() -> void:
if mask_resource == null: if mask_resource == null:
mask_sprite.visible = false
return return
if mask_sprite != null: if mask_sprite != null:
mask_sprite.visible = true
mask_sprite.texture = mask_resource.mask_sprite mask_sprite.texture = mask_resource.mask_sprite
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
if Engine.is_editor_hint():
_engine_process(delta)
else:
_game_process(delta)
func _game_process(delta: float) -> void:
pass
func _engine_process(delta: float) -> void:
if mask_resource == null:
return

View File

@@ -1,12 +1,12 @@
[gd_scene format=3 uid="uid://3jlukpb5hefb"] [gd_scene format=3 uid="uid://3jlukpb5hefb"]
[ext_resource type="Script" uid="uid://cfo3mk5f2q3ej" path="res://scenes/mask/mask.gd" id="1_61b51"] [ext_resource type="Script" uid="uid://cfo3mk5f2q3ej" path="res://scenes/mask/mask.gd" id="1_61b51"]
[ext_resource type="Resource" uid="uid://pdiaprcknftw" path="res://resources/masks/mute.tres" id="2_0pm64"] [ext_resource type="Resource" uid="uid://q3o5oxegjx2" path="res://resources/masks/no_smell.tres" id="2_0pm64"]
[ext_resource type="Texture2D" uid="uid://bfnvs01ynm55q" path="res://assets/masks/Bouche 3.png" id="3_0pm64"] [ext_resource type="Texture2D" uid="uid://b4d451508si3t" path="res://assets/masks/Masque 3.png" id="3_htpgb"]
[node name="Mask" type="Node2D" unique_id=428968220] [node name="Mask" type="Node2D" unique_id=428968220]
script = ExtResource("1_61b51") script = ExtResource("1_61b51")
mask_resource = ExtResource("2_0pm64") mask_resource = ExtResource("2_0pm64")
[node name="MaskSprite" type="Sprite2D" parent="." unique_id=1997645103] [node name="MaskSprite" type="Sprite2D" parent="." unique_id=1997645103]
texture = ExtResource("3_0pm64") texture = ExtResource("3_htpgb")