From 6da977a4da2f2b646bdbb05105dce9a942a07a08 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Thu, 20 Aug 2020 16:33:27 +0200 Subject: [PATCH] progress --- dialogues/game1.json | 4 +- dialogues/intro_1.json | 2 +- dialogues/oilTanker1.json | 6 +-- dialogues/oilTanker2.json | 2 +- dialogues/oilTanker3.json | 2 +- dialogues/oilTanker4.json | 4 +- dialogues/oilTanker5.json | 4 +- images/game1/ParralaxPoutre3.png | Bin 0 -> 1788 bytes images/game1/ParralaxPoutre3.png.import | 34 +++++++++++++ scenes/campfire2.tscn | 1 + scenes/oil_tanker.tscn | 64 ++++++++++++------------ scripts/DialogueBox.gd | 5 +- 12 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 images/game1/ParralaxPoutre3.png create mode 100644 images/game1/ParralaxPoutre3.png.import diff --git a/dialogues/game1.json b/dialogues/game1.json index e926d74..ddfe01d 100644 --- a/dialogues/game1.json +++ b/dialogues/game1.json @@ -1,4 +1,4 @@ [ - {"name": "Herbert", "text": "There was some sort of weird goo floating around.", "upside_down": true, "timer": 6, "auto": true}, - {"name": "Herbert", "text": "So I decided to look for the source.", "upside_down": true, "timer": 6, "auto": true} + {"name": "", "text": "There was some sort of weird goo floating around.", "upside_down": true, "timer": 6, "auto": true}, + {"name": "", "text": "So I decided to look for the source.", "upside_down": true, "timer": 6, "auto": true} ] diff --git a/dialogues/intro_1.json b/dialogues/intro_1.json index 40bdba1..0310dcd 100644 --- a/dialogues/intro_1.json +++ b/dialogues/intro_1.json @@ -1,5 +1,5 @@ [ - {"timer": 2, "auto": true}, + {"animation": "fadein", "timer": 2, "auto": true}, {"name": "Ely", "text": "What a shame..."}, {"name": "Ely", "text": "I don't like being alone."}, diff --git a/dialogues/oilTanker1.json b/dialogues/oilTanker1.json index 4a35156..f21d270 100644 --- a/dialogues/oilTanker1.json +++ b/dialogues/oilTanker1.json @@ -1,6 +1,6 @@ [ {"animation": "fadein", "timer": 2, "auto": true}, - {"name": "Herbert", "text": "Finally I found the source.", "timer": 4, "auto": true, "upside_down": true}, - {"name": "Herbert", "text": "It was a recently sunk oil tanker.", "timer": 4, "auto": true, "upside_down": true}, - {"name": "Herbert", "text": "I had to investigate further.", "timer": 4, "auto": true, "upside_down": true} + {"name": "", "text": "Finally I found the source.", "timer": 4, "auto": true, "upside_down": true}, + {"name": "", "text": "It was a recently sunk oil tanker.", "timer": 4, "auto": true, "upside_down": true}, + {"name": "", "text": "I had to investigate further.", "timer": 4, "auto": true, "upside_down": true} ] diff --git a/dialogues/oilTanker2.json b/dialogues/oilTanker2.json index 0d66e95..3cf87b5 100644 --- a/dialogues/oilTanker2.json +++ b/dialogues/oilTanker2.json @@ -1,3 +1,3 @@ [ - {"name": "Herbert", "text": "The closer I got, the more oil there was.", "timer": 6, "auto": true, "upside_down": true} + {"name": "", "text": "The closer I got, the more oil there was.", "timer": 6, "auto": true, "upside_down": true} ] diff --git a/dialogues/oilTanker3.json b/dialogues/oilTanker3.json index ae4c6fe..b39e757 100644 --- a/dialogues/oilTanker3.json +++ b/dialogues/oilTanker3.json @@ -1,3 +1,3 @@ [ - {"name": "Herbert", "text": "The inside was full of oil, I was really close.", "upside_down": true, "timer": 6, "auto": true} + {"name": "", "text": "The inside was full of oil, I was really close.", "upside_down": true, "timer": 6, "auto": true} ] diff --git a/dialogues/oilTanker4.json b/dialogues/oilTanker4.json index 6993feb..552a212 100644 --- a/dialogues/oilTanker4.json +++ b/dialogues/oilTanker4.json @@ -1,4 +1,4 @@ [ - {"name": "Herbert", "text": "And there it was, one of the tank was damaged.", "upside_down": true}, - {"name": "Herbert", "text": "I'm just a crab, I couldn't do anything about it.", "upside_down": true, "animation": "fadeout", "timer": 2} + {"name": "", "text": "And there it was, one of the tank was damaged.", "upside_down": true}, + {"name": "", "text": "I'm just a crab, I couldn't do anything about it.", "upside_down": true, "animation": "fadeout", "timer": 2} ] diff --git a/dialogues/oilTanker5.json b/dialogues/oilTanker5.json index c105650..8c55355 100644 --- a/dialogues/oilTanker5.json +++ b/dialogues/oilTanker5.json @@ -1,5 +1,5 @@ [ - {"name": "Herbert", "text": "Back at my home, there was goo everywhere.", "expression": "black"}, + {"name": "", "text": "Back at my home, there was goo everywhere.", "expression": "black"}, {"animation": "fadein", "timer": 2, "auto": true}, - {"name": "Herbert", "text": "My friends and I were forced to move..."} + {"name": "", "text": "My friends and I were forced to move..."} ] diff --git a/images/game1/ParralaxPoutre3.png b/images/game1/ParralaxPoutre3.png new file mode 100644 index 0000000000000000000000000000000000000000..2822b136aa52f94e1f7f44866b513ada1d103b62 GIT binary patch literal 1788 zcmVPx*wn;=mRCt{2oo%zEC=5np*Zlv#?0(p$FO3N#h%b%jR87rZMfC3EF$n||0RR91 z00000005Yt_38%zxQf^NZ$to(?ST-1$0~d4uu~z)$ec zI?-|r>Aco%S(bDV?*O;PJqi?oT_)gHa0#FYbzG!GI&uxb*|@P?+uem@C0xbU+V#^y8l|9aKIb_o&Zk6`a+D$6O0B=0B2Jxg)l{s zzx8W1Ks_J=IFr^Vl3XI_p(Ywc0B2!(fIKzGk84Amk$E*fw?IDJ!H9L zhWWS5>%g~v**}Rf9Etgny!Yf)Zs~tjYzHUBe4_x)qWO)mMp?5-PoI(g0Y*@*22EbT zlMiV08gZFd;053)Hr1ewWsM?E5wwzH%?sp7b=e0ZfFrPWd)p+U>$;XXKy|jbxYmAv zBHm|38JtOVXSm!L^Mp9n&z0>pa-;SX+_AP8&ZN00z7fI<5kYxZj^qJ7YY+f5_6ne7wTI;cwf1-c@UkZd zDEq159vKp850U2WYJHLqK#Q{kAmx2VZKra82-Nk^Fejq~koszIXAyjD6OZ?J24@RE z%KME9hf-Us&mvdIf7q;b#`vGZ$Wb7#kV1*EwXv?%wslVVxcAq2MwXt%NDrX(UE`2& zNMv6U&D;N3961jVvS{xRsdut0GO1QP1IGU#jub$P&}?zpF0!|f)rY4Y%uOT&>Is*^ zBSRv-x*@Z(fI;Ua*XfY^Vwi$EltOgX4O!~BvPu}cK0eg0v- zh&RyIEC<3Q_(3cIq_=(gvxm}B!(oJ11lpF0r6A0QRCc5*?vL?LNG$})tzgNHjWC3; zConszh@kWUo{*><9wqddn^q2>iQp`{*AnDq51Kb@8p(d4SRp*aG_q8K-bU|!r|hG#|9j(cxz zt=uD=6MSwosPdC=Xg;c=K&`d57ZI)-s_jZ00Z%X=r2wkNl^M~9`GKJc^jX7}h+r1REH;hbS+_puKO`tG$4F-(C?!uEPt=LsvEEU@vf~2=bZZ2#8<~ULrn&HfB+8 zyHd(i^wu*vq~t`m{Qbd4EeB}6MhDi)A5vD)vol2XCTzqz9ib%nU;{W+1krM5zD_eI zUjpzX#2Tdm49F2Y_tn~jyiiZgzxBHzg5PB00a_x6uFeWF!hpJVnHUi+A%fqdYgdTK zwj&qK8-zvRG;UX4f(U*FRRB9fA@^~sn@HmdL*@w5Xi<4BBAA2jeSxCo$iFIr+M6E{ z{63NO0Q+~Dx+WwVE&}iGfC%nS)dMI78(yex_3LTY)w#|P5#;|r5WyTAx;u1h_XUR$ zr3NFa+;)pV%LmebQ;7GQd<3wrtNAY&@dBlhL^hVY;3 z>6JF3wQ=;lIo*6XKk7qxpUp~&wO#3qesC2x;@hJA+k}W10#Mqy`>$L(+GxTeu&@l? eN|q79z4#9b)FPFj_7qtF0000 void: $MarginContainer/VBoxContainer.alignment = BoxContainer.ALIGN_END $MarginContainer/VBoxContainer.add_child_below_node($MarginContainer/VBoxContainer/NameContainer, $MarginContainer/VBoxContainer/TextContainer) - if text != '' and character_name != '': + if text != '': name_label.bbcode_text = character_name name_label.rect_min_size.x = name_label.get_font('normal_font').get_string_size(name_label.text).x text_label.bbcode_text = text + if character_name == '': $MarginContainer/VBoxContainer/NameContainer.hide() + else: $MarginContainer/VBoxContainer/NameContainer.show() + if text == "": $MarginContainer.hide() else: $MarginContainer.show()