initial starter deck added. the turn rotation works sometimes

This commit is contained in:
2023-06-11 02:08:09 +10:00
parent f2028527b5
commit 8bc39d9d74
24 changed files with 391 additions and 135 deletions

View File

@ -1,9 +1,10 @@
[gd_scene load_steps=9 format=3 uid="uid://c7j6lwbwgbosr"]
[gd_scene load_steps=10 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://bj07g3riacndc" path="res://Assets/back.png" id="4_tye4g"]
[ext_resource type="Texture2D" uid="uid://ws1ghxt16a54" path="res://Assets/hardest.png" id="5_hl5js"]
[sub_resource type="LabelSettings" id="LabelSettings_xciys"]
@ -14,18 +15,19 @@ shadow_size = 0
font_size = 24
[sub_resource type="RectangleShape2D" id="RectangleShape2D_70vuu"]
size = Vector2(350, 253)
size = Vector2(350, 250)
[node name="Card" type="Node2D"]
script = ExtResource("1_bvmvn")
[node name="Background" type="TextureRect" parent="."]
[node name="front" type="TextureRect" parent="."]
visible = false
texture_filter = 1
offset_right = 350.0
offset_bottom = 250.0
texture = ExtResource("2_k2tqp")
[node name="Title" type="Label" parent="Background"]
[node name="Title" type="Label" parent="front"]
modulate = Color(0, 0, 0, 1)
texture_filter = 1
layout_mode = 0
@ -38,7 +40,7 @@ horizontal_alignment = 1
vertical_alignment = 1
uppercase = true
[node name="Initial Stress" type="Label" parent="Background"]
[node name="Initial Stress" type="Label" parent="front"]
modulate = Color(0, 0, 0, 1)
texture_filter = 1
layout_mode = 0
@ -51,47 +53,43 @@ horizontal_alignment = 1
vertical_alignment = 1
uppercase = true
[node name="Slice1" type="TextureRect" parent="Background"]
visible = false
[node name="Slice1" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 325.0
offset_top = 6.0
offset_right = 344.0
offset_bottom = 25.0
offset_left = 318.0
offset_top = 12.0
offset_right = 336.0
offset_bottom = 30.0
texture = ExtResource("3_pxlet")
[node name="Slice2" type="TextureRect" parent="Background"]
visible = false
[node name="Slice2" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 326.0
offset_top = 25.0
offset_right = 345.0
offset_bottom = 44.0
offset_left = 318.0
offset_top = 28.0
offset_right = 336.0
offset_bottom = 46.0
texture = ExtResource("3_pxlet")
flip_v = true
[node name="Slice3" type="TextureRect" parent="Background"]
visible = false
[node name="Slice3" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 308.0
offset_top = 24.0
offset_right = 327.0
offset_bottom = 43.0
offset_left = 302.0
offset_top = 28.0
offset_right = 320.0
offset_bottom = 46.0
texture = ExtResource("3_pxlet")
flip_h = true
flip_v = true
[node name="Slice4" type="TextureRect" parent="Background"]
visible = false
[node name="Slice4" type="TextureRect" parent="front"]
layout_mode = 0
offset_left = 308.0
offset_top = 7.0
offset_right = 327.0
offset_bottom = 26.0
offset_left = 302.0
offset_top = 12.0
offset_right = 320.0
offset_bottom = 30.0
texture = ExtResource("3_pxlet")
flip_h = true
[node name="Turns Left Counter" type="Label" parent="Background"]
[node name="Turns Left Counter" type="Label" parent="front"]
layout_mode = 0
offset_left = 354.0
offset_right = 394.0
@ -184,7 +182,7 @@ scale = Vector2(0.9, 0.9)
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2(175, 124.5)
position = Vector2(175, 125)
shape = SubResource("RectangleShape2D_70vuu")
[node name="Control" type="Control" parent="."]
@ -195,7 +193,6 @@ offset_right = 40.0
offset_bottom = 40.0
[node name="4turn" type="Button" parent="Control"]
visible = false
layout_mode = 0
offset_left = 91.0
offset_top = 56.0
@ -204,7 +201,6 @@ offset_bottom = 118.0
text = "4"
[node name="3turn" type="Button" parent="Control"]
visible = false
layout_mode = 0
offset_left = 90.0
offset_top = 131.0
@ -213,7 +209,6 @@ offset_bottom = 193.0
text = "3"
[node name="2turn" type="Button" parent="Control"]
visible = false
layout_mode = 0
offset_left = 176.0
offset_top = 132.0
@ -222,7 +217,6 @@ offset_bottom = 194.0
text = "2"
[node name="1turn" type="Button" parent="Control"]
visible = false
layout_mode = 0
offset_left = 176.0
offset_top = 56.0
@ -230,6 +224,13 @@ offset_right = 240.0
offset_bottom = 118.0
text = "1"
[node name="back" type="TextureRect" parent="."]
offset_top = 250.0
offset_right = 250.0
offset_bottom = 600.0
rotation = -1.5708
texture = ExtResource("4_tye4g")
[connection signal="pressed" from="Control/4turn" to="." method="_on_turn_pressed" binds= [4]]
[connection signal="pressed" from="Control/3turn" to="." method="_on_turn_pressed" binds= [3]]
[connection signal="pressed" from="Control/2turn" to="." method="_on_turn_pressed" binds= [2]]

View File

@ -2,40 +2,63 @@
[ext_resource type="Script" path="res://Scripts/network_lobby.gd" id="1_dsni2"]
[node name="Root" type="Node2D"]
[node name="Root" type="Node2D" node_paths=PackedStringArray("username_field", "IP_field", "Port_field")]
script = ExtResource("1_dsni2")
username_field = NodePath("CanvasLayer/Control/UI/Username")
IP_field = NodePath("CanvasLayer/Control/UI/IPField")
Port_field = NodePath("CanvasLayer/Control/UI/PortField")
[node name="UI" type="VBoxContainer" parent="."]
offset_right = 116.0
offset_bottom = 136.0
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Username" type="LineEdit" parent="UI"]
[node name="Control" type="Control" parent="CanvasLayer"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="UI" type="VBoxContainer" parent="CanvasLayer/Control"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -150.0
offset_top = -125.0
offset_right = 150.0
offset_bottom = 125.0
grow_horizontal = 2
grow_vertical = 2
[node name="Username" type="LineEdit" parent="CanvasLayer/Control/UI"]
layout_mode = 2
placeholder_text = "username"
alignment = 2
[node name="IPField" type="LineEdit" parent="UI"]
[node name="IPField" type="LineEdit" parent="CanvasLayer/Control/UI"]
layout_mode = 2
placeholder_text = "localhost"
alignment = 2
[node name="PortField" type="LineEdit" parent="UI"]
[node name="PortField" type="LineEdit" parent="CanvasLayer/Control/UI"]
layout_mode = 2
placeholder_text = "58008"
alignment = 2
[node name="Connect" type="Button" parent="UI"]
[node name="Connect" type="Button" parent="CanvasLayer/Control/UI"]
layout_mode = 2
text = "Connect"
[node name="Host" type="Button" parent="UI"]
[node name="Host" type="Button" parent="CanvasLayer/Control/UI"]
layout_mode = 2
text = "Host"
[node name="SinglePlayer" type="Button" parent="UI"]
[node name="SinglePlayer" type="Button" parent="CanvasLayer/Control/UI"]
layout_mode = 2
text = "SinglePlayer"
[connection signal="pressed" from="UI/Connect" to="." method="connect_to_server"]
[connection signal="pressed" from="UI/Host" to="." method="host_server"]
[connection signal="pressed" from="UI/SinglePlayer" to="." method="_on_single_player_pressed"]
[connection signal="pressed" from="CanvasLayer/Control/UI/Connect" to="." method="connect_to_server"]
[connection signal="pressed" from="CanvasLayer/Control/UI/Host" to="." method="host_server"]
[connection signal="pressed" from="CanvasLayer/Control/UI/SinglePlayer" to="." method="_on_single_player_pressed"]

View File

@ -75,7 +75,7 @@ anchors_preset = -1
anchor_left = 0.5
anchor_right = 0.5
offset_left = -42.5
offset_top = 21.0
offset_top = 30.0
offset_right = 42.5
offset_bottom = 31.0
grow_horizontal = 2
@ -107,6 +107,38 @@ size_flags_vertical = 3
[node name="LineEdit" type="LineEdit" parent="CanvasLayer/UI/VBoxContainer"]
layout_mode = 2
[node name="Hire" type="Button" parent="CanvasLayer/UI"]
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -8.0
offset_top = -4.0
offset_right = -30.0
offset_bottom = 4.0
grow_horizontal = 0
grow_vertical = 2
text = "Hire Worker"
[node name="Label" type="Label" parent="CanvasLayer/UI"]
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -40.0
offset_top = -11.5
offset_right = -137.0
offset_bottom = 11.5
grow_horizontal = 0
grow_vertical = 2
text = "$50"
horizontal_alignment = 2
vertical_alignment = 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"]

View File

@ -13,61 +13,59 @@ script = ExtResource("1_cg0id")
[node name="Title" type="Label" parent="."]
layout_mode = 0
offset_left = 94.0
offset_top = 4.0
offset_right = 1027.0
offset_bottom = 183.0
theme_override_font_sizes/font_size = 129
offset_left = 79.0
offset_top = 31.0
offset_right = 603.0
offset_bottom = 159.0
theme_override_font_sizes/font_size = 91
text = "Lexi's Game"
horizontal_alignment = 1
vertical_alignment = 1
[node name="Play Game" type="Button" parent="."]
layout_mode = 0
offset_left = 389.0
offset_top = 187.0
offset_right = 743.0
offset_bottom = 350.0
theme_override_font_sizes/font_size = 40
offset_left = 31.0
offset_top = 215.0
offset_right = 281.0
offset_bottom = 273.0
theme_override_font_sizes/font_size = 36
text = "Play"
[node name="Worker Deck" type="Button" parent="."]
visible = false
layout_mode = 0
offset_left = 383.0
offset_top = 394.0
offset_right = 737.0
offset_bottom = 557.0
theme_override_font_sizes/font_size = 40
text = "worker deck
dev tool"
offset_left = 874.0
offset_top = 261.0
offset_right = 1124.0
offset_bottom = 319.0
theme_override_font_sizes/font_size = 36
text = "worker editor"
[node name="Task Deck" type="Button" parent="."]
visible = false
layout_mode = 0
offset_left = 383.0
offset_top = 570.0
offset_right = 737.0
offset_bottom = 733.0
theme_override_font_sizes/font_size = 40
text = "task deck
dev tool"
offset_left = 874.0
offset_top = 332.0
offset_right = 1124.0
offset_bottom = 390.0
theme_override_font_sizes/font_size = 36
text = "client editor"
[node name="CheckButton" type="CheckButton" parent="."]
layout_mode = 0
offset_left = 652.0
offset_top = 343.0
offset_right = 696.0
offset_bottom = 367.0
scale = Vector2(2, 2)
offset_left = 1054.0
offset_top = 221.0
offset_right = 1098.0
offset_bottom = 245.0
scale = Vector2(1.5, 1.5)
[node name="Label" type="Label" parent="."]
layout_mode = 0
offset_left = 378.0
offset_top = 344.0
offset_right = 642.0
offset_bottom = 402.0
theme_override_font_sizes/font_size = 35
offset_left = 895.0
offset_top = 219.0
offset_right = 1055.0
offset_bottom = 253.0
theme_override_font_sizes/font_size = 22
text = "Show dev tools"
horizontal_alignment = 1
vertical_alignment = 1

View File

@ -5,26 +5,34 @@
[ext_resource type="PackedScene" uid="uid://y2i3u6n1oowh" path="res://Scenes/deck.tscn" id="3_ypq4b"]
[ext_resource type="PackedScene" uid="uid://baoec8cqmedf6" path="res://Scenes/worker_slot.tscn" id="4_o73ea"]
[node name="PlayerBoard" type="Node2D"]
[node name="PlayerBoard" type="Node2D" node_paths=PackedStringArray("poor_deck", "good_deck", "great_deck", "shift_deck", "slot1", "slot2", "slot3", "slot4")]
script = ExtResource("1_80bvu")
poor_deck = NodePath("PoorDeck")
good_deck = NodePath("GoodDeck")
great_deck = NodePath("GreatDeck")
shift_deck = NodePath("ShiftDeck")
slot1 = NodePath("Slot1")
slot2 = NodePath("Slot2")
slot3 = NodePath("Slot3")
slot4 = NodePath("Slot4")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("2_rx76r")
[node name="ShiftDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(835, -345)
type = 1
[node name="GreatDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(85, -345)
[node name="PoorDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(-855, -345)
type = 1
[node name="GoodDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(-385, -345)
type = 1
[node name="PoorDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(-855, -345)
[node name="GreatDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(85, -345)
type = 1
[node name="ShiftDeck" parent="." instance=ExtResource("3_ypq4b")]
position = Vector2(835, -345)
type = 1
[node name="Slot1" parent="." instance=ExtResource("4_o73ea")]

View File

@ -60,9 +60,9 @@ uppercase = true
[node name="Capacity" type="Label" parent="Sprite2D"]
modulate = Color(0, 0, 0, 1)
texture_filter = 1
offset_left = 77.0
offset_left = 78.0
offset_top = 126.0
offset_right = 114.0
offset_right = 115.0
offset_bottom = 163.0
text = "99"
label_settings = SubResource("LabelSettings_88ebh")
@ -71,6 +71,7 @@ vertical_alignment = 1
uppercase = true
[node name="Bonus1" type="Node2D" parent="Sprite2D"]
position = Vector2(-2, 1)
[node name="Icon1" type="Sprite2D" parent="Sprite2D/Bonus1"]
visible = false
@ -80,6 +81,7 @@ region_enabled = true
region_rect = Rect2(0, 0, 32, 32)
[node name="frame1" type="Sprite2D" parent="Sprite2D/Bonus1"]
visible = false
position = Vector2(-99, 145)
texture = ExtResource("4_rce5w")
region_rect = Rect2(0, 0, 32, 32)
@ -91,6 +93,7 @@ texture = ExtResource("5_a2bm7")
region_rect = Rect2(0, 0, 32, 32)
[node name="Bonus2" type="Node2D" parent="Sprite2D"]
position = Vector2(1, 1)
[node name="Icon2" type="Sprite2D" parent="Sprite2D/Bonus2"]
visible = false
@ -100,6 +103,7 @@ region_enabled = true
region_rect = Rect2(0, 0, 32, 32)
[node name="frame2" type="Sprite2D" parent="Sprite2D/Bonus2"]
visible = false
position = Vector2(-52, 145)
texture = ExtResource("4_rce5w")
region_rect = Rect2(0, 0, 32, 32)
@ -111,6 +115,7 @@ texture = ExtResource("5_a2bm7")
region_rect = Rect2(0, 0, 32, 32)
[node name="Bonus3" type="Node2D" parent="Sprite2D"]
position = Vector2(3, 1)
[node name="Icon3" type="Sprite2D" parent="Sprite2D/Bonus3"]
visible = false
@ -120,6 +125,7 @@ region_enabled = true
region_rect = Rect2(0, 0, 32, 32)
[node name="frame3" type="Sprite2D" parent="Sprite2D/Bonus3"]
visible = false
position = Vector2(-6, 145)
texture = ExtResource("4_rce5w")
region_rect = Rect2(0, 0, 32, 32)
@ -131,6 +137,7 @@ texture = ExtResource("5_a2bm7")
region_rect = Rect2(0, 0, 32, 32)
[node name="Bonus4" type="Node2D" parent="Sprite2D"]
position = Vector2(5, 1)
[node name="Icon4" type="Sprite2D" parent="Sprite2D/Bonus4"]
visible = false
@ -140,6 +147,7 @@ region_enabled = true
region_rect = Rect2(0, 0, 32, 32)
[node name="frame4" type="Sprite2D" parent="Sprite2D/Bonus4"]
visible = false
position = Vector2(40, 145)
texture = ExtResource("4_rce5w")
region_rect = Rect2(0, 0, 32, 32)

View File

@ -19,7 +19,6 @@ texture = ExtResource("1_fxq0t")
position = Vector2(-225, -175)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Worker"]
visible = false
position = Vector2(125, 175)
shape = SubResource("RectangleShape2D_1gv0f")
@ -27,6 +26,8 @@ shape = SubResource("RectangleShape2D_1gv0f")
position = Vector2(-125, -175)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Client"]
visible = false
position = Vector2(175, 125)
shape = SubResource("RectangleShape2D_27hn2")
[connection signal="input_event" from="Worker" to="." method="_on_area2d_input_event"]
[connection signal="input_event" from="Client" to="." method="_on_area2d_input_event"]