diff --git a/assets/blankIcon.png b/assets/blankIcon.png new file mode 100644 index 0000000..34b0522 Binary files /dev/null and b/assets/blankIcon.png differ diff --git a/assets/blankIcon.png.import b/assets/blankIcon.png.import new file mode 100644 index 0000000..7f2feca --- /dev/null +++ b/assets/blankIcon.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbu7dofi4u038" +path="res://.godot/imported/blankIcon.png-8fc835676acf830316155cd070dc4a11.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/blankIcon.png" +dest_files=["res://.godot/imported/blankIcon.png-8fc835676acf830316155cd070dc4a11.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/assets/sellIcon.png b/assets/sellIcon.png new file mode 100644 index 0000000..0a524a4 Binary files /dev/null and b/assets/sellIcon.png differ diff --git a/assets/sellIcon.png.import b/assets/sellIcon.png.import new file mode 100644 index 0000000..f48f202 --- /dev/null +++ b/assets/sellIcon.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dokuqh6jq4eti" +path="res://.godot/imported/sellIcon.png-bbb1034de3ddd6ea52c144d6369cc78c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sellIcon.png" +dest_files=["res://.godot/imported/sellIcon.png-bbb1034de3ddd6ea52c144d6369cc78c.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/inv_system/item_data.gd b/inv_system/item_data.gd index 08f7243..d79da92 100644 --- a/inv_system/item_data.gd +++ b/inv_system/item_data.gd @@ -11,3 +11,4 @@ class_name ItemData @export var can_buy : bool = false @export var description : String = "" @export var rarity : String = "" +@export var sell_icon : bool = false diff --git a/inv_system/item_slot.gd b/inv_system/item_slot.gd index 77eea5c..41edfda 100644 --- a/inv_system/item_slot.gd +++ b/inv_system/item_slot.gd @@ -4,6 +4,8 @@ class_name ItemSlot @export var icon : TextureRect @export var item: ItemData @export var label : Label +@export var botnet_icon : Control +@export var sell_icon : Control var type : String var block_taking : bool = false const DEFAULT = preload("uid://hgjmkwj0dbqr") @@ -17,6 +19,8 @@ func update_ui(): if not item: icon.texture = null label.text = "" + sell_icon.visible = false + botnet_icon.visible = false add_theme_stylebox_override("panel",DEFAULT) return @@ -28,6 +32,8 @@ func update_ui(): icon.texture = item.icon #tooltip_text = item.item_name label.text = item.value + botnet_icon.visible = item.botnet_power > 0 + sell_icon.visible = item.sell_icon diff --git a/inv_system/item_slot.tscn b/inv_system/item_slot.tscn index dc4d714..96c0497 100644 --- a/inv_system/item_slot.tscn +++ b/inv_system/item_slot.tscn @@ -1,19 +1,23 @@ -[gd_scene load_steps=5 format=3 uid="uid://dgqs20xf7l8c"] +[gd_scene load_steps=7 format=3 uid="uid://dgqs20xf7l8c"] [ext_resource type="Script" uid="uid://cpd04flfh5nlc" path="res://inv_system/item_slot.gd" id="1_m11ft"] [ext_resource type="StyleBox" uid="uid://hgjmkwj0dbqr" path="res://inv_system/item_panels/default.tres" id="1_mkcpq"] [ext_resource type="Texture2D" uid="uid://b7jp850fqpa0j" path="res://icon.svg" id="3_0tnt0"] +[ext_resource type="Texture2D" uid="uid://bbu7dofi4u038" path="res://assets/blankIcon.png" id="4_0tnt0"] +[ext_resource type="Texture2D" uid="uid://dokuqh6jq4eti" path="res://assets/sellIcon.png" id="5_eh2fu"] [sub_resource type="LabelSettings" id="LabelSettings_ab1u2"] outline_size = 5 outline_color = Color(0, 0, 0, 1) -[node name="ItemSlot" type="Panel" node_paths=PackedStringArray("icon", "label")] +[node name="ItemSlot" type="Panel" node_paths=PackedStringArray("icon", "label", "botnet_icon", "sell_icon")] custom_minimum_size = Vector2(50, 50) theme_override_styles/panel = ExtResource("1_mkcpq") script = ExtResource("1_m11ft") icon = NodePath("Icon") label = NodePath("Icon/Label") +botnet_icon = NodePath("icons/botnet_power") +sell_icon = NodePath("icons/sell_only") [node name="Icon" type="TextureRect" parent="."] layout_mode = 1 @@ -46,5 +50,31 @@ text = "120 GB" label_settings = SubResource("LabelSettings_ab1u2") horizontal_alignment = 2 +[node name="icons" type="HBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -24.0 +offset_bottom = 10.0 +grow_horizontal = 0 +alignment = 2 + +[node name="botnet_power" type="TextureRect" parent="icons"] +texture_filter = 1 +custom_minimum_size = Vector2(16, 16) +layout_mode = 2 +texture = ExtResource("4_0tnt0") +expand_mode = 1 +stretch_mode = 4 + +[node name="sell_only" type="TextureRect" parent="icons"] +texture_filter = 1 +custom_minimum_size = Vector2(16, 16) +layout_mode = 2 +texture = ExtResource("5_eh2fu") +expand_mode = 1 +stretch_mode = 4 + [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] diff --git a/items/disc_item.tres b/items/disc_item.tres index 6e1ebc9..5dc3b02 100644 --- a/items/disc_item.tres +++ b/items/disc_item.tres @@ -12,4 +12,5 @@ custom_panel_style = ExtResource("1_lhfs3") bin_chance = 0 buy_value = 600 rarity = "Epic" +sell_icon = true metadata/_custom_type_script = "uid://dccraom7a7e8d" diff --git a/items/ups_item.tres b/items/ups_item.tres index b948b93..ee47d2f 100644 --- a/items/ups_item.tres +++ b/items/ups_item.tres @@ -12,4 +12,5 @@ custom_panel_style = ExtResource("1_pugmu") bin_chance = 0 buy_value = 400 rarity = "Rare" +sell_icon = true metadata/_custom_type_script = "uid://dccraom7a7e8d"