From 4409365ffdfd497c28931f9917ab2c79d1cc27ff Mon Sep 17 00:00:00 2001
From: Harmony Honey <harmonymonroe97@gmail.com>
Date: Fri, 16 Jul 2021 16:19:57 -0400
Subject: [PATCH] yup

---
 media/image/solid_bricks.png | Bin 234 -> 229 bytes
 project.godot                |   2 +-
 src/actor/Player.gd          |   7 ++-----
 src/actor/Player.tscn        |   4 +---
 src/map/08.tscn              |   1 +
 src/map/09.tscn              |   1 +
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media/image/solid_bricks.png b/media/image/solid_bricks.png
index 55070d91f3d4b96685ccef90e5bd105864be7253..aa93507ee6319fe4c9eae2cbe1f6fa00a829607c 100644
GIT binary patch
delta 188
zcmV;t07L)k0p$UZF@K*)L_t(YiS3m;5`Z8KM1}EE7J7InI2KkoDCR4{hS!o9*<HYe
znDVi2F2s}<1Z|DS8hT(pz#LFlOmoTF^nm2ji<5H=(*qI{-D^Lm2P97V9!T#fu|#DE
zw_fFebciX9W?HSGK2J4r!1_F=Nc-_2+;r2v!_OM<E-H&(BQ;pZxH$(Qrraav!_La9
qu8`guuU5`ql&xywNDlZt=M*QDQMQHox{=xd0000<MNUMnLSTYxe^)I4

delta 193
zcmV;y06zca0qOyeF@K~<L_t(YiS3n57Qhe;gz<VQ3l1L($I_KPt&*Rj8{bya)XYFb
zh{-#vA;hFQNNY^5VFc3$OsA=9Pjk-N_5kJ5i;{B*+XIv-x|e=#4^TAsJ>cF^Y>Dy^
zYQ4w<?vSZenn|^8^%<;@La)zIiliT3!c8~nJN&F^-bH!wYdQqW7+2>2LQErazU-{L
v>gt_U5Mos<@#>)bMc%3;j_82jbB=KWEIze`tYc*C00000NkvXXu0mjfuykA*

diff --git a/project.godot b/project.godot
index 94350bd..74e40e2 100644
--- a/project.godot
+++ b/project.godot
@@ -224,7 +224,7 @@ screenshot={
 [rendering]
 
 2d/snapping/use_gpu_pixel_snap=true
-environment/default_clear_color=Color( 0.5, 0.6, 1, 1 )
+environment/default_clear_color=Color( 0, 0, 0, 1 )
 environment/default_environment="res://default_env.tres"
 quality/dynamic_fonts/use_oversampling=false
 quality/2d/use_pixel_snap=true
diff --git a/src/actor/Player.gd b/src/actor/Player.gd
index 7c8c532..4ad1ac5 100644
--- a/src/actor/Player.gd
+++ b/src/actor/Player.gd
@@ -18,7 +18,7 @@ var pickup_frames = 8
 var pickup_count = 0
 var pickup_start := Vector2.ZERO
 var pickup_box : Actor
-var pickup_offset := Vector2(-2, -8)
+var pickup_offset := Vector2(0, -8)
 
 export var speed_drop := Vector2(1, -1)
 
@@ -133,10 +133,7 @@ func _process(delta):
 		is_jump = true
 		jump_count = 0
 		node_audio_jump.play()
-		if is_pickup:
-			node_anim.play("box_jump")
-		else:
-			node_anim.play("jump")
+		node_anim.play("jump")
 		#Shared.stage.metric_jump += 1
 	
 	# jump height
diff --git a/src/actor/Player.tscn b/src/actor/Player.tscn
index eb8d4d5..e8fa9d7 100644
--- a/src/actor/Player.tscn
+++ b/src/actor/Player.tscn
@@ -182,8 +182,6 @@ tracks/1/keys = {
 z_index = 5
 z_as_relative = false
 script = ExtResource( 1 )
-hitbox_x = 3
-hitbox_y = 5
 gravity = 0.25
 is_moving = true
 is_colliding = true
@@ -191,7 +189,6 @@ is_using_gravity = true
 is_using_tread = true
 
 [node name="Sprite" type="Sprite" parent="."]
-visible = false
 position = Vector2( 4, -4 )
 texture = ExtResource( 3 )
 region_enabled = true
@@ -220,5 +217,6 @@ stream = ExtResource( 6 )
 stream = ExtResource( 5 )
 
 [node name="idkbb" type="Sprite" parent="."]
+visible = false
 position = Vector2( 2, 2 )
 texture = ExtResource( 7 )
diff --git a/src/map/08.tscn b/src/map/08.tscn
index afe665a..7f7e3de 100644
--- a/src/map/08.tscn
+++ b/src/map/08.tscn
@@ -29,6 +29,7 @@ tile_data = PoolIntArray( -327674, 4, 196613, -327673, 4, 0, -327672, 4, 65540,
 
 [node name="GameCamera" parent="." instance=ExtResource( 7 )]
 editor_draw_drag_margin = false
+is_focal_point = false
 target_influence = 0.3
 
 [node name="Actors" type="Node2D" parent="."]
diff --git a/src/map/09.tscn b/src/map/09.tscn
index f280ff6..7f9921d 100644
--- a/src/map/09.tscn
+++ b/src/map/09.tscn
@@ -27,6 +27,7 @@ z_index = -11
 
 [node name="GameCamera" parent="." instance=ExtResource( 7 )]
 editor_draw_drag_margin = false
+is_focal_point = false
 target_influence = 0.3
 
 [node name="Actors" type="Node2D" parent="."]