Work on item display windows and variant coloring for portraits and sprites.

This commit is contained in:
2025-08-30 08:01:48 -04:00
parent b93889e914
commit 149ee993dc
84 changed files with 1526 additions and 43 deletions

View File

@@ -4,11 +4,11 @@
[ext_resource type="Texture2D" uid="uid://cjjtgrr56guj0" path="res://graphics/ui/item-slot.png" id="2_dxjvd"]
[ext_resource type="Texture2D" uid="uid://clrvwaqb61lpv" path="res://graphics/items/pitchfork.png" id="3_tsl8r"]
[node name="Item Display Window" type="Window"]
[node name="Item Display Window" type="Popup"]
oversampling_override = 1.0
size = Vector2i(300, 400)
borderless = true
popup_window = true
visible = true
always_on_top = true
script = ExtResource("1_n2g4t")
[node name="Panel" type="PanelContainer" parent="."]
@@ -47,12 +47,13 @@ layout_mode = 2
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
[node name="TextureRect2" type="TextureRect" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/MarginContainer"]
[node name="SlotBox" type="TextureRect" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/MarginContainer"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
texture = ExtResource("2_dxjvd")
[node name="TextureRect" type="TextureRect" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/MarginContainer"]
[node name="Image" type="TextureRect" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/MarginContainer"]
unique_name_in_owner = true
layout_mode = 2
texture = ExtResource("3_tsl8r")
stretch_mode = 3
@@ -61,23 +62,28 @@ stretch_mode = 3
layout_mode = 2
theme_override_constants/separation = 0
[node name="Label" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
[node name="ItemName" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "ITEM NAME"
[node name="Label2" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
[node name="ItemType" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "ITEM TYPE"
[node name="Label3" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
[node name="ItemGrade" type="Label" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "ITEM GRADE"
[node name="Label2" type="Label" parent="Panel/MarginContainer/VBoxContainer"]
[node name="PrimaryStat" type="Label" parent="Panel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "Primary Stat Goes Here"
[node name="Label3" type="Label" parent="Panel/MarginContainer/VBoxContainer"]
[node name="SecondaryStats" type="Label" parent="Panel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 60)
layout_mode = 2
text = "Secondary Stats Go Here"
@@ -85,7 +91,17 @@ text = "Secondary Stats Go Here"
[node name="HSeparator" type="HSeparator" parent="Panel/MarginContainer/VBoxContainer"]
layout_mode = 2
[node name="Label" type="Label" parent="Panel/MarginContainer/VBoxContainer"]
[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 5
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5
[node name="Brief" type="Label" parent="Panel/MarginContainer/VBoxContainer/MarginContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 150)
layout_mode = 2
text = "Brief Description Goes Here"
autowrap_mode = 2
[connection signal="gui_input" from="Panel/MarginContainer/VBoxContainer/ColorRect" to="." method="_on_drag_region_gui_input"]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=3 uid="uid://bktxswsjql86p"]
[gd_scene load_steps=15 format=3 uid="uid://bktxswsjql86p"]
[ext_resource type="Script" uid="uid://ccsiubi5y75qg" path="res://scripts/npc_profile_window.gd" id="1_4xbne"]
[ext_resource type="Texture2D" uid="uid://cbt6po52ad37x" path="res://external/profile-window.png" id="2_s0l16"]
@@ -11,7 +11,6 @@
[ext_resource type="Texture2D" uid="uid://d1btg2hfnjx6r" path="res://graphics/ui/inventory-heading.png" id="8_1nmd1"]
[ext_resource type="Texture2D" uid="uid://blt2b7f6iqb8j" path="res://graphics/questview/test-char.png" id="10_tiew1"]
[ext_resource type="Script" uid="uid://cw6yo5opbrpr8" path="res://scripts/item_slot.gd" id="11_tiew1"]
[ext_resource type="Texture2D" uid="uid://bgjiahbc4jpwd" path="res://graphics/items/rags.png" id="12_ktflt"]
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_ktflt"]
blend_mode = 3
@@ -30,7 +29,7 @@ fill_to = Vector2(0, 1)
transparent_bg = true
oversampling_override = 1.0
initial_position = 1
size = Vector2i(707, 857)
size = Vector2i(707, 884)
wrap_controls = true
unresizable = true
borderless = true
@@ -466,6 +465,7 @@ offset_bottom = 183.0
texture = ExtResource("10_tiew1")
[node name="GearGrid" type="GridContainer" parent="."]
unique_name_in_owner = true
anchors_preset = -1
offset_left = 241.0
offset_top = 545.0
@@ -503,6 +503,7 @@ offset_bottom = 509.0
texture = ExtResource("8_1nmd1")
[node name="InventoryGrid" type="GridContainer" parent="."]
unique_name_in_owner = true
anchors_preset = -1
offset_left = 325.0
offset_top = 513.0
@@ -527,70 +528,313 @@ offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
texture = ExtResource("12_ktflt")
[node name="TextureRect2" type="TextureRect" parent="InventoryGrid"]
layout_mode = 2
[node name="ItemSlot" type="Control" parent="InventoryGrid/ItemSlot"]
custom_minimum_size = Vector2(71, 71)
anchors_preset = 0
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot/ItemSlot"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect3" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot/ItemSlot"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot2" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot2"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect4" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot2"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot3" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot3"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect5" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot3"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot4" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot4"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect6" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot4"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot5" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot5"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect7" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot5"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot6" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot6"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect8" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot6"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot7" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot7"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect9" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot7"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot8" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot8"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect10" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot8"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot9" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot9"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect11" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot9"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot10" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot10"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect12" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot10"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot11" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot11"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect13" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot11"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot12" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot12"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect14" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot12"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot13" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot13"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect15" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot13"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot14" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot14"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="TextureRect16" type="TextureRect" parent="InventoryGrid"]
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot14"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot15" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot15"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot15"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[node name="ItemSlot16" type="Control" parent="InventoryGrid"]
custom_minimum_size = Vector2(71, 71)
layout_mode = 2
script = ExtResource("11_tiew1")
[node name="Square" type="TextureRect" parent="InventoryGrid/ItemSlot16"]
layout_mode = 0
offset_right = 71.0
offset_bottom = 71.0
texture = ExtResource("7_ktflt")
[node name="Item" type="TextureRect" parent="InventoryGrid/ItemSlot16"]
layout_mode = 0
offset_left = 3.0
offset_top = 3.0
offset_right = 67.0
offset_bottom = 67.0
[connection signal="close_requested" from="." to="." method="_on_close_requested"]
[connection signal="focus_exited" from="." to="." method="_on_close_requested"]
[connection signal="pressed" from="CloseButton" to="." method="_on_close_requested"]
[connection signal="gui_input" from="DragRegion" to="." method="_on_drag_region_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot" to="InventoryGrid/ItemSlot" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot/ItemSlot" to="InventoryGrid/ItemSlot/ItemSlot" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot2" to="InventoryGrid/ItemSlot2" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot3" to="InventoryGrid/ItemSlot3" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot4" to="InventoryGrid/ItemSlot4" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot5" to="InventoryGrid/ItemSlot5" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot6" to="InventoryGrid/ItemSlot6" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot7" to="InventoryGrid/ItemSlot7" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot8" to="InventoryGrid/ItemSlot8" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot9" to="InventoryGrid/ItemSlot9" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot10" to="InventoryGrid/ItemSlot10" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot11" to="InventoryGrid/ItemSlot11" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot12" to="InventoryGrid/ItemSlot12" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot13" to="InventoryGrid/ItemSlot13" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot14" to="InventoryGrid/ItemSlot14" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot15" to="InventoryGrid/ItemSlot15" method="_on_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot16" to="InventoryGrid/ItemSlot16" method="_on_gui_input"]

View File

@@ -819,7 +819,7 @@ offset_right = 67.0
offset_bottom = 67.0
[connection signal="close_requested" from="." to="." method="_on_close_requested"]
[connection signal="focus_exited" from="." to="." method="_on_close_requested"]
[connection signal="focus_exited" from="." to="." method="_on_focus_exited"]
[connection signal="pressed" from="CloseButton" to="." method="_on_close_requested"]
[connection signal="gui_input" from="DragRegion" to="." method="_on_drag_region_gui_input"]
[connection signal="gui_input" from="InventoryGrid/ItemSlot" to="InventoryGrid/ItemSlot" method="_on_gui_input"]

View File

@@ -33,10 +33,8 @@ expand_mode = 1
[node name="Portrait" type="TextureRect" parent="PanelContainer/PortraitFrame"]
unique_name_in_owner = true
layout_mode = 0
offset_left = -34.0
offset_top = -8.0
offset_right = 94.0
offset_bottom = 120.0
offset_right = 64.0
offset_bottom = 64.0
texture = ExtResource("4_ileh1")
expand_mode = 1