diff --git a/Levels/Level01.gd b/Levels/Level01.gd new file mode 100644 index 0000000..3929d16 --- /dev/null +++ b/Levels/Level01.gd @@ -0,0 +1,23 @@ +extends Spatial + +var enemycount = 1 +onready var NEXTSCENE = "res://Levels/Level02.tscn" + +onready var WinMess = $Messages/Win +onready var EndTimer = $End + +onready var HUD = $"Player/HUD/MenuLayer/Start" + +func _ready(): + pass # Replace with function body. + + +func _on_Enemy_dying(): + enemycount -= 1 + if enemycount == 0: + WinMess.show() + EndTimer.start() + + +func _on_Win_timeout(): + get_tree().change_scene(NEXTSCENE) diff --git a/Levels/Level01.tscn b/Levels/Level01.tscn index 371b631..4870161 100644 --- a/Levels/Level01.tscn +++ b/Levels/Level01.tscn @@ -1,10 +1,56 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Materials/Dark_ProtoMat.tres" type="Material" id=1] [ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=2] [ext_resource path="res://Player.tscn" type="PackedScene" id=3] +[ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=4] +[ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=5] +[ext_resource path="res://Levels/Level01.gd" type="Script" id=6] +[ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=7] +[ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8] -[node name="Spatial" type="Spatial"] +[sub_resource type="PanoramaSky" id=12] +panorama = ExtResource( 7 ) + +[sub_resource type="Environment" id=10] +background_mode = 2 +background_sky = SubResource( 12 ) +ambient_light_energy = 0.5 +fog_color = Color( 0.305882, 0.372549, 0.52549, 1 ) +fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 ) +fog_sun_amount = 1.0 +fog_depth_begin = 98.8 +fog_depth_end = 1444.5 +fog_depth_curve = 0.466516 +fog_transmit_enabled = true +fog_transmit_curve = 0.659754 +fog_height_enabled = true +fog_height_min = 148.2 +fog_height_max = -48.0 +fog_height_curve = 4.59481 +ssao_radius = 8.1 +ssao_intensity = 4.3 +ssao_radius2 = 40.7 +ssao_intensity2 = 14.6 +ssao_bias = 0.059 +ssao_color = Color( 0.180392, 0.207843, 0.25098, 1 ) +glow_enabled = true +glow_intensity = 1.86 +glow_strength = 0.87 +glow_bloom = 0.02 +glow_hdr_threshold = 0.44 +glow_bicubic_upscale = true + +[sub_resource type="DynamicFont" id=11] +size = 64 +outline_size = 4 +outline_color = Color( 0, 0, 0, 1 ) +use_mipmaps = true +use_filter = true +font_data = ExtResource( 8 ) + +[node name="lvl1" type="Spatial"] +script = ExtResource( 6 ) [node name="CSGCombiner" type="CSGCombiner" parent="."] use_collision = true @@ -36,3 +82,37 @@ transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -8.9641 text = "Slap the ball into the other one [hold and release left_click to slap]" + +[node name="Enemy" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, -3 ) + +[node name="Enemy2" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, -16 ) + +[node name="Music" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) +bus = "Music" + +[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."] +environment = SubResource( 10 ) + +[node name="Messages" type="Control" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 + +[node name="Win" type="Label" parent="Messages"] +visible = false +margin_left = 775.0 +margin_top = 469.0 +margin_right = 1187.0 +margin_bottom = 627.0 +custom_fonts/font = SubResource( 11 ) +text = "You're Winner!" +align = 1 + +[node name="End" type="Timer" parent="."] +wait_time = 3.0 + +[connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"] +[connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"] +[connection signal="timeout" from="End" to="." method="_on_Win_timeout"] diff --git a/Levels/Level02.tscn b/Levels/Level02.tscn index 1db1201..bd2808c 100644 --- a/Levels/Level02.tscn +++ b/Levels/Level02.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://Textures/kenney_prototype_textures/red/texture_01.png" type="Texture" id=1] [ext_resource path="res://Textures/kenney_prototype_textures/orange/texture_01.png" type="Texture" id=2] @@ -9,30 +9,43 @@ [ext_resource path="res://Levels/Level02.gd" type="Script" id=7] [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8] [ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=9] +[ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=10] [sub_resource type="SpatialMaterial" id=1] albedo_texture = ExtResource( 2 ) +uv1_triplanar = true [sub_resource type="SpatialMaterial" id=2] albedo_texture = ExtResource( 4 ) +uv1_triplanar = true [sub_resource type="SpatialMaterial" id=3] albedo_texture = ExtResource( 4 ) +uv1_triplanar = true [sub_resource type="SpatialMaterial" id=4] albedo_texture = ExtResource( 1 ) +uv1_triplanar = true [sub_resource type="SpatialMaterial" id=5] albedo_texture = ExtResource( 1 ) +uv1_triplanar = true -[sub_resource type="PanoramaSky" id=9] +[sub_resource type="DynamicFont" id=8] +size = 64 +outline_size = 4 +outline_color = Color( 0, 0, 0, 1 ) +use_mipmaps = true +use_filter = true +font_data = ExtResource( 8 ) + +[sub_resource type="PanoramaSky" id=11] panorama = ExtResource( 6 ) -[sub_resource type="Environment" id=7] +[sub_resource type="Environment" id=10] background_mode = 2 -background_sky = SubResource( 9 ) -ambient_light_energy = 0.67 -fog_enabled = true +background_sky = SubResource( 11 ) +ambient_light_energy = 0.5 fog_color = Color( 0.305882, 0.372549, 0.52549, 1 ) fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 ) fog_sun_amount = 1.0 @@ -58,14 +71,6 @@ glow_bloom = 0.02 glow_hdr_threshold = 0.44 glow_bicubic_upscale = true -[sub_resource type="DynamicFont" id=8] -size = 64 -outline_size = 4 -outline_color = Color( 0, 0, 0, 1 ) -use_mipmaps = true -use_filter = true -font_data = ExtResource( 8 ) - [node name="lvl2" type="Spatial"] script = ExtResource( 7 ) @@ -104,7 +109,7 @@ height = 15.2222 material = SubResource( 5 ) [node name="Player" parent="." instance=ExtResource( 5 )] -transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 4.26204, -33.907 ) +transform = Transform( -0.656112, 0, -0.754664, 0, 1, 0, 0.754664, 0, -0.656112, 0.792524, 4.26204, -33.907 ) [node name="Enemy" parent="." instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.311301, 5.60897, -25.7954 ) @@ -112,15 +117,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.311301, 5.60897, -25.7954 ) [node name="Enemy2" parent="." instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.950571, 4.64411, 34.8337 ) -[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."] -environment = SubResource( 7 ) - -[node name="DirectionalLight_EpicBlueSky" type="DirectionalLight" parent="."] -transform = Transform( 1, 0, 0, 0, 0.849579, 0.527461, 0, -0.527461, 0.849579, 0, 26.5368, 0 ) -light_color = Color( 1, 0.924276, 0.869018, 1 ) -light_specular = 1.0 -shadow_enabled = true - [node name="Messages" type="Control" parent="."] margin_right = 40.0 margin_bottom = 40.0 @@ -143,6 +139,17 @@ stream = ExtResource( 9 ) volume_db = -3.0 bus = "Music" +[node name="Sun" type="DirectionalLight" parent="."] +transform = Transform( -0.897916, 0.257019, -0.357335, 0.170954, 0.951718, 0.254964, 0.405613, 0.167849, -0.898502, -33.0059, 16.9772, -31.8496 ) + +[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."] +environment = SubResource( 10 ) + +[node name="InfoScreen" parent="." instance=ExtResource( 10 )] +transform = Transform( -0.05847, 0, -0.998289, 0, 1, 0, 0.998289, 0, -0.05847, 7.47698, 5.37611, -28.4769 ) +text = "Balls can +bounce" + [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"] [connection signal="timeout" from="End" to="." method="_on_Win_timeout"] diff --git a/Levels/Level03.tscn b/Levels/Level03.tscn index 3685f87..249217b 100644 --- a/Levels/Level03.tscn +++ b/Levels/Level03.tscn @@ -19,14 +19,21 @@ albedo_texture = ExtResource( 2 ) [sub_resource type="SpatialMaterial" id=12] albedo_texture = ExtResource( 7 ) -[sub_resource type="PanoramaSky" id=6] +[sub_resource type="DynamicFont" id=8] +size = 64 +outline_size = 4 +outline_color = Color( 0, 0, 0, 1 ) +use_mipmaps = true +use_filter = true +font_data = ExtResource( 8 ) + +[sub_resource type="PanoramaSky" id=13] panorama = ExtResource( 6 ) -[sub_resource type="Environment" id=7] +[sub_resource type="Environment" id=14] background_mode = 2 -background_sky = SubResource( 6 ) -ambient_light_energy = 0.67 -fog_enabled = true +background_sky = SubResource( 13 ) +ambient_light_energy = 0.5 fog_color = Color( 0.305882, 0.372549, 0.52549, 1 ) fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 ) fog_sun_amount = 1.0 @@ -52,14 +59,6 @@ glow_bloom = 0.02 glow_hdr_threshold = 0.44 glow_bicubic_upscale = true -[sub_resource type="DynamicFont" id=8] -size = 64 -outline_size = 4 -outline_color = Color( 0, 0, 0, 1 ) -use_mipmaps = true -use_filter = true -font_data = ExtResource( 8 ) - [node name="lvl3" type="Spatial"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.990751, 0 ) script = ExtResource( 1 ) @@ -89,15 +88,6 @@ material = SubResource( 12 ) [node name="Player" parent="." instance=ExtResource( 5 )] transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 7.59106, -6.04147 ) -[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."] -environment = SubResource( 7 ) - -[node name="DirectionalLight_EpicBlueSky" type="DirectionalLight" parent="."] -transform = Transform( 1, 0, 0, 0, 0.849579, 0.527461, 0, -0.527461, 0.849579, 0, 26.5368, 0 ) -light_color = Color( 1, 0.924276, 0.869018, 1 ) -light_specular = 1.0 -shadow_enabled = true - [node name="Messages" type="Control" parent="."] margin_right = 40.0 margin_bottom = 40.0 @@ -140,6 +130,12 @@ transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -0.602382 [node name="Enemy7" parent="." instance=ExtResource( 3 )] transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -0.602382, 2.53295, -12.5044 ) +[node name="Sun" type="DirectionalLight" parent="."] +transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.707107, -0.353553, 0.612372, 7.99925, 6, 7.97141 ) + +[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."] +environment = SubResource( 14 ) + [connection signal="timeout" from="End" to="." method="_on_Win_timeout"] [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"] diff --git a/Player.tscn b/Player.tscn index 4087168..37b4158 100644 --- a/Player.tscn +++ b/Player.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://Player.gd" type="Script" id=1] [ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2] [ext_resource path="res://Textures/kenney_prototype_textures/purple/texture_01.png" type="Texture" id=3] [ext_resource path="res://HUD.tscn" type="PackedScene" id=4] [ext_resource path="res://Audio/whoosh.wav" type="AudioStream" id=5] +[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=6] [ext_resource path="res://Scripts/HitBox.gd" type="Script" id=7] [ext_resource path="res://Audio/step2.wav" type="AudioStream" id=8] [ext_resource path="res://Audio/step3.wav" type="AudioStream" id=9] @@ -21,6 +22,7 @@ height = 3.0 extents = Vector3( 0.983522, 2, 1.55035 ) [sub_resource type="SpatialMaterial" id=4] +next_pass = ExtResource( 6 ) flags_no_depth_test = true albedo_texture = ExtResource( 3 ) uv1_triplanar = true diff --git a/Textures/ARA.png b/Textures/ARA.png new file mode 100644 index 0000000..e4b9362 Binary files /dev/null and b/Textures/ARA.png differ diff --git a/Textures/ARA.png.import b/Textures/ARA.png.import new file mode 100644 index 0000000..bff83be --- /dev/null +++ b/Textures/ARA.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Textures/ARA.png" +dest_files=[ "res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.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=true +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/Textures/Custom/300x300.psd b/Textures/Custom/300x300.psd index de9aaba..e0e0c4c 100644 Binary files a/Textures/Custom/300x300.psd and b/Textures/Custom/300x300.psd differ diff --git a/project.godot b/project.godot index 4792279..cadefa1 100644 --- a/project.godot +++ b/project.godot @@ -27,7 +27,7 @@ _global_script_class_icons={ [application] config/name="Slap" -run/main_scene="res://Test_Scene.tscn" +run/main_scene="res://Levels/Level01.tscn" config/icon="res://icon.png" [display]