From e40437148a94f5f7649e94b6091086397fd8877f Mon Sep 17 00:00:00 2001 From: Logan Date: Sun, 19 Jul 2020 20:06:49 -0500 Subject: [PATCH] Fixed corrupted files --- characters/Player.tscn | 7 +++---- magic/Projectiles/EcoProjectile.tscn | 6 +----- magic/Projectiles/PhantomProjectile.tscn | 14 +++++-------- project.godot | 26 ++++++++---------------- ui/PlayerStats.tscn | 2 -- 5 files changed, 18 insertions(+), 37 deletions(-) diff --git a/characters/Player.tscn b/characters/Player.tscn index 3c9deda..b8477fa 100644 --- a/characters/Player.tscn +++ b/characters/Player.tscn @@ -13,7 +13,7 @@ polygon = PoolVector2Array( -7, 0, -7, -2, -6, -2, -6, -3, -5, -3, -5, -5, -6, - [sub_resource type="CapsuleShape2D" id=2] radius = 6.0 -height = 4.0 +height = 2.0 [sub_resource type="Animation" id=3] resource_name = "Idle" @@ -100,7 +100,8 @@ position = Vector2( 0, 12 ) occluder = SubResource( 1 ) [node name="WorldCollision" type="CollisionShape2D" parent="."] -position = Vector2( 0, -8 ) +visible = false +position = Vector2( 0, -7 ) shape = SubResource( 2 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] @@ -119,8 +120,6 @@ one_shot = true [node name="Hitbox" type="Area2D" parent="."] visible = false position = Vector2( 0, -7 ) -collision_layer = 0 -collision_mask = 0 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hitbox"] visible = false diff --git a/magic/Projectiles/EcoProjectile.tscn b/magic/Projectiles/EcoProjectile.tscn index 6d545fe..05e779a 100644 --- a/magic/Projectiles/EcoProjectile.tscn +++ b/magic/Projectiles/EcoProjectile.tscn @@ -4,15 +4,11 @@ [ext_resource path="res://magic/Projectiles/Projectile.gd" type="Script" id=2] [sub_resource type="CircleShape2D" id=1] -radius = 5.0 +radius = 5.09902 [node name="EcoProjectile" type="KinematicBody2D"] collision_layer = 8 -<<<<<<< Updated upstream -collision_mask = 2 -======= collision_mask = 6 ->>>>>>> Stashed changes script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/magic/Projectiles/PhantomProjectile.tscn b/magic/Projectiles/PhantomProjectile.tscn index 470f577..11b427e 100644 --- a/magic/Projectiles/PhantomProjectile.tscn +++ b/magic/Projectiles/PhantomProjectile.tscn @@ -4,21 +4,17 @@ [ext_resource path="res://magic/Projectiles/Projectile.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] -radius = 5.0 -height = 2.0 +radius = 4.0 +height = 6.0 [node name="PhantomProjectile" type="KinematicBody2D"] -<<<<<<< Updated upstream collision_layer = 8 -======= -collision_layer = 2147483656 ->>>>>>> Stashed changes collision_mask = 6 script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="."] -texture = ExtResource( 1 ) - [node name="CollisionShape2D" type="CollisionShape2D" parent="."] rotation = 1.5708 shape = SubResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) diff --git a/project.godot b/project.godot index cbeac25..673fb89 100644 --- a/project.godot +++ b/project.godot @@ -45,7 +45,7 @@ _global_script_class_icons={ [application] config/name="Gamejam" -run/main_scene="res://Title/Tilte.tscn" +run/main_scene="res://levels/test.tscn" config/icon="res://icon.png" [autoload] @@ -55,6 +55,10 @@ 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 @@ -90,47 +94,32 @@ 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":-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) +"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) ] } inventory={ @@ -141,11 +130,14 @@ 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/ui/PlayerStats.tscn b/ui/PlayerStats.tscn index fa4e77d..c758d63 100644 --- a/ui/PlayerStats.tscn +++ b/ui/PlayerStats.tscn @@ -6,8 +6,6 @@ [ext_resource path="res://ui/Energy.png" type="Texture" id=4] [ext_resource path="res://ui/Energy Burnout.png" type="Texture" id=5] - - [node name="Stats" type="CanvasLayer"] script = ExtResource( 1 )