Refactor multi-resource UI and transfers
This commit is contained in:
parent
af5e08e5a1
commit
8231e165ff
20 changed files with 648 additions and 435 deletions
249
Main.tscn
249
Main.tscn
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=23 format=3]
|
||||
[gd_scene load_steps=29 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://Starfield.gd" id="1"]
|
||||
[ext_resource type="Script" path="res://Fleet.gd" id="2"]
|
||||
|
|
@ -25,6 +25,8 @@
|
|||
[ext_resource type="Script" path="res://ResourceBar.gd" id="24"]
|
||||
[ext_resource type="Script" path="res://GasCounter.gd" id="25"]
|
||||
[ext_resource type="Script" path="res://VesselDeliveryField.gd" id="26"]
|
||||
[ext_resource type="Script" path="res://ResourceTransferList.gd" id="27"]
|
||||
[ext_resource type="Script" path="res://GasCargoCounter.gd" id="28"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="1"]
|
||||
shader = ExtResource("5")
|
||||
|
|
@ -90,48 +92,58 @@ layer = 1
|
|||
[node name="ResourceCounter" type="Control" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 28
|
||||
offset_top = 24
|
||||
offset_top = 38
|
||||
offset_right = 320
|
||||
offset_bottom = 92
|
||||
offset_bottom = 82
|
||||
script = ExtResource("16")
|
||||
digit_height = 60.0
|
||||
digit_height = 38.0
|
||||
|
||||
[node name="OreCaption" type="Label" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 28
|
||||
offset_top = 22
|
||||
offset_right = 120
|
||||
offset_bottom = 48
|
||||
offset_top = 6
|
||||
offset_right = 220
|
||||
offset_bottom = 34
|
||||
theme_override_font_sizes/font_size = 18
|
||||
text = "ORE"
|
||||
theme_override_colors/font_color = Color(0.55, 0.78, 0.86, 1)
|
||||
text = "BANKED"
|
||||
|
||||
[node name="GasCounter" type="Control" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 294
|
||||
offset_top = 24
|
||||
offset_right = 468
|
||||
offset_bottom = 92
|
||||
script = ExtResource("25")
|
||||
digit_height = 60.0
|
||||
|
||||
[node name="GasCaption" type="Label" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 294
|
||||
offset_top = 22
|
||||
offset_right = 380
|
||||
offset_bottom = 48
|
||||
theme_override_font_sizes/font_size = 18
|
||||
theme_override_colors/font_color = Color(0.85, 0.52, 1, 1)
|
||||
text = "GAS"
|
||||
|
||||
[node name="CargoCounter" type="Control" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 28
|
||||
offset_top = 96
|
||||
offset_right = 320
|
||||
offset_bottom = 146
|
||||
offset_bottom = 140
|
||||
script = ExtResource("25")
|
||||
digit_height = 38.0
|
||||
|
||||
[node name="GasCaption" type="Label" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 356
|
||||
offset_top = 6
|
||||
offset_right = 620
|
||||
offset_bottom = 34
|
||||
theme_override_font_sizes/font_size = 18
|
||||
theme_override_colors/font_color = Color(1, 0.78, 0.25, 1)
|
||||
text = "FLEET HOLD"
|
||||
|
||||
[node name="CargoCounter" type="Control" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 356
|
||||
offset_top = 38
|
||||
offset_right = 696
|
||||
offset_bottom = 82
|
||||
script = ExtResource("22")
|
||||
digit_height = 42.0
|
||||
digit_height = 38.0
|
||||
|
||||
[node name="GasCargoCounter" type="Control" parent="UI"]
|
||||
mouse_filter = 2
|
||||
offset_left = 356
|
||||
offset_top = 96
|
||||
offset_right = 696
|
||||
offset_bottom = 140
|
||||
script = ExtResource("28")
|
||||
digit_height = 38.0
|
||||
|
||||
[node name="PlanetNameLabel" type="Label" parent="UI"]
|
||||
visible = false
|
||||
|
|
@ -947,10 +959,11 @@ horizontal_alignment = 1
|
|||
|
||||
[node name="Bar" type="Control" parent="UI/LabMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_left = 24
|
||||
offset_top = 180
|
||||
offset_right = 520
|
||||
offset_bottom = 260
|
||||
offset_right = -24
|
||||
offset_bottom = 264
|
||||
script = ExtResource("24")
|
||||
|
||||
[node name="VesselA" type="Control" parent="UI/LabMenu"]
|
||||
|
|
@ -1004,7 +1017,7 @@ anchor_left = 0.5
|
|||
anchor_right = 0.5
|
||||
offset_left = -330
|
||||
offset_right = -130
|
||||
offset_top = 376
|
||||
offset_top = 400
|
||||
offset_bottom = 460
|
||||
theme_override_font_sizes/font_size = 22
|
||||
horizontal_alignment = 1
|
||||
|
|
@ -1258,7 +1271,7 @@ mouse_filter = 2
|
|||
offset_left = 24
|
||||
offset_top = 180
|
||||
offset_right = 520
|
||||
offset_bottom = 260
|
||||
offset_bottom = 264
|
||||
script = ExtResource("24")
|
||||
|
||||
[node name="StatusLabel" type="Label" parent="UI/CraftMenu"]
|
||||
|
|
@ -1467,142 +1480,29 @@ offset_left = 24
|
|||
offset_top = 36
|
||||
offset_right = -200
|
||||
offset_bottom = 166
|
||||
text = "Move ore"
|
||||
text = "Transfer cargo"
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="Bar" type="Control" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
offset_left = 24
|
||||
offset_top = 180
|
||||
offset_right = 520
|
||||
offset_bottom = 260
|
||||
script = ExtResource("24")
|
||||
|
||||
[node name="StatusLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_left = 24
|
||||
offset_top = 274
|
||||
offset_top = 184
|
||||
offset_right = -24
|
||||
offset_bottom = 396
|
||||
theme_override_font_sizes/font_size = 34
|
||||
offset_bottom = 284
|
||||
theme_override_font_sizes/font_size = 30
|
||||
autowrap_mode = 2
|
||||
text = ""
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToBuildingLabel" type="Label" parent="UI/TransferMenu"]
|
||||
[node name="ResourceList" type="Control" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_left = 24
|
||||
offset_top = 376
|
||||
offset_top = 294
|
||||
offset_right = -24
|
||||
offset_bottom = 426
|
||||
theme_override_font_sizes/font_size = 28
|
||||
text = ""
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToBuildingBatchButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -184
|
||||
offset_right = -36
|
||||
offset_top = 438
|
||||
offset_bottom = 586
|
||||
script = ExtResource("10")
|
||||
icon = 3
|
||||
glow_color = Color(0.45, 0.9, 0.55, 1)
|
||||
|
||||
[node name="ToBuildingBatchLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -230
|
||||
offset_right = 10
|
||||
offset_top = 592
|
||||
offset_bottom = 638
|
||||
theme_override_font_sizes/font_size = 24
|
||||
text = ""
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToBuildingAllButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -180
|
||||
offset_right = -32
|
||||
offset_top = 438
|
||||
offset_bottom = 586
|
||||
script = ExtResource("10")
|
||||
icon = 3
|
||||
glow_color = Color(0.45, 0.9, 0.55, 1)
|
||||
|
||||
[node name="ToBuildingAllLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -230
|
||||
offset_right = 10
|
||||
offset_top = 592
|
||||
offset_bottom = 638
|
||||
theme_override_font_sizes/font_size = 24
|
||||
text = "Unload all"
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToFleetLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_left = 24
|
||||
offset_top = 680
|
||||
offset_right = -24
|
||||
offset_bottom = 730
|
||||
theme_override_font_sizes/font_size = 28
|
||||
text = ""
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToFleetBatchButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -184
|
||||
offset_right = -36
|
||||
offset_top = 756
|
||||
offset_bottom = 904
|
||||
script = ExtResource("10")
|
||||
icon = 4
|
||||
glow_color = Color(1, 0.78, 0.25, 1)
|
||||
|
||||
[node name="ToFleetBatchLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -230
|
||||
offset_right = 10
|
||||
offset_top = 910
|
||||
offset_bottom = 962
|
||||
theme_override_font_sizes/font_size = 30
|
||||
text = ""
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ToFleetAllButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = 32
|
||||
offset_right = 180
|
||||
offset_top = 438
|
||||
offset_bottom = 586
|
||||
script = ExtResource("10")
|
||||
icon = 4
|
||||
glow_color = Color(1, 0.78, 0.25, 1)
|
||||
|
||||
[node name="ToFleetAllLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = 10
|
||||
offset_right = 230
|
||||
offset_top = 592
|
||||
offset_bottom = 638
|
||||
theme_override_font_sizes/font_size = 24
|
||||
text = "Load all"
|
||||
horizontal_alignment = 1
|
||||
offset_bottom = 1080
|
||||
script = ExtResource("27")
|
||||
|
||||
[node name="CloseButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 1.0
|
||||
|
|
@ -1615,37 +1515,17 @@ script = ExtResource("10")
|
|||
icon = 1
|
||||
glow_color = Color(1, 0.78, 0.25, 1)
|
||||
|
||||
[node name="GasToBuildingButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -180
|
||||
offset_right = -32
|
||||
offset_top = 742
|
||||
offset_bottom = 890
|
||||
script = ExtResource("10")
|
||||
icon = 25
|
||||
glow_color = Color(0.85, 0.52, 1, 1)
|
||||
|
||||
[node name="GasToFleetButton" type="Control" parent="UI/TransferMenu"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = 32
|
||||
offset_right = 180
|
||||
offset_top = 742
|
||||
offset_bottom = 890
|
||||
script = ExtResource("10")
|
||||
icon = 25
|
||||
glow_color = Color(0.85, 0.52, 1, 1)
|
||||
|
||||
[node name="GasTransferLabel" type="Label" parent="UI/TransferMenu"]
|
||||
[node name="HintLabel" type="Label" parent="UI/TransferMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_top = 896
|
||||
offset_bottom = 942
|
||||
text = "Unload all Load all"
|
||||
offset_left = 24
|
||||
offset_top = 1092
|
||||
offset_right = -24
|
||||
offset_bottom = 1150
|
||||
text = "Arrows move everything available on that side"
|
||||
horizontal_alignment = 1
|
||||
theme_override_colors/font_color = Color(0.85, 0.52, 1, 1)
|
||||
theme_override_font_sizes/font_size = 22
|
||||
theme_override_colors/font_color = Color(0.55, 0.7, 0.78, 1)
|
||||
theme_override_font_sizes/font_size = 20
|
||||
|
||||
[node name="FormationMenu" type="Control" parent="UI" groups=["modal_menus"]]
|
||||
visible = false
|
||||
|
|
@ -1755,10 +1635,11 @@ horizontal_alignment = 1
|
|||
|
||||
[node name="Bar" type="Control" parent="UI/SkillMenu"]
|
||||
mouse_filter = 2
|
||||
anchor_right = 1.0
|
||||
offset_left = 24.0
|
||||
offset_top = 180.0
|
||||
offset_right = 520.0
|
||||
offset_bottom = 260.0
|
||||
offset_right = -24.0
|
||||
offset_bottom = 264.0
|
||||
script = ExtResource("24")
|
||||
|
||||
[node name="Tree" type="Control" parent="UI/SkillMenu"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue