Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev-SummationX-2-22-25-Shop #4067

Merged
merged 5 commits into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,5 @@ vite.config.*.timestamp*

# Python
.venv
vitest.config.*.timestamp*
vitest.config.*.timestamp*
.vscode/settings.json
68 changes: 0 additions & 68 deletions .vscode/settings.json

This file was deleted.

64 changes: 50 additions & 14 deletions apps/gamejam/brackeys/13/scenes/shop/shop.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,26 @@ script = ExtResource("1_3omsn")

[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 0
offset_left = 81.0
offset_left = 32.0
offset_top = 27.0
offset_right = 1071.0
offset_bottom = 104.0
theme_override_constants/separation = 105

[node name="Label" type="Label" parent="HBoxContainer"]
[node name="ResourcePanel" type="TextureRect" parent="HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 56
theme_override_styles/normal = SubResource("StyleBoxTexture_mr6sy")
horizontal_alignment = 1
size_flags_stretch_ratio = 1.86
texture = ExtResource("1_x5466")

[node name="Label" type="Label" parent="HBoxContainer/ResourcePanel"]
layout_mode = 0
offset_left = 10.0
offset_top = 6.0
offset_right = 443.0
offset_bottom = 69.0
horizontal_alignment = 3
vertical_alignment = 3

[node name="ShopTitle" type="Label" parent="HBoxContainer"]
layout_mode = 2
Expand All @@ -67,10 +75,10 @@ horizontal_alignment = 1

[node name="Button" type="Button" parent="HBoxContainer/Label3"]
layout_mode = 0
offset_left = 7.0
offset_top = 4.0
offset_right = 322.0
offset_bottom = 70.0
offset_left = 18.0
offset_top = 8.0
offset_right = 234.0
offset_bottom = 74.0
theme = ExtResource("5_lsrhg")
theme_type_variation = &"SpaceBar"

Expand Down Expand Up @@ -102,16 +110,12 @@ offset_bottom = 150.0
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
text = "dada
dada"
vertical_alignment = 3

[node name="Right" type="Label" parent="MainBG/CenterScreen/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
text = "dad
sdsd"
horizontal_alignment = 2
vertical_alignment = 3

Expand All @@ -124,6 +128,22 @@ offset_bottom = 224.0
text = "Left Right"
horizontal_alignment = 3

[node name="GreenLight" type="TextureRect" parent="MainBG/CenterScreen"]
layout_mode = 0
offset_left = 191.0
offset_top = 302.0
offset_right = 231.0
offset_bottom = 342.0
texture = ExtResource("6_75t5l")

[node name="RedLight" type="TextureRect" parent="MainBG/CenterScreen"]
layout_mode = 0
offset_left = 148.0
offset_top = 302.0
offset_right = 188.0
offset_bottom = 342.0
texture = ExtResource("9_f5tfu")

[node name="LeftPanel" type="TextureRect" parent="MainBG"]
layout_mode = 0
offset_left = 20.0
Expand All @@ -133,6 +153,7 @@ offset_bottom = 351.0
texture = ExtResource("1_x5466")

[node name="ScreenPanel" type="TextureRect" parent="MainBG/LeftPanel"]
layout_mode = 0
offset_left = 32.0
offset_top = 34.0
offset_right = 264.0
Expand Down Expand Up @@ -192,7 +213,6 @@ offset_top = 33.0
offset_right = 424.0
offset_bottom = 284.0
texture = ExtResource("4_atpsb")
metadata/_edit_group_ = true

[node name="VBoxContainer" type="VBoxContainer" parent="MainBG/LeftButtons"]
layout_mode = 1
Expand All @@ -215,6 +235,7 @@ theme_type_variation = &"RightButton"
[node name="Button2" type="Button" parent="MainBG/LeftButtons/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
theme = ExtResource("5_lsrhg")
theme_type_variation = &"RightButton"

[node name="Button3" type="Button" parent="MainBG/LeftButtons/VBoxContainer"]
Expand Down Expand Up @@ -273,6 +294,15 @@ offset_right = 1034.0
offset_bottom = 449.0
texture = ExtResource("3_pd5pr")

[node name="Label" type="Label" parent="MainBG/NonInteractable/BottomScreen"]
layout_mode = 0
offset_left = 47.0
offset_top = 5.0
offset_right = 949.0
offset_bottom = 76.0
horizontal_alignment = 3
vertical_alignment = 1

[node name="VSlider" type="VSlider" parent="MainBG/NonInteractable"]
layout_mode = 0
offset_left = 901.0
Expand Down Expand Up @@ -378,3 +408,9 @@ lights_off = ExtResource("13_swidh")
[connection signal="pressed" from="MainBG/LeftPanel/HBoxContainer/LeftButton" to="." method="_on_left_button_pressed_left_panel"]
[connection signal="pressed" from="MainBG/LeftPanel/HBoxContainer/EnterButton" to="." method="_on_enter_button_pressed_left_panel"]
[connection signal="pressed" from="MainBG/LeftPanel/HBoxContainer/RightButton" to="." method="_on_right_button_pressed_left_panel"]
[connection signal="pressed" from="MainBG/LeftButtons/VBoxContainer/Button" to="." method="_on_button_1_left_pressed"]
[connection signal="pressed" from="MainBG/LeftButtons/VBoxContainer/Button2" to="." method="_on_button_2_left_pressed"]
[connection signal="pressed" from="MainBG/LeftButtons/VBoxContainer/Button3" to="." method="_on_button_3_left_pressed"]
[connection signal="pressed" from="MainBG/RightButtons/VBoxContainer/Button" to="." method="_on_button_right_pressed"]
[connection signal="pressed" from="MainBG/RightButtons/VBoxContainer/Button2" to="." method="_on_button_2_right_pressed"]
[connection signal="pressed" from="MainBG/RightButtons/VBoxContainer/Button3" to="." method="_on_button_right_3_pressed"]
2 changes: 2 additions & 0 deletions apps/gamejam/brackeys/13/scripts/global.gd
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ func get_starship_stat(stat_name: String) -> float:

func apply_starship_bonus(stat_name: String, bonus: float):
if not base_starship_stats.has(stat_name):
print("not applying bonus")
return
starship_bonuses[stat_name] += bonus
print("applied bonus")
emit_signal("starship_stat_changed", stat_name, get_starship_stat(stat_name))

func reset_starship_bonus(stat_name: String):
Expand Down
Loading