From f926d37adafe30dbdf0d814b37c95b76e8fcd9b8 Mon Sep 17 00:00:00 2001 From: Andrea Franceschini Date: Fri, 29 Sep 2023 18:50:58 +0200 Subject: [PATCH] Really, the last few bits before #Science4All --- assets/main.dialogue | 4 ++-- assets/sfx/talk.ogg | Bin 0 -> 4117 bytes assets/sfx/talk.ogg.import | 19 +++++++++++++++++++ assets/sfx/thief.ogg | Bin 0 -> 10810 bytes assets/sfx/thief.ogg.import | 19 +++++++++++++++++++ classes/globals.gd | 1 + game_scenes/GameOver.gd | 3 ++- game_scenes/GameOver.tscn | 12 ++++++++++++ game_scenes/Intro.tscn | 2 +- game_scenes/Privacy.gd | 2 +- game_scenes/balloon/balloon.gd | 11 +++++++++++ game_scenes/balloon/balloon.tscn | 8 +++++++- game_scenes/shop.gd | 9 +++++---- game_scenes/shop.tscn | 7 ++++++- game_scenes/title.gd | 3 ++- translations/en.mo | Bin 24271 -> 24370 bytes translations/en.po | 10 +++++++--- translations/template.pot | 12 ++++++++++-- 18 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 assets/sfx/talk.ogg create mode 100644 assets/sfx/talk.ogg.import create mode 100644 assets/sfx/thief.ogg create mode 100644 assets/sfx/thief.ogg.import diff --git a/assets/main.dialogue b/assets/main.dialogue index 511fb1d..ba77699 100644 --- a/assets/main.dialogue +++ b/assets/main.dialogue @@ -215,7 +215,7 @@ set cash = 0.0 Sei stato derubato mentre andavi in banca! La polizia è arrivata troppo tardi per fermare il ladro e hai perso {{stolen_cash}} soldi! [ID:t8873a801e3] - Chiama l'assicurazione (recuperi {{potential_loss}} soldi, il premio salirà) [ID:t47f1d93a36] do emit("log_request", { "dialogue_title": "street_robbery", "event_type": "player", "event": "make_insurance_claim", "loss": potential_loss }) - do handle_insurance_claim(cash) + do handle_insurance_claim() => insurance_claim_end - Torna a casa (perdi {{stolen_cash}} soldi) [ID:tdad83184fe] do emit("log_request", { "dialogue_title": "street_robbery", "event_type": "player", "event": "go_home", "loss": stolen_cash }) @@ -232,7 +232,7 @@ set cash = 0.0 Sei stato rapinato in negozio! La polizia è arrivata troppo tardi per fermare il ladro e hai perso {{stolen_cash}} soldi! [ID:t29909e55c2] - Chiama l'assicurazione (recuperi {{potential_loss}} soldi, il premio salirà) [ID:tc20800c867] do emit("log_request", { "dialogue_title": "shop_robbery", "event_type": "player", "event": "make_insurance_claim", "loss": potential_loss }) - do handle_insurance_claim(cash) + do handle_insurance_claim() => insurance_claim_end - Chiudi e torna a casa (perdi {{stolen_cash}} soldi) [ID:t8a8611b98d] do emit("log_request", { "dialogue_title": "shop_robbery", "event_type": "player", "event": "go_home", "loss": stolen_cash }) diff --git a/assets/sfx/talk.ogg b/assets/sfx/talk.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ac9e52b3c8a55f93893dc831e580a5f036ab7a0d GIT binary patch literal 4117 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

V?@R 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 void: func _on_margin_resized() -> void: handle_resize() + + +func _on_dialogue_label_spoke(letter: String, letter_index: int, speed: float) -> void: + if not letter in [" ", "."] and character_label.visible: + var actual_speed: int = 4 if speed >= 1 else 2 + if letter_index % actual_speed == 0: + talk_sound.play() + var pitch = randf_range(1, 1.8) + talk_sound.pitch_scale = randf_range(pitch - 0.2, pitch + 0.2) diff --git a/game_scenes/balloon/balloon.tscn b/game_scenes/balloon/balloon.tscn index c524b45..d0d443a 100644 --- a/game_scenes/balloon/balloon.tscn +++ b/game_scenes/balloon/balloon.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://8lyp1gprpln4"] +[gd_scene load_steps=6 format=3 uid="uid://8lyp1gprpln4"] [ext_resource type="Script" path="res://game_scenes/balloon/balloon.gd" id="1_bf5nr"] [ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_h1no1"] +[ext_resource type="AudioStream" uid="uid://cdlqaqx42ju4e" path="res://assets/sfx/talk.ogg" id="3_tpida"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5d24i"] content_margin_left = 40.0 @@ -70,5 +71,10 @@ shortcut_keys_enabled = false meta_underlined = false hint_underlined = false +[node name="TalkPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("3_tpida") +volume_db = -18.0 + [connection signal="gui_input" from="Balloon" to="." method="_on_balloon_gui_input"] [connection signal="resized" from="Balloon/Margin" to="." method="_on_margin_resized"] +[connection signal="spoke" from="Balloon/Margin/VBox/DialogueLabel" to="." method="_on_dialogue_label_spoke"] diff --git a/game_scenes/shop.gd b/game_scenes/shop.gd index 9db5d8b..6325ba3 100644 --- a/game_scenes/shop.gd +++ b/game_scenes/shop.gd @@ -152,7 +152,7 @@ func radio_on(): func run(): print("Day: ", day) - if day < 7: + if day < 5: await initialize_day() else: await lights_out() @@ -274,7 +274,7 @@ func new_customer(): customer_has_explained_conspiracy = false select_payment_method(customer) - amount = snapped(randf_range(0.05, 100.0), 0.01) + amount = snapped(randf_range(0.98, 150.0), 0.01) amount_str = ("%.2f" % amount).replace(".", ",") amountLabel.text = tr("Totale: %s") % amount_str electronic_offered = false @@ -310,13 +310,14 @@ func shop_robbery(): radio_off(true) for i in customers.size(): customer_walks_away(true) - # TODO Add robbery stinger + $ThiefStinger.play() stolen_cash = cash potential_loss = max(0, stolen_cash - insurance_excess) var t = randi_range(1, 3) customerPicture.texture = load("res://assets/faces/Thief%02d.png" % t) customerNameLabel.text = tr("Al ladro!") - amountLabel.text = tr("Un ladro selvaggio appare.") + customerDescription.text = "" + amountLabel.text = tr("Appare un ladro selvaggio!") await show_info_panel() start_dialogue(main_dialog, "shop_robbery") customers = [] diff --git a/game_scenes/shop.tscn b/game_scenes/shop.tscn index 8c11384..4b8b889 100644 --- a/game_scenes/shop.tscn +++ b/game_scenes/shop.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://bq8cdsnxpscqs"] +[gd_scene load_steps=5 format=3 uid="uid://bq8cdsnxpscqs"] [ext_resource type="Script" path="res://game_scenes/shop.gd" id="1_edlot"] [ext_resource type="PackedScene" uid="uid://cpwmax3kf4sya" path="res://game_scenes/shop_ui.tscn" id="2_epm6x"] [ext_resource type="AudioStream" uid="uid://b5fy1xk4j1wrw" path="res://assets/music/Kenobit_Bit_Beat_Beach.ogg" id="3_iik3r"] +[ext_resource type="AudioStream" uid="uid://dy0rvx4m7b6i8" path="res://assets/sfx/thief.ogg" id="4_q6uxa"] [node name="Shop" type="Node2D"] script = ExtResource("1_edlot") @@ -27,6 +28,10 @@ centered = false stream = ExtResource("3_iik3r") volume_db = -40.0 +[node name="ThiefStinger" type="AudioStreamPlayer" parent="."] +stream = ExtResource("4_q6uxa") +volume_db = -12.0 + [connection signal="bank_changed" from="." to="HUD" method="_on_shop_bank_changed"] [connection signal="cash_changed" from="." to="HUD" method="_on_shop_cash_changed"] [connection signal="cash_fee_loss_changed" from="." to="HUD" method="_on_shop_cash_fee_loss_changed"] diff --git a/game_scenes/title.gd b/game_scenes/title.gd index 7d12169..f7a7176 100644 --- a/game_scenes/title.gd +++ b/game_scenes/title.gd @@ -8,7 +8,8 @@ var privacy_scene = preload("res://game_scenes/Privacy.tscn") func _ready(): var date = Time.get_datetime_dict_from_system() Globals.participant_id = "%02d%02d%02d%02d%02d%02d" % [date.year-2000, date.month, date.day, date.hour, date.minute, date.second ] - %ParticipantID.text = "%02d %02d %02d %02d %02d %02d" % [date.year-2000, date.month, date.day, date.hour, date.minute, date.second ] + Globals.participant_id_string = "%02d %02d %02d %02d %02d %02d" % [date.year-2000, date.month, date.day, date.hour, date.minute, date.second ] + %ParticipantID.text = Globals.participant_id_string pass func _on_start_button_pressed(): diff --git a/translations/en.mo b/translations/en.mo index 6efa431fe63f6dd0138a3a970d916b55e91f9c33..ed67f18aa2704de37efb1a5c72e62e5a056a35e3 100644 GIT binary patch delta 3233 zcmZA3c}!GC9KiA4Du*0`oF1Socz_(DDB^(}UZ5g95GbCYtbziIy9+HKZdE+%(bRgR zCTLsR7;9_l#vV4+^sq7YN~%_))}+={ZLC_GnkH!4@9(|!k9Oj3KQnLl&Ad0inZfg4 zT8=4QpB9`dz5jlbPdhkKH6C`5CySSO}DuP8;)Bd%WNC4J`iBJ_M>Mb4E z54T_x9>7pMjuChc=}K;5w1`{oQ%U85Z@36m$-qpUj3L;Hdc#JH#2wfh528PQjdUd6 zqdv&b7>JKhAMh#mL4QWqeyr$+shG?7GLnjR;KX6L39a}!rr=f7f&3U<4Z&>|?m>N! z_jyen_&Dmo=aF0FD(VB=M}3jMaU}XPn9k669KrZfMr9&yz&1RM4Ol?$L+}%?KVb`P zA6_ROSK>0b zWR|wE1b@dhm_I;dDxO5W9vmmqgq2u<#7j|AaRW64@k7lHU&nmfk8l@`N)~wo&tNVtV6rqpXKiuqKC+c?k3>V=k5WRG4Ksg!;ql z7=*V`JNVOU_dIj|M_>fkV^9Z7N4+l_{jdOapkmbPHuS|t%*JL6Lk|veQ#nb6tth{t zPN^RW)Pp7swZlxTv2Zi$o4&^iW$NS$)B(<*KImoafwxfye28oed5k(>%p~(*OG8a{ zF}fE}*+6AJ-a*Yx!DREuT!@Xd+b{(0q5iH5H{$FmA~Wz7cH;11JoQ>7PD~Bg^~CjZpLe<-`6~6 z9!M)tSN%l{z(0^Kqzl_{+Vkd-d=mA6+vxNq{J~8{bCL3*xgTw)+vpUI$AKm0d9VOm zXrD!Pq7=+BQ_+scXkW*pxU1AWaAq<}2<>;V36CHx?V>al$?Xi(eKKx(?V`MxMbaI@S92xx^wuU!;W4 z!o(V@e;oEDVhA1ID9icO6{)4p#5|w9^&qbsv4&_Sbj54YX&y=FENRIm1`$qT0Fg@g z5rc_*Ldyh#2@rPf`viO*Ftp}s8x6V;u>;!G13*S912yhbuSFGNi)Zlvr11ZLry@t*)9{r{1uTju+b8tVDY#n H&WZgO{F;Q% delta 3151 zcmZA3X;76_7{Kx8f(U}5psX%jM03Yfa6^Ghil7JusA(=;0a--R3o5wX5SJ)YiySc> z9qmJoHRFPNCOM8}n#*M4sHs!qGNXRT4_Y~+L;vSJZ_U&hp8GrJ+v44MaC$WgC$eydA&`=|+%91>VF4-pgz+vWD{YP9p7adWZ;FDM0;76^7v| z?1+un89zswkYgB*XK|p2S8kEvPy9ng5-|#cF$eVvv#|@7VFY^7AGe}5vT!0+j)*{(ZOg^FaX2pUoyzVQ!xjfxDmC3{kF$&lY?179Y79`ryUlfc36$k zSciN>cA^g85bA@R!eMw3^>eK_1fv;!8vRQanH9JR7h({-yoSqdcVi9Z^B9Y1Jl1?H zL|v+@I0ZLHi5$U)n1MU!jjTMt?bwQAaC=t~H{L+6HaMDvUyn1f8t-Agmb;7O;X$lJ zzaAp#SdUtN6_;SI81?~vhL!jX=VFOdWCUKs(dbKO<1iULSQpFu?YRAlGmfKE-{Q&9pwk7pVQ+>*F;e zj_=E~Qn3eh2_B#}nBR{<;8EO)f8i&%xxd*&ar8Eyasi&fE4Uv&W^3z`xCWUe+loz; zPoU0VE*p+9$u=(;W>;Ep0p7tAIBBq10>9Ty12a&M(@HGB2IL{+DeBZmu%mRKi}6!z zMr}7^sF|sGc$so6J5iVBDb}DjFF|A!nM*hv{S#>flaXbV16Ye!aXjYoA?>&cd01(| z8TbTs%F|i!rC5OUA-6CHgGZX(AB~+TC!&v@|8z1P9b7C}#2eEYjfab-1vgM0nrzPP zN#yR4GuRF<+vOW}`2p$-{f>dyis2ZTBEo7(EOx*wWO8K&2I~3$fQ*iC3u*(qZ4aW} z181-^{(w4wJE$Ez#`VmB`7HCiM4`IZQ?yI)x?7 z#90iZJdho!QV+CHs zDon~?{^?T=WSHIl3_X-HGtKTjg;dEcd>7*;n)_ibx+(vH@8DQQH2}9^9G*iChCIST zjLu@2(Tl?|aI!i7uF1^5K5+vTy2h{YEey#vKRN~2K)D+AeZL%Y5k;Zy_Qlu^HzHq^ zCR~9J@d(a+(+oJ0M&G7ffw~muaW49JbItK7!Xzrb#Rd2hYp^WO{3_l@U5e;@bDnEZ zJ4l#fE}F*}OgVL`xsr2`lPBk}Bfdg?fDY5l1r&=PQudbE70)n~iX?{Vi`htb0Q# z&({n|cl2s2XU@B3b&87#9@aVmVD03gIFcwQbl>zOboROv0|>oO^dzJbn#K@wh_OTh z!75tG%W~=eVbaEwr3ZE()(`ow`-(lm^yC3N?4imWwu;{TKGoh5|MY$+O`f;h!u9ZFE-fu_83g`Co+ju#0Vmv;MiMNulh7eqG);|q;lZ6v&2~L-F?BGAihf<7PGXW>t`O@a! zg7*70ei?GmF`{`^=xRr^f0t{H=qU@G