endings

16 files changed, 247 insertions, 3 deletions

diff --git a/MainScene.tscn b/MainScene.tscn
index 564ead9..3273248 100644
--- a/MainScene.tscn
+++ b/MainScene.tscn
@@ -12,10 +12,12 @@ bg_color = Color( 0, 0.270588, 1, 1 )
 position = Vector2( -0.516018, 0 )
 
 [node name="Node2D" type="Node2D" parent="."]
+visible = false
 z_index = 2
 
 [node name="Label" type="Label" parent="Node2D"]
 pause_mode = 2
+visible = false
 margin_right = 1010.0
 margin_bottom = 14.0
 custom_styles/normal = SubResource( 1 )
diff --git a/assets/EatTheRich.png.import b/assets/EatTheRich.png.import
new file mode 100644
index 0000000..bb3c93d
--- /dev/null
+++ b/assets/EatTheRich.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/EatTheRich.png-8d536182d45afc9be6897de93232e02c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/EatTheRich.png"
+dest_files=[ "res://.import/EatTheRich.png-8d536182d45afc9be6897de93232e02c.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/InGeldBaden.png.import b/assets/InGeldBaden.png.import
new file mode 100644
index 0000000..8267b35
--- /dev/null
+++ b/assets/InGeldBaden.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/InGeldBaden.png-391c986183368e5012fed49d2f1bbaba.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/InGeldBaden.png"
+dest_files=[ "res://.import/InGeldBaden.png-391c986183368e5012fed49d2f1bbaba.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/Itsrainingmoney.png.import b/assets/Itsrainingmoney.png.import
new file mode 100644
index 0000000..e8134c4
--- /dev/null
+++ b/assets/Itsrainingmoney.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Itsrainingmoney.png-efa5411ebd3db555f50f0ed9db339637.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Itsrainingmoney.png"
+dest_files=[ "res://.import/Itsrainingmoney.png-efa5411ebd3db555f50f0ed9db339637.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/JudgeEnding.png.import b/assets/JudgeEnding.png.import
new file mode 100644
index 0000000..b035a5c
--- /dev/null
+++ b/assets/JudgeEnding.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/JudgeEnding.png-8803e730a9e292b546d9609e07bee782.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/JudgeEnding.png"
+dest_files=[ "res://.import/JudgeEnding.png-8803e730a9e292b546d9609e07bee782.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/endings/eattherich.tscn b/endings/eattherich.tscn
new file mode 100644
index 0000000..7f093b0
--- /dev/null
+++ b/endings/eattherich.tscn
@@ -0,0 +1,26 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/EatTheRich.png" type="Texture" id=1]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="EatTheRich" type="Sprite" parent="."]
+position = Vector2( 505.708, 241.522 )
+scale = Vector2( 5, 5 )
+texture = ExtResource( 1 )
+
+[node name="Label" type="Label" parent="."]
+margin_left = 257.975
+margin_top = 481.878
+margin_right = 773.975
+margin_bottom = 580.878
+text = "OM NOM NOM NOM NOM NOM NOM.
+Everyone thought this was just a joke, but Harry
+(the one who always smells weird, and has those stains on his black hoodie)
+took eating the rich to a quite literal level. No one cared enough about you
+to tell him to stop though. Doesn't he know that raw meat has a high risk of
+getting you infected?"
+align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
diff --git a/endings/its_raining_bread.tscn b/endings/its_raining_bread.tscn
new file mode 100644
index 0000000..1a8d563
--- /dev/null
+++ b/endings/its_raining_bread.tscn
@@ -0,0 +1,27 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/InGeldBaden.png" type="Texture" id=1]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="Itsrainingmoney" type="Sprite" parent="."]
+position = Vector2( 476.626, 172.06 )
+scale = Vector2( 5, 5 )
+texture = ExtResource( 1 )
+
+[node name="Label" type="Label" parent="."]
+margin_left = 224.495
+margin_top = 439.229
+margin_right = 733.495
+margin_bottom = 555.229
+text = "After acquiring substantial amounts of money,
+you are faced with the toughest decision of them all:
+Will you acquire more money and grow your IT to the biggest of them all,
+or will you sell out and just outsource the whole operation.
+Naturally you choose the latter and spend the rest on mozarella sticks.
+Delicious.
+(This ending increases your risk of dying of cardiovascular diseases by a tenfold."
+align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
diff --git a/endings/youve_been_jailed.tscn b/endings/youve_been_jailed.tscn
new file mode 100644
index 0000000..da18606
--- /dev/null
+++ b/endings/youve_been_jailed.tscn
@@ -0,0 +1,26 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/JudgeEnding.png" type="Texture" id=1]
+
+[node name="Node2D" type="Node2D"]
+position = Vector2( 2.78955, 0 )
+
+[node name="JudgeEnding" type="Sprite" parent="."]
+position = Vector2( 496.908, 240.549 )
+scale = Vector2( 4, 4 )
+texture = ExtResource( 1 )
+
+[node name="Label" type="Label" parent="."]
+margin_left = 403.954
+margin_top = 498.3
+margin_right = 671.954
+margin_bottom = 580.3
+text = "When you seee him at the table,
+he turns out to be rather stable,
+and when the haaamer hits the wood top,
+He's the baddest fucker in the courthouse
+(then he does the jail dance)"
+align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
diff --git a/lawsuit/lawsuit.gd b/lawsuit/lawsuit.gd
index 3cf596b..e616db7 100644
--- a/lawsuit/lawsuit.gd
+++ b/lawsuit/lawsuit.gd
@@ -6,9 +6,9 @@ onready var wright = preload("res://lawsuit/wright.tscn")
 func get_cost():
 	var x = 1
 	for value in SaveState.upgrades.values():
-		x *= value
+		x *= value + 1
 	for value in SaveState.buildings.values():
-		x *= value
+		x *= value + 1
 	return x
 
 func _ready():
diff --git a/lawsuit/miles.gd b/lawsuit/miles.gd
index 7ea8213..b55b389 100644
--- a/lawsuit/miles.gd
+++ b/lawsuit/miles.gd
@@ -5,5 +5,8 @@ func _physics_process(delta):
 	if position.x < 0:
 		get_parent().lose()
 
+func queue_free():
+	print('p')
+	
 func _on_Area2D_area_shape_entered(area_id, area, area_shape, self_shape):
 	queue_free()
diff --git a/lawsuit/miles.tscn b/lawsuit/miles.tscn
index 1d8175e..39f37d1 100644
--- a/lawsuit/miles.tscn
+++ b/lawsuit/miles.tscn
@@ -14,6 +14,7 @@ scale = Vector2( -1, 1 )
 texture = ExtResource( 1 )
 
 [node name="Area2D" type="Area2D" parent="."]
+collision_mask = 2
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
 shape = SubResource( 1 )
diff --git a/lawsuit/wright.gd b/lawsuit/wright.gd
index 42a53ce..a577d33 100644
--- a/lawsuit/wright.gd
+++ b/lawsuit/wright.gd
@@ -6,7 +6,9 @@ func _physics_process(delta):
 	if position.x > 1024:
 		get_parent().win()
 
-
+func queue_free():
+	print('p')
+	
 func _on_Area2D_area_shape_entered(area_id, area, area_shape, self_shape):
 	queue_free()
 	var objection = blueprint.instance()
diff --git a/lawsuit/wright.tscn b/lawsuit/wright.tscn
index f753cb6..b54f0d1 100644
--- a/lawsuit/wright.tscn
+++ b/lawsuit/wright.tscn
@@ -13,6 +13,7 @@ script = ExtResource( 2 )
 texture = ExtResource( 1 )
 
 [node name="Area2D" type="Area2D" parent="."]
+collision_layer = 2
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
 position = Vector2( -3.6832, 0 )
diff --git a/main_scene/konami_check.gd b/main_scene/konami_check.gd
index ea033d0..500f90c 100644
--- a/main_scene/konami_check.gd
+++ b/main_scene/konami_check.gd
@@ -1,5 +1,8 @@
 extends Node2D
 var progression = 0
+onready var eat_the_rich = preload("res://endings/eattherich.tscn")
+onready var youve_been_jailed = preload("res://endings/youve_been_jailed.tscn")
+onready var its_raining_bread = preload("res://endings/its_raining_bread.tscn")
 
 func _unhandled_key_input(event: InputEventKey):
 	var sc = event.scancode
@@ -18,3 +21,17 @@ func _unhandled_key_input(event: InputEventKey):
 		SaveState.coffee = 1000000000
 		SaveState.coffee_beans = 1000000000
 		SaveState.riot_cooldown = 1000000000
+
+func _process(delta):
+	if SaveState.failed_riot_count > 3:
+		get_parent().add_child(eat_the_rich.instance())
+		queue_free()
+	if SaveState.bitcoin < -0:
+		get_parent().add_child(youve_been_jailed.instance())
+		queue_free()
+	if SaveState.bitcoin > 100000:
+		get_parent().add_child(its_raining_bread.instance())
+		queue_free()
+
+func _ready():
+	randomize()
diff --git a/riot/manager.gd b/riot/manager.gd
index 56d507a..2629a6f 100644
--- a/riot/manager.gd
+++ b/riot/manager.gd
@@ -21,4 +21,5 @@ func _physics_process(delta : float) -> void:
 				child.show()
 				child.pause_mode = PAUSE_MODE_INHERIT
 		SaveState.riot_cooldown = 10
+		SaveState.failed_riot_count += 1
 		get_parent().queue_free()
diff --git a/save_state.gd b/save_state.gd
index 30e471b..44712b2 100644
--- a/save_state.gd
+++ b/save_state.gd
@@ -40,11 +40,13 @@ func pack_data():
 		"bitcoin": bitcoin,
 		"riot_cooldown": riot_cooldown,
 		"tutorial": tutorial,
+		"failed_riot_count": failed_riot_count,
 	}
 
 var coffee = 0
 var coffee_beans = 150
 var bitcoin = 100
+var failed_riot_count = 0
 var riot_cooldown = 0
 
 var buildings = {