From 77f730d27d04bdcb64209a50b50e916ed9d33b07 Mon Sep 17 00:00:00 2001 From: as4s4hetic Date: Sat, 22 Jan 2022 23:17:54 +1100 Subject: [PATCH] josep on laptop --- Sprites/josep/Josep_Sitting.tscn | 16 +++++++++++++ Sprites/josep/at_desk.png | Bin 0 -> 1489 bytes Sprites/josep/at_desk.png.import | 35 ++++++++++++++++++++++++++++ Sprites/josep/left.png | Bin 1593 -> 884 bytes Story/Ch1S2.tscn | 38 ++++++++++++------------------- 5 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 Sprites/josep/Josep_Sitting.tscn create mode 100644 Sprites/josep/at_desk.png create mode 100644 Sprites/josep/at_desk.png.import diff --git a/Sprites/josep/Josep_Sitting.tscn b/Sprites/josep/Josep_Sitting.tscn new file mode 100644 index 0000000..0bcb905 --- /dev/null +++ b/Sprites/josep/Josep_Sitting.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/josep/at_desk.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 46.5001, 40.4998 ) + +[node name="Josep_Sitting" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( -10.5, 27.4999 ) +rotation = 1.5708 +shape = SubResource( 1 ) diff --git a/Sprites/josep/at_desk.png b/Sprites/josep/at_desk.png new file mode 100644 index 0000000000000000000000000000000000000000..b3f212958e0f34bc7c2e91a0e76cea103dfab72f GIT binary patch literal 1489 zcmZuxeK^xw9CwS{hl||UudH>wToD>_+d|aEPpK!1OXel76*p@dTU?As<)!V8TVi!7 zT1pbhTNBGmX_dsDD2s6;HZL=ajke+b+C0zw=bq;|=RD_}&vQPXb3Whi_tH`C13Fqp zT54))I$j4oe4#lB>h<4mfW|Oy0YXhpSpuYO6zLLMe&>&eY*anMk+b?Mb!t z{bi$uR_f$O;*;{V^)mhN~|qIuNL z-k#7pSbXQsokMBw_58$lE%h{Dd_y?Yj+@;>22~x?_nDlZH(^}fr)4wS-n(gore?zG z#=*hCrq;U_*TY-_1>pn(Y{*#;pxr{6@Ta&B>zbxu!XH*uX|PIN5{bk<8UTY0z2>f9 z%1R4Tt(>r1HDCbfA%96BlnC$*K^1IrBsbdoy||*H;&s3zv1X5!O*KmYMyKavT5Jgx z>2@pxgTVl@r)x}e;~l*$fq2sxK6QMmpftgqn{%_cm^em_b1igQ?aOXuKBB#Uu(?M@ z`pdA(+S(ew*TG@zg_)Td9*1_P?AN5;ZW}#x90U*_P;LMK@Rr&VW@cxf5IB!;oc2-68s^71;>FXtu2+&3Y>dUw(t<*GBF)n#dun>R zYngV1!U5KI@t^0O;T7`kV0`LKr>!r4km))f7_Z28@MrLTm7 zB2qTvLZ?qSp|&!nxrt+^&r21Q!bifAEF?qwM9ZIE@SR>g)NA(g1ymnXn}bXMUG|6x zQ(|}+$u}=wRO=+VE#HhgXS{=0F!4xpzGGv90;y!Dz=+Q2_esilnnIySYjtA)y-=LHZ?K z*ny1B0wd0ZRmkntaB0g%;p3-?W40q{dr7&hHy>QnpVRVCX#$xHE&u5V;wSQ~-?(0) zyi`f+^N>;3k{r`UQ0X7d=0}r*$F=6<;?{P}idv=v5ljVfJzO zmOXxUXh~WW`};fA09KbLSZckcysRMv488?N&^&875dkj)r_ztO;WOYQMw zOL}a}ZaSYWmydTisa$~+q%=+HuBuiA;KHyW=?jx`d>IxIwNelg8ZAPXry2-(2-Vk9 z{E7N{Y9V9xek50=sUZ;L8+M{j zx%ZnFs(?^((VKomMyBs+#I8N@tOtEdxjof!4Z%0$6crVL>A69hjf~=>Qr_{te2K3o z98n5rVVuO_9>5mW87L}I1{z=6e>RDdej*GK)^-~ zEgK}IE0bg}c-m1LVUxR#I=zEYhf=@Ks5i+6lc}JdDmi3 z)W8pG_6$*VX(z3TX||C}`#dF2|8@p>v>I8tylYHF3?evzmt*s?J@K~uEUVG^wbU{A zR#G4WkVR>HJ>-sb^Dik;UI5`i+`6kx0OA>IROtdF4N8AYyZ=gJj7$@~tDNn#_%-O; NrWfe#QSBCf{$Iii+}QvC literal 0 HcmV?d00001 diff --git a/Sprites/josep/at_desk.png.import b/Sprites/josep/at_desk.png.import new file mode 100644 index 0000000..da96665 --- /dev/null +++ b/Sprites/josep/at_desk.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/at_desk.png-4d1628e675cf4f1eea9bbac5877439aa.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/josep/at_desk.png" +dest_files=[ "res://.import/at_desk.png-4d1628e675cf4f1eea9bbac5877439aa.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/josep/left.png b/Sprites/josep/left.png index dadaf67a0baf9b2fb29dbb98618e065c717a6147..5e9d7c0084be27559d5f1e40781f6f46fdea00c6 100644 GIT binary patch literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7Fk5@NIEGZrd3(n`LpV|5_{ZQQ z7cMV}5LjrjMB&v19luMK0wo!a2iM*>xN>v#^d>$%y;h&FU7V#Sg1ByW&5mweWihRZ zLpL{T)-|WtQmN0_t<5pXA_bhL?&6JJ5mKZ(%`)2)O=hfoN?4#~x zO?KggsffM#Nc#Q9w^K9UfBf}v;rAWY?rV239%AWUeDG1z@9*Ivt{16K!)j)L3^Nx4`^wp;m6{_GGkxG7Wz OlJ#`;b6Mw<&;$TfK(Lnp 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 diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index f105dfe..a138f4a 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://Resources/lodge.tres" type="TileSet" id=1] [ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=2] @@ -15,7 +15,7 @@ [ext_resource path="res://Scenes/InteractiveDialog.tscn" type="PackedScene" id=13] [ext_resource path="res://Scripts/CoverControl.gd" type="Script" id=14] [ext_resource path="res://Music/Lodge-Unmastered.mp3" type="AudioStream" id=15] -[ext_resource path="res://Sprites/josep/Josep.tscn" type="PackedScene" id=16] +[ext_resource path="res://Sprites/josep/Josep_Sitting.tscn" type="PackedScene" id=16] [ext_resource path="res://Sprites/bong/sit_1cat.png" type="Texture" id=17] [ext_resource path="res://Sprites/eunsu/Eunsu.tscn" type="PackedScene" id=18] [ext_resource path="res://Sprites/bong/black_cat.png" type="Texture" id=19] @@ -26,7 +26,6 @@ [ext_resource path="res://Resources/bathrooms.tres" type="TileSet" id=24] [ext_resource path="res://Sprites/josha/Josh.tscn" type="PackedScene" id=25] [ext_resource path="res://Sprites/joe/Joe.tscn" type="PackedScene" id=26] -[ext_resource path="res://Tiles/Furniture/thonkpad.png" type="Texture" id=27] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -235,12 +234,19 @@ format = 1 tile_data = PoolIntArray( 1245168, 69, 0, 1179694, 536870981, 0 ) [node name="BedBot" type="TileMap" parent="FG/Rooms"] -visible = false tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) cell_y_sort = true format = 1 -tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834994, 65, 0, 1769512, 536870977, 0, 2228208, 74, 0, 2162733, 536870986, 0 ) +tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834994, 65, 0, 1769512, 536870977, 0, 2162733, 536870986, 0 ) + +[node name="Furniture" type="TileMap" parent="FG/Rooms/BedBot"] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 ) [node name="Eunsu" parent="FG/Rooms/BedBot" instance=ExtResource( 18 )] position = Vector2( 1353, 888 ) @@ -260,25 +266,11 @@ frames = SubResource( 1 ) frame = 2 script = ExtResource( 22 ) -[node name="Josep" parent="FG/Rooms/BedBot" instance=ExtResource( 16 )] -position = Vector2( -375, 1020 ) -scale = Vector2( 1.00493, 0.995532 ) - -[node name="Thonkpad" type="Sprite" parent="FG/Rooms/BedBot"] -position = Vector2( -447, 1019 ) -scale = Vector2( 1.00493, 0.995532 ) -texture = ExtResource( 27 ) - -[node name="Furniture" type="TileMap" parent="FG/Rooms/BedBot"] -tile_set = ExtResource( 1 ) -cell_size = Vector2( 30, 30 ) -cell_tile_origin = 2 -cell_y_sort = true -format = 1 -tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 ) - [node name="Josh" parent="FG/Rooms/BedBot" instance=ExtResource( 25 )] -position = Vector2( -330, 1068 ) +position = Vector2( -357, 1065 ) + +[node name="Josep_Sitting" parent="FG/Rooms/BedBot" instance=ExtResource( 16 )] +position = Vector2( -420, 1050 ) [node name="BathTop" type="TileMap" parent="FG/Rooms"] cell_tile_origin = 2