diff options
Diffstat (limited to 'main_scene')
| -rw-r--r-- | main_scene/Label.gd | 3 | ||||
| -rw-r--r-- | main_scene/management.tscn | 30 | ||||
| -rw-r--r-- | main_scene/programmers.gd | 19 |
3 files changed, 7 insertions, 45 deletions
diff --git a/main_scene/Label.gd b/main_scene/Label.gd index 751a9a1..0c1c4a0 100644 --- a/main_scene/Label.gd +++ b/main_scene/Label.gd @@ -1,6 +1,5 @@ extends Label func _process(delta): - text = str(SaveState.coffee) + "CM: "+str(SaveState.buildings["intern"])+\ - "DEVS: "+str(SaveState.programmers)+"BTC: "+str(SaveState.bitcoin) + text = JSON.print(SaveState.pack_data()) diff --git a/main_scene/management.tscn b/main_scene/management.tscn index 398f2ea..5e9a4f8 100644 --- a/main_scene/management.tscn +++ b/main_scene/management.tscn @@ -1,25 +1,20 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://assets/background.png" type="Texture" id=1] [ext_resource path="res://main_scene/coffee_machine.gd" type="Script" id=2] [ext_resource path="res://main_scene/Label.gd" type="Script" id=3] [ext_resource path="res://buildings/buildings.tscn" type="PackedScene" id=4] -[ext_resource path="res://assets/hire.png" type="Texture" id=5] -[ext_resource path="res://main_scene/hire_button.gd" type="Script" id=6] -[ext_resource path="res://main_scene/programmers.gd" type="Script" id=7] [ext_resource path="res://assets/coffee_maschine.png" type="Texture" id=8] [ext_resource path="res://upgrades/upgrades.tscn" type="PackedScene" id=9] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 70.4574, 120 ) - -[sub_resource type="RectangleShape2D" id=2] extents = Vector2( 360, 360 ) [node name="Node2D" type="Node2D"] [node name="background" type="Sprite" parent="."] position = Vector2( 512.018, 299.606 ) +z_index = -1 texture = ExtResource( 1 ) [node name="Label" type="Label" parent="."] @@ -31,24 +26,10 @@ __meta__ = { } [node name="buildings" parent="." instance=ExtResource( 4 )] - -[node name="hiring" type="Node2D" parent="."] -script = ExtResource( 7 ) - -[node name="hire" type="Sprite" parent="hiring"] -position = Vector2( 501.726, 101.527 ) -scale = Vector2( 0.6, 0.6 ) -texture = ExtResource( 5 ) - -[node name="Area2D" type="Area2D" parent="hiring/hire"] -script = ExtResource( 6 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="hiring/hire/Area2D"] -position = Vector2( -9.54248, -2.42094 ) -shape = SubResource( 1 ) +position = Vector2( 697.186, 65.6175 ) [node name="coffee_maschine" type="Sprite" parent="."] -position = Vector2( 288, 304 ) +position = Vector2( 519.712, 314.253 ) scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 8 ) @@ -57,6 +38,7 @@ script = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="coffee_maschine/Area2D"] position = Vector2( -40.0001, -0.00012207 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="upgrades" parent="." instance=ExtResource( 9 )] +position = Vector2( 20.5055, 36.9098 ) diff --git a/main_scene/programmers.gd b/main_scene/programmers.gd index 95245e5..1f5150f 100644 --- a/main_scene/programmers.gd +++ b/main_scene/programmers.gd @@ -1,20 +1 @@ extends Ticked - -var riot := preload("res://riot/riot.tscn") - -func _tick() -> void: - if SaveState.riot_cooldown == 0: - SaveState.coffee -= SaveState.programmers - if SaveState.coffee < 0: - invoke_riot() - SaveState.coffee = 0 - else: - SaveState.bitcoin += SaveState.programmers - else: - SaveState.riot_cooldown -= 1 - -func invoke_riot() -> void: - SaveState.riot_cooldown = -1 - get_parent().hide() - get_parent().pause_mode = PAUSE_MODE_STOP - get_parent().get_parent().add_child(riot.instance()) |