diff --git a/Client/origin-client/scenes/game/GameScreen.tscn b/Client/origin-client/scenes/game/GameScreen.tscn index 3e3d20b..7e3ec78 100644 --- a/Client/origin-client/scenes/game/GameScreen.tscn +++ b/Client/origin-client/scenes/game/GameScreen.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://b8x84lb58h6gx" path="res://scenes/game/game_screen.gd" id="1_gscr"] [ext_resource type="PackedScene" path="res://scenes/game/InGameSettings.tscn" id="2_igs"] -[ext_resource type="PackedScene" path="res://scenes/game/components/hud/hud_controller.tscn" id="3_hudctrl"] +[ext_resource type="PackedScene" uid="uid://doy6e5sb5bk48" path="res://scenes/game/components/hud/hud_controller.tscn" id="3_hudctrl"] [ext_resource type="PackedScene" uid="uid://cowqg2xdx0x7g" path="res://scenes/game/components/hud/hand_manager.tscn" id="4_handmgr"] [ext_resource type="PackedScene" path="res://scenes/game/components/overlays/game_over_overlay.tscn" id="5_goo"] @@ -34,11 +34,9 @@ layer = 10 [node name="HudController" parent="HUD" instance=ExtResource("3_hudctrl")] unique_name_in_owner = true -layout_mode = 3 [node name="HandManager" parent="HUD" instance=ExtResource("4_handmgr")] unique_name_in_owner = true -visible = true [node name="RightPanel" type="PanelContainer" parent="HUD"] visible = false @@ -122,34 +120,36 @@ 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 +offset_left = 127.0 +offset_top = 1.0 +offset_right = 377.0 +offset_bottom = 47.0 -[node name="CamCtrlVBox" type="VBoxContainer" parent="HUD/CamCtrlPanel"] +[node name="CamCtrlVBox" type="HBoxContainer" parent="HUD/CamCtrlPanel"] layout_mode = 2 -theme_override_constants/separation = 4 +theme_override_constants/separation = 6 [node name="CamOrbitBtn" type="Button" parent="HUD/CamCtrlPanel/CamCtrlVBox"] unique_name_in_owner = true -custom_minimum_size = Vector2(0, 44) +custom_minimum_size = Vector2(76, 34) layout_mode = 2 +tooltip_text = "Orbit camera" 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) +custom_minimum_size = Vector2(76, 34) layout_mode = 2 +tooltip_text = "Pan camera" 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) +custom_minimum_size = Vector2(76, 34) layout_mode = 2 +tooltip_text = "Zoom camera" toggle_mode = true text = "Zoom" diff --git a/Client/origin-client/scenes/game/components/hud/hand_manager.tscn b/Client/origin-client/scenes/game/components/hud/hand_manager.tscn index 3cce7b3..530df67 100644 --- a/Client/origin-client/scenes/game/components/hud/hand_manager.tscn +++ b/Client/origin-client/scenes/game/components/hud/hand_manager.tscn @@ -14,6 +14,7 @@ anchors_preset = -1 anchor_top = 1.0 anchor_right = 0.75 anchor_bottom = 1.0 +offset_left = 206.0 offset_top = -248.0 offset_bottom = 2.0 mouse_filter = 2 @@ -64,10 +65,10 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_panel2") unique_name_in_owner = true custom_minimum_size = Vector2(22, 22) layout_mode = 0 -offset_left = 963.0 -offset_top = 6.0 -offset_right = 1030.0 -offset_bottom = 108.0 +offset_left = 806.0 +offset_top = 4.0 +offset_right = 873.0 +offset_bottom = 106.0 scale = Vector2(2.08, 1.6) texture_normal = ExtResource("2_arrow") ignore_texture_size = true diff --git a/Client/origin-client/scenes/game/components/hud/hud_controller.gd b/Client/origin-client/scenes/game/components/hud/hud_controller.gd index 7a7f86e..2d4a10f 100644 --- a/Client/origin-client/scenes/game/components/hud/hud_controller.gd +++ b/Client/origin-client/scenes/game/components/hud/hud_controller.gd @@ -36,6 +36,8 @@ signal spectator_leave_requested @onready var _spectator_list : VBoxContainer = %SpectatorPlayerList @onready var _sp_st_panel : PanelContainer = $"SP-ST Panel Container" @onready var _deck_discard_panel: Control = $"ActionRail/RailMargin/RailHBox/Deck-Discard Panel Container" +@onready var _player_duel_hud : PlayerDuelHud = %PlayerDuelHud +@onready var _turn_banner : TurnTransitionBanner = %TurnTransitionBanner ## Exposed so GameScreen can hand it to the Chat system. @onready var chat_bubble_host : Control = %ChatBubbleHost @@ -50,6 +52,8 @@ func _ready() -> void: _settings_btn.pressed.connect(func() -> void: settings_requested.emit()) _discard_btn.pressed.connect(func() -> void: show_own_discard(Game.state)) _opp_discard_btn.pressed.connect(func() -> void: show_opp_discard(Game.state)) + _player_duel_hud.own_discard_requested.connect(func() -> void: show_own_discard(Game.state)) + _player_duel_hud.opponent_discard_requested.connect(func() -> void: show_opp_discard(Game.state)) _dv_close_btn.pressed.connect(func() -> void: _dv_overlay.visible = false) _spectator_leave_btn.pressed.connect(func() -> void: spectator_leave_requested.emit()) @@ -61,6 +65,7 @@ func enter_spectator_mode() -> void: _deck_discard_panel.visible = false _draw_btn.visible = false _end_turn_btn.visible = false + _player_duel_hud.visible = false _spectator_panel.visible = true _spectator_leave_btn.visible = true @@ -68,7 +73,13 @@ func enter_spectator_mode() -> void: func update_hud(state: Dictionary) -> void: var phase: String = state.get("phase", "") var turn: int = state.get("turnNumber", 1) - _phase_lbl.text = "Phase: %s" % phase + _phase_lbl.text = "TURN %d\n%s\nPhase: %s" % [ + turn, + "YOUR TURN" if Game.is_my_turn() else "OPPONENT TURN", + phase + ] + _turn_banner.update_from_state(state, is_spectating) + _player_duel_hud.update_from_state(state, is_spectating) if is_spectating: update_hud_spectator(state) @@ -77,8 +88,10 @@ func update_hud(state: Dictionary) -> void: var is_mine: bool = Game.is_my_turn() var my: Dictionary = Game.get_my_player() var opp: Dictionary = Game.get_opponent() + var all_players: Array = state.get("players", []) + var is_duel: bool = all_players.size() == 2 - _turn_lbl.text = "Turn %d — %s" % [turn, "Your turn" if is_mine else "Opponent's turn"] + _turn_lbl.text = "" if is_duel else "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 = "%d" % int(my.get("currentSp", 0)) @@ -91,14 +104,17 @@ func update_hud(state: Dictionary) -> void: _opp_hand_lbl.text = "Hand: %d" % int(opp.get("handCount", 0)) _opp_deck_lbl.text = "Deck: %d" % int(opp.get("deckCount", 0)) - var all_players: Array = state.get("players", []) if all_players.size() > 2: _opp_panel.visible = false _turn_order_strip.visible = true + _sp_st_panel.visible = true + _deck_discard_panel.visible = true rebuild_turn_order_strip(state) else: - _opp_panel.visible = true + _opp_panel.visible = false _turn_order_strip.visible = false + _sp_st_panel.visible = false + _deck_discard_panel.visible = false _draw_btn.visible = (phase == "Draw" and is_mine) _end_turn_btn.visible = (phase == "Main" and is_mine) @@ -108,9 +124,9 @@ func update_hud(state: Dictionary) -> void: var my_arch: Dictionary = my.get("archSpirit", {}) var i_have_placed: bool = not my_arch.is_empty() and my_arch.get("position") != null if not i_have_placed: - _phase_lbl.text = "Phase: Placement — click a tile to place your ArchSpirit" + _phase_lbl.text = "TURN %d\nPLACEMENT\nPlace ArchSpirit" % turn else: - _phase_lbl.text = "Phase: Placement — waiting for opponent…" + _phase_lbl.text = "TURN %d\nPLACEMENT\nWaiting" % turn func update_hud_spectator(state: Dictionary) -> void: @@ -292,6 +308,7 @@ func show_opp_discard(state: Dictionary) -> void: func show_discard_for(title: String, cards: Array) -> void: _dv_title.text = "%s (%d)" % [title, cards.size()] + _dv_overlay.move_to_front() for c in _dv_list.get_children(): c.queue_free() if cards.is_empty(): diff --git a/Client/origin-client/scenes/game/components/hud/hud_controller.tscn b/Client/origin-client/scenes/game/components/hud/hud_controller.tscn index 867bc41..2fc6b51 100644 --- a/Client/origin-client/scenes/game/components/hud/hud_controller.tscn +++ b/Client/origin-client/scenes/game/components/hud/hud_controller.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=15 format=3 uid="uid://doy6e5sb5bk48"] +[gd_scene load_steps=17 format=3 uid="uid://doy6e5sb5bk48"] [ext_resource type="Script" uid="uid://c0cr5qgneoab1" path="res://scenes/game/components/hud/hud_controller.gd" id="1_script"] [ext_resource type="Texture2D" uid="uid://dvmripj4jux0b" path="res://icons/SP-Symbol-White.png" id="2_sp"] [ext_resource type="Texture2D" uid="uid://csvmdo2kwnh7c" path="res://icons/ST-Symbol-White.png" id="3_st"] [ext_resource type="Texture2D" uid="uid://beyeu0y34m3v4" path="res://ui/icons/Deck Icon.png" id="4_deck"] [ext_resource type="Texture2D" uid="uid://c65s8sn4p7s37" path="res://ui/icons/Discard Icon.png" id="5_discard"] +[ext_resource type="PackedScene" uid="uid://b4ogwqj0xql6y" path="res://scenes/game/components/hud/player_duel_hud.tscn" id="6_duel"] +[ext_resource type="Script" uid="uid://kofrp8y3wdxj" path="res://scenes/game/components/hud/turn_transition_banner.gd" id="7_banner"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_spst"] @@ -30,21 +32,27 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 script = ExtResource("1_script") [node name="TopBar" type="HBoxContainer" parent="."] layout_mode = 0 anchor_right = 1.0 -offset_bottom = 48.0 +offset_bottom = 96.0 theme_override_constants/separation = 0 [node name="PhaseLabel" type="Label" parent="TopBar"] unique_name_in_owner = true -custom_minimum_size = Vector2(140, 48) +custom_minimum_size = Vector2(154, 84) layout_mode = 2 -theme_override_font_sizes/font_size = 13 -text = "Phase: —" +theme_override_colors/font_color = Color(0.74, 0.96, 1, 1) +theme_override_font_sizes/font_size = 12 +text = "TURN 1 +YOUR TURN +Phase: Main" +horizontal_alignment = 1 vertical_alignment = 1 [node name="TurnLabel" type="Label" parent="TopBar"] @@ -52,7 +60,6 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 theme_override_font_sizes/font_size = 13 -text = "Turn 1 — Your turn" horizontal_alignment = 1 vertical_alignment = 1 @@ -65,6 +72,7 @@ theme_override_constants/separation = 4 [node name="OpponentPanel" type="HBoxContainer" parent="TopBar"] unique_name_in_owner = true +visible = false custom_minimum_size = Vector2(240, 48) layout_mode = 2 theme_override_constants/separation = 8 @@ -97,7 +105,23 @@ layout_mode = 2 theme_override_font_sizes/font_size = 11 text = "Discard" +[node name="PlayerDuelHud" parent="." instance=ExtResource("6_duel")] +unique_name_in_owner = true +layout_mode = 1 + +[node name="TurnTransitionBanner" type="Control" parent="."] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("7_banner") + [node name="SP-ST Panel Container" type="PanelContainer" parent="."] +visible = false layout_mode = 0 anchor_top = 0.675 anchor_bottom = 0.675 @@ -195,6 +219,7 @@ layout_mode = 2 theme_override_constants/separation = 12 [node name="Deck-Discard Panel Container" type="Control" parent="ActionRail/RailMargin/RailHBox"] +visible = false custom_minimum_size = Vector2(76, 0) layout_mode = 2 diff --git a/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd b/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd new file mode 100644 index 0000000..a37bc95 --- /dev/null +++ b/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd @@ -0,0 +1,177 @@ +class_name PlayerDuelHud +extends Control + +const DEFAULT_CARD_ART_URL := "https://cdn.aeternalisgames.com/sor-assets/cardart/0_No-Card-Art.jpg" +static var _texture_cache: Dictionary = {} + +signal own_discard_requested +signal opponent_discard_requested + +@onready var _opp_name_lbl: Label = %OppNameLabel +@onready var _opp_arch_lbl: Label = %OppArchLabel +@onready var _opp_hp_lbl: Label = %OppHpLabel +@onready var _opp_hp_bar: ProgressBar = %OppHpBar +@onready var _opp_sp_lbl: Label = %OppSpLabel +@onready var _opp_st_lbl: Label = %OppStLabel +@onready var _opp_hand_lbl: Label = %OppHandLabel +@onready var _opp_deck_lbl: Label = %OppDeckLabel +@onready var _opp_discard_btn: Button = %OppDiscardBtn +@onready var _opp_portrait: TextureRect = %OppPortrait + +@onready var _self_hp_lbl: Label = %SelfHpLabel +@onready var _self_hp_bar: ProgressBar = %SelfHpBar +@onready var _self_sp_lbl: Label = %SelfSpLabel +@onready var _self_st_lbl: Label = %SelfStLabel +@onready var _self_hand_lbl: Label = %SelfHandLabel +@onready var _self_deck_lbl: Label = %SelfDeckLabel +@onready var _self_discard_lbl: Label = %SelfDiscardLabel +@onready var _self_discard_btn: TextureButton = %SelfDiscardBtn +@onready var _self_portrait: TextureRect = %SelfPortrait +@onready var _archspirit_mask: TextureRect = %ArchspiritMask + + +func _ready() -> void: + mouse_filter = Control.MOUSE_FILTER_IGNORE + _self_portrait.material = _make_portrait_mask_material() + _self_discard_btn.pressed.connect(func() -> void: own_discard_requested.emit()) + _opp_discard_btn.pressed.connect(func() -> void: opponent_discard_requested.emit()) + + +func update_from_state(state: Dictionary, spectating: bool) -> void: + var players: Array = state.get("players", []) + visible = not spectating and players.size() == 2 + if not visible: + return + + _apply_player(Game.get_my_player(), true) + _apply_player(Game.get_opponent(), false) + + +func _apply_player(player: Dictionary, self_side: bool) -> void: + if player.is_empty(): + return + + var arch_raw: Variant = player.get("archSpirit", {}) + var arch: Dictionary = {} + if arch_raw is Dictionary: + arch = arch_raw as Dictionary + var def_id := str(arch.get("cardDefinitionId", "")) + var def := ContentCache.get_definition(def_id) + var current_hp := int(arch.get("currentHealth", 0)) + var max_hp := int(arch.get("maxHealth", def.get("maxHealth", max(1, current_hp)))) + max_hp = max(1, max_hp) + + var discard_raw: Variant = player.get("discard", []) + var discard: Array = [] + if discard_raw is Array: + discard = discard_raw as Array + var discard_count := discard.size() if not discard.is_empty() else int(player.get("discardCount", 0)) + + if self_side: + _self_hp_lbl.text = "HP %d/%d" % [current_hp, max_hp] + _self_hp_bar.max_value = max_hp + _self_hp_bar.value = clampi(current_hp, 0, max_hp) + _self_sp_lbl.text = "%d" % int(player.get("currentSp", 0)) + _self_st_lbl.text = "%d" % int(player.get("currentSt", 0)) + _self_hand_lbl.text = "%d" % int(player.get("handCount", 0)) + _self_deck_lbl.text = "%d" % int(player.get("deckCount", 0)) + _self_discard_lbl.text = "%d" % discard_count + _set_remote_texture(_self_portrait, _find_card_art_url(def)) + else: + var account_id := str(player.get("accountId", "")) + _opp_name_lbl.text = Game.get_display_name(account_id) + _opp_arch_lbl.text = str(arch.get("name", def.get("name", "ArchSpirit"))) + _opp_hp_lbl.text = "HP %d/%d" % [current_hp, max_hp] + _opp_hp_bar.max_value = max_hp + _opp_hp_bar.value = clampi(current_hp, 0, max_hp) + _opp_sp_lbl.text = "%d" % int(player.get("currentSp", 0)) + _opp_st_lbl.text = "%d" % int(player.get("currentSt", 0)) + _opp_hand_lbl.text = "Hand %d" % int(player.get("handCount", 0)) + _opp_deck_lbl.text = "Deck %d" % int(player.get("deckCount", 0)) + _opp_discard_btn.text = "Discard %d" % discard_count + _set_remote_texture(_opp_portrait, _find_card_art_url(def)) + + +func _find_card_art_url(def: Dictionary) -> String: + var assets: Variant = def.get("assets", []) + if typeof(assets) != TYPE_ARRAY: + return DEFAULT_CARD_ART_URL + + for asset in assets as Array: + if typeof(asset) != TYPE_DICTIONARY: + continue + var d := asset as Dictionary + if str(d.get("assetType", "")) == "Art2D": + return str(d.get("cdnUrl", DEFAULT_CARD_ART_URL)) + + return DEFAULT_CARD_ART_URL + + +func _set_remote_texture(target: TextureRect, url: String) -> void: + if url.is_empty() or not is_instance_valid(target): + return + + var cached: Variant = _texture_cache.get(url, null) + if cached != null: + target.texture = cached as Texture2D + return + + if not url.begins_with("http"): + return + + var requester := HTTPRequest.new() + requester.use_threads = true + add_child(requester) + requester.request_completed.connect( + func(_result: int, response_code: int, _headers: PackedStringArray, body: PackedByteArray) -> void: + if response_code >= 200 and response_code < 300: + var texture := _texture_from_bytes(url, body) + if texture != null: + _texture_cache[url] = texture + if is_instance_valid(target): + target.texture = texture + requester.queue_free() + ) + var err := requester.request(url) + if err != OK: + requester.queue_free() + + +func _texture_from_bytes(url: String, body: PackedByteArray) -> Texture2D: + var image := Image.new() + var ext := url.get_file().get_extension().to_lower() + var err := ERR_FILE_UNRECOGNIZED + match ext: + "png": + err = image.load_png_from_buffer(body) + "jpg", "jpeg": + err = image.load_jpg_from_buffer(body) + "webp": + err = image.load_webp_from_buffer(body) + "svg": + err = image.load_svg_from_buffer(body) + _: + err = image.load_png_from_buffer(body) + if err != OK: + err = image.load_jpg_from_buffer(body) + if err != OK: + return null + return ImageTexture.create_from_image(image) + + +func _make_portrait_mask_material() -> ShaderMaterial: + var shader := Shader.new() + shader.code = """ +shader_type canvas_item; +uniform sampler2D mask_tex; + +void fragment() { + vec4 color = texture(TEXTURE, UV); + float mask_alpha = texture(mask_tex, UV).a; + COLOR = vec4(color.rgb, color.a * mask_alpha); +} +""" + var material := ShaderMaterial.new() + material.shader = shader + material.set_shader_parameter("mask_tex", _archspirit_mask.texture) + return material diff --git a/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd.uid b/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd.uid new file mode 100644 index 0000000..b37f221 --- /dev/null +++ b/Client/origin-client/scenes/game/components/hud/player_duel_hud.gd.uid @@ -0,0 +1 @@ +uid://v6rfnn2v3o73 diff --git a/Client/origin-client/scenes/game/components/hud/player_duel_hud.tscn b/Client/origin-client/scenes/game/components/hud/player_duel_hud.tscn new file mode 100644 index 0000000..b0e4971 --- /dev/null +++ b/Client/origin-client/scenes/game/components/hud/player_duel_hud.tscn @@ -0,0 +1,588 @@ +[gd_scene load_steps=18 format=3 uid="uid://b4ogwqj0xql6y"] + +[ext_resource type="Script" uid="uid://v6rfnn2v3o73" path="res://scenes/game/components/hud/player_duel_hud.gd" id="1_script"] +[ext_resource type="Texture2D" uid="uid://dvmripj4jux0b" path="res://icons/SP-Symbol-White.png" id="2_sp"] +[ext_resource type="Texture2D" uid="uid://csvmdo2kwnh7c" path="res://icons/ST-Symbol-White.png" id="3_st"] +[ext_resource type="Texture2D" uid="uid://cle8yc2o6vd2t" path="res://ui/icons/Archspirit Portrait Flair Background.png" id="4_flair"] +[ext_resource type="Texture2D" uid="uid://s4q1bm6vkawk" path="res://ui/icons/Archspirit Portrait Light Reflection.png" id="5_light"] +[ext_resource type="Texture2D" uid="uid://duilm8ch2kr05" path="res://ui/icons/Archspirit Portrait Outline.png" id="6_outline"] +[ext_resource type="Texture2D" uid="uid://btflxbnlm1mja" path="res://ui/icons/Archspirit Portrait Shadow.png" id="7_shadow"] +[ext_resource type="Texture2D" uid="uid://moqusmwltqh2" path="res://ui/icons/Archspirit Mask.png" id="8_mask"] +[ext_resource type="Texture2D" uid="uid://beyeu0y34m3v4" path="res://ui/icons/Deck Icon.png" id="9_deck"] +[ext_resource type="Texture2D" uid="uid://c65s8sn4p7s37" path="res://ui/icons/Discard Icon.png" id="10_discard"] +[ext_resource type="Texture2D" uid="uid://bwgtejjr5gwi4" path="res://ui/icons/Hand Icon.png" id="11_hand"] + +[sub_resource type="StyleBoxFlat" id="Panel_opp"] +bg_color = Color(0.03, 0.07, 0.1, 0.78) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.13, 0.75, 0.84, 0.75) +corner_radius_top_left = 6 +corner_radius_top_right = 6 +corner_radius_bottom_right = 6 +corner_radius_bottom_left = 6 + +[sub_resource type="StyleBoxFlat" id="Hp_bg"] +bg_color = Color(0.09, 0.07, 0.08, 0.95) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="Hp_fill"] +bg_color = Color(0.88, 0.22, 0.35, 0.95) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="Panel_pill"] +bg_color = Color(0.14, 0.16, 0.2, 0.82) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.7, 0.95, 1, 0.16) +corner_radius_top_left = 6 +corner_radius_top_right = 6 +corner_radius_bottom_right = 6 +corner_radius_bottom_left = 6 + +[sub_resource type="StyleBoxFlat" id="Panel_pill_hover"] +bg_color = Color(0.24, 0.26, 0.31, 0.88) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.7, 0.95, 1, 0.35) +corner_radius_top_left = 6 +corner_radius_top_right = 6 +corner_radius_bottom_right = 6 +corner_radius_bottom_left = 6 + +[sub_resource type="StyleBoxFlat" id="Panel_hp"] +bg_color = Color(0.42, 0.06, 0.12, 0.88) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.8, 0.28, 0.36, 1) +corner_radius_top_left = 6 +corner_radius_top_right = 6 +corner_radius_bottom_right = 6 +corner_radius_bottom_left = 6 + +[node name="PlayerDuelHud" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_script") + +[node name="OpponentStatusBand" type="PanelContainer" parent="."] +layout_mode = 0 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -310.0 +offset_top = 8.0 +offset_right = 310.0 +offset_bottom = 92.0 +grow_horizontal = 2 +mouse_filter = 2 +theme_override_styles/panel = SubResource("Panel_opp") + +[node name="OppMargin" type="MarginContainer" parent="OpponentStatusBand"] +layout_mode = 2 +theme_override_constants/margin_left = 10 +theme_override_constants/margin_top = 6 +theme_override_constants/margin_right = 10 +theme_override_constants/margin_bottom = 6 + +[node name="OppRow" type="HBoxContainer" parent="OpponentStatusBand/OppMargin"] +layout_mode = 2 +theme_override_constants/separation = 10 + +[node name="OppInfo" type="VBoxContainer" parent="OpponentStatusBand/OppMargin/OppRow"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/separation = 3 + +[node name="OppNameLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo"] +unique_name_in_owner = true +layout_mode = 2 +theme_override_colors/font_color = Color(1, 0.62, 0.7, 1) +theme_override_font_sizes/font_size = 12 +text = "Opponent" +text_overrun_behavior = 3 + +[node name="OppArchLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo"] +unique_name_in_owner = true +layout_mode = 2 +theme_override_colors/font_color = Color(0.62, 0.7, 0.78, 1) +theme_override_font_sizes/font_size = 10 +text = "ArchSpirit" +text_overrun_behavior = 3 + +[node name="OppHpRow" type="HBoxContainer" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo"] +layout_mode = 2 +theme_override_constants/separation = 6 + +[node name="OppHpLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppHpRow"] +unique_name_in_owner = true +custom_minimum_size = Vector2(62, 0) +layout_mode = 2 +theme_override_colors/font_color = Color(1, 0.48, 0.55, 1) +theme_override_font_sizes/font_size = 12 +text = "HP 0" +vertical_alignment = 1 + +[node name="OppHpBar" type="ProgressBar" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppHpRow"] +unique_name_in_owner = true +custom_minimum_size = Vector2(0, 12) +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_styles/background = SubResource("Hp_bg") +theme_override_styles/fill = SubResource("Hp_fill") +show_percentage = false + +[node name="OppStats" type="HBoxContainer" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo"] +layout_mode = 2 +theme_override_constants/separation = 7 + +[node name="OppSpStat" type="HBoxContainer" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats"] +custom_minimum_size = Vector2(72, 24) +layout_mode = 2 +theme_override_constants/separation = 6 + +[node name="OppSpIcon" type="TextureRect" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats/OppSpStat"] +self_modulate = Color(0, 1, 0.94, 0.8) +custom_minimum_size = Vector2(18, 18) +layout_mode = 2 +texture = ExtResource("2_sp") +expand_mode = 1 +stretch_mode = 5 + +[node name="OppSpLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats/OppSpStat"] +unique_name_in_owner = true +custom_minimum_size = Vector2(26, 0) +layout_mode = 2 +theme_override_colors/font_color = Color(0.82, 0.98, 1, 1) +theme_override_font_sizes/font_size = 13 +text = "0" +vertical_alignment = 1 + +[node name="OppStStat" type="HBoxContainer" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats"] +custom_minimum_size = Vector2(72, 24) +layout_mode = 2 +theme_override_constants/separation = 6 + +[node name="OppStIcon" type="TextureRect" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats/OppStStat"] +self_modulate = Color(0, 1, 0.94, 0.8) +custom_minimum_size = Vector2(18, 18) +layout_mode = 2 +texture = ExtResource("3_st") +expand_mode = 1 +stretch_mode = 5 + +[node name="OppStLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats/OppStStat"] +unique_name_in_owner = true +custom_minimum_size = Vector2(26, 0) +layout_mode = 2 +theme_override_colors/font_color = Color(0.82, 0.98, 1, 1) +theme_override_font_sizes/font_size = 13 +text = "0" +vertical_alignment = 1 + +[node name="OppHandLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats"] +unique_name_in_owner = true +custom_minimum_size = Vector2(62, 22) +layout_mode = 2 +theme_override_font_sizes/font_size = 10 +theme_override_styles/normal = SubResource("Panel_pill") +text = "Hand 0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="OppDeckLabel" type="Label" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats"] +unique_name_in_owner = true +custom_minimum_size = Vector2(62, 22) +layout_mode = 2 +theme_override_font_sizes/font_size = 10 +theme_override_styles/normal = SubResource("Panel_pill") +text = "Deck 0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="OppDiscardBtn" type="Button" parent="OpponentStatusBand/OppMargin/OppRow/OppInfo/OppStats"] +unique_name_in_owner = true +custom_minimum_size = Vector2(72, 22) +layout_mode = 2 +focus_mode = 0 +theme_override_font_sizes/font_size = 10 +theme_override_styles/normal = SubResource("Panel_pill") +theme_override_styles/pressed = SubResource("Panel_pill") +theme_override_styles/hover = SubResource("Panel_pill_hover") +text = "Discard 0" + +[node name="OppPortrait" type="TextureRect" parent="OpponentStatusBand/OppMargin/OppRow"] +unique_name_in_owner = true +custom_minimum_size = Vector2(72, 72) +layout_mode = 2 +expand_mode = 1 +stretch_mode = 6 + +[node name="SelfStatusCluster" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_left = 16.0 +offset_top = -308.0 +offset_right = 308.0 +offset_bottom = -18.0 +grow_vertical = 0 +mouse_filter = 2 + +[node name="SelfSpToken" type="Control" parent="SelfStatusCluster"] +anchors_preset = 0 +offset_left = 3.0 +offset_top = 8.0 +offset_right = 75.0 +offset_bottom = 80.0 +mouse_filter = 2 + +[node name="SelfSpIcon" type="TextureRect" parent="SelfStatusCluster/SelfSpToken"] +self_modulate = Color(0, 1, 0.9411765, 0.5764706) +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +tooltip_text = "Spirit Points" +texture = ExtResource("2_sp") +expand_mode = 1 +stretch_mode = 5 + +[node name="SelfSpLabel" type="Label" parent="SelfStatusCluster/SelfSpToken"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 9.0 +offset_top = 3.0 +offset_right = -9.0 +offset_bottom = -19.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_colors/font_color = Color(0.01, 0.02, 0.02, 1) +theme_override_font_sizes/font_size = 24 +text = "0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SelfStToken" type="Control" parent="SelfStatusCluster"] +anchors_preset = 0 +offset_left = 83.0 +offset_top = 8.0 +offset_right = 155.0 +offset_bottom = 80.0 +mouse_filter = 2 + +[node name="SelfStIcon" type="TextureRect" parent="SelfStatusCluster/SelfStToken"] +self_modulate = Color(0, 1, 0.9411765, 0.5647059) +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +tooltip_text = "Sacrifice Tokens" +texture = ExtResource("3_st") +expand_mode = 1 +stretch_mode = 5 + +[node name="SelfStLabel" type="Label" parent="SelfStatusCluster/SelfStToken"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 11.0 +offset_top = 3.0 +offset_right = -11.0 +offset_bottom = -19.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_colors/font_color = Color(0.01, 0.02, 0.02, 1) +theme_override_font_sizes/font_size = 24 +text = "0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SelfHpBadge" type="PanelContainer" parent="SelfStatusCluster"] +layout_mode = 0 +offset_left = 44.0 +offset_top = 81.0 +offset_right = 116.0 +offset_bottom = 115.0 +tooltip_text = "ArchSpirit Health" +theme_override_styles/panel = SubResource("Panel_hp") + +[node name="SelfHpLabel" type="Label" parent="SelfStatusCluster/SelfHpBadge"] +unique_name_in_owner = true +layout_mode = 2 +theme_override_colors/font_color = Color(1, 0.48, 0.55, 1) +theme_override_font_sizes/font_size = 13 +text = "HP 0/0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SelfHpBar" type="ProgressBar" parent="SelfStatusCluster"] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 20.0 +offset_top = 116.0 +offset_right = 138.0 +offset_bottom = 128.0 +theme_override_styles/background = SubResource("Hp_bg") +theme_override_styles/fill = SubResource("Hp_fill") +show_percentage = false + +[node name="SelfPortraitFrame" type="Control" parent="SelfStatusCluster"] +anchors_preset = 0 +offset_top = 118.0 +offset_right = 190.0 +offset_bottom = 308.0 +mouse_filter = 2 + +[node name="Shadow" type="TextureRect" parent="SelfStatusCluster/SelfPortraitFrame"] +self_modulate = Color(0, 0.36176714, 0.33852944, 0.5764706) +layout_mode = 0 +offset_left = -1.0 +offset_top = 10.0 +offset_right = 149.0 +offset_bottom = 164.0 +scale = Vector2(1, 1.0399951) +mouse_filter = 2 +texture = ExtResource("7_shadow") +expand_mode = 1 + +[node name="FlairBackground" type="TextureRect" parent="SelfStatusCluster/SelfPortraitFrame"] +self_modulate = Color(0, 0.8575818, 0.806699, 0.5764706) +layout_mode = 0 +offset_left = 3.0 +offset_top = 2.0 +offset_right = 167.0 +offset_bottom = 162.0 +scale = Vector2(1, 1.0399951) +mouse_filter = 2 +texture = ExtResource("4_flair") +expand_mode = 1 + +[node name="PortraitClip" type="Control" parent="SelfStatusCluster/SelfPortraitFrame"] +unique_name_in_owner = true +clip_contents = true +layout_mode = 1 +anchor_left = 0.053000003 +anchor_top = 0.068 +anchor_right = 0.80500007 +anchor_bottom = 0.85800004 +offset_left = 0.92999935 +offset_top = 0.0800066 +offset_right = -5.411667 +offset_bottom = -20.70964 +scale = Vector2(1.0400009, 1.16) +mouse_filter = 2 + +[node name="ArchspiritMask" type="TextureRect" parent="SelfStatusCluster/SelfPortraitFrame/PortraitClip"] +unique_name_in_owner = true +clip_children = 1 +layout_mode = 1 +anchors_preset = -1 +anchor_left = -0.049000002 +anchor_right = 1.056 +anchor_bottom = 1.0270001 +offset_left = 0.0067310333 +offset_top = -7.7586403 +offset_right = -6.4962616 +offset_bottom = -7.517975 +scale = Vector2(1.044615, 1.0567364) +mouse_filter = 2 +texture = ExtResource("8_mask") +expand_mode = 1 + +[node name="SelfPortrait" type="TextureRect" parent="SelfStatusCluster/SelfPortraitFrame/PortraitClip/ArchspiritMask"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 11.045649 +offset_top = 2.4473572 +offset_right = -3.6818695 +offset_bottom = 4.8947144 +grow_horizontal = 2 +grow_vertical = 2 +expand_mode = 1 +stretch_mode = 6 + +[node name="Outline" type="TextureRect" parent="SelfStatusCluster"] +self_modulate = Color(0, 0.58431375, 0.54901963, 0.4) +layout_mode = 0 +offset_left = -25.0 +offset_top = 111.0 +offset_right = 165.0 +offset_bottom = 287.0 +scale = Vector2(1, 1.16) +mouse_filter = 2 +texture = ExtResource("6_outline") +expand_mode = 1 + +[node name="LightReflection" type="TextureRect" parent="SelfStatusCluster"] +self_modulate = Color(0, 1, 0.9411765, 0.43137255) +layout_mode = 0 +offset_left = 66.0 +offset_top = 120.0 +offset_right = 162.0 +offset_bottom = 216.0 +scale = Vector2(1, 1.0399951) +mouse_filter = 2 +texture = ExtResource("5_light") +expand_mode = 1 + +[node name="SelfHandToken" type="Control" parent="SelfStatusCluster"] +anchors_preset = 0 +offset_left = 170.0 +offset_top = 126.0 +offset_right = 226.0 +offset_bottom = 182.0 +tooltip_text = "Hand" +mouse_filter = 2 + +[node name="SelfHandIcon" type="TextureRect" parent="SelfStatusCluster/SelfHandToken"] +self_modulate = Color(0, 1, 0.9411765, 0.8) +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("11_hand") +expand_mode = 1 +stretch_mode = 5 + +[node name="SelfHandLabel" type="Label" parent="SelfStatusCluster/SelfHandToken"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 7.0 +offset_top = 7.0 +offset_right = -9.0 +offset_bottom = -7.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_colors/font_color = Color(0.01, 0.02, 0.02, 1) +theme_override_colors/font_shadow_color = Color(0, 1, 0.9411765, 0.8) +theme_override_colors/font_outline_color = Color(0, 1, 0.9411765, 0.8) +theme_override_constants/shadow_offset_x = 2 +theme_override_constants/shadow_offset_y = 2 +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 20 +text = "0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SelfDeckToken" type="Control" parent="SelfStatusCluster"] +anchors_preset = 0 +offset_left = 170.0 +offset_top = 162.0 +offset_right = 226.0 +offset_bottom = 218.0 +tooltip_text = "Deck" +mouse_filter = 2 + +[node name="SelfDeckIcon" type="TextureRect" parent="SelfStatusCluster/SelfDeckToken"] +self_modulate = Color(0, 1, 0.9411765, 0.8) +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("9_deck") +expand_mode = 1 +stretch_mode = 5 + +[node name="SelfDeckLabel" type="Label" parent="SelfStatusCluster/SelfDeckToken"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 8.0 +offset_top = 6.0 +offset_right = -8.0 +offset_bottom = -8.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_colors/font_color = Color(0.01, 0.02, 0.02, 1) +theme_override_colors/font_shadow_color = Color(0, 1, 0.9411765, 0.8) +theme_override_colors/font_outline_color = Color(0, 1, 0.9411765, 0.8) +theme_override_constants/shadow_offset_x = 2 +theme_override_constants/shadow_offset_y = 2 +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 20 +text = "0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SelfDiscardBtn" type="TextureButton" parent="SelfStatusCluster"] +unique_name_in_owner = true +self_modulate = Color(0, 1, 0.9411765, 0.8) +layout_mode = 0 +offset_left = 165.00002 +offset_top = 201.0 +offset_right = 737.0 +offset_bottom = 481.0 +scale = Vector2(0.11999819, 0.16000307) +tooltip_text = "Discard" +focus_mode = 0 +texture_normal = ExtResource("10_discard") +texture_pressed = ExtResource("10_discard") +texture_hover = ExtResource("10_discard") +stretch_mode = 5 + +[node name="SelfDiscardLabel" type="Label" parent="SelfStatusCluster/SelfDiscardBtn"] +unique_name_in_owner = true +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.045 +anchor_top = 0.224 +anchor_right = 0.94400007 +anchor_bottom = 0.83400005 +offset_left = 99.2619 +offset_top = -25.220871 +offset_right = -376.58112 +offset_bottom = -168.02089 +grow_horizontal = 2 +grow_vertical = 2 +scale = Vector2(8.249869, 6.249839) +theme_override_colors/font_color = Color(0.01, 0.02, 0.02, 1) +theme_override_colors/font_shadow_color = Color(0, 1, 0.9411765, 0.8) +theme_override_colors/font_outline_color = Color(0, 1, 0.9411765, 0.8) +theme_override_constants/shadow_offset_x = 2 +theme_override_constants/shadow_offset_y = 2 +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 20 +text = "0" +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd b/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd new file mode 100644 index 0000000..b016ac7 --- /dev/null +++ b/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd @@ -0,0 +1,107 @@ +class_name TurnTransitionBanner +extends Control + +var _panel: PanelContainer = null +var _label: Label = null +var _last_active_id: String = "" +var _last_phase: String = "" +var _initialized: bool = false +var _active_tween: Tween = null + + +func _ready() -> void: + mouse_filter = Control.MOUSE_FILTER_IGNORE + set_anchors_preset(Control.PRESET_FULL_RECT) + _build_layout() + move_to_front() + + +func update_from_state(state: Dictionary, spectating: bool) -> void: + if spectating: + return + + var phase := str(state.get("phase", "")) + var active_id := str(state.get("activePlayerAccountId", "")) + if not _initialized: + _initialized = true + _last_phase = phase + _last_active_id = active_id + return + + var entered_main := phase == "Main" and (_last_phase != "Main" or _last_active_id != active_id) + _last_phase = phase + _last_active_id = active_id + + if entered_main: + var label_text := "Your Main Phase" if active_id == Auth.user_id else "%s Main Phase" % Game.get_display_name(active_id) + show_banner(label_text) + + +func show_banner(text: String) -> void: + if _panel == null or _label == null: + return + + if _active_tween != null and _active_tween.is_running(): + _active_tween.kill() + + _label.text = text + _panel.visible = true + _panel.modulate = Color(1, 1, 1, 0) + + var viewport_size := get_viewport_rect().size + var target_pos := Vector2((viewport_size.x - _panel.size.x) * 0.5, viewport_size.y * 0.38) + if _panel.size.x <= 0.0: + target_pos.x = (viewport_size.x - 420.0) * 0.5 + _panel.position = Vector2(-460.0, target_pos.y) + + _active_tween = create_tween() + _active_tween.set_parallel(true) + _active_tween.tween_property(_panel, "position", target_pos, 0.42).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_OUT) + _active_tween.tween_property(_panel, "modulate:a", 1.0, 0.20) + _active_tween.set_parallel(false) + _active_tween.tween_interval(1.15) + _active_tween.set_parallel(true) + _active_tween.tween_property(_panel, "position:x", viewport_size.x + 24.0, 0.32).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_IN) + _active_tween.tween_property(_panel, "modulate:a", 0.0, 0.25) + _active_tween.finished.connect(func() -> void: + if is_instance_valid(_panel): + _panel.visible = false) + + +func _build_layout() -> void: + _panel = PanelContainer.new() + _panel.visible = false + _panel.custom_minimum_size = Vector2(420, 54) + _panel.size = Vector2(420, 54) + _panel.add_theme_stylebox_override("panel", _panel_style()) + add_child(_panel) + + var margin := MarginContainer.new() + margin.add_theme_constant_override("margin_left", 18) + margin.add_theme_constant_override("margin_right", 18) + margin.add_theme_constant_override("margin_top", 9) + margin.add_theme_constant_override("margin_bottom", 9) + _panel.add_child(margin) + + _label = Label.new() + _label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER + _label.vertical_alignment = VERTICAL_ALIGNMENT_CENTER + _label.add_theme_font_size_override("font_size", 24) + _label.add_theme_color_override("font_color", Color(0.76, 0.98, 1.0)) + _label.text = "Main Phase" + margin.add_child(_label) + + +func _panel_style() -> StyleBoxFlat: + var style := StyleBoxFlat.new() + style.bg_color = Color(0.02, 0.05, 0.07, 0.88) + style.border_color = Color(0.18, 0.86, 0.94, 0.9) + style.border_width_left = 2 + style.border_width_top = 2 + style.border_width_right = 2 + style.border_width_bottom = 2 + style.corner_radius_top_left = 8 + style.corner_radius_top_right = 8 + style.corner_radius_bottom_left = 8 + style.corner_radius_bottom_right = 8 + return style diff --git a/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd.uid b/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd.uid new file mode 100644 index 0000000..78a5933 --- /dev/null +++ b/Client/origin-client/scenes/game/components/hud/turn_transition_banner.gd.uid @@ -0,0 +1 @@ +uid://kofrp8y3wdxj diff --git a/Client/origin-client/ui/icons/Archspirit Mask.png b/Client/origin-client/ui/icons/Archspirit Mask.png new file mode 100644 index 0000000..2bfa3a1 Binary files /dev/null and b/Client/origin-client/ui/icons/Archspirit Mask.png differ diff --git a/Client/origin-client/ui/icons/Archspirit Mask.png.import b/Client/origin-client/ui/icons/Archspirit Mask.png.import new file mode 100644 index 0000000..f4f8824 --- /dev/null +++ b/Client/origin-client/ui/icons/Archspirit Mask.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://moqusmwltqh2" +path="res://.godot/imported/Archspirit Mask.png-2419ae94642f2c5f2b01ddb0b6d03a01.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/Archspirit Mask.png" +dest_files=["res://.godot/imported/Archspirit Mask.png-2419ae94642f2c5f2b01ddb0b6d03a01.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/ui/icons/Archspirit Portrait Flair Background.png b/Client/origin-client/ui/icons/Archspirit Portrait Flair Background.png new file mode 100644 index 0000000..0ae75b7 Binary files /dev/null and b/Client/origin-client/ui/icons/Archspirit Portrait Flair Background.png differ diff --git a/Client/origin-client/ui/icons/Archspirit Portrait Flair Background.png.import b/Client/origin-client/ui/icons/Archspirit Portrait Flair Background.png.import new file mode 100644 index 0000000..bc1538f --- /dev/null +++ b/Client/origin-client/ui/icons/Archspirit Portrait Flair Background.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cle8yc2o6vd2t" +path="res://.godot/imported/Archspirit Portrait Flair Background.png-f91655e50fc27f4a142eaf29cfac3b90.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/Archspirit Portrait Flair Background.png" +dest_files=["res://.godot/imported/Archspirit Portrait Flair Background.png-f91655e50fc27f4a142eaf29cfac3b90.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/ui/icons/Archspirit Portrait Light Reflection.png b/Client/origin-client/ui/icons/Archspirit Portrait Light Reflection.png new file mode 100644 index 0000000..da302f0 Binary files /dev/null and b/Client/origin-client/ui/icons/Archspirit Portrait Light Reflection.png differ diff --git a/Client/origin-client/ui/icons/Archspirit Portrait Light Reflection.png.import b/Client/origin-client/ui/icons/Archspirit Portrait Light Reflection.png.import new file mode 100644 index 0000000..56d9db4 --- /dev/null +++ b/Client/origin-client/ui/icons/Archspirit Portrait Light Reflection.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://s4q1bm6vkawk" +path="res://.godot/imported/Archspirit Portrait Light Reflection.png-dff3b5ed6d5f882ade14eb49c0d5c272.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/Archspirit Portrait Light Reflection.png" +dest_files=["res://.godot/imported/Archspirit Portrait Light Reflection.png-dff3b5ed6d5f882ade14eb49c0d5c272.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/ui/icons/Archspirit Portrait Outline.png b/Client/origin-client/ui/icons/Archspirit Portrait Outline.png new file mode 100644 index 0000000..1845087 Binary files /dev/null and b/Client/origin-client/ui/icons/Archspirit Portrait Outline.png differ diff --git a/Client/origin-client/ui/icons/Archspirit Portrait Outline.png.import b/Client/origin-client/ui/icons/Archspirit Portrait Outline.png.import new file mode 100644 index 0000000..3f1ddca --- /dev/null +++ b/Client/origin-client/ui/icons/Archspirit Portrait Outline.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://duilm8ch2kr05" +path="res://.godot/imported/Archspirit Portrait Outline.png-bd3cf6cb640923a1af0e26e660403118.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/Archspirit Portrait Outline.png" +dest_files=["res://.godot/imported/Archspirit Portrait Outline.png-bd3cf6cb640923a1af0e26e660403118.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/ui/icons/Archspirit Portrait Shadow.png b/Client/origin-client/ui/icons/Archspirit Portrait Shadow.png new file mode 100644 index 0000000..1352f49 Binary files /dev/null and b/Client/origin-client/ui/icons/Archspirit Portrait Shadow.png differ diff --git a/Client/origin-client/ui/icons/Archspirit Portrait Shadow.png.import b/Client/origin-client/ui/icons/Archspirit Portrait Shadow.png.import new file mode 100644 index 0000000..0f697ab --- /dev/null +++ b/Client/origin-client/ui/icons/Archspirit Portrait Shadow.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btflxbnlm1mja" +path="res://.godot/imported/Archspirit Portrait Shadow.png-d4eab9e749bc9cc83d453e0507255f00.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/Archspirit Portrait Shadow.png" +dest_files=["res://.godot/imported/Archspirit Portrait Shadow.png-d4eab9e749bc9cc83d453e0507255f00.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