Skip to content

Commit

Permalink
Crunch time version 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@williamd1k0
williamd1k0 committed Jan 31, 2017
1 parent 0451b66 commit ec4ed89
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 58 deletions.
Binary file added assets/textures/scene_items/sky_bg3.tex
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion engine.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ ui_right=[key(Right), jbutton(0, 15), jaxis(0, 1), key(D)]

[render]

default_clear_color=#ff4a4a4a
default_clear_color=#ff000000
4 changes: 2 additions & 2 deletions scenes/screen/GameHUD.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 0
margin/left = 60.0
margin/top = 333.0
margin/top = 92.0
margin/right = 420.0
margin/bottom = 589.0
margin/bottom = 348.0
custom_fonts/font = SubResource( 1 )
custom_colors/font_color_shadow = Color( 0.325768, 0.0636292, 0.542969, 1 )
text = "Now, catch as many stars as you can in your basket.\nBe careful not to let them hit the balloons!"
Expand Down
158 changes: 103 additions & 55 deletions scenes/screen/GameScreen.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
[gd_scene load_steps=32 format=1]
[gd_scene load_steps=35 format=1]

[ext_resource path="res://scripts/core/GameScreen.gd" type="Script" id=1]
[ext_resource path="res://scenes/core/AudioFade.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/music/wind_loop.ogg" type="AudioStream" id=3]
[ext_resource path="res://assets/music/starphaser_loop.ogg" type="AudioStream" id=4]
[ext_resource path="res://assets/textures/scene_items/sky_bg.tex" type="Texture" id=5]
[ext_resource path="res://assets/textures/scene_items/sky_bg2.tex" type="Texture" id=6]
[ext_resource path="res://assets/textures/scene_items/sunrise_cloud.tex" type="Texture" id=7]
[ext_resource path="res://assets/textures/scene_items/cloud_bg.tex" type="Texture" id=8]
[ext_resource path="res://assets/textures/scene_items/grass_tuft.tex" type="Texture" id=9]
[ext_resource path="res://assets/textures/scene_items/ground.tex" type="Texture" id=10]
[ext_resource path="res://assets/textures/scene_items/grass_tuft_2.tex" type="Texture" id=11]
[ext_resource path="res://assets/shaders/simple_wind_shader.tres" type="CanvasItemMaterial" id=12]
[ext_resource path="res://assets/textures/scene_items/bg_flowers.tex" type="Texture" id=13]
[ext_resource path="res://scenes/gameplay/BalloonPlayer.tscn" type="PackedScene" id=14]
[ext_resource path="res://scenes/gameplay/SpawnerArea.tscn" type="PackedScene" id=15]
[ext_resource path="res://scenes/gameplay/SpawnerTimer.tscn" type="PackedScene" id=16]
[ext_resource path="res://scenes/gameplay/StarBase.tscn" type="PackedScene" id=17]
[ext_resource path="res://assets/textures/scene_items/title_graphic.tex" type="Texture" id=18]
[ext_resource path="res://scenes/screen/GameHUD.tscn" type="PackedScene" id=19]
[ext_resource path="res://assets/textures/scene_items/sky_bg3.tex" type="Texture" id=7]
[ext_resource path="res://assets/textures/scene_items/sunrise_cloud.tex" type="Texture" id=8]
[ext_resource path="res://assets/textures/scene_items/cloud_bg.tex" type="Texture" id=9]
[ext_resource path="res://assets/textures/scene_items/grass_tuft.tex" type="Texture" id=10]
[ext_resource path="res://assets/textures/scene_items/ground.tex" type="Texture" id=11]
[ext_resource path="res://assets/textures/scene_items/grass_tuft_2.tex" type="Texture" id=12]
[ext_resource path="res://assets/shaders/simple_wind_shader.tres" type="CanvasItemMaterial" id=13]
[ext_resource path="res://assets/textures/scene_items/bg_flowers.tex" type="Texture" id=14]
[ext_resource path="res://scenes/gameplay/BalloonPlayer.tscn" type="PackedScene" id=15]
[ext_resource path="res://scenes/gameplay/SpawnerArea.tscn" type="PackedScene" id=16]
[ext_resource path="res://scenes/gameplay/SpawnerTimer.tscn" type="PackedScene" id=17]
[ext_resource path="res://scenes/gameplay/StarBase.tscn" type="PackedScene" id=18]
[ext_resource path="res://assets/textures/scene_items/title_graphic.tex" type="Texture" id=19]
[ext_resource path="res://assets/fonts/great-vibes/src/GreatVibes-Regular.ttf" type="DynamicFontData" id=20]
[ext_resource path="res://scenes/screen/GameHUD.tscn" type="PackedScene" id=21]

[sub_resource type="Animation" id=1]

Expand All @@ -41,6 +43,11 @@ tracks/2/path = NodePath("MainLayer/BalloonPlayer/Player/Camera2D:zoom")
tracks/2/interp = 1
tracks/2/imported = false
tracks/2/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":0, "values":[ Vector2( 1, 1 ) ] }
tracks/3/type = "value"
tracks/3/path = NodePath("HUD/Label:visibility/opacity")
tracks/3/interp = 1
tracks/3/imported = false
tracks/3/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":0, "values":[ 1.0 ] }

[sub_resource type="Animation" id=2]

Expand All @@ -67,6 +74,11 @@ tracks/3/path = NodePath("HUD/GameHUD/AnimationPlayer:playback/play")
tracks/3/interp = 1
tracks/3/imported = false
tracks/3/keys = { "times":FloatArray( 6 ), "transitions":FloatArray( 1 ), "update":2, "values":[ "start" ] }
tracks/4/type = "value"
tracks/4/path = NodePath("HUD/Label:visibility/opacity")
tracks/4/interp = 1
tracks/4/imported = false
tracks/4/keys = { "times":FloatArray( 2.1, 6 ), "transitions":FloatArray( 1, 1 ), "update":0, "values":[ 1.0, 0.0 ] }

[sub_resource type="Animation" id=3]

Expand Down Expand Up @@ -137,6 +149,13 @@ shader/shader = SubResource( 5 )
shader/shading_mode = 0
shader_param/Scalar = 10.0

[sub_resource type="DynamicFont" id=13]

font/size = 36
font/use_mipmaps = true
font/use_filter = true
font/font = ExtResource( 20 )

[node name="TitleGameScreen" type="Node2D"]

script/script = ExtResource( 1 )
Expand Down Expand Up @@ -198,6 +217,14 @@ texture = ExtResource( 6 )
region = true
region_rect = Rect2( 0, 0, 5000, 1024 )

[node name="sky_bg3" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]

transform/pos = Vector2( 247.813, -1547.2 )
transform/scale = Vector2( 0.835572, 0.835572 )
texture = ExtResource( 7 )
region = true
region_rect = Rect2( 0, 0, 5000, 1020 )

[node name="_sky_bg" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]

transform/pos = Vector2( 247.813, 875.813 )
Expand All @@ -210,7 +237,7 @@ region_rect = Rect2( 0, -1, 2048, 1024 )
[node name="sunrise_cloud" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]

transform/pos = Vector2( 988, 110 )
texture = ExtResource( 7 )
texture = ExtResource( 8 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="ParallaxBackground/ParallaxLayer/sunrise_cloud"]

Expand All @@ -233,7 +260,7 @@ motion/mirroring = Vector2( 0, 0 )
[node name="white_cloud" type="Sprite" parent="ParallaxBackground/ParallaxLayer2"]

transform/pos = Vector2( -284, 177 )
texture = ExtResource( 8 )
texture = ExtResource( 9 )
centered = false
region = true
region_rect = Rect2( 5, 5, 2048, 512 )
Expand All @@ -251,6 +278,8 @@ autoplay = "CloudTitleAnim"

[node name="MainLayer" type="Node2D" parent="."]

editor/display_folded = true

[node name="GrassBack" type="Node2D" parent="MainLayer"]

editor/display_folded = true
Expand All @@ -265,7 +294,7 @@ material/material = SubResource( 6 )
transform/pos = Vector2( -986.145, -355.215 )
transform/rot = -6.15568
transform/scale = Vector2( 0.68515, 0.68515 )
texture = ExtResource( 9 )
texture = ExtResource( 10 )
modulate = Color( 0.286182, 0.143188, 0.796875, 1 )

[node name="grass_tuft6" type="Sprite" parent="MainLayer/GrassBack"]
Expand All @@ -275,18 +304,19 @@ material/material = SubResource( 7 )
transform/pos = Vector2( -526.124, -300.08 )
transform/rot = -6.15568
transform/scale = Vector2( 0.68515, 0.68515 )
texture = ExtResource( 9 )
texture = ExtResource( 10 )
flip_h = true
modulate = Color( 0.286182, 0.143188, 0.796875, 1 )

[node name="ground" type="Sprite" parent="MainLayer"]

transform/pos = Vector2( 251.19, 538.404 )
transform/scale = Vector2( 0.835572, 0.874104 )
texture = ExtResource( 10 )
texture = ExtResource( 11 )

[node name="SmallGrass" type="Node2D" parent="MainLayer"]

editor/display_folded = true
visibility/opacity = 0.85
transform/pos = Vector2( 565, 613 )
z/z = 1
Expand All @@ -296,7 +326,7 @@ z/z = 1
transform/pos = Vector2( -272.555, -78.441 )
transform/rot = 6.18468
transform/scale = Vector2( 0.0597345, 0.0597345 )
texture = ExtResource( 11 )
texture = ExtResource( 12 )
flip_h = true
modulate = Color( 0.796875, 0.796875, 0.796875, 1 )
region = true
Expand All @@ -307,7 +337,7 @@ region_rect = Rect2( 0, 0, 900, 200 )
transform/pos = Vector2( -383.373, -78.1939 )
transform/rot = -7.62422
transform/scale = Vector2( 0.0597345, 0.0597345 )
texture = ExtResource( 11 )
texture = ExtResource( 12 )
modulate = Color( 0.796875, 0.796875, 0.796875, 1 )
region = true
region_rect = Rect2( 0, 0, 800, 200 )
Expand All @@ -316,7 +346,7 @@ region_rect = Rect2( 0, 0, 800, 200 )

transform/pos = Vector2( -328.863, -75.2848 )
transform/scale = Vector2( 0.08529, 0.0597345 )
texture = ExtResource( 11 )
texture = ExtResource( 12 )
flip_h = true
modulate = Color( 0.796875, 0.796875, 0.796875, 1 )
region = true
Expand All @@ -331,9 +361,9 @@ transform/scale = Vector2( 0.44422, 0.44422 )

[node name="grass_tuft3" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
material/material = ExtResource( 13 )
transform/pos = Vector2( -21.4455, -180.091 )
texture = ExtResource( 9 )
texture = ExtResource( 10 )
flip_h = true

[node name="bg_flowers4" type="Sprite" parent="MainLayer/GrassFront"]
Expand All @@ -342,21 +372,21 @@ material/material = SubResource( 8 )
transform/pos = Vector2( -226.162, -326.701 )
transform/rot = 6.81639
transform/scale = Vector2( 0.614421, 0.614421 )
texture = ExtResource( 13 )
texture = ExtResource( 14 )
flip_h = true

[node name="grass_tuft8" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
texture = ExtResource( 9 )
material/material = ExtResource( 13 )
texture = ExtResource( 10 )
flip_h = true

[node name="grass_tuft4" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
material/material = ExtResource( 13 )
transform/pos = Vector2( -1406.24, -332.016 )
transform/rot = -17.6572
texture = ExtResource( 9 )
texture = ExtResource( 10 )
flip_h = true

[node name="bg_flowers2" type="Sprite" parent="MainLayer/GrassFront"]
Expand All @@ -365,42 +395,42 @@ material/material = SubResource( 9 )
transform/pos = Vector2( -1161.67, -426.729 )
transform/rot = -9.38129
transform/scale = Vector2( 0.614421, 0.614421 )
texture = ExtResource( 13 )
texture = ExtResource( 14 )

[node name="grass_tuft7" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
material/material = ExtResource( 13 )
transform/pos = Vector2( -1571.01, -192.442 )
transform/rot = -17.6572
texture = ExtResource( 9 )
texture = ExtResource( 10 )
flip_h = true

[node name="grass_tuft" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
material/material = ExtResource( 13 )
transform/pos = Vector2( -1012.38, -19.3785 )
transform/rot = -6.15568
texture = ExtResource( 9 )
texture = ExtResource( 10 )

[node name="grass_tuft2" type="Sprite" parent="MainLayer/GrassFront"]

material/material = ExtResource( 12 )
material/material = ExtResource( 13 )
transform/pos = Vector2( -496.223, 9.65991 )
transform/rot = -6.15568
texture = ExtResource( 9 )
texture = ExtResource( 10 )
flip_h = true

[node name="bg_flowers" type="Sprite" parent="MainLayer/GrassFront"]

material/material = SubResource( 10 )
transform/pos = Vector2( -458.961, -152.145 )
texture = ExtResource( 13 )
texture = ExtResource( 14 )

[node name="bg_flowers3" type="Sprite" parent="MainLayer/GrassFront"]

material/material = SubResource( 11 )
transform/pos = Vector2( -1010.28, -184.568 )
texture = ExtResource( 13 )
texture = ExtResource( 14 )
flip_h = true

[node name="bg_flowers5" type="Sprite" parent="MainLayer/GrassFront"]
Expand All @@ -410,36 +440,35 @@ material/material = SubResource( 12 )
transform/pos = Vector2( -487.522, -4.38337 )
transform/rot = -12.8613
transform/scale = Vector2( 1.48892, 1.48892 )
texture = ExtResource( 13 )
texture = ExtResource( 14 )
flip_h = true

[node name="BalloonPlayer" parent="MainLayer" instance=ExtResource( 14 )]
[node name="BalloonPlayer" parent="MainLayer" instance=ExtResource( 15 )]

transform/pos = Vector2( 239, 185 )

[node name="BalloonBody2" parent="MainLayer/BalloonPlayer"]
[node name="BalloonBody" parent="MainLayer/BalloonPlayer"]

modulate = Color( 0.929412, 0.12549, 0.141176, 1 )
modulate = Color( 0.156863, 0.352941, 0.858824, 1 )

[node name="BalloonBody3" parent="MainLayer/BalloonPlayer"]
[node name="BalloonBody2" parent="MainLayer/BalloonPlayer"]

modulate = Color( 0.156863, 0.352941, 0.858824, 1 )
modulate = Color( 0.129412, 0.741176, 0.172549, 1 )

[node name="Camera2D" parent="MainLayer/BalloonPlayer/Player"]

offset = Vector2( 0, -200 )
zoom = Vector2( 1.5, 1.5 )
offset = Vector2( 0, 100 )

[node name="SpawnerArea" parent="MainLayer" instance=ExtResource( 15 )]
[node name="SpawnerArea" parent="MainLayer" instance=ExtResource( 16 )]

test_scene = null
y_offset = 1000
debug = false

[node name="SpawnerTimer" parent="MainLayer" instance=ExtResource( 16 )]
[node name="SpawnerTimer" parent="MainLayer" instance=ExtResource( 17 )]

wait_time = 2.0
object_scene = ExtResource( 17 )
object_scene = ExtResource( 18 )
spawner_area = "spawner-area"
spawn = false
debug = false
Expand Down Expand Up @@ -497,7 +526,7 @@ region_rect = Rect2( 0, -1, 2048, 1024 )

transform/pos = Vector2( 360.464, 89 )
transform/scale = Vector2( 5, 10.3553 )
texture = ExtResource( 7 )
texture = ExtResource( 8 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="ParallaxBackground2/ParallaxLayer/sunrise_cloud"]

Expand All @@ -521,7 +550,7 @@ motion/mirroring = Vector2( 0, 0 )
[node name="white_cloud" type="Sprite" parent="ParallaxBackground2/ParallaxLayer2"]

transform/pos = Vector2( -284, 177 )
texture = ExtResource( 8 )
texture = ExtResource( 9 )
centered = false
region = true
region_rect = Rect2( 5, 5, 2048, 512 )
Expand All @@ -546,12 +575,31 @@ scale = Vector2( 1, 1 )

[node name="title_graphic" type="Sprite" parent="HUD"]

visibility/opacity = 0.0
transform/pos = Vector2( 237, 91 )
transform/scale = Vector2( 0.419922, 0.419922 )
texture = ExtResource( 18 )

[node name="GameHUD" parent="HUD" instance=ExtResource( 19 )]
texture = ExtResource( 19 )

[node name="Label" type="Label" parent="HUD"]

focus/ignore_mouse = true
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 0
margin/left = 0.0
margin/top = 571.0
margin/right = 480.0
margin/bottom = 616.0
custom_fonts/font = SubResource( 13 )
custom_colors/font_color_shadow = Color( 0.312778, 0.121689, 0.566406, 1 )
text = "Shake off to start flying!"
align = 1
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="GameHUD" parent="HUD" instance=ExtResource( 21 )]

visibility/opacity = 1.0

[connection signal="finished" from="HUD/GameHUD/AnimationPlayer" to="." method="_on_AnimationPlayer_finished"]

Expand Down

0 comments on commit ec4ed89

Please sign in to comment.