Merge branch 'master' of https://github.com/romangraef/LDJam46

8 files changed, 186 insertions, 37 deletions

diff --git a/assets/AddAnwalt.png.import b/assets/AddAnwalt.png.import
new file mode 100644
index 0000000..b1ae221
--- /dev/null
+++ b/assets/AddAnwalt.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/AddAnwalt.png-f50ad737477ab7e6526fc7443513066d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/AddAnwalt.png"
+dest_files=[ "res://.import/AddAnwalt.png-f50ad737477ab7e6526fc7443513066d.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/assets/AngryAnwalt.png.import b/assets/AngryAnwalt.png.import
new file mode 100644
index 0000000..6801d64
--- /dev/null
+++ b/assets/AngryAnwalt.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/AngryAnwalt.png-711611143e2daf9d2e499239119184c3.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/AngryAnwalt.png"
+dest_files=[ "res://.import/AngryAnwalt.png-711611143e2daf9d2e499239119184c3.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/assets/Anwalt.png.import b/assets/Anwalt.png.import
new file mode 100644
index 0000000..35c74ae
--- /dev/null
+++ b/assets/Anwalt.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Anwalt.png-b56174301a8b85bba69f710874fff88c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Anwalt.png"
+dest_files=[ "res://.import/Anwalt.png-b56174301a8b85bba69f710874fff88c.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/assets/laser_blast.png.import b/assets/laser_blast.png.import
index f9e6604..2899f95 100644
--- a/assets/laser_blast.png.import
+++ b/assets/laser_blast.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/laser_blast.PNG-98f5df94b5d70eb459cbeaba7d67a38b.stex"
+path="res://.import/laser_blast.png-faf99ac52547b5232e1f87a2c7649cc8.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/laser_blast.PNG"
-dest_files=[ "res://.import/laser_blast.PNG-98f5df94b5d70eb459cbeaba7d67a38b.stex" ]
+source_file="res://assets/laser_blast.png"
+dest_files=[ "res://.import/laser_blast.png-faf99ac52547b5232e1f87a2c7649cc8.stex" ]
 
 [params]
 
diff --git a/buildings/buildings.tscn b/buildings/buildings.tscn
index 574dedb..990183c 100644
--- a/buildings/buildings.tscn
+++ b/buildings/buildings.tscn
@@ -32,10 +32,20 @@ script = ExtResource( 4 )
 shape = SubResource( 1 )
 
 [node name="Label" type="Label" parent="dev"]
-margin_left = 22.0
-margin_top = 94.0
-margin_right = 76.0
-margin_bottom = 119.0
+margin_left = -5.01797
+margin_top = 42.6658
+margin_right = 48.982
+margin_bottom = 67.6658
+custom_colors/font_color = Color( 0.988235, 0.980392, 0.980392, 1 )
+custom_colors/font_outline_modulate = Color( 0, 0, 0, 1 )
+text = "abcdef"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Cost" type="Label" parent="dev"]
+margin_right = 40.0
+margin_bottom = 14.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -66,6 +76,15 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="Cost" type="Label" parent="intern"]
+margin_left = -109.958
+margin_top = 65.1604
+margin_right = -69.9582
+margin_bottom = 79.1604
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="glasses" type="Sprite" parent="."]
 position = Vector2( 175.565, 41.7443 )
 texture = ExtResource( 6 )
diff --git a/lib/building_interface.gd b/lib/building_interface.gd
index b03d3d1..23daa3f 100644
--- a/lib/building_interface.gd
+++ b/lib/building_interface.gd
@@ -11,7 +11,9 @@ func _process(delta):
 
 func update_label():
 	var label : Label = $Label
+	var cost : Label = $Cost
 	label.text = str(get_amount())
+	cost.text = str(get_cost())
 
 func get_cost() -> float:
 	return floor(base_cost * pow(cost_multiplier, get_amount()))
diff --git a/main_scene/management.tscn b/main_scene/management.tscn
index 804f33f..fef4fca 100644
--- a/main_scene/management.tscn
+++ b/main_scene/management.tscn
@@ -26,12 +26,14 @@ extents = Vector2( 228.401, 203.958 )
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 16 )
 
-[node name="background" type="Sprite" parent="."]
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+
+[node name="background" type="Sprite" parent="CanvasLayer"]
 position = Vector2( 512.018, 299.606 )
 z_index = -1
 texture = ExtResource( 1 )
 
-[node name="Label" type="Label" parent="."]
+[node name="Label" type="Label" parent="CanvasLayer"]
 margin_right = 237.0
 margin_bottom = 97.0
 script = ExtResource( 3 )
@@ -39,38 +41,38 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="buildings" parent="." instance=ExtResource( 4 )]
+[node name="buildings" parent="CanvasLayer" instance=ExtResource( 4 )]
 position = Vector2( 695.516, 65.6175 )
 
-[node name="coffee_maschine" type="Sprite" parent="."]
+[node name="coffee_maschine" type="Sprite" parent="CanvasLayer"]
 position = Vector2( 519.712, 314.253 )
 scale = Vector2( 0.2, 0.2 )
 texture = ExtResource( 8 )
 
-[node name="Area2D" type="Area2D" parent="coffee_maschine"]
+[node name="Area2D" type="Area2D" parent="CanvasLayer/coffee_maschine"]
 script = ExtResource( 2 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="coffee_maschine/Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasLayer/coffee_maschine/Area2D"]
 position = Vector2( -40.0001, -0.00012207 )
 shape = SubResource( 1 )
 
-[node name="upgrades" parent="." instance=ExtResource( 9 )]
+[node name="upgrades" parent="CanvasLayer" instance=ExtResource( 9 )]
 position = Vector2( 20.5055, 36.9098 )
 
-[node name="BeanIcon" type="Sprite" parent="."]
+[node name="BeanIcon" type="Sprite" parent="CanvasLayer"]
 position = Vector2( 421.662, 194.889 )
 texture = ExtResource( 6 )
 script = ExtResource( 5 )
 
-[node name="Area2D" type="Area2D" parent="BeanIcon"]
+[node name="Area2D" type="Area2D" parent="CanvasLayer/BeanIcon"]
 script = ExtResource( 7 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="BeanIcon/Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasLayer/BeanIcon/Area2D"]
 position = Vector2( -0.0478821, -0.59053 )
 scale = Vector2( 0.174159, 0.186657 )
 shape = SubResource( 2 )
 
-[node name="intro" parent="." instance=ExtResource( 10 )]
+[node name="intro" parent="CanvasLayer" instance=ExtResource( 10 )]
 visible = false
 margin_left = 347.916
 margin_top = 183.211
@@ -85,12 +87,12 @@ Start by clicking the coffee machine to brew some coffee.
 script = ExtResource( 11 )
 identifier = "introduction"
 
-[node name="coffee_beans" parent="." instance=ExtResource( 10 )]
+[node name="coffee_beans" parent="CanvasLayer" instance=ExtResource( 10 )]
 visible = false
 margin_left = 355.319
 margin_top = 99.9334
 margin_right = 699.319
-margin_bottom = 147.933
+margin_bottom = 164.933
 text = "To make coffee, you will obviously need coffee beans.
 You can buy coffee beans by clicking
 the coffee bean with the + next to it
@@ -98,12 +100,12 @@ You can buy 1000 for just 100 bitcoin"
 script = ExtResource( 12 )
 identifier = "coffee_beans"
 
-[node name="devs" parent="." instance=ExtResource( 10 )]
+[node name="devs" parent="CanvasLayer" instance=ExtResource( 10 )]
 visible = false
 margin_left = 584.068
 margin_top = 105.736
-margin_right = 844.068
-margin_bottom = 153.736
+margin_right = 987.068
+margin_bottom = 187.736
 text = "You can buy more developers by clicking
 the developer symbol with the +
 (they are the ones with coffee)
@@ -112,12 +114,12 @@ they will revolt."
 script = ExtResource( 13 )
 identifier = "devs"
 
-[node name="riot_aftermath" parent="." instance=ExtResource( 10 )]
+[node name="riot_aftermath" parent="CanvasLayer" instance=ExtResource( 10 )]
 visible = false
 margin_left = 379.131
 margin_top = 203.762
-margin_right = 651.131
-margin_bottom = 251.762
+margin_right = 654.131
+margin_bottom = 302.762
 text = "To prevent riots from happening again
 it is recommended you hire some interns
 to automatically brew coffee for your devs.
@@ -127,11 +129,12 @@ conditions"
 script = ExtResource( 14 )
 identifier = "riot_aftermath"
 
-[node name="upgrades2" parent="." instance=ExtResource( 10 )]
+[node name="upgrades2" parent="CanvasLayer" instance=ExtResource( 10 )]
+visible = false
 margin_left = 450.949
 margin_top = 200.422
-margin_right = 533.949
-margin_bottom = 231.422
+margin_right = 739.949
+margin_bottom = 265.422
 text = "You can buy upgrades on the left
 to increase your production. But be aware
 that some upgrades may have varying results
diff --git a/upgrades/upgrades.tscn b/upgrades/upgrades.tscn
index 7eea485..0434aa0 100644
--- a/upgrades/upgrades.tscn
+++ b/upgrades/upgrades.tscn
@@ -33,10 +33,17 @@ script = ExtResource( 3 )
 shape = SubResource( 1 )
 
 [node name="Label" type="Label" parent="wageslavery"]
-margin_left = -8.62447
-margin_top = 15.9221
-margin_right = 31.3755
-margin_bottom = 29.9221
+margin_left = -1.25805
+margin_top = -22.1378
+margin_right = 38.7419
+margin_bottom = -8.13778
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Cost" type="Label" parent="wageslavery"]
+margin_right = 40.0
+margin_bottom = 14.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -59,6 +66,15 @@ position = Vector2( 0.82769, 0.430544 )
 shape = SubResource( 2 )
 
 [node name="Label" type="Label" parent="sunglasses"]
+margin_left = -0.592613
+margin_top = -16.6465
+margin_right = 39.4074
+margin_bottom = -2.64654
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Cost" type="Label" parent="sunglasses"]
 margin_right = 40.0
 margin_bottom = 14.0
 __meta__ = {
@@ -82,10 +98,17 @@ script = ExtResource( 3 )
 shape = SubResource( 3 )
 
 [node name="Label" type="Label" parent="contract"]
-margin_left = -8.34222
-margin_top = 1.0
-margin_right = 12.6578
-margin_bottom = 15.0
+margin_left = 2.97597
+margin_top = -15.3181
+margin_right = 23.976
+margin_bottom = -1.31815
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Cost" type="Label" parent="contract"]
+margin_right = 40.0
+margin_bottom = 14.0
 __meta__ = {
 "_edit_use_anchors_": false
 }