diff --git a/Scenes/Events/ovni.tscn b/Scenes/Events/ovni.tscn index 1b93602..b4dcd85 100644 --- a/Scenes/Events/ovni.tscn +++ b/Scenes/Events/ovni.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=4 format=1] +[gd_scene load_steps=9 format=1] -[ext_resource path="res://Sprites/Charasets/UFO.png" type="Texture" id=1] -[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Effects/UFO-ray_1.png" type="Texture" id=1] +[ext_resource path="res://Sprites/Effects/UFO-ray_2.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Charasets/UFO.png" type="Texture" id=4] [sub_resource type="Animation" id=1] @@ -20,42 +22,153 @@ tracks/0/keys = { "values": [ Vector2( 0, 0 ), Vector2( 0, -7 ), Vector2( 0, 0 ) ] } +[sub_resource type="ConvexPolygonShape2D" id=2] + +custom_solver_bias = 0.0 +points = Vector2Array( 0, 23.8991, -81, 17.8991, -119, 6.89908, -139, -6.10092, -140, -16.1009, -134, -26.1009, -110, -38.1009, -76, -47.1009, -57, -50.1009 ) + +[sub_resource type="ConvexPolygonShape2D" id=3] + +custom_solver_bias = 0.0 +points = Vector2Array( 66, 19.8991, 0, 23.8991, -57, -50.1009, -46, -67.1009, -23, -81.1009, 0, -83.1009, 22, -81.1009, 46, -66.1009, 57, -50.1009 ) + +[sub_resource type="ConvexPolygonShape2D" id=4] + +custom_solver_bias = 0.0 +points = Vector2Array( 134, -3.10092, 106, 12.8991, 66, 19.8991, 57, -50.1009, 83, -46.1009, 107, -39.1009, 123, -32.1009, 137, -19.1009, 139, -10.1009 ) + [node name="UFO" type="Node2D"] -[node name="Sprite" type="Sprite" parent="."] +[node name="Ray" type="Node2D" parent="."] -transform/pos = Vector2( 0, -0.855299 ) -texture = ExtResource( 1 ) +visibility/behind_parent = true +transform/pos = Vector2( 0, 131 ) -[node name="Particles2D" type="Particles2D" parent="Sprite"] +[node name="ray_outter" type="Sprite" parent="Ray"] visibility/opacity = 0.2 visibility/behind_parent = true -transform/pos = Vector2( -69, 10.046 ) -config/amount = 32 -config/lifetime = 0.5 +visibility/blend_mode = 1 +texture = ExtResource( 1 ) + +[node name="ray_inner" type="Sprite" parent="Ray"] + +visibility/opacity = 0.2 +visibility/behind_parent = true +visibility/blend_mode = 1 +texture = ExtResource( 2 ) + +[node name="Particles2D" type="Particles2D" parent="Ray"] + +visibility/behind_parent = true +visibility/blend_mode = 1 +transform/pos = Vector2( 38, 111 ) +config/amount = 3 +config/lifetime = 0.6 +config/time_scale = 0.6 +config/preprocess = 10.0 config/process_mode = 1 -config/texture = ExtResource( 2 ) -params/direction = 0.0 -params/spread = 10.0 -params/linear_velocity = 80.0 +config/texture = ExtResource( 3 ) +params/direction = 180.0 +params/spread = 0.0 +params/linear_velocity = 400.0 params/spin_velocity = 0.0 params/orbit_velocity = 0.0 params/gravity_direction = 0.0 params/gravity_strength = 9.8 -params/radial_accel = 0.0 +params/radial_accel = 100.0 +params/tangential_accel = 150.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 0.5 +params/final_size = 0.0 +params/hue_variation = 5.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 +randomness/gravity_direction = 1.0 +randomness/tangential_accel = 0.4 +randomness/initial_size = 0.5 +randomness/hue_variation = 0.15 +color/color = Color( 0.333827, 0.355469, 0.209671, 1 ) + +[node name="Particles2D1" type="Particles2D" parent="Ray"] + +visibility/behind_parent = true +visibility/blend_mode = 1 +transform/pos = Vector2( -34, 111 ) +config/amount = 3 +config/lifetime = 0.6 +config/time_scale = 0.6 +config/preprocess = 10.0 +config/process_mode = 1 +config/texture = ExtResource( 3 ) +params/direction = 180.0 +params/spread = 0.0 +params/linear_velocity = 400.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 100.0 +params/tangential_accel = -128.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 0.5 +params/final_size = 0.0 +params/hue_variation = 5.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 +randomness/gravity_direction = 1.0 +randomness/tangential_accel = 0.4 +randomness/initial_size = 0.5 +randomness/hue_variation = 0.15 +color/color = Color( 0.333827, 0.355469, 0.209671, 1 ) + +[node name="Particles2D2" type="Particles2D" parent="Ray"] + +visibility/behind_parent = true +visibility/blend_mode = 1 +transform/pos = Vector2( 2, 118 ) +config/amount = 3 +config/lifetime = 0.6 +config/time_scale = 0.6 +config/preprocess = 10.0 +config/process_mode = 1 +config/texture = ExtResource( 3 ) +params/direction = 180.0 +params/spread = 0.0 +params/linear_velocity = 400.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 100.0 params/tangential_accel = 0.0 params/damping = 0.0 params/initial_angle = 0.0 -params/initial_size = 1.0 +params/initial_size = 0.5 params/final_size = 0.0 -params/hue_variation = 0.0 +params/hue_variation = 5.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 -randomness/spread = 0.2 -color/color = Color( 0.414062, 1, 0.533081, 1 ) +randomness/linear_velocity = 0.5 +randomness/gravity_direction = 1.0 +randomness/tangential_accel = 0.4 +randomness/initial_size = 0.5 +randomness/hue_variation = 0.15 +color/color = Color( 0.333827, 0.355469, 0.209671, 1 ) -[node name="Particles2D4" type="Particles2D" parent="Sprite"] +[node name="Sprite" type="Sprite" parent="."] + +transform/pos = Vector2( 0, -4.66871 ) +texture = ExtResource( 4 ) + +[node name="Smoke" type="Node2D" parent="Sprite"] + +editor/display_folded = true +visibility/behind_parent = true + +[node name="some_a" type="Particles2D" parent="Sprite/Smoke"] visibility/opacity = 0.2 visibility/behind_parent = true @@ -63,7 +176,7 @@ transform/pos = Vector2( -94, -8.13146 ) config/amount = 32 config/lifetime = 0.5 config/process_mode = 1 -config/texture = ExtResource( 2 ) +config/texture = ExtResource( 3 ) params/direction = 0.0 params/spread = 10.0 params/linear_velocity = 80.0 @@ -81,9 +194,39 @@ params/hue_variation = 0.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 randomness/spread = 0.2 +randomness/hue_variation = 0.1 color/color = Color( 0.414062, 1, 0.533081, 1 ) -[node name="Particles2D1" type="Particles2D" parent="Sprite"] +[node name="smoke_b" type="Particles2D" parent="Sprite/Smoke"] + +visibility/opacity = 0.2 +visibility/behind_parent = true +transform/pos = Vector2( -69, 10.046 ) +config/amount = 32 +config/lifetime = 0.5 +config/process_mode = 1 +config/texture = ExtResource( 3 ) +params/direction = 0.0 +params/spread = 10.0 +params/linear_velocity = 80.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 0.0 +params/tangential_accel = 0.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 1.0 +params/final_size = 0.0 +params/hue_variation = 0.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 +randomness/spread = 0.2 +randomness/hue_variation = 0.1 +color/color = Color( 0.414062, 1, 0.533081, 1 ) + +[node name="smoke_c" type="Particles2D" parent="Sprite/Smoke"] visibility/opacity = 0.2 visibility/behind_parent = true @@ -91,7 +234,7 @@ transform/pos = Vector2( -24, 21.6321 ) config/amount = 32 config/lifetime = 0.5 config/process_mode = 1 -config/texture = ExtResource( 2 ) +config/texture = ExtResource( 3 ) params/direction = 0.0 params/spread = 10.0 params/linear_velocity = 80.0 @@ -109,9 +252,10 @@ params/hue_variation = 0.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 randomness/spread = 0.2 +randomness/hue_variation = 0.1 color/color = Color( 0.414062, 1, 0.533081, 1 ) -[node name="Particles2D2" type="Particles2D" parent="Sprite"] +[node name="smoke_d" type="Particles2D" parent="Sprite/Smoke"] visibility/opacity = 0.2 visibility/behind_parent = true @@ -119,7 +263,7 @@ transform/pos = Vector2( 26, 20.4355 ) config/amount = 32 config/lifetime = 0.5 config/process_mode = 1 -config/texture = ExtResource( 2 ) +config/texture = ExtResource( 3 ) params/direction = 0.0 params/spread = 10.0 params/linear_velocity = 80.0 @@ -137,9 +281,10 @@ params/hue_variation = 0.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 randomness/spread = 0.2 +randomness/hue_variation = 0.1 color/color = Color( 0.414062, 1, 0.533081, 1 ) -[node name="Particles2D3" type="Particles2D" parent="Sprite"] +[node name="smoke_e" type="Particles2D" parent="Sprite/Smoke"] visibility/opacity = 0.2 visibility/behind_parent = true @@ -147,7 +292,7 @@ transform/pos = Vector2( 67, 13.6283 ) config/amount = 32 config/lifetime = 0.5 config/process_mode = 1 -config/texture = ExtResource( 2 ) +config/texture = ExtResource( 3 ) params/direction = 0.0 params/spread = 10.0 params/linear_velocity = 80.0 @@ -165,9 +310,10 @@ params/hue_variation = 0.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 randomness/spread = 0.2 +randomness/hue_variation = 0.1 color/color = Color( 0.414062, 1, 0.533081, 1 ) -[node name="Particles2D5" type="Particles2D" parent="Sprite"] +[node name="smoke_f" type="Particles2D" parent="Sprite/Smoke"] visibility/opacity = 0.2 visibility/behind_parent = true @@ -175,7 +321,7 @@ transform/pos = Vector2( 90, -12.5606 ) config/amount = 32 config/lifetime = 0.5 config/process_mode = 1 -config/texture = ExtResource( 2 ) +config/texture = ExtResource( 3 ) params/direction = 0.0 params/spread = 10.0 params/linear_velocity = 80.0 @@ -193,6 +339,7 @@ params/hue_variation = 0.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 randomness/spread = 0.2 +randomness/hue_variation = 0.1 color/color = Color( 0.414062, 1, 0.533081, 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="Sprite"] @@ -206,4 +353,32 @@ playback/speed = 1.0 blend_times = [ ] autoplay = "floating" +[node name="StaticBody2D" type="StaticBody2D" parent="Sprite"] + +editor/display_folded = true +visibility/visible = false +input/pickable = false +shapes/0/shape = SubResource( 2 ) +shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) +shapes/0/trigger = false +shapes/1/shape = SubResource( 3 ) +shapes/1/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) +shapes/1/trigger = false +shapes/2/shape = SubResource( 4 ) +shapes/2/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) +shapes/2/trigger = false +collision/layers = 1 +collision/mask = 1 +constant_linear_velocity = Vector2( 0, 0 ) +constant_angular_velocity = 0.0 +friction = 1.0 +bounce = 0.0 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Sprite/StaticBody2D"] + +build_mode = 0 +polygon = Vector2Array( -57, -50.1009, -46, -67.1009, -23, -81.1009, 0, -83.1009, 22, -81.1009, 46, -66.1009, 57, -50.1009, 83, -46.1009, 107, -39.1009, 123, -32.1009, 137, -19.1009, 139, -10.1009, 134, -3.10092, 106, 12.8991, 66, 19.8991, 0, 23.8991, -81, 17.8991, -119, 6.89908, -139, -6.10092, -140, -16.1009, -134, -26.1009, -110, -38.1009, -76, -47.1009 ) +shape_range = Vector2( 0, 2 ) +trigger = false + diff --git a/Scenes/Maps/map_1.tscn b/Scenes/Maps/map_1.tscn index 3ddda7a..3843f95 100644 --- a/Scenes/Maps/map_1.tscn +++ b/Scenes/Maps/map_1.tscn @@ -2042,7 +2042,7 @@ transform/scale = Vector2( 6889, 1 ) [node name="Ovni" parent="." instance=ExtResource( 12 )] -transform/pos = Vector2( -1230, -3190 ) +transform/pos = Vector2( -1230, -3340 ) transform/scale = Vector2( 1.7, 1.7 ) [node name="StreamPlayer" type="StreamPlayer" parent="."] diff --git a/Scenes/Menu/main_menu.tscn b/Scenes/Menu/main_menu.tscn index 7eba51a..da9bfb4 100644 --- a/Scenes/Menu/main_menu.tscn +++ b/Scenes/Menu/main_menu.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=8 format=1] +[gd_scene load_steps=9 format=1] [ext_resource path="res://Sprites/GUI/Buttons/btn_shoot.png" type="Texture" id=1] [ext_resource path="res://Fonts/Cave-Story.fnt" type="BitmapFont" id=2] [ext_resource path="res://Scenes/Menu/bttn_play.gd" type="Script" id=3] [ext_resource path="res://Scenes/Menu/about_button.gd" type="Script" id=4] [ext_resource path="res://Music/dangerous_hills.ogg" type="AudioStream" id=5] -[ext_resource path="res://Sprites/GUI/title.png" type="Texture" id=6] -[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=7] +[ext_resource path="res://Sprites/GUI/title_base.png" type="Texture" id=6] +[ext_resource path="res://Sprites/GUI/title_revenge.png" type="Texture" id=7] +[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=8] [node name="Node2D" type="Node2D"] @@ -98,24 +99,31 @@ stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 -[node name="Sprite 2" type="Sprite" parent="."] +[node name="Base" type="Sprite" parent="."] transform/pos = Vector2( 1.07855, -1.84071 ) transform/scale = Vector2( 0.0864583, 0.128739 ) z/z = -1 texture = ExtResource( 6 ) +[node name="Revenge" type="Sprite" parent="."] + +transform/pos = Vector2( 1.07855, -1.84071 ) +transform/scale = Vector2( 0.0864583, 0.128739 ) +texture = ExtResource( 7 ) + [node name="Particles2D" type="Particles2D" parent="."] visibility/blend_mode = 1 transform/pos = Vector2( -32.6951, -11.8638 ) transform/rot = 90.0 transform/scale = Vector2( 0.0957527, 0.0615344 ) -config/amount = 16 -config/lifetime = 5.0 +z/z = 1 +config/amount = 8 +config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 7 ) +config/texture = ExtResource( 8 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 @@ -142,11 +150,76 @@ visibility/blend_mode = 1 transform/pos = Vector2( -34.2293, -8.62984 ) transform/rot = 90.0 transform/scale = Vector2( 0.0957527, 0.0615344 ) -config/amount = 16 -config/lifetime = 5.0 +z/z = 1 +config/amount = 8 +config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 7 ) +config/texture = ExtResource( 8 ) +params/direction = 0.0 +params/spread = 1.0 +params/linear_velocity = 500.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 0.0 +params/tangential_accel = 0.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 1.0 +params/final_size = 1.0 +params/hue_variation = 0.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 +randomness/spread = 10.0 +randomness/linear_velocity = 0.5 +color/color = Color( 0.851562, 0.459045, 0.83623, 1 ) + +[node name="Particles2D2" type="Particles2D" parent="."] + +visibility/blend_mode = 1 +transform/pos = Vector2( -34.2293, -11.7693 ) +transform/rot = 90.0 +transform/scale = Vector2( 0.0957527, 0.0615344 ) +z/z = -1 +config/amount = 6 +config/lifetime = 2.5 +config/preprocess = 1.0 +config/process_mode = 1 +config/texture = ExtResource( 8 ) +params/direction = 0.0 +params/spread = 1.0 +params/linear_velocity = 500.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 0.0 +params/tangential_accel = 0.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 1.0 +params/final_size = 1.0 +params/hue_variation = 0.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 +randomness/spread = 10.0 +randomness/linear_velocity = 0.5 +color/color = Color( 0.851562, 0.459045, 0.83623, 1 ) + +[node name="Particles2D3" type="Particles2D" parent="."] + +visibility/blend_mode = 1 +transform/pos = Vector2( -34.2293, -8.62984 ) +transform/rot = 90.0 +transform/scale = Vector2( 0.0957527, 0.0615344 ) +z/z = -1 +config/amount = 6 +config/lifetime = 2.5 +config/preprocess = 1.0 +config/process_mode = 1 +config/texture = ExtResource( 8 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 diff --git a/Sprites/Effects/UFO-ray_1.png b/Sprites/Effects/UFO-ray_1.png new file mode 100644 index 0000000..7325174 Binary files /dev/null and b/Sprites/Effects/UFO-ray_1.png differ diff --git a/Sprites/Effects/UFO-ray_2.png b/Sprites/Effects/UFO-ray_2.png new file mode 100644 index 0000000..b3bea7b Binary files /dev/null and b/Sprites/Effects/UFO-ray_2.png differ diff --git a/Sprites/GUI/title_base.png b/Sprites/GUI/title_base.png new file mode 100644 index 0000000..4b006cf Binary files /dev/null and b/Sprites/GUI/title_base.png differ diff --git a/Sprites/GUI/title_revenge.png b/Sprites/GUI/title_revenge.png new file mode 100644 index 0000000..56afbc2 Binary files /dev/null and b/Sprites/GUI/title_revenge.png differ