From 6361580c157bca0e6a3a60fd2b7c03bc5959a89a Mon Sep 17 00:00:00 2001 From: as4s4hetic Date: Tue, 18 Jan 2022 00:50:01 +1100 Subject: [PATCH] added characters into ch1s2 --- Ch1S2.tscn | 73 +++++++++++++++++++++++++++ LivingRoom.tscn | 47 +++++++++++++++++ Player.tscn | 32 ++++++------ Sprites/jame/James.tscn | 15 ++++++ Sprites/richal/Richal.tscn | 15 ++++++ Sprites/sak/Sak.tscn | 15 ++++++ Tiles/Furniture/kettle.png | Bin 185 -> 372 bytes Tiles/Furniture/kitchen-bottom.png | Bin 2163 -> 2155 bytes Tiles/Furniture/mug.png | Bin 0 -> 255 bytes Tiles/Furniture/mug.png.import | 35 +++++++++++++ Tiles/Furniture/sofa-chair-front.png | Bin 1257 -> 787 bytes lodge.tres | 2 +- project.godot | 2 +- 13 files changed, 218 insertions(+), 18 deletions(-) create mode 100644 Ch1S2.tscn create mode 100644 LivingRoom.tscn create mode 100644 Sprites/jame/James.tscn create mode 100644 Sprites/richal/Richal.tscn create mode 100644 Sprites/sak/Sak.tscn create mode 100644 Tiles/Furniture/mug.png create mode 100644 Tiles/Furniture/mug.png.import diff --git a/Ch1S2.tscn b/Ch1S2.tscn new file mode 100644 index 0000000..9df3e09 --- /dev/null +++ b/Ch1S2.tscn @@ -0,0 +1,73 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=3] +[ext_resource path="res://Tiles/Furniture/kettle.png" type="Texture" id=4] +[ext_resource path="res://Tiles/Furniture/mug.png" type="Texture" id=5] +[ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=6] +[ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=7] +[ext_resource path="res://lodge.tres" type="TileSet" id=14] + +[node name="LivingRoom" type="Node2D"] +position = Vector2( 60, 0 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] + +[node name="Lodge" type="TileMap" parent="."] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 60, 60 ) +cell_quadrant_size = 15 +format = 1 +tile_data = PoolIntArray( 65535, 31, 0, 0, 1, 0, 1, 15, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 131071, 31, 0, 65536, 1, 0, 65537, 18, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 196607, 6, 0, 131072, 8, 0, 131073, 21, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 7, 0, 131082, 7, 0, 131084, 7, 0, 131086, 8, 0, 262143, 9, 0, 196608, 25, 0, 196610, 10, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 10, 0, 196622, 11, 0, 327679, 9, 0, 262144, 25, 0, 262146, 10, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 10, 0, 262158, 11, 0, 393215, 9, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 10, 0, 327694, 11, 0, 458751, 9, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 10, 0, 393230, 11, 0, 524287, 12, 0, 458752, 10, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 13, 0, 458762, 13, 0, 458764, 13, 0, 458766, 14, 0 ) + +[node name="Carpet" type="TileMap" parent="."] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 60, 60 ) +format = 1 +tile_data = PoolIntArray( 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327681, 39, 0, 327682, 40, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393217, 42, 0, 393218, 43, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 ) + +[node name="YSort" type="YSort" parent="."] + +[node name="Player" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 453, 309 ) + +[node name="Furniture" type="TileMap" parent="YSort"] +position = Vector2( -1, 0 ) +tile_set = ExtResource( 14 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 131088, 45, 0, 458753, 49, 0, 458761, 47, 0, 524300, 48, 0, 589840, 32, 0, 720905, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 ) + +[node name="Chairs" type="TileMap" parent="YSort"] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 1 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0 ) + +[node name="Richal" parent="YSort" instance=ExtResource( 3 )] +position = Vector2( 548, 180 ) + +[node name="James" parent="YSort" instance=ExtResource( 6 )] +position = Vector2( 786, 189 ) + +[node name="Sak" parent="YSort" instance=ExtResource( 7 )] +position = Vector2( 831, 216 ) + +[node name="Kettle" type="Sprite" parent="YSort"] +position = Vector2( 593, 156 ) +texture = ExtResource( 4 ) + +[node name="Mug" type="Sprite" parent="YSort"] +position = Vector2( 492, 155 ) +texture = ExtResource( 5 ) + +[node name="Mug2" type="Sprite" parent="YSort"] +position = Vector2( 517, 155 ) +texture = ExtResource( 5 ) diff --git a/LivingRoom.tscn b/LivingRoom.tscn new file mode 100644 index 0000000..7661c63 --- /dev/null +++ b/LivingRoom.tscn @@ -0,0 +1,47 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://lodge.tres" type="TileSet" id=1] +[ext_resource path="res://UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Player.tscn" type="PackedScene" id=3] + +[node name="LivingRoom" type="Node2D"] +position = Vector2( 60, 0 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] + +[node name="Lodge" type="TileMap" parent="."] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 60, 60 ) +cell_quadrant_size = 15 +format = 1 +tile_data = PoolIntArray( 65535, 31, 0, 0, 1, 0, 1, 15, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 131071, 31, 0, 65536, 1, 0, 65537, 18, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 196607, 6, 0, 131072, 8, 0, 131073, 21, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 7, 0, 131082, 7, 0, 131084, 7, 0, 131086, 8, 0, 262143, 9, 0, 196608, 25, 0, 196610, 10, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 10, 0, 196622, 11, 0, 327679, 9, 0, 262144, 25, 0, 262146, 10, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 10, 0, 262158, 11, 0, 393215, 9, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 10, 0, 327694, 11, 0, 458751, 9, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 10, 0, 393230, 11, 0, 524287, 12, 0, 458752, 10, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 13, 0, 458762, 13, 0, 458764, 13, 0, 458766, 14, 0 ) + +[node name="Carpet" type="TileMap" parent="."] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 60, 60 ) +format = 1 +tile_data = PoolIntArray( 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327681, 39, 0, 327682, 40, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393217, 42, 0, 393218, 43, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 ) + +[node name="YSort" type="YSort" parent="."] + +[node name="Player" parent="YSort" instance=ExtResource( 3 )] +position = Vector2( 453, 309 ) + +[node name="Furniture" type="TileMap" parent="YSort"] +position = Vector2( -1, 0 ) +tile_set = ExtResource( 1 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 131088, 45, 0, 458753, 49, 0, 458761, 47, 0, 524300, 48, 0, 589840, 32, 0, 720905, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 ) + +[node name="Chairs" type="TileMap" parent="YSort"] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 1 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0 ) diff --git a/Player.tscn b/Player.tscn index 1b10645..69530e1 100644 --- a/Player.tscn +++ b/Player.tscn @@ -16,16 +16,6 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ], -"loop": true, -"name": "MoveDown", -"speed": 5.0 -}, { -"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], -"loop": true, -"name": "MoveLeft", -"speed": 5.0 -}, { "frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ], "loop": true, "name": "MoveUp", @@ -36,9 +26,14 @@ animations = [ { "name": "MoveRight", "speed": 5.0 }, { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], "loop": true, -"name": "IdleLeft", +"name": "MoveLeft", +"speed": 5.0 +}, { +"frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ], +"loop": true, +"name": "MoveDown", "speed": 5.0 }, { "frames": [ ExtResource( 3 ) ], @@ -55,26 +50,31 @@ animations = [ { "loop": true, "name": "IdleUp", "speed": 5.0 +}, { +"frames": [ ExtResource( 4 ) ], +"loop": true, +"name": "IdleLeft", +"speed": 5.0 } ] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.75 ) +extents = Vector2( 22, 4.5 ) [node name="Player" type="KinematicBody2D"] position = Vector2( 4, 4 ) script = ExtResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] -position = Vector2( -1, -1 ) +position = Vector2( -4, -4 ) frames = SubResource( 2 ) animation = "IdleDown" playing = true -offset = Vector2( 1, 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 32 ) +position = Vector2( -4, 28 ) shape = SubResource( 1 ) [node name="RayCast2D" type="RayCast2D" parent="."] +position = Vector2( -4, -4 ) enabled = true cast_to = Vector2( 0, 60 ) diff --git a/Sprites/jame/James.tscn b/Sprites/jame/James.tscn new file mode 100644 index 0000000..21475e5 --- /dev/null +++ b/Sprites/jame/James.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/jame/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="James" type="StaticBody2D" groups=["Humans"]] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Sprites/richal/Richal.tscn b/Sprites/richal/Richal.tscn new file mode 100644 index 0000000..a88cd12 --- /dev/null +++ b/Sprites/richal/Richal.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/richal/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="Richal" type="StaticBody2D" groups=["Humans"]] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Sprites/sak/Sak.tscn b/Sprites/sak/Sak.tscn new file mode 100644 index 0000000..8558fe5 --- /dev/null +++ b/Sprites/sak/Sak.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/sak/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="Sak" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Tiles/Furniture/kettle.png b/Tiles/Furniture/kettle.png index 239a8e3ae8ed869a7015468e05ab37365359f477..76d2b8617ae5f57552f62dc70149d7e161b8cc69 100644 GIT binary patch delta 346 zcmdnV_=RbLay_H9r;B4q#hkY@4Y>|E2)HihSR}q7AgH4wd_(k+bJh`60{std-?(i1 z%oQfKs8u{5D06$yq@zdX_CET*o=ef^+2{R-*LVs!{p*VAS#)g1Za3NNwN>?{Z=3e> z%}LmL;)F!DtD&2(Mf*b*_M<9pPm=a?pG&kjxO8z~YESYPhUW(La~`-&)t7#MU9W5R z#W&ja>>#D?om(vP?#uDlp1)BdWcsRr?=YvHNM^oE@a*3{WqWu2K3k@(SsZ_D;>WsI ziTiXemFa<1*a|-Vq_A_&xrcZ6TzFY}cWX?Dlb8g^xYfFHFAE;5b6&QkysBF{QS5^H zoWli8&ELW-b+-mDdc9kp(=zIiC6BsAhS%v-XTMC{l)r~d4*KiPXHbuLd%yKx+R{&g pF^fc#IYHVu6zmvv4FO#tePop}HN delta 158 zcmeyuw3Bgyay>(Xr;B4q#hkZS9Qh6@2(VsQnf`HJOLf)sT}FuuGaGMZJm34(;m1sQ zB?b_9VB`J1(NymB@9uY}ubtV)o_qiDxi7nV<^F`fWa1B3PFlCCx@OgOuX2GOuUPi& zS{c8q^jW{H^4+$}tafWItqnR=us3^ceC1{DUA)V=c|Zn=|Jk8#QYR+O9IJK^#P@Xd Kb6Mw<&;$Tf&T` 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 diff --git a/Tiles/Furniture/mug.png b/Tiles/Furniture/mug.png new file mode 100644 index 0000000000000000000000000000000000000000..2ba0792e80ad98f683072a336215ab28d2a8f2ca GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8$2?seLn`LHy z4GX^3*e6Vt@B03$vVO|fhZRp&y*hq#*XO@qckfGl!69SKbUg3Fd)_~rY|@V||CPBh zx2EcJX@p+E1?61#@3$+it6opsdBCxMi|k`F_03?;J$I}9F{i((%)GYi-?p0{D{oAT wNqApxv*xGW+M3D_hR3GGv_EBH23vmQIcrzHqD7X%`U4=or>mdKI;Vst0DGHq9smFU literal 0 HcmV?d00001 diff --git a/Tiles/Furniture/mug.png.import b/Tiles/Furniture/mug.png.import new file mode 100644 index 0000000..d5ce5cf --- /dev/null +++ b/Tiles/Furniture/mug.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mug.png-0d9d2911da1c980d5c5aa7bdfee3cff8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/Furniture/mug.png" +dest_files=[ "res://.import/mug.png-0d9d2911da1c980d5c5aa7bdfee3cff8.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/Tiles/Furniture/sofa-chair-front.png b/Tiles/Furniture/sofa-chair-front.png index 145859183e34773f21035a547941408992aabc34..fda7514115511d9597e2e73efe1a2b8d73676001 100644 GIT binary patch delta 764 zcmaFKIhk#Oay`>6PZ!6KiaBrRI{FJcO0+rNW@^+5Q*?XU&}pcs`0>?2`v?5r_$wZG zIVCxHJZX>+ZO-sMAjY))rMuB&y}3W*%Dz_m9ZtJ^v-0z~+cW>}I(>$Rfq|i+DKa(v zz4^UZ&EK<+wEN4aKHk6l)r)%eg|0jN=k7Y{%Jp92;6){YsFu_9C7wr*7JXmnULIV0 z>A$S)J3(cOC>Ez~4KvqOM~?oxI6dgDXkzVC*Np1p9DQPq7nGvpr6cL$$Jcx0bFb^_>GVI_z3}Z`r9%+ARvq^9{U$MhE;jwOG6#0xfE0A#mAhG68?=I#3TTUK>_S99&WE5NJozHsl? z%Id7W1zR{;#4euT?Pg!Rx%;C$->L^0f*iU^*^^4rZcp}KWoV|?wzm6)< z+tK3E=GWueo8Cl~n^v8BdB3pmbHxw!E%UckExa4IeXhK(Pdibn&Rr7b$HUM4OiZV+E06Ub;qqqQsI6}z`=1Sl|4~g{F_;3@COa0$DjZ@ zq-quPT_EWGv+~wYx4_U=hvstFK*v)JAUS~H6}WcWb>WJTS;$L$MFb| fC2R~U^snFaJR;S+YI!;^Su%LK`njxgN@xNA#ba#k delta 1238 zcmbQt_L6ggay?^trn7T^r?ay{Kv8~LW=<*tL&coZiN4-Ufg)}4TQyD@tZ;SV78lc< zvP2vF%S2e&b8i+dR9db#`1=R*tEE=v12@56>kz3Q$0Eqiy#1pK&mNw~Cb zvqkW8{qC%zw2j^WVH#X0CB->c`A zPZwceVAl0?aSW-L^LFmRY+*-o@c%N{?%u*CufH)>j9~l z5$%5S4b#Dmq8lfQOu49{V$yl*@9gYA`HIgUf8H_ce`ojgmh19b#Z~&*Y=`gPdz_&h zRT{#>>8tc>wwcM)t{X>xUE6-+olj)su7{5%^zNzpuX8%fMbg*FX|lo14J~gLRW5t@ zsMSrozIy-e%NxH}tk9Q<7L@jM1gkiaCcFQbbAF83ZU?<>xAeBf32H6|xmayA-<(Ne z3u2#aQkF4}iq``>i}N#AH>=oc@oWf>6J*7N3o4Veboj&O?^xCKRjrjXuS1PJSbYEA zFOP0q6-zbY?K~F=t&< zVE=d6_1K-FPcEe;z%0zkFL!>Gam4-xhV(J3qdE#-!t1?pMLc0+>`R+@oURt?^u+7Iy!g#;rV*+%+Bwwc(~^OG~=BA z3;!E=S%bA6O8GbKrk=nSyDhB~N|!7EJ4fYg>YO}|x@P^@eNU3Q)q{c$sMi!O6|q_m zjnItO2kNt#6ty`*BTju=C7)7cv3gsJS(2s(B($wL*2FwWy|gMJ&?O8ULOyGhOLz}H zx^2Vy>;@!BWW4U!8`l^tv|fD*%q2{`E!qKy0r6MZMXHk)LBX59Y&y}I`O^a qw1(Ia!R}&6BxU{DnZ*aze#Cwc%Tu+T%gh!q0D-5gpUXO@geCwe1xc^~ diff --git a/lodge.tres b/lodge.tres index 64af3a3..dbf73c3 100644 --- a/lodge.tres +++ b/lodge.tres @@ -65,7 +65,7 @@ points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 330, 180, 330, 150, 0, 150 ) points = PoolVector2Array( 12, 51, 78, 51, 69, 81, 21, 81 ) [sub_resource type="ConvexPolygonShape2D" id=31] -points = PoolVector2Array( 78, 48, 78, 72, 72, 81, 18, 81, 12, 72, 12, 48 ) +points = PoolVector2Array( 78, 51, 78, 72, 72, 81, 18, 81, 12, 72, 12, 51 ) [sub_resource type="ConvexPolygonShape2D" id=24] points = PoolVector2Array( 0, 45, 60, 45, 60, 150, 0, 150 ) diff --git a/project.godot b/project.godot index 3c8c698..aceaa8c 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="Fullhouse" -run/main_scene="res://MainScene.tscn" +run/main_scene="res://Ch1S2.tscn" config/icon="res://icon.png" [input]