accumulation test

This commit is contained in:
Tabby 2026-01-23 15:38:28 +11:00
parent 69f6544545
commit 7e5603927e
7 changed files with 65 additions and 14 deletions

View file

@ -125,9 +125,9 @@ anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = 241.0 offset_left = 241.0
offset_top = 154.0 offset_top = 111.0
offset_right = -635.0 offset_right = -635.0
offset_bottom = -136.0 offset_bottom = -126.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("2_hk4hx") script = ExtResource("2_hk4hx")
@ -249,6 +249,21 @@ layout_mode = 2
[node name="ItemSlot30" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] [node name="ItemSlot30" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2 layout_mode = 2
[node name="ItemSlot31" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2
[node name="ItemSlot32" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2
[node name="ItemSlot33" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2
[node name="ItemSlot34" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2
[node name="ItemSlot35" parent="Inventory/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")]
layout_mode = 2
[node name="TabContainer" type="TabContainer" parent="."] [node name="TabContainer" type="TabContainer" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 1.0 offset_left = 1.0

View file

@ -29,16 +29,16 @@ func calculate_sell_value():
else: else:
sell_label.text = "Place an item" sell_label.text = "Place an item"
sell_button.disabled = true sell_button.disabled = true
if not Clock.has_time(15): if not Clock.has_time(10):
sell_button.disabled = true sell_button.disabled = true
func _on_sell_button_pressed() -> void: func _on_sell_button_pressed() -> void:
if slots[0].item and Clock.has_time(15): if slots[0].item and Clock.has_time(10):
var sell_value : int = floori(slots[0].item.buy_value / float(2)) var sell_value : int = floori(slots[0].item.buy_value / float(2))
slots[0].item = null slots[0].item = null
slots[0].update_ui() slots[0].update_ui()
PlayerInventory.money += sell_value PlayerInventory.money += sell_value
Clock.use_time(15) Clock.use_time(10)
calculate_sell_value() calculate_sell_value()

View file

@ -55,6 +55,6 @@ text = "1234"
[node name="SellButton" type="Button" parent="MarginContainer/VBoxContainer"] [node name="SellButton" type="Button" parent="MarginContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "Sell! (Uses 15 time)" text = "Sell! (Uses 10 time)"
[connection signal="pressed" from="MarginContainer/VBoxContainer/SellButton" to="." method="_on_sell_button_pressed"] [connection signal="pressed" from="MarginContainer/VBoxContainer/SellButton" to="." method="_on_sell_button_pressed"]

View file

@ -23,7 +23,7 @@ func _on_play_button_pressed() -> void:
PlayerInventory.show() PlayerInventory.show()
Clock.show() Clock.show()
Locations.show() Locations.show()
Locations.goto_workshop() Locations.goto_ewaste()
#Locations.current_location = Locations.Location.workshop #Locations.current_location = Locations.Location.workshop
#get_tree().change_scene_to_file("res://scenes/workshop.tscn") #get_tree().change_scene_to_file("res://scenes/workshop.tscn")

View file

@ -99,6 +99,7 @@ text = "Cannot buy: Inventory Full!"
horizontal_alignment = 1 horizontal_alignment = 1
[node name="BotnetPanel" parent="." instance=ExtResource("5_jxe34")] [node name="BotnetPanel" parent="." instance=ExtResource("5_jxe34")]
visible = false
layout_mode = 0 layout_mode = 0
offset_left = 523.0 offset_left = 523.0
offset_top = 434.0 offset_top = 434.0

View file

@ -18,6 +18,8 @@ var ending_text : String
var power_vis : float = 0 var power_vis : float = 0
@export var accumlate_labebl :Label
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
pass # Replace with function body. pass # Replace with function body.
@ -29,7 +31,7 @@ func _process(delta: float) -> void:
timer_text.text = str(time_left) timer_text.text = str(time_left)
days_text.text = str(days_left) days_text.text = str(days_left)
next_button.disabled = time_left > 10 next_button.disabled = time_left > 10
if days_left == 0: if days_left <= 0:
next_button.text = "End Game" next_button.text = "End Game"
else: else:
next_button.text = "Proceed to next day ->" next_button.text = "Proceed to next day ->"
@ -48,10 +50,15 @@ func use_time(time : float):
func _on_next_day_pressed() -> void: func _on_next_day_pressed() -> void:
if days_left >= 1: if days_left >= 1:
accumulate_botnet()
days_left -= 1 days_left -= 1
time_left = 200 time_left = 200
new_day.emit() new_day.emit()
elif days_left == 0:
accumulate_botnet()
days_left = -1
else: else:
get_tree().change_scene_to_file("res://scenes/ending.tscn") get_tree().change_scene_to_file("res://scenes/ending.tscn")
PlayerInventory.hide() PlayerInventory.hide()
@ -59,7 +66,18 @@ func _on_next_day_pressed() -> void:
Locations.hide() Locations.hide()
pass pass
func accumulate_botnet():
for slot in PlayerInventory.inventory_panel.slots:
if slot.item:
PlayerInventory.botnet_servers += slot.item.botnet_power
func update_power(): func update_power():
var active_power : int = 0
for slot in PlayerInventory.inventory_panel.slots:
if slot.item:
active_power += slot.item.botnet_power
accumlate_labebl.text = "+" + str(active_power) + " next day"
var current_level : HackLevel var current_level : HackLevel
var next_level : HackLevel var next_level : HackLevel
for x in range(levels.size()): for x in range(levels.size()):

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://dpa3yvdrddtsh"] [gd_scene load_steps=16 format=3 uid="uid://dpa3yvdrddtsh"]
[ext_resource type="Texture2D" uid="uid://cvsibrbtuqfww" path="res://assets/ready_time.png" id="1_chnjs"] [ext_resource type="Texture2D" uid="uid://cvsibrbtuqfww" path="res://assets/ready_time.png" id="1_chnjs"]
[ext_resource type="Script" uid="uid://c4y7w10si2q2p" path="res://time_system/clock.gd" id="1_m6rn1"] [ext_resource type="Script" uid="uid://c4y7w10si2q2p" path="res://time_system/clock.gd" id="1_m6rn1"]
@ -18,7 +18,7 @@ metadata/_custom_type_script = "uid://md6s5hsjvnxc"
[sub_resource type="Resource" id="Resource_m763i"] [sub_resource type="Resource" id="Resource_m763i"]
script = ExtResource("2_hjq5n") script = ExtResource("2_hjq5n")
name = "UTS" name = "UTS"
power = 10 power = 50
color = Color(0.36701235, 0.9999997, 0.3376366, 1) color = Color(0.36701235, 0.9999997, 0.3376366, 1)
ending_text = "You hack into the UTS administration servers and completely cancel the OSI saving thousands of classes, hundres of staff jobs and many key degrees!" ending_text = "You hack into the UTS administration servers and completely cancel the OSI saving thousands of classes, hundres of staff jobs and many key degrees!"
metadata/_custom_type_script = "uid://md6s5hsjvnxc" metadata/_custom_type_script = "uid://md6s5hsjvnxc"
@ -26,7 +26,7 @@ metadata/_custom_type_script = "uid://md6s5hsjvnxc"
[sub_resource type="Resource" id="Resource_nhhwl"] [sub_resource type="Resource" id="Resource_nhhwl"]
script = ExtResource("2_hjq5n") script = ExtResource("2_hjq5n")
name = "Microsoft" name = "Microsoft"
power = 20 power = 125
color = Color(0.36862746, 1, 1, 1) color = Color(0.36862746, 1, 1, 1)
ending_text = "Your sizable botnet quickly cuts through the defenses of the Microsoft servers eliminating Copilot and stealing their source code so you can run any Windows program on linux " ending_text = "Your sizable botnet quickly cuts through the defenses of the Microsoft servers eliminating Copilot and stealing their source code so you can run any Windows program on linux "
metadata/_custom_type_script = "uid://md6s5hsjvnxc" metadata/_custom_type_script = "uid://md6s5hsjvnxc"
@ -34,7 +34,7 @@ metadata/_custom_type_script = "uid://md6s5hsjvnxc"
[sub_resource type="Resource" id="Resource_023ps"] [sub_resource type="Resource" id="Resource_023ps"]
script = ExtResource("2_hjq5n") script = ExtResource("2_hjq5n")
name = "X" name = "X"
power = 40 power = 200
color = Color(0.70184636, 0.4491853, 1, 1) color = Color(0.70184636, 0.4491853, 1, 1)
ending_text = "You point your powerful botnet towards X (the everything app) and eviscerate the platform along with grok and elon musk, reducing them both to ashes" ending_text = "You point your powerful botnet towards X (the everything app) and eviscerate the platform along with grok and elon musk, reducing them both to ashes"
metadata/_custom_type_script = "uid://md6s5hsjvnxc" metadata/_custom_type_script = "uid://md6s5hsjvnxc"
@ -42,7 +42,7 @@ metadata/_custom_type_script = "uid://md6s5hsjvnxc"
[sub_resource type="Resource" id="Resource_cb2q0"] [sub_resource type="Resource" id="Resource_cb2q0"]
script = ExtResource("2_hjq5n") script = ExtResource("2_hjq5n")
name = "US Goverment" name = "US Goverment"
power = 65 power = 300
color = Color(0.96814066, 0.8503548, 0, 1) color = Color(0.96814066, 0.8503548, 0, 1)
ending_text = "With your mighty botnet you break into the US goverment servers and release every secret file aswell as reverse every transphobic, homophobic or otherwise bad law. Finally you turn all the White House automated defenses against Trump" ending_text = "With your mighty botnet you break into the US goverment servers and release every secret file aswell as reverse every transphobic, homophobic or otherwise bad law. Finally you turn all the White House automated defenses against Trump"
metadata/_custom_type_script = "uid://md6s5hsjvnxc" metadata/_custom_type_script = "uid://md6s5hsjvnxc"
@ -50,7 +50,11 @@ metadata/_custom_type_script = "uid://md6s5hsjvnxc"
[sub_resource type="LabelSettings" id="LabelSettings_r3ygl"] [sub_resource type="LabelSettings" id="LabelSettings_r3ygl"]
font_size = 32 font_size = 32
[node name="Clock" type="Control" node_paths=PackedStringArray("bar", "timer_text", "days_text", "next_button", "current_target_label", "power_bar", "next_target_label")] [sub_resource type="LabelSettings" id="LabelSettings_hjq5n"]
outline_size = 6
outline_color = Color(0, 0, 0, 1)
[node name="Clock" type="Control" node_paths=PackedStringArray("bar", "timer_text", "days_text", "next_button", "current_target_label", "power_bar", "next_target_label", "accumlate_labebl")]
z_index = 2 z_index = 2
layout_mode = 3 layout_mode = 3
anchors_preset = 15 anchors_preset = 15
@ -68,6 +72,7 @@ current_target_label = NodePath("PanelContainer/HBoxContainer/Hacking/Current Ta
power_bar = NodePath("PanelContainer/HBoxContainer/Hacking/Power Bar") power_bar = NodePath("PanelContainer/HBoxContainer/Hacking/Power Bar")
next_target_label = NodePath("PanelContainer/HBoxContainer/Hacking/Next Target") next_target_label = NodePath("PanelContainer/HBoxContainer/Hacking/Next Target")
levels = Array[ExtResource("2_hjq5n")]([SubResource("Resource_hjq5n"), SubResource("Resource_m763i"), SubResource("Resource_nhhwl"), SubResource("Resource_023ps"), SubResource("Resource_cb2q0")]) levels = Array[ExtResource("2_hjq5n")]([SubResource("Resource_hjq5n"), SubResource("Resource_m763i"), SubResource("Resource_nhhwl"), SubResource("Resource_023ps"), SubResource("Resource_cb2q0")])
accumlate_labebl = NodePath("PanelContainer/HBoxContainer/Hacking/Power Bar/next day")
[node name="PanelContainer" type="PanelContainer" parent="."] [node name="PanelContainer" type="PanelContainer" parent="."]
layout_mode = 1 layout_mode = 1
@ -166,6 +171,18 @@ texture_under = ExtResource("5_idmoy")
texture_over = ExtResource("6_hjq5n") texture_over = ExtResource("6_hjq5n")
texture_progress = ExtResource("7_m763i") texture_progress = ExtResource("7_m763i")
[node name="next day" type="Label" parent="PanelContainer/HBoxContainer/Hacking/Power Bar"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
text = "+123 next day"
label_settings = SubResource("LabelSettings_hjq5n")
horizontal_alignment = 1
vertical_alignment = 1
[node name="Next Target" type="Label" parent="PanelContainer/HBoxContainer/Hacking"] [node name="Next Target" type="Label" parent="PanelContainer/HBoxContainer/Hacking"]
layout_mode = 2 layout_mode = 2
text = "10 Power to next target" text = "10 Power to next target"