From 44bca26d88fe1c9bb0a37c8cbee81dfb7a9e8b6e Mon Sep 17 00:00:00 2001
From: Logan <xterminate18181@gmail.com>
Date: Sat, 18 Jul 2020 12:21:05 -0500
Subject: [PATCH] Color pallete changes

---
 characters/Player.tscn   |  16 +++++++++++-----
 project.godot            |  26 +++++++++-----------------
 ui/Inventory.png         | Bin 1262 -> 1267 bytes
 ui/Player UI Frame 2.png | Bin 506 -> 520 bytes
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/characters/Player.tscn b/characters/Player.tscn
index 4b10638..1bba75d 100644
--- a/characters/Player.tscn
+++ b/characters/Player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://script/player.gd" type="Script" id=1]
 [ext_resource path="res://ui/PlayerStats.tscn" type="PackedScene" id=2]
@@ -9,6 +9,10 @@
 [sub_resource type="OccluderPolygon2D" id=1]
 polygon = PoolVector2Array( -7, 0, -7, -2, -6, -2, -6, -3, -5, -3, -5, -5, -6, -5, -6, -10, -7, -10, -7, -12, -6, -12, -6, -19, -4, -19, -4, -18, -3, -18, -3, -17, 1, -17, 1, -16, 3, -16, 3, -15, 4, -15, 4, -14, 5, -14, 5, -13, 6, -13, 6, -12, 7, -12, 7, -10, 6, -10, 6, -9, 5, -9, 5, -8, 6, -8, 6, -4, 5, -4, 5, 0, -7, 0 )
 
+[sub_resource type="CapsuleShape2D" id=2]
+radius = 6.0
+height = 2.0
+
 [sub_resource type="Animation" id=3]
 resource_name = "Idle"
 length = 0.8
@@ -90,6 +94,11 @@ visible = false
 position = Vector2( 0, 12 )
 occluder = SubResource( 1 )
 
+[node name="WorldCollision" type="CollisionShape2D" parent="."]
+visible = false
+position = Vector2( 0, -7 )
+shape = SubResource( 2 )
+
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/Idle = SubResource( 3 )
 anims/Jumping = SubResource( 4 )
@@ -109,8 +118,5 @@ position = Vector2( 0, -7 )
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hitbox"]
 visible = false
-polygon = PoolVector2Array( -6, -12, -6, -5, -7, -5, -7, -3, -6, -3, -6, -0.52261, -6, 2, -5, 2, -5, 4, -6, 4, -6, 5, -7, 5, -7, 7, -3.9179, 7, 0.0151539, 7, 5, 7, 5, 5.0024, 5, 3, 6, 3, 6, 0.882053, 6, -1, 5, -1, 5, -2, 6, -2, 6, -3, 7, -3, 7, -5, 6, -5, 6, -6, 5, -6, 5, -7, 4, -7, 4, -8, 3, -8, 3, -9, 1, -9, 1, -10, -3, -10, -3, -11, -4, -11, -4, -12, -6, -12 )
-
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-polygon = PoolVector2Array( 5, 0, 5, -4, 6, -4, 6, -8, 5, -8, 5, -9, 6, -9, 6, -10, 7, -10, 7, -12, 6, -12, 6, -13, 5, -13, 5, -14, 4, -14, 4, -15, 3, -15, 3, -16, 1, -16, 1, -17, -3, -17, -3, -18, -4, -18, -4, -19, -6, -19, -6, -12, -7, -12, -7, -10, -6, -10, -6, -5, -5, -5, -5, -3, -6, -3, -6, -2, -7, -2, -7, 0 )
+polygon = PoolVector2Array( -6, -12, -6, -5, -7, -5, -7, -3, -6, -3, -6, 2, -5, 2, -5, 4, -6, 4, -6, 5, -7, 5, -7, 7, 5, 7, 5, 3, 6, 3, 6, -1, 5, -1, 5, -2, 6, -2, 6, -3, 7, -3, 7, -5, 6, -5, 6, -6, 5, -6, 5, -7, 4, -7, 4, -8, 3, -8, 3, -9, 1, -9, 1, -10, -3, -10, -3, -11, -4, -11, -4, -12, -6, -12 )
 [connection signal="grounded_updated" from="." to="Camera" method="_on_grounded_updated"]
diff --git a/project.godot b/project.godot
index 9fd4570..33640fb 100644
--- a/project.godot
+++ b/project.godot
@@ -27,7 +27,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]
@@ -37,6 +37,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
@@ -72,47 +76,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={
@@ -123,11 +112,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/Inventory.png b/ui/Inventory.png
index e7bc4bf2cdfb6964ae59da5d3e85afd7da541ecb..5f328630ec06a4e51113dec9bc743b2bb36f9485 100644
GIT binary patch
delta 1234
zcmV;@1TFjS3G)e%F@LQ|L_t(|ob8=Ka^f%$MeV7af?~xrsLBD7bt;EolcQwAA*ig$
z0aC>^SW#SqSxm$TBgtx6vecjdR)axuxB5$NNmi!sx~^L-7ncr*<LTU^`6LCg4UVUC
z->;U7%lqrPwk=uN?GGKAPf`%uV7EVXPv*mB^H$TAY;3n**MEPb_#_3f4UA8JD%(Mb
z2nv>{f`TQgpkRqAo_t?CzkJ+${`vmQe)H#-kLY@hJ?8f*Wo>f#Gqh_;J+3<J`XxR~
z?mNW3hy8ub^;8>T>u?G-R}gYD#hzi=oWU>MPNnJ}YXhGSYU;x~!upH}jl8A-QhJ}O
z@$74*gXXe1=6@;U3#RM)l&4mVpd|H4@zt5CkC-|_+zB?+>&8T78|8X*yB<F=48>$V
z53k$nk16%LI^Xbjp~qsV%vihn>a#zGY%$lQn*}}*joIYu;8OoX^%?BAdPmq)q+*xU
zIhN0DHg8FyO&ytB9WkX-`urK|=&tM1HVBQNKAU1XpMT{3W2uSl(^atB?HA0hh{5)0
zj>l)odQ<N;cU(*R-|W_GYWiSf`_$S5axPkn>r_N3!7#5f*K**>*~Ua$Vwop&|FL_8
z%H(dllCel-4*%~2>k~@MY&|rKjuD_Qhx7gR`Q>Bs5{uNIQuW2GuGqi%`Tm?N(6Lyj
z)+zl?vVXGV9AR6{?<9iGdEdE+SwhO~ORB(f6I&;@W+zfIEg|=0U)FjQTHOsqhk{Ln
zLahT+0-_2EmZ;)prwa{4pQNC*LEm+F$Giz9Jmw7yVjHMA<}G=FL(>uGkY7_?TG7%5
zDREUX>1w&rr%*zynn>~SDp-W%9KnaK%iBRw+JD4w6|D9i{V1c76tp%`krKp!78v3N
zMzG``Xeq!D3Kk6XCk+KlR6)TKRZy@*6%;H{1qB;POSA8mY?&LVovtB>K1o4q1DKsI
z7l=MdL2Cn^=?c)&TTd<7QWFX`Kuf}C$(EWFnRLyOH=*Tb8fYP|TqPi?fD$Z6T}+Dn
zL4V^pCIw^nNd1Gx#7}E+%_i76CIy^$%uj1^g-QtsJ`^lb1qDk~LBSGLP_RT56f98%
z^y`HLFRsw97ZSX<G9@6YpkRqADA-6^$^~1pWo{@~q6!L@sDeji0<?6FswG=$Lcs=T
zNf<5JQWKu(BGI%ESLU!p70`m^D2xZxnSZV!%=@O(T3qk`>&{f8S~&Z|5j8)p#r5Xp
z7wxA`YmKPe?U(9yYaKhTcR8#PEdvk_LTA^4bJAr3Kx9y~<$+!$7^8%^#zad&PXl_V
zD@Gip1Vqu60amcP{h_uAqyVsjJ)X{eZ5wK`S}rcNZ72b(U=7m14TY|~JQ~n~HGjc=
ze_coYez!k#tL5Tig08(hA~!o-h)Y@TuWONC!`xSUd9=9lm^V1N;@Zl}#zU{el6YF#
z6ro^$nHmi3<zpx*+Sqz2*k7hTI<=RV+^6P9`w)VyJ$ltHpPQPZeF(wU9=&RpFF{Vx
zN>(x+La+n}3YH{OBQ=;L*xbgpmP@NWDs#qFy0Ou(mWxa5)}I!3`$Km;o%@un&93{u
wAFsJQYFuv`1_gUBz4pr|HOnK%l@JyD1+nZ{5_~Jq(*OVf07*qoM6N<$g4aJ>Q~&?~

delta 1229
zcmV;;1Ty>c3GNAyF@LB@L_t(|ob8=4a_b-vhUGUoiMmv8CKpMYKBX_<oFKk{%k*w@
z5zn}Cr>o=@FL<yl5Q{+U{{FuzmIc~nf6xkqv+267>-+wv17aA44Vq6<5ZhoFhRvq$
z`=9;xt+g#h*&U7@nom*?+hBJ%c2DlZ^UL3swiM%XI$!@r@qbAQVjDQ0{xr6O5D^qC
zF$D!nOhLgCQ#^&fczyr4`TYI$S^VO!?;pwaI(yvtIc0rH`7^d_Nj+0_`1MPCmRxs?
ze+~cpl;gQJq}DMh*iu0#%@TXYWlILXc01Lof36KeI%uhn;0PNsCN}cA2FU4sQ;p{z
zs~xl{n^W#Gp?_dbeV=pJN)eQ#J}IF(bM=u@M~pkc#(LeHsC=WQZrxM2pA^Poa-YY?
z{rSh7`lmYI_`KL{F;-@-T|@QxpJTSTW75Tfkcj4N3UzR)|FQZUeq4hiY%Wr<OX{4<
z=bm5wW{Ea;WSZ)TIh``(&s;~JIxcO4*a#Z3DW&sCu75w5n)p6l1$#N2VOB*PzE5l1
zK5N#Sd#$zOTHAlMOS8G@gOBf%wg<?y&=%LFh*E-aUgeIJU@B*u6K#!Yp4j#0t`#d&
zy6tMlB9}G%zY}aoC@D|tv8U)10fut8(7CVgAB(40r2f>ZFJ*ScKj-`FbFo0@Vx3#3
z^gGGS(tq{!LX=y_<#fKjTDO)@HAng!TC_oJoKIYuU5GZZqEmcY>rv3U8i)=Bn+b*5
z2BrkW6cj8m#m!0=8i+ngL2H9e*WqpRCYW%WH!z58U}l@Q<OL2(TbyHlEqQ6hN*m<F
z)x<-W=0;ya4Y67x$H%K+5t4HRAG)q=2SsTU$A49@)_e4$j7n0_+QdXkkOEp@$TTp5
zCI3N70me|UV4&Y=C|F_&3YM6Hf+eP)V2LRx*hDlveQUC1ZJ<`V#vuA61+5KWR=TD@
z^hpX@8*ooo1Wj)}X|kmy6l?@d!q8+(OR79{t&umO<z^Pp5LeC;5K}-2mZL5vResQT
zjem!NxohP9pfL%fEw04`yT(HSA3WAaTU?=10)h_(OH4t*5>rsH#1s@PF$D!nOac9R
zA;F6)^y`HLFRn}ph$$#oVhRd25ly+ECR^5qf+eP)V2LTXMJ9r#eN>ukX$b`zL6a~v
z+0qj3=_1K!h%0kgVhU)%aumh`YERb~=6`+5(H7Ucf8CjDl!m=O98t@oEv`2&zgXXO
z+G<3-oX)1(O*?*E?{ZitS_U8;gwAe-$%if%03w5;tq=4p!5lTjH78mMdKu6wT`A(I
zB_N8n4zPmV9geL{AQgZW>@W<Q);6@H@B5$DHq-!CunuY9#zMDV9t~*0x?u0OZ+}VW
z?+(YV@B1GYbnE32xmoE#oXXm7-;({>Z|`$o>*dkn%5C1@l!~jCnT>~@hb8G~SrnmQ
ze_0v~>*Z6ZDcaO}DcE0@-a4(9mt3diNc#|iZ9RImE?=6KqJ0R#wjRA&m#;xd(Mo1A
z9zw7L2MU&C(;_ukB-ql%YRlCgl}0t=DqYyP+tXFj7!CF94##f4O+Oc{{2Fmx`WmO?
rS~qLfDEMpXtzSNASsppAgqYwTd+Jm$S;ER+00000NkvXXu0mjfhF4Q=

diff --git a/ui/Player UI Frame 2.png b/ui/Player UI Frame 2.png
index 35e4287d4d8299374d1594452433142ebccd3392..4437fcf3db8790a3becd1b20c4e19b9d5910552c 100644
GIT binary patch
delta 481
zcmV<70UrMP1Be8WF@M5IL_t(&f$f>GZo)7ShJPwv0>p%r5ebQnjtG_tbwXw76J()J
zQWif!7f>dISU`-hAt5m$b*jo^(8-nwv56DHU8;Oj;^RM?yC}YMN&rx=RnI73%lFT3
zsZ_63&u=f!)N3iQFkNg=mN&jXxSL}kg1h>AG@RBiL;wJI%74PS?+>tD?Xg|$vv8j&
z+tr>;l61<qe*#pzj=DY_*Eh!jpxtez(x;t2Df+rOaWhdBuY*RbukH`KIZns5ah#hz
z${%1(EVbQ)HBmAc%gIQMHClZfc5~x+_=%^~NBtjZ*RQ$QZ8+~y%gN{}NO{mxC&4vI
z;r%^PF_ARLRDb$#khs~SXm^{c;sY|O`Z#ksuGJpL(XOLcpDIy$_H?I*-5kB)*y^x1
z97paC)Oy`d#p_suM`@3PN|fw<q9(BgD^8Fo^<iItd5@sB+qii3nR*CQu;K=ZT2Eal
zq^b5K>Z~tLH?Eh<E>AKCJ#~MSw0{yJz;v;3OO%{2PFl~xRi8IxqMWNf`5H<ZBx-$L
zNmQPv4bmg@c{mVuS>wO$qrwd%H-reB4uFdfhYa!k!No(SiV4Cs6@-|5ed6`~<7)g5
X;&VqJgdtQ;00000NkvXXu0mjf`@iPh

delta 467
zcmV;^0WAKA1o{JzF@Lm4L_t(&f$dqbZi6roeN_1pwjf23k|iIIHR_n|9W!K2zo1<+
zFm_MIij@yw0SO_&#;>H4Er((Un<RHsya{}~v;EHCJL3U>@B0^wV2ir0J<s?3%h&FW
zdMqOhID{um#LaXuznkMK%kS#%+2Az(D$4-?FOP6OUCdEsxqs|rNZ=GC6_eYK0KsZ4
zugfI9*$!O4p)UNs{kwu=kbn+>3RY{(mK%9rq!G#_*0yuwxA_C~fu*+VU<{NH;~ef~
z+ibZ(kw)6~=8C7}x6Mb`)oU(x6Rh{BbGZK_(h&I6L9h){bANYACR|0P;x|R&W^aQ?
z$OIme^>Id-#D8*+<7ii*CN?rqZK-sb#3<4T+uhOVaJxIU?hn*_)laZm8^xovcYzF4
z^HozjF^SbhBuakM7oguGsO=_Pefo4YgifrkB2n|H6NNt6o`5{->r&{c>9WmA=D??}
zk6i1gD$8*QPj-P49d@Z%xblYv5h&}dPke@4MWW^p6--X)d0&y9!5_kbu+13%Z5^e{
zV!6QflwO|oah_BkaGsZLY;B9o1IAzRobdDgiP!g!tG2qXy<bl_Nv<g)G|~V7002ov
JPDHLkV1gpv>#hI*