diff --git a/butler_push.bat b/butler_push.bat index 9729992..5359eb6 100644 --- a/butler_push.bat +++ b/butler_push.bat @@ -3,4 +3,5 @@ butler push win harmonyhoney/tinycrate:windows butler push linux harmonyhoney/tinycrate:linux butler push mac harmonyhoney/tinycrate:mac butler push web harmonyhoney/tinycrate:web -butler push android harmonyhoney/tinycrate:android \ No newline at end of file +butler push android harmonyhoney/tinycrate:android +pause \ No newline at end of file diff --git a/export_presets.cfg b/export_presets.cfg index a2e7c7c..5702224 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -380,3 +380,209 @@ permissions/write_sms=false permissions/write_social_stream=false permissions/write_sync_settings=false permissions/write_user_dictionary=false + +[preset.5] + +name="Android APK" +platform="Android" +runnable=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="export/android/Tiny-Crate33-4.apk" +script_export_mode=1 +script_encryption_key="" + +[preset.5.options] + +custom_template/debug="" +custom_template/release="" +custom_build/use_custom_build=true +custom_build/export_format=0 +custom_build/min_sdk="" +custom_build/target_sdk="33" +architectures/armeabi-v7a=true +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +keystore/debug="" +keystore/debug_user="" +keystore/debug_password="" +keystore/release="C:/Users/harmo/.android/tinycrate.keystore" +keystore/release_user="tinycrate" +keystore/release_password="release" +one_click_deploy/clear_previous_install=true +version/code=4 +version/name="1.0" +package/unique_name="harmonyhoney.tinycrate" +package/name="Tiny Crate" +package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="res://media/image/android_icon.png" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 +screen/immersive_mode=true +screen/support_small=true +screen/support_normal=true +screen/support_large=true +screen/support_xlarge=true +user_data_backup/allow=false +command_line/extra_args="" +apk_expansion/enable=false +apk_expansion/SALT="" +apk_expansion/public_key="" +permissions/custom_permissions=PoolStringArray( ) +permissions/access_checkin_properties=false +permissions/access_coarse_location=false +permissions/access_fine_location=false +permissions/access_location_extra_commands=false +permissions/access_mock_location=false +permissions/access_network_state=false +permissions/access_surface_flinger=false +permissions/access_wifi_state=false +permissions/account_manager=false +permissions/add_voicemail=false +permissions/authenticate_accounts=false +permissions/battery_stats=false +permissions/bind_accessibility_service=false +permissions/bind_appwidget=false +permissions/bind_device_admin=false +permissions/bind_input_method=false +permissions/bind_nfc_service=false +permissions/bind_notification_listener_service=false +permissions/bind_print_service=false +permissions/bind_remoteviews=false +permissions/bind_text_service=false +permissions/bind_vpn_service=false +permissions/bind_wallpaper=false +permissions/bluetooth=false +permissions/bluetooth_admin=false +permissions/bluetooth_privileged=false +permissions/brick=false +permissions/broadcast_package_removed=false +permissions/broadcast_sms=false +permissions/broadcast_sticky=false +permissions/broadcast_wap_push=false +permissions/call_phone=false +permissions/call_privileged=false +permissions/camera=false +permissions/capture_audio_output=false +permissions/capture_secure_video_output=false +permissions/capture_video_output=false +permissions/change_component_enabled_state=false +permissions/change_configuration=false +permissions/change_network_state=false +permissions/change_wifi_multicast_state=false +permissions/change_wifi_state=false +permissions/clear_app_cache=false +permissions/clear_app_user_data=false +permissions/control_location_updates=false +permissions/delete_cache_files=false +permissions/delete_packages=false +permissions/device_power=false +permissions/diagnostic=false +permissions/disable_keyguard=false +permissions/dump=false +permissions/expand_status_bar=false +permissions/factory_test=false +permissions/flashlight=false +permissions/force_back=false +permissions/get_accounts=false +permissions/get_package_size=false +permissions/get_tasks=false +permissions/get_top_activity_info=false +permissions/global_search=false +permissions/hardware_test=false +permissions/inject_events=false +permissions/install_location_provider=false +permissions/install_packages=false +permissions/install_shortcut=false +permissions/internal_system_window=false +permissions/internet=false +permissions/kill_background_processes=false +permissions/location_hardware=false +permissions/manage_accounts=false +permissions/manage_app_tokens=false +permissions/manage_documents=false +permissions/manage_external_storage=false +permissions/master_clear=false +permissions/media_content_control=false +permissions/modify_audio_settings=false +permissions/modify_phone_state=false +permissions/mount_format_filesystems=false +permissions/mount_unmount_filesystems=false +permissions/nfc=false +permissions/persistent_activity=false +permissions/process_outgoing_calls=false +permissions/read_calendar=false +permissions/read_call_log=false +permissions/read_contacts=false +permissions/read_external_storage=false +permissions/read_frame_buffer=false +permissions/read_history_bookmarks=false +permissions/read_input_state=false +permissions/read_logs=false +permissions/read_phone_state=false +permissions/read_profile=false +permissions/read_sms=false +permissions/read_social_stream=false +permissions/read_sync_settings=false +permissions/read_sync_stats=false +permissions/read_user_dictionary=false +permissions/reboot=false +permissions/receive_boot_completed=false +permissions/receive_mms=false +permissions/receive_sms=false +permissions/receive_wap_push=false +permissions/record_audio=false +permissions/reorder_tasks=false +permissions/restart_packages=false +permissions/send_respond_via_message=false +permissions/send_sms=false +permissions/set_activity_watcher=false +permissions/set_alarm=false +permissions/set_always_finish=false +permissions/set_animation_scale=false +permissions/set_debug_app=false +permissions/set_orientation=false +permissions/set_pointer_speed=false +permissions/set_preferred_applications=false +permissions/set_process_limit=false +permissions/set_time=false +permissions/set_time_zone=false +permissions/set_wallpaper=false +permissions/set_wallpaper_hints=false +permissions/signal_persistent_processes=false +permissions/status_bar=false +permissions/subscribed_feeds_read=false +permissions/subscribed_feeds_write=false +permissions/system_alert_window=false +permissions/transmit_ir=false +permissions/uninstall_shortcut=false +permissions/update_device_stats=false +permissions/use_credentials=false +permissions/use_sip=false +permissions/vibrate=false +permissions/wake_lock=false +permissions/write_apn_settings=false +permissions/write_calendar=false +permissions/write_call_log=false +permissions/write_contacts=false +permissions/write_external_storage=false +permissions/write_gservices=false +permissions/write_history_bookmarks=false +permissions/write_profile=false +permissions/write_secure_settings=false +permissions/write_settings=false +permissions/write_sms=false +permissions/write_social_stream=false +permissions/write_sync_settings=false +permissions/write_user_dictionary=false diff --git a/media/font/Abaddon Bold.ttf b/media/font/Abaddon Bold.ttf new file mode 100644 index 0000000..c0374e1 Binary files /dev/null and b/media/font/Abaddon Bold.ttf differ diff --git a/media/font/Abaddon Light.ttf b/media/font/Abaddon Light.ttf new file mode 100644 index 0000000..687f959 Binary files /dev/null and b/media/font/Abaddon Light.ttf differ diff --git a/media/font/CompassPro.ttf b/media/font/CompassPro.ttf new file mode 100644 index 0000000..5432d65 Binary files /dev/null and b/media/font/CompassPro.ttf differ diff --git a/media/font/DungeonFont.ttf b/media/font/DungeonFont.ttf new file mode 100644 index 0000000..413f196 Binary files /dev/null and b/media/font/DungeonFont.ttf differ diff --git a/media/font/EquipmentPro.ttf b/media/font/EquipmentPro.ttf new file mode 100644 index 0000000..b9813f1 Binary files /dev/null and b/media/font/EquipmentPro.ttf differ diff --git a/media/font/ExpressionPro.ttf b/media/font/ExpressionPro.ttf new file mode 100644 index 0000000..4600022 Binary files /dev/null and b/media/font/ExpressionPro.ttf differ diff --git a/media/font/FutilePro.ttf b/media/font/FutilePro.ttf new file mode 100644 index 0000000..33ea1a5 Binary files /dev/null and b/media/font/FutilePro.ttf differ diff --git a/media/font/Kaph-Italic.ttf b/media/font/Kaph-Italic.ttf new file mode 100644 index 0000000..d10a69c Binary files /dev/null and b/media/font/Kaph-Italic.ttf differ diff --git a/media/font/Kaph-Regular.ttf b/media/font/Kaph-Regular.ttf new file mode 100644 index 0000000..b84049c Binary files /dev/null and b/media/font/Kaph-Regular.ttf differ diff --git a/media/font/MatchupPro.ttf b/media/font/MatchupPro.ttf new file mode 100644 index 0000000..905154c Binary files /dev/null and b/media/font/MatchupPro.ttf differ diff --git a/media/font/NicoBold-Monospaced.ttf b/media/font/NicoBold-Monospaced.ttf new file mode 100644 index 0000000..19c10b9 Binary files /dev/null and b/media/font/NicoBold-Monospaced.ttf differ diff --git a/media/font/NicoBold-Regular.ttf b/media/font/NicoBold-Regular.ttf new file mode 100644 index 0000000..1abfda3 Binary files /dev/null and b/media/font/NicoBold-Regular.ttf differ diff --git a/media/font/NicoClean-Monospaced.ttf b/media/font/NicoClean-Monospaced.ttf new file mode 100644 index 0000000..c3e16c1 Binary files /dev/null and b/media/font/NicoClean-Monospaced.ttf differ diff --git a/media/font/NicoClean-Regular.ttf b/media/font/NicoClean-Regular.ttf new file mode 100644 index 0000000..067df39 Binary files /dev/null and b/media/font/NicoClean-Regular.ttf differ diff --git a/media/font/NicoPaint-Monospaced.ttf b/media/font/NicoPaint-Monospaced.ttf new file mode 100644 index 0000000..35259e3 Binary files /dev/null and b/media/font/NicoPaint-Monospaced.ttf differ diff --git a/media/font/NicoPaint-Regular.ttf b/media/font/NicoPaint-Regular.ttf new file mode 100644 index 0000000..43f210f Binary files /dev/null and b/media/font/NicoPaint-Regular.ttf differ diff --git a/media/font/NicoPups-Monospaced.ttf b/media/font/NicoPups-Monospaced.ttf new file mode 100644 index 0000000..c7d1d88 Binary files /dev/null and b/media/font/NicoPups-Monospaced.ttf differ diff --git a/media/font/NicoPups-Regular.ttf b/media/font/NicoPups-Regular.ttf new file mode 100644 index 0000000..519023b Binary files /dev/null and b/media/font/NicoPups-Regular.ttf differ diff --git a/media/font/QuinqueFive.ttf b/media/font/QuinqueFive.ttf new file mode 100644 index 0000000..a89a6e9 Binary files /dev/null and b/media/font/QuinqueFive.ttf differ diff --git a/media/font/Silver.ttf b/media/font/Silver.ttf new file mode 100644 index 0000000..ba88a85 Binary files /dev/null and b/media/font/Silver.ttf differ diff --git a/media/font/Sta.Toasty_font.ttf b/media/font/Sta.Toasty_font.ttf new file mode 100644 index 0000000..9638f5b Binary files /dev/null and b/media/font/Sta.Toasty_font.ttf differ diff --git a/media/font/ThaleahFat.ttf b/media/font/ThaleahFat.ttf new file mode 100644 index 0000000..91fc7dc Binary files /dev/null and b/media/font/ThaleahFat.ttf differ diff --git a/media/font/mago1.ttf b/media/font/mago1.ttf new file mode 100644 index 0000000..ae1e592 Binary files /dev/null and b/media/font/mago1.ttf differ diff --git a/media/font/mago2.ttf b/media/font/mago2.ttf new file mode 100644 index 0000000..67a2c5c Binary files /dev/null and b/media/font/mago2.ttf differ diff --git a/media/font/mago3.ttf b/media/font/mago3.ttf new file mode 100644 index 0000000..9b045c7 Binary files /dev/null and b/media/font/mago3.ttf differ diff --git a/media/font/monogram-extended.ttf b/media/font/monogram-extended.ttf new file mode 100644 index 0000000..4d4a390 Binary files /dev/null and b/media/font/monogram-extended.ttf differ diff --git a/media/font/monogram.tres b/media/font/monogram.tres new file mode 100644 index 0000000..07ec6a3 --- /dev/null +++ b/media/font/monogram.tres @@ -0,0 +1,6 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://media/font/monogram.ttf" type="DynamicFontData" id=1] + +[resource] +font_data = ExtResource( 1 ) diff --git a/media/font/monogram.ttf b/media/font/monogram.ttf new file mode 100644 index 0000000..aceaeba Binary files /dev/null and b/media/font/monogram.ttf differ diff --git a/project.godot b/project.godot index 2ba0b8d..1bc0790 100644 --- a/project.godot +++ b/project.godot @@ -197,7 +197,6 @@ action={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":74,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777240,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } reset={ diff --git a/src/autoload/UI.gd b/src/autoload/UI.gd index 389fac9..97150c6 100644 --- a/src/autoload/UI.gd +++ b/src/autoload/UI.gd @@ -1,15 +1,18 @@ extends CanvasLayer -onready var x := $Center/Control/Buttons/X -onready var c := $Center/Control/Buttons/C +onready var x := $Center/Control/List/X +onready var c := $Center/Control/List/C onready var notes := $Center/Control/Notes onready var notes_label := $Center/Control/Notes/Label +onready var spacer := $Center/Control/List/Spacer func _ready(): keys(false, false) notes.visible = false -func keys(left := true, right := true): +func keys(left := true, right := true, is_expand := true): x.visible = left c.visible = right + spacer.size_flags_horizontal = spacer.SIZE_EXPAND_FILL if is_expand else spacer.SIZE_FILL + diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 086111b..52aa325 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -1,17 +1,31 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=11 format=2] -[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/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=1] +[sub_resource type="DynamicFont" id=4] +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +extra_spacing_bottom = -1 +font_data = ExtResource( 8 ) + +[sub_resource type="DynamicFont" id=3] +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +extra_spacing_bottom = -1 +font_data = ExtResource( 7 ) + +[sub_resource type="DynamicFont" id=5] +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) extra_spacing_bottom = -1 font_data = ExtResource( 5 ) -[sub_resource type="ShaderMaterial" id=2] +[sub_resource type="ShaderMaterial" id=6] shader = ExtResource( 6 ) shader_param/line_color = Color( 0, 0, 0, 1 ) shader_param/line_thickness = 1.0 @@ -21,6 +35,7 @@ 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 @@ -29,81 +44,74 @@ margin_right = 228.0 margin_bottom = 128.0 rect_min_size = Vector2( 228, 128 ) -[node name="Buttons" type="Node2D" parent="Center/Control"] +[node name="List" type="HBoxContainer" parent="Center/Control"] +margin_left = 5.0 +margin_top = 110.0 +margin_right = 223.0 +margin_bottom = 125.0 -[node name="X" type="Sprite" parent="Center/Control/Buttons"] -position = Vector2( 12, 116 ) -texture = ExtResource( 2 ) -hframes = 6 -vframes = 4 -frame = 1 -region_rect = Rect2( 0, 0, 18, 18 ) +[node name="X" type="HBoxContainer" parent="Center/Control/List"] +margin_right = 50.0 +margin_bottom = 15.0 -[node name="Label" type="Label" parent="Center/Control/Buttons/X"] -margin_left = 11.0 -margin_top = -7.0 -margin_right = 49.0 -margin_bottom = 6.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 = ExtResource( 1 ) +[node name="Key" type="Label" parent="Center/Control/List/X"] +margin_right = 10.0 +margin_bottom = 15.0 +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 +custom_fonts/font = SubResource( 3 ) text = "select" -[node name="C" type="Sprite" parent="Center/Control/Buttons"] -position = Vector2( 216, 116 ) -texture = ExtResource( 2 ) -hframes = 6 -vframes = 4 -region_rect = Rect2( 0, 0, 18, 18 ) +[node name="Spacer" type="Control" parent="Center/Control/List"] +margin_left = 54.0 +margin_right = 168.0 +margin_bottom = 15.0 +size_flags_horizontal = 3 -[node name="Label" type="Label" parent="Center/Control/Buttons/C"] -margin_left = -38.0 -margin_top = -7.0 -margin_right = -10.0 -margin_bottom = 6.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 = ExtResource( 1 ) +[node name="C" type="HBoxContainer" parent="Center/Control/List"] +margin_left = 172.0 +margin_right = 218.0 +margin_bottom = 15.0 + +[node name="Key" type="Label" parent="Center/Control/List/C"] +margin_right = 13.0 +margin_bottom = 15.0 +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 +custom_fonts/font = SubResource( 3 ) text = "back" -[node name="Arrows" type="Sprite" parent="Center/Control/Buttons"] -visible = false -position = Vector2( 216, 116 ) -texture = ExtResource( 2 ) -hframes = 6 -vframes = 4 -frame = 7 -region_rect = Rect2( 0, 0, 18, 18 ) - -[node name="Label" type="Label" parent="Center/Control/Buttons/Arrows"] -margin_left = -40.0 -margin_top = -7.0 -margin_right = -10.0 -margin_bottom = 6.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 = ExtResource( 1 ) -text = "move" - -[node name="Notes" type="Node2D" parent="Center/Control"] -position = Vector2( 218, 11 ) +[node name="Notes" type="Control" parent="Center/Control"] +margin_left = 224.0 +margin_top = 5.0 +margin_right = 224.0 +margin_bottom = 5.0 [node name="Label" type="Label" parent="Center/Control/Notes"] -margin_left = -70.0 -margin_top = -6.0 -margin_right = -9.0 -margin_bottom = 7.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 ) +margin_left = -76.0 +margin_right = -15.0 +margin_bottom = 13.0 +custom_fonts/font = SubResource( 5 ) text = "13" align = 2 -[node name="Sprite" type="Sprite" parent="Center/Control/Notes"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) +[node name="Control" type="Control" parent="Center/Control/Notes"] +margin_left = -14.0 +margin_top = -2.0 +margin_right = 2.0 +margin_bottom = 14.0 + +[node name="Note" type="Sprite" parent="Center/Control/Notes/Control"] +material = SubResource( 6 ) +position = Vector2( 8, 8 ) texture = ExtResource( 4 ) diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd index 72e250f..c5ca155 100644 --- a/src/menu/StartMenu.gd +++ b/src/menu/StartMenu.gd @@ -29,7 +29,7 @@ var is_input = true func _ready(): menu_list = main_list switch_menu("main") - UI.keys(true, false) + UI.keys(true, true, false) func _input(event): if !is_input: diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 671fafb..6c16623 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=25 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/font/m3x6.ttf" type="DynamicFontData" id=4] -[ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=5] +[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/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] @@ -22,20 +23,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] -[sub_resource type="DynamicFont" id=1] -extra_spacing_bottom = -1 -font_data = ExtResource( 5 ) +[sub_resource type="DynamicFont" id=3] +font_data = ExtResource( 6 ) -[sub_resource type="DynamicFont" id=2] -extra_spacing_top = -5 -extra_spacing_bottom = -2 -font_data = ExtResource( 4 ) +[sub_resource type="DynamicFont" id=4] +size = 48 +extra_spacing_top = -11 +extra_spacing_bottom = -12 +font_data = ExtResource( 5 ) [node name="StartMenu" type="Node2D"] pause_mode = 2 script = ExtResource( 3 ) [node name="Menu" type="Node2D" parent="."] +visible = false position = Vector2( -18, 8 ) z_index = 20 z_as_relative = false @@ -124,30 +126,50 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Header" type="Label" parent="."] -margin_left = -33.0 -margin_top = 24.0 -margin_right = 81.0 -margin_bottom = 37.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" +[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"] +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 +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 +custom_fonts/font = SubResource( 3 ) +text = "play +options +credits" + +[node name="Header" type="Label" parent="Control"] +margin_top = 5.0 +margin_right = 228.0 +margin_bottom = 26.0 +rect_min_size = Vector2( 228, 0 ) +custom_fonts/font = SubResource( 4 ) +text = "Tiny Crate" align = 1 -[node name="Signature" type="Label" parent="Header"] -margin_left = 26.0 -margin_top = -10.0 -margin_right = 87.0 -margin_bottom = -4.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "Harmony Honey's" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +[node name="Logo" type="TextureRect" parent="Control"] +margin_left = 115.0 +margin_top = 97.0 +margin_right = 192.0 +margin_bottom = 125.0 +texture = ExtResource( 4 ) [node name="AudioScroll" type="AudioStreamPlayer" parent="."] stream = ExtResource( 7 ) @@ -188,7 +210,7 @@ z_index = -11 tile_data = PoolIntArray( 131093, 536870916, 3, 131094, 4, 1, 131095, 4, 0, 131096, 4, 3, 196624, 5, 2, 196625, 5, 0, 196626, -1610612731, 2, 196630, 536870916, 0, 196631, 4, 1, 196632, 4, 0, 262154, 536870916, 3, 262155, 536870916, 0, 262156, 4, 3, 262159, 5, 2, 262160, 5, 0, 262161, 5, 0, 262162, 5, 0, 262163, -1610612731, 2, 262166, 4, 1, 262167, 4, 0, 262168, 4, 1, 327685, 5, 2, 327686, 5, 0, 327687, 5, 0, 327688, 5, 0, 327689, 536870917, 2, 327690, 536870916, 0, 327691, 4, 1, 327692, 4, 0, 327695, -1610612731, 0, 327696, 5, 0, 327697, 5, 0, 327698, 5, 0, 327699, -1073741819, 0, 327701, 536870916, 3, 327702, 4, 0, 327703, 4, 1, 327704, 536870916, 2, 393221, -1073741819, 0, 393227, 4, 1, 393228, 4, 0, 393229, 4, 3, 393231, -1073741819, 2, 393232, 5, 0, 393233, 5, 0, 393234, 5, 0, 393235, -536870907, 2, 393237, 536870916, 0, 393238, 4, 1, 393239, 536870916, 0, 458757, -1073741819, 2, 458759, -1610612731, 2, 458762, 4, 1, 458763, 536870916, 0, 458764, 4, 1, 458765, 4, 0, 458768, -1073741819, 2, 458769, 5, 0, 458770, 1610612741, 2, 458773, 4, 2, 458774, 4, 0, 458775, 4, 1, 458776, 4, 3, 524295, -1610612731, 0, 524298, 4, 2, 524299, 4, 1, 524300, 536870916, 0, 524301, 4, 1, 524302, 4, 3, 524305, 5, 1, 524310, 4, 2, 524311, 536870916, 0, 524312, 536870916, 2, 589831, -1073741819, 1, 589832, -1610612731, 0, 589836, 4, 2, 589837, 4, 1, 589838, 4, 0, 589839, 4, 3, 589841, 5, 1, 589842, -536870907, 2, 655367, -1610612731, 0, 655373, 536870916, 3, 655374, 4, 1, 655375, 536870916, 0, 655377, 5, 1, 720901, -2147483643, 2, 720903, -536870907, 2, 720905, 5, 2, 720906, 5, 0, 720907, 5, 0, 720908, 536870917, 2, 720909, 536870916, 3, 720910, 536870916, 0, 720911, 536870916, 2, 720912, 5, 2, 720913, 5, 1, 720914, 5, 0, 720915, 536870917, 2, 720917, 5, 2, 720918, 5, 0, 720919, 536870917, 2, 786437, -2147483643, 0, 786441, -1073741819, 0, 786455, -1610612731, 0, 851973, -1073741819, 2, 851974, 1610612741, 2, 851977, 1073741829, 2, 851978, 5, 0, 851979, 1610612741, 2, 851981, 536870916, 3, 851982, 4, 1, 851983, 4, 0, 851987, 1073741829, 2, 851988, 5, 0, 851989, 5, 1, 851990, 5, 0, 851991, -536870907, 2, 917517, 536870916, 0, 917518, 4, 1, 917519, 536870916, 2, 917525, 1610612741, 2, 983053, 4, 2, 983054, 4, 0, 983055, 536870916, 2 ) [node name="GameCamera" parent="Stage" instance=ExtResource( 13 )] -position = Vector2( 96, 72 ) +position = Vector2( 90, 76 ) [node name="Actors" type="Node2D" parent="Stage"] script = ExtResource( 10 ) diff --git a/src/menu/Vis.gd b/src/menu/Vis.gd new file mode 100644 index 0000000..0313598 --- /dev/null +++ b/src/menu/Vis.gd @@ -0,0 +1,9 @@ +extends VisibilityNotifier2D + +func _ready(): + connect("screen_entered", self, "enter") + connect("screen_exited", self, "enter") + pass # Replace with function body. + +func enter(): + visible = is_on_screen() diff --git a/src/menu/select.gd b/src/menu/select.gd index 22fb77a..1394d20 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -30,10 +30,10 @@ func _ready(): var sy = i / columns var sx = i % columns new.rect_position += Vector2(sx + (sy % 2) * 0.5, sy) * screen_dist - new.get_node("Label").text = Shared.maps[i] - new.get_node("Note").visible = Shared.notes.has(i) + new.get_node("Overlay/Label").text = Shared.maps[i] + new.get_node("Overlay/Note").visible = Shared.notes.has(i) screens.add_child(new) - view_scene(new.get_node("ViewportContainer/Viewport"), Shared.map_path + Shared.maps[i]) + view_scene(new.get_node("Vis/ViewportContainer/Viewport"), Shared.map_path + Shared.maps[i]) scroll(Shared.current_map) diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 1f2be82..7e08bb3 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,14 +1,21 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [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/font/m3x6.ttf" type="DynamicFontData" id=2] [ext_resource path="res://media/image/note.png" type="Texture" id=3] +[ext_resource path="res://src/menu/Vis.gd" type="Script" id=4] [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] [ext_resource path="res://media/audio/sfx/Randomize104.wav" type="AudioStream" id=8] [ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=9] +[sub_resource type="DynamicFont" id=4] +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +extra_spacing_top = -5 +font_data = ExtResource( 2 ) + [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 6 ) shader_param/line_color = Color( 0, 0, 0, 1 ) @@ -66,11 +73,6 @@ tracks/3/keys = { "values": [ Vector2( 55, 55 ), Vector2( 45, 45 ), Vector2( 55, 55 ) ] } -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 6 ) -shader_param/line_color = Color( 0, 0, 0, 1 ) -shader_param/line_thickness = 1.0 - [node name="Node2D" type="Node2D"] position = Vector2( 1, 1 ) script = ExtResource( 7 ) @@ -107,47 +109,39 @@ margin_left = 110.0 margin_top = 40.0 margin_right = 150.0 margin_bottom = 80.0 -__meta__ = { -"_edit_use_anchors_": false -} -[node name="ColorRect" type="ColorRect" parent="Control/Screen"] -visible = false -margin_left = -2.00002 -margin_top = -2.0 -margin_right = 102.0 -margin_bottom = 102.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +[node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] +rect = Rect2( 0, 0, 100, 100 ) +script = ExtResource( 4 ) -[node name="ViewportContainer" type="ViewportContainer" parent="Control/Screen"] +[node name="ViewportContainer" type="ViewportContainer" parent="Control/Screen/Vis"] margin_left = -1.52588e-05 margin_right = 100.0 margin_bottom = 100.0 -__meta__ = { -"_edit_use_anchors_": false -} -[node name="Viewport" type="Viewport" parent="Control/Screen/ViewportContainer"] +[node name="Viewport" type="Viewport" parent="Control/Screen/Vis/ViewportContainer"] size = Vector2( 100, 100 ) own_world = true handle_input_locally = false render_target_update_mode = 3 -[node name="Label" type="Label" parent="Control/Screen"] +[node name="Overlay" type="Control" parent="Control/Screen"] +modulate = Color( 1, 0.945098, 0.909804, 1 ) +margin_right = 100.0 +margin_bottom = 100.0 + +[node name="Label" type="Label" parent="Control/Screen/Overlay"] margin_top = 46.0 margin_right = 100.0 margin_bottom = 54.0 grow_horizontal = 2 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 2 ) +custom_fonts/font = SubResource( 4 ) text = "1-1" align = 1 valign = 1 -[node name="ColorRect" type="ColorRect" parent="Control/Screen/Label"] +[node name="ColorRect" type="ColorRect" parent="Control/Screen/Overlay/Label"] +visible = false show_behind_parent = true margin_left = 43.0 margin_top = -1.0 @@ -158,8 +152,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Note" type="Sprite" parent="Control/Screen"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) +[node name="Note" type="Sprite" parent="Control/Screen/Overlay"] material = SubResource( 3 ) position = Vector2( 90, 10 ) texture = ExtResource( 3 ) @@ -171,34 +164,27 @@ smoothing_enabled = true editor_draw_screen = false [node name="Cursor" type="Node2D" parent="Camera2D"] +modulate = Color( 1, 0.92549, 0.152941, 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="Camera2D/Cursor"] autoplay = "New Anim" "anims/New Anim" = SubResource( 1 ) [node name="c1" type="Sprite" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) position = Vector2( -55, -55 ) texture = ExtResource( 1 ) [node name="c2" type="Sprite" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) position = Vector2( 55, -55 ) rotation = 1.5708 texture = ExtResource( 1 ) [node name="c3" type="Sprite" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) position = Vector2( -55, 55 ) rotation = 4.71239 texture = ExtResource( 1 ) [node name="c4" type="Sprite" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) position = Vector2( 55, 55 ) rotation = 3.14159 texture = ExtResource( 1 ) @@ -209,4 +195,4 @@ layer = -1 [node name="ColorRect" type="ColorRect" parent="BG"] anchor_right = 1.0 anchor_bottom = 1.0 -color = Color( 1, 0.945098, 0.909804, 1 ) +color = Color( 0.160784, 0.678431, 1, 1 ) diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 238b4c4..3042576 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -7,23 +7,23 @@ [node name="Splash" type="Node2D"] script = ExtResource( 3 ) +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +bus = "SFX" + [node name="CanvasLayer" type="CanvasLayer" parent="."] -layer = -1 +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="."] +[node name="Logo" type="Sprite" parent="CanvasLayer"] modulate = Color( 0, 0, 0, 1 ) position = Vector2( 114, 64 ) texture = ExtResource( 1 ) -[node name="Camera2D" type="Camera2D" parent="."] +[node name="Camera2D" type="Camera2D" parent="CanvasLayer"] position = Vector2( 114, 64 ) current = true - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 4 ) -bus = "SFX"