From 161d68dc1834ff51f2a284981f9e7806d8243dd4 Mon Sep 17 00:00:00 2001 From: ChickenStorm Date: Wed, 25 Nov 2020 17:50:53 +0100 Subject: [PATCH] combat report page --- ...t.svg-330cedff7866d8046d53870e9578b4bc.md5 | 3 + ....svg-330cedff7866d8046d53870e9578b4bc.stex | Bin 0 -> 2109 bytes audio/audio_scene_singleton.gd | 3 +- gui/circular_button.gd | 2 +- hud/hud_menu.gd | 11 +++ hud/hud_menu.tscn | 71 +++++++++++----- hud/hud_menu/combat_report/combat_report.tscn | 76 ++++++++++++++++++ hud/hud_menu/combat_report/report.tscn | 50 ++++++++++++ hud/menu_layer.gd | 2 + project.godot | 6 ++ resources/assets/2d/picto/general/combat.svg | 48 +++++++++++ .../assets/2d/picto/general/combat.svg.import | 34 ++++++++ 12 files changed, 286 insertions(+), 20 deletions(-) create mode 100644 .import/combat.svg-330cedff7866d8046d53870e9578b4bc.md5 create mode 100644 .import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex create mode 100644 hud/hud_menu/combat_report/combat_report.tscn create mode 100644 hud/hud_menu/combat_report/report.tscn create mode 100644 resources/assets/2d/picto/general/combat.svg create mode 100644 resources/assets/2d/picto/general/combat.svg.import diff --git a/.import/combat.svg-330cedff7866d8046d53870e9578b4bc.md5 b/.import/combat.svg-330cedff7866d8046d53870e9578b4bc.md5 new file mode 100644 index 00000000..3b6b135d --- /dev/null +++ b/.import/combat.svg-330cedff7866d8046d53870e9578b4bc.md5 @@ -0,0 +1,3 @@ +source_md5="272177dcc86949b0d6a987dcf04c362b" +dest_md5="bac091e0d109587c6d519c69aa2a1b17" + diff --git a/.import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex b/.import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex new file mode 100644 index 0000000000000000000000000000000000000000..1d51990a32599d3e19d48effc84e48c6a0e4fa24 GIT binary patch literal 2109 zcmV-D2*USAL{n5i0000$000040000001yWO0000X2mk<3PDdb#P)Px+*GWV{RCt`tn`^8cRTam7 z=RSh83bjQLYM^a|G(pk?L4hL7HHGrfpco~=#0FHb4b~7o5YbfB@bJ|bqSgw88sdj5 z7(gi|S~-J#P}-8HG*E0qZlT56mIg_0UvT;RVeh%jnX~uIp2xZEKba4+XYaNCYt5eh zSZhy9(gVOhf!_i9D1lb1Ri=8+AgOGVslb`ly(4;))X`tm2|75{-foD0K@w&$I${?){b*cHNK*tQG)f7 z&Yox|1Q>s|9+w6lljyvv$hK6bx-fp)$?xQGjRa*co z1C9?6`48Y+KmdKI2LkR6@{6Tl?se*4MWs^SD+o0N{pR`;S3Vq@TubV1eu0&W5hln{C)@K@l2>B4MRE#riw zuBW?Wb^XQa4#h!?Z5>3i4gh!sSW-eTz(v5{f$88U9^!;-9fzz_foH7FGPo1i>Qv~s z`Xy}$98uF4k#tto86vMuyWOVUZqJakwF0l_B@H;ar5t=8_yz81*M%PdzXtj%=-Q0oI_j&CwzbP@Il4z` z^))?;qP4&o6^H>01787-cvg)A7{k9>QU3Ngj^_e9Q!+b{ebEE13W*c4B(322z-r(_ z6$oC3iN{?F?9V)#jB(J_732c!vD|hh1quJe5w2eD?2^9E!3uiWlFS+qipzkffs;~Y zCt>y=RgK>dTm`)BTZQ^;@_v)q1{uK{fzJa+N{~$B{3wdn0H*^p?PvALin5MaE}N2q ztP?6nuM0+LBz;L{s;i0}lKxYp{g~z8 z-Wy-S3CkwX_+=Ane4rEhBt0?##{b^xnpoolop79r*v+rRN6-^nBm9@gk&PCa=Ah-vl1$(x#gTQj&hEfd5<00T? z;B8+b2ExaLpdOI*s-xSV06aP&<4Fp;67Wjt2*YRjb(sybi+=FOj2RdItj5yNFc zmBv*Zu!QEPxw=TE$+AgZ=emBLq(4Y{R?=O1FTOq~>A{BA_oFI4&r=o;>b-=>`y|~i z=`l&ak;yN1?jJG*pH_D=Vxy$#YJQhDCX@NOM)ksKF07K_{CuW-pQM?}ae!|>Ung$o z!{U_Q#XXS!x~Kd{DZO1|z!cAy^5N3oRz7|X+?Tq)&z3cbQ$6LUq;Ikgc)DQ{E<6t0 z<|x0-KI=6)ZB*wcaGdHTL5r|n(j;{cyva35;b;A-V2v^dJzXooX}}s_cEg^3C640@ z@dPz8!IWo#SqwP3!M)K#If}Q53BMPHRZ{K45Mf$6G=wM^Q8zSc}OcHi12H z9AAJr0M>y%FotKgmfJB$(Eite^23Qv9-!Yv%9i~X za~^MQ4due5!&fE+GiJy2hQO7;A91A6OW-?r zj^E}5GcvdXxT^+-*Wx(72(xqSPMk{WAY&_h9CNJn{WTOnfQjRIkwk4A192Aj17EAb z1XEQX_8*5 zIoIxzbh`X=y_aEL8!K~HO>Pe>^ZQR)!TBV(gIyOBz;rT{y-bvl5~@-1AZ9TNRnbnQ!J@7W!|(8 zPpCNu^s>=YeY{z_zJc#V;&{WM!x4Y9Z(3zi}@J&IfI3Lz;}Ul zj)!BIACkr#&q@>OH9Wm?GbUf@!k>WU$x3hlxD~VUI0bkS^N-CYPvc-RX+pj10Xe<0 n5BLV~E#RXV+aAJ%;NJZ|=jY(dSMx#300000NkvXXu0mjf<-z(q literal 0 HcmV?d00001 diff --git a/audio/audio_scene_singleton.gd b/audio/audio_scene_singleton.gd index f1cba739..5df745ec 100644 --- a/audio/audio_scene_singleton.gd +++ b/audio/audio_scene_singleton.gd @@ -1,8 +1,9 @@ +class_name AudioSceneSingleton extends Node - onready var click_sound = $AudioStackingClick + func play_click(): if click_sound != null: click_sound.play_sound() diff --git a/gui/circular_button.gd b/gui/circular_button.gd index 43f88fdd..5bb43173 100644 --- a/gui/circular_button.gd +++ b/gui/circular_button.gd @@ -232,7 +232,7 @@ func _draw_texture(): var center = rect_size / 2.0 var middle_angle = deg2rad(angle_start + angle_end) / 2.0 var position = get_vector_radial(middle_angle, (radius_out + radius_in) / 2.0 * rect_size / 2.0) - var rect_rexture = Rect2(center - texture_size / 2.0 + position,texture_size) + var rect_rexture = Rect2(center - texture_size / 2.0 + position, texture_size) draw_texture_rect(texture,rect_rexture,false) diff --git a/hud/hud_menu.gd b/hud/hud_menu.gd index caaa2d2f..0ab17e6c 100644 --- a/hud/hud_menu.gd +++ b/hud/hud_menu.gd @@ -13,6 +13,7 @@ onready var button_container_right = $HBoxContainer/ButtonContainerRight onready var menu_button = $HBoxContainer/ButtonContainerRight/SelectablePanelContainerMenu onready var popup_menu = $HBoxContainer/ButtonContainerRight/SelectablePanelContainerMenu/PopupMenu onready var finance_button = $HBoxContainer/ButtonContainerRight/SelectablePanelContainerFinance +onready var combat_button = $HBoxContainer/ButtonContainerRight/CombatReport func _ready(): @@ -24,6 +25,7 @@ func _ready(): popup_menu.connect("id_pressed", self, "_on_id_pressed") texture_rect.texture = _game_data.player.faction.banner finance_button.connect("pressed", self, "_on_finance_menu_pressed") + combat_button.connect("pressed", self, "_on_combat_button_pressed") func set_menu_layer(node): @@ -83,3 +85,12 @@ func _on_finance_menu_pressed(): func _on_menu_layer_menu_closed(menu_name): if menu_name == "menu_finance": finance_button.is_selected = false + elif menu_name == "menu_combat_report": + combat_button.is_selected = false + + +func _on_combat_button_pressed(): + if combat_button.is_selected: + menu_layer.request_menu("menu_combat_report") + else: + menu_layer.close_menu("menu_combat_report") diff --git a/hud/hud_menu.tscn b/hud/hud_menu.tscn index ed1a248d..63d40598 100644 --- a/hud/hud_menu.tscn +++ b/hud/hud_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://hud/hud_menu.gd" type="Script" id=1] [ext_resource path="res://.import/banner.png-74e88a02fde8130f5f843aba121c4815.res" type="Texture" id=2] @@ -6,7 +6,7 @@ [ext_resource path="res://hud/rounded_selectable_panel_left.gd" type="Script" id=4] [ext_resource path="res://hud/rounded_selectable_panel_right.gd" type="Script" id=5] -[sub_resource type="Image" id=6] +[sub_resource type="Image" id=7] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), "format": "LumAlpha8", @@ -18,7 +18,7 @@ data = { [sub_resource type="ImageTexture" id=2] flags = 4 flags = 4 -image = SubResource( 6 ) +image = SubResource( 7 ) size = Vector2( 16, 16 ) [sub_resource type="StyleBoxTexture" id=3] @@ -31,10 +31,14 @@ margin_bottom = 2.0 [sub_resource type="StreamTexture" id=4] flags = 4 -load_path = "res://.import/money_64px.png-14695073b2b7bd4dbc437a5f1f5458b7.stex" +load_path = "res://.import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex" [sub_resource type="StreamTexture" id=5] flags = 4 +load_path = "res://.import/money_64px.png-14695073b2b7bd4dbc437a5f1f5458b7.stex" + +[sub_resource type="StreamTexture" id=6] +flags = 4 load_path = "res://.import/G_P_Logout_64px.png-96df486bc5e14ad2595297b93d598753.stex" [node name="HudMenu" type="VBoxContainer"] @@ -69,10 +73,6 @@ margin_bottom = 54.0 size_flags_horizontal = 3 custom_styles/panel = SubResource( 3 ) script = ExtResource( 4 ) -base_style = null -hover_style = null -selected_style = null -focus_style = null [node name="SelectablePanelContainer" type="PanelContainer" parent="HBoxContainer/ButtonContainerLeft"] margin_left = 260.0 @@ -101,8 +101,43 @@ mouse_filter = 2 size_flags_horizontal = 3 custom_constants/separation = 1 +[node name="CombatReport" type="PanelContainer" parent="HBoxContainer/ButtonContainerRight"] +margin_right = 172.0 +margin_bottom = 54.0 +size_flags_horizontal = 3 +custom_styles/panel = SubResource( 3 ) +script = ExtResource( 3 ) + +[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/ButtonContainerRight/CombatReport"] +margin_left = 2.0 +margin_top = 2.0 +margin_right = 170.0 +margin_bottom = 52.0 +mouse_filter = 2 +custom_constants/margin_right = 10 +custom_constants/margin_top = 10 +custom_constants/margin_left = 10 +custom_constants/margin_bottom = 10 + +[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/ButtonContainerRight/CombatReport/MarginContainer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 158.0 +margin_bottom = 40.0 +mouse_filter = 2 +alignment = 1 + +[node name="TextureRect" type="TextureRect" parent="HBoxContainer/ButtonContainerRight/CombatReport/MarginContainer/HBoxContainer"] +margin_right = 148.0 +margin_bottom = 30.0 +size_flags_horizontal = 3 +texture = SubResource( 4 ) +expand = true +stretch_mode = 6 + [node name="SelectablePanelContainerFinance" type="PanelContainer" parent="HBoxContainer/ButtonContainerRight"] -margin_right = 259.0 +margin_left = 173.0 +margin_right = 346.0 margin_bottom = 54.0 size_flags_horizontal = 3 custom_styles/panel = SubResource( 3 ) @@ -111,7 +146,7 @@ script = ExtResource( 3 ) [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerFinance"] margin_left = 2.0 margin_top = 2.0 -margin_right = 257.0 +margin_right = 171.0 margin_bottom = 52.0 mouse_filter = 2 custom_constants/margin_right = 10 @@ -122,21 +157,21 @@ custom_constants/margin_bottom = 10 [node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerFinance/MarginContainer"] margin_left = 10.0 margin_top = 10.0 -margin_right = 245.0 +margin_right = 159.0 margin_bottom = 40.0 mouse_filter = 2 alignment = 1 [node name="TextureRect" type="TextureRect" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerFinance/MarginContainer/HBoxContainer"] -margin_right = 235.0 +margin_right = 149.0 margin_bottom = 30.0 size_flags_horizontal = 3 -texture = SubResource( 4 ) +texture = SubResource( 5 ) expand = true stretch_mode = 6 [node name="SelectablePanelContainerMenu" type="PanelContainer" parent="HBoxContainer/ButtonContainerRight"] -margin_left = 260.0 +margin_left = 347.0 margin_right = 520.0 margin_bottom = 54.0 size_flags_horizontal = 3 @@ -150,7 +185,7 @@ focus_style = null [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerMenu"] margin_left = 2.0 margin_top = 2.0 -margin_right = 258.0 +margin_right = 171.0 margin_bottom = 52.0 mouse_filter = 2 custom_constants/margin_right = 10 @@ -161,16 +196,16 @@ custom_constants/margin_bottom = 10 [node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerMenu/MarginContainer"] margin_left = 10.0 margin_top = 10.0 -margin_right = 246.0 +margin_right = 159.0 margin_bottom = 40.0 mouse_filter = 2 alignment = 1 [node name="TextureRect" type="TextureRect" parent="HBoxContainer/ButtonContainerRight/SelectablePanelContainerMenu/MarginContainer/HBoxContainer"] -margin_right = 236.0 +margin_right = 149.0 margin_bottom = 30.0 size_flags_horizontal = 3 -texture = SubResource( 5 ) +texture = SubResource( 6 ) expand = true stretch_mode = 6 diff --git a/hud/hud_menu/combat_report/combat_report.tscn b/hud/hud_menu/combat_report/combat_report.tscn new file mode 100644 index 00000000..8748206c --- /dev/null +++ b/hud/hud_menu/combat_report/combat_report.tscn @@ -0,0 +1,76 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://gui/menu/menu_container.gd" type="Script" id=1] +[ext_resource path="res://gui/menu/menu_header.tscn" type="PackedScene" id=2] +[ext_resource path="res://gui/menu/menu_header.gd" type="Script" id=3] +[ext_resource path="res://gui/menu/menu_body.gd" type="Script" id=4] + +[sub_resource type="Image" id=4] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 16, +"mipmaps": false, +"width": 16 +} + +[sub_resource type="ImageTexture" id=2] +flags = 4 +flags = 4 +image = SubResource( 4 ) +size = Vector2( 16, 16 ) + +[sub_resource type="StyleBoxTexture" id=3] +texture = SubResource( 2 ) +region_rect = Rect2( 0, 0, 16, 16 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[node name="CombatReportMenu" type="VBoxContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_constants/separation = 0 +script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MenuHeader" type="PanelContainer" parent="." instance=ExtResource( 2 )] +margin_right = 1920.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 0, 31 ) +custom_styles/panel = SubResource( 3 ) +script = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} +text = "no_translate.menu_title" + +[node name="MenuBody" type="PanelContainer" parent="."] +show_behind_parent = true +margin_top = 31.0 +margin_right = 1920.0 +margin_bottom = 1080.0 +size_flags_vertical = 3 +script = ExtResource( 4 ) + +[node name="Body" type="VBoxContainer" parent="MenuBody"] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 1913.0 +margin_bottom = 1042.0 +size_flags_vertical = 3 + +[node name="ScrollContainer" type="ScrollContainer" parent="MenuBody/Body"] +margin_right = 1906.0 +margin_bottom = 1035.0 +size_flags_vertical = 3 +scroll_horizontal_enabled = false + +[node name="VBoxContainer" type="VBoxContainer" parent="MenuBody/Body/ScrollContainer"] +margin_right = 1906.0 +margin_bottom = 1035.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 diff --git a/hud/hud_menu/combat_report/report.tscn b/hud/hud_menu/combat_report/report.tscn new file mode 100644 index 00000000..1ecd26df --- /dev/null +++ b/hud/hud_menu/combat_report/report.tscn @@ -0,0 +1,50 @@ +[gd_scene format=2] + +[node name="Report" type="PanelContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginContainer" type="MarginContainer" parent="."] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 1913.0 +margin_bottom = 1073.0 + +[node name="Container" type="VBoxContainer" parent="MarginContainer"] +margin_right = 1906.0 +margin_bottom = 1066.0 + +[node name="Header" type="PanelContainer" parent="MarginContainer/Container"] +margin_right = 1906.0 +margin_bottom = 46.0 + +[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/Container/Header"] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 1899.0 +margin_bottom = 39.0 +alignment = 1 + +[node name="TextureRect" type="TextureRect" parent="MarginContainer/Container/Header/HBoxContainer"] +margin_right = 32.0 +margin_bottom = 32.0 +rect_min_size = Vector2( 32, 32 ) +expand = true +stretch_mode = 6 + +[node name="Label" type="Label" parent="MarginContainer/Container/Header/HBoxContainer"] +margin_left = 36.0 +margin_top = 9.0 +margin_right = 1892.0 +margin_bottom = 23.0 +size_flags_horizontal = 3 +align = 1 +valign = 1 + +[node name="Body" type="VBoxContainer" parent="MarginContainer/Container"] +margin_top = 50.0 +margin_right = 1906.0 +margin_bottom = 50.0 diff --git a/hud/menu_layer.gd b/hud/menu_layer.gd index 19c779df..3f6bcaa5 100644 --- a/hud/menu_layer.gd +++ b/hud/menu_layer.gd @@ -9,6 +9,7 @@ const MENU_HANGAR = preload("res://hud/system/buildings/hangar.tscn") const MENU_CONSTRUCTION = preload("res://hud/system/buildings/contruction/construction_menu.tscn") const MENU_FINANCE = preload("res://hud/hud_menu/finance/finance_menu.tscn") const MENU_OPTIONS = preload("res://hud/hud_menu/options/menu_option_hud.tscn") +const MENU_COMBAT_REPORT = preload("res://hud/hud_menu/combat_report/combat_report.tscn") var menus = { "menu_fleet" : MENU_FLEET.instance(), @@ -16,6 +17,7 @@ var menus = { "menu_construction" : MENU_CONSTRUCTION.instance(), "menu_finance" : MENU_FINANCE.instance(), "menu_options" : MENU_OPTIONS.instance(), + "menu_combat_report" : MENU_COMBAT_REPORT.instance(), } diff --git a/project.godot b/project.godot index c990c737..54d13a20 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,11 @@ _global_script_classes=[ { "path": "res://audio/audio_resource.gd" }, { "base": "Node", +"class": "AudioSceneSingleton", +"language": "GDScript", +"path": "res://audio/audio_scene_singleton.gd" +}, { +"base": "Node", "class": "AudioStacking", "language": "GDScript", "path": "res://audio/audio_stacking.gd" @@ -296,6 +301,7 @@ _global_script_classes=[ { } ] _global_script_class_icons={ "AudioResource": "", +"AudioSceneSingleton": "", "AudioStacking": "res://resources/editor/audio_stacking.svg", "AudioStacking2D": "res://resources/editor/audio_stacking_2d.svg", "AudioStacking3D": "res://resources/editor/audio_stacking_3d.svg", diff --git a/resources/assets/2d/picto/general/combat.svg b/resources/assets/2d/picto/general/combat.svg new file mode 100644 index 00000000..8c71f711 --- /dev/null +++ b/resources/assets/2d/picto/general/combat.svg @@ -0,0 +1,48 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/resources/assets/2d/picto/general/combat.svg.import b/resources/assets/2d/picto/general/combat.svg.import new file mode 100644 index 00000000..3db44be7 --- /dev/null +++ b/resources/assets/2d/picto/general/combat.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/assets/2d/picto/general/combat.svg" +dest_files=[ "res://.import/combat.svg-330cedff7866d8046d53870e9578b4bc.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0