diff options
| -rw-r--r-- | assets/wageslavery.png | bin | 0 -> 611 bytes | |||
| -rw-r--r-- | assets/wageslavery.png.import | 34 | ||||
| -rw-r--r-- | buildings/base_building.tscn | 2 | ||||
| -rw-r--r-- | lib/base_buyable.gd (renamed from buildings/building_clickable.gd) | 8 | ||||
| -rw-r--r-- | main_scene/management.tscn | 5 | ||||
| -rw-r--r-- | project.godot | 6 | ||||
| -rw-r--r-- | riot/riot.gd | 2 | ||||
| -rw-r--r-- | save_state.gd | 9 | ||||
| -rw-r--r-- | upgrades/upgrades.tscn | 21 | ||||
| -rw-r--r-- | upgrades/wageslavery.gd | 13 |
10 files changed, 89 insertions, 11 deletions
diff --git a/assets/wageslavery.png b/assets/wageslavery.png Binary files differnew file mode 100644 index 0000000..e13a88b --- /dev/null +++ b/assets/wageslavery.png diff --git a/assets/wageslavery.png.import b/assets/wageslavery.png.import new file mode 100644 index 0000000..c417010 --- /dev/null +++ b/assets/wageslavery.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/wageslavery.png-083c68db6304c61c6d1f5b8b13d81f74.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/wageslavery.png" +dest_files=[ "res://.import/wageslavery.png-083c68db6304c61c6d1f5b8b13d81f74.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/buildings/base_building.tscn b/buildings/base_building.tscn index 036ad96..d8b9876 100644 --- a/buildings/base_building.tscn +++ b/buildings/base_building.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://buildings/building_clickable.gd" type="Script" id=1] +[ext_resource path="res://lib/base_buyable.gd" type="Script" id=1] [ext_resource path="res://buildings/building_interface.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] diff --git a/buildings/building_clickable.gd b/lib/base_buyable.gd index 74c455b..db1a0e0 100644 --- a/buildings/building_clickable.gd +++ b/lib/base_buyable.gd @@ -1,10 +1,12 @@ extends Area2D -class_name BaseBuilding +class_name BaseBuyable func _input_event(viewport, event, shape_idx): + # todo RMB max + if event is InputEventMouseButton and event.button_index == BUTTON_LEFT and event.is_pressed(): var parent = get_parent() - if SaveState.coffee >= parent.get_cost(): - SaveState.coffee -= parent.get_cost() + if SaveState.bitcoin >= parent.get_cost(): + SaveState.bitcoin -= parent.get_cost() parent._bought() diff --git a/main_scene/management.tscn b/main_scene/management.tscn index 63dc13d..398f2ea 100644 --- a/main_scene/management.tscn +++ b/main_scene/management.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 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] @@ -8,6 +8,7 @@ [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 ) @@ -57,3 +58,5 @@ script = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="coffee_maschine/Area2D"] position = Vector2( -40.0001, -0.00012207 ) shape = SubResource( 2 ) + +[node name="upgrades" parent="." instance=ExtResource( 9 )] diff --git a/project.godot b/project.godot index 9e63f07..3389e48 100644 --- a/project.godot +++ b/project.godot @@ -15,9 +15,9 @@ _global_script_classes=[ { "path": "res://riot/angrydev.gd" }, { "base": "Area2D", -"class": "BaseBuilding", +"class": "BaseBuyable", "language": "GDScript", -"path": "res://buildings/building_clickable.gd" +"path": "res://lib/base_buyable.gd" }, { "base": "Area2D", "class": "ClickableArea", @@ -36,7 +36,7 @@ _global_script_classes=[ { } ] _global_script_class_icons={ "AngryDev": "", -"BaseBuilding": "", +"BaseBuyable": "", "ClickableArea": "", "Manager": "", "Ticked": "" diff --git a/riot/riot.gd b/riot/riot.gd index 4fd0173..9bfa056 100644 --- a/riot/riot.gd +++ b/riot/riot.gd @@ -7,7 +7,7 @@ func random_position(): var devs = [] func _ready() -> void: - for i in range(10): + for i in range(SaveState.upgrades['wageslavery'] + 1): var instance: AngryDev = dev_blueprint.instance() var vec = random_position() while vec.distance_squared_to(manager.position) < 256 * 256: diff --git a/save_state.gd b/save_state.gd index a11ecaf..ac58feb 100644 --- a/save_state.gd +++ b/save_state.gd @@ -3,10 +3,15 @@ extends Node var buildings = { "intern": 0 } +var upgrades = { + "wageslavery": 0 +} +func gain_bitcoin(amount: int) -> void: + bitcoin += amount * (upgrades["wageslavery"] + 1) var coffee = 0 -var programmers = 0 +var programmers = 1 var coffee_beans = 1000 var bitcoin = 100 -var riot_cooldown = 0 +var riot_cooldown = 60 diff --git a/upgrades/upgrades.tscn b/upgrades/upgrades.tscn new file mode 100644 index 0000000..6cd6770 --- /dev/null +++ b/upgrades/upgrades.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://assets/wageslavery.png" type="Texture" id=1] +[ext_resource path="res://upgrades/wageslavery.gd" type="Script" id=2] +[ext_resource path="res://lib/base_buyable.gd" type="Script" id=3] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 32, 32 ) + +[node name="Node2D" type="Node2D"] + +[node name="wageslavery" type="Sprite" parent="."] +position = Vector2( 62.9383, 60.4207 ) +texture = ExtResource( 1 ) +script = ExtResource( 2 ) + +[node name="Area2D" type="Area2D" parent="wageslavery"] +script = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="wageslavery/Area2D"] +shape = SubResource( 1 ) diff --git a/upgrades/wageslavery.gd b/upgrades/wageslavery.gd new file mode 100644 index 0000000..e48fba2 --- /dev/null +++ b/upgrades/wageslavery.gd @@ -0,0 +1,13 @@ +extends Node + +func _bought(): + pass + +func get_cost(): + return 200 * pow(100, get_amount()) + +func set_amount(amount: int) -> void: + SaveState.upgrades['wageslavery'] = amount + +func get_amount() -> int: + return SaveState.upgrades['wageslavery'] |
