From efc5806d0a093dd1927e061e6c2ce8f4758e4c67 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Wed, 19 Aug 2020 18:59:29 +0200 Subject: [PATCH] Add oil_tanker 3rd part --- dialogues/End_Truth.json | 36 +++- .../oil_tanker/OilTankerLeak_Background.png | Bin 0 -> 5475 bytes .../OilTankerLeak_Background.png.import | 34 +++ .../oil_tanker/OilTankerLeak_Foreground.png | Bin 0 -> 1651 bytes .../OilTankerLeak_Foreground.png.import | 34 +++ images/oil_tanker/OilTankerLeak_Midground.png | Bin 0 -> 3688 bytes .../OilTankerLeak_Midground.png.import | 34 +++ .../OilTankerLeak_Midground_GooMask.png | Bin 0 -> 1432 bytes ...OilTankerLeak_Midground_GooMask.png.import | 34 +++ .../oil_tanker/oilTankerInside_Background.png | Bin 1936 -> 1947 bytes .../oil_tanker/oilTankerInside_Foreground.png | Bin 856 -> 836 bytes scenes/SidePlayer.tscn | 1 + scenes/oil_tanker.tscn | 201 ++++++++++++++---- scripts/game1/Game1Script.gd | 1 + scripts/game1/PlayerController.gd | 38 ++-- scripts/oil_tanker.gd | 46 ++-- 16 files changed, 391 insertions(+), 68 deletions(-) create mode 100644 images/oil_tanker/OilTankerLeak_Background.png create mode 100644 images/oil_tanker/OilTankerLeak_Background.png.import create mode 100644 images/oil_tanker/OilTankerLeak_Foreground.png create mode 100644 images/oil_tanker/OilTankerLeak_Foreground.png.import create mode 100644 images/oil_tanker/OilTankerLeak_Midground.png create mode 100644 images/oil_tanker/OilTankerLeak_Midground.png.import create mode 100644 images/oil_tanker/OilTankerLeak_Midground_GooMask.png create mode 100644 images/oil_tanker/OilTankerLeak_Midground_GooMask.png.import diff --git a/dialogues/End_Truth.json b/dialogues/End_Truth.json index a2471f0..e7b2e7c 100644 --- a/dialogues/End_Truth.json +++ b/dialogues/End_Truth.json @@ -19,5 +19,39 @@ {"name": "Crab", "text": "..."}, {"name": "Crab", "text": "Why are you telling me the truth ?"}, {"name": "Ely", "text": "Sorry, wha-"}, - {"name": "Crab", "text": "I thought we were telling tales."} + {"name": "Crab", "text": "I thought we were telling tales."}, + {"name": "Ely", "text": "Y-yeah. That's true..."}, + {"name": "Ely", "text": "I don't know. I find it really hard to lie"}, + {"name": "Ely", "text": "Furthermore, I think it's better to tell what really happened."}, + {"name": "Crab", "text": "..."}, + {"name": "Crab", "text": "Is it really ?"}, + {"name": "Ely", "text": "What do you mean ?"}, + {"name": "Crab", "text": "What does it changes ? Is the world a better place now ?"}, + {"name": "Crab", "text": "Did you accomplish anything by telling the truth ?"}, + {"name": "Ely", "text": "I mean... Now you know it was hum-... hum... hoomans' fault."}, + {"name": "Crab", "text": "I already knew that and besides, what can I [wave amp=20 freq=2]do[wave/] with this knowledge ?"}, + {"name": "Ely", "text": "..."}, + {"name": "Ely", "text": "Nothing..."}, + {"name": "Ely", "text": "You're just..."}, + {"name": "Crab", "text": "a cute talking crab ?"}, + {"name": "Ely", "text": "Yeah... A cute talking crab."}, + {"name": "Ely", "text": "..."}, + {"name": "Ely", "text": "I'm sorry."}, + {"name": "Ely", "text": "I'm so sorry..."}, + {"name": "Crab", "text": "..."}, + {"name": "Crab", "text": "You said you were just trying to do your job and pay you rent."}, + {"name": "Ely", "text": "Yes true."}, + {"name": "Ely", "text": "But I'm still responsible."}, + {"name": "Ely", "text": "I-I shouldn't have pick this job. I know it's bad for the environnement."}, + {"name": "Ely", "text": "And I dislike the job, it's not a pleasure to participate in this system."}, + {"name": "Ely", "text": "Uh. Crap."}, + {"name": "Ely", "text": "I'm so sorry."}, + {"name": "Crab", "text": "..."}, + {"name": "Crab", "text": "You had to pick this job."}, + {"name": "Ely", "text": "... I suppose..."}, + {"name": "Ely", "text": "Yes... That was the only way to pay my bills."}, + {"name": "Crab", "text": "..."}, + {"name": "Crab", "text": "To be honest..."}, + {"name": "Crab", "text": "It's okay. You were in a system that requires you to take that job."}, + {"name": "Crab", "text": "If I had someone or something to blame or attack it could be you but "} ] diff --git a/images/oil_tanker/OilTankerLeak_Background.png b/images/oil_tanker/OilTankerLeak_Background.png new file mode 100644 index 0000000000000000000000000000000000000000..ca50b24a2c19d2435540fcccb1e18d8076a8dd9f GIT binary patch literal 5475 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 Z{{@OR?!NoW;Vu9G002ovPDHLkV1h&S-9i8W literal 0 HcmV?d00001 diff --git a/images/oil_tanker/OilTankerLeak_Background.png.import b/images/oil_tanker/OilTankerLeak_Background.png.import new file mode 100644 index 0000000..afa9a3d --- /dev/null +++ b/images/oil_tanker/OilTankerLeak_Background.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/OilTankerLeak_Background.png-0c9b66bebe152e43e2790bbf7fdbebf5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/oil_tanker/OilTankerLeak_Background.png" +dest_files=[ "res://.import/OilTankerLeak_Background.png-0c9b66bebe152e43e2790bbf7fdbebf5.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=false +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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/images/oil_tanker/OilTankerLeak_Foreground.png b/images/oil_tanker/OilTankerLeak_Foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..d973da23dfa40f5beb265c2445bed8ca6857578f GIT binary patch literal 1651 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 literal 0 HcmV?d00001 diff --git a/images/oil_tanker/OilTankerLeak_Midground_GooMask.png.import b/images/oil_tanker/OilTankerLeak_Midground_GooMask.png.import new file mode 100644 index 0000000..89030c0 --- /dev/null +++ b/images/oil_tanker/OilTankerLeak_Midground_GooMask.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/OilTankerLeak_Midground_GooMask.png-13544a8ea729d77b6d159695d7231fb5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/oil_tanker/OilTankerLeak_Midground_GooMask.png" +dest_files=[ "res://.import/OilTankerLeak_Midground_GooMask.png-13544a8ea729d77b6d159695d7231fb5.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=false +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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/images/oil_tanker/oilTankerInside_Background.png b/images/oil_tanker/oilTankerInside_Background.png index 29bfa48d0184e023c8fee1e737255f6bde36a189..bdb51f54706b42d5291b2e934da9b2f126205e89 100644 GIT binary patch delta 1919 zcmbW2YdjN-0>)>UOEj4%$*V#}<(?#M#9D4?YGN$9klWmnhHQ-{I?fw5EVq=~i{&=2 z&Ak-wSy;SVD|2TiG-)qOUUoXa-}!RBp6A>1;d!2K&;JRy2>is7aOHxF)8%``UrLs9 z=Z)1K#`;dms1C5^(nd8Ml{<2Gx@)=IVMdesX#>L%Jj!iK0q%Wv5)2?7)c`1~D*&A3 z<%sX$00W!<*Ao649)kUBz5Z=G^-swe-W0#)J{qVDsPWNVmz+5^$5%L^vCrAogDol* z1s`btuu`Up20Zyet_w@yhQ3z-D#OLm@#=J89sewUwq#vW)&bC2j6L;a4j=sBFth^=R@4yM4zEhLBxMA|)@AfRqIljBIb~y##jY~0Ma~xOOq>R!LOs6ba z7H9P_*tsTFsBa+cu}xXibs&F7%{BnJF1(tX4~~qX4`>HKiA7&yAP5k%#VMXe@B&~# zc^P^a5wn}VV~yI6+W`z`5;qxh#GZ)a!1A`Ee$I8Tv)aH+2x-8r=@@am*Zl_P+GO&6 zu2vfLz0Hf$qdXc**+lwR^RGCq+adD8%<8T3y_-$p4SEq?qqV*Q*pg0k(Iz7#5@$Fa zD85^~eZ2IQPYT7Eq3<8eCIp7>B&!8Jd+JnB+_>42^&o;F(KQ)B`q~L^oyuz_#f(iT zuDM+O^tq#}@g#}`$gGF16Wvy$v2to=Rd%oHN|H}^C1NZK{VBJMvyLbx^6ayJkwdEa z>w~At^8w^^Bpawu)x&t=!PkCRr2f|h(4laC5+!IgVA=XP!IVf-zbH2M?|(}V z8`_!N0~Q+^Hf5DWemAe!OKjPA0f2^9zKV4ges&5;R#)5%x}+mM%J{7%FO@(0jK)q)V& z-=)Rb3m&kmodlhA7NT14GT}i8v(mZ->6_wqPKKtD&N#K>b2T;T&K*87WGGgavb41K9F~>mNt9L#B8_b z$GeP@_691HQ5K$SZ*q!K-i{k2k(*3OR8vnJuDnx5a4TwCYXQbYAnRwh&Gr3wf2!SR zB`;PaQfK>UMkxQS_Qw;SsSsp`vo-fe=bdROSopPyDb)6m^=SJC zuF*EjwP-X66Q=s?%5r>s==>ng%6=~`7f0AlHJLkKx!DD89hx4twp7eKmD=zn1#B62 z2m{GFpYLc@zY1F4rf!N#OJXGzq)y< zr~GjI`G^ERA|KvrRr_>*klP0;O4IRh9R6Qo8;<>=^}pAL3R}^b{=)1k={njMSrfp6SZ{SBuwTAjA+dcgf;cit=;S zUV-|G@$0+gHX9#$Fv5Oq&O+DIVsgez+Yjjl=zY3UFPqQS z&z!D@Ti(j0riYvPu|`Aj2j5H1$V!x$VH@U6gQ4|eC7fp3ypyr#?^E&>HdqjJEg?!C zGXWmItGYswo^l2p>5G2o^G+zWwK(3hMR6)vxHe`;>~QxfO{aItpKx%qi7eODXj{ApXab7yqQ*DV#W+si@)qk#EcheLig0` zFO{+QCK|DG_trly!3R~4`y$UmB6N~@;$1tUM;?tv_wuLGouFTHwF6eMdsx>MO_cIA z@%C>EIDrK;d6~t=*#VVlt-g|nNsUV6<9)Hf!eF}*Z?C3Ty-~`C04fX@g>zCxpf{-H n$K-!NRw45=1+)SGmx&Vds@A984k*7qz)xLp^>TUX97OszRbQ$T delta 1908 zcmbW2XE+;*0)`XO+|X)Kwa#gdU7=cAtr{g}9fGK6t<%P;qV^1GmPGUrGZDv3jZlqJ zD|M_=Vgwb68po=gLydCJ{c(TYfA{btoa7%KR zj6QmvpXWsWf^-~72Z9=vns9GNiFrY$hS$K0>}Z5}5vRU&Oo$5rpdAO)_jCpDiV6b~ zz+gb}|64Kt9iMp;zwZ}!_%4S-_a3Yt0zCJn%C;}O77>$XaWXwzxye|TfTvySjO?)T z#HRo;b#Gg;Ai;p4?5+d3ZObUoFYAY&F*?HZ!y7#@UF? z4>n)k`?=X4MKKJ*(>bnM<2a$$Djr&4NC7B(W+X8js^)!8*Lzq4bl$ss8#4j@5)pXj zd~%ec5MDEy_PjLt+)WUORPTw1Ux56^)PXkWw;4A}Ex-SBx&iNg@*kgtKum9CNR{Wa zP9{KJB8zuyEqYIOe>umygneCP-;FsJ48{Je-5H zZ3NRGjdBX}I(@S`kt?zo%9qAuRZn?tYmAS<{om&To0S2F9|BEw#-pOzSC-Ses&y{Ajz{M zAs$TxmaJ)PzyLtKBz}*Umms^~UV&eTXZ?f?y z-{l^B6LcVQRHn$#T&H3fENgt{Cxi#~9v9r=RKqxBuX#{(JDk)6Ud7UpQ&}vTJfkUU zSM8cC!3S6klv%@mE?I6Y3_Q3iuW+{K*P`D4R(24hTVQ|DBi3HLP)dSg`O&fknWbhp z!)Q%VruQc~IO6TAj$E$gFENvkkEB3>WbP&SACbbK>X#j-+pV{Z&Fw@Na^!jstQ3kf z@BO%y4n$K@m4(`~_>dP^{Pday>iylO?f~&iiYjU%L|ep|v;}H&leJM7-@scdtxn2f zpJA>jK_7e^p*{{q8mlUz)= zYZDBA12q0E5gu`pz#UNOR(6!BKZWG&6CJhV4$hnM@Y5njz%#hWttv|zd z>`(8(--GjlY6fRMJ>b+fiddo&OB%I5g?~V!eaX#rej}EKQa9rtxxvm3x8)`G`*1s3 z_jURqpCN$>rQaiMvq#p4odv!=yt;BYy0qc6uH^L5>^^9m#%N?gfr?(d##LBiqw-3}@SMb5rh+4ik|^g~Mp znpOCCZ~Ay4`T$+VTXkhes-BInZ&EIe5R}(~$UtY;1f?d9 zl~O$qR!#keZX71-G8O>)ad}!X*6)r?Uj}WRA;~iz9oP+mf)ghMdM()PEI2z-G~y)%>w?n_@^7- z-5gKqlTMM?7m42~5wO${Kh-!HMg63n0-Krp(p8n97rs#-P*5(#k8vnt<@hUeHm?kq z8J5|5Q8AXct+Q@6;GKUy%oQLBpR3)Yd%2T<;LquVRml_w4q>{ub3dm902DhsU-0#R bzVM8rQ?3hAqX|p`{1Y={E2CON*Z6+}bljgl diff --git a/images/oil_tanker/oilTankerInside_Foreground.png b/images/oil_tanker/oilTankerInside_Foreground.png index 0432c130e31b44a11b42add2a7e223c673ef7141..5ecf3440fa0f4f2c1af15777d8fa6c64bb3dacab 100644 GIT binary patch delta 801 zcmV++1K#}D2E+!CFnsA#Wn48Z z`bw<_PD%g(00000000000000000000P=GF_)JH$W4Z7$DpboF-2Y^TdK+^<(rU?K| z69Aef05nYiXqo`fGy$M#0zlKA7y#EG*zC{Uzo75`Up4AFwSP%jt_Z+VRriXY()|j+ z-rJ(lH%q0AU0&&5(F}z%E}$*NH2zHA_x-!&G5S-3EsNl}a7=x)J5YIvq>anG(!oQdX}_=kr$&ccpkc(H{&_Q_KbIN;uxt39UU{|#pjP7op@BF}} zh8JQ6Ya!@U`o8!EHJe)l%vJUK-xNMivNZb7wHwh@zkm8h+J?`-m+=g+sTG=g=ND=< zZGo0T@KNmn3*aq^dmzd;w+7g{D2D27>8pp&MTgq zU~YResDJ&@@{rBqA~ftLSaeUj%|%mEHoC98Mmf^Z=wJ z1l*|f7HEz3h|_8gz(5c<>8q)A;G(%;1Ftn00000NkvXXu0mjf$C-6c delta 821 zcmV-51Iqlw2G|CWFn0kQS~c$A^`0Pgm$_5h$J0ibIFK-UC-t_c8L z69Bp<0CY_N=$Zh~H36V&wnA{!tF}Y@)E)rL4Z~l?V$6GtR(}CFsz?P$gkWi|UK)=c zfTL<1G>6I85v$`B0Gc#i`i#|J7>4onGz5DB856H#2q6jpkCO<&T%3JhBmgvPUIlVA z!~#Imc24@!$q)dpDAEwe7()a0v0h;Q{R{!%k>*<>PE>&* z1U&%ftn~o%zsWAKQ*>)y|Bg)s;L#Q~$gPF%<7OHG;C~eoRUj3Dub){0aYj>1paol} zXk!SLK)k@tMmTvNu>f#JQ!9s+jdH2iA7d8)-fr~?5=|wUM;Sux%zi(wQ1UMI0PXt5dy067(32F)k`)*c~EFu7G}h8OM^a8EE@`?`r< z0O*n3pnp_RY{|X$2*v5sr3HYJwl1FKdDE3fSQAWcOIKryH^-?*tP21oEN!1I_Ds>G z`-UxnD52VccI$?D0idR0pD(b~2Ur48%2ESdZP(~93<5wCs)fK3h_0ysw4zECPyy(g z0MLq}tC8R910~-SHWXh52>`7r`b<$vAi5?1bbn0%Xo((xt`!e}3P3CVo@jN$=l|}d z0?>kLdw~Ri+UAqL=v`x$K(u6jK+b-E765A6e0pFKmpX@0Dz*Uc&_#**ek4I1PH3Gnv*G~Qr z1TKKIS5NvW0q9dV6MTyR^uwf25P;`1u`l=!=Gw|*t(Nll00000NkvXXu0mjfJ$PKG diff --git a/scenes/SidePlayer.tscn b/scenes/SidePlayer.tscn index d227307..1561420 100644 --- a/scenes/SidePlayer.tscn +++ b/scenes/SidePlayer.tscn @@ -10,6 +10,7 @@ extents = Vector2( 10, 4.5 ) position = Vector2( 1, -1 ) mode = 2 gravity_scale = 0.0 +sleeping = true linear_damp = 25.0 script = ExtResource( 2 ) diff --git a/scenes/oil_tanker.tscn b/scenes/oil_tanker.tscn index 79b6fe6..8c9e355 100644 --- a/scenes/oil_tanker.tscn +++ b/scenes/oil_tanker.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=35 format=2] [ext_resource path="res://scripts/oil_tanker.gd" type="Script" id=1] [ext_resource path="res://images/oil_tanker/OilTanker.tres" type="SpriteFrames" id=2] @@ -6,10 +6,7 @@ [ext_resource path="res://scenes/SidePlayer.tscn" type="PackedScene" id=4] [ext_resource path="res://images/oil_tanker/oilTankerInside_Foreground.png" type="Texture" id=5] [ext_resource path="res://scripts/GooEmitter.gd" type="Script" id=6] -[ext_resource path="res://images/goo/goo.shader" type="Shader" id=7] [ext_resource path="res://images/goo/BigGoo1.tres" type="Resource" id=8] -[ext_resource path="res://images/goo/BigGoo1.png" type="Texture" id=9] -[ext_resource path="res://images/goo/BigGoo1_Outlines.png" type="Texture" id=10] [ext_resource path="res://images/goo/BigGoo2.tres" type="Resource" id=11] [ext_resource path="res://images/goo/goo5.tres" type="Resource" id=12] [ext_resource path="res://images/goo/goo8.tres" type="Resource" id=13] @@ -19,50 +16,169 @@ [ext_resource path="res://images/goo/goo6.tres" type="Resource" id=17] [ext_resource path="res://images/goo/goo1.tres" type="Resource" id=18] [ext_resource path="res://images/goo/goo3.tres" type="Resource" id=19] +[ext_resource path="res://images/oil_tanker/OilTankerLeak_Background.png" type="Texture" id=20] +[ext_resource path="res://images/oil_tanker/OilTankerLeak_Foreground.png" type="Texture" id=21] +[ext_resource path="res://images/oil_tanker/OilTankerLeak_Midground.png" type="Texture" id=22] +[ext_resource path="res://images/oil_tanker/OilTankerLeak_Midground_GooMask.png" type="Texture" id=23] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 10, 27.9493 ) +extents = Vector2( 10, 34.563 ) [sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 10, 27.9493 ) +extents = Vector2( 10, 34.563 ) [sub_resource type="RectangleShape2D" id=3] -extents = Vector2( 20.5315, 7.16187 ) +extents = Vector2( 276.861, 9.9101 ) [sub_resource type="RectangleShape2D" id=4] +extents = Vector2( 276.861, 9.9101 ) + +[sub_resource type="RectangleShape2D" id=15] +extents = Vector2( 175.74, 9.07445 ) + +[sub_resource type="CircleShape2D" id=16] +radius = 31.4057 + +[sub_resource type="RectangleShape2D" id=7] +extents = Vector2( 10, 27.9493 ) + +[sub_resource type="RectangleShape2D" id=8] +extents = Vector2( 10, 27.9493 ) + +[sub_resource type="RectangleShape2D" id=9] +extents = Vector2( 20.5315, 7.16187 ) + +[sub_resource type="RectangleShape2D" id=10] extents = Vector2( 85.2849, 7.16187 ) -[sub_resource type="SegmentShape2D" id=5] -b = Vector2( -77.3156, 35.1986 ) +[sub_resource type="SegmentShape2D" id=11] +b = Vector2( 70.2283, 33.9024 ) -[sub_resource type="SegmentShape2D" id=6] -b = Vector2( -129.208, -5.53812 ) +[sub_resource type="SegmentShape2D" id=12] +b = Vector2( 122.205, -7.65517 ) -[sub_resource type="SegmentShape2D" id=7] -b = Vector2( -87.4343, 42.6051 ) +[sub_resource type="SegmentShape2D" id=13] +b = Vector2( 107.673, 44.0238 ) -[sub_resource type="ShaderMaterial" id=10] -shader = ExtResource( 7 ) -shader_param/particles_anim_h_frames = 10 -shader_param/particles_anim_v_frames = 11 -shader_param/particles_anim_loop = true -shader_param/frame = null +[sub_resource type="RectangleShape2D" id=14] +extents = Vector2( 4.85875, 16.0913 ) [node name="Node2D" type="Node2D"] script = ExtResource( 1 ) +[node name="InsideOilTanker2" type="Sprite" parent="."] +texture = ExtResource( 20 ) +centered = false + +[node name="Camera2D" type="Camera2D" parent="InsideOilTanker2"] +anchor_mode = 0 + +[node name="Player" parent="InsideOilTanker2" instance=ExtResource( 4 )] +position = Vector2( 1.05231, 91.7763 ) +collision_layer = 4 +collision_mask = 4 + +[node name="Parallax" type="Node2D" parent="InsideOilTanker2"] + +[node name="Prop2" type="Sprite" parent="InsideOilTanker2/Parallax"] +texture = ExtResource( 22 ) +centered = false + +[node name="GooEmitter2" type="Node2D" parent="InsideOilTanker2/Parallax/Prop2"] +position = Vector2( 355.334, 55.192 ) +script = ExtResource( 6 ) +goo_particles = [ ExtResource( 8 ), ExtResource( 11 ), ExtResource( 18 ), ExtResource( 15 ), ExtResource( 19 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 16 ), ExtResource( 13 ) ] +direction = Vector2( -1, 0 ) +spawn_radius = 16 +despawn_radius = 600 + +[node name="Mask" type="Sprite" parent="InsideOilTanker2/Parallax/Prop2"] +texture = ExtResource( 23 ) +centered = false + +[node name="Prop1" type="Sprite" parent="InsideOilTanker2/Parallax"] +texture = ExtResource( 21 ) +centered = false + +[node name="walls" type="Node2D" parent="InsideOilTanker2"] + +[node name="Wall" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall"] +position = Vector2( -23.7448, 88.1799 ) +shape = SubResource( 1 ) + +[node name="Wall4" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 +__meta__ = { +"_editor_description_": "" +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall4"] +position = Vector2( 520.202, 91.1098 ) +shape = SubResource( 2 ) + +[node name="Wall2" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 +__meta__ = { +"_editor_description_": "" +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall2"] +position = Vector2( 249.14, 122.296 ) +shape = SubResource( 3 ) + +[node name="Wall3" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 +__meta__ = { +"_editor_description_": "" +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall3"] +position = Vector2( 244.468, 58.9552 ) +shape = SubResource( 4 ) + +[node name="Wall5" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 +__meta__ = { +"_editor_description_": "" +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall5"] +position = Vector2( 342.076, 75.064 ) +rotation = 0.0123712 +shape = SubResource( 15 ) + +[node name="Wall6" type="StaticBody2D" parent="InsideOilTanker2/walls"] +collision_layer = 2147483652 +collision_mask = 4 +__meta__ = { +"_editor_description_": "" +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall6"] +position = Vector2( 168.01, 51.7275 ) +rotation = 0.0123712 +shape = SubResource( 16 ) + [node name="InsideOilTanker" type="Sprite" parent="."] texture = ExtResource( 3 ) centered = false [node name="Player" parent="InsideOilTanker" instance=ExtResource( 4 )] -position = Vector2( 192, 64.4552 ) +position = Vector2( -1.71286, 64.9552 ) [node name="GooEmitter" type="Node2D" parent="InsideOilTanker"] -position = Vector2( -43.5548, 47.7155 ) +position = Vector2( 208.261, 55.1923 ) script = ExtResource( 6 ) goo_particles = [ ExtResource( 8 ), ExtResource( 11 ), ExtResource( 18 ), ExtResource( 15 ), ExtResource( 19 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 16 ), ExtResource( 13 ) ] -direction = Vector2( 1, 0 ) +direction = Vector2( -1, 0 ) spawn_rate = 2 [node name="Foreground" type="Sprite" parent="InsideOilTanker"] @@ -74,52 +190,51 @@ centered = false [node name="Wall" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall"] -position = Vector2( 212.356, 79.3663 ) -shape = SubResource( 1 ) +position = Vector2( 208.261, 91.1098 ) +shape = SubResource( 7 ) [node name="Wall2" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall2"] -position = Vector2( -22.7999, 91.1098 ) -shape = SubResource( 2 ) +position = Vector2( -23.7448, 81.6604 ) +shape = SubResource( 8 ) [node name="Wall5" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall5"] -position = Vector2( 195.122, 51.255 ) -shape = SubResource( 3 ) +position = Vector2( 6.44882, 51.7275 ) +shape = SubResource( 9 ) [node name="Wall6" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall6"] -position = Vector2( 61.9836, 120.029 ) -shape = SubResource( 4 ) +position = Vector2( 127.185, 119.399 ) +shape = SubResource( 10 ) [node name="Wall7" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall7"] -position = Vector2( 188.054, 51.255 ) -shape = SubResource( 5 ) +position = Vector2( 10.2871, 55.1923 ) +shape = SubResource( 11 ) [node name="Wall9" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall9"] -position = Vector2( 111.845, 85.2935 ) -shape = SubResource( 6 ) +position = Vector2( 79.5423, 88.1799 ) +shape = SubResource( 12 ) [node name="Wall10" type="StaticBody2D" parent="InsideOilTanker/walls"] [node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall10"] -position = Vector2( 204.978, 72.7017 ) -shape = SubResource( 7 ) +position = Vector2( -15.3507, 75.064 ) +shape = SubResource( 13 ) + +[node name="NextTrigger" type="Area2D" parent="InsideOilTanker"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/NextTrigger"] +position = Vector2( 197.689, 97.7763 ) +shape = SubResource( 14 ) [node name="OilTanker" type="AnimatedSprite" parent="."] frames = ExtResource( 2 ) centered = false - -[node name="GooExample" type="Sprite" parent="."] -visible = false -material = SubResource( 10 ) -texture = ExtResource( 9 ) -normal_map = ExtResource( 10 ) -centered = false diff --git a/scripts/game1/Game1Script.gd b/scripts/game1/Game1Script.gd index 38be5d2..79b5792 100644 --- a/scripts/game1/Game1Script.gd +++ b/scripts/game1/Game1Script.gd @@ -32,6 +32,7 @@ func _ready(): $Opening1.play('default') yield($Opening1, 'animation_finished') $Opening1.queue_free() + $Opening2/Player.sleep = false func start_game(): # Hide opening diff --git a/scripts/game1/PlayerController.gd b/scripts/game1/PlayerController.gd index d2b3fe9..47fdb42 100644 --- a/scripts/game1/PlayerController.gd +++ b/scripts/game1/PlayerController.gd @@ -3,29 +3,43 @@ extends RigidBody2D var dir = Vector2(0, 0) +var sleep = true + +var input_right = false +var input_left = false +var input_up = false +var input_down = false + func _input(event): - var x = 0 - var y = 0 + if sleep: return + if event.is_action_pressed('left'): - x -= 1 + input_left = true if event.is_action_released('left'): - x += 1 + input_left = false if event.is_action_pressed('right'): - x += 1 + input_right = true if event.is_action_released('right'): - x -= 1 + input_right = false if event.is_action_pressed('up'): - y -= 1 + input_up = true if event.is_action_released('up'): - y += 1 + input_up = false if event.is_action_pressed('down'): - y += 1 + input_down = true if event.is_action_released('down'): - y -= 1 + input_down = false - dir.x += x - dir.y += y + var x = 0 + var y = 0 + + if input_left: x -= 1 + if input_right: x += 1 + if input_up: y -= 1 + if input_down: y += 1 + + dir = Vector2(x, y) func _process(delta): if linear_velocity.length_squared() < 1: diff --git a/scripts/oil_tanker.gd b/scripts/oil_tanker.gd index 3ac5cba..02b73b4 100644 --- a/scripts/oil_tanker.gd +++ b/scripts/oil_tanker.gd @@ -1,26 +1,48 @@ extends Node2D -onready var oil_tanker = $OilTanker +# 2 +onready var oil_tanker_inside_2 = $InsideOilTanker2 +onready var camera = $InsideOilTanker2/Camera2D +onready var player = $InsideOilTanker2/Player func _ready(): - oil_tanker.connect('animation_finished', self, 'end_oil_tanker') + $OilTanker.connect('animation_finished', self, 'end_oil_tanker') + $InsideOilTanker/NextTrigger.connect("body_entered", self, 'end_inside_oil_tanker') + +# $OilTanker.frame = 12 +# end_oil_tanker() +# end_inside_oil_tanker($InsideOilTanker/Player) func end_oil_tanker(): - print('oil_tanker.frame') - if oil_tanker.frame > 1: - oil_tanker.hide() + print('end_oil_tanker') + if $OilTanker.frame > 1: + $OilTanker.queue_free() + $InsideOilTanker/Player.sleep = false + +func end_inside_oil_tanker(body : Node): + print('end_inside_oil_tanker') + if body.name == "Player": + $InsideOilTanker.queue_free() + $InsideOilTanker2/Player.sleep = false + $InsideOilTanker2/Camera2D.current = true func _input(event): - if oil_tanker.visible: + if $OilTanker != null: if event.is_action_pressed('right'): - if !oil_tanker.is_playing(): - oil_tanker.play('default') + if !$OilTanker.is_playing(): + $OilTanker.play('default') if event.is_action_released('right'): - oil_tanker.stop() + $OilTanker.stop() if event.is_action_pressed('left'): - if !oil_tanker.is_playing() && oil_tanker.frame > 0: - oil_tanker.play('default', true) + if !$OilTanker.is_playing() && $OilTanker.frame > 0: + $OilTanker.play('default', true) if event.is_action_released('left'): - oil_tanker.stop() + $OilTanker.stop() +func _process(delta): + if !$InsideOilTanker2/Player.sleep: + var screen_width = ProjectSettings.get_setting("display/window/size/width") + camera.position.x = floor(clamp(player.position.x - screen_width / 2.0, 0, oil_tanker_inside_2.texture.get_width() - screen_width)) + $InsideOilTanker2/Parallax/Prop2.position.x = floor((260 - camera.position.x) * 0.5) + $InsideOilTanker2/Parallax/Prop1.position.x = floor((300 - camera.position.x) * 0.75)