diff --git a/Miriani/AtmoSalvage.tin b/Miriani/AtmoSalvage.tin index e6d32b8..5768891 100755 --- a/Miriani/AtmoSalvage.tin +++ b/Miriani/AtmoSalvage.tin @@ -157,7 +157,9 @@ #ACTION {^Warning, avian lifeform in processing chamber. Expelling...$} { - play ACV/AvianExpulsion@rnd{38}.wav + play Atmo/SalvageLifeForm.wav; + play ACV/AvianExpulsion@rnd{38}.wav; + #line gag; } {5} diff --git a/Miriani/Comm.tin b/Miriani/Comm.tin index 1415562..43e29e8 100755 --- a/Miriani/Comm.tin +++ b/Miriani/Comm.tin @@ -35,7 +35,8 @@ #list {Buffer[@GetBufferNumber{General}][Messages]} ADD {%1}; UpdateBuffer Comm; #list {Buffer[@GetBufferNumber{Comm}][Messages]} ADD {[General] %1}; - #line gag + #line gag; + #showme {This line has been gagged.} } {5} @@ -47,6 +48,16 @@ UpdateBuffer Comm; #list {Buffer[@GetBufferNumber{Comm}][Messages]} ADD {[Short-range] %1} } + +#ACTION {^%* flight control scanner announce%*} +{ + play General/Comm/FlightScanner.wav; + play General/Comm/FlightScanner.wav + UpdateBuffer Sflight-control; + #list {Buffer[@GetBufferNumber{flight-control}][Messages]} ADD {%1}; + UpdateBuffer Comm; + #list {Buffer[@GetBufferNumber{Comm}][Messages]} ADD {[flight-control] %1} +} {5} #ACTION {^[Newbie]} @@ -54,7 +65,10 @@ play General/Comm/Newbie.wav } {5} - +#ACTION {^[%?%?%?] %* transmits, %*} +{ + play General/Comm/org.wav; +} #ACTION {^[{AIE|Commonwealth|Hale}} { play General/Comm/alliance.wav @@ -125,6 +139,7 @@ UpdateBuffer CM; #list {Buffer[@GetBufferNumber{CM}][Messages]} ADD {%1}; } + {5} #SUBSTITUTE {^You press a small button mounted on the wall and say, "%1"} {%1} {5} diff --git a/Miriani/FC-Scanner.tin b/Miriani/FC-Scanner.tin index c0f154e..993eb90 100644 --- a/Miriani/FC-Scanner.tin +++ b/Miriani/FC-Scanner.tin @@ -9,7 +9,7 @@ #ACTION {{you|You} hear a %* flight control scanner announce, "%*"} { #showme {%3}; - play General/Comm/Flight.wav; + play General/Comm/FlightScanner.wav; UpdateBuffer Flight; #list {Buffer[@GetBufferNumber{Flight}][Messages]} Add {%3}; #line gag diff --git a/Miriani/Miriani.tin b/Miriani/Miriani.tin index 07da51b..0c2f299 100755 --- a/Miriani/Miriani.tin +++ b/Miriani/Miriani.tin @@ -8,8 +8,7 @@ #ACTION {^The deck beneath you vibrates slightly as the relativity drive begins accelerating the starship through space.$} { - play General/Misc/Beep1.wav; - play Ship/Move/Accelerate.wav + play Ship/Move/Accelerate1.wav } {5} @@ -27,7 +26,7 @@ #ACTION {^The sounds of the relativity drive slowly cease as the starship comes to a halt.$} { - play Ship/Move/Decelerate.wav + play Ship/Move/Decelerate1.wav } {5} @@ -73,6 +72,10 @@ { play Ship/Move/ftl.wav } +#ACTION {^Precision Wormhole Drive is powering up %*} +{ + play Ship/Move/PreciseFTL.wav +} {5} #ACTION {^You hear a sharp whine as the starship begins an intrasector slip.$} diff --git a/Miriani/Misc.tin b/Miriani/Misc.tin index 3d19320..28405bf 100755 --- a/Miriani/Misc.tin +++ b/Miriani/Misc.tin @@ -244,12 +244,26 @@ { play prompt.wav } - +#ACTION {^[Type a line of input or `@abort' to abort the command.]} +{ + play prompt.wav +} #ACTION {[Enter "yes" or "no"]} { play prompt.wav } - +#ACTION {^Input your selection:} +{ + play prompt.wav +} +#ACTION {^Enter your selection:} +{ + play prompt.wav; +} +#ACTION {^Enter your selection or enter @abort to not purchase this item.} +{ + play prompt.wav; +} #ACTION {^A few sparks rise} { play Gneral/Misc/Fireplace.wav; diff --git a/Miriani/Ship-Comm.tin b/Miriani/Ship-Comm.tin index 76cf6ca..beeefb6 100755 --- a/Miriani/Ship-Comm.tin +++ b/Miriani/Ship-Comm.tin @@ -2,7 +2,7 @@ #ACTION {^[PA] %1} { - play Ship/Comm/intercom1.wavv; + play Ship/Comm/pa@rnd{9}.wav; UpdateBuffer PA; #list {Buffer[@GetBufferNumber{PA}][Messages]} ADD {%1} } @@ -10,14 +10,23 @@ #ACTION {^You press a small button mounted on the wall and %1} { - play Ship/Comm/intercom1.wav;#show [PA] You %1;#line gag + play Ship/Comm/pa@rnd{9}.wav; + #show [PA] You %1;#line gag } {5} #action {^%1's voice comes over the intercom, saying, "%2"} {#show [PA] %1 says, "%2";#line gag} {5} -#action {%1 over the intercom.$} {#show [PA] %1;#line gag} +#action {%1 over the intercom.$} +{ + #show [PA] %1; + #line gag +} -#action {%1 into a small microphone mounted on the wall.$} {#show [PA] %1;#line gag} +#action {%1 into a small microphone mounted on the wall.$} +{ + #show [PA] %1;# + line gag +} #CLASS {Ship-Comm} CLOSE diff --git a/Miriani/Ship-Computer.tin b/Miriani/Ship-Computer.tin index 3be22a4..d1d2abb 100644 --- a/Miriani/Ship-Computer.tin +++ b/Miriani/Ship-Computer.tin @@ -129,7 +129,18 @@ { play Ship/Computer/ScanRetrieved.wav } - +#ACTION {^Name %* # %* Units} +{ + play Ship/Computer/Display.wav; +} +#ACTION {^Charge Readout:} +{ + play Ship/Computer/Display.wav; +} +#ACTION {^Objects %* Direction %* Lightyears %* Coordinates %*} +{ + play Ship/Computer/LRScan@rnd{4}.wav; +} #ALIAS {g} { use survey diff --git a/Miriani/Ship-Misc.tin b/Miriani/Ship-Misc.tin index 5c4b5f5..4c19d6b 100755 --- a/Miriani/Ship-Misc.tin +++ b/Miriani/Ship-Misc.tin @@ -163,7 +163,22 @@ play Ship/Misc/Salvage@rnd{3}.wav; #line gag } - +#ACTION {%1 pieces of debris salvaged.} +{ + play Ship/Misc/Salvage@rnd{3}.wav; +} +#ACTION {%1 piece of debris salvaged} +{ + play Ship/Misc/Salvage@rnd{3}.wav; +} +#ACTION {Salvage line energy emitters linked. Beginning salvage sweep...} +{ +#line gag +} +#ACTION {You watch as the salvage lines slowly wind their way to what %*} +{ + #line gag +} #ACTION {You hear a thunk as a video probe is launched.} { play Ship/Misc/VideoProbe.wav diff --git a/Miriani/Sounds/Ship/Move/Accelerate1.wav b/Miriani/Sounds/Ship/Move/Accelerate1.wav new file mode 100644 index 0000000..ae4f0a8 Binary files /dev/null and b/Miriani/Sounds/Ship/Move/Accelerate1.wav differ diff --git a/Miriani/Sounds/Ship/Move/Decelerate1.wav b/Miriani/Sounds/Ship/Move/Decelerate1.wav new file mode 100644 index 0000000..12fe04c Binary files /dev/null and b/Miriani/Sounds/Ship/Move/Decelerate1.wav differ diff --git a/Miriani/Sounds/Ship/Move/Slip.wav b/Miriani/Sounds/Ship/Move/Slip.wav old mode 100755 new mode 100644 diff --git a/Miriani/Sounds/Ship/Move/Subwarp.wav b/Miriani/Sounds/Ship/Move/Subwarp.wav old mode 100755 new mode 100644