This commit is contained in:
Victor Turgeon 2022-10-12 13:17:10 -04:00
commit f02268b101
12 changed files with 380 additions and 38 deletions

View File

@ -112,7 +112,7 @@ margin_left = -4.0
margin_top = -8.0
margin_right = 1927.0
margin_bottom = 1085.0
color = Color( 0.14902, 0.121569, 0.121569, 1 )
color = Color( 0.0862745, 0.0705882, 0.0705882, 1 )
[node name="Start" type="Control" parent="MenuLayer"]
pause_mode = 2
@ -134,7 +134,7 @@ margin_left = 886.0
margin_top = 554.0
margin_right = 1061.0
margin_bottom = 598.0
text = "New Game"
text = "Start Level"
[node name="Quit to Desktop" type="Button" parent="MenuLayer/Start"]
margin_left = 887.0
@ -148,7 +148,7 @@ margin_left = 887.0
margin_top = 609.0
margin_right = 1062.0
margin_bottom = 653.0
text = "Quit Game"
text = "Restart Level"
[node name="MenuMusic" type="AudioStreamPlayer" parent="MenuLayer/Start"]
stream = ExtResource( 4 )
@ -225,6 +225,13 @@ margin_right = -17.0
margin_bottom = 26.0
text = "Master Volume"
[node name="Level" type="Label" parent="MenuLayer/Start"]
margin_left = 546.0
margin_top = 478.0
margin_right = 1414.0
margin_bottom = 526.0
align = 1
[connection signal="pressed" from="MenuLayer/Start/New Game" to="MenuLayer/Start" method="_on_New_Game_pressed"]
[connection signal="pressed" from="MenuLayer/Start/Quit to Desktop" to="MenuLayer/Start" method="_on_Quit_to_Desktop_Button_pressed"]
[connection signal="pressed" from="MenuLayer/Start/Quit Game" to="MenuLayer/Start" method="_on_Quit_Game_pressed"]

29
Levels/Level02.gd Normal file
View File

@ -0,0 +1,29 @@
extends Spatial
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
var enemycount = 2
onready var NEXTSCENE = "res://Test_Scene.tscn"
onready var WinMess = $Messages/Win
onready var EndTimer = $End
onready var HUD = $"Player/HUD/MenuLayer/Start"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
func _on_Enemy_dying():
enemycount -= 1
if enemycount == 0:
WinMess.show()
EndTimer.start()
HUD.ingame = false
func _on_Win_timeout():
get_tree().change_scene(NEXTSCENE)

148
Levels/Level02.tscn Normal file
View File

@ -0,0 +1,148 @@
[gd_scene load_steps=18 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]
[ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3]
[ext_resource path="res://Textures/kenney_prototype_textures/green/texture_01.png" type="Texture" id=4]
[ext_resource path="res://Player.tscn" type="PackedScene" id=5]
[ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=6]
[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]
[sub_resource type="SpatialMaterial" id=1]
albedo_texture = ExtResource( 2 )
[sub_resource type="SpatialMaterial" id=2]
albedo_texture = ExtResource( 4 )
[sub_resource type="SpatialMaterial" id=3]
albedo_texture = ExtResource( 4 )
[sub_resource type="SpatialMaterial" id=4]
albedo_texture = ExtResource( 1 )
[sub_resource type="SpatialMaterial" id=5]
albedo_texture = ExtResource( 1 )
[sub_resource type="PanoramaSky" id=6]
panorama = ExtResource( 6 )
[sub_resource type="Environment" id=7]
background_mode = 2
background_sky = SubResource( 6 )
ambient_light_energy = 0.67
fog_enabled = true
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=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 )
[node name="CSGCombiner" type="CSGCombiner" parent="."]
transform = Transform( 1, 0, 0.000244346, 0, 1, 0, -0.000244346, 0, 1, 0, 0, 0 )
use_collision = true
[node name="CSGBox" type="CSGBox" parent="CSGCombiner"]
width = 18.2596
depth = 80.7948
material = SubResource( 1 )
[node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.997184, 0, -0.0749961, 0, 1, 0, 0.0749961, 0, 0.997184, 6.91614, 4.27048, -0.0257568 )
width = 2.86909
height = 6.65734
depth = 80.5573
material = SubResource( 2 )
[node name="CSGBox3" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.99821, 0, 0.0598116, 0, 1, 0, -0.0598116, 0, 0.99821, -7.83423, 4.01678, 0.380192 )
width = 2.86909
height = 6.65734
depth = 80.5573
material = SubResource( 3 )
[node name="CSGBox4" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0489336, 2.37517, -39.3407 )
width = 20.8555
height = 10.0608
material = SubResource( 4 )
[node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3921, -0.351473, -0.361702 )
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 )
[node name="Enemy" parent="." instance=ExtResource( 3 )]
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
[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( 8 )
text = "You're Winner!"
[node name="End" type="Timer" parent="."]
wait_time = 3.0
[node name="Music" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 9 )
volume_db = -3.0
autoplay = true
bus = "Music"
[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"]

View File

@ -22,14 +22,14 @@ onready var MasterBus := AudioServer.get_bus_index(MasterBusName)
# Called when the node enters the scene tree for the first time.
func _ready():
MouseSensSlider.value = get_node("/root/Spatial/Player").mouse_sensitivity
MouseSensSlider.value = get_tree().get_current_scene().get_node("Player").mouse_sensitivity
SFXVol.value = db2linear(AudioServer.get_bus_volume_db(SFXBus))
MusicVol.value = db2linear(AudioServer.get_bus_volume_db(MusicBus))
MasterVol.value = db2linear(AudioServer.get_bus_volume_db(MasterBus))
func _on_MouseSensSlider_value_changed(value):
get_node("/root/Spatial/Player").mouse_sensitivity = value
get_tree().get_current_scene().get_node("Player").mouse_sensitivity = value
func _on_SFXSlider_value_changed(value):

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=2]
[gd_scene load_steps=18 format=2]
[ext_resource path="res://Player.gd" type="Script" id=1]
[ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2]
@ -11,8 +11,6 @@
[ext_resource path="res://Audio/step4.wav" type="AudioStream" id=10]
[ext_resource path="res://Audio/step1.wav" type="AudioStream" id=11]
[ext_resource path="res://Audio/mixkit-fast-whoosh-transition-1490.wav" type="AudioStream" id=12]
[ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=13]
[ext_resource path="res://Music.gd" type="Script" id=14]
[sub_resource type="CapsuleShape" id=2]
height = 3.0
@ -148,13 +146,6 @@ cast_to = Vector3( 0, -1.5, 0 )
anims/RESET = SubResource( 5 )
anims/basic_slap = SubResource( 6 )
[node name="Music" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 13 )
volume_db = -3.0
autoplay = true
bus = "Music"
script = ExtResource( 14 )
[node name="SlapCooldown" type="Timer" parent="."]
wait_time = 0.5

View File

@ -1,10 +1,9 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=15 format=2]
[ext_resource path="res://Scripts/HitBox.gd" type="Script" id=1]
[ext_resource path="res://Scenes/Enemy.gd" type="Script" id=2]
[ext_resource path="res://Scripts/HurtBox.gd" type="Script" id=3]
[ext_resource path="res://Materials/Ball_Mat.tres" type="Material" id=4]
[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=5]
[ext_resource path="res://Audio/boom.wav" type="AudioStream" id=7]
[ext_resource path="res://Audio/80-s-clap.wav" type="AudioStream" id=8]
[ext_resource path="res://Audio/MegaSlap.wav" type="AudioStream" id=9]
@ -18,7 +17,6 @@
[sub_resource type="SphereShape" id=9]
[sub_resource type="SpatialMaterial" id=13]
next_pass = ExtResource( 5 )
params_billboard_mode = 3
particles_anim_h_frames = 1
particles_anim_v_frames = 1

23
Scenes/LevelTest.gd Normal file
View File

@ -0,0 +1,23 @@
extends Spatial
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
onready var Enemies = [ $Enemy, $Enemy2 ]
var isWinner = false
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
isWinner = true
for Enemy in Enemies:
if !Enemy.isDead:
isWinner = false
if isWinner:
get_tree().quit()

118
Scenes/LevelTest.tscn Normal file
View File

@ -0,0 +1,118 @@
[gd_scene load_steps=15 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]
[ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3]
[ext_resource path="res://Textures/kenney_prototype_textures/green/texture_01.png" type="Texture" id=4]
[ext_resource path="res://Player.tscn" type="PackedScene" id=5]
[ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=6]
[ext_resource path="res://Scenes/LevelTest.gd" type="Script" id=7]
[sub_resource type="SpatialMaterial" id=1]
albedo_texture = ExtResource( 2 )
[sub_resource type="SpatialMaterial" id=2]
albedo_texture = ExtResource( 4 )
[sub_resource type="SpatialMaterial" id=3]
albedo_texture = ExtResource( 4 )
[sub_resource type="SpatialMaterial" id=4]
albedo_texture = ExtResource( 1 )
[sub_resource type="SpatialMaterial" id=5]
albedo_texture = ExtResource( 1 )
[sub_resource type="PanoramaSky" id=6]
panorama = ExtResource( 6 )
[sub_resource type="Environment" id=7]
background_mode = 2
background_sky = SubResource( 6 )
ambient_light_energy = 0.67
fog_enabled = true
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
[node name="Spatial" type="Spatial"]
script = ExtResource( 7 )
[node name="CSGCombiner" type="CSGCombiner" parent="."]
transform = Transform( 1, 0, 0.000244346, 0, 1, 0, -0.000244346, 0, 1, 0, 0, 0 )
use_collision = true
[node name="CSGBox" type="CSGBox" parent="CSGCombiner"]
width = 18.2596
depth = 80.7948
material = SubResource( 1 )
[node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.997184, 0, -0.0749961, 0, 1, 0, 0.0749961, 0, 0.997184, 6.91614, 4.27048, -0.0257568 )
width = 2.86909
height = 6.65734
depth = 80.5573
material = SubResource( 2 )
[node name="CSGBox3" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.99821, 0, 0.0598116, 0, 1, 0, -0.0598116, 0, 0.99821, -7.83423, 4.01678, 0.380192 )
width = 2.86909
height = 6.65734
depth = 80.5573
material = SubResource( 3 )
[node name="CSGBox4" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0489336, 2.37517, -39.3407 )
width = 20.8555
height = 10.0608
material = SubResource( 4 )
[node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3921, -0.351473, -0.361702 )
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 )
[node name="Enemy" parent="." instance=ExtResource( 3 )]
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="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 0.72831, 0.357922, 0.584342, 0.224814, -0.930353, 0.289658, 0.647319, -0.0795927, -0.758052, -51.5559, 23.8185, -5.9078 )
light_energy = 1.734
light_indirect_energy = 3.789
light_specular = 0.499

View File

@ -5,14 +5,32 @@ onready var NewGame = $"New Game"
onready var QuitGame = $"Quit Game"
onready var QuitDesktop = $"Quit to Desktop"
onready var MMusic = $"MenuMusic"
onready var CurrentLevel = $"Level"
onready var Levels = {
"lvl1": "Level 1 - What did the five fingers say to the face? SLAP!",
"lvl2": "Level 2 - Something in the way...",
"lvl3": "Level 3 - ",
"lvl4": "Level 4 - ",
"lvl5": "Level 5 - ",
"lvl6": "Level 6 - ",
"lvl7": "Level 7 - ",
"lvl8": "Level 8 - ",
"lvl9": "Level 9 - ",
"lvl10": "Level 10 - ",
"lvl11": "Level 11 - ",
"Spatial" : "I am Error.",
"" : "I also am Error."
}
func _ready():
MMusic.play()
get_parent().show()
get_tree().paused = true
CurrentLevel.text = Levels[get_tree().get_current_scene().get_name()]
QuitGame.hide()
QuitDesktop.margin_top -= 44
QuitDesktop.margin_bottom -= 44
MMusic.play()
get_parent().show()
get_tree().paused = true
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
func _on_Quit_to_Desktop_Button_pressed():
@ -36,7 +54,10 @@ func openMenu():
get_parent().show()
get_tree().paused = true
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
func _on_Quit_Game_pressed():
get_tree().reload_current_scene()
get_tree().paused = true

View File

@ -2,28 +2,30 @@
importer="texture"
type="StreamTexture"
path="res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.stex"
path.s3tc="res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.s3tc.stex"
path.etc2="res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.etc2.stex"
metadata={
"vram_texture": false
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://Textures/kenney_prototype_textures/green/texture_01.png"
dest_files=[ "res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.stex" ]
dest_files=[ "res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.s3tc.stex", "res://.import/texture_01.png-a70a232ea5920a0ccf3e70d4a4d30427.etc2.stex" ]
[params]
compress/mode=0
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/repeat=true
flags/filter=true
flags/mipmaps=false
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
@ -31,5 +33,5 @@ process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0

View File

@ -2,28 +2,30 @@
importer="texture"
type="StreamTexture"
path="res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.stex"
path.s3tc="res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.s3tc.stex"
path.etc2="res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.etc2.stex"
metadata={
"vram_texture": false
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://Textures/kenney_prototype_textures/red/texture_01.png"
dest_files=[ "res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.stex" ]
dest_files=[ "res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.s3tc.stex", "res://.import/texture_01.png-31ae63b9e1d9ba8e9393cf4124d04d7b.etc2.stex" ]
[params]
compress/mode=0
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/repeat=true
flags/filter=true
flags/mipmaps=false
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
@ -31,5 +33,5 @@ process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0

View File

@ -34,6 +34,9 @@ config/icon="res://icon.png"
window/size/width=1920
window/size/height=1080
window/size/fullscreen=true
window/size/test_width=1280
window/size/test_height=720
window/stretch/mode="viewport"
window/stretch/aspect="keep"