This commit is contained in:
Victor Turgeon 2022-10-12 20:57:42 -04:00
commit 0a883a031d
6 changed files with 184 additions and 23 deletions

Binary file not shown.

View File

@ -4,7 +4,7 @@ extends Spatial
# Declare member variables here. Examples: # Declare member variables here. Examples:
# var a = 2 # var a = 2
# var b = "text" # var b = "text"
var enemycount = 2 var enemycount = 7
onready var NEXTSCENE = "res://Scenes/End.tscn" onready var NEXTSCENE = "res://Scenes/End.tscn"
onready var WinMess = $Messages/Win onready var WinMess = $Messages/Win
@ -26,3 +26,4 @@ func _on_Enemy_dying():
func _on_Win_timeout(): func _on_Win_timeout():
get_tree().change_scene(NEXTSCENE) get_tree().change_scene(NEXTSCENE)

View File

@ -58,10 +58,10 @@ transform = Transform( 1, 0, 0.000244346, 0, 1, 0, -0.000244346, 0, 1, 0, 0, 0 )
use_collision = true use_collision = true
[node name="CSGBox" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -400.676, -3.7047, -436.227 ) transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -33.6014, -3.7047, -188.392 )
width = 1000.0 width = 246.369
height = 1.0 height = 1.0
depth = 1000.0 depth = 488.763
[node name="CSGBox2" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 86.2812, 13.2378, 27.87 ) transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 86.2812, 13.2378, 27.87 )
@ -99,9 +99,9 @@ height = 35.4425
depth = 78.029 depth = 78.029
[node name="CSGBox9" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox9" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 32.0407, 13.2378, -85.3592 ) transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 32.0479, 13.2378, -114.679 )
height = 35.4425 height = 91.7009
depth = 64.0893 depth = 118.952
[node name="CSGBox10" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox10" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999999, 0, 1, 0, -0.999999, 0, -0.000453754, 78.9271, 13.1203, -120.838 ) transform = Transform( -0.000453754, 0, 0.999999, 0, 1, 0, -0.999999, 0, -0.000453754, 78.9271, 13.1203, -120.838 )
@ -109,9 +109,9 @@ height = 35.4425
depth = 28.3406 depth = 28.3406
[node name="CSGBox11" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox11" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 87.2983, 13.2378, -111.903 ) transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 87.3217, 13.2378, -207.544 )
height = 35.4425 height = 35.4425
depth = 226.35 depth = 415.34
[node name="CSGBox12" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox12" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999999, 0, 1, 0, -0.999999, 0, -0.000453754, 7.58406, 13.1203, -8.48543 ) transform = Transform( -0.000453754, 0, 0.999999, 0, 1, 0, -0.999999, 0, -0.000453754, 7.58406, 13.1203, -8.48543 )
@ -119,14 +119,119 @@ height = 35.4425
depth = 53.7257 depth = 53.7257
[node name="CSGBox13" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox13" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -19.2716, 13.2378, 6.43087 ) transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -19.2691, 13.2378, -3.6952 )
height = 35.4425 height = 35.4425
depth = 64.3012 depth = 54.9621
[node name="CSGBox14" type="CSGBox" parent="CSGCombiner"] [node name="CSGBox14" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.0299802, -0.99955, -0.000251671, 0.999549, -0.0299803, 0.000244236, -0.000251671, -0.000244236, 0.999998, 81.4861, 31.0136, -45.2696 ) transform = Transform( -0.0299802, -0.99955, -0.000251671, 0.999549, -0.0299803, 0.000244236, -0.000251671, -0.000244236, 0.999998, 81.4903, 31.0136, -62.5089 )
height = 35.4425 height = 35.4425
depth = 91.4289 depth = 122.196
[node name="CSGBox15" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999972, 0, 0.00720813, 0, 1, 0, -0.00720813, 0, 0.999972, -45.1009, 13.2378, -54.4091 )
height = 35.4425
depth = 160.32
[node name="CSGBox16" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, -32.2756, 13.1203, 25.6462 )
height = 42.4404
depth = 24.4842
[node name="CSGBox17" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.00376999, -0.999993, -0.000243424, 0.999991, 0.00376994, 0.000244344, -0.000243424, -0.000244344, 0.999998, -32.0056, 33.3066, -15.102 )
height = 28.5479
depth = 81.3697
[node name="CSGBox18" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 63.8532, 13.2378, -179.373 )
height = 35.4425
depth = 118.952
[node name="CSGBox19" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.0148986, -0.999819, 0.011775, 0.953193, 0.0177585, 0.301836, -0.30199, 0.00672695, 0.953285, 82.8387, 13.2378, -179.182 )
height = 35.4425
depth = 118.952
[node name="CSGBox20" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.508274, -0.861193, -0.00036854, 0.861193, -0.508275, 0.000210429, -0.00036854, -0.000210429, 0.999997, 2.03001, 12.2476, 50.4871 )
height = 70.2716
depth = 5.64618
[node name="CSGBox21" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, -7.34159, 13.8849, -173.254 )
height = 35.4425
depth = 78.029
[node name="CSGBox22" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999997, 0, 1, 0, -0.999997, 0, -0.000453754, -29.7367, 13.8849, -134.25 )
height = 35.4425
depth = 36.7396
[node name="CSGBox23" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999997, 0, 1, 0, -0.999997, 0, -0.000453754, 12.7438, 13.8849, -97.4678 )
height = 35.4425
depth = 36.7396
[node name="CSGBox24" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.0407595, -0.999169, -0.000254305, 0.999168, -0.0407596, 0.000244143, -0.000254305, -0.000244143, 0.999998, -2.4395, 27.6925, -114.687 )
height = 91.7009
depth = 118.952
[node name="CSGBox25" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.789103, 0, 0.614256, 0, 1, 0, -0.614256, 0, 0.789103, 12.7394, 13.8849, -79.8612 )
height = 35.4425
depth = 48.5074
[node name="CSGBox26" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.788951, -0.000244336, 0.61445, 0.614425, -0.00881379, -0.788922, 0.00560839, 0.999961, -0.00680352, 12.7382, 13.8849, -74.8757 )
height = 35.4425
depth = 48.5074
[node name="CSGBox27" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.789102, 0, 0.614256, 0, 1, 0, -0.614256, 0, 0.789102, -21.7006, 19.6636, -117.714 )
height = 18.5102
depth = 48.5074
[node name="CSGBox28" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 31.3031, 13.2378, -313.804 )
height = 35.4425
depth = 229.469
[node name="CSGBox29" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, 59.4606, 13.1203, -311.126 )
height = 35.4425
depth = 57.6762
[node name="CSGBox30" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999999, 0, 1, 0, -0.999999, 0, -0.000453754, -28.6396, 13.1203, -196.995 )
height = 35.4425
depth = 81.4166
[node name="CSGBox31" type="CSGBox" parent="CSGCombiner"]
transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -67.9928, 13.2378, -136.402 )
height = 35.4425
depth = 384.791
[node name="CSGBox32" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000544563, 0.000190083, 0.999997, -0.777923, 0.628357, -0.000543069, -0.628355, -0.777925, -0.00019431, -60.3016, 6.78922, -91.6615 )
height = 42.4404
depth = 24.4842
[node name="CSGBox33" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, 60.7576, 13.1203, -427.6 )
height = 35.4425
depth = 57.6762
[node name="CSGBox34" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.000453754, 0, 0.999997, 0, 1, 0, -0.999997, 0, -0.000453754, 20.4908, 13.1203, -216.322 )
height = 42.4404
depth = 24.4842
[node name="CSGBox35" type="CSGBox" parent="CSGCombiner"]
transform = Transform( -0.99987, 0, 0.0159517, 0, 1, 0, -0.0159517, 0, -0.99987, 8.95874, 13.1203, -209.14 )
height = 42.4404
depth = 24.4842
[node name="Player" parent="." instance=ExtResource( 5 )] [node name="Player" parent="." instance=ExtResource( 5 )]
transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 61.0243, 21.5903, 29.8235 ) transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 61.0243, 21.5903, 29.8235 )
@ -165,7 +270,7 @@ environment = SubResource( 14 )
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 16.6179, 19.204, -18.5969 ) transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 16.6179, 19.204, -18.5969 )
[node name="UVB76" type="AudioStreamPlayer3D" parent="."] [node name="UVB76" type="AudioStreamPlayer3D" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -93.1999, -7.28051, -104.312 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.8966, -7.28051, -160.061 )
stream = ExtResource( 6 ) stream = ExtResource( 6 )
attenuation_model = 2 attenuation_model = 2
unit_db = 80.0 unit_db = 80.0
@ -190,8 +295,48 @@ transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 77.2415,
[node name="Enemy4" parent="." instance=ExtResource( 3 )] [node name="Enemy4" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 78.58, 3.58712, -86.6356 ) transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 78.58, 3.58712, -86.6356 )
[node name="Enemy5" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 18.9165, 1.22523, -62.043 )
[node name="Enemy6" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -1.05265, 1.22523, -112.367 )
[node name="Enemy7" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 96.0541, 1.22523, -230.659 )
[node name="Enemy8" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 96.0541, 1.22523, -340.582 )
[node name="Enemy9" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -58.5717, 22.1019, -105.117 )
[node name="Enemy10" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -58.5717, 35.0832, -182.625 )
[node name="Enemy11" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 55.3829, 19.4327, -340.582 )
[node name="Enemy12" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 55.3829, 6.97042, -400.071 )
[node name="Enemy13" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 22.0135, 6.78618, -200.877 )
[node name="Enemy14" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 22.0135, 57.1242, -200.877 )
[connection signal="timeout" from="End" to="." method="_on_Win_timeout"] [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
[connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy3" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy3" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy4" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy4" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy5" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy6" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy7" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy8" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy9" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy10" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy11" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy12" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy13" to="." method="_on_Enemy_dying"]
[connection signal="dying" from="Enemy14" to="." method="_on_Enemy_dying"]

View File

@ -2,7 +2,7 @@
[ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://Spatial.gd" type="Script" id=2] [ext_resource path="res://Spatial.gd" type="Script" id=2]
[ext_resource path="res://Audio/music01.wav" type="AudioStream" id=3] [ext_resource path="res://Audio/menumusic.ogg" type="AudioStream" id=3]
[sub_resource type="DynamicFont" id=5] [sub_resource type="DynamicFont" id=5]
size = 88 size = 88
@ -29,10 +29,12 @@ script = ExtResource( 2 )
margin_right = 40.0 margin_right = 40.0
margin_bottom = 40.0 margin_bottom = 40.0
[node name="ColorRect" type="ColorRect" parent="Control"] [node name="Background" type="ColorRect" parent="Control"]
margin_right = 1916.0 margin_left = -4.0
margin_bottom = 1084.0 margin_top = -8.0
color = Color( 0.109804, 0.054902, 0.054902, 1 ) margin_right = 1927.0
margin_bottom = 1085.0
color = Color( 0.0862745, 0.0705882, 0.0705882, 1 )
[node name="Title" type="Label" parent="Control"] [node name="Title" type="Label" parent="Control"]
margin_left = 532.0 margin_left = 532.0
@ -63,3 +65,8 @@ align = 1
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 ) stream = ExtResource( 3 )
autoplay = true autoplay = true
[node name="Timer" type="Timer" parent="."]
wait_time = 3.0
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]

View File

@ -4,14 +4,20 @@ extends Spatial
# Declare member variables here. Examples: # Declare member variables here. Examples:
# var a = 2 # var a = 2
# var b = "text" # var b = "text"
onready var Timer = $Timer
var stop = false;
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
pass # Replace with function body. Timer.start()
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _input(event): func _input(event):
if event is InputEventKey and event.pressed: if event is InputEventKey and event.pressed:
if stop:
get_tree().quit() get_tree().quit()
func _on_Timer_timeout():
stop = true

View File

@ -37,7 +37,9 @@ func _ready():
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
func _on_Quit_to_Desktop_Button_pressed(): func _on_Quit_to_Desktop_Button_pressed():
get_tree().quit() Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
get_tree().paused = false
get_tree().change_scene("res://Scenes/End.tscn")
func _on_New_Game_pressed(): func _on_New_Game_pressed():
get_parent().hide() get_parent().hide()