Merge remote-tracking branch 'origin/main' into joke-processing

This commit is contained in:
Waldemar Tomme 2024-01-27 16:21:26 +01:00
commit c2192ffdb5
2 changed files with 49 additions and 25 deletions

View File

@ -10,67 +10,87 @@ script = ExtResource("1_y7wyj")
[node name="Tables" type="Node" parent="."] [node name="Tables" type="Node" parent="."]
[node name="Table_1" type="Sprite2D" parent="Tables"] [node name="Table_1" type="Sprite2D" parent="Tables"]
z_index = 35
position = Vector2(170, 199) position = Vector2(170, 199)
texture = ExtResource("2_kf115") texture = ExtResource("2_kf115")
[node name="Table_2" type="Sprite2D" parent="Tables"] [node name="Table_2" type="Sprite2D" parent="Tables"]
z_index = 25
position = Vector2(359, 138) position = Vector2(359, 138)
texture = ExtResource("2_kf115") texture = ExtResource("2_kf115")
[node name="Table_3" type="Sprite2D" parent="Tables"] [node name="Table_3" type="Sprite2D" parent="Tables"]
z_index = 15
position = Vector2(203, 84) position = Vector2(203, 84)
texture = ExtResource("2_kf115") texture = ExtResource("2_kf115")
[node name="Table_4" type="Sprite2D" parent="Tables"] [node name="Table_4" type="Sprite2D" parent="Tables"]
z_index = 45
position = Vector2(319, 230) position = Vector2(319, 230)
texture = ExtResource("2_kf115") texture = ExtResource("2_kf115")
[node name="Seats" type="Node" parent="."] [node name="Seats" type="Node" parent="."]
[node name="Seat_1" type="Node2D" parent="Seats"]
position = Vector2(168, 156)
[node name="Seat_10" type="Node2D" parent="Seats"]
position = Vector2(311, 137)
[node name="Seat_7" type="Node2D" parent="Seats"]
position = Vector2(249, 81)
[node name="Seat_16" type="Node2D" parent="Seats"]
position = Vector2(320, 274)
[node name="Seat_5" type="Node2D" parent="Seats"] [node name="Seat_5" type="Node2D" parent="Seats"]
z_index = 10
position = Vector2(205, 35) position = Vector2(205, 35)
[node name="Seat_12" type="Node2D" parent="Seats"] [node name="Seat_6" type="Node2D" parent="Seats"]
position = Vector2(359, 184) z_index = 12
position = Vector2(159, 79)
[node name="Seat_7" type="Node2D" parent="Seats"]
z_index = 13
position = Vector2(249, 81)
[node name="Seat_8" type="Node2D" parent="Seats"] [node name="Seat_8" type="Node2D" parent="Seats"]
z_index = 17
position = Vector2(204, 130) position = Vector2(204, 130)
[node name="Seat_13" type="Node2D" parent="Seats"] [node name="Seat_9" type="Node2D" parent="Seats"]
position = Vector2(315, 187) z_index = 20
position = Vector2(359, 94)
[node name="Seat_10" type="Node2D" parent="Seats"]
z_index = 22
position = Vector2(311, 137)
[node name="Seat_11" type="Node2D" parent="Seats"]
z_index = 23
position = Vector2(401, 133)
[node name="Seat_12" type="Node2D" parent="Seats"]
z_index = 26
position = Vector2(359, 184)
[node name="Seat_1" type="Node2D" parent="Seats"]
z_index = 30
position = Vector2(168, 156)
[node name="Seat_2" type="Node2D" parent="Seats"] [node name="Seat_2" type="Node2D" parent="Seats"]
z_index = 32
position = Vector2(122, 197) position = Vector2(122, 197)
[node name="Seat_3" type="Node2D" parent="Seats"] [node name="Seat_3" type="Node2D" parent="Seats"]
z_index = 33
position = Vector2(217, 199) position = Vector2(217, 199)
[node name="Seat_15" type="Node2D" parent="Seats"]
position = Vector2(366, 231)
[node name="Seat_4" type="Node2D" parent="Seats"] [node name="Seat_4" type="Node2D" parent="Seats"]
z_index = 36
position = Vector2(166, 244) position = Vector2(166, 244)
[node name="Seat_9" type="Node2D" parent="Seats"] [node name="Seat_13" type="Node2D" parent="Seats"]
position = Vector2(359, 94) z_index = 40
position = Vector2(315, 187)
[node name="Seat_14" type="Node2D" parent="Seats"] [node name="Seat_14" type="Node2D" parent="Seats"]
z_index = 42
position = Vector2(276, 232) position = Vector2(276, 232)
[node name="Seat_6" type="Node2D" parent="Seats"] [node name="Seat_15" type="Node2D" parent="Seats"]
position = Vector2(159, 79) z_index = 43
position = Vector2(366, 231)
[node name="Seat_11" type="Node2D" parent="Seats"] [node name="Seat_16" type="Node2D" parent="Seats"]
position = Vector2(401, 133) z_index = 46
position = Vector2(320, 274)

View File

@ -12,8 +12,10 @@ size = Vector2(600, 200)
size = Vector2(100, 10000) size = Vector2(100, 10000)
[node name="Stage" type="Node2D"] [node name="Stage" type="Node2D"]
z_index = 100
[node name="Sprite2D" type="Sprite2D" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
z_index = 100
scale = Vector2(1, 0.3) scale = Vector2(1, 0.3)
texture = SubResource("PlaceholderTexture2D_3hx6l") texture = SubResource("PlaceholderTexture2D_3hx6l")
offset = Vector2(0, -100) offset = Vector2(0, -100)
@ -25,12 +27,14 @@ tim_sprite = NodePath("Sprite2D")
transmitter_area = NodePath("Joke Transmitter/Area2D") transmitter_area = NodePath("Joke Transmitter/Area2D")
[node name="Sprite2D" type="Sprite2D" parent="Tim"] [node name="Sprite2D" type="Sprite2D" parent="Tim"]
z_index = 110
position = Vector2(-12, -142) position = Vector2(-12, -142)
scale = Vector2(0.4, 0.4) scale = Vector2(0.4, 0.4)
texture = ExtResource("1_saxit") texture = ExtResource("1_saxit")
offset = Vector2(0, 50) offset = Vector2(0, 50)
[node name="Joke Buttons" type="Node2D" parent="Tim"] [node name="Joke Buttons" type="Node2D" parent="Tim"]
z_index = 120
position = Vector2(0, -25) position = Vector2(0, -25)
[node name="Joke Button 1" parent="Tim/Joke Buttons" instance=ExtResource("3_0t41i")] [node name="Joke Button 1" parent="Tim/Joke Buttons" instance=ExtResource("3_0t41i")]