diff --git a/graphics/hud/sg_menu.png b/graphics/hud/sg_menu.png index 57b7176..90bc921 100644 Binary files a/graphics/hud/sg_menu.png and b/graphics/hud/sg_menu.png differ diff --git a/graphics/hud/sg_menu_blink.png b/graphics/hud/sg_menu_blink.png new file mode 100644 index 0000000..11dd379 Binary files /dev/null and b/graphics/hud/sg_menu_blink.png differ diff --git a/graphics/hud/sg_menu_blink.png.import b/graphics/hud/sg_menu_blink.png.import new file mode 100644 index 0000000..53e9a64 --- /dev/null +++ b/graphics/hud/sg_menu_blink.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sg_menu_blink.png-52c2e781126ecac40e3e1a9c6b79cf1c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/sg_menu_blink.png" +dest_files=[ "res://.import/sg_menu_blink.png-52c2e781126ecac40e3e1a9c6b79cf1c.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=false +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/maps/global_palette.png b/maps/global_palette.png new file mode 100644 index 0000000..a77b625 Binary files /dev/null and b/maps/global_palette.png differ diff --git a/maps/global_palette.png.import b/maps/global_palette.png.import new file mode 100644 index 0000000..b2a9f99 --- /dev/null +++ b/maps/global_palette.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/global_palette.png-5912e6b1a36410a858c7b9382fbf9c96.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://maps/global_palette.png" +dest_files=[ "res://.import/global_palette.png-5912e6b1a36410a858c7b9382fbf9c96.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=false +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/maps/level_select.tscn b/maps/level_select.tscn index 5213f4c..217c712 100644 --- a/maps/level_select.tscn +++ b/maps/level_select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2] @@ -9,6 +9,18 @@ [ext_resource path="res://maps/level_select.gd" type="Script" id=7] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=8] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=9] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=10] +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=11] + +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 11 ) +shader_param/color_1 = Color( 0.121569, 0.454902, 1, 1 ) +shader_param/color_2 = Color( 0.258824, 0.909804, 0.396078, 1 ) +shader_param/checker_size = Vector2( 8, 8 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 11, 1 ) +shader_param/cycle_alternation = Vector2( 1, 1 ) +shader_param/uv_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 3 ) @@ -19,9 +31,9 @@ shader_param/border_corners = false script = ExtResource( 7 ) [node name="BackGround" type="ColorRect" parent="."] +material = SubResource( 3 ) margin_right = 256.0 margin_bottom = 192.0 -color = Color( 0, 0, 0, 1 ) [node name="ColorRect2" type="ColorRect" parent="."] margin_left = 43.0 @@ -86,6 +98,7 @@ text = "AAAAAAAAAAAAAAAAAAAAAAAA" align = 1 [node name="EasyModeText" type="Label" parent="."] +material = ExtResource( 10 ) margin_top = 3.0 margin_right = 256.0 margin_bottom = 13.0 @@ -94,6 +107,7 @@ text = "easy is off press c to change this" align = 1 [node name="LivesModeText" type="Label" parent="."] +material = ExtResource( 10 ) margin_left = 2.0 margin_top = 180.0 margin_right = 258.0 diff --git a/menus/cool.tscn b/menus/cool.tscn index d09ad4f..2ac0bd1 100644 --- a/menus/cool.tscn +++ b/menus/cool.tscn @@ -7,8 +7,9 @@ shader = ExtResource( 1 ) shader_param/color_1 = Color( 0.145098, 0.0823529, 0.0823529, 1 ) shader_param/color_2 = Color( 1, 0, 0, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( -8, 0 ) shader_param/pan_speed = Vector2( 0, 8 ) +shader_param/cycle_speed = Vector2( -8, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 1, 0, 1, 4, 0, 0 ) [node name="Node2D" type="Node2D"] diff --git a/menus/file_select.tscn b/menus/file_select.tscn index 7f7b068..2c6a71e 100644 --- a/menus/file_select.tscn +++ b/menus/file_select.tscn @@ -11,8 +11,9 @@ shader = ExtResource( 11 ) shader_param/color_1 = Color( 0.2, 0.294118, 1, 1 ) shader_param/color_2 = Color( 0, 0.0352941, 0.329412, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 0, 16 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 0, 16 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 2, 0, 2, 1, 0, 0 ) [node name="FileSelect" type="Node"] diff --git a/menus/main_menu.gd b/menus/main_menu.gd index 0b62762..2d99b50 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -14,3 +14,15 @@ func _ready(): $Panel/FileSelect.grab_focus() Vector2( 0.83205, 0.5547 ) + + +func _on_Continue_button_down(): + pass # Replace with function body. + + +func _on_FileSelect_button_down(): + SceneManager.current_scene = load("res://menus/file_select.tscn").instance() + + +func _on_Exit_button_down(): + get_tree().quit() diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index f7fd33d..ff143e7 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -1,18 +1,21 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] +[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=2] [ext_resource path="res://graphics/hud/sg_menu.png" type="Texture" id=3] [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=4] [ext_resource path="res://menus/main_menu.gd" type="Script" id=5] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=6] +[ext_resource path="res://graphics/hud/sg_menu_blink.png" type="Texture" id=7] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 6 ) shader_param/color_1 = Color( 1, 0.835294, 0.619608, 1 ) shader_param/color_2 = Color( 1, 0.478431, 0.219608, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 12, 0 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 12, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform( 1, -2, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 ) [sub_resource type="ShaderMaterial" id=3] @@ -20,10 +23,53 @@ shader = ExtResource( 6 ) shader_param/color_1 = Color( 0.62, 0.797333, 1, 1 ) shader_param/color_2 = Color( 0.22, 0.428, 1, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 24, 0 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 24, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform( 1, 1, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 ) +[sub_resource type="ShaderMaterial" id=6] +shader = ExtResource( 2 ) +shader_param/speed = Vector2( 0, 4 ) +shader_param/ammount = Vector2( 0, 1 ) +shader_param/offset = Vector2( 0, 1 ) + +[sub_resource type="ShaderMaterial" id=4] +shader = ExtResource( 2 ) +shader_param/speed = Vector2( 4, 8 ) +shader_param/ammount = Vector2( 1, 1 ) +shader_param/offset = Vector2( 0, 0 ) + +[sub_resource type="Animation" id=5] +resource_name = "blink" +length = 5.0 +loop = true +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("SG/Eyes:visible") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 4.3, 4.55 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ false, true, false ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("SG/Eyes:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 4.3, 4.35, 4.4, 4.45, 4.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 1, 0 ] +} + [node name="MainMenu" type="Node"] script = ExtResource( 5 ) @@ -39,39 +85,50 @@ anchor_right = 1.0 anchor_bottom = 1.0 margin_bottom = -56.0 -[node name="TextureRect2" type="TextureRect" parent="."] +[node name="SG" type="TextureRect" parent="."] margin_left = 176.0 margin_top = 40.0 margin_right = 242.0 margin_bottom = 187.0 texture = ExtResource( 3 ) +[node name="Eyes" type="Sprite" parent="SG"] +visible = false +position = Vector2( 33, 38 ) +texture = ExtResource( 7 ) +hframes = 3 + [node name="Panel" type="Panel" parent="."] +material = SubResource( 6 ) margin_left = 16.0 margin_top = 32.0 margin_right = 136.0 -margin_bottom = 112.0 +margin_bottom = 120.0 theme = ExtResource( 1 ) [node name="Body" type="Label" parent="Panel"] +material = SubResource( 6 ) margin_left = 16.0 margin_top = 8.0 margin_right = 112.0 -margin_bottom = 57.0 +margin_bottom = 80.0 text = "continue file select marathon mode augmentations -options" +options +exit" [node name="GreyedContinue" type="Label" parent="Panel/Body"] visible = false +material = SubResource( 6 ) margin_right = 56.0 margin_bottom = 10.0 custom_colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) text = "Continue" [node name="Continue" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 9.0 margin_right = 16.0 @@ -81,6 +138,7 @@ focus_neighbour_bottom = NodePath("../FileSelect") texture_focused = ExtResource( 4 ) [node name="FileSelect" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 22.0 margin_right = 16.0 @@ -90,6 +148,7 @@ focus_neighbour_bottom = NodePath("../MarathonMode") texture_focused = ExtResource( 4 ) [node name="MarathonMode" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 35.0 margin_right = 16.0 @@ -99,6 +158,7 @@ focus_neighbour_bottom = NodePath("../Augmentations") texture_focused = ExtResource( 4 ) [node name="Augmentations" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 48.0 margin_right = 16.0 @@ -108,10 +168,29 @@ focus_neighbour_bottom = NodePath("../Options") texture_focused = ExtResource( 4 ) [node name="Options" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 61.0 margin_right = 16.0 margin_bottom = 69.0 focus_neighbour_top = NodePath("../Augmentations") +focus_neighbour_bottom = NodePath("../Exit") +texture_focused = ExtResource( 4 ) + +[node name="Exit" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) +margin_left = 8.0 +margin_top = 74.0 +margin_right = 16.0 +margin_bottom = 82.0 +focus_neighbour_top = NodePath("../Options") focus_neighbour_bottom = NodePath("../Continue") texture_focused = ExtResource( 4 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "blink" +anims/blink = SubResource( 5 ) + +[connection signal="button_down" from="Panel/Continue" to="." method="_on_Continue_button_down"] +[connection signal="button_down" from="Panel/FileSelect" to="." method="_on_FileSelect_button_down"] +[connection signal="button_down" from="Panel/Exit" to="." method="_on_Exit_button_down"] diff --git a/objects/hud/pause_screen.tscn b/objects/hud/pause_screen.tscn index 6b12586..deaed7d 100644 --- a/objects/hud/pause_screen.tscn +++ b/objects/hud/pause_screen.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] +[ext_resource path="res://ui/arrow_figure_8.tres" type="Material" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=3] [ext_resource path="res://objects/hud/pause_screen.gd" type="Script" id=4] @@ -58,6 +59,7 @@ align = 1 [node name="Resume" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 36.0 margin_top = 1.0 margin_right = 44.0 @@ -67,6 +69,7 @@ texture_focused = ExtResource( 3 ) [node name="Restart" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 32.0 margin_top = 14.0 margin_right = 40.0 @@ -77,6 +80,7 @@ texture_focused = ExtResource( 3 ) [node name="Settings" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 29.0 margin_top = 27.0 margin_right = 37.0 @@ -87,6 +91,7 @@ texture_focused = ExtResource( 3 ) [node name="ExitLevel" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 22.0 margin_top = 40.0 margin_right = 30.0 diff --git a/ui/arrow_figure_8.tres b/ui/arrow_figure_8.tres new file mode 100644 index 0000000..2843937 --- /dev/null +++ b/ui/arrow_figure_8.tres @@ -0,0 +1,9 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=2] + +[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=1] + +[resource] +shader = ExtResource( 1 ) +shader_param/speed = Vector2( 4, 8 ) +shader_param/ammount = Vector2( 1, 1 ) +shader_param/offset = Vector2( 0, 0 )