From 497f25137669a3bdd1d51e6f2a83c1f02d06c484 Mon Sep 17 00:00:00 2001 From: Joseph Manley <j@cloudsumu.com> Date: Sat, 16 May 2020 11:22:41 -0400 Subject: [PATCH] Bugfixes and Beauty --- ...g.png-ea141b5c86a53d3760c4270db6a90b57.md5 | 3 ++ ....png-ea141b5c86a53d3760c4270db6a90b57.stex | Bin 0 -> 2326 bytes ...l.png-68d707a54b36ade140524fb8e7a76ff5.md5 | 3 ++ ....png-68d707a54b36ade140524fb8e7a76ff5.stex | Bin 0 -> 169 bytes ...m.png-fa6c1000359a082b3ed63552d71e9023.md5 | 4 +- ....png-fa6c1000359a082b3ed63552d71e9023.stex | Bin 161 -> 199 bytes ...w.png-bc8282fbd0878885d99d7aa183c1441f.md5 | 3 ++ ....png-bc8282fbd0878885d99d7aa183c1441f.stex | Bin 0 -> 164 bytes client/Assets/Art/bkg.aseprite | Bin 0 -> 2934 bytes client/Assets/Art/bkg.png | Bin 0 -> 2059 bytes client/Assets/Art/bkg.png.import | 34 ++++++++++++ client/Assets/Art/metal_wall.aseprite | Bin 0 -> 591 bytes client/Assets/Art/metal_wall.png | Bin 0 -> 137 bytes client/Assets/Art/metal_wall.png.import | 34 ++++++++++++ client/Assets/Art/platform.aseprite | Bin 573 -> 674 bytes client/Assets/Art/platform.png | Bin 112 -> 167 bytes client/Assets/Art/window.aseprite | Bin 0 -> 587 bytes client/Assets/Art/window.png | Bin 0 -> 132 bytes client/Assets/Art/window.png.import | 34 ++++++++++++ client/Assets/Stories/english_story.tres | 42 +++++++++++++++ client/Nodes/NPCs/CEO.tscn | 2 +- client/Nodes/Tiles/tileset_science_lab.tres | 50 +++++++++++++++++- client/Scenes/World.scn | Bin 17794 -> 6359 bytes client/Scripts/Component/StorySpeaker.gd | 3 ++ client/Scripts/Entities/NPCs/CEO.gd | 13 ++++- .../Scripts/Entities/NPCs/IntroScientist.gd | 2 +- client/Scripts/Entities/Player.gd | 2 +- client/Scripts/Systems/GameGui.gd | 1 + 28 files changed, 222 insertions(+), 8 deletions(-) create mode 100644 client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.md5 create mode 100644 client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.stex create mode 100644 client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.md5 create mode 100644 client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.stex create mode 100644 client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.md5 create mode 100644 client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.stex create mode 100644 client/Assets/Art/bkg.aseprite create mode 100644 client/Assets/Art/bkg.png create mode 100644 client/Assets/Art/bkg.png.import create mode 100644 client/Assets/Art/metal_wall.aseprite create mode 100644 client/Assets/Art/metal_wall.png create mode 100644 client/Assets/Art/metal_wall.png.import create mode 100644 client/Assets/Art/window.aseprite create mode 100644 client/Assets/Art/window.png create mode 100644 client/Assets/Art/window.png.import diff --git a/client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.md5 b/client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.md5 new file mode 100644 index 0000000..041d15a --- /dev/null +++ b/client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.md5 @@ -0,0 +1,3 @@ +source_md5="424bc2e8a11a2373217678abda0df97e" +dest_md5="917df80dfa039af088b63b9a234e0ced" + diff --git a/client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.stex b/client/.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.stex new file mode 100644 index 0000000000000000000000000000000000000000..68e145a3c4c29ce729ea191423d9da27a51f64ca GIT binary patch literal 2326 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 literal 0 HcmV?d00001 diff --git a/client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.md5 b/client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.md5 new file mode 100644 index 0000000..687121d --- /dev/null +++ b/client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.md5 @@ -0,0 +1,3 @@ +source_md5="46a58c40f5b6b62c3a59601b0fb55288" +dest_md5="6c83115f14a9c0acf967eb87bf07fe4b" + diff --git a/client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.stex b/client/.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.stex new file mode 100644 index 0000000000000000000000000000000000000000..a82c72ea9ef8aad90b2e82dbe93cfd6c9da6292a GIT binary patch literal 169 zcmZ>F2@VlpU|;}Y2oPXr1TuPoIKa<cp%X~(a!GLkxxAhpE<r#Vtek@l$ddp3KM_bV z76-XIF|0c$^AgB$_H=O!vFJ_C$;tV1-hnY8F(Dyg!h{J5w;9wV9v|%%cgc1N<2G*) z30GL1dT4Q<hC$YW6^t5eJP|=@7cX5>ic&UXU^sG=Kj-dTk3B%+7(8A5T-G@yGywpc Ccr670 literal 0 HcmV?d00001 diff --git a/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 index 5d656fb..7bce99e 100644 --- a/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 +++ b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 @@ -1,3 +1,3 @@ -source_md5="02860f21d0b06f5acf9d6f81718d443a" -dest_md5="29b11c828e308d1479c7681a6d77bbda" +source_md5="9161b62a08022547a51cb144c79b83c2" +dest_md5="f5e5412b84c441a6c7bf7f80491ac049" diff --git a/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.stex b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.stex index 1a19a983b761e01fcca366d1c5fdb08c1cc9b662..e3e63848206a2f58f9b2028eddd6d39d5c561b26 100644 GIT binary patch delta 130 zcmV-|0Db?V0mlK57y+x188~)fNkl<ZIE`a$Y;63`KmlN3U|?X7kdPqT045mY#fuk2 zYeH5FH-HpZAgg7<qmC#r@CL9L85vP#z`1kh7(zlq$kKe|$Pq|7ICA6&*)ACPK%|}l k1D2Fow6wH{)`$%N04GKm2GLJ&rvLx|07*qoM6N<$g8rZ~I{*Lx delta 92 zcmV-i0HgoM0igkq7y*Tm88}coNkl<ZIE`aq81jH|^XAPI8NfuT3kKc*76t}}|CAcQ ysHCJsmLd1<-D70Ddi5$L4j2T1NU;IK0000#=n1b<w}#yS0000<MNUMnLSTZE`y;{t diff --git a/client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.md5 b/client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.md5 new file mode 100644 index 0000000..164b681 --- /dev/null +++ b/client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.md5 @@ -0,0 +1,3 @@ +source_md5="c4e868a40fcea38649d43a73971cf969" +dest_md5="d21853d8744e43202ee3050f2c706feb" + diff --git a/client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.stex b/client/.import/window.png-bc8282fbd0878885d99d7aa183c1441f.stex new file mode 100644 index 0000000000000000000000000000000000000000..84eacb16e88cb60f46932b1e06b4c7bac6ab8787 GIT binary patch literal 164 zcmZ>F2@VlpU|;}Y2oPXr1Ts2+IKa<cp%X~(a!GLkxxAhpE<r#Vtek@l$ddp3KM_bV z76-XIF|0c$^AgCh^K@|xvFJ_y^Z$RnF0*Qb5c9wP|Km@)Onl43!?T#JN6Mgp4J2oM slT9HzEddA=uQIr~x%rFOExjqp@U=&DxAzn2T%bt|p00i_>zopr07xk<F8}}l literal 0 HcmV?d00001 diff --git a/client/Assets/Art/bkg.aseprite b/client/Assets/Art/bkg.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..8f5124d136ada3074f746ba8bf2c9ffb2a551d76 GIT binary patch literal 2934 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 literal 0 HcmV?d00001 diff --git a/client/Assets/Art/bkg.png b/client/Assets/Art/bkg.png new file mode 100644 index 0000000000000000000000000000000000000000..f490a50d3665fc5be2d9ebde59762cf33bcab027 GIT binary patch literal 2059 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
UlsF>clnyS%F=!&Q8{9q0Xx~ zq@n;_&kDM25eNhVfj}S-2m}IwKp+qZ1OkDu2cWz~M)&rZqHMiMv_(e8mK2%YEVi?5 zy&3o?o4WP}4QlI6qAfBywxr1H0_L{fXjK5)R9He()(QbLTW>f5bZ<!+Etj#ewIy}1 zC|hp=3edGBWqf=bleHS>sJMP#gsnFL0(5Rk$+Dp$udO$>SRkESQbYv+@V4I+aqA6% zKp+qZ1OkCTAP@)y0)apv?0FbF2q6r4uNoKfJli~1jkOUlsC@*g`O5NESv9tcc(g^H ztHw5KAdiC$!VYX;E8^PXqPKP@OQUnu*v|WC3m5zL?F%e;vK7HDcMWpYnEQO*#L*UE zi=3*Jl6BQM@bPp}j<yJc?p0$>0j7?&n3$O0R;b<o=do&>`Unl3`v|Vg&f?nQV!)3) p4s75QVCrZKnXOi<mCJz*{{!{3yfc4k$|V2*002ovPDHLkV1iNK$ru0t literal 0 HcmV?d00001 diff --git a/client/Assets/Art/bkg.png.import b/client/Assets/Art/bkg.png.import new file mode 100644 index 0000000..8a4cdac --- /dev/null +++ b/client/Assets/Art/bkg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Art/bkg.png" +dest_files=[ "res://.import/bkg.png-ea141b5c86a53d3760c4270db6a90b57.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/client/Assets/Art/metal_wall.aseprite b/client/Assets/Art/metal_wall.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..ba1aabc02e900df5e6336a67c0a2ce3ab9161245 GIT binary patch literal 591 zcmb`F&nts*9LK-Ia&=hZv@dCKvMtfFS}Bq#v%@3@)>!SaCMG{pij>-A4oXZYapJ5T zTy}6+lEczCjN-t7D3=+J*Yk|FKfved`|9(2zV&^-zE4kInGkme22sT$g+T~0$|@E! zZK&@Tr~lVoa(eE~sHYk^wwhHb^~jQt8~R!)e<$XW9lceBsFy9Uv(X8I4jYX7+F^Fm z0yBF-_>$a$pYN@3^U(v9Gb?Ock3e^*8G79f(C&0VmunhYN0#AG<Q@hRDjdFefT`O& zR4E}6$0u-QaTSIX1rGYWaHb;$kL-4s83@4Zg;N;c=z*~btEzB;3hlc~8ZN;N(8nEd ztWm}nSxnKy5kc%w!wV^l(9v8}6$=!|C!Azr$s~|8qRd*7EQf!Ef~XX|{`s*fY3t&} zC<|LEKSiOm-(qfiJRHtvyX$rwQA?)gaMu)FOM6q_{a^dJrYo1{Y4+neZSsqy^W^If DpG=>a literal 0 HcmV?d00001 diff --git a/client/Assets/Art/metal_wall.png b/client/Assets/Art/metal_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..e69295e0e7d66ccc7bfcd11dd05318741d1840ca GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|oIPC}Lo9le zb8>S2oOfVMNK8mbm@r|2!fggMiN{B~#a*(U!nn;FM8XwTryg3|r(uwFU<IQF8&5<~ i+Qmzkl%kZ)7#NNm<<Gf0*JBURI0jEwKbLh*2~7afJt_$R literal 0 HcmV?d00001 diff --git a/client/Assets/Art/metal_wall.png.import b/client/Assets/Art/metal_wall.png.import new file mode 100644 index 0000000..df97324 --- /dev/null +++ b/client/Assets/Art/metal_wall.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Art/metal_wall.png" +dest_files=[ "res://.import/metal_wall.png-68d707a54b36ade140524fb8e7a76ff5.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/client/Assets/Art/platform.aseprite b/client/Assets/Art/platform.aseprite index ac44e244d902cc4b7a907efd42a6229ff6c73a3d..23c272d0458df00a7b7b41b5a40ebcf920302136 100644 GIT binary patch delta 115 zcmdnXvWS&&(L~02UL__5hF>4q8B!P+7}z)VRx>ghO@75F@9PHSvnl`yAoved0|5dI z0t^*%vU76&-1ktNXIZRvQ)1bCk>UwggHHbo{JZ#<=0*E}m*rnyT@^`WXgq%Sy$Mho Ls{-R>0VZ7lFT5mq delta 40 tcmZ3)x|fB~b|Pav?_Nd*hF>398B!P+7+5#<Rx@%Knt+%J43kTlbOG8+310vJ diff --git a/client/Assets/Art/platform.png b/client/Assets/Art/platform.png index 1bddf547002e56afa32f9831feda79756c9ac303..b03ae6c24b7054320ea32deb853116ae6e149aa6 100644 GIT binary patch delta 124 zcmV-?0E7Q<rvZ>Lc40|GK~y-6V{B|}{LerEU}0cjV33fIAlm>Y7~{o@7es49Rtq<P z6jvatWx}J5C@}B_uoxK`QD(robLSXBLPE&WeB{UxNIE!j<Ota=82CV>o&f`vlv%X2 ew20P-4FCWqMi>UsPjIII0000<MNUMnLSTX!?=W-# delta 69 zcmZ3^STMoRUdz+PF~p)bIYEN;FoQwfy*)qeUD*tPAZBmXR2}CnTenJTZmbdEkz!!@ XlgloB&G>R70}yz+`njxgN@xNAL=G2# diff --git a/client/Assets/Art/window.aseprite b/client/Assets/Art/window.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..6b0195aba167ac8061f4a07cfc7fd5c5780e99eb GIT binary patch literal 587 zcmb`Fy-Pw-7>AFU2u)2!lZS|?DZNA?3X;&04IyDfLxyE|2cw9{f`kYHmkSYu*-%5^ zP-8?5Ezu+mO<@jwP-8)j8l9edE%XoQy_|>lz6Z|lIhPx565{d5CR%x<un8e%SoLCN z4z2zA^#8gdr&m54R;q(zT`Z@xA{#>P>D#6JowyrztX2upA^YG^cK{}QUT8%9@L{0~ zmJSl|{b~<ZKl@?sbrkBC9yqX*g5hK@jD$O(7VyDfa0z;18*no91mk%Hr*2+gvHS%U zB}D$@3~sJ(!KALkiD(2ahqCZk(_m>l4)4}3ps_m)v-2LMbAe{_yGt4_!41&I9dWEt z#ur&k(Zmr!>`=oCDU8rDU6jHC1@Z|enOHIjB#kJynI!G-uTT(9F*2Q=U6kGsFAiDT vQv4LPGJlJe{i;%#w@i!Io{NpC!uMgpU6}KqR|Z#mZjFTNI^8Cox67wLId`1% literal 0 HcmV?d00001 diff --git a/client/Assets/Art/window.png b/client/Assets/Art/window.png new file mode 100644 index 0000000000000000000000000000000000000000..359ccfcd06219ce085ebbb131c446b1e01b1f0b4 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>^xl@Lo9le z|NQ@7ugk33AjJId|Nr>YE)(DK@bD~V>ya`jU<1in-(*wBPD=m+#j6Z%Zf^b}c1v$c ZGJNe3-R=EEIu~dXgQu&X%Q~loCIFC@DmVZD literal 0 HcmV?d00001 diff --git a/client/Assets/Art/window.png.import b/client/Assets/Art/window.png.import new file mode 100644 index 0000000..da3211c --- /dev/null +++ b/client/Assets/Art/window.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/window.png-bc8282fbd0878885d99d7aa183c1441f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Art/window.png" +dest_files=[ "res://.import/window.png-bc8282fbd0878885d99d7aa183c1441f.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=false +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/client/Assets/Stories/english_story.tres b/client/Assets/Stories/english_story.tres index 36e61e3..3152d2e 100644 --- a/client/Assets/Stories/english_story.tres +++ b/client/Assets/Stories/english_story.tres @@ -6,6 +6,7 @@ script = ExtResource( 1 ) TYPE = "EXP_Story_editor" names = { +"into_speak_ceo": 5, "intro_meet_ceo": 4, "intro_science": 1, "intro_science_followup": 3, @@ -629,6 +630,47 @@ not be too far out of reach.", "type": "line" } } +}, +5: { +"available_nid": [ ], +"groups": [ "Introduction" ], +"human_readable_description": "Non-event CEO interactions", +"name": "into_speak_ceo", +"nodes": { +1: { +"graph_offset": Vector2( 0, -360 ), +"links": { +0: 2, +1: 3 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 2, +"text": "Any updates? +<choice>Nothing yet</choice> +<choice>Where is the shipping facility?</choice>", +"type": "line" +}, +2: { +"graph_offset": Vector2( 560, -420 ), +"links": { + +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Ravenworks is counting on you.", +"type": "line" +}, +3: { +"graph_offset": Vector2( 560, -220 ), +"links": { + +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "It is on the mid level.", +"type": "line" +} +} } } available_dids = [ ] diff --git a/client/Nodes/NPCs/CEO.tscn b/client/Nodes/NPCs/CEO.tscn index 6c8f273..c7c5c2a 100644 --- a/client/Nodes/NPCs/CEO.tscn +++ b/client/Nodes/NPCs/CEO.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://Assets/Art/Characters/business.png" type="Texture" id=3] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 5, 8 ) +extents = Vector2( 16.0863, 8 ) [node name="Scientist" type="Area2D"] script = ExtResource( 1 ) diff --git a/client/Nodes/Tiles/tileset_science_lab.tres b/client/Nodes/Tiles/tileset_science_lab.tres index c535502..ee83500 100644 --- a/client/Nodes/Tiles/tileset_science_lab.tres +++ b/client/Nodes/Tiles/tileset_science_lab.tres @@ -1,7 +1,9 @@ -[gd_resource type="TileSet" load_steps=98 format=2] +[gd_resource type="TileSet" load_steps=100 format=2] [ext_resource path="res://Nodes/Tiles/tileset_science_lab.png" type="Texture" id=1] [ext_resource path="res://Assets/Art/platform.png" type="Texture" id=2] +[ext_resource path="res://Assets/Art/metal_wall.png" type="Texture" id=3] +[ext_resource path="res://Assets/Art/window.png" type="Texture" id=4] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) @@ -625,3 +627,49 @@ points = PoolVector2Array( 16, 9, 0, 9, 0, 7, 16, 7 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 48/z_index = 0 +49/name = "metal_wall.png 49" +49/texture = ExtResource( 3 ) +49/tex_offset = Vector2( 0, 0 ) +49/modulate = Color( 1, 1, 1, 1 ) +49/region = Rect2( 0, 0, 16, 16 ) +49/tile_mode = 1 +49/autotile/bitmask_mode = 0 +49/autotile/bitmask_flags = [ ] +49/autotile/icon_coordinate = Vector2( 0, 0 ) +49/autotile/tile_size = Vector2( 16, 16 ) +49/autotile/spacing = 0 +49/autotile/occluder_map = [ ] +49/autotile/navpoly_map = [ ] +49/autotile/priority_map = [ ] +49/autotile/z_index_map = [ ] +49/occluder_offset = Vector2( 0, 0 ) +49/navigation_offset = Vector2( 0, 0 ) +49/shape_offset = Vector2( 0, 0 ) +49/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +49/shape_one_way = false +49/shape_one_way_margin = 0.0 +49/shapes = [ ] +49/z_index = 0 +50/name = "window.png 50" +50/texture = ExtResource( 4 ) +50/tex_offset = Vector2( 0, 0 ) +50/modulate = Color( 1, 1, 1, 1 ) +50/region = Rect2( 0, 0, 16, 16 ) +50/tile_mode = 1 +50/autotile/bitmask_mode = 0 +50/autotile/bitmask_flags = [ ] +50/autotile/icon_coordinate = Vector2( 0, 0 ) +50/autotile/tile_size = Vector2( 16, 16 ) +50/autotile/spacing = 0 +50/autotile/occluder_map = [ ] +50/autotile/navpoly_map = [ ] +50/autotile/priority_map = [ ] +50/autotile/z_index_map = [ ] +50/occluder_offset = Vector2( 0, 0 ) +50/navigation_offset = Vector2( 0, 0 ) +50/shape_offset = Vector2( 0, 0 ) +50/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +50/shape_one_way = false +50/shape_one_way_margin = 0.0 +50/shapes = [ ] +50/z_index = 0 diff --git a/client/Scenes/World.scn b/client/Scenes/World.scn index 2c8ec3322ea5ff58ad5bfbcd9e236235f513b40c..e8d90f7bf15923eba00565ee9d2d5d7e8fed7895 100644 GIT binary patch literal 6359 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 KTo?P7#(x1Dlgf7h literal 17794 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 aW6piJw^yf+*!&0=<?5?30%P#MulyfJ6EAH5 diff --git a/client/Scripts/Component/StorySpeaker.gd b/client/Scripts/Component/StorySpeaker.gd index 635d727..5cf3516 100644 --- a/client/Scripts/Component/StorySpeaker.gd +++ b/client/Scripts/Component/StorySpeaker.gd @@ -1,5 +1,7 @@ extends "res://Scripts/Component/Speaker.gd" +signal dialog_exited + const Story_Reader_Class = preload("res://addons/EXP-System-Dialog/Reference_StoryReader/EXP_StoryReader.gd") const story_file = preload("res://Assets/Stories/english_story.tres") var story_reader = Story_Reader_Class.new() @@ -69,6 +71,7 @@ func move_dialog_forward(decision = 0): nid = story_reader.get_nid_from_slot(did, nid, decision) process_message(story_reader.get_text(did, nid)) else: + emit_signal("dialog_exited") gui.finish_dialog() func _process(delta): diff --git a/client/Scripts/Entities/NPCs/CEO.gd b/client/Scripts/Entities/NPCs/CEO.gd index 2b83acb..fde1954 100644 --- a/client/Scripts/Entities/NPCs/CEO.gd +++ b/client/Scripts/Entities/NPCs/CEO.gd @@ -1,9 +1,18 @@ extends "res://Scripts/Component/Interactable.gd" +var state : int = 0 + func _ready(): connect("interacted", self, "_on_interact") $Speaker.speaker_name = "CEO Grant Blevins" - #$Speaker.start_dialog("intro_science") + $Speaker.connect("dialog_exited", self, "_on_dialog_exit") func _on_interact(): - $Speaker.start_dialog("intro_meet_ceo") + if state == 0: + $Speaker.start_dialog("intro_meet_ceo") + else: + $Speaker.start_dialog("into_speak_ceo") + +func _on_dialog_exit(): + if state == 0: + state = 1 diff --git a/client/Scripts/Entities/NPCs/IntroScientist.gd b/client/Scripts/Entities/NPCs/IntroScientist.gd index 1544d1d..e445a9a 100644 --- a/client/Scripts/Entities/NPCs/IntroScientist.gd +++ b/client/Scripts/Entities/NPCs/IntroScientist.gd @@ -3,7 +3,7 @@ extends "res://Scripts/Component/Interactable.gd" func _ready(): connect("interacted", self, "_on_interact") $Speaker.speaker_name = "Dr.Thadd" - $Speaker.start_dialog("intro_science") + #$Speaker.start_dialog("intro_science") func _on_interact(): $Speaker.start_dialog("intro_science_followup") diff --git a/client/Scripts/Entities/Player.gd b/client/Scripts/Entities/Player.gd index fa5138d..5554c04 100644 --- a/client/Scripts/Entities/Player.gd +++ b/client/Scripts/Entities/Player.gd @@ -24,7 +24,7 @@ func remove_interactable(interactable): interactables.remove(loc) func _process(delta): - if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0: + if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0 and not gui.is_in_dialog(): interactables[0].interact() func _physics_process(delta): diff --git a/client/Scripts/Systems/GameGui.gd b/client/Scripts/Systems/GameGui.gd index bf759d6..a131c9d 100644 --- a/client/Scripts/Systems/GameGui.gd +++ b/client/Scripts/Systems/GameGui.gd @@ -21,6 +21,7 @@ func clear_choices(): $Dialog/Choices.get_child(i).queue_free() func add_choice(speaker : Node, choice_id : int, choice_text : String): + $Dialog/Choices.hide() var button = Button.new() button.text = choice_text button.connect("button_down", speaker, "_on_choice", [choice_id])