Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
		| @@ -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 = 1 | var enemycount = 3 | ||||||
| onready var NEXTSCENE = "res://Scenes/End.tscn" | onready var NEXTSCENE = "res://Scenes/End.tscn" | ||||||
|  |  | ||||||
| onready var WinMess = $Messages/Win | onready var WinMess = $Messages/Win | ||||||
|   | |||||||
| @@ -94,9 +94,9 @@ height = 35.4425 | |||||||
| depth = 24.4842 | depth = 24.4842 | ||||||
|  |  | ||||||
| [node name="CSGBox8" type="CSGBox" parent="CSGCombiner"] | [node name="CSGBox8" type="CSGBox" parent="CSGCombiner"] | ||||||
| transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, 18.7267, 13.1203, -54.722 ) | transform = Transform( -0.000453754, 0, 0.999998, 0, 1, 0, -0.999998, 0, -0.000453754, -7.37017, 13.8849, -56.2824 ) | ||||||
| height = 35.4425 | height = 35.4425 | ||||||
| depth = 24.4842 | 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.0407, 13.2378, -85.3592 ) | ||||||
| @@ -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.285, 13.2378, -57.5419 ) | transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 87.2983, 13.2378, -111.903 ) | ||||||
| height = 35.4425 | height = 35.4425 | ||||||
| depth = 123.512 | depth = 226.35 | ||||||
|  |  | ||||||
| [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 ) | ||||||
| @@ -123,6 +123,11 @@ transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -19.2716, 13.237 | |||||||
| height = 35.4425 | height = 35.4425 | ||||||
| depth = 64.3012 | depth = 64.3012 | ||||||
|  |  | ||||||
|  | [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 ) | ||||||
|  | height = 35.4425 | ||||||
|  | depth = 91.4289 | ||||||
|  |  | ||||||
| [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 ) | ||||||
|  |  | ||||||
| @@ -179,6 +184,14 @@ pitch_scale = 0.86 | |||||||
| autoplay = true | autoplay = true | ||||||
| bus = "SFX" | bus = "SFX" | ||||||
|  |  | ||||||
|  | [node name="Enemy3" parent="." instance=ExtResource( 3 )] | ||||||
|  | transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 77.2415, 18.5348, -18.5969 ) | ||||||
|  |  | ||||||
|  | [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 ) | ||||||
|  |  | ||||||
| [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="Enemy4" to="." method="_on_Enemy_dying"] | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user