bunch of fixes and changes done

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

View file

@ -1,12 +0,0 @@
[gd_resource type="Resource" script_class="CraftRecipe" load_steps=5 format=3 uid="uid://betkb8vbukp8g"]
[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="1_ex3qq"]
[ext_resource type="Resource" uid="uid://cnr1k8seffsxb" path="res://items/plastic.tres" id="2_ex3qq"]
[ext_resource type="Resource" uid="uid://u5u51q8erbkf" path="res://items/plastic_block.tres" id="3_1qpj1"]
[ext_resource type="Script" uid="uid://b4iu5xrdf0evs" path="res://crafting/craft_recipe.gd" id="4_hrlxw"]
[resource]
script = ExtResource("4_hrlxw")
ingredients = Array[ExtResource("1_ex3qq")]([ExtResource("2_ex3qq"), ExtResource("2_ex3qq"), ExtResource("2_ex3qq"), ExtResource("2_ex3qq"), ExtResource("2_ex3qq"), ExtResource("2_ex3qq"), null, null, null])
output = ExtResource("3_1qpj1")
metadata/_custom_type_script = "uid://b4iu5xrdf0evs"

View file

@ -0,0 +1,12 @@
[gd_resource type="Resource" script_class="CraftRecipe" load_steps=5 format=3 uid="uid://betkb8vbukp8g"]
[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="1_73sjm"]
[ext_resource type="Resource" uid="uid://b2tfv3l6feulr" path="res://items/battery.tres" id="2_ddta5"]
[ext_resource type="Resource" uid="uid://etplpx8i2jf1" path="res://items/ups_item.tres" id="3_cnltt"]
[ext_resource type="Script" uid="uid://b4iu5xrdf0evs" path="res://crafting/craft_recipe.gd" id="4_mwyny"]
[resource]
script = ExtResource("4_mwyny")
ingredients = Array[ExtResource("1_73sjm")]([ExtResource("2_ddta5"), ExtResource("2_ddta5"), ExtResource("2_ddta5"), ExtResource("2_ddta5"), null, null, null, null, null])
output = ExtResource("3_cnltt")
metadata/_custom_type_script = "uid://b4iu5xrdf0evs"

View file

@ -25,8 +25,8 @@ func show_recipe(recipe : CraftRecipe):
ingredient_slots[x].update_ui()
ingredient_slots[x].block_taking = true
output_slot.item = recipe.output
if (PlayerInventory.power_values.has(recipe.output)):
output_slot.extra_data = "Botnet Power: " + str(PlayerInventory.power_values.get(recipe.output))
#if (PlayerInventory.power_values.has(recipe.output)):
#output_slot.extra_data = "Botnet Power: " + str(PlayerInventory.power_values.get(recipe.output))
output_slot.update_ui()
output_slot.block_taking = true

View file

@ -19,8 +19,18 @@ func scavs_ready():
new_slot.item = scav.input
new_slot.block_taking = true
var scav_preview : String = str(scav.rolls) + " Rolls"
var total_chance : int = 0
for loot in scav.loot_pool:
scav_preview += "\n" + loot.item.item_name + " : " + str(loot.chance) + " Chance"
total_chance += loot.chance
var uncounted_chance = total_chance
for loot in scav.loot_pool:
if loot.item:
scav_preview += "\n" + loot.item.item_name + ": " + str((int((loot.chance/float(total_chance))*10000))/100) + "%"
uncounted_chance -= loot.chance
if uncounted_chance > 0:
scav_preview += "\nNothing: " + str((int((uncounted_chance/float(total_chance))*10000))/100) + "%"
new_slot.extra_data = scav_preview
grid.add_child(new_slot)
pass

View file

@ -0,0 +1,24 @@
[gd_resource type="Resource" script_class="ScavengeRecipe" load_steps=7 format=3 uid="uid://bagxi34ry0g1b"]
[ext_resource type="Resource" uid="uid://d14wjbxictxb" path="res://items/dvd_drive.tres" id="1_54aqd"]
[ext_resource type="Script" uid="uid://oa5rlx6ttwuj" path="res://crafting/rollableLoot.gd" id="2_8d3so"]
[ext_resource type="Resource" uid="uid://cbgv58ylt2wnc" path="res://items/disc_item.tres" id="3_54aqd"]
[ext_resource type="Script" uid="uid://boqr1fowaqmt0" path="res://crafting/scavenge_recipe.gd" id="5_n3vaw"]
[sub_resource type="Resource" id="Resource_uytxf"]
script = ExtResource("2_8d3so")
item = ExtResource("3_54aqd")
chance = 1
metadata/_custom_type_script = "uid://oa5rlx6ttwuj"
[sub_resource type="Resource" id="Resource_8d3so"]
script = ExtResource("2_8d3so")
chance = 9
metadata/_custom_type_script = "uid://oa5rlx6ttwuj"
[resource]
script = ExtResource("5_n3vaw")
input = ExtResource("1_54aqd")
rolls = 1
loot_pool = Array[ExtResource("2_8d3so")]([SubResource("Resource_uytxf"), SubResource("Resource_8d3so")])
metadata/_custom_type_script = "uid://boqr1fowaqmt0"