diff --git a/.gitignore b/.gitignore index a83e35c0..689d7b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -104,6 +104,9 @@ NetrworkManagerUI.prefab.meta CustomNetworkManager.prefab CustomNetworkManager.prefab.meta +#FMOD Studio +DeltaVRFMOD/.cache + # Project-specific files config.json \ No newline at end of file diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 94eeafe0..f939552d 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -7,7 +7,6 @@ * npc character: * klaas on näha temast eespool * shape detection: - * professor võiks öelda "good job, continue..." pärast esimest successi * kui kõik configurationid tehtud, siis professor tuleb uksest välja ja ütleb "thank you" * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit diff --git a/3d-generation-pipeline/generate_voiceline_amplitude_curves.py b/3d-generation-pipeline/generate_voiceline_amplitude_curves.py index 892fd0a6..eae0008f 100644 --- a/3d-generation-pipeline/generate_voiceline_amplitude_curves.py +++ b/3d-generation-pipeline/generate_voiceline_amplitude_curves.py @@ -6,9 +6,17 @@ import numpy as np FRAME_DURATION = 0.02 # 20 ms windows GAIN = 1.0 # multiply RMS values (set to e.g. 30.0 if you want larger values) EXTENSION = ".txt" # output file extension +OVERWRITE = False # set True to regenerate even if .txt exists def process_wav(filepath): + # Compute output path first (so we can decide whether to skip) + out_path = os.path.splitext(filepath)[0] + EXTENSION + + if not OVERWRITE and os.path.exists(out_path): + print(f"Skipping (already exists): {out_path}") + return + print(f"Processing: {filepath}") # Load audio @@ -29,7 +37,6 @@ def process_wav(filepath): rms = rms * GAIN # Save to .txt - out_path = os.path.splitext(filepath)[0] + EXTENSION np.savetxt(out_path, rms, fmt="%.8f") print(f"Saved RMS → {out_path}") @@ -49,4 +56,4 @@ def process_folder(folder_path): # === Run script === if __name__ == "__main__": folder = input("Enter folder path: ").strip() - process_folder(folder) \ No newline at end of file + process_folder(folder) diff --git a/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -001.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -001.wav.meta new file mode 100644 index 00000000..b23152b1 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -001.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42e58ab8243a8c3449d391cc548d895c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -002.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -002.wav.meta new file mode 100644 index 00000000..7ed9f629 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Congratulations_Defended -002.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7cb93a4fb1b04374eaf023113b75af18 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-001.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-001.wav.meta new file mode 100644 index 00000000..e539e8bd --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-001.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 264f1b0a1d60ee44fb83104376fe62d6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-002.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-002.wav.meta new file mode 100644 index 00000000..1088a600 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Different_Target-002.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8ff483912820c0c458c2960593f32d01 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt new file mode 100644 index 00000000..dca83368 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt @@ -0,0 +1,306 @@ +0.00000005 +0.00000003 +0.00000000 +0.00000000 +0.00008677 +0.02555647 +0.06356105 +0.06754274 +0.12535521 +0.11968394 +0.10654067 +0.08807448 +0.03094069 +0.01887335 +0.04522886 +0.10707195 +0.10807064 +0.11986617 +0.15139525 +0.12412844 +0.08856518 +0.09356070 +0.09514336 +0.07740945 +0.06272630 +0.05835729 +0.05653152 +0.04069148 +0.02248743 +0.00993187 +0.00186555 +0.00107107 +0.00120904 +0.00187453 +0.00111695 +0.00004033 +0.00000578 +0.00000037 +0.00000047 +0.00000041 +0.00000041 +0.00000036 +0.00000037 +0.00000030 +0.00000033 +0.00000027 +0.00000021 +0.00000026 +0.00000013 +0.00000017 +0.00000012 +0.00000011 +0.01054585 +0.05012132 +0.13717458 +0.13160563 +0.06083952 +0.03850145 +0.06312518 +0.08917529 +0.07733954 +0.03812576 +0.02091784 +0.02317895 +0.09112280 +0.10568590 +0.05461230 +0.01764572 +0.00752449 +0.00855657 +0.01883113 +0.11905217 +0.15466592 +0.14110537 +0.12407092 +0.09104393 +0.06492120 +0.05765026 +0.03929679 +0.01446094 +0.01584649 +0.01906035 +0.00225289 +0.03853673 +0.04068287 +0.12364593 +0.11614482 +0.09028992 +0.06433237 +0.02383663 +0.01381440 +0.00635609 +0.01836661 +0.02473579 +0.11016511 +0.10806321 +0.03348883 +0.01009692 +0.03878922 +0.07220570 +0.08639481 +0.07928380 +0.10606322 +0.10445405 +0.11997829 +0.09822565 +0.08011347 +0.04837793 +0.03226493 +0.03607234 +0.03278252 +0.03711180 +0.06834672 +0.07951122 +0.08939215 +0.08045211 +0.06378602 +0.03623512 +0.03542983 +0.13810526 +0.13145922 +0.08724828 +0.07982137 +0.07484215 +0.06310783 +0.03040927 +0.02398604 +0.01799416 +0.01170484 +0.00820995 +0.00466642 +0.00173959 +0.00026183 +0.00000286 +0.00000056 +0.00000045 +0.00000036 +0.00000037 +0.00000035 +0.00000034 +0.00000032 +0.00000030 +0.00000027 +0.00000027 +0.00000023 +0.00000022 +0.00000018 +0.00000018 +0.00000013 +0.00000013 +0.00000010 +0.00000010 +0.00000008 +0.00000004 +0.00000004 +0.00000003 +0.00000002 +0.00000003 +0.00000003 +0.00000002 +0.00000002 +0.00000004 +0.00000002 +0.01210695 +0.03104685 +0.09687874 +0.10992987 +0.06612710 +0.05232693 +0.07025713 +0.07789180 +0.05726887 +0.05102119 +0.05531616 +0.07071804 +0.07324490 +0.12500001 +0.13551877 +0.11463275 +0.09164570 +0.07969173 +0.08745047 +0.09294610 +0.08758718 +0.04984579 +0.01199116 +0.01887675 +0.01864040 +0.07235581 +0.10418790 +0.03615440 +0.00980441 +0.00221446 +0.03594533 +0.06812992 +0.11332203 +0.06093310 +0.05594898 +0.06496126 +0.08740044 +0.12233238 +0.09580570 +0.04772820 +0.02361993 +0.01078867 +0.03802064 +0.07909553 +0.08012012 +0.07333743 +0.05754400 +0.05097869 +0.07664723 +0.05694538 +0.04448567 +0.09419085 +0.06582000 +0.06082845 +0.03704552 +0.02209460 +0.00290526 +0.00198855 +0.00014714 +0.00000098 +0.00000014 +0.00000015 +0.00003012 +0.00101211 +0.00025446 +0.00000087 +0.00000012 +0.00000008 +0.00000007 +0.00000005 +0.00017385 +0.00057944 +0.00056784 +0.00059026 +0.00004644 +0.01499533 +0.03538585 +0.06983574 +0.06200712 +0.06784921 +0.06938390 +0.08049586 +0.07614776 +0.05881132 +0.11806823 +0.15041181 +0.12342727 +0.11753254 +0.10245495 +0.09522798 +0.09911717 +0.09732006 +0.07817753 +0.08756886 +0.05415813 +0.02474579 +0.02446261 +0.11357070 +0.11718469 +0.09938256 +0.08500034 +0.07520326 +0.07641556 +0.06648254 +0.06731120 +0.07971697 +0.08603772 +0.05109902 +0.09391770 +0.12228667 +0.05145732 +0.05202519 +0.06156273 +0.01560635 +0.00427968 +0.02421295 +0.03267565 +0.07683574 +0.02789398 +0.01183625 +0.01795142 +0.02549900 +0.04912534 +0.10022978 +0.09703911 +0.06528247 +0.05660536 +0.05310062 +0.02857801 +0.00309033 +0.00894551 +0.02781632 +0.00307855 +0.00136751 +0.01259168 +0.03591923 +0.02849875 +0.03123168 +0.01485326 +0.00356870 +0.00102485 +0.00086726 +0.00025258 diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt.meta new file mode 100644 index 00000000..b1584bea --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9e4ecb709f95cd241a9c5dc5558ab3b7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.wav.meta new file mode 100644 index 00000000..691dd0e1 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-001.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5aa14328feee8ad47a37f50a3b07ae47 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt new file mode 100644 index 00000000..758e6bd1 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt @@ -0,0 +1,309 @@ +0.00000005 +0.00000003 +0.00000002 +0.00000004 +0.00001575 +0.00056058 +0.10512087 +0.06247878 +0.13907126 +0.10796085 +0.08928745 +0.04296236 +0.01589850 +0.03041418 +0.09944262 +0.09935775 +0.09998433 +0.11296503 +0.11884489 +0.10825495 +0.09847742 +0.08814481 +0.09157983 +0.09493581 +0.08478543 +0.06469711 +0.06443882 +0.04607481 +0.01910205 +0.00103388 +0.00010046 +0.00071292 +0.00033006 +0.00008951 +0.00007941 +0.00000031 +0.00011136 +0.00000019 +0.00000021 +0.00000018 +0.00000026 +0.00000008 +0.00000014 +0.00000015 +0.00000016 +0.00000012 +0.00000009 +0.00000007 +0.00000006 +0.00000005 +0.00000004 +0.00000002 +0.00000002 +0.00005185 +0.00000828 +0.02832398 +0.12830395 +0.16844831 +0.12687734 +0.06460033 +0.01894131 +0.03220102 +0.05880868 +0.06527510 +0.05140930 +0.03658038 +0.01398638 +0.02421561 +0.08997451 +0.08377688 +0.02418836 +0.00973439 +0.00599007 +0.00905722 +0.02651637 +0.10164079 +0.14320731 +0.12904300 +0.11029114 +0.07977970 +0.05571616 +0.06751201 +0.01764874 +0.00617195 +0.02489195 +0.01025172 +0.00284820 +0.04030944 +0.02575630 +0.11017919 +0.11959197 +0.06856420 +0.03276161 +0.01958396 +0.01616774 +0.02088996 +0.05009602 +0.07843453 +0.06901982 +0.02250954 +0.01337707 +0.02803325 +0.06195528 +0.07357799 +0.06418665 +0.09644670 +0.09922776 +0.11329394 +0.10822823 +0.09179486 +0.06035907 +0.05104551 +0.03396708 +0.05817677 +0.06630339 +0.04054824 +0.07112641 +0.05802667 +0.06763632 +0.06566662 +0.05350130 +0.03097204 +0.01398106 +0.03965144 +0.13338506 +0.14704359 +0.09780610 +0.06288150 +0.05591090 +0.05028389 +0.02308469 +0.02326990 +0.01427633 +0.01059657 +0.00597096 +0.00265677 +0.00096331 +0.00027705 +0.00081122 +0.00029532 +0.00003557 +0.00000033 +0.00000033 +0.00000032 +0.00000030 +0.00000028 +0.00000030 +0.00000022 +0.00000023 +0.00000021 +0.00000018 +0.00000015 +0.00000015 +0.00000014 +0.00000010 +0.00000007 +0.00000008 +0.00000004 +0.00000004 +0.00000002 +0.00000002 +0.00000002 +0.00000002 +0.00000002 +0.00008707 +0.00058412 +0.00013537 +0.00000516 +0.02347101 +0.04357265 +0.11365347 +0.08669745 +0.05095782 +0.06836279 +0.07590245 +0.07837829 +0.06091340 +0.05027740 +0.07152368 +0.12868381 +0.13290957 +0.11694506 +0.10228214 +0.10048629 +0.08879036 +0.03953559 +0.01065895 +0.02042474 +0.02315973 +0.05589612 +0.10023368 +0.05182547 +0.00905302 +0.00198392 +0.02186030 +0.04189350 +0.14410524 +0.09991421 +0.04756368 +0.06668478 +0.09321541 +0.11032545 +0.10434034 +0.08342411 +0.03306899 +0.01367741 +0.06044695 +0.09034430 +0.06164889 +0.06296910 +0.05844286 +0.04815272 +0.05400948 +0.07309759 +0.08802762 +0.15068236 +0.11547473 +0.05514836 +0.03452749 +0.01822943 +0.00416943 +0.00182502 +0.00100153 +0.00051689 +0.00018493 +0.00159059 +0.00043061 +0.00000588 +0.00000041 +0.00000057 +0.00000034 +0.00000041 +0.00015376 +0.00000841 +0.00085780 +0.01958037 +0.03508846 +0.08052298 +0.05665231 +0.05217534 +0.07203114 +0.06636944 +0.06487500 +0.06899809 +0.05801162 +0.13297467 +0.10661902 +0.09435981 +0.09961571 +0.10622018 +0.11464507 +0.10977937 +0.09725338 +0.09613403 +0.07686792 +0.04782833 +0.04779501 +0.02959961 +0.04014716 +0.10748242 +0.09299997 +0.08187937 +0.08289372 +0.10451850 +0.09585603 +0.10306562 +0.09885249 +0.09429167 +0.08828995 +0.08491156 +0.05210634 +0.06902108 +0.06840731 +0.03392952 +0.05985209 +0.05023765 +0.01092744 +0.00683205 +0.02457151 +0.09223298 +0.04956920 +0.01651768 +0.00484253 +0.00325285 +0.01828707 +0.03094625 +0.08162503 +0.09403877 +0.07717906 +0.05836591 +0.07295292 +0.03507503 +0.00875005 +0.00378138 +0.01026982 +0.00332591 +0.00306266 +0.01591836 +0.03091518 +0.02433426 +0.02051376 +0.00947862 +0.00142537 +0.00069377 +0.00004064 +0.00000018 +0.00000003 +0.00000002 +0.00007110 diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt.meta new file mode 100644 index 00000000..5959e814 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0ebb29a4c0d68b4da17bc19e7384990 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.wav.meta new file mode 100644 index 00000000..ee760805 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_First_Configuration-002.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97f150ec0d3d48a4db1ea667fe05b072 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt new file mode 100644 index 00000000..0306ded6 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt @@ -0,0 +1,293 @@ +0.00000006 +0.00000004 +0.00000000 +0.00000876 +0.00000012 +0.00004277 +0.05436340 +0.17665382 +0.12990713 +0.12583591 +0.13277286 +0.13517515 +0.12306246 +0.12600669 +0.12459808 +0.10394835 +0.09309749 +0.09333178 +0.07643553 +0.05511052 +0.04393115 +0.02941259 +0.03382056 +0.02038616 +0.01548435 +0.01363530 +0.01174366 +0.00893834 +0.00600578 +0.00371616 +0.00200703 +0.00146441 +0.00025279 +0.00000120 +0.00000023 +0.00000033 +0.00000023 +0.00000020 +0.00000020 +0.00000015 +0.00000013 +0.00000013 +0.00000010 +0.00000008 +0.00000008 +0.00011547 +0.03884210 +0.11290570 +0.14032798 +0.11392568 +0.10667438 +0.11704497 +0.08145794 +0.03876734 +0.01617737 +0.00410597 +0.03786850 +0.01552934 +0.08146030 +0.12936532 +0.10310936 +0.04261066 +0.01968959 +0.01155729 +0.01246085 +0.01643562 +0.02611092 +0.06975007 +0.06647281 +0.04812134 +0.06127471 +0.04931017 +0.05622455 +0.09936404 +0.13729018 +0.09841577 +0.05966850 +0.01680984 +0.00261750 +0.00143242 +0.01419471 +0.04943705 +0.04137772 +0.03587830 +0.03199233 +0.03906901 +0.03574416 +0.03229308 +0.03190199 +0.04779297 +0.04261694 +0.04245671 +0.04589238 +0.05662980 +0.05274693 +0.05354149 +0.04374932 +0.03250221 +0.01861564 +0.01963406 +0.00308434 +0.00011245 +0.00000138 +0.00004786 +0.00000296 +0.00000008 +0.00040744 +0.01232126 +0.00401640 +0.00080837 +0.00001568 +0.00000014 +0.00000001 +0.00000000 +0.00000001 +0.00000000 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00000001 +0.00137698 +0.00120946 +0.00037309 +0.00001546 +0.00019473 +0.05597774 +0.05349650 +0.07315911 +0.10007664 +0.12148964 +0.10390536 +0.11813873 +0.12236188 +0.07448173 +0.07163881 +0.03668909 +0.00482586 +0.00674204 +0.03587620 +0.16254307 +0.15529911 +0.04756048 +0.01177680 +0.00713155 +0.09382056 +0.10292054 +0.16375251 +0.13605520 +0.05452843 +0.09455058 +0.12224557 +0.13256259 +0.09879588 +0.06324653 +0.02657961 +0.01032267 +0.00230831 +0.02871299 +0.07454104 +0.13230723 +0.08707617 +0.04283587 +0.02152865 +0.08970764 +0.15705778 +0.13232288 +0.11249097 +0.12094339 +0.09471517 +0.08165064 +0.05688582 +0.06236089 +0.06496719 +0.07772935 +0.07066742 +0.06583010 +0.06023704 +0.05579713 +0.03196885 +0.02167577 +0.00885445 +0.00054829 +0.00120143 +0.05003724 +0.05701566 +0.05554289 +0.06652608 +0.06286423 +0.07321317 +0.10022882 +0.08733696 +0.05627337 +0.00893717 +0.05115506 +0.02904028 +0.03742857 +0.05691869 +0.04722928 +0.04761178 +0.11284457 +0.06448554 +0.01647628 +0.00811301 +0.00184246 +0.00095617 +0.03380137 +0.05253933 +0.09993897 +0.08770414 +0.06539877 +0.06725874 +0.05866503 +0.02927921 +0.00474572 +0.00449728 +0.00220470 +0.03732991 +0.16716687 +0.13160835 +0.11313587 +0.09361040 +0.08533838 +0.05350770 +0.01132886 +0.00188624 +0.00224469 +0.04322987 +0.14946128 +0.11786281 +0.09559109 +0.08745537 +0.06887340 +0.06453345 +0.14468354 +0.15365960 +0.08112232 +0.05636847 +0.05092329 +0.06082837 +0.05791784 +0.03492959 +0.01728887 +0.01145544 +0.03110087 +0.06301248 +0.08440568 +0.02886192 +0.02436969 +0.06101014 +0.06737709 +0.12571132 +0.13595617 +0.11148004 +0.02669337 +0.00637604 +0.00583108 +0.04190948 +0.12353806 +0.13185968 +0.10900982 +0.09392569 +0.07719076 +0.06124953 +0.04566133 +0.03477211 +0.02629414 +0.02993021 +0.03762943 +0.05084812 +0.03652138 +0.05007470 +0.11358684 +0.14574684 +0.11534683 +0.09708887 +0.06805480 +0.04739871 +0.04391212 +0.04065108 +0.02693054 +0.01430396 +0.00508704 +0.00183298 +0.00007207 diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt.meta new file mode 100644 index 00000000..84f3aadc --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 62632355e21a84c4c84e476062ab8670 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.wav.meta new file mode 100644 index 00000000..242fd980 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-001.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a43d69a404558844883b6d1e9ccc6a6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt new file mode 100644 index 00000000..58e555c5 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt @@ -0,0 +1,268 @@ +0.00000005 +0.00000003 +0.00240253 +0.02907968 +0.10503523 +0.13422142 +0.12195620 +0.13128196 +0.13441545 +0.10902201 +0.11511548 +0.12498570 +0.10779791 +0.08748529 +0.09270831 +0.08885102 +0.07140992 +0.07817293 +0.05512253 +0.07312962 +0.05332483 +0.02952465 +0.00628433 +0.00322687 +0.01116481 +0.02963358 +0.09202230 +0.10785520 +0.09845226 +0.10343045 +0.09329684 +0.04513930 +0.02688077 +0.01212403 +0.04465980 +0.02088372 +0.02843172 +0.14170074 +0.14037681 +0.08236120 +0.02720438 +0.01238582 +0.01198153 +0.01171427 +0.04087922 +0.11383022 +0.10109381 +0.08515322 +0.04896748 +0.04567009 +0.02929136 +0.06172283 +0.11550593 +0.09598164 +0.07837296 +0.02478683 +0.00525718 +0.00181524 +0.00970324 +0.07209075 +0.09798092 +0.07967266 +0.06513842 +0.05123381 +0.05027419 +0.04282681 +0.04678136 +0.06629726 +0.04876049 +0.04369129 +0.03766395 +0.04394144 +0.04186778 +0.05153219 +0.04662358 +0.03369124 +0.02084255 +0.01368451 +0.00168093 +0.00043239 +0.00004149 +0.00041319 +0.00029644 +0.00001294 +0.00009876 +0.01724320 +0.00515795 +0.00088585 +0.00000051 +0.00000013 +0.00000001 +0.00000002 +0.00000002 +0.00000002 +0.00029903 +0.00017885 +0.00173300 +0.03660622 +0.08778569 +0.08299683 +0.08249202 +0.07836448 +0.07183830 +0.09798677 +0.10288965 +0.07641125 +0.07789677 +0.06810252 +0.00654751 +0.00414498 +0.01800906 +0.10378619 +0.10797114 +0.02479648 +0.00965088 +0.01219227 +0.07751130 +0.11227150 +0.14128794 +0.06956887 +0.05905581 +0.10559428 +0.11890519 +0.08814315 +0.05743459 +0.02042473 +0.00343255 +0.02520813 +0.04550547 +0.11568366 +0.09366174 +0.04345708 +0.03914818 +0.07486159 +0.13059510 +0.15400928 +0.13821089 +0.12171482 +0.10681405 +0.08661242 +0.06828332 +0.04075309 +0.05218672 +0.07257383 +0.07887270 +0.08816109 +0.09971622 +0.08168958 +0.05080761 +0.02718288 +0.00490109 +0.00417936 +0.01302431 +0.01342031 +0.01449505 +0.01702639 +0.01002846 +0.00135636 +0.00615288 +0.00988699 +0.05511121 +0.13424085 +0.13549428 +0.12707625 +0.10175641 +0.09349026 +0.08078031 +0.10017768 +0.09641082 +0.05651959 +0.02388979 +0.03372757 +0.02807933 +0.06420366 +0.05765516 +0.10705915 +0.12931576 +0.06605592 +0.01316365 +0.00862626 +0.00548033 +0.00231362 +0.05162323 +0.02771896 +0.04052469 +0.06053808 +0.04970683 +0.04813053 +0.03046989 +0.00504421 +0.00297387 +0.00175442 +0.03428232 +0.16087463 +0.14309265 +0.11838740 +0.07561675 +0.07153413 +0.06790428 +0.03115408 +0.00911597 +0.03592220 +0.12518162 +0.14040351 +0.13036409 +0.08447693 +0.08117232 +0.06552082 +0.09590764 +0.13285699 +0.12561189 +0.06799156 +0.04766290 +0.04445734 +0.03842782 +0.02435055 +0.01544531 +0.01147488 +0.01724531 +0.10274742 +0.08165291 +0.02878892 +0.04548312 +0.05494404 +0.07406324 +0.12911624 +0.12757473 +0.11833390 +0.03788988 +0.01097155 +0.00298281 +0.00275654 +0.02835943 +0.14801164 +0.12368125 +0.11705162 +0.08316845 +0.07073751 +0.07032350 +0.07200280 +0.05796322 +0.03717402 +0.02600084 +0.02813455 +0.03365216 +0.03137246 +0.02250615 +0.06806763 +0.12442078 +0.12454491 +0.12151590 +0.09865309 +0.07201285 +0.05476528 +0.04899836 +0.04472922 +0.04327874 +0.03483583 +0.02293462 +0.01217319 +0.00345893 +0.00050839 +0.00024330 +0.00011198 +0.00018678 +0.00008502 +0.00005998 +0.00000075 diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt.meta new file mode 100644 index 00000000..707e996c --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6789c915ab4332b4f9a2a5e01a0b1d32 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.wav.meta b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.wav.meta new file mode 100644 index 00000000..74d0e3f8 --- /dev/null +++ b/Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Worry-002.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7bb958a26428f774dae23140e390d603 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset index 67768501..6ea78388 100644 --- a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2603c48b9b99ac3d88f6e9ef6a6c97774b498655f4e8f0ffef4fe027fca4065f -size 2138468 +oid sha256:e992b79ecf324fa1acf5e15edc232d5b54c6cda3122a5fd4eae33c337c66a839 +size 2138990 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 7c0cfd21..75738a83 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d8dc5e91fb819b2be295a6430496031232a3217462dde2c7e55f0e9be24451c -size 68115956 +oid sha256:75b64b2260d52d3fa41fdf7934157bc8ba6ccd255738159273b8fab030740c8b +size 68116183 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs index 267b2687..c63b44b2 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs @@ -1,5 +1,4 @@ using DG.Tweening; -using System; using System.Threading.Tasks; using UnityEngine; @@ -26,8 +25,9 @@ public class ShapeDetectionNPC : NPCController // 3 - player spoke into the radio // 4 - player pressed enter on keyboard // 5 - player inserted picture into printer - // 6 - shape scanner completed - // 7 - moving away + // 6 - player completed first shape scanner config + // 7 - shape scanner completed + // 8 - moving away private int state; private float lastPlayerApproachTime; @@ -43,7 +43,8 @@ public class ShapeDetectionNPC : NPCController radio.OnPlayerFinishedSpeaking += OnPlayerSpokeIntoRadio; printerInsertionHole.OnPlayerInsertedPrintable += OnPlayerInitiatedPrinting; computerPrinter.OnImagePrinted += OnPlayerPrintedImage; - shapeScanner.OnShapeScannerCompleted += OnShapeScannerCompleted; + shapeScanner.OnConfigCompleted += OnPlayerCompletedFirstConfiguration; + shapeScanner.OnAllCompleted += OnShapeScannerCompleted; } protected async override void OnPlayerApproach() @@ -132,10 +133,22 @@ public class ShapeDetectionNPC : NPCController } } + private void OnPlayerCompletedFirstConfiguration() + { + if (state == 5) + { + SpeakVoiceLine(6, radio.gameObject, radioAmount); + state = 6; + } + } + private void OnShapeScannerCompleted() { - state = 6; - questMarker.MoveTo(questMarkerPoint); + if (state == 6) + { + state = 7; + questMarker.MoveTo(questMarkerPoint); + } } private void MoveToNextPoint(int pointIndex) @@ -153,9 +166,9 @@ public class ShapeDetectionNPC : NPCController public async void OnPlayerEnteredRoom() { - if (state == 6) + if (state == 7) { - state = 7; + state = 8; staticRadio.SetActive(false); questMarker.gameObject.SetActive(false); await Task.Delay(2500); diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/ShapeScanner.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/ShapeScanner.cs index 64fa18ad..47bbf29e 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/ShapeScanner.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/ShapeScanner.cs @@ -35,11 +35,13 @@ public class ShapeScannerConfiguration public class ShapeScanner : MonoBehaviour { - public delegate void OnShapeScannerCompletedDelegate(); - public event OnShapeScannerCompletedDelegate OnShapeScannerCompleted; + public delegate void OnConfigCompletedDelegate(); + public event OnConfigCompletedDelegate OnConfigCompleted; + public delegate void OnAllCompletedDelegate(); + public event OnAllCompletedDelegate OnAllCompleted; [Header("Static References")] - public List configurations = new List(); + public List configurations = new(); public ShapeScannerRay rayPrefab; public Transform raySpawnCorner1; public Transform raySpawnCorner2; @@ -163,6 +165,8 @@ public class ShapeScanner : MonoBehaviour AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ShapeScannerSuccess, gameObject); if (!particles.isPlaying) particles.Play(); particles.Emit(100); + + OnConfigCompleted?.Invoke(); } private float CalculateCorrectPercentage() @@ -235,6 +239,6 @@ public class ShapeScanner : MonoBehaviour // Create line renderer from shape scanner to door card reader lineRenderer.enabled = true; - OnShapeScannerCompleted?.Invoke(); + OnAllCompleted?.Invoke(); } } diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank index 3b519117..e08be886 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank differ