tabby/RustHacker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bunch of fixes and changes done

Browse source
This commit is contained in:
Tabby 2026-01-17 17:07:53 +11:00
parent 4a9193e549
commit 73b9a706a3
59 changed files with 940 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inv_system/botnet/botnet_panel.gd
View file

@ -26,9 +26,9 @@ func _notification(what: int) -> void:
func check_server():
if slots[0].item:
if PlayerInventory.power_values.has(slots[0].item):
if slots[0].item.botnet_power > 0:
install_button.disabled = false
power_predict.text = "[color=green][wave]Device Power: " + str(PlayerInventory.power_values.get(slots[0].item))
power_predict.text = "[color=green][wave]Device Power: " + str(slots[0].item.botnet_power)
else:
install_button.disabled = true
power_predict.text = "[pulse]Insert a device to predict power"
@ -39,7 +39,7 @@ func check_server():
func _on_button_pressed() -> void:
PlayerInventory.botnet_servers += PlayerInventory.power_values.get(slots[0].item)
PlayerInventory.botnet_servers += slots[0].item.botnet_power
PlayerInventory.botnet.append(slots[0].item)
install_button.disabled = true
power_predict.text = "[pulse]Insert a device to predict power"

2
inv_system/item_data.gd
View file

@ -7,4 +7,6 @@ class_name ItemData
@export var custom_panel_style : StyleBox
@export var bin_chance : int = 5
@export var buy_value : int = 10
@export var botnet_power : int = 0
@export var can_buy : bool = false
@export var description : String = ""

2
inv_system/item_slot.gd
View file

@ -62,7 +62,7 @@ func _drop_data(at_position: Vector2, data: Variant) -> void:
func _on_mouse_entered() -> void:
#print("im real?")
if item:
Tooltip.show_tip(item.item_name, extra_data)
Tooltip.show_tip(item, extra_data)
MouseTweaks.hovered_slot = self
pass # Replace with function body.

2
inv_system/player_inventory.gd
View file

@ -6,7 +6,7 @@ extends Node
@export var money_label : Label
@export var botnet_servers : int = 0
@export var botnet : Array[ItemData] = []
@export var power_values : Dictionary[ItemData,int]
#@export var power_values : Dictionary[ItemData,int]
# Called when the node enters the scene tree for the first time.
func _ready() -> void:

121
inv_system/player_inventory.tscn
View file

@ -1,16 +1,65 @@
[gd_scene load_steps=15 format=3 uid="uid://bkhg56q71vsjv"]
[gd_scene load_steps=16 format=3 uid="uid://bkhg56q71vsjv"]
[ext_resource type="Script" uid="uid://jxkjnscuxcyi" path="res://inv_system/player_inventory.gd" id="1_vk2kx"]
[ext_resource type="Script" uid="uid://c6oycdae5wvjf" path="res://inv_system/inventory.gd" id="2_hk4hx"]
[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_l456l"]
[ext_resource type="PackedScene" uid="uid://dgqs20xf7l8c" path="res://inv_system/item_slot.tscn" id="3_8qgtd"]
[ext_resource type="Resource" uid="uid://be540abaa08ox" path="res://items/server.tres" id="3_77dmv"]
[ext_resource type="Script" uid="uid://chxgum3v3d1o7" path="res://crafting/recipe book/recipie_book.gd" id="4_bdgfq"]
[ext_resource type="Resource" uid="uid://b3uytlkfvj67f" path="res://items/gaming_computer.tres" id="4_txpda"]
[ext_resource type="Script" uid="uid://drm5jfhadys7l" path="res://crafting/recipe book/scavengeBook.gd" id="5_bdgfq"]
[ext_resource type="Resource" uid="uid://8vw85c1qrypm" path="res://items/computer.tres" id="5_klg10"]
[ext_resource type="Resource" uid="uid://bvcquf4e43r6r" path="res://items/laptop.tres" id="6_xr7r7"]
[ext_resource type="Resource" uid="uid://3afonee3dw7" path="res://items/nas_item.tres" id="7_g2557"]
[ext_resource type="Texture2D" uid="uid://of71gurkt2v2" path="res://assets/glyphs/keyboard_shift.png" id="12_txpda"]
[ext_resource type="Texture2D" uid="uid://b6pddnr3aascg" path="res://assets/glyphs/mouse_left.png" id="13_klg10"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_txpda"]
content_margin_left = 10.0
content_margin_top = 4.0
content_margin_right = 10.0
content_margin_bottom = 4.0
bg_color = Color(0.1, 0.1, 0.1, 0.6)
border_color = Color(1, 1, 0, 0.7490196)
corner_radius_top_left = 15
corner_radius_top_right = 15
corner_detail = 5
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_klg10"]
content_margin_left = 10.0
content_margin_top = 4.0
content_margin_right = 10.0
content_margin_bottom = 4.0
bg_color = Color(0.46963727, 0.46963727, 0.46963727, 0.6)
border_width_left = 2
border_width_top = 2
border_width_right = 2
border_color = Color(1, 1, 0, 0.7490196)
corner_radius_top_left = 15
corner_radius_top_right = 15
corner_detail = 5
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xr7r7"]
content_margin_left = 10.0
content_margin_top = 4.0
content_margin_right = 10.0
content_margin_bottom = 4.0
bg_color = Color(0.1, 0.1, 0.1, 0.6)
border_width_left = 2
border_width_top = 2
border_width_right = 2
border_color = Color(1, 1, 0, 0.7490196)
corner_radius_top_left = 15
corner_radius_top_right = 15
corner_detail = 5
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_g2557"]
content_margin_left = 10.0
content_margin_top = 4.0
content_margin_right = 10.0
content_margin_bottom = 4.0
bg_color = Color(0.6, 0.6, 0.6, 0)
border_width_left = 2
border_width_top = 2
border_width_right = 2
border_color = Color(1, 1, 0, 0.7490196)
corner_radius_top_left = 15
corner_radius_top_right = 15
corner_detail = 5
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_icm48"]
content_margin_left = 0.0
@ -40,6 +89,9 @@ corner_detail = 5
font_size = 24
font_color = Color(1, 0.7490196, 0, 1)
[sub_resource type="LabelSettings" id="LabelSettings_xr7r7"]
font_size = 24
[node name="PlayerInventory" type="Control" node_paths=PackedStringArray("inventory_panel", "button", "money_label")]
z_index = 2
layout_mode = 3
@ -53,13 +105,6 @@ script = ExtResource("1_vk2kx")
inventory_panel = NodePath("Inventory")
button = NodePath("Button")
money_label = NodePath("PanelContainer/Label")
power_values = Dictionary[ExtResource("2_l456l"), int]({
ExtResource("3_77dmv"): 10,
ExtResource("4_txpda"): 4,
ExtResource("5_klg10"): 2,
ExtResource("6_xr7r7"): 3,
ExtResource("7_g2557"): 2
})
[node name="Button" type="Button" parent="."]
visible = false
@ -208,27 +253,33 @@ offset_left = 1.0
offset_top = 126.0
offset_right = 237.0
offset_bottom = 603.0
theme_override_colors/font_selected_color = Color(0.9490196, 0.9490196, 0, 1)
theme_override_colors/font_unselected_color = Color(0.99637884, 0.99637896, 0.99637896, 1)
theme_override_styles/tab_unselected = SubResource("StyleBoxFlat_txpda")
theme_override_styles/tab_hovered = SubResource("StyleBoxFlat_klg10")
theme_override_styles/tab_selected = SubResource("StyleBoxFlat_xr7r7")
theme_override_styles/tab_focus = SubResource("StyleBoxFlat_g2557")
current_tab = 0
[node name="Recipie Book" type="PanelContainer" parent="TabContainer" node_paths=PackedStringArray("vbox")]
[node name="Recipe Book" type="PanelContainer" parent="TabContainer" node_paths=PackedStringArray("vbox")]
layout_mode = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_icm48")
script = ExtResource("4_bdgfq")
vbox = NodePath("MarginContainer/ScrollContainer/VBoxContainer")
metadata/_tab_index = 0
[node name="MarginContainer" type="MarginContainer" parent="TabContainer/Recipie Book"]
[node name="MarginContainer" type="MarginContainer" parent="TabContainer/Recipe Book"]
layout_mode = 2
theme_override_constants/margin_left = 5
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5
[node name="ScrollContainer" type="ScrollContainer" parent="TabContainer/Recipie Book/MarginContainer"]
[node name="ScrollContainer" type="ScrollContainer" parent="TabContainer/Recipe Book/MarginContainer"]
layout_mode = 2
horizontal_scroll_mode = 0
[node name="VBoxContainer" type="VBoxContainer" parent="TabContainer/Recipie Book/MarginContainer/ScrollContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="TabContainer/Recipe Book/MarginContainer/ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
@ -276,4 +327,38 @@ text = "Money: $0"
label_settings = SubResource("LabelSettings_bdgfq")
horizontal_alignment = 1
[node name="PanelContainer2" type="PanelContainer" parent="."]
layout_mode = 0
offset_left = 250.0
offset_top = 575.0
offset_right = 507.0
offset_bottom = 617.0
[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer2"]
layout_mode = 2
theme_override_constants/separation = 0
alignment = 1
[node name="Label" type="Label" parent="PanelContainer2/HBoxContainer"]
layout_mode = 2
text = "Quick Move:"
label_settings = SubResource("LabelSettings_xr7r7")
horizontal_alignment = 1
[node name="TextureRect" type="TextureRect" parent="PanelContainer2/HBoxContainer"]
layout_mode = 2
texture = ExtResource("12_txpda")
expand_mode = 3
[node name="Label2" type="Label" parent="PanelContainer2/HBoxContainer"]
layout_mode = 2
text = "+"
label_settings = SubResource("LabelSettings_xr7r7")
horizontal_alignment = 1
[node name="TextureRect2" type="TextureRect" parent="PanelContainer2/HBoxContainer"]
layout_mode = 2
texture = ExtResource("13_klg10")
expand_mode = 3
[connection signal="pressed" from="Button" to="." method="_on_button_pressed"]

1
inv_system/sell_panel.gd
View file

@ -7,6 +7,7 @@ extends Inventory
func _ready() -> void:
super()
calculate_sell_value()
Clock.new_day.connect(calculate_sell_value)
pass # Replace with function body.

17
inv_system/trash_slot.gd Normal file
View file

@ -0,0 +1,17 @@
extends PanelContainer
@export var slot : ItemSlot
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
pass
func _on_button_pressed() -> void:
slot.item = null
slot.update_ui()

1
inv_system/trash_slot.gd.uid Normal file
View file

@ -0,0 +1 @@
uid://dm7x3etlucffq