diff --git a/README.md b/README.md index ed2e111..6efc986 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - [ ] 1-19 mew - [ ] 20-39 winning - [ ] 40-59 winning more - - [ ] 60+ winning most + - [ ] 60+ winning most or maybe 50+? - [ ] soundtrack - kane working on something - [x] credit/replace images - square images that fit in the item slot box - [x] Disk drives scavenge to disks of varying rarity worth $$$ diff --git a/credits/people/jessica.webp b/credits/people/jessica.webp new file mode 100644 index 0000000..5245ce9 Binary files /dev/null and b/credits/people/jessica.webp differ diff --git a/credits/people/jessica.webp.import b/credits/people/jessica.webp.import new file mode 100644 index 0000000..724dd33 --- /dev/null +++ b/credits/people/jessica.webp.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmdro72icyith" +path="res://.godot/imported/jessica.webp-98ebceaab50f797a5ff4da161089e16f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://credits/people/jessica.webp" +dest_files=["res://.godot/imported/jessica.webp-98ebceaab50f797a5ff4da161089e16f.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/scenes/credits.tscn b/scenes/credits.tscn index fabc250..2de9855 100644 --- a/scenes/credits.tscn +++ b/scenes/credits.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://cix7xfnu1305i"] +[gd_scene load_steps=16 format=3 uid="uid://cix7xfnu1305i"] [ext_resource type="Script" uid="uid://4c4k3o0jnmdk" path="res://scenes/menu.gd" id="1_2ckv8"] [ext_resource type="Texture2D" uid="uid://b1rs6epjar6mj" path="res://assets/menu.png" id="2_0ctdu"] @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://ofdvybdxtcgb" path="res://credits/people/maxie.webp" id="8_7lgdl"] [ext_resource type="Texture2D" uid="uid://bu3t30sqi3t8t" path="res://credits/people/spantle.webp" id="9_c6kru"] [ext_resource type="PackedScene" uid="uid://bicj8f61mhigk" path="res://credits/credit_slot.tscn" id="9_ih6pn"] +[ext_resource type="Texture2D" uid="uid://cmdro72icyith" path="res://credits/people/jessica.webp" id="10_7lgdl"] [sub_resource type="Resource" id="Resource_7lgdl"] script = ExtResource("6_7lgdl") @@ -42,6 +43,14 @@ custom_panel_style = ExtResource("7_ih6pn") buy_value = 0 metadata/_custom_type_script = "uid://dccraom7a7e8d" +[sub_resource type="Resource" id="Resource_c6kru"] +script = ExtResource("6_7lgdl") +item_name = "Jessica" +icon = ExtResource("10_7lgdl") +custom_panel_style = ExtResource("7_ih6pn") +buy_value = 0 +metadata/_custom_type_script = "uid://dccraom7a7e8d" + [node name="Credits" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -159,6 +168,10 @@ item = SubResource("Resource_x5q3x") layout_mode = 2 item = SubResource("Resource_nmdnh") +[node name="Jessica" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer/HFlowContainer2" instance=ExtResource("9_ih6pn")] +layout_mode = 2 +item = SubResource("Resource_c6kru") + [node name="other" type="RichTextLabel" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer"] layout_mode = 2 bbcode_enabled = true diff --git a/scenes/ending.gd b/scenes/ending.gd index 6857745..31d2818 100644 --- a/scenes/ending.gd +++ b/scenes/ending.gd @@ -15,7 +15,7 @@ func _ready() -> void: for device in PlayerInventory.botnet: var new_slot : ItemSlot = load("res://inv_system/item_slot.tscn").instantiate() new_slot.item = device - new_slot.extra_data = "Power: " + str(PlayerInventory.power_values.get(device)) + new_slot.extra_data = "Power: " + str(device.botnet_power) new_slot.update_ui() new_slot.block_taking = true server_box.add_child(new_slot)