diff --git a/media/image/btn.png b/media/image/btn.png index 08b7285..7944270 100644 Binary files a/media/image/btn.png and b/media/image/btn.png differ diff --git a/media/image/crate.png b/media/image/crate.png index 49af2c2..a553180 100644 Binary files a/media/image/crate.png and b/media/image/crate.png differ diff --git a/media/image/crate_tiles.png b/media/image/crate_tiles.png index 4ec6bab..c7ba6c4 100644 Binary files a/media/image/crate_tiles.png and b/media/image/crate_tiles.png differ diff --git a/media/image/explode.png b/media/image/explode.png index 7ce5099..f307f24 100644 Binary files a/media/image/explode.png and b/media/image/explode.png differ diff --git a/media/image/menu.png b/media/image/menu.png new file mode 100644 index 0000000..1a2da60 Binary files /dev/null and b/media/image/menu.png differ diff --git a/src/actor/Exit.tscn b/src/actor/Exit.tscn index 7ee8d1b..3ddd209 100644 --- a/src/actor/Exit.tscn +++ b/src/actor/Exit.tscn @@ -57,7 +57,6 @@ anims/Loop = SubResource( 1 ) position = Vector2( 3, 3 ) [node name="dust" type="Sprite" parent="Dust"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) texture = ExtResource( 3 ) centered = false diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 52aa325..38f0248 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=11 format=2] +[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=1] [ext_resource path="res://src/autoload/UI.gd" type="Script" id=3] [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] -[ext_resource path="res://media/font/NicoPups-Regular.ttf" type="DynamicFontData" id=7] [ext_resource path="res://media/font/NicoPaint-Regular.ttf" type="DynamicFontData" id=8] [sub_resource type="DynamicFont" id=4] @@ -14,10 +14,11 @@ extra_spacing_bottom = -1 font_data = ExtResource( 8 ) [sub_resource type="DynamicFont" id=3] +size = 5 outline_size = 1 outline_color = Color( 0, 0, 0, 1 ) extra_spacing_bottom = -1 -font_data = ExtResource( 7 ) +font_data = ExtResource( 1 ) [sub_resource type="DynamicFont" id=5] outline_size = 1 @@ -35,7 +36,6 @@ layer = 5 script = ExtResource( 3 ) [node name="Center" type="CenterContainer" parent="."] -modulate = Color( 1, 0.945098, 0.909804, 1 ) anchor_right = 1.0 anchor_bottom = 1.0 @@ -49,10 +49,12 @@ margin_left = 5.0 margin_top = 110.0 margin_right = 223.0 margin_bottom = 125.0 +custom_constants/separation = 0 [node name="X" type="HBoxContainer" parent="Center/Control/List"] -margin_right = 50.0 +margin_right = 48.0 margin_bottom = 15.0 +custom_constants/separation = 2 [node name="Key" type="Label" parent="Center/Control/List/X"] margin_right = 10.0 @@ -61,22 +63,24 @@ custom_fonts/font = SubResource( 4 ) text = "x" [node name="Desc" type="Label" parent="Center/Control/List/X"] -margin_left = 14.0 -margin_right = 50.0 -margin_bottom = 15.0 +margin_left = 12.0 +margin_top = 4.0 +margin_right = 48.0 +margin_bottom = 10.0 custom_fonts/font = SubResource( 3 ) text = "select" [node name="Spacer" type="Control" parent="Center/Control/List"] -margin_left = 54.0 -margin_right = 168.0 +margin_left = 48.0 +margin_right = 52.0 margin_bottom = 15.0 -size_flags_horizontal = 3 +rect_min_size = Vector2( 4, 0 ) [node name="C" type="HBoxContainer" parent="Center/Control/List"] -margin_left = 172.0 -margin_right = 218.0 +margin_left = 52.0 +margin_right = 91.0 margin_bottom = 15.0 +custom_constants/separation = 2 [node name="Key" type="Label" parent="Center/Control/List/C"] margin_right = 13.0 @@ -85,9 +89,10 @@ custom_fonts/font = SubResource( 4 ) text = "C" [node name="Desc" type="Label" parent="Center/Control/List/C"] -margin_left = 17.0 -margin_right = 46.0 -margin_bottom = 15.0 +margin_left = 15.0 +margin_top = 4.0 +margin_right = 39.0 +margin_bottom = 10.0 custom_fonts/font = SubResource( 3 ) text = "back" diff --git a/src/autoload/Wipe.tscn b/src/autoload/Wipe.tscn index 4dc6888..de5788a 100644 --- a/src/autoload/Wipe.tscn +++ b/src/autoload/Wipe.tscn @@ -19,7 +19,6 @@ layer = 10 script = ExtResource( 1 ) [node name="ColorRect" type="ColorRect" parent="."] -modulate = Color( 1, 0.945098, 0.909804, 1 ) material = SubResource( 1 ) anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 6c16623..58d0614 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -1,11 +1,11 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=1] [ext_resource path="res://media/image/9slice.png" type="Texture" id=2] [ext_resource path="res://src/menu/StartMenu.gd" type="Script" id=3] [ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=4] [ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=5] -[ext_resource path="res://media/font/CompassPro.ttf" type="DynamicFontData" id=6] +[ext_resource path="res://media/font/ExpressionPro.ttf" type="DynamicFontData" id=6] [ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=7] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] @@ -15,6 +15,7 @@ [ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=13] [ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=14] [ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=15] +[ext_resource path="res://media/image/menu.png" type="Texture" id=16] [ext_resource path="res://media/font/m5x7.tres" type="DynamicFont" id=17] [ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=18] [ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=19] @@ -22,6 +23,7 @@ [ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=21] [ext_resource path="res://media/audio/sfx/Randomize105.wav" type="AudioStream" id=22] [ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=23] +[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=24] [sub_resource type="DynamicFont" id=3] font_data = ExtResource( 6 ) @@ -32,6 +34,10 @@ extra_spacing_top = -11 extra_spacing_bottom = -12 font_data = ExtResource( 5 ) +[sub_resource type="DynamicFont" id=5] +size = 5 +font_data = ExtResource( 24 ) + [node name="StartMenu" type="Node2D"] pause_mode = 2 script = ExtResource( 3 ) @@ -127,33 +133,94 @@ __meta__ = { } [node name="Control" type="Control" parent="."] -modulate = Color( 1, 0.945098, 0.909804, 1 ) margin_left = -24.0 margin_top = 12.0 margin_right = 204.0 margin_bottom = 140.0 -[node name="Menu2" type="VBoxContainer" parent="Control"] +[node name="Menu" type="VBoxContainer" parent="Control"] margin_left = 2.0 margin_top = 32.0 margin_right = 66.0 margin_bottom = 104.0 alignment = 1 -[node name="Center" type="CenterContainer" parent="Control/Menu2"] -margin_top = 10.0 +[node name="Item" type="HBoxContainer" parent="Control/Menu"] +margin_top = 11.0 +margin_right = 64.0 +margin_bottom = 25.0 +rect_min_size = Vector2( 0, 12 ) + +[node name="Image" type="Control" parent="Control/Menu/Item"] +margin_right = 8.0 +margin_bottom = 14.0 +rect_min_size = Vector2( 8, 8 ) + +[node name="Sprite" type="Sprite" parent="Control/Menu/Item/Image"] +position = Vector2( 0, 4 ) +texture = ExtResource( 16 ) +centered = false +hframes = 4 +vframes = 4 + +[node name="Label" type="Label" parent="Control/Menu/Item"] +margin_left = 12.0 +margin_right = 39.0 +margin_bottom = 14.0 +custom_fonts/font = SubResource( 3 ) +text = "play" + +[node name="Item2" type="HBoxContainer" parent="Control/Menu"] +margin_top = 29.0 +margin_right = 64.0 +margin_bottom = 43.0 +rect_min_size = Vector2( 0, 12 ) + +[node name="Image" type="Control" parent="Control/Menu/Item2"] +margin_right = 8.0 +margin_bottom = 14.0 +rect_min_size = Vector2( 8, 8 ) + +[node name="Sprite" type="Sprite" parent="Control/Menu/Item2/Image"] +position = Vector2( 0, 4 ) +texture = ExtResource( 16 ) +centered = false +hframes = 4 +vframes = 4 +frame = 1 + +[node name="Label" type="Label" parent="Control/Menu/Item2"] +margin_left = 12.0 +margin_right = 58.0 +margin_bottom = 14.0 +custom_fonts/font = SubResource( 3 ) +text = "options" + +[node name="Item3" type="HBoxContainer" parent="Control/Menu"] +margin_top = 47.0 margin_right = 64.0 margin_bottom = 61.0 rect_min_size = Vector2( 0, 12 ) -[node name="Label" type="Label" parent="Control/Menu2/Center"] -margin_left = 9.0 -margin_right = 54.0 -margin_bottom = 51.0 +[node name="Image" type="Control" parent="Control/Menu/Item3"] +margin_right = 8.0 +margin_bottom = 14.0 +rect_min_size = Vector2( 8, 8 ) + +[node name="Sprite" type="Sprite" parent="Control/Menu/Item3/Image"] +position = Vector2( 0, 4 ) +texture = ExtResource( 16 ) +centered = false +hframes = 4 +vframes = 4 +frame = 2 + +[node name="Label" type="Label" parent="Control/Menu/Item3"] +margin_left = 12.0 +margin_right = 58.0 +margin_bottom = 14.0 custom_fonts/font = SubResource( 3 ) -text = "play -options -credits" +text = "credits" [node name="Header" type="Label" parent="Control"] margin_top = 5.0 @@ -166,11 +233,21 @@ align = 1 [node name="Logo" type="TextureRect" parent="Control"] margin_left = 115.0 -margin_top = 97.0 +margin_top = 95.0 margin_right = 192.0 -margin_bottom = 125.0 +margin_bottom = 123.0 texture = ExtResource( 4 ) +[node name="Website" type="Label" parent="Control"] +margin_left = 158.0 +margin_top = 112.0 +margin_right = 227.0 +margin_bottom = 127.0 +custom_fonts/font = SubResource( 5 ) +text = "hhoney.net" +align = 2 +valign = 2 + [node name="AudioScroll" type="AudioStreamPlayer" parent="."] stream = ExtResource( 7 ) volume_db = -7.0 diff --git a/src/menu/WinScreen.tscn b/src/menu/WinScreen.tscn index 7beb0a1..be09bde 100644 --- a/src/menu/WinScreen.tscn +++ b/src/menu/WinScreen.tscn @@ -18,12 +18,8 @@ margin_top = 10.0 margin_right = 230.0 margin_bottom = 23.0 custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) text = "YOU WIN!" align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="ThanksForPlaying" type="Label" parent="."] margin_left = 2.0 @@ -31,7 +27,6 @@ margin_top = 36.0 margin_right = 230.0 margin_bottom = 44.0 custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) text = "thanks for playing" align = 1 __meta__ = { @@ -44,7 +39,6 @@ margin_top = 58.0 margin_right = 230.0 margin_bottom = 71.0 custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) text = "TINY CRATE" align = 1 __meta__ = { @@ -57,7 +51,6 @@ margin_top = 84.0 margin_right = 230.0 margin_bottom = 92.0 custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) text = "a game by" align = 1 __meta__ = { @@ -70,7 +63,6 @@ margin_top = 103.0 margin_right = 230.0 margin_bottom = 116.0 custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) text = "Harmony Honey" align = 1 __meta__ = { diff --git a/src/menu/credits.tscn b/src/menu/credits.tscn index 4e84667..34b50f5 100644 --- a/src/menu/credits.tscn +++ b/src/menu/credits.tscn @@ -28,7 +28,6 @@ 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 ) @@ -40,14 +39,12 @@ 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 ) @@ -56,7 +53,6 @@ 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 = "hhoney.net diff --git a/src/menu/options/OptionsMenu.tscn b/src/menu/options/OptionsMenu.tscn index 7d9ccc7..b0d6367 100644 --- a/src/menu/options/OptionsMenu.tscn +++ b/src/menu/options/OptionsMenu.tscn @@ -44,7 +44,6 @@ margin_left = 14.0 margin_top = 7.0 margin_right = 242.0 margin_bottom = 20.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 ) @@ -91,7 +90,6 @@ script = ExtResource( 19 ) margin_top = 1.0 margin_right = 128.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Back to Menu" align = 1 @@ -124,7 +122,6 @@ script = ExtResource( 20 ) margin_top = 1.0 margin_right = 50.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Fullscreen" __meta__ = { @@ -136,7 +133,6 @@ margin_left = 99.0 margin_top = -1.0 margin_right = 109.0 margin_bottom = 9.0 -color = Color( 1, 0.945098, 0.909804, 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -147,16 +143,12 @@ margin_top = 1.0 margin_right = 9.0 margin_bottom = 9.0 color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Fill" type="ColorRect" parent="MenuItems/Fullscreen/Box"] margin_left = 2.0 margin_top = 2.0 margin_right = 8.0 margin_bottom = 8.0 -color = Color( 1, 0.945098, 0.909804, 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -173,7 +165,6 @@ script = ExtResource( 21 ) margin_top = 1.0 margin_right = 50.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Window Size" __meta__ = { @@ -185,7 +176,6 @@ margin_left = 48.0 margin_top = 1.0 margin_right = 80.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "1x" align = 1 @@ -198,7 +188,6 @@ margin_left = 72.0 margin_top = 1.0 margin_right = 136.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "228 x 128" align = 1 @@ -218,7 +207,6 @@ script = ExtResource( 22 ) margin_top = 1.0 margin_right = 56.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Touch Controls" __meta__ = { @@ -230,7 +218,6 @@ margin_left = 99.0 margin_top = -1.0 margin_right = 109.0 margin_bottom = 9.0 -color = Color( 1, 0.945098, 0.909804, 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -250,7 +237,6 @@ margin_left = 2.0 margin_top = 2.0 margin_right = 8.0 margin_bottom = 8.0 -color = Color( 1, 0.945098, 0.909804, 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -267,7 +253,6 @@ script = ExtResource( 23 ) margin_top = 1.0 margin_right = 128.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Delete Save Data" align = 1 @@ -287,7 +272,6 @@ script = ExtResource( 24 ) margin_top = 1.0 margin_right = 128.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 9 ) text = "Unlock All" align = 1 diff --git a/src/menu/options/Volume.tscn b/src/menu/options/Volume.tscn index 178de9d..d29924a 100644 --- a/src/menu/options/Volume.tscn +++ b/src/menu/options/Volume.tscn @@ -13,7 +13,6 @@ script = ExtResource( 3 ) margin_top = 1.0 margin_right = 42.0 margin_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) custom_fonts/font = ExtResource( 4 ) text = "Sounds" diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 7e08bb3..50cbd45 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -126,7 +126,6 @@ handle_input_locally = false render_target_update_mode = 3 [node name="Overlay" type="Control" parent="Control/Screen"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) margin_right = 100.0 margin_bottom = 100.0 diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 3042576..be1a9ca 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -17,7 +17,6 @@ layer = 9 [node name="ColorRect" type="ColorRect" parent="CanvasLayer"] anchor_right = 1.0 anchor_bottom = 1.0 -color = Color( 1, 0.945098, 0.909804, 1 ) [node name="Logo" type="Sprite" parent="CanvasLayer"] modulate = Color( 0, 0, 0, 1 )