diff --git a/graphics/backgrounds/moon.png b/graphics/backgrounds/moon.png new file mode 100644 index 0000000..19e9e27 Binary files /dev/null and b/graphics/backgrounds/moon.png differ diff --git a/graphics/backgrounds/moon.png.import b/graphics/backgrounds/moon.png.import new file mode 100644 index 0000000..c3f3f99 --- /dev/null +++ b/graphics/backgrounds/moon.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/moon.png-0d02dd6dd46a32e59657bae322ccdfab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/backgrounds/moon.png" +dest_files=[ "res://.import/moon.png-0d02dd6dd46a32e59657bae322ccdfab.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/graphics/backgrounds/sun_and_clouds.png b/graphics/backgrounds/sun_and_clouds.png new file mode 100644 index 0000000..d45811b Binary files /dev/null and b/graphics/backgrounds/sun_and_clouds.png differ diff --git a/graphics/backgrounds/sun_and_clouds.png.import b/graphics/backgrounds/sun_and_clouds.png.import new file mode 100644 index 0000000..9b85afc --- /dev/null +++ b/graphics/backgrounds/sun_and_clouds.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sun_and_clouds.png-c34ae0c7398c0c962738b6b195e403ec.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/backgrounds/sun_and_clouds.png" +dest_files=[ "res://.import/sun_and_clouds.png-c34ae0c7398c0c962738b6b195e403ec.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/graphics/particles/smoke.png b/graphics/particles/smoke.png new file mode 100644 index 0000000..6c478d9 Binary files /dev/null and b/graphics/particles/smoke.png differ diff --git a/graphics/particles/smoke.png.import b/graphics/particles/smoke.png.import new file mode 100644 index 0000000..f7b0016 --- /dev/null +++ b/graphics/particles/smoke.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/smoke.png-ec8443d9c944559763c6fb0b7caf4529.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/particles/smoke.png" +dest_files=[ "res://.import/smoke.png-ec8443d9c944559763c6fb0b7caf4529.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/menus/credits.tscn b/menus/credits.tscn index 9aedc5f..577e85f 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -8,11 +8,11 @@ shader = ExtResource( 2 ) shader_param/color_1 = Color( 1, 0.423529, 0.4, 1 ) shader_param/color_2 = Color( 0.4, 0.52549, 1, 1 ) -shader_param/checker_size = Vector2( 8, 8 ) -shader_param/pan_speed = Vector2( 0, 0 ) -shader_param/cycle_speed = Vector2( 0, 0 ) -shader_param/cycle_alternation = Vector2( 0, 0 ) -shader_param/uv_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +shader_param/checker_size = Vector2( 32, 32 ) +shader_param/pan_speed = Vector2( 20, 21 ) +shader_param/cycle_speed = Vector2( 6, 3 ) +shader_param/cycle_alternation = Vector2( 6, 3 ) +shader_param/uv_transform = Transform2D( 1, -1, 1, 1, 0, 0 ) [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 1 ) @@ -45,32 +45,46 @@ tracks/1/keys = { "update": 0, "values": [ Color( 0.4, 0.52549, 1, 1 ) ] } +tracks/2/type = "value" +tracks/2/path = NodePath("ColorRect:material:shader_param/uv_transform") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Transform2D( 1, -1, 1, 1, 0, 0 ) ] +} [sub_resource type="Animation" id=4] resource_name = "rainbow_cycle" +length = 5.0 +loop = true tracks/0/type = "value" tracks/0/path = NodePath("ColorRect:material:shader_param/color_1") -tracks/0/interp = 1 +tracks/0/interp = 2 tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 1 ), -"transitions": PoolRealArray( 1, 1 ), +"times": PoolRealArray( 0, 1, 2, 3, 4, 5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ Color( 1, 0.423529, 0.4, 1 ), Color( 1, 0.423529, 0.4, 1 ) ] +"values": [ Color( 1, 0.423529, 0.4, 1 ), Color( 1, 0.894118, 0.4, 1 ), Color( 0.4, 1, 0.443137, 1 ), Color( 0.4, 0.52549, 1, 1 ), Color( 0.992157, 0.4, 1, 1 ), Color( 1, 0.423529, 0.4, 1 ) ] } tracks/1/type = "value" tracks/1/path = NodePath("ColorRect:material:shader_param/color_2") -tracks/1/interp = 1 +tracks/1/interp = 2 tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 1 ), -"transitions": PoolRealArray( 1, 1 ), +"times": PoolRealArray( 0, 1, 2, 3, 4, 5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ Color( 0.4, 0.52549, 1, 1 ), Color( 0.4, 0.52549, 1, 1 ) ] +"values": [ Color( 0.4, 1, 0.443137, 1 ), Color( 0.4, 0.52549, 1, 1 ), Color( 0.992157, 0.4, 1, 1 ), Color( 1, 0.423529, 0.4, 1 ), Color( 1, 0.894118, 0.4, 1 ), Color( 0.4, 1, 0.443137, 1 ) ] } [node name="Credits" type="Node2D"] @@ -86,5 +100,6 @@ position = Vector2( 128, 96 ) texture = ExtResource( 3 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "rainbow_cycle" anims/RESET = SubResource( 3 ) anims/rainbow_cycle = SubResource( 4 ) diff --git a/menus/title_screen.gd b/menus/title_screen.gd index 9319c10..24d11bc 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -7,3 +7,10 @@ func _input(event): Fade.fade_out(0.4) yield(Fade, "fade_finished") SceneManager.current_scene = next_menu.instance() + +func _ready(): + var time = OS.get_time() + if time.hour >= 18 or time.hour < 6: + $Night.visible = true + else: + $Day.visible = true diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 6f6dafb..f256bb6 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -1,12 +1,35 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=1] [ext_resource path="res://shaders/wibble_border.gdshader" type="Shader" id=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=3] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://menus/title_screen.gd" type="Script" id=5] [ext_resource path="res://menus/main_menu.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/hud/logo.png" type="Texture" id=7] -[ext_resource path="res://graphics/backgrounds/blue_sky.png" type="Texture" id=8] +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=8] +[ext_resource path="res://graphics/backgrounds/sun_and_clouds.png" type="Texture" id=9] +[ext_resource path="res://graphics/particles/smoke.png" type="Texture" id=10] +[ext_resource path="res://shaders/color_noise.gdshader" type="Shader" id=11] +[ext_resource path="res://graphics/backgrounds/moon.png" type="Texture" id=12] + +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 8 ) +shader_param/color_1 = Color( 0.662745, 0.647059, 0.819608, 1 ) +shader_param/color_2 = Color( 0.12549, 0.133333, 0.227451, 1 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 6, 3 ) +shader_param/cycle_alternation = Vector2( 6, 3 ) +shader_param/uv_transform = Transform2D( 0, 1, 1, 0, 0, 0 ) + +[sub_resource type="ShaderMaterial" id=5] +shader = ExtResource( 11 ) +shader_param/animate_noise = true +shader_param/noise_intensity = 1.0 + +[sub_resource type="Curve" id=4] +_data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.130639, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.348684, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 2 ) @@ -17,23 +40,60 @@ shader_param/delay = Vector2( 1, 0 ) shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) shader_param/border_corners = false -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 2 ) -shader_param/speed = Vector2( 4, 0 ) -shader_param/ammount = Vector2( 4, 0 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) -shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) -shader_param/border_corners = true - [node name="TitleScreen" type="Node"] script = ExtResource( 5 ) next_menu = ExtResource( 6 ) -[node name="Background" type="TextureRect" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -texture = ExtResource( 8 ) +[node name="Day" type="Node2D" parent="."] +visible = false + +[node name="ColorRect" type="ColorRect" parent="Day"] +material = SubResource( 3 ) +margin_right = 256.0 +margin_bottom = 192.0 + +[node name="Sprite" type="Sprite" parent="Day"] +position = Vector2( 128, 96 ) +texture = ExtResource( 9 ) + +[node name="Night" type="Node2D" parent="."] +visible = false + +[node name="ColorRect2" type="ColorRect" parent="Night"] +material = SubResource( 3 ) +margin_right = 256.0 +margin_bottom = 192.0 + +[node name="ColorRect" type="ColorRect" parent="Night"] +material = SubResource( 5 ) +margin_right = 256.0 +margin_bottom = 192.0 +color = Color( 1, 1, 1, 0.392157 ) + +[node name="Sprite" type="Sprite" parent="Night"] +position = Vector2( 296, 96 ) +texture = ExtResource( 12 ) + +[node name="SmokeParticles" type="CPUParticles2D" parent="."] +position = Vector2( 40, 192 ) +amount = 512 +lifetime = 8.0 +preprocess = 8.0 +speed_scale = 2.0 +texture = ExtResource( 10 ) +direction = Vector2( 1, -1 ) +spread = 117.74 +gravity = Vector2( 0, -30 ) +initial_velocity = 20.0 +initial_velocity_random = 1.0 +angular_velocity = 180.0 +angular_velocity_random = 1.0 +angle = 720.0 +angle_random = 1.0 +scale_amount = 3.0 +scale_amount_random = 1.0 +scale_amount_curve = SubResource( 4 ) +color = Color( 0.0666667, 0.0666667, 0.0666667, 1 ) [node name="Logo" type="TextureRect" parent="."] material = SubResource( 2 ) @@ -51,7 +111,7 @@ format = 1 tile_data = PoolIntArray( 589832, 3, 196609, 589833, 3, 196610, 589834, 3, 3, 589836, 3, 1, 589837, 3, 196610, 589838, 3, 3, 589840, 3, 1, 589841, 3, 196610, 589842, 3, 3, 589844, 3, 196609, 589845, 3, 196610, 589846, 3, 3, 655370, 3, 65536, 655372, 3, 65536, 655374, 3, 65536, 655376, 3, 65536, 655378, 3, 65536, 655382, 3, 65536, 720904, 3, 1, 720905, 3, 196610, 720906, 3, 131075, 720908, 3, 65536, 720910, 3, 65536, 720912, 3, 65537, 720913, 3, 196610, 720914, 3, 65539, 720916, 3, 196609, 720917, 3, 196610, 720918, 3, 65539, 786440, 3, 65536, 786444, 3, 65536, 786446, 3, 65536, 786448, 3, 65536, 786450, 3, 65536, 786454, 3, 65536, 851976, 3, 131073, 851977, 3, 196610, 851978, 3, 196611, 851980, 3, 131073, 851981, 3, 196610, 851982, 3, 131075, 851984, 3, 131073, 851985, 3, 196610, 851986, 3, 131075, 851988, 3, 196609, 851989, 3, 196610, 851990, 3, 131075 ) [node name="Label" type="Label" parent="."] -material = SubResource( 1 ) +material = ExtResource( 4 ) margin_top = 159.0 margin_right = 256.0 margin_bottom = 182.0