Commit 866010a4 authored by Nathan Lovato's avatar Nathan Lovato
Browse files

Fix broken exported variables and built-in script

parent 19eb5ef3
Pipeline #5101 failed with stage
in 1 minute and 25 seconds
......@@ -13,21 +13,37 @@
[ext_resource path="res://ScoreBoard/ScoreBoard.tscn" type="PackedScene" id=11]
[sub_resource type="Gradient" id=1]
offsets = PoolRealArray( 0, 0.26699, 0.76699, 1 )
colors = PoolColorArray( 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 )
[sub_resource type="GradientTexture" id=2]
flags = 4
gradient = SubResource( 1 )
width = 2048
[sub_resource type="Curve" id=3]
min_value = 0.0
max_value = 1.0
bake_resolution = 100
_data = [ Vector2( 0, 0.528988 ), 0.0, 1.40242, 0, 0, Vector2( 0.331339, 0.687388 ), 0.956195, 0.956195, 0, 0, Vector2( 1, 1 ), 0.0, 0.0, 0, 0 ]
[sub_resource type="CurveTexture" id=4]
flags = 4
width = 2048
curve = SubResource( 3 )
[sub_resource type="ParticlesMaterial" id=5]
render_priority = 0
trail_divisor = 1
emission_shape = 2
emission_box_extents = Vector3( 540, 20, 1 )
flag_align_y = false
flag_rotate_y = false
flag_disable_z = true
spread = 180.0
flatness = 0.32
......@@ -38,17 +54,33 @@ angular_velocity = 28.27
angular_velocity_random = 1.0
orbit_velocity = 0.0
orbit_velocity_random = 0.0
linear_accel = 0.0
linear_accel_random = 0.0
radial_accel = 0.0
radial_accel_random = 0.0
tangential_accel = 0.0
tangential_accel_random = 0.0
damping = 25.29
damping_random = 0.0
angle = 310.1
angle_random = 1.0
scale = 0.97
scale_random = 0.39
scale_curve = SubResource( 4 )
color_ramp = SubResource( 2 )
hue_variation = 0.0
hue_variation_random = 1.0
anim_speed = 0.0
anim_speed_random = 0.0
anim_offset = 0.0
anim_offset_random = 0.0
anim_loop = false
[sub_resource type="Animation" id=6]
length = 0.6
loop = false
step = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
......@@ -62,61 +94,129 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
}
[node name="Game" type="Node2D"]
[node name="Game" type="Node2D" index="0"]
script = ExtResource( 1 )
[node name="Background" type="CanvasLayer" parent="."]
[node name="Background" type="CanvasLayer" parent="." index="0"]
layer = -10
offset = Vector2( 0, 0 )
rotation = 0.0
scale = Vector2( 1, 1 )
transform = Transform2D( 1, 0, 0, 1, 0, 0 )
[node name="Sky" type="Sprite" parent="Background" index="0"]
[node name="Sky" type="Sprite" parent="Background"]
texture = ExtResource( 2 )
offset = Vector2( 540, 960 )
[node name="Fog" type="Particles2D" parent="Background"]
[node name="Fog" type="Particles2D" parent="Background" index="1"]
modulate = Color( 0.878431, 0.243137, 0.435294, 1 )
position = Vector2( 510, 1540 )
scale = Vector2( 1.31406, 1.31406 )
emitting = true
amount = 40
lifetime = 3.0
one_shot = false
preprocess = 2.0
speed_scale = 1.0
explosiveness = 0.0
randomness = 0.0
fixed_fps = 0
fract_delta = true
visibility_rect = Rect2( -640, -100.058, 1280, 200 )
local_coords = true
draw_order = 0
process_material = SubResource( 5 )
texture = ExtResource( 3 )
normal_map = null
h_frames = 1
v_frames = 1
[node name="ScoreLabel" parent="Background" index="2" instance=ExtResource( 4 )]
anchor_left = 0.0
anchor_top = 0.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="Gnu" parent="." index="1" instance=ExtResource( 5 )]
[node name="ScoreLabel" parent="Background" instance=ExtResource( 4 )]
[node name="Gnu" parent="." instance=ExtResource( 5 )]
position = Vector2( 190, 960 )
z_index = 1
input_pickable = false
collision_layer = 1
collision/safe_margin = 0.08
gravity = 4000.0
flap_force = 1200.0
max_fall_speed = 1200.0
max_angular_velocity = 3.14159
angular_acceleration = 6.28319
speed_horizontal = 280.0
[node name="Foreground" type="Node2D" parent="." index="2"]
[node name="Foreground" type="Node2D" parent="."]
script = ExtResource( 6 )
[node name="PillarSpawner" parent="Foreground" instance=ExtResource( 7 )]
[node name="PillarSpawner" parent="Foreground" index="0" instance=ExtResource( 7 )]
position = Vector2( 0, 950 )
[node name="GroundSpawner" type="Node2D" parent="Foreground"]
[node name="GroundSpawner" type="Node2D" parent="Foreground" index="1"]
editor/display_folded = true
position = Vector2( -180, 1930 )
z_index = 100
script = ExtResource( 8 )
sprite_scene = ExtResource( 9 )
[node name="SpawnPosition" type="Position2D" parent="Foreground/GroundSpawner"]
[node name="SpawnPosition" type="Position2D" parent="Foreground/GroundSpawner" index="0"]
[node name="FenceSpawner" type="Node2D" parent="Foreground" index="2"]
[node name="FenceSpawner" type="Node2D" parent="Foreground"]
position = Vector2( -180, 1700 )
z_index = 100
script = ExtResource( 8 )
sprite_scene = ExtResource( 10 )
[node name="SpawnPosition" type="Position2D" parent="Foreground/FenceSpawner"]
[node name="SpawnPosition" type="Position2D" parent="Foreground/FenceSpawner" index="0"]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Foreground"]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Foreground" index="3"]
root_node = NodePath("..")
autoplay = ""
playback_process_mode = 1
playback_default_blend_time = 0.0
playback_speed = 1.0
anims/fade_out = SubResource( 6 )
blend_times = [ ]
[node name="UI" type="CanvasLayer" parent="." index="3"]
[node name="UI" type="CanvasLayer" parent="."]
layer = 1
offset = Vector2( 0, 0 )
rotation = 0.0
scale = Vector2( 1, 1 )
transform = Transform2D( 1, 0, 0, 1, 0, 0 )
[node name="ScoreBoard" parent="UI" index="0" instance=ExtResource( 11 )]
[node name="ScoreBoard" parent="UI" instance=ExtResource( 11 )]
visible = false
anchor_left = 0.0
anchor_top = 0.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
......@@ -3,12 +3,16 @@
[ext_resource path="res://PillarSpawner/PillarSpawner.gd" type="Script" id=1]
[ext_resource path="res://PillarSpawner/SpawnArea.gd" type="Script" id=2]
[node name="PillarSpawner" type="Node2D"]
[node name="PillarSpawner" type="Node2D" index="0"]
position = Vector2( 0, 960 )
script = ExtResource( 1 )
spawn_interval = 400.0
[node name="SpawnArea" type="Node2D" parent="." index="0"]
[node name="SpawnArea" type="Node2D" parent="."]
script = ExtResource( 2 )
min_extents = 60.0
max_extents = 400.0
......@@ -4,11 +4,11 @@
[ext_resource path="res://assets/fonts/ScoreRow.tres" type="DynamicFont" id=2]
[sub_resource type="GDScript" id=1]
script/source = "extends Label
script/source = "extends Label
func set_rank(index) -> void:
var suffix := \"\"
func set_rank(index):
var suffix = \"\"
match index:
0:
suffix = \"st\"
......@@ -22,8 +22,11 @@ func set_rank(index) -> void:
"
[sub_resource type="Animation" id=2]
resource_name = "fade_in"
length = 0.3
loop = false
step = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
......@@ -37,44 +40,99 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
}
[node name="ScoreRow" type="HBoxContainer"]
[node name="ScoreRow" type="HBoxContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
margin_top = -44.0
margin_bottom = 44.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
alignment = 1
script = ExtResource( 1 )
[node name="Rank" type="Label" parent="."]
[node name="Rank" type="Label" parent="." index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 357.0
margin_bottom = 88.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 4
custom_fonts/font = ExtResource( 2 )
text = "1ST"
align = 2
uppercase = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
script = SubResource( 1 )
[node name="Score" type="Label" parent="."]
[node name="Score" type="Label" parent="." index="1"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 361.0
margin_right = 718.0
margin_bottom = 88.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 4
custom_fonts/font = ExtResource( 2 )
text = "001"
align = 1
uppercase = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="Initials" type="Label" parent="." index="2"]
[node name="Initials" type="Label" parent="."]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 722.0
margin_right = 1080.0
margin_bottom = 88.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 4
custom_fonts/font = ExtResource( 2 )
text = "RMS"
uppercase = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="3"]
root_node = NodePath("..")
autoplay = ""
playback_process_mode = 1
playback_default_blend_time = 0.0
playback_speed = 1.0
anims/fade_in = SubResource( 2 )
blend_times = [ ]
......@@ -7,7 +7,7 @@ fill the view
onready var spawn_position = $SpawnPosition
export var sprite_scene : PackedScene
export(PackedScene) var sprite_scene
var WINDOW_WIDTH = ProjectSettings.get('display/window/size/width')
var sprite_width = 0.0
......
......@@ -2,7 +2,100 @@
[sub_resource type="ProceduralSky" id=1]
radiance_size = 4
sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
sky_curve = 0.25
sky_energy = 1.0
ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
ground_curve = 0.01
ground_energy = 1.0
sun_color = Color( 1, 1, 1, 1 )
sun_latitude = 35.0
sun_longitude = 0.0
sun_angle_min = 1.0
sun_angle_max = 100.0
sun_curve = 0.05
sun_energy = 16.0
texture_size = 2
[resource]
background_mode = 2
background_sky = SubResource( 1 )
background_sky_custom_fov = 0.0
background_color = Color( 0, 0, 0, 1 )
background_energy = 1.0
background_canvas_max_layer = 0
ambient_light_color = Color( 0, 0, 0, 1 )
ambient_light_energy = 1.0
ambient_light_sky_contribution = 1.0
fog_enabled = false
fog_color = Color( 0.5, 0.6, 0.7, 1 )
fog_sun_color = Color( 1, 0.9, 0.7, 1 )
fog_sun_amount = 0.0
fog_depth_enabled = true
fog_depth_begin = 10.0
fog_depth_curve = 1.0
fog_transmit_enabled = false
fog_transmit_curve = 1.0
fog_height_enabled = false
fog_height_min = 0.0
fog_height_max = 100.0
fog_height_curve = 1.0
tonemap_mode = 0
tonemap_exposure = 1.0
tonemap_white = 1.0
auto_exposure_enabled = false
auto_exposure_scale = 0.4
auto_exposure_min_luma = 0.05
auto_exposure_max_luma = 8.0
auto_exposure_speed = 0.5
ss_reflections_enabled = false
ss_reflections_max_steps = 64
ss_reflections_fade_in = 0.15
ss_reflections_fade_out = 2.0
ss_reflections_depth_tolerance = 0.2
ss_reflections_roughness = true
ssao_enabled = false
ssao_radius = 1.0
ssao_intensity = 1.0
ssao_radius2 = 0.0
ssao_intensity2 = 1.0
ssao_bias = 0.01
ssao_light_affect = 0.0
ssao_color = Color( 0, 0, 0, 1 )
ssao_quality = 0
ssao_blur = 3
ssao_edge_sharpness = 4.0
dof_blur_far_enabled = false
dof_blur_far_distance = 10.0
dof_blur_far_transition = 5.0
dof_blur_far_amount = 0.1
dof_blur_far_quality = 1
dof_blur_near_enabled = false
dof_blur_near_distance = 2.0
dof_blur_near_transition = 1.0
dof_blur_near_amount = 0.1
dof_blur_near_quality = 1
glow_enabled = false
glow_levels/1 = false
glow_levels/2 = false
glow_levels/3 = true
glow_levels/4 = false
glow_levels/5 = true
glow_levels/6 = false
glow_levels/7 = false
glow_intensity = 0.8
glow_strength = 1.0
glow_bloom = 0.0
glow_blend_mode = 2
glow_hdr_threshold = 1.0
glow_hdr_scale = 2.0
glow_bicubic_upscale = false
adjustment_enabled = false
adjustment_brightness = 1.0
adjustment_contrast = 1.0
adjustment_saturation = 1.0
......@@ -6,12 +6,7 @@
; [section] ; section goes between []
; param=value ; assign values to parameters
config_version=4
_global_script_classes=[ ]
_global_script_class_icons={
}
config_version=3
[application]
......@@ -34,22 +29,10 @@ window/stretch/aspect="keep"
[input]
flap={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":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":32,"unicode":0,"echo":false,"script":null)
]
}
reset={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null)
]
}
tap={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
]
}
flap=[ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":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":32,"unicode":0,"echo":false,"script":null)]
reset=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null)]
tap=[ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)]
[layer_names]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment