diff --git a/media/image/HarmonyHoneyLogo.png b/media/image/HarmonyHoneyLogo.png index 81820cc..99fb79f 100644 Binary files a/media/image/HarmonyHoneyLogo.png and b/media/image/HarmonyHoneyLogo.png differ diff --git a/media/image/note.png b/media/image/note.png new file mode 100644 index 0000000..f5c74c7 Binary files /dev/null and b/media/image/note.png differ diff --git a/media/image/splash.png b/media/image/splash.png new file mode 100644 index 0000000..4cc1f65 Binary files /dev/null and b/media/image/splash.png differ diff --git a/project.godot b/project.godot index 19448f7..0a8e261 100644 --- a/project.godot +++ b/project.godot @@ -86,6 +86,9 @@ hhoney.net" run/main_scene="res://src/menu/splash.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="tiny_crate" +boot_splash/image="res://media/image/splash.png" +boot_splash/use_filter=false +boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://media/image/icon.png" config/windows_native_icon="res://media/image/icon_gimp.ico" @@ -103,6 +106,8 @@ UI="*res://src/autoload/UI.tscn" window/size/width=228 window/size/height=128 +window/size/test_width=1280 +window/size/test_height=720 window/dpi/allow_hidpi=true window/stretch/mode="viewport" window/stretch/aspect="keep" diff --git a/src/actor/Note.tscn b/src/actor/Note.tscn index 673f464..a5efa65 100644 --- a/src/actor/Note.tscn +++ b/src/actor/Note.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/actor/Note.gd" type="Script" id=1] -[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=2] +[ext_resource path="res://media/image/note.png" type="Texture" id=2] [node name="Note" type="Node2D"] modulate = Color( 1, 0.945098, 0.909804, 1 ) @@ -16,5 +16,3 @@ palette = PoolColorArray( 1, 0.945098, 0.909804, 1, 0.113725, 0.168627, 0.32549, [node name="Sprite" type="Sprite" parent="."] position = Vector2( 5, 5 ) texture = ExtResource( 2 ) -region_enabled = true -region_rect = Rect2( 4, 2, 14, 14 ) diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 0bc687e..6f26a52 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=1] [ext_resource path="res://media/image/btn.png" type="Texture" id=2] [ext_resource path="res://src/autoload/UI.gd" type="Script" id=3] -[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=4] +[ext_resource path="res://media/image/note.png" type="Texture" id=4] [ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] @@ -98,5 +98,3 @@ align = 2 modulate = Color( 1, 0.945098, 0.909804, 1 ) material = SubResource( 2 ) texture = ExtResource( 4 ) -region_enabled = true -region_rect = Rect2( 4, 2, 14, 14 ) diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index f34804a..671fafb 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -135,9 +135,6 @@ custom_constants/shadow_as_outline = 1 custom_fonts/font = SubResource( 1 ) text = "TINY CRATE" align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Signature" type="Label" parent="Header"] margin_left = 26.0 diff --git a/src/menu/credits.tscn b/src/menu/credits.tscn index f28d266..4e84667 100644 --- a/src/menu/credits.tscn +++ b/src/menu/credits.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=1] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] @@ -9,6 +9,12 @@ [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=7] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=9] +[ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=10] +[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=11] + +[sub_resource type="DynamicFont" id=1] +extra_spacing_bottom = -1 +font_data = ExtResource( 10 ) [node name="Credits" type="Node2D"] script = ExtResource( 4 ) @@ -17,22 +23,46 @@ script = ExtResource( 4 ) stream = ExtResource( 5 ) bus = "SFX" +[node name="Header" type="Label" parent="."] +margin_left = -2.0 +margin_top = 11.0 +margin_right = 226.0 +margin_bottom = 24.0 +custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_constants/shadow_as_outline = 1 +custom_fonts/font = SubResource( 1 ) +text = "TINY CRATE" +align = 1 + +[node name="By" type="Label" parent="."] +margin_left = 103.0 +margin_top = 25.0 +margin_right = 113.0 +margin_bottom = 35.0 +custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +custom_fonts/font = ExtResource( 1 ) +text = "by" +align = 1 +valign = 1 + +[node name="HarmonyHoneyLogo" type="Sprite" parent="."] +modulate = Color( 1, 0.945098, 0.909804, 1 ) +position = Vector2( 112, 49 ) +texture = ExtResource( 11 ) + [node name="List" type="Label" parent="."] margin_left = -2.0 +margin_top = 59.0 margin_right = 226.0 margin_bottom = 128.0 custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 1 ) -text = "Tiny Crate -by Harmony Honey +text = "hhoney.net Made with Godot Engine -Using fonts: -m3x6, m5x7, m6x11 -by Daniel Linssen - -visit hhoney.net for more! <3" +Fonts by Daniel Linssen" align = 1 valign = 1 @@ -43,7 +73,7 @@ tile_data = PoolIntArray( -65531, 0, 1, 5, 536870912, 0, 65541, 0, 1, 131077, 0, [node name="DetailTileMap" parent="Stage" instance=ExtResource( 2 )] z_index = -11 -tile_data = PoolIntArray( -1, 4, 0, -65536, 536870916, 1, -65535, 4, 0, -65532, 5, 0, -65529, 536870916, 3, -65528, 536870916, 1, -65527, 536870916, 0, -65526, 4, 3, -65510, 536870916, 0, -65509, 4, 1, -65508, 4, 1, 65535, 536870916, 1, 0, 536870916, 0, 1, 536870916, 2, 4, -1073741819, 0, 7, 4, 2, 8, 4, 0, 9, 536870916, 1, 10, 536870916, 2, 17, 4, 2, 18, 536870916, 0, 19, 4, 1, 20, 4, 1, 21, 4, 0, 22, 536870916, 2, 26, 4, 2, 27, 4, 0, 28, 4, 1, 131071, 4, 0, 65536, 536870916, 2, 65540, -1073741819, 0, 65544, 4, 2, 65545, 4, 3, 65554, 4, 2, 65555, 4, 0, 65556, 4, 1, 65557, 536870916, 2, 65563, 4, 2, 65564, 536870916, 0, 131076, -1073741819, 0, 131095, 5, 2, 131096, 5, 0, 131097, -1610612731, 2, 196612, -1073741819, 2, 196614, 536870917, 2, 196631, 5, 0, 196632, 5, 0, 196633, 5, 0, 196634, -1610612731, 2, 262150, -1610612731, 0, 262166, -1610612731, 0, 262167, 5, 0, 262168, 5, 0, 262169, 5, 0, 262170, -1073741819, 0, 327686, -1610612731, 0, 327702, -1073741819, 2, 327703, 5, 0, 327704, 5, 0, 327705, 5, 0, 458751, 5, 0, 393216, 5, 0, 393217, 536870917, 2, 393220, 5, 2, 393222, -536870907, 2, 393239, -1073741819, 2, 393240, 5, 0, 393241, 1610612741, 2, 393242, 536870916, 3, 393243, 536870916, 1, 393244, 536870916, 1, 458776, 5, 1, 458778, 4, 2, 458779, 536870916, 0, 458780, 536870916, 1, 524289, 1073741829, 2, 524290, 5, 0, 524291, 5, 1, 524292, 1610612741, 2, 524312, 5, 1, 524313, 536870917, 2, 655359, 536870916, 1, 589824, 4, 3, 589827, 5, 1, 720895, 536870916, 1, 655360, 536870916, 2, 655362, 5, 2, 655363, 5, 1, 655364, 5, 0, 655365, -1610612731, 2, 655380, 5, 2, 655382, 5, 0, 655383, 5, 0, 655384, 5, 0, 655385, 1610612741, 2, 720897, 5, 2, 720898, 5, 0, 720899, 5, 0, 720900, -1610612731, 1, 720901, -1610612731, 1, 720902, -1610612731, 1, 720903, -1610612731, 2, 720916, -1073741819, 0, 720922, 4, 2, 720923, 4, 0, 720924, 4, 1, 786433, 5, 0, 786434, 1073741829, 1, 786435, 5, 0, 786436, 5, 0, 786452, -1073741819, 2, 786456, -1610612731, 2, 786459, 4, 2, 786460, 536870916, 1, 851969, -1073741819, 2, 851970, 5, 0, 851971, -2147483643, 1, 851972, -536870907, 1, 851973, -536870907, 2, 851992, 5, 0, 983039, 536870916, 0, 917504, 4, 3, 917506, -1073741819, 2, 917507, 5, 0, 917508, 1610612741, 2, 917528, 5, 0, 917531, 536870916, 3, 917532, 4, 0, 1048575, 4, 1, 983040, 4, 0, 983041, 4, 3, 983052, 536870916, 3, 983053, 4, 1, 983054, 4, 0, 983055, 4, 3, 983062, -2147483643, 2, 983064, 1610612741, 2, 983066, 536870916, 3, 983067, 536870916, 0, 983068, 536870916, 1, 1114111, 4, 1, 1048576, 4, 1, 1048577, 536870916, 0, 1048588, 4, 2, 1048589, 536870916, 1, 1048590, 536870916, 1, 1048591, 536870916, 2, 1048598, -2147483643, 0, 1048602, 4, 0, 1048603, 536870916, 1, 1048604, 4, 0 ) +tile_data = PoolIntArray( -1, 4, 0, -65536, 536870916, 1, -65535, 4, 0, -65532, 5, 0, -65529, 536870916, 3, -65528, 536870916, 1, -65527, 536870916, 0, -65526, 4, 3, -65510, 536870916, 0, -65509, 4, 1, -65508, 4, 1, 65535, 536870916, 1, 0, 536870916, 0, 1, 536870916, 2, 4, -1073741819, 0, 7, 4, 2, 8, 4, 0, 9, 536870916, 1, 10, 536870916, 2, 17, 4, 2, 18, 536870916, 0, 19, 4, 1, 20, 4, 1, 21, 4, 0, 22, 536870916, 2, 26, 4, 2, 27, 4, 0, 28, 4, 1, 131071, 4, 0, 65536, 536870916, 2, 65540, -1073741819, 0, 65543, 536870916, 3, 65544, 536870916, 2, 65555, 4, 2, 65556, 4, 1, 65557, 536870916, 2, 65563, 4, 2, 65564, 536870916, 0, 131076, -1073741819, 0, 131095, 5, 2, 131096, 5, 0, 131097, -1610612731, 2, 196612, -1073741819, 2, 196614, 536870917, 2, 196631, 5, 0, 196632, 5, 0, 196633, 5, 0, 196634, -1610612731, 2, 262150, -1610612731, 0, 262166, -1610612731, 0, 262167, 5, 0, 262168, 5, 0, 262169, 5, 0, 262170, -1073741819, 0, 327686, -1610612731, 0, 327702, -1073741819, 2, 327703, 5, 0, 327704, 5, 0, 327705, 5, 0, 458751, 5, 0, 393216, 5, 0, 393217, 536870917, 2, 393220, 5, 2, 393222, -536870907, 2, 393239, -1073741819, 2, 393240, 5, 0, 393241, 1610612741, 2, 393242, 536870916, 3, 393243, 536870916, 1, 393244, 536870916, 1, 458776, 5, 1, 458778, 4, 2, 458779, 536870916, 0, 458780, 536870916, 1, 524289, 1073741829, 2, 524290, 5, 0, 524291, 5, 1, 524292, 1610612741, 2, 524312, 5, 1, 524313, 536870917, 2, 655359, 536870916, 1, 589824, 4, 3, 589827, 5, 1, 720895, 536870916, 1, 655360, 536870916, 2, 655362, 5, 2, 655363, 5, 1, 655364, 5, 0, 655365, -1610612731, 2, 655380, 5, 2, 655382, 5, 0, 655383, 5, 0, 655384, 5, 0, 655385, 1610612741, 2, 720897, 5, 2, 720898, 5, 0, 720899, 5, 0, 720900, -1610612731, 1, 720901, -1610612731, 1, 720902, -1610612731, 1, 720903, -1610612731, 2, 720916, -1073741819, 0, 720922, 4, 2, 720923, 4, 0, 720924, 4, 1, 786433, 5, 0, 786434, 1073741829, 1, 786435, 5, 0, 786436, 5, 0, 786452, -1073741819, 2, 786456, -1610612731, 2, 786459, 4, 2, 786460, 536870916, 1, 851969, -1073741819, 2, 851970, 5, 0, 851971, -2147483643, 1, 851972, -536870907, 1, 851973, -536870907, 2, 851992, 5, 0, 983039, 536870916, 0, 917504, 4, 3, 917506, -1073741819, 2, 917507, 5, 0, 917508, 1610612741, 2, 917528, 5, 0, 917531, 536870916, 3, 917532, 4, 0, 1048575, 4, 1, 983040, 4, 0, 983041, 4, 3, 983052, 536870916, 3, 983053, 4, 1, 983054, 4, 0, 983055, 4, 3, 983062, -2147483643, 2, 983064, 1610612741, 2, 983066, 536870916, 3, 983067, 536870916, 0, 983068, 536870916, 1, 1114111, 4, 1, 1048576, 4, 1, 1048577, 536870916, 0, 1048588, 4, 2, 1048589, 536870916, 1, 1048590, 536870916, 1, 1048591, 536870916, 2, 1048598, -2147483643, 0, 1048602, 4, 0, 1048603, 536870916, 1, 1048604, 4, 0 ) [node name="GameCamera" parent="Stage" instance=ExtResource( 6 )] position = Vector2( 112, 64 ) diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 8cc21cc..fc9e94e 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=2] -[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=3] +[ext_resource path="res://media/image/note.png" type="Texture" id=3] [ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] [ext_resource path="res://src/menu/select.gd" type="Script" id=7] @@ -163,8 +163,6 @@ modulate = Color( 1, 0.945098, 0.909804, 1 ) material = SubResource( 3 ) position = Vector2( 90, 10 ) texture = ExtResource( 3 ) -region_enabled = true -region_rect = Rect2( 4, 2, 14, 14 ) [node name="Camera2D" type="Camera2D" parent="."] position = Vector2( 160, 90 ) diff --git a/src/menu/splash.gd b/src/menu/splash.gd index fe09bc0..e2076bc 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,22 +1,8 @@ extends Node2D -var timer = 0.7 -var step = 0 -onready var logo = $Logo -onready var audio = $AudioStreamPlayer - func _ready(): - logo.visible = false + yield(get_tree(), "idle_frame") Music.play() - -func _physics_process(delta): - timer = max(0, timer - delta) - if timer == 0: - if step == 0: - logo.visible = true - audio.play() - step = 1 - timer = 1.5 - else: - Shared.wipe_scene(Shared.main_menu_path) - set_physics_process(false) + $AudioStreamPlayer.play() + yield(get_tree().create_timer(1.5), "timeout") + Shared.wipe_scene(Shared.main_menu_path) diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 4880640..4a2b09c 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -8,18 +8,17 @@ script = ExtResource( 3 ) [node name="ColorRect" type="ColorRect" parent="."] -margin_left = 14.0 -margin_right = 242.0 +margin_right = 228.0 margin_bottom = 128.0 color = Color( 1, 0.945098, 0.909804, 1 ) [node name="Logo" type="Sprite" parent="."] modulate = Color( 0, 0, 0, 1 ) -position = Vector2( 126, 71 ) +position = Vector2( 114, 64 ) texture = ExtResource( 1 ) [node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( 128, 64 ) +position = Vector2( 114, 64 ) current = true [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]