diff --git a/numberstation.go b/numberstation.go index b82fc06..9a25fec 100644 --- a/numberstation.go +++ b/numberstation.go @@ -27,7 +27,7 @@ const ( func main() { // Define and parse the flags repeat := flag.Bool("r", false, "Repeat each section separated by space, '-', '_', or a new line") - low := flag.Bool("l", false, "Use lower pitched SAM sound bank") + altvoice := flag.Bool("a", false, "Use alternate (lower pitched) SAM sound bank") flag.Usage = func() { fmt.Fprintf(os.Stderr, "Usage: %s [options]\n", os.Args[0]) @@ -48,10 +48,10 @@ func main() { flag.Parse() - // Select the correct file prefix based on the low flag + // Select the correct file prefix based on the altvoice flag prefix := "sam" - if *low { - prefix = "losam" + if *altvoice { + prefix = "altsam" } // Create a map to store sound data for each character diff --git a/sound/losam0.wav b/sound/altsam0.wav similarity index 100% rename from sound/losam0.wav rename to sound/altsam0.wav diff --git a/sound/losam1.wav b/sound/altsam1.wav similarity index 100% rename from sound/losam1.wav rename to sound/altsam1.wav diff --git a/sound/losam2.wav b/sound/altsam2.wav similarity index 100% rename from sound/losam2.wav rename to sound/altsam2.wav diff --git a/sound/losam3.wav b/sound/altsam3.wav similarity index 100% rename from sound/losam3.wav rename to sound/altsam3.wav diff --git a/sound/losam4.wav b/sound/altsam4.wav similarity index 100% rename from sound/losam4.wav rename to sound/altsam4.wav diff --git a/sound/losam5.wav b/sound/altsam5.wav similarity index 100% rename from sound/losam5.wav rename to sound/altsam5.wav diff --git a/sound/losam6.wav b/sound/altsam6.wav similarity index 100% rename from sound/losam6.wav rename to sound/altsam6.wav diff --git a/sound/losam7.wav b/sound/altsam7.wav similarity index 100% rename from sound/losam7.wav rename to sound/altsam7.wav diff --git a/sound/losam8.wav b/sound/altsam8.wav similarity index 100% rename from sound/losam8.wav rename to sound/altsam8.wav diff --git a/sound/losam9.wav b/sound/altsam9.wav similarity index 100% rename from sound/losam9.wav rename to sound/altsam9.wav diff --git a/sound/losama.wav b/sound/altsama.wav similarity index 100% rename from sound/losama.wav rename to sound/altsama.wav diff --git a/sound/losamb.wav b/sound/altsamb.wav similarity index 100% rename from sound/losamb.wav rename to sound/altsamb.wav diff --git a/sound/losamc.wav b/sound/altsamc.wav similarity index 100% rename from sound/losamc.wav rename to sound/altsamc.wav diff --git a/sound/losamd.wav b/sound/altsamd.wav similarity index 100% rename from sound/losamd.wav rename to sound/altsamd.wav diff --git a/sound/losame.wav b/sound/altsame.wav similarity index 100% rename from sound/losame.wav rename to sound/altsame.wav diff --git a/sound/losamf.wav b/sound/altsamf.wav similarity index 100% rename from sound/losamf.wav rename to sound/altsamf.wav diff --git a/sound/losamg.wav b/sound/altsamg.wav similarity index 100% rename from sound/losamg.wav rename to sound/altsamg.wav diff --git a/sound/losamh.wav b/sound/altsamh.wav similarity index 100% rename from sound/losamh.wav rename to sound/altsamh.wav diff --git a/sound/losami.wav b/sound/altsami.wav similarity index 100% rename from sound/losami.wav rename to sound/altsami.wav diff --git a/sound/losamj.wav b/sound/altsamj.wav similarity index 100% rename from sound/losamj.wav rename to sound/altsamj.wav diff --git a/sound/losamk.wav b/sound/altsamk.wav similarity index 100% rename from sound/losamk.wav rename to sound/altsamk.wav diff --git a/sound/losaml.wav b/sound/altsaml.wav similarity index 100% rename from sound/losaml.wav rename to sound/altsaml.wav diff --git a/sound/losamm.wav b/sound/altsamm.wav similarity index 100% rename from sound/losamm.wav rename to sound/altsamm.wav diff --git a/sound/losamn.wav b/sound/altsamn.wav similarity index 100% rename from sound/losamn.wav rename to sound/altsamn.wav diff --git a/sound/losamo.wav b/sound/altsamo.wav similarity index 100% rename from sound/losamo.wav rename to sound/altsamo.wav diff --git a/sound/losamp.wav b/sound/altsamp.wav similarity index 100% rename from sound/losamp.wav rename to sound/altsamp.wav diff --git a/sound/losamq.wav b/sound/altsamq.wav similarity index 100% rename from sound/losamq.wav rename to sound/altsamq.wav diff --git a/sound/losamr.wav b/sound/altsamr.wav similarity index 100% rename from sound/losamr.wav rename to sound/altsamr.wav diff --git a/sound/losams.wav b/sound/altsams.wav similarity index 100% rename from sound/losams.wav rename to sound/altsams.wav diff --git a/sound/losamt.wav b/sound/altsamt.wav similarity index 100% rename from sound/losamt.wav rename to sound/altsamt.wav diff --git a/sound/losamu.wav b/sound/altsamu.wav similarity index 100% rename from sound/losamu.wav rename to sound/altsamu.wav diff --git a/sound/losamv.wav b/sound/altsamv.wav similarity index 100% rename from sound/losamv.wav rename to sound/altsamv.wav diff --git a/sound/losamw.wav b/sound/altsamw.wav similarity index 100% rename from sound/losamw.wav rename to sound/altsamw.wav diff --git a/sound/losamx.wav b/sound/altsamx.wav similarity index 100% rename from sound/losamx.wav rename to sound/altsamx.wav diff --git a/sound/losamy.wav b/sound/altsamy.wav similarity index 100% rename from sound/losamy.wav rename to sound/altsamy.wav diff --git a/sound/losamz.wav b/sound/altsamz.wav similarity index 100% rename from sound/losamz.wav rename to sound/altsamz.wav diff --git a/winbatch/encode-and-play.bat b/winbatch/encode-and-play.bat index 4a98f8e..97c292a 100755 --- a/winbatch/encode-and-play.bat +++ b/winbatch/encode-and-play.bat @@ -17,8 +17,8 @@ set /p gsize="Enter the number group size: " :: Ask whether to repeat number groups set /p repeat="Do you want to repeat number groups (y/N)? " -:: Ask whether to use the low voice -set /p lowvoice="Do you want to use the low voice (y/N)? " +:: Ask whether to use the alt voice +set /p lowvoice="Do you want to use the alternate voice (y/N)? " :: Ask for the message input echo. @@ -33,10 +33,10 @@ if /i "%repeat%"=="y" ( echo Not repeating number groups. ) -:: Check if the user wants to use the low voice +:: Check if the user wants to use the alt voice if /i "%lowvoice%"=="y" ( - echo Using low voice with the -l flag. - set flags=%flags% -l + echo Using alternate voice with the -a flag. + set flags=%flags% -a ) else ( echo Using default voice. ) diff --git a/winbatch/run-numberstation.bat b/winbatch/run-numberstation.bat index e6b6a6c..1e4a5c3 100755 --- a/winbatch/run-numberstation.bat +++ b/winbatch/run-numberstation.bat @@ -4,8 +4,8 @@ setlocal :: Ask whether to repeat number groups set /p repeat="Do you want to repeat number groups (y/N)? " -:: Ask whether to use the losam voice -set /p lowvoice="Do you want to use the low voice (y/N)? " +:: Ask whether to use the alt voice +set /p lowvoice="Do you want to use the alternate voice (y/N)? " :: Initialize flags set flags= @@ -18,16 +18,20 @@ if /i "%repeat%"=="y" ( echo Not repeating number groups. ) -:: Check if the user wants to use the low voice +:: Check if the user wants to use the alt voice if /i "%lowvoice%"=="y" ( - echo Using low voice with the -l flag. - set flags=%flags% -l + echo Using alternate voice with the -a flag. + set flags=%flags% -a ) else ( echo Using default voice. ) :: Run the numberstation.exe with the appropriate flags -numberstation.exe %flags% +if defined flags ( + numberstation.exe %flags% +) else ( + numberstation.exe +) :: Pause before exit pause