Really, the last few bits before #Science4All

Morpheu5 · Sep 29, 2023 · f926d37 · f926d37
1 parent 7b81a0b
commit f926d37
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 17 deletions.
diff --git 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
diff --git a/assets/sfx/talk.ogg.import b/assets/sfx/talk.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cdlqaqx42ju4e"
+path="res://.godot/imported/talk.ogg-0273f00632dc4c02bc550217cb930f04.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/sfx/talk.ogg"
+dest_files=["res://.godot/imported/talk.ogg-0273f00632dc4c02bc550217cb930f04.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/assets/sfx/thief.ogg b/assets/sfx/thief.ogg
diff --git a/assets/sfx/thief.ogg.import b/assets/sfx/thief.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dy0rvx4m7b6i8"
+path="res://.godot/imported/thief.ogg-6dc9e7ae83ba76fe4dea00754f32e4b9.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/sfx/thief.ogg"
+dest_files=["res://.godot/imported/thief.ogg-6dc9e7ae83ba76fe4dea00754f32e4b9.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/classes/globals.gd b/classes/globals.gd
@@ -1,6 +1,7 @@
 extends Node2D
 
 var participant_id: String = ""
+var participant_id_string: String = ""
 
 var customer_names = ["Leonardo","Alessandro","Tommaso","Francesco","Lorenzo","Edoardo","Mattia","Riccardo","Gabriele","Andrea","Diego","Matteo","Nicolo","Giuseppe","Antonio","Federico","Pietro","Samuele","Giovanni","Filippo","Enea","Davide","Christian","Gioele","Giulio","Michele","Marco","Gabriel","Elia","Luca","Salvatore","Vincenzo","Emanuele","Thomas","Alessio","Giacomo","Nathan","Liam","Simone","Samuel","Jacopo","Noah","Daniele","Giorgio","Ettore","Luigi","Daniel","Manuel","Nicola","Damiano","Sofia","Aurora","Giulia","Ginevra","Beatrice","Alice","Vittoria","Emma","Ludovica","Matilde","Giorgia","Camilla","Chiara","Anna","Bianca","Nicole","Gaia","Martina","Greta","Azzurra","Sara","Arianna","Noemi","Rebecca","Mia","Isabel","Adele","Chloe","Elena","Francesca","Gioia","Ambra","Viola","Carlotta","Cecilia","Diana","Alessia","Elisa","Emily","Marta","Maria","Margherita","Anita","Giada","Eleonora","Nina","Miriam","Asia","Amelia","Diletta"]
 

diff --git a/game_scenes/GameOver.gd b/game_scenes/GameOver.gd
@@ -22,6 +22,8 @@ func _ready():
 	else:
 		%TitleLabel.text = tr("Game Over!")
 		%InfoText.text = gameOverText % Globals.bank_money
+
+	%PIDLabel.text = Globals.participant_id_string
 
 func _on_survey_button_pressed():
 	var locale = TranslationServer.get_locale()
@@ -30,7 +32,6 @@ func _on_survey_button_pressed():
 		u = "https://qualtricsxmfv525fqw4.qualtrics.com/jfe/form/SV_6im4rtDltNhqjFY?PID=%s" % Globals.participant_id
 	else:
 		u = "https://qualtricsxmfv525fqw4.qualtrics.com/jfe/form/SV_9Ahy56rr3zyUVdc?PID=%s" % Globals.participant_id
-	print(u)
 	OS.shell_open(u)
 
 func _on_back_to_title_button_pressed():

diff --git a/game_scenes/GameOver.tscn b/game_scenes/GameOver.tscn
@@ -63,6 +63,18 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Fai un breve sondaggio"
 
+[node name="Label" type="Label" parent="CanvasLayer/CenterContainer/VBoxContainer"]
+layout_mode = 2
+text = "Per il sondaggio, ti servirà questo numero"
+horizontal_alignment = 1
+
+[node name="PIDLabel" type="Label" parent="CanvasLayer/CenterContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+auto_translate = false
+localize_numeral_system = false
+horizontal_alignment = 1
+
 [node name="HSeparator3" type="HSeparator" parent="CanvasLayer/CenterContainer/VBoxContainer"]
 visibility_layer = 0
 layout_mode = 2

diff --git a/game_scenes/Intro.tscn b/game_scenes/Intro.tscn
@@ -584,7 +584,7 @@ layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 0
 theme_override_font_sizes/font_size = 48
-text = "Certo, certo, ho ancora 7 giorni, non si preoccupi…"
+text = "Certo, certo, ho ancora 5 giorni, non si preoccupi…"
 autowrap_mode = 2
 visible_characters = 0
 visible_ratio = 0.0

diff --git a/game_scenes/Privacy.gd b/game_scenes/Privacy.gd
@@ -3,7 +3,7 @@ extends Node2D
 @onready var richtext = $Canvas/MarginContainer/RichTextLabel
 
 func _ready():
-	richtext.text = tr(richtext.text) % [Globals.participant_id]
+	richtext.text = tr(richtext.text) % [Globals.participant_id_string]
 
 func _on_back_button_pressed():
 	queue_free()
diff --git a/game_scenes/balloon/balloon.gd b/game_scenes/balloon/balloon.gd
@@ -8,6 +8,8 @@ extends CanvasLayer
 @onready var responses_menu: VBoxContainer = $Balloon/Margin/VBox/Responses
 @onready var response_template: RichTextLabel = %ResponseTemplate
 
+@onready var talk_sound = $TalkPlayer
+
 ## The dialogue resource
 var resource: DialogueResource
 
@@ -218,3 +220,12 @@ func _on_balloon_gui_input(event: InputEvent) -> 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/translations/en.po b/translations/en.po
@@ -34,8 +34,8 @@ msgid "La chiamo per ricordarle di saldare la fattura di 10.000 soldi."
 msgstr "I'm calling to remind you of your invoice for 10.000 moneys."
 
 #: game_scenes/Intro.tscn
-msgid "Certo, certo, ho ancora 7 giorni, non si preoccupi…"
-msgstr "Sure, sure, I still have 7 days, don't worry…"
+msgid "Certo, certo, ho ancora 5 giorni, non si preoccupi…"
+msgstr "Sure, sure, I still have 5 days, don't worry…"
 
 #: game_scenes/Intro.tscn
 msgid "Continua »"
@@ -909,7 +909,7 @@ msgid "Al ladro!"
 msgstr "Thief!"
 
 #: game_scenes/shop.gd
-msgid "Un ladro selvaggio appare."
+msgid "Appare un ladro selvaggio!"
 msgstr "A wild thief appears."
 
 #: game_scenes/Privacy.tscn
@@ -969,6 +969,10 @@ msgstr "Game Over!"
 msgid "Fai un breve sondaggio"
 msgstr "Take a brief survey"
 
+#: game_scenes/GameOver.tscn
+msgid "Per il sondaggio, ti servirà questo numero"
+msgstr "You'll need this number for the survey"
+
 #: game_scenes/GameOver.tscn
 msgid "Torna all'inizio"
 msgstr "Back to the menu"

diff --git a/translations/template.pot b/translations/template.pot
@@ -39,7 +39,7 @@ msgid "La chiamo per ricordarle di saldare la fattura di 10.000 soldi."
 msgstr ""
 
 #: game_scenes/Intro.tscn
-msgid "Certo, certo, ho ancora 7 giorni, non si preoccupi…"
+msgid "Certo, certo, ho ancora 5 giorni, non si preoccupi…"
 msgstr ""
 
 #: game_scenes/Intro.tscn
@@ -440,6 +440,10 @@ msgctxt "ta2bd7bbd9e"
 msgid ""
 msgstr ""
 
+#: game_scenes/shop.gd
+msgid ""
+msgstr ""
+
 #: assets/main.dialogue
 msgctxt "tc2b37b1d9d"
 msgid "POS (commissione: {{100 * get_fee("card", amount)}}%)"
@@ -677,7 +681,7 @@ msgid "Al ladro!"
 msgstr ""
 
 #: game_scenes/shop.gd
-msgid "Un ladro selvaggio appare."
+msgid "Appare un ladro selvaggio!"
 msgstr ""
 
 #: game_scenes/Privacy.tscn
@@ -717,6 +721,10 @@ msgstr ""
 msgid "Fai un breve sondaggio"
 msgstr ""
 
+#: game_scenes/GameOver.tscn
+msgid "Per il sondaggio, ti servirà questo numero"
+msgstr ""
+
 #: game_scenes/GameOver.tscn
 msgid "Torna all'inizio"
 msgstr ""