sowelilekusi/bordello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed that turn rotation bug, added spectator cam, started work on new client mechanics

Browse Source
This commit is contained in:
Lexi Quinn
2023-06-13 00:59:02 +10:00
parent 8bc39d9d74
commit b7d709d726
17 changed files with 364 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Scenes/client_card.tscn
View File

@ -1,11 +1,14 @@
[gd_scene load_steps=10 format=3 uid="uid://c7j6lwbwgbosr"]
[gd_scene load_steps=13 format=3 uid="uid://c7j6lwbwgbosr"]
[ext_resource type="Script" path="res://Scripts/client.gd" id="1_bvmvn"]
[ext_resource type="Texture2D" uid="uid://dpu7jjppeja2v" path="res://Assets/task.png" id="2_k2tqp"]
[ext_resource type="Texture2D" uid="uid://de0gq6h0onwex" path="res://Assets/slice.png" id="3_pxlet"]
[ext_resource type="Texture2D" uid="uid://b72amudxuxo8n" path="res://Assets/hard.png" id="4_8gylx"]
[ext_resource type="Texture2D" uid="uid://qhoam0u12smd" path="res://Assets/bad_pip.png" id="4_h1e7v"]
[ext_resource type="Texture2D" uid="uid://bj07g3riacndc" path="res://Assets/back.png" id="4_tye4g"]
[ext_resource type="Texture2D" uid="uid://dsqwv4h4oynxu" path="res://Assets/medium_pip.png" id="5_2itu6"]
[ext_resource type="Texture2D" uid="uid://ws1ghxt16a54" path="res://Assets/hardest.png" id="5_hl5js"]
[ext_resource type="Texture2D" uid="uid://bo6ohnvl8b64o" path="res://Assets/good_pip.png" id="6_6ba24"]
[sub_resource type="LabelSettings" id="LabelSettings_xciys"]
font_size = 25
@ -96,6 +99,70 @@ offset_right = 394.0
offset_bottom = 26.0
text = "0"
[node name="pip2" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 149.0
offset_top = 209.0
offset_right = 169.0
offset_bottom = 223.0
texture = ExtResource("4_h1e7v")
[node name="pip3" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 169.0
offset_top = 209.0
offset_right = 189.0
offset_bottom = 223.0
texture = ExtResource("4_h1e7v")
[node name="pip4" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 189.0
offset_top = 209.0
offset_right = 209.0
offset_bottom = 223.0
texture = ExtResource("4_h1e7v")
[node name="pip5" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 209.0
offset_top = 209.0
offset_right = 229.0
offset_bottom = 223.0
texture = ExtResource("5_2itu6")
[node name="pip6" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 229.0
offset_top = 209.0
offset_right = 249.0
offset_bottom = 223.0
texture = ExtResource("5_2itu6")
[node name="pip7" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 249.0
offset_top = 209.0
offset_right = 269.0
offset_bottom = 223.0
texture = ExtResource("5_2itu6")
[node name="pip8" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 269.0
offset_top = 209.0
offset_right = 289.0
offset_bottom = 223.0
texture = ExtResource("6_6ba24")
[node name="pip9" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 289.0
offset_top = 209.0
offset_right = 309.0
offset_bottom = 223.0
texture = ExtResource("6_6ba24")
[node name="easy" type="Node2D" parent="."]
visible = false

1
Scenes/client_editor.tscn
View File

@ -49,6 +49,7 @@ region = Rect2(288, 0, 32, 32)
script = ExtResource("1_lgqnu")
[node name="main_camera" type="Camera2D" parent="."]
zoom = Vector2(0.6, 0.6)
[node name="background_image" type="Sprite2D" parent="."]
texture = ExtResource("2_58m7y")

84
Scenes/human_player.tscn
View File

@ -3,9 +3,10 @@
[ext_resource type="Script" path="res://Scripts/PlayerStateMachine/human_controller.gd" id="1_4thxs"]
[ext_resource type="Theme" uid="uid://d26ldkm1br1bo" path="res://UI_Theme.tres" id="2_ja0q8"]
[node name="HumanPlayer" type="Node2D" node_paths=PackedStringArray("hand_position")]
[node name="HumanPlayer" type="Node2D" node_paths=PackedStringArray("hand_position", "player_cam")]
script = ExtResource("1_4thxs")
hand_position = NodePath("Node2D")
player_cam = NodePath("Camera2D")
[node name="Node2D" type="Node2D" parent="."]
@ -139,6 +140,87 @@ text = "$50"
horizontal_alignment = 2
vertical_alignment = 1
[node name="top_line" type="HBoxContainer" parent="CanvasLayer/UI"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_right = 1.0
offset_top = 30.0
offset_bottom = 56.0
grow_horizontal = 2
[node name="MarginContainer2" type="MarginContainer" parent="CanvasLayer/UI/top_line"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_constants/margin_left = 30
theme_override_constants/margin_top = 10
theme_override_constants/margin_bottom = 10
[node name="ColorRect2" type="ColorRect" parent="CanvasLayer/UI/top_line/MarginContainer2"]
layout_mode = 2
size_flags_horizontal = 3
color = Color(0.85098, 0, 1, 1)
[node name="Label" type="Label" parent="CanvasLayer/UI/top_line"]
layout_mode = 2
theme_override_colors/font_color = Color(0.94902, 0, 1, 1)
text = "sowelijanpona"
horizontal_alignment = 1
vertical_alignment = 1
[node name="MarginContainer" type="MarginContainer" parent="CanvasLayer/UI/top_line"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 30
theme_override_constants/margin_bottom = 10
[node name="ColorRect" type="ColorRect" parent="CanvasLayer/UI/top_line/MarginContainer"]
layout_mode = 2
color = Color(0.85098, 0, 1, 1)
[node name="left_line" type="ColorRect" parent="CanvasLayer/UI"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_bottom = 1.0
offset_left = 30.0
offset_top = 40.0
offset_right = 36.0
offset_bottom = -40.0
grow_vertical = 2
color = Color(0.85098, 0, 1, 1)
[node name="right_line" type="ColorRect" parent="CanvasLayer/UI"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -36.0
offset_top = 40.0
offset_right = -30.0
offset_bottom = -46.0
grow_horizontal = 0
grow_vertical = 2
color = Color(0.85098, 0, 1, 1)
[node name="bottom_line" type="ColorRect" parent="CanvasLayer/UI"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 30.0
offset_top = -46.0
offset_right = -30.0
offset_bottom = -40.0
grow_horizontal = 2
grow_vertical = 0
color = Color(0.85098, 0, 1, 1)
[connection signal="pressed" from="CanvasLayer/UI/Confirm" to="." method="_on_confirm_pressed"]
[connection signal="pressed" from="CanvasLayer/UI/HBoxContainer/LobbyReadyButton" to="." method="_on_lobby_ready_button_pressed"]
[connection signal="text_submitted" from="CanvasLayer/UI/VBoxContainer/LineEdit" to="." method="_on_line_edit_text_submitted"]

1
Scenes/worker_editor.tscn
View File

@ -8,6 +8,7 @@
script = ExtResource("1_vn0ae")
[node name="main_camera" type="Camera2D" parent="."]
zoom = Vector2(0.6, 0.6)
[node name="background_image" type="Sprite2D" parent="."]
texture = ExtResource("2_1kq1c")