diff --git a/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.md5 b/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.md5 index bc8c618..2f97e8f 100644 --- a/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.md5 +++ b/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.md5 @@ -1,3 +1,3 @@ -source_md5="079efcbf483b26f2c408230ebe2b7b9d" -dest_md5="13eacbf430e7e68f7610730f2e60fd75" +source_md5="8406aa5d39658d07f4df6eb8d30b6efe" +dest_md5="139510e0d03c987cee6b0d307c32a3bb" diff --git a/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.stex b/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.stex index eea7f72..c2ecfd2 100644 Binary files a/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.stex and b/.import/Ending.png-a739b4e7085c6936dd464e11d48c3211.stex differ diff --git a/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.md5 b/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.md5 new file mode 100644 index 0000000..3095a7a --- /dev/null +++ b/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.md5 @@ -0,0 +1,3 @@ +source_md5="cf4aec4842e6f28b128d15ef58be76d0" +dest_md5="f713b52cc8973914be7fa878566b7e90" + diff --git a/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.stex b/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.stex new file mode 100644 index 0000000..11c0ee6 Binary files /dev/null and b/.import/LD51 - Office Madness.apple-touch-icon.png-d566a281ffba1facecb16ccc5770da1c.stex differ diff --git a/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.md5 b/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.md5 new file mode 100644 index 0000000..5328bc7 --- /dev/null +++ b/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.md5 @@ -0,0 +1,3 @@ +source_md5="47313fa4c47a9963fddd764e1ec6e4a8" +dest_md5="26ea799ea0a3da9e753b3ebe822e0570" + diff --git a/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.stex b/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.stex new file mode 100644 index 0000000..71f6913 Binary files /dev/null and b/.import/LD51 - Office Madness.icon.png-1aef36db851001fbfdd3ae3bf07637ab.stex differ diff --git a/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.md5 b/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.md5 new file mode 100644 index 0000000..087b6ed --- /dev/null +++ b/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.md5 @@ -0,0 +1,3 @@ +source_md5="7e41bf3051b18e392a4bb6c0cc45cd7c" +dest_md5="73e4f4d3969b9486e63fd804f5f0f1a9" + diff --git a/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.stex b/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.stex new file mode 100644 index 0000000..3cf702c Binary files /dev/null and b/.import/LD51 - Office Madness.png-f6b913df60338d8effe0446dec41cd20.stex differ diff --git a/Scenes/Ending.tscn b/Scenes/Ending.tscn index 0a2f000..02be891 100644 --- a/Scenes/Ending.tscn +++ b/Scenes/Ending.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Scripts/Play.gd" type="Script" id=1] [ext_resource path="res://Sprites/Play_again_button.png" type="Texture" id=2] @@ -8,14 +8,14 @@ [ext_resource path="res://Music/Music_Changer.gd" type="Script" id=6] [ext_resource path="res://Sprites/Music_On.png" type="Texture" id=7] [ext_resource path="res://Fonts/Life is goofy.ttf" type="DynamicFontData" id=8] +[ext_resource path="res://Scripts/Time_Display.gd" type="Script" id=9] [sub_resource type="DynamicFont" id=1] size = 80 font_data = ExtResource( 4 ) [sub_resource type="DynamicFont" id=2] -size = 35 -outline_color = Color( 0, 0, 0, 1 ) +size = 90 font_data = ExtResource( 8 ) [node name="Panel" type="Panel"] @@ -67,21 +67,11 @@ flat = true [node name="Label2" type="Label" parent="."] modulate = Color( 0, 0, 0, 1 ) -margin_left = 302.0 -margin_top = 160.0 -margin_right = 681.0 -margin_bottom = 577.0 +margin_left = 297.0 +margin_top = 308.0 +margin_right = 993.0 +margin_bottom = 368.0 custom_fonts/font = SubResource( 2 ) -text = "Music by Kevin Macleod (incompetech.com) -Sound by FreeSound - - - - - - - - - - -Made by Cookie-CHR for Ludum Dare 51" +text = "60 minutes and 60 seconds" +align = 1 +script = ExtResource( 9 ) diff --git a/Scripts/M_manager.gd b/Scripts/M_manager.gd index 1628bfd..4936df5 100644 --- a/Scripts/M_manager.gd +++ b/Scripts/M_manager.gd @@ -42,7 +42,7 @@ func on_finished(): var sprite = Sprite.new() sprite.texture = completed spawnpoint.add_child(sprite) - sprite.position = Vector2(348, 320) + sprite.position = Vector2(300, 270) var sound = audiostream.instance() spawnpoint.add_child(sound) sound._play("victory") diff --git a/Scripts/Play.gd b/Scripts/Play.gd index 3ee4018..659942d 100644 --- a/Scripts/Play.gd +++ b/Scripts/Play.gd @@ -5,6 +5,7 @@ var muted = preload("res://Sprites/Music_Off.png") var unmuted = preload("res://Sprites/Music_On.png") # Called when the node enters the scene tree for the first time. func _ready(): + GlobalTimer._stop() for child in get_children(): if child.name == "Play": child.connect("pressed", self, "_play") diff --git a/Scripts/TimePassed.gd b/Scripts/TimePassed.gd index 8d0dec2..b7c252b 100644 --- a/Scripts/TimePassed.gd +++ b/Scripts/TimePassed.gd @@ -6,7 +6,14 @@ var seconds_passed # Called when the node enters the scene tree for the first time. func _ready(): - seconds_passed = 0 + _play() func _on_Timer_timeout(): seconds_passed += 1 + +func _play(): + seconds_passed = 0 + start() + +func _stop(): + stop() diff --git a/Scripts/Time_Display.gd b/Scripts/Time_Display.gd new file mode 100644 index 0000000..372101c --- /dev/null +++ b/Scripts/Time_Display.gd @@ -0,0 +1,12 @@ +extends Label + +# Called when the node enters the scene tree for the first time. +func _ready(): + var seconds = GlobalTimer.seconds_passed%60 + var minutes = (GlobalTimer.seconds_passed/60)%60 + var string = "" + + if minutes > 0: + string += str(minutes)+" minutes and" + string += str(seconds)+" seconds" + self.text = string diff --git a/Scripts/Timer.gd b/Scripts/Timer.gd index 08f8712..079cfbf 100644 --- a/Scripts/Timer.gd +++ b/Scripts/Timer.gd @@ -18,6 +18,7 @@ func _ready(): elif child.name=="SpawnPoint": MManager.reset_spawnpoint(child) randomize() + GlobalTimer._play() _on_Timer_timeout() # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/Scripts/Timer.tscn b/Scripts/Timer.tscn index d7eac07..e6cd77e 100644 --- a/Scripts/Timer.tscn +++ b/Scripts/Timer.tscn @@ -3,7 +3,6 @@ [ext_resource path="res://Scripts/TimePassed.gd" type="Script" id=1] [node name="Timer" type="Timer"] -autostart = true script = ExtResource( 1 ) [connection signal="timeout" from="." to="." method="_on_Timer_timeout"] diff --git a/Sprites/Ending.png b/Sprites/Ending.png index f280aca..786a244 100644 Binary files a/Sprites/Ending.png and b/Sprites/Ending.png differ diff --git a/gimp stuff/Ending.xcf b/gimp stuff/Ending.xcf index 6f59e4c..4c6d0c4 100644 Binary files a/gimp stuff/Ending.xcf and b/gimp stuff/Ending.xcf differ diff --git a/project.godot b/project.godot index 109a0ef..57059d6 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=4 config/name="LD51 - Office Madness" run/main_scene="res://Scenes/Title.tscn" -config/icon="res://icon.png" +config/icon="res://Sprites/Me.png" [autoload]