From c21e713fcd50a972e3e97d0101cd5726c3ec384d Mon Sep 17 00:00:00 2001 From: as4s4hetic Date: Sat, 22 Jan 2022 22:00:11 +1100 Subject: [PATCH] changed shape and size of npc collision boxes --- Scenes/Player.tscn | 30 +++++++++++++----------- Sprites/alistair/Alistair-back.tscn | 9 +++---- Sprites/charlene/Charlene.tscn | 5 ++-- Sprites/eunsu/Eunsu.tscn | 5 ++-- Sprites/jame/James.tscn | 5 ++-- Sprites/joe/Joe.tscn | 5 ++-- Sprites/joe/front.png | Bin 1101 -> 1109 bytes Sprites/josep/Josep.tscn | 5 ++-- Sprites/josep/left.png | Bin 0 -> 1593 bytes Sprites/josep/left.png.import | 35 ++++++++++++++++++++++++++++ Sprites/josha/Josh.tscn | 5 ++-- Sprites/richal/Richal.tscn | 5 ++-- Sprites/sak/Sak.tscn | 5 ++-- Story/Ch1S2.tscn | 6 +++-- 14 files changed, 84 insertions(+), 36 deletions(-) create mode 100644 Sprites/josep/left.png create mode 100644 Sprites/josep/left.png.import diff --git a/Scenes/Player.tscn b/Scenes/Player.tscn index 69fcd10..e6828ee 100644 --- a/Scenes/Player.tscn +++ b/Scenes/Player.tscn @@ -21,6 +21,11 @@ animations = [ { "name": "MoveDown", "speed": 5.0 }, { +"frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ], +"loop": true, +"name": "MoveUp", +"speed": 5.0 +}, { "frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], "loop": true, "name": "MoveLeft", @@ -31,14 +36,14 @@ animations = [ { "name": "MoveRight", "speed": 5.0 }, { -"frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ], +"frames": [ ExtResource( 3 ) ], "loop": true, -"name": "MoveUp", +"name": "IdleRight", "speed": 5.0 }, { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 2 ) ], "loop": true, -"name": "IdleLeft", +"name": "IdleDown", "speed": 5.0 }, { "frames": [ ExtResource( 5 ) ], @@ -46,19 +51,15 @@ animations = [ { "name": "IdleUp", "speed": 5.0 }, { -"frames": [ ExtResource( 2 ) ], -"loop": true, -"name": "IdleDown", -"speed": 5.0 -}, { -"frames": [ ExtResource( 3 ) ], +"frames": [ ExtResource( 4 ) ], "loop": true, -"name": "IdleRight", +"name": "IdleLeft", "speed": 5.0 } ] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 24, 7.5 ) +[sub_resource type="CapsuleShape2D" id=4] +radius = 8.0 +height = 32.0 [sub_resource type="CircleShape2D" id=3] radius = 30.0 @@ -75,7 +76,8 @@ playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( -4, 30.5 ) -shape = SubResource( 1 ) +rotation = 1.5708 +shape = SubResource( 4 ) one_way_collision = true [node name="RayCast2D" type="RayCast2D" parent="."] diff --git a/Sprites/alistair/Alistair-back.tscn b/Sprites/alistair/Alistair-back.tscn index ae2e480..df4ad66 100644 --- a/Sprites/alistair/Alistair-back.tscn +++ b/Sprites/alistair/Alistair-back.tscn @@ -2,9 +2,9 @@ [ext_resource path="res://Sprites/alistair/back.png" type="Texture" id=1] -[sub_resource type="CapsuleShape2D" id=2] -radius = 25.0 -height = 0.0 +[sub_resource type="CapsuleShape2D" id=1] +radius = 12.0 +height = 25.0 [node name="Alistair" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) -shape = SubResource( 2 ) +rotation = 1.5708 +shape = SubResource( 1 ) diff --git a/Sprites/charlene/Charlene.tscn b/Sprites/charlene/Charlene.tscn index e2336c8..c73109d 100644 --- a/Sprites/charlene/Charlene.tscn +++ b/Sprites/charlene/Charlene.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/charlene/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Charlene" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/eunsu/Eunsu.tscn b/Sprites/eunsu/Eunsu.tscn index a37a10c..402ac94 100644 --- a/Sprites/eunsu/Eunsu.tscn +++ b/Sprites/eunsu/Eunsu.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/eunsu/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Eunsu" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/jame/James.tscn b/Sprites/jame/James.tscn index 1d68897..0fd54dd 100644 --- a/Sprites/jame/James.tscn +++ b/Sprites/jame/James.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/jame/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="James" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/joe/Joe.tscn b/Sprites/joe/Joe.tscn index dd7cc2d..76ac9ef 100644 --- a/Sprites/joe/Joe.tscn +++ b/Sprites/joe/Joe.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/joe/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Joe" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/joe/front.png b/Sprites/joe/front.png index c133c039eebe98f0d3ae0a33924717abe1dca114..832c147d5f16b5e07b42fc73142fa3583bf31c74 100644 GIT binary patch literal 1109 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7u*i72IEGZrd3)EpHpKu zN7q)>$wqG%l~sRUyXXAO!p*h!um3Nvvb}fC@AJohHMVWnJ_9X8fCu(h1Kvxo2sN?V zH9fU<-Rjdl+N)Q0zW)0%^Wymx8}FGjxO20H`KA21B6M12ZDFtM8X2xNb7q`)m}Keu zC#Y9eHf_)DjT3jw>(0}JO5WL6b^kyjPqbC|cYsIUFpd)9H;`&+v0 z*M7eJ;QnauP9EzBOOXi6<;t_1lXt#6#r%5K-qz}w>rTd|Kffz$ysqM#-mO%K3p+bs ztm>;Oy4mx6p1OPC;RCg=ZF&peS?yQ1k9zOO^(Nsd$fCX%Chra2KYPnA5@#uQ$#2K2 z&0h+X>wi=iOO|aY(%4Ys=WgdHZVVk=NpF_c|)d zprP?*(Pk~N?lhm>8C_*pWH(d-w9@E`KKe===Ok@w0RDy`gTO z(ZN@rJKNA!ewm=x^$X?tUP~uQUf!{+s=9j3^(XIO0qHVl`8)UfFJ4%e9zIjgoA+<( z>+dc8XMcSDE}qt7Zgs#C7?h8c()aJ2xm#`B>|)=veWn}APtRFv@NUcLsj|j$QZohq z_H1aL>fAV0xcI_BPvO%hb(*{Oz1n=HsuLW{Lq-tPx# literal 1101 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7u!wlNIEGZrd3*P~_Y_Bo10O@9 zBexu#l%guQP^78rN{5X|+%E2a%(Be=bDMegRJ@cZnegI@?*?xU#}ZEEfW>-E?5-?F zH>3n_6Wx0I&1R#=`_?C&`~2naoMnmk%S;}iZ4l7#Kjd!Y{sW#<+uHdr ztvO#-vg6~sS6OGj?mX#v_5O-~YvLJ}cQZ&Y-}GnB5}o!4-RmhE3R!Mgn5wFWOq)C< ze&xQkXM4Y!n`N!zpPHxpbQX_UAA@xHyEX9-Ec}9|8SCm!t=y;4fp<3;ZlO@6~{{#3u}`D^LV zE9Y&E*Q(*9Q^LMXa6+I4!^!ucv3kisTG4&*w%**3*w{6x_{Nzl!r@NRn|bs0S-yWi&3Rk* zRKMMOc0WJH?3}!6zo2A}45OLfSvPl&Nt<*|uUEMq9xENO9x7bh2~3Eo;W4gjIHzSl zh4}rI_m(MTo1O9|wVc{o1_`jKs=Gq8c3!fww|y3S`Qm?%KP$h@x_WbZUd+8Uf7Vxh zirg9FcXyutX96PIoZ(W<=Oa?Yl_tgPz)JZ)|5d%_Ao_xu-+F4{RqX7vxKsiv`C zj&auADlI87xth2qU?u}oxJ4h!=X~^Gj{xyKUHx3vIVCg!0DfQ|6aWAK diff --git a/Sprites/josep/Josep.tscn b/Sprites/josep/Josep.tscn index 521c010..6be9449 100644 --- a/Sprites/josep/Josep.tscn +++ b/Sprites/josep/Josep.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/josep/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Josep" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/josep/left.png b/Sprites/josep/left.png new file mode 100644 index 0000000000000000000000000000000000000000..dadaf67a0baf9b2fb29dbb98618e065c717a6147 GIT binary patch literal 1593 zcmY+EeKZql9LHB(leZ~!cbO!T5|T3SxwK??St6=CvzuW%^R|XwyeBb5RI`No)&eL}gw=nU{1onhNuhJ8|wk_c`Zzo^yWBAHVPO`F@{=bi(JDhN_+_007W{ zd%#XA_KT}?Gf=VGW1!st01yC&x%ywEN$+}NLr&=k4(?zq7hKIXIkMR=&)OJx-SAEX zY|ou2Yb!T`pCqDE2W*LfX8XA|@lw@Fd-L;+)HfYOZ#{nhy<46y=3)GO9q^IOKl^I+ zvvB3Oih3gA8;v`6i$7bul=7%qnlyKp(=4C(%2`C6JD^bT-za%PbBt8(FlugY&U7Uf zP$-C{e%u6O0y%-dpga%Q7@_aM@+yG|^oUZ{7dLvEx}t*D+U|Z9k^NA_?BbHX8>Z)^ z10aGcut4Ifj|qwS9}7e6D`Q25A~J?r z)oH(Xh1|qC3gt{_0thOih7kok_38@#`HRB<8W~+K`$) z^S-h3)Cli_z`(#do!hV#PbM$K1}FXaaf`rae#vT^&00GSE*4|0d#j13$yDmt(XhO) z@AuIsCoA%jZXh%3P@|@lS6uGl>To_)bC9&f)4^=as8745>9FzIeTvK$uu2IQkB8es z6D2-rl82}8&R5A}UWn9<>F(jp5n`())DJ|q3^=tHkFzrb?Y#`4-@=7^vPEB_9hUV=l{^;Xc;H2E!U z)b_y-FCt~VpNel+Qwh6yUOjrQ(+AI?Pr>L6$?t z`q)v=`_JCX68m}CK)L{zD*e=J7iMxfCMIuGcJocPUAeTnM%x8+E6BX9NT#L2W?u>oJ<5qk7TDm% z#4aiPVi%PrwP+!b*}Bdwq_T@F41*h}b*3Q1&J819dxwT+>?r3z(-xUKxyz^ZCp1(o z>m0%LEpqANZzFcoM+JWfA;#;#P;^sMQ+R=>rw7YvgT}JVw1V<&lk_X-1O5F*^5!D- zo7`CT)?ivf0IjOE8k*T|Lm4@y-FVyi^Fq=ghac*PJP%PqH5g}^ACPG|JEeO)G%V|U zA7Mc$&uNRP>QIp4Sx%c=Mx#?BEJezHx<&b-o+Os|cgYjE;|9(t7AI$nxP4smko#=JIQ4b=gYACf~}PkvRo zeBPIPD@iPAPW7^F9xqsU=}f90hlOOfp2 zyXCaI*Z;*C4fa7Gc39UJ$FXD{B5Zs-w3~~~o&84k+Rc+$t;f`pG+v#UeK<=rWj@b$ y{gKFAik1+^+U3rm-#jznzXV$?u73OfA4N->>Y0nU++Q%r)dToZ9~jdOedQk~fd#Sv literal 0 HcmV?d00001 diff --git a/Sprites/josep/left.png.import b/Sprites/josep/left.png.import new file mode 100644 index 0000000..5a523b4 --- /dev/null +++ b/Sprites/josep/left.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/left.png-b030edeb4b7709d11a1c7286008597c7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/josep/left.png" +dest_files=[ "res://.import/left.png-b030edeb4b7709d11a1c7286008597c7.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=true +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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Sprites/josha/Josh.tscn b/Sprites/josha/Josh.tscn index fd1f92d..6aab20c 100644 --- a/Sprites/josha/Josh.tscn +++ b/Sprites/josha/Josh.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/josha/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Josh" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/richal/Richal.tscn b/Sprites/richal/Richal.tscn index 0e1c1a4..6b04023 100644 --- a/Sprites/richal/Richal.tscn +++ b/Sprites/richal/Richal.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/richal/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Richal" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Sprites/sak/Sak.tscn b/Sprites/sak/Sak.tscn index eb47dd1..c3f4fc1 100644 --- a/Sprites/sak/Sak.tscn +++ b/Sprites/sak/Sak.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://Sprites/sak/front.png" type="Texture" id=1] [sub_resource type="CapsuleShape2D" id=1] -radius = 25.0 -height = 0.0 +radius = 12.0 +height = 25.0 [node name="Sak" type="StaticBody2D"] @@ -13,4 +13,5 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, 35 ) +rotation = 1.5708 shape = SubResource( 1 ) diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index b893714..f105dfe 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -139,7 +139,7 @@ scale = Vector2( 1.00493, 0.995532 ) z_index = 1 [node name="Richal" parent="FG/Rooms/Living/NPCs" instance=ExtResource( 11 )] -position = Vector2( 600, 180 ) +position = Vector2( 600, 188.036 ) [node name="Node2D" parent="FG/Rooms/Living/NPCs/Richal" instance=ExtResource( 13 )] position = Vector2( 0, 4 ) @@ -180,7 +180,7 @@ timeline = "timeline-1642568183.json" position = Vector2( 0, 18 ) [node name="Alistair" parent="FG/Rooms/Living/NPCs" instance=ExtResource( 3 )] -position = Vector2( 165, 150 ) +position = Vector2( 165, 158.036 ) [node name="Node2D" parent="FG/Rooms/Living/NPCs/Alistair" instance=ExtResource( 13 )] position = Vector2( 0, 4 ) @@ -281,6 +281,8 @@ tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 position = Vector2( -330, 1068 ) [node name="BathTop" type="TileMap" parent="FG/Rooms"] +cell_tile_origin = 2 +cell_y_sort = true format = 1 [node name="Joe" parent="FG/Rooms/BathTop" instance=ExtResource( 26 )]