Merge branch 'main' into accumulation-mode

inv_system/botnet/botnet_panel.tscn

@@ -60,7 +60,7 @@ horizontal_alignment = 1
 
 [node name="Button" type="Button" parent="MarginContainer/VBoxContainer"]
 layout_mode = 2
-text = "Install Device"
+text = "Install Device (cannot return)"
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
 layout_mode = 2

inv_system/item_data.gd

@@ -10,3 +10,5 @@ class_name ItemData
 @export var botnet_power : int = 0
 @export var can_buy : bool = false
 @export var description : String = ""
+@export var rarity : String = ""
+@export var sell_icon : bool = false

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
 		
 
 

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"]

inv_system/player_inventory.tscn

@@ -383,7 +383,8 @@ self_modulate = Color(1, 0, 0.23137255, 0.6039216)
 layout_mode = 0
 offset_left = 207.0
 offset_right = 363.0
-offset_bottom = 112.0
+offset_bottom = 141.0
+mouse_filter = 2
 texture = ExtResource("8_icm48")
 expand_mode = 1
 
@@ -392,7 +393,7 @@ layout_mode = 0
 offset_left = 39.0
 offset_top = 10.0
 offset_right = 144.0
-offset_bottom = 99.0
+offset_bottom = 129.0
 text = "View your salvaging recipes here"
 horizontal_alignment = 1
 vertical_alignment = 1