Fixed Intro AI and quit button

jooshd · jooshd · commit b16ac6f45d8a · 2022-11-28T21:13:46.000-05:00
diff --git a/.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.md5 b/.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.md5
@@ -0,0 +1,3 @@
+source_md5="658d89891ce77f7ea9b19128dd7b39e8"
+dest_md5="b1166910497e4da162c572ea74f2799a"
+
diff --git a/.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.stex b/.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.stex
diff --git a/.import/Reporter person.PNG-cdf8c236eb91faeccb53094bbe8eb69d.md5 b/.import/Reporter person.PNG-cdf8c236eb91faeccb53094bbe8eb69d.md5
@@ -1,3 +1,3 @@
-source_md5="cb72e7475dce1ce81c1a42200cddc14a"
-dest_md5="0d69d191c79064f2c10635808c902049"
+source_md5="59e3941b39736f0c6d3e10e8178cc3ee"
+dest_md5="abc19924cf49202606d916d9b06f767a"
 
diff --git a/.import/Reporter person.PNG-cdf8c236eb91faeccb53094bbe8eb69d.stex b/.import/Reporter person.PNG-cdf8c236eb91faeccb53094bbe8eb69d.stex
diff --git a/.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.md5 b/.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.md5
@@ -0,0 +1,3 @@
+source_md5="75483b80e1b22be16ac737015bf0b5b6"
+dest_md5="87d32169bfe0be46b533c20567651642"
+
diff --git a/.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.stex b/.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.stex
diff --git a/Scenes/Intro/Intro2.tscn b/Scenes/Intro/Intro2.tscn
@@ -1,9 +1,8 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://Scenes/Intro/Intro2.gd" type="Script" id=1]
 [ext_resource path="res://Inconsolata-Black.ttf" type="DynamicFontData" id=2]
 [ext_resource path="res://png/Monitor.png" type="Texture" id=3]
-[ext_resource path="res://png/greenbutton.png" type="Texture" id=4]
 
 [sub_resource type="DynamicFont" id=1]
 size = 25
@@ -40,13 +39,9 @@ tracks/0/keys = {
 "values": [ 0.0, 1.0 ]
 }
 
-[sub_resource type="StyleBoxTexture" id=8]
-texture = ExtResource( 4 )
-region_rect = Rect2( 0, 0, 224, 49 )
-
-[sub_resource type="StyleBoxTexture" id=4]
-texture = ExtResource( 4 )
-region_rect = Rect2( 0, 0, 224, 49 )
+[sub_resource type="DynamicFont" id=4]
+size = 25
+font_data = ExtResource( 2 )
 
 [node name="Opening Scene" type="Node2D"]
 position = Vector2( 0, 38 )
@@ -82,17 +77,6 @@ playback_speed = 0.6
 anims/RESET = SubResource( 2 )
 anims/type = SubResource( 3 )
 
-[node name="MarginContainer4" type="MarginContainer" parent="."]
-margin_left = 70.0
-margin_top = 408.0
-margin_right = 955.0
-margin_bottom = 497.0
-
-[node name="ColorRect" type="ColorRect" parent="MarginContainer4"]
-margin_right = 885.0
-margin_bottom = 89.0
-color = Color( 1, 0.803922, 0.388235, 1 )
-
 [node name="MarginContainer2" type="MarginContainer" parent="."]
 margin_left = 348.0
 margin_top = 420.0
@@ -102,8 +86,8 @@ margin_bottom = 484.0
 [node name="Button" type="Button" parent="MarginContainer2"]
 margin_right = 300.0
 margin_bottom = 64.0
-custom_styles/hover = SubResource( 8 )
-custom_styles/normal = SubResource( 4 )
+custom_fonts/font = SubResource( 4 )
+text = "Start the Day"
 
 [connection signal="animation_finished" from="MarginContainer/AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
 [connection signal="button_up" from="MarginContainer2/Button" to="." method="_on_Button_button_up"]
diff --git a/Scenes/Intro/Intro3.tscn b/Scenes/Intro/Intro3.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://Scenes/Intro/Intro3.gd" type="Script" id=1]
 [ext_resource path="res://Inconsolata-Black.ttf" type="DynamicFontData" id=2]
-[ext_resource path="res://png/Monitor+icon.png" type="Texture" id=3]
+[ext_resource path="res://png/MonitorwAI.png" type="Texture" id=3]
 
 [sub_resource type="DynamicFont" id=1]
 size = 25
@@ -40,7 +40,7 @@ tracks/0/keys = {
 }
 
 [sub_resource type="DynamicFont" id=4]
-size = 30
+size = 20
 font_data = ExtResource( 2 )
 
 [node name="Opening Scene" type="Node2D"]
@@ -77,28 +77,17 @@ playback_speed = 0.6
 anims/RESET = SubResource( 2 )
 anims/type = SubResource( 3 )
 
-[node name="MarginContainer4" type="MarginContainer" parent="."]
-margin_left = 70.0
-margin_top = 408.0
-margin_right = 955.0
-margin_bottom = 497.0
-
-[node name="ColorRect" type="ColorRect" parent="MarginContainer4"]
-margin_right = 885.0
-margin_bottom = 89.0
-color = Color( 1, 0.803922, 0.388235, 1 )
-
 [node name="MarginContainer2" type="MarginContainer" parent="."]
-margin_left = 348.0
-margin_top = 420.0
-margin_right = 648.0
-margin_bottom = 484.0
+margin_left = 155.0
+margin_top = 421.0
+margin_right = 413.0
+margin_bottom = 482.0
 
 [node name="Button" type="Button" parent="MarginContainer2"]
-margin_right = 312.0
-margin_bottom = 64.0
+margin_right = 258.0
+margin_bottom = 61.0
 custom_fonts/font = SubResource( 4 )
-text = "How can you help me?"
+text = "My companion?"
 
 [connection signal="animation_finished" from="MarginContainer/AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
 [connection signal="pressed" from="MarginContainer2/Button" to="." method="_on_Button_pressed"]
diff --git a/Scenes/Intro/Intro4.tscn b/Scenes/Intro/Intro4.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://Scenes/Intro/Intro4.gd" type="Script" id=1]
 [ext_resource path="res://Inconsolata-Black.ttf" type="DynamicFontData" id=2]
-[ext_resource path="res://png/Monitor+icon.png" type="Texture" id=3]
+[ext_resource path="res://png/MonitorwAI.png" type="Texture" id=3]
 
 [sub_resource type="DynamicFont" id=1]
 size = 25
@@ -40,7 +40,7 @@ tracks/0/keys = {
 }
 
 [sub_resource type="DynamicFont" id=4]
-size = 25
+size = 20
 font_data = ExtResource( 2 )
 
 [node name="Opening Scene" type="Node2D"]
@@ -61,12 +61,12 @@ margin_right = 944.0
 margin_bottom = 80.0
 
 [node name="Task" type="Label" parent="MarginContainer"]
-margin_top = 6.0
 margin_right = 875.0
-margin_bottom = 33.0
+margin_bottom = 57.0
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 custom_fonts/font = SubResource( 1 )
-text = "DICTOR: I will guide you in making the best decisions possible"
+text = "DICTOR: Yes! I will guide you in making the best decisions
+possible to make sure our society is safe!"
 align = 1
 uppercase = true
 percent_visible = 0.0
@@ -77,28 +77,17 @@ playback_speed = 0.6
 anims/RESET = SubResource( 2 )
 anims/type = SubResource( 3 )
 
-[node name="MarginContainer4" type="MarginContainer" parent="."]
-margin_left = 70.0
-margin_top = 408.0
-margin_right = 955.0
-margin_bottom = 497.0
-
-[node name="ColorRect" type="ColorRect" parent="MarginContainer4"]
-margin_right = 885.0
-margin_bottom = 89.0
-color = Color( 1, 0.803922, 0.388235, 1 )
-
 [node name="MarginContainer2" type="MarginContainer" parent="."]
-margin_left = 348.0
-margin_top = 420.0
-margin_right = 648.0
-margin_bottom = 484.0
+margin_left = 155.0
+margin_top = 421.0
+margin_right = 413.0
+margin_bottom = 482.0
 
 [node name="Button" type="Button" parent="MarginContainer2"]
-margin_right = 300.0
-margin_bottom = 64.0
+margin_right = 258.0
+margin_bottom = 61.0
 custom_fonts/font = SubResource( 4 )
-text = "So how do I start?"
+text = "Cool! Let's get Started!"
 
 [connection signal="animation_finished" from="MarginContainer/AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
 [connection signal="pressed" from="MarginContainer2/Button" to="." method="_on_Button_pressed"]
diff --git a/Scenes/Intro/Intro5.tscn b/Scenes/Intro/Intro5.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://Scenes/Intro/Intro5.gd" type="Script" id=1]
 [ext_resource path="res://Inconsolata-Black.ttf" type="DynamicFontData" id=2]
-[ext_resource path="res://png/Monitor+icon.png" type="Texture" id=3]
+[ext_resource path="res://png/MonitorwAI.png" type="Texture" id=3]
 [ext_resource path="res://png/Capital+person.png" type="Texture" id=4]
 
 [sub_resource type="DynamicFont" id=1]
@@ -56,7 +56,7 @@ rect_scale = Vector2( 1.0248, 0.990458 )
 texture = ExtResource( 3 )
 
 [node name="Testpfp" type="Sprite" parent="."]
-position = Vector2( 190.125, 290 )
+position = Vector2( 284, 292 )
 scale = Vector2( 0.489872, 0.506329 )
 texture = ExtResource( 4 )
 
@@ -84,26 +84,15 @@ playback_speed = 0.2
 anims/RESET = SubResource( 2 )
 anims/type = SubResource( 3 )
 
-[node name="MarginContainer4" type="MarginContainer" parent="."]
-margin_left = 70.0
-margin_top = 408.0
-margin_right = 955.0
-margin_bottom = 497.0
-
-[node name="ColorRect" type="ColorRect" parent="MarginContainer4"]
-margin_right = 885.0
-margin_bottom = 89.0
-color = Color( 1, 0.803922, 0.388235, 1 )
-
 [node name="MarginContainer2" type="MarginContainer" parent="."]
-margin_left = 348.0
-margin_top = 420.0
-margin_right = 648.0
-margin_bottom = 484.0
+margin_left = 155.0
+margin_top = 421.0
+margin_right = 413.0
+margin_bottom = 482.0
 
 [node name="Button" type="Button" parent="MarginContainer2"]
-margin_right = 300.0
-margin_bottom = 64.0
+margin_right = 258.0
+margin_bottom = 61.0
 custom_fonts/font = SubResource( 4 )
 text = "Investigate Him"
 
diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn
@@ -77,6 +77,7 @@ font_data = ExtResource( 1 )
 script = ExtResource( 3 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+reset_on_save = false
 playback_default_blend_time = 0.5
 playback_speed = 0.2
 anims/RESET = SubResource( 7 )
@@ -191,7 +192,7 @@ texture_normal = ExtResource( 4 )
 [connection signal="pressed" from="HBoxContainer/MarginContainer/Start Game Button" to="." method="_on_Start_Game_Button_pressed"]
 [connection signal="button_up" from="HBoxContainer/MarginContainer2/Controls Button" to="." method="_on_Controls_Button_button_up"]
 [connection signal="button_up" from="HBoxContainer/MarginContainer3/Credits Button" to="." method="_on_Credits_Button_button_up"]
-[connection signal="button_up" from="HBoxContainer/MarginContainer4/Quit" to="." method="_on_Quit_Game_Button_button_up"]
+[connection signal="button_up" from="HBoxContainer/MarginContainer4/Quit" to="." method="_on_Quit_button_up"]
 [connection signal="mouse_entered" from="HBoxContainer/MarginContainer4/Quit" to="." method="_on_Quit_mouse_entered"]
 [connection signal="mouse_exited" from="HBoxContainer/MarginContainer4/Quit" to="." method="_on_Quit_mouse_exited"]
 [connection signal="button_up" from="TextureButton" to="." method="_on_TextureButton_button_up"]
diff --git a/png/Female Commenter.PNG.import b/png/Female Commenter.PNG.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://png/Female Commenter.PNG"
+dest_files=[ "res://.import/Female Commenter.PNG-38452680c61d3d8c36278637668465f2.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/png/government Person.PNG.import b/png/government Person.PNG.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://png/government Person.PNG"
+dest_files=[ "res://.import/government Person.PNG-651789b5fd54e8f1dab8f4cbdcd3d26f.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source_md5="658d89891ce77f7ea9b19128dd7b39e8"`
	`2`	`+dest_md5="b1166910497e4da162c572ea74f2799a"`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source_md5="75483b80e1b22be16ac737015bf0b5b6"`
	`2`	`+dest_md5="87d32169bfe0be46b533c20567651642"`
	`3`	`+`