Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								Audio/Scary Scream.wav
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Audio/Scary Scream.wav
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										23
									
								
								Audio/Scary Scream.wav.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								Audio/Scary Scream.wav.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="wav" | ||||||
|  | type="AudioStreamSample" | ||||||
|  | path="res://.import/Scary Scream.wav-5eddc3df18e74cbb3fb69d0eb4051d5b.sample" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/Scary Scream.wav" | ||||||
|  | dest_files=[ "res://.import/Scary Scream.wav-5eddc3df18e74cbb3fb69d0eb4051d5b.sample" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | force/8_bit=false | ||||||
|  | force/mono=false | ||||||
|  | force/max_rate=false | ||||||
|  | force/max_rate_hz=44100 | ||||||
|  | edit/trim=false | ||||||
|  | edit/normalize=false | ||||||
|  | edit/loop_mode=0 | ||||||
|  | edit/loop_begin=0 | ||||||
|  | edit/loop_end=-1 | ||||||
|  | compress/mode=0 | ||||||
							
								
								
									
										
											BIN
										
									
								
								Audio/Spooky Water Drops.wav
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Audio/Spooky Water Drops.wav
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										23
									
								
								Audio/Spooky Water Drops.wav.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								Audio/Spooky Water Drops.wav.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="wav" | ||||||
|  | type="AudioStreamSample" | ||||||
|  | path="res://.import/Spooky Water Drops.wav-1bebb79376daf5f65cd5d0a4938e4d40.sample" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/Spooky Water Drops.wav" | ||||||
|  | dest_files=[ "res://.import/Spooky Water Drops.wav-1bebb79376daf5f65cd5d0a4938e4d40.sample" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | force/8_bit=false | ||||||
|  | force/mono=false | ||||||
|  | force/max_rate=false | ||||||
|  | force/max_rate_hz=44100 | ||||||
|  | edit/trim=false | ||||||
|  | edit/normalize=false | ||||||
|  | edit/loop_mode=0 | ||||||
|  | edit/loop_begin=0 | ||||||
|  | edit/loop_end=-1 | ||||||
|  | compress/mode=0 | ||||||
							
								
								
									
										
											BIN
										
									
								
								Audio/UVB-76.ogg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Audio/UVB-76.ogg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										15
									
								
								Audio/UVB-76.ogg.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Audio/UVB-76.ogg.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="ogg_vorbis" | ||||||
|  | type="AudioStreamOGGVorbis" | ||||||
|  | path="res://.import/UVB-76.ogg-eda565c24036b9b4f1def10bcc328b77.oggstr" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/UVB-76.ogg" | ||||||
|  | dest_files=[ "res://.import/UVB-76.ogg-eda565c24036b9b4f1def10bcc328b77.oggstr" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | loop=true | ||||||
|  | loop_offset=0 | ||||||
							
								
								
									
										
											BIN
										
									
								
								Audio/music01.wav
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Audio/music01.wav
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										23
									
								
								Audio/music01.wav.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								Audio/music01.wav.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="wav" | ||||||
|  | type="AudioStreamSample" | ||||||
|  | path="res://.import/music01.wav-991659a267f03a2aa8300804daceb76d.sample" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/music01.wav" | ||||||
|  | dest_files=[ "res://.import/music01.wav-991659a267f03a2aa8300804daceb76d.sample" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | force/8_bit=false | ||||||
|  | force/mono=false | ||||||
|  | force/max_rate=false | ||||||
|  | force/max_rate_hz=44100 | ||||||
|  | edit/trim=false | ||||||
|  | edit/normalize=false | ||||||
|  | edit/loop_mode=0 | ||||||
|  | edit/loop_begin=0 | ||||||
|  | edit/loop_end=-1 | ||||||
|  | compress/mode=0 | ||||||
							
								
								
									
										4
									
								
								HUD.tscn
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								HUD.tscn
									
									
									
									
									
								
							| @@ -6,7 +6,7 @@ | |||||||
| [ext_resource path="res://Audio/menumusic.ogg" type="AudioStream" id=4] | [ext_resource path="res://Audio/menumusic.ogg" type="AudioStream" id=4] | ||||||
| [ext_resource path="res://Options.gd" type="Script" id=5] | [ext_resource path="res://Options.gd" type="Script" id=5] | ||||||
|  |  | ||||||
| [sub_resource type="DynamicFont" id=4] | [sub_resource type="DynamicFont" id=12] | ||||||
| size = 19 | size = 19 | ||||||
| outline_size = 2 | outline_size = 2 | ||||||
| outline_color = Color( 0, 0, 0, 1 ) | outline_color = Color( 0, 0, 0, 1 ) | ||||||
| @@ -15,7 +15,7 @@ use_filter = true | |||||||
| font_data = ExtResource( 3 ) | font_data = ExtResource( 3 ) | ||||||
|  |  | ||||||
| [sub_resource type="Theme" id=8] | [sub_resource type="Theme" id=8] | ||||||
| default_font = SubResource( 4 ) | default_font = SubResource( 12 ) | ||||||
|  |  | ||||||
| [sub_resource type="Shader" id=6] | [sub_resource type="Shader" id=6] | ||||||
| code = "shader_type canvas_item; | code = "shader_type canvas_item; | ||||||
|   | |||||||
| @@ -114,7 +114,7 @@ align = 1 | |||||||
| wait_time = 3.0 | wait_time = 3.0 | ||||||
|  |  | ||||||
| [node name="Floor" type="MeshInstance" parent="."] | [node name="Floor" type="MeshInstance" parent="."] | ||||||
| transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.239059, 0.211092, -0.192581 ) | transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.239059, 0.150923, -0.192581 ) | ||||||
| mesh = SubResource( 13 ) | mesh = SubResource( 13 ) | ||||||
| material/0 = ExtResource( 9 ) | material/0 = ExtResource( 9 ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ extends Spatial | |||||||
| # var a = 2 | # var a = 2 | ||||||
| # var b = "text" | # var b = "text" | ||||||
| var enemycount = 1 | var enemycount = 1 | ||||||
| onready var NEXTSCENE = "res://Levels/Level10.tscn" | onready var NEXTSCENE = "res://Scenes/End.tscn" | ||||||
|  |  | ||||||
| onready var WinMess = $Messages/Win | onready var WinMess = $Messages/Win | ||||||
| onready var EndTimer = $End | onready var EndTimer = $End | ||||||
|   | |||||||
| @@ -1,10 +1,12 @@ | |||||||
| [gd_scene load_steps=10 format=2] | [gd_scene load_steps=12 format=2] | ||||||
|  |  | ||||||
| [ext_resource path="res://Levels/Level09.gd" type="Script" id=1] | [ext_resource path="res://Levels/Level09.gd" type="Script" id=1] | ||||||
| [ext_resource path="res://Audio/mood.ogg" type="AudioStream" id=2] | [ext_resource path="res://Audio/mood.ogg" type="AudioStream" id=2] | ||||||
| [ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3] | [ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3] | ||||||
| [ext_resource path="res://AllSkyFree_Skyboxes/Deep Dusk Equirect.png" type="Texture" id=4] | [ext_resource path="res://AllSkyFree_Skyboxes/Deep Dusk Equirect.png" type="Texture" id=4] | ||||||
| [ext_resource path="res://Player.tscn" type="PackedScene" id=5] | [ext_resource path="res://Player.tscn" type="PackedScene" id=5] | ||||||
|  | [ext_resource path="res://Audio/UVB-76.ogg" type="AudioStream" id=6] | ||||||
|  | [ext_resource path="res://Audio/Spooky Water Drops.wav" type="AudioStream" id=7] | ||||||
| [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8] | [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8] | ||||||
|  |  | ||||||
| [sub_resource type="DynamicFont" id=8] | [sub_resource type="DynamicFont" id=8] | ||||||
| @@ -157,6 +159,26 @@ environment = SubResource( 14 ) | |||||||
| [node name="Enemy2" parent="." instance=ExtResource( 3 )] | [node name="Enemy2" parent="." instance=ExtResource( 3 )] | ||||||
| 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="."] | ||||||
|  | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -93.1999, -7.28051, -104.312 ) | ||||||
|  | stream = ExtResource( 6 ) | ||||||
|  | attenuation_model = 2 | ||||||
|  | unit_db = 80.0 | ||||||
|  | max_db = 6.0 | ||||||
|  | autoplay = true | ||||||
|  | bus = "SFX" | ||||||
|  |  | ||||||
|  | [node name="AudioStreamPlayer3D2" type="AudioStreamPlayer3D" parent="."] | ||||||
|  | transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 39.1568, -7.28051, -20.8087 ) | ||||||
|  | stream = ExtResource( 7 ) | ||||||
|  | attenuation_model = 2 | ||||||
|  | unit_db = 80.0 | ||||||
|  | unit_size = 8.1 | ||||||
|  | max_db = 6.0 | ||||||
|  | pitch_scale = 0.86 | ||||||
|  | autoplay = true | ||||||
|  | bus = "SFX" | ||||||
|  |  | ||||||
| [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"] | ||||||
|   | |||||||
							
								
								
									
										65
									
								
								Scenes/End.tscn
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								Scenes/End.tscn
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,65 @@ | |||||||
|  | [gd_scene load_steps=7 format=2] | ||||||
|  |  | ||||||
|  | [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://Audio/music01.wav" type="AudioStream" id=3] | ||||||
|  |  | ||||||
|  | [sub_resource type="DynamicFont" id=5] | ||||||
|  | size = 88 | ||||||
|  | outline_size = 5 | ||||||
|  | outline_color = Color( 0, 0, 0, 1 ) | ||||||
|  | use_filter = true | ||||||
|  | font_data = ExtResource( 1 ) | ||||||
|  |  | ||||||
|  | [sub_resource type="DynamicFont" id=4] | ||||||
|  | size = 19 | ||||||
|  | outline_size = 2 | ||||||
|  | outline_color = Color( 0, 0, 0, 1 ) | ||||||
|  | use_mipmaps = true | ||||||
|  | use_filter = true | ||||||
|  | font_data = ExtResource( 1 ) | ||||||
|  |  | ||||||
|  | [sub_resource type="Theme" id=6] | ||||||
|  | default_font = SubResource( 4 ) | ||||||
|  |  | ||||||
|  | [node name="Spatial" type="Spatial"] | ||||||
|  | script = ExtResource( 2 ) | ||||||
|  |  | ||||||
|  | [node name="Control" type="Control" parent="."] | ||||||
|  | margin_right = 40.0 | ||||||
|  | margin_bottom = 40.0 | ||||||
|  |  | ||||||
|  | [node name="ColorRect" type="ColorRect" parent="Control"] | ||||||
|  | margin_right = 1916.0 | ||||||
|  | margin_bottom = 1084.0 | ||||||
|  | color = Color( 0.109804, 0.054902, 0.054902, 1 ) | ||||||
|  |  | ||||||
|  | [node name="Title" type="Label" parent="Control"] | ||||||
|  | margin_left = 532.0 | ||||||
|  | margin_top = 353.0 | ||||||
|  | margin_right = 1414.0 | ||||||
|  | margin_bottom = 455.0 | ||||||
|  | custom_fonts/font = SubResource( 5 ) | ||||||
|  | text = "FIRST PERSON SLAPPER" | ||||||
|  |  | ||||||
|  | [node name="Level" type="Label" parent="Control"] | ||||||
|  | margin_left = 493.0 | ||||||
|  | margin_top = 345.0 | ||||||
|  | margin_right = 1414.0 | ||||||
|  | margin_bottom = 526.0 | ||||||
|  | theme = SubResource( 6 ) | ||||||
|  | text = "You have been playing" | ||||||
|  | align = 1 | ||||||
|  |  | ||||||
|  | [node name="Level2" type="Label" parent="Control"] | ||||||
|  | margin_left = 493.0 | ||||||
|  | margin_top = 498.0 | ||||||
|  | margin_right = 1414.0 | ||||||
|  | margin_bottom = 526.0 | ||||||
|  | theme = SubResource( 6 ) | ||||||
|  | text = "Thank you!" | ||||||
|  | align = 1 | ||||||
|  |  | ||||||
|  | [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] | ||||||
|  | stream = ExtResource( 3 ) | ||||||
|  | autoplay = true | ||||||
							
								
								
									
										17
									
								
								Spatial.gd
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								Spatial.gd
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | extends Spatial | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # Declare member variables here. Examples: | ||||||
|  | # var a = 2 | ||||||
|  | # var b = "text" | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # 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 _input(event): | ||||||
|  | 	if event is InputEventKey and event.pressed: | ||||||
|  | 		get_tree().quit() | ||||||
		Reference in New Issue
	
	Block a user