diff --git a/Client/origin-client/icons/SP-Symbol-White.png b/Client/origin-client/icons/SP-Symbol-White.png new file mode 100644 index 0000000..5e4c1e4 Binary files /dev/null and b/Client/origin-client/icons/SP-Symbol-White.png differ diff --git a/Client/origin-client/icons/SP-Symbol-White.png.import b/Client/origin-client/icons/SP-Symbol-White.png.import new file mode 100644 index 0000000..9a56541 --- /dev/null +++ b/Client/origin-client/icons/SP-Symbol-White.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dvmripj4jux0b" +path="res://.godot/imported/SP-Symbol-White.png-1296872f3357576963a788a915e74bf1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icons/SP-Symbol-White.png" +dest_files=["res://.godot/imported/SP-Symbol-White.png-1296872f3357576963a788a915e74bf1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Client/origin-client/icons/ST-Symbol-White.png b/Client/origin-client/icons/ST-Symbol-White.png new file mode 100644 index 0000000..20fffb9 Binary files /dev/null and b/Client/origin-client/icons/ST-Symbol-White.png differ diff --git a/Client/origin-client/icons/ST-Symbol-White.png.import b/Client/origin-client/icons/ST-Symbol-White.png.import new file mode 100644 index 0000000..353e8b7 --- /dev/null +++ b/Client/origin-client/icons/ST-Symbol-White.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csvmdo2kwnh7c" +path="res://.godot/imported/ST-Symbol-White.png-9f745da6c8a4c0780d4d88d404f8966b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icons/ST-Symbol-White.png" +dest_files=["res://.godot/imported/ST-Symbol-White.png-9f745da6c8a4c0780d4d88d404f8966b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Client/origin-client/scenes/game/GameScreen.tscn b/Client/origin-client/scenes/game/GameScreen.tscn index 961e6bc..14daff8 100644 --- a/Client/origin-client/scenes/game/GameScreen.tscn +++ b/Client/origin-client/scenes/game/GameScreen.tscn @@ -1,8 +1,13 @@ -[gd_scene load_steps=3 format=3 uid="uid://b17evi1hw4dqu"] +[gd_scene load_steps=6 format=3 uid="uid://b17evi1hw4dqu"] [ext_resource type="Script" uid="uid://b8x84lb58h6gx" path="res://scenes/game/game_screen.gd" id="1_gscr"] +[ext_resource type="Texture2D" uid="uid://dvmripj4jux0b" path="res://icons/SP-Symbol-White.png" id="2_056su"] [ext_resource type="PackedScene" path="res://scenes/game/InGameSettings.tscn" id="2_igs"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_wukpb"] + +[sub_resource type="Theme" id="Theme_056su"] + [node name="GameScreen" type="Node3D"] script = ExtResource("1_gscr") @@ -54,10 +59,10 @@ vertical_alignment = 1 [node name="TurnOrderStrip" type="HBoxContainer" parent="HUD/TopBar"] unique_name_in_owner = true +visible = false layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 4 -visible = false [node name="OpponentPanel" type="HBoxContainer" parent="HUD/TopBar"] unique_name_in_owner = true @@ -93,6 +98,39 @@ layout_mode = 2 theme_override_font_sizes/font_size = 11 text = "Discard" +[node name="SP-ST Panel Container" type="PanelContainer" parent="HUD"] +offset_left = 12.0 +offset_top = 374.0 +offset_right = 88.0 +offset_bottom = 508.0 +theme_override_styles/panel = SubResource("StyleBoxEmpty_wukpb") + +[node name="VBoxContainer" type="VBoxContainer" parent="HUD/SP-ST Panel Container"] +layout_mode = 2 +alignment = 2 + +[node name="TextureRect" type="TextureRect" parent="HUD/SP-ST Panel Container/VBoxContainer"] +self_modulate = Color(0, 0.8117647, 0.77254903, 0.38039216) +texture_filter = 5 +custom_minimum_size = Vector2(1.78, 76) +layout_mode = 2 +theme = SubResource("Theme_056su") +texture = ExtResource("2_056su") +expand_mode = 1 + +[node name="SpLabel" type="Label" parent="HUD/SP-ST Panel Container/VBoxContainer/TextureRect"] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 15.0 +offset_top = 5.0 +offset_right = 62.0 +offset_bottom = 51.0 +theme_override_colors/font_color = Color(0.012617188, 0.012617188, 0.012617188, 1) +theme_override_font_sizes/font_size = 33 +text = "88" +horizontal_alignment = 1 +vertical_alignment = 1 + [node name="HandArea" type="PanelContainer" parent="HUD"] anchors_preset = -1 anchor_top = 1.0 @@ -136,12 +174,6 @@ theme_override_constants/margin_bottom = 8 layout_mode = 2 theme_override_constants/separation = 6 -[node name="SpLabel" type="Label" parent="HUD/RightPanel/RightMargin/RightVBox"] -unique_name_in_owner = true -layout_mode = 2 -theme_override_font_sizes/font_size = 14 -text = "SP: 0" - [node name="StLabel" type="Label" parent="HUD/RightPanel/RightMargin/RightVBox"] unique_name_in_owner = true layout_mode = 2 @@ -316,6 +348,39 @@ text = "Return to Main Menu" [node name="InGameSettings" parent="HUD" instance=ExtResource("2_igs")] unique_name_in_owner = true +[node name="CamCtrlPanel" type="PanelContainer" parent="HUD"] +unique_name_in_owner = true +visible = false +offset_left = 8.0 +offset_top = 56.0 +offset_right = 104.0 +offset_bottom = 200.0 + +[node name="CamCtrlVBox" type="VBoxContainer" parent="HUD/CamCtrlPanel"] +layout_mode = 2 +theme_override_constants/separation = 4 + +[node name="CamOrbitBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] +unique_name_in_owner = true +custom_minimum_size = Vector2(0, 44) +layout_mode = 2 +toggle_mode = true +text = "Orbit" + +[node name="CamPanBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] +unique_name_in_owner = true +custom_minimum_size = Vector2(0, 44) +layout_mode = 2 +toggle_mode = true +text = "Pan" + +[node name="CamZoomBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] +unique_name_in_owner = true +custom_minimum_size = Vector2(0, 44) +layout_mode = 2 +toggle_mode = true +text = "Zoom" + [node name="HoldTimer" type="Timer" parent="."] unique_name_in_owner = true wait_time = 0.5 @@ -325,41 +390,3 @@ one_shot = true unique_name_in_owner = true wait_time = 3.0 one_shot = true - -[node name="CamCtrlPanel" type="PanelContainer" parent="HUD"] -unique_name_in_owner = true -anchors_preset = -1 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 8.0 -offset_top = 56.0 -offset_right = 104.0 -offset_bottom = 200.0 -visible = false - -[node name="CamCtrlVBox" type="VBoxContainer" parent="HUD/CamCtrlPanel"] -layout_mode = 2 -theme_override_constants/separation = 4 - -[node name="CamOrbitBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] -unique_name_in_owner = true -layout_mode = 2 -custom_minimum_size = Vector2(0, 44) -toggle_mode = true -text = "Orbit" - -[node name="CamPanBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] -unique_name_in_owner = true -layout_mode = 2 -custom_minimum_size = Vector2(0, 44) -toggle_mode = true -text = "Pan" - -[node name="CamZoomBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] -unique_name_in_owner = true -layout_mode = 2 -custom_minimum_size = Vector2(0, 44) -toggle_mode = true -text = "Zoom" diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index 05e81d5..f55ab00 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -3835,7 +3835,7 @@ func _update_hud(state: Dictionary) -> void: _turn_lbl.text = "Turn %d — %s" % [turn, "Your turn" if is_mine else "Opponent's turn"] _turn_lbl.modulate = Color(0.4, 1.0, 0.5) if is_mine else Color(1.0, 0.6, 0.6) - _sp_lbl.text = "SP: %d" % int(my.get("currentSp", 0)) + _sp_lbl.text = "%d" % int(my.get("currentSp", 0)) _st_lbl.text = "ST: %d" % int(my.get("currentSt", 0)) _deck_lbl.text = "Deck: %d" % int(my.get("deckCount", 0))