diff --git a/Sound Effects/Hit Wall.wav.import b/Sound Effects/Hit Wall.wav.import new file mode 100644 index 0000000..e85757e --- /dev/null +++ b/Sound Effects/Hit Wall.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Hit Wall.wav-3b5807491ce777ec76e9ac41474661f7.sample" + +[deps] + +source_file="res://Sound Effects/Hit Wall.wav" +dest_files=[ "res://.import/Hit Wall.wav-3b5807491ce777ec76e9ac41474661f7.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=true +compress/mode=0 diff --git a/Sound Effects/Hit.wav b/Sound Effects/Hit.wav new file mode 100644 index 0000000..15857dc Binary files /dev/null and b/Sound Effects/Hit.wav differ diff --git a/Sound Effects/Hit.wav.import b/Sound Effects/Hit.wav.import new file mode 100644 index 0000000..3b96089 --- /dev/null +++ b/Sound Effects/Hit.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Hit.wav-0bbd577b2dd4dc38b184ffd94be9da75.sample" + +[deps] + +source_file="res://Sound Effects/Hit.wav" +dest_files=[ "res://.import/Hit.wav-0bbd577b2dd4dc38b184ffd94be9da75.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=true +compress/mode=0 diff --git a/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg b/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg new file mode 100644 index 0000000..ce95719 Binary files /dev/null and b/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg differ diff --git a/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg.import b/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg.import new file mode 100644 index 0000000..83c6c09 --- /dev/null +++ b/Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg-cdec0b7f82f2b8c50604c5b31f7e0660.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sound Effects/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg" +dest_files=[ "res://.import/interface-bit-game-pixel-art-platformer-mobile-desktop-version-appearance-level-dark-dungeon-brick-walls-torches-126375076.jpg-cdec0b7f82f2b8c50604c5b31f7e0660.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Title/Death Screen'.gd b/Title/Death Screen'.gd new file mode 100644 index 0000000..efde8c7 --- /dev/null +++ b/Title/Death Screen'.gd @@ -0,0 +1,24 @@ +extends Sprite + + +# 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 _process(delta): +# pass + + +func _on_TextureButton_pressed(): + get_tree().change_scene("res://levels/World.tscn") + + +func _on_TextureButton2_pressed(): + get_tree().quit() diff --git a/Title/Death Screen'.tscn b/Title/Death Screen'.tscn new file mode 100644 index 0000000..d1f9e07 --- /dev/null +++ b/Title/Death Screen'.tscn @@ -0,0 +1,42 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://art/Respawn 1.png" type="Texture" id=1] +[ext_resource path="res://art/Quit Death 1.png" type="Texture" id=2] +[ext_resource path="res://art/Good Try.png" type="Texture" id=3] +[ext_resource path="res://art/Respawn 2.png" type="Texture" id=4] +[ext_resource path="res://art/You Died.png" type="Texture" id=5] +[ext_resource path="res://art/Quit DEath 2.png" type="Texture" id=6] +[ext_resource path="res://Title/Death Screen'.gd" type="Script" id=7] + +[node name="Sprite" type="Sprite"] +texture = ExtResource( 5 ) +centered = false +script = ExtResource( 7 ) + +[node name="TextureButton" type="TextureButton" parent="."] +margin_top = 74.0 +margin_right = 190.0 +margin_bottom = 124.0 +texture_normal = ExtResource( 1 ) +texture_hover = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TextureButton2" type="TextureButton" parent="."] +margin_left = 5.0 +margin_top = 127.0 +margin_right = 105.0 +margin_bottom = 177.0 +texture_normal = ExtResource( 2 ) +texture_hover = ExtResource( 6 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 248.195, 167.584 ) +scale = Vector2( 0.377746, 0.377746 ) +texture = ExtResource( 3 ) +[connection signal="pressed" from="TextureButton" to="." method="_on_TextureButton_pressed"] +[connection signal="pressed" from="TextureButton2" to="." method="_on_TextureButton2_pressed"] diff --git a/ai/SpinningBone.gd b/ai/SpinningBone.gd index 2edaaf4..a1ebcfa 100644 --- a/ai/SpinningBone.gd +++ b/ai/SpinningBone.gd @@ -8,7 +8,6 @@ func launch_upleft(): velocity = (Vector2(-1, -1).normalized() * speed) func launch_upright(): velocity = (Vector2(1, -1).normalized() * speed) - func on_impact(collision): if collision.collider.has_method("get_type"): collision.collider.set_health(collision.collider.get_health() - 1) diff --git a/ai/SpinningBone.tscn b/ai/SpinningBone.tscn index eef9568..92e6d8a 100644 --- a/ai/SpinningBone.tscn +++ b/ai/SpinningBone.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://art/SpinningBone.png" type="Texture" id=1] [ext_resource path="res://ai/SpinningBone.gd" type="Script" id=2] +[ext_resource path="res://Sound Effects/Hit.wav" type="AudioStream" id=3] +[ext_resource path="res://Sound Effects/Hit Wall.wav" type="AudioStream" id=4] [sub_resource type="Animation" id=1] resource_name = "Bone Throw" @@ -21,8 +23,8 @@ tracks/0/keys = { } [sub_resource type="CapsuleShape2D" id=2] -radius = 5.0 -height = 0.0 +radius = 3.0 +height = 2.0 [node name="KinematicBody2D" type="KinematicBody2D"] collision_layer = 8 @@ -44,3 +46,13 @@ autoplay = "Bone Throw" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 2 ) + +[node name="Node" type="Node" parent="."] + +[node name="Hit Wall" type="AudioStreamPlayer" parent="Node"] +stream = ExtResource( 3 ) +pitch_scale = 0.77 + +[node name="Hit" type="AudioStreamPlayer" parent="Node"] +stream = ExtResource( 4 ) +pitch_scale = 0.54 diff --git a/art/Good Try.png b/art/Good Try.png new file mode 100644 index 0000000..94171c2 Binary files /dev/null and b/art/Good Try.png differ diff --git a/art/Good Try.png.import b/art/Good Try.png.import new file mode 100644 index 0000000..f9278c7 --- /dev/null +++ b/art/Good Try.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Good Try.png-5837a4fe37e845783add2dd81017e194.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Good Try.png" +dest_files=[ "res://.import/Good Try.png-5837a4fe37e845783add2dd81017e194.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Quit DEath 2.png b/art/Quit DEath 2.png new file mode 100644 index 0000000..4bdb87c Binary files /dev/null and b/art/Quit DEath 2.png differ diff --git a/art/Quit DEath 2.png.import b/art/Quit DEath 2.png.import new file mode 100644 index 0000000..d0864e3 --- /dev/null +++ b/art/Quit DEath 2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Quit DEath 2.png-1301a6dd2a5ffd18f164161188ddb4f4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Quit DEath 2.png" +dest_files=[ "res://.import/Quit DEath 2.png-1301a6dd2a5ffd18f164161188ddb4f4.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Quit Death 1.png b/art/Quit Death 1.png new file mode 100644 index 0000000..cef1b78 Binary files /dev/null and b/art/Quit Death 1.png differ diff --git a/art/Quit Death 1.png.import b/art/Quit Death 1.png.import new file mode 100644 index 0000000..9b901e3 --- /dev/null +++ b/art/Quit Death 1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Quit Death 1.png-0c3895ad33fba5cda45c0e4410edd7cc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Quit Death 1.png" +dest_files=[ "res://.import/Quit Death 1.png-0c3895ad33fba5cda45c0e4410edd7cc.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Respawn 1.png b/art/Respawn 1.png new file mode 100644 index 0000000..04605fc Binary files /dev/null and b/art/Respawn 1.png differ diff --git a/art/Respawn 1.png.import b/art/Respawn 1.png.import new file mode 100644 index 0000000..834de17 --- /dev/null +++ b/art/Respawn 1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Respawn 1.png-8c8d2e7b3373bdf863fd124aeaac09b6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Respawn 1.png" +dest_files=[ "res://.import/Respawn 1.png-8c8d2e7b3373bdf863fd124aeaac09b6.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Respawn 2.png b/art/Respawn 2.png new file mode 100644 index 0000000..005390a Binary files /dev/null and b/art/Respawn 2.png differ diff --git a/art/Respawn 2.png.import b/art/Respawn 2.png.import new file mode 100644 index 0000000..9fe3c62 --- /dev/null +++ b/art/Respawn 2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Respawn 2.png-ddb4307a060d136724245537934e4297.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Respawn 2.png" +dest_files=[ "res://.import/Respawn 2.png-ddb4307a060d136724245537934e4297.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/You Died.png b/art/You Died.png new file mode 100644 index 0000000..477e0a7 Binary files /dev/null and b/art/You Died.png differ diff --git a/art/You Died.png.import b/art/You Died.png.import new file mode 100644 index 0000000..45e65d4 --- /dev/null +++ b/art/You Died.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/You Died.png-d6d2ed0a4f431ce0b22424c97a218f4f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/You Died.png" +dest_files=[ "res://.import/You Died.png-d6d2ed0a4f431ce0b22424c97a218f4f.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=false +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/levels/World.tscn b/levels/World.tscn index 121688b..a7386f3 100644 --- a/levels/World.tscn +++ b/levels/World.tscn @@ -12,9 +12,24 @@ [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 169.977, 24.8286 ) -[sub_resource type="DynamicFont" id=3] +[sub_resource type="DynamicFont" id=2] font_data = ExtResource( 3 ) +[sub_resource type="Animation" id=3] +length = 2.0 +tracks/0/type = "value" +tracks/0/path = NodePath("sample_text:percent_visible") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.2, 2 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0 ] +} + [sub_resource type="Animation" id=4] length = 2.0 tracks/0/type = "value" @@ -46,21 +61,6 @@ tracks/0/keys = { } [sub_resource type="Animation" id=6] -length = 2.0 -tracks/0/type = "value" -tracks/0/path = NodePath("sample_text:percent_visible") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0.2, 2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ 0.0, 1.0 ] -} - -[sub_resource type="Animation" id=7] tracks/0/type = "value" tracks/0/path = NodePath("sample_text:percent_visible") tracks/0/interp = 1 @@ -74,7 +74,7 @@ tracks/0/keys = { "values": [ 0.0, 0.0 ] } -[sub_resource type="Animation" id=8] +[sub_resource type="Animation" id=7] length = 2.0 tracks/0/type = "value" tracks/0/path = NodePath("sample_text:percent_visible") @@ -89,7 +89,7 @@ tracks/0/keys = { "values": [ 0.0, 1.0 ] } -[sub_resource type="Animation" id=9] +[sub_resource type="Animation" id=8] length = 2.0 tracks/0/type = "value" tracks/0/path = NodePath("sample_text:percent_visible") @@ -164,7 +164,7 @@ margin_left = 61.7179 margin_top = 35.9192 margin_right = 239.718 margin_bottom = 108.919 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) text = "AH! I see you finally came after like, forever!" autowrap = true __meta__ = { @@ -173,7 +173,7 @@ __meta__ = { [node name="AnimationPlayer" type="AnimationPlayer" parent="text/Text"] autoplay = "Type Writer" -"anims/Type Writer" = SubResource( 4 ) +"anims/Type Writer" = SubResource( 3 ) [node name="Text4" type="Node" parent="text"] @@ -182,7 +182,7 @@ margin_left = 577.321 margin_top = 30.5355 margin_right = 742.321 margin_bottom = 103.536 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) text = "The wand is an extremely hard weapon to master" autowrap = true __meta__ = { @@ -191,7 +191,7 @@ __meta__ = { [node name="AnimationPlayer" type="AnimationPlayer" parent="text/Text4"] autoplay = "Type Writer" -"anims/Type Writer" = SubResource( 5 ) +"anims/Type Writer" = SubResource( 4 ) [node name="Text5" type="Node" parent="text"] @@ -200,7 +200,7 @@ margin_left = 747.863 margin_top = 36.84 margin_right = 881.863 margin_bottom = 147.84 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) text = "Let me show you how to use it!" autowrap = true __meta__ = { @@ -209,7 +209,7 @@ __meta__ = { [node name="AnimationPlayer" type="AnimationPlayer" parent="text/Text5"] autoplay = "Type Writer" -"anims/Type Writer" = SubResource( 6 ) +"anims/Type Writer" = SubResource( 5 ) [node name="Text2" type="Node" parent="text"] script = ExtResource( 5 ) @@ -219,7 +219,7 @@ margin_left = 327.0 margin_top = 23.0 margin_right = 518.0 margin_bottom = 96.0 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) text = "W and Space Jump @@ -232,8 +232,8 @@ __meta__ = { [node name="AnimationPlayer" type="AnimationPlayer" parent="text/Text2"] autoplay = "Ok" -anims/Ok = SubResource( 7 ) -"anims/Type Writer" = SubResource( 8 ) +anims/Ok = SubResource( 6 ) +"anims/Type Writer" = SubResource( 7 ) [node name="Text3" type="Node" parent="text"] @@ -242,7 +242,7 @@ margin_left = 67.5595 margin_top = 171.0 margin_right = 870.56 margin_bottom = 244.0 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) text = " Walk also arrow keys work the same! " autowrap = true @@ -252,5 +252,5 @@ __meta__ = { [node name="AnimationPlayer2" type="AnimationPlayer" parent="text/Text3"] autoplay = "Type Writer" -"anims/Type Writer" = SubResource( 9 ) +"anims/Type Writer" = SubResource( 8 ) [connection signal="body_entered" from="Area2D" to="text/Text2" method="_on_body_entered"] diff --git a/project.godot b/project.godot index c1649d2..267992f 100644 --- a/project.godot +++ b/project.godot @@ -33,7 +33,7 @@ _global_script_class_icons={ [application] config/name="Gamejam" -run/main_scene="res://levels/test.tscn" +run/main_scene="res://Title/Tilte.tscn" config/icon="res://icon.png" [autoload] @@ -43,10 +43,6 @@ IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd" RestHandler="*res://addons/github-integration/scripts/RestHandler.gd" Globals="*res://script/globals.gd" -[debug] - -settings/fps/force_fps=60 - [display] window/size/width=320 @@ -82,32 +78,47 @@ texture={ "stream": false, "svg/scale": 1.0 } +wav={ +"compress/mode": 0, +"edit/loop": true, +"edit/normalize": false, +"edit/trim": false, +"force/8_bit": false, +"force/max_rate": false, +"force/max_rate_hz": 44100, +"force/mono": false +} [input] up={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) ] } down={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) ] } left={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) ] } right={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) ] } shoot={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) ] } inventory={ @@ -118,14 +129,11 @@ inventory={ [layer_names] -2d_render/layer_1="Player" 2d_physics/layer_1="Player" -2d_render/layer_2="World" 2d_physics/layer_2="World" 2d_physics/layer_3="Enemy" 2d_physics/layer_4="Projectiles" [rendering] -quality/driver/fallback_to_gles2=true environment/default_environment="res://default_env.tres" diff --git a/script/Projectile.gd b/script/Projectile.gd index 8395b29..2b3fc13 100644 --- a/script/Projectile.gd +++ b/script/Projectile.gd @@ -8,7 +8,6 @@ func _physics_process(delta): var collision = move_and_collide(velocity * delta) if collision != null: on_impact(collision) - print(collision) func launch(): velocity = (Vector2(speed, 0)).rotated(rotation) diff --git a/script/player.gd b/script/player.gd index b678e84..8fe2572 100644 --- a/script/player.gd +++ b/script/player.gd @@ -60,7 +60,7 @@ func _physics_process(delta): Globals.player = position emit_signal("grounded_updated", is_on_floor()) if get_health() <= 0: - get_tree().change_scene("res://levels/World.tscn") + get_tree().change_scene("res://Title/Death Screen'.tscn") func handle_move_input(): input_direction = int(Input.is_action_pressed("right")) - int(Input.is_action_pressed("left"))