diff --git a/DATA/AUDIO/harrison_voice_m14.utf b/DATA/AUDIO/harrison_voice_m14.utf index a4763b23..717bcb9b 100644 Binary files a/DATA/AUDIO/harrison_voice_m14.utf and b/DATA/AUDIO/harrison_voice_m14.utf differ diff --git a/DATA/AUDIO/voices_mission14.ini b/DATA/AUDIO/voices_mission14.ini index 83000ac5..0f1c8eb0 100644 --- a/DATA/AUDIO/voices_mission14.ini +++ b/DATA/AUDIO/voices_mission14.ini @@ -8,6 +8,22 @@ script = SC_MLBODY_CHRB_IDLE_SMALL_000LV_XA_07 msg = DX_M14_0000_HARRISON attenuation = -6 +[Sound] +msg = DX_M14_0001_HARRISON +attenuation = -6 + +[Sound] +msg = DX_M14_0002_HARRISON +attenuation = -6 + +[Sound] +msg = DX_M14_0003_HARRISON +attenuation = -6 + +[Sound] +msg = DX_M14_0004_HARRISON +attenuation = -6 + [Sound] msg = DX_M14_0005_HARRISON attenuation = -6 diff --git a/DATA/MISSIONS/M13/m13.ini b/DATA/MISSIONS/M13/m13.ini index 1da2eb34..dfa74126 100644 --- a/DATA/MISSIONS/M13/m13.ini +++ b/DATA/MISSIONS/M13/m13.ini @@ -2601,9 +2601,10 @@ nickname = rem_space_harrison01 ;system = Li01 Cnd_PopUpDialog = CLOSE Act_AdjAcct = 2000000 -Cnd_SpaceEnter = Li01 +;Cnd_SpaceEnter = Li01 +Cnd_LocEnter = deck, li01_09_base ;Act_SendComm = king, Player, DX_M13_0840_KING -Cnd_Timer = 12 +Cnd_Timer = 15 ;Act_EtherComm = juni_voice_m01a, 216116, Player, dx_m01_1580_juni, -1, pl_female4_head, li_hatcher_body ;Act_EtherComm = juni, 216200, Player, dx_m02_0000_Juni, -1, pl_female4_head, li_hatcher_body ;Act_EtherComm = juni, 216200, Player, dx_m04_0000_JUNI, -1, pl_female4_head, li_hatcher_body @@ -2635,12 +2636,35 @@ nickname = rem_cityscape01 ;Cnd_RTCDone = missions\REM_ARCs\m014a_s003x_li01_01_nrml.ini Act_Popupdialog = 600030, 600031, CLOSE Act_ActTrig = rem_space_harrison02 +Act_ActTrig = bsx_newnnobj [Trigger] nickname = rem_space_harrison02 +Cnd_PopUpDialog = CLOSE +Cnd_Timer = 2 +Act_ActTrig = rem_space_harrison03 + +[NNObjective] +nickname = mlog_meetking +state = HIDDEN +type = navmarker, Li01, 21880, 21800, -33267, 0, -28810 + +[Trigger] +nickname = bsx_newnnobj +Cnd_BaseExit = Li01_01_Base +Act_SetNNObj = mlog_meetking + +[Trigger] +nickname = rem_space_harrison03 system = Li01 -Cnd_SpaceEnter = Li01 +;Cnd_SpaceEnter = Li01 +Cnd_BaseExit = li01_01_base +Cnd_Timer = 10 Act_AdjAcct = 2000000 +Act_EtherComm = harrison_voice_m14, 227159, Player, dx_m14_0001_HARRISON, -1, rh_captain_head, li_rockford_body +Act_EtherComm = harrison_voice_m14, 227159, Player, dx_m14_0002_HARRISON, -1, rh_captain_head, li_rockford_body +Act_EtherComm = harrison_voice_m14, 227159, Player, dx_m14_0003_HARRISON, -1, rh_captain_head, li_rockford_body +Act_EtherComm = harrison_voice_m14, 227159, Player, dx_m14_0004_HARRISON, -1, rh_captain_head, li_rockford_body Act_ActTrig = rem_rochester_harrison01 [Trigger] @@ -2655,12 +2679,13 @@ Act_ActTrig = rem_deck03 nickname = rem_deck03 Cnd_RTCDone = missions\REM_ARCs\m014a_s004x_li01_01_nrml.ini Act_Popupdialog = 600030, 600036, CLOSE -Act_ActTrig = rem_space_harrison03 +Act_ActTrig = rem_space_harrison04 [Trigger] -nickname = rem_space_harrison03 +nickname = rem_space_harrison04 system = Li01 -Cnd_SpaceEnter = Li01 +;Cnd_SpaceEnter = Li01 +Cnd_BaseExit = li13_01_base Cnd_Timer = 15 Act_AdjAcct = 2000000 Act_EtherComm = rebus_voice_m14, 600019, Player, dx_m14_0000_Rebus, -1, sh_female2_rebus_head, pl_female1_rebus_peasant_body_bust @@ -2696,6 +2721,10 @@ Line = Player, Player, DX_M14_0010_TRENT [Trigger] nickname = rem_buffalo_rebus +;Cnd_CommComplete = DX_M01_0000_FREEPORT_7_BRIDGE +;Act_PlayMusic = none, none, none, music_srtc_second_cue, 2 +;Act_CallThorn = missions\m01a\m01a_fp7_02b.thn, fp7base +;Act_SetNNObj = mlog_job ; REM end