Merge branch 'main' of http://nathantech.net:3000/CosmicRage/VIPMudCosmicRageScripts

readme.md

@@ -92,8 +92,7 @@ Move it to the folder of your choice, ensuring that the path contains no spaces
 - **Alt + F12**: Restart soundpack  
 - **F2**: Open server-side settings  
 - **Ctrl + S**: Save client-side settings  
-- **Alt + N**: Add a new string to be gagged
+- **Alt + N**: Open gag-related settings.
-- **Alt + F2**: Open the gag-related configuration manager
 - **Alt + F3**: Toggle Intro Music
 - ** Control + F2 and Control + F3**: Turn the client side main volume down and up respectively
 - **Shift + f1**: Toggle The Soundpack
@@ -101,6 +100,7 @@ Move it to the folder of your choice, ensuring that the path contains no spaces
 - **Shift + F2**: Bring up the interface to change the defined paths for scripts and sounds. Use at your own risk!
 - **Control+Shift+R**: Reload the soundpack.
 - **Control+`**: Toggle command displaying in the output window.
+- **Alt+Enter**: toggle numpad movement.
 ## FAQ
 
 **Q: My soundpack doesn't work. What now?**  

repair tool.bat

@@ -19,15 +19,15 @@ if %errorlevel%==0 (
 :: Reset scripts repo
 echo Resetting scripts repo to remote...
 pushd "%SCRIPTS_DIR%"
-%GIT% fetch origin
+call "%GIT%" fetch origin
-%GIT% reset --hard origin/main
+call "%GIT%" reset --hard origin/main
 popd
 
 :: Reset sounds repo
 echo Resetting sounds repo to remote...
 pushd "%SOUNDS_DIR%"
-%GIT% fetch origin
+call "%GIT%" fetch origin
-%GIT% reset --hard origin/main
+call "%GIT%" reset --hard origin/main
 popd
 
 echo Done.

scripts/aliases.set

@@ -1,7 +1,7 @@
 #var badaliases {music|StopMusic|sc|capture}
 #ForAll @badaliases {#gunalias %i}
 
-#Alias login {#gagon all; 1; %charInfo(name); #wait (0.1); #ungagon; %charInfo(password)}
+#Alias login {#alarm 1 {#gagon all; 1; %charInfo(name); #wait (0.1); #ungagon; %charInfo(password)}}
 #alias ActualSave {#if {%length(@decchar)>1 OR %length(@decchar)<1} {#say {Attention. Your decimal seperator was set incorrectly therefore it has been switched to default.};#var decchar .};
 #File 6 {settings.set} 1;
 #Var SettingsFileCounter 0;

scripts/gagcreator.set

@@ -1,51 +1,95 @@
-#alias addnewgag {#play {@sppath/general/misc/confman.wav} @vol;
+#alias addnewgag {#alarm 0@{decchar}10 {#play {@sppath/general/misc/confman.wav} @vol;
-#alarm 0@{decchar}100 {#say {This prompt allows one to add a string that they would like to be gagged either completely or just from the speach queue. In order to do this, please use the options below} VoiceOnly};
+#pick {*This prompt allows one to add a string that they would like to be gagged either completely or just from the speach queue. In order to do this, please use the options below:addnewgag|
-#pick {P:Creating a new gag|
+Note! Please ensure that the gag file you selected is enabled in the gag settings after you have added your new gag.:addnewgag|
 What line are we gagging today? @newgag:setgagline|
 What kind of the gagging method would you like? @gagmethod:setgagmethod|
 What file is this going to be stored in? @gagfile:setgagfile|
 I'm done and want to finish:pushnewgag|
-I didn't mean to use this, please abort:#abort}}
+I want to start over, clear the current input:clearnewgag|
+I didn't mean to use this, please abort.:#abort
+}
+}
+}
+
+#Alias clearnewgag {#unvar gagmethod;#unvar newgag;#unvar gagfile;#unvar gagsubvar;addnewgag}
 
 #alias setgagline {
-#alarm 0@{decchar}100 {#say {please enter the line that you would like to be  gagged, if parts of it are not static, E.G random numbers or words, replace this bit by an asterisc, *} VoiceOnly};
+#pick {*Please enter the text you would like to be gagged. Use an asterisk (*) in place of any static strings.:setgagline|
-#prompt newgag {Enter the line here.};
+For example, instead of "Bob hugs you," write "* hugs you" because the player name might not always be "Bob" in every situation within the game.:setgagline|
-addnewgag}
+Press enter to open the input field, @newgag:enternewgag
+}
+}
+
+#alias enternewgag {#prompt newgag {Enter the line here.};#alarm 0@{decchar}50 {addnewgag}}
 
 #alias setgagmethod {
-#alarm 0@{decchar}100 {#say {please choose one of the methods below:} VoiceOnly};
+#pick {*Please choose one of the methods below:setgagmethod|
-#pick {P:Method?|
+If you choose substitute, Please enter the text that you want to have displayed in place of the trigger. Use ~%0 for the entire line, and ~%1 to ~%9 for each wildcard (asterisk, *) you defined in the trigger.:setgagmethod|
 Omit the line from my speech queue but leave it in the output window:#var gagmethod voice|
-Omit the line both from the output window and from my speech queue:#var gagmethod all};
+Omit the line both from the output window and from my speech queue:#var gagmethod all|
-addnewgag}
+Substitute the text. Currently set to @gagsubvar:#Var gagmethod substitute;subgagtextenter
+};
+#alarm 0@{decchar}50 {addnewgag}
+}
+
+#alias subgagtextenter {#Prompt gagsubvar {Enter the substitution text here.}}
+
 #alias setgagfile {
-#alarm 0@{decchar}100 {#say {Due to VIPMud limitations, a file cannot exceed 32000 characters in length, this is why it is recommended to sort your gags into categories, so please choose from one of the files below:} VoiceOnly};
+#pick {*Due to VIPMud limitations, no single file can exceed 32000 characters in length. Therefore, it is recommended to organize content into categories. Please select one of the files from the options below.:setgagfile|
-#pick {P:What file are we using today?|
 Activity related gags:#var gagfile ActivityGags|
 Ship Related Gags:#var gagfile ShipGags|
 Miscellaneous gags:#var gagfile MiscGags|
 Vehicle Related gags:#var gagfile VehicleGags};
-addnewgag}
+#alarm 0@{decchar}50 {addnewgag}
+}
 
-#alias pushnewgag {#if {%length(@gagfile)<1 or %length(@gagmethod)<1 or %length(@newgag)<1} {#alarm 1 {#say {you have not filled out all the required fields with rellivant information}; #play {@sppath/general/misc/boop.wav} @vol;#abort}} {
+#alias pushnewgag {
-#file 3 {%CharInfo(MudName)/gags/@gagfile.set};
+#if {%length(@gagfile)<1 or %length(@gagmethod)<1 or %length(@newgag)<1} {
-#forall {@newgag} {
+  #alarm 0@{decchar}5 {
-#write 3 {~#trigger {%i} {~#gagline @gagmethod}}};
+    #play {@sppath/general/misc/boop.wav} @vol;
-#close 3;
+  #Say {Error: You have not filled out all the required fields with relevant information};
-#unload {gags/@gagfile.set};
+  #abort
-#load {gags/@gagfile.set};
+  }
-#unvar gagmethod;#unvar newgag;#unvar gagfile;#alarm 1 {#say {Complete!}; #play {@sppath/general/misc/loadingfile.wav} @vol}}}
+} {
+  #if {@gagmethod="substitute" AND %length(@gagsubvar)<1} {
+    #alarm 0@{decchar}5 {
+      #play {@sppath/general/misc/boop.wav} @vol;
+    #Say {Error: Substitution was selected, but you haven't entered valid substitute text};
+    #abort
+    }
+  } {
+    #file 3 {%CharInfo(MudName)/gags/@gagfile.set};
+          #if {@gagmethod="substitute"} {
+        #write 3 {~#trigger {@newgag} {~#sub {@gagsubvar}}}
+      } {
+        #write 3 {~#trigger {@newgag} {~#gagline @gagmethod}}
+    };
+    #close 3;
+    #unload {gags/@gagfile.set};
+    #load {gags/@gagfile.set};
+    #unvar gagmethod;
+    #unvar newgag;
+    #unvar gagfile;
+    #unvar gagsubvar;
+    #alarm 1 {
+      #say {Complete!};
+      #play {@sppath/general/misc/loadingfile.wav} @vol
+    }
+  }
+}
+};
 
 #alias miscgagtoggle {
-#if {@MiscGags="disabled"} {#var MiscGags "enabled";#load {@scpath/gags/MiscGags.set}} {#var MiscGags "disabled";#unload {@scpath/gags/gags.set}}}
+#if {@MiscGags="disabled"} {#var MiscGags "enabled";#load {%charinfo(mudname)/gags/MiscGags.set}} {#var MiscGags "disabled";#unload {%charinfo(mudname)/gags/miscgags.set}}}
 #alias vehiclegagtoggle {
-#if {@VehicleGags="disabled"} {#var VehicleGags "enabled"; #unload {@scpath/gags/VehicleGags.set}} {#var VehicleGags "disabled";#load {@scpath/gags/VehicleGags.set}}}
+#if {@VehicleGags="disabled"} {#var VehicleGags "enabled"; #load {%charinfo(mudname)/gags/VehicleGags.set}} {#var VehicleGags "disabled";#unload {%charinfo(mudname)/gags/VehicleGags.set}}}
 #alias activitygagtoggle {
-#if {@ActivityGags="disabled"} {#var ActivityGags "enabled";#load {@scpath/gags/ActivityGags.set}} {#var ActivityGags "disabled";#unload {@scpath/gags/ActivityGags.set}}}
+#if {@ActivityGags="disabled"} {#var ActivityGags "enabled";#load {%charinfo(mudname)/gags/ActivityGags.set}} {#var ActivityGags "disabled";#unload {%charinfo(mudname)/gags/ActivityGags.set}}}
 #alias shipgagtoggle {
-#if {@ShipGags="disabled"} {#var ShipGags "enabled";#load {@scpath/gags/ShipGags.set}} {#var ShipGags "disabled";#unload {@scpath/gags/ShipGags.set}}}
+#if {@ShipGags="disabled"} {#var ShipGags "enabled";#load {%charinfo(mudname)/gags/ShipGags.set}} {#var ShipGags "disabled";#unload {%charinfo(mudname)/gags/ShipGags.set}}}
 #alias gagconfig {#play {@sppath/general/misc/confman.wav} @vol;
-#pick {P:Please select an option below|
+#pick {*Please choose an option below:#abort|
+Create a new gag:addnewgag|
 Activity-related gags (@ActivityGags):activitygagtoggle|
 Ship-related gags (@ShipGags):shipgagtoggle|
 Vehicle-related gags (@VehicleGags):vehiclegagtoggle|

scripts/keys.set

@@ -1,5 +1,5 @@
 ;unneeded keys
-#var badkeys {numpad2|numpad4|numpad5|numpad8|numpad9|numpad/|numpad*|control-a|shift-pageup|shift-pagedown|control-pageup|control-pagedown}
+#var badkeys {numpad2|numpad4|numpad5|numpad6|numpad8|numpad9|numpad/|numpad*|control-a|shift-pageup|shift-pagedown|control-pageup|control-pagedown}
 #ForAll @badkeys {#gunkey %i}
 ;buffer keys
 #key {Alt-shift-right} {~buffer~ add}
@@ -55,7 +55,6 @@
 #key {Shift-alt-f9} {~@sp-settings Interrupt OOC Social sounds when the next one plays}
 #key {f2} {~@sp-settings}
 #key {control-s} {ActualSave;#say {Client-side Soundpack Settings have been saved successfully!} VoiceOnly}
-#key {alt-n} {addnewgag}
 #key {alt-shift-h} {localsphelp}
 #key {Shift-f1} {~@sp-toggle}
 #key {control-f2} {mainvoldown}
@@ -82,4 +81,6 @@
   }
 }
 #key {alt-shift-enter} {~@buffer link}
-#key {alt-f1} {decimalpick}
+#key {alt-f1} {decimalpick}
+#key {alt-n} {gagconfig}
+#key {alt-enter} {#if {@numpadon="disabled"} {#var numpadon "enabled" ; #load {@scpath/numpad.set} ; #play {@sppath/general/misc/on.wav} @vol;#say {Numpad movement enabled.} VoiceOnly} {#var numpadon "disabled" ; #unload {@scpath/numpad.set} ; #play {@sppath/general/misc/off.wav} @vol;#say {Numpad movement disabled} VoiceOnly}}

scripts/main.set

@@ -1,7 +1,7 @@
 ;core variables
-#var clientversion 11
+#var clientversion 13
 #var loadtask {soundpack|keys|aliases|updator|misc|gagcreator|pathupdator}
-#var settings {rawpass|miscgags|shipgags|vehiclegags|activitygags|intromusic|vol|commandsinoutput|devmode|decchar}
+#var settings {rawpass|miscgags|shipgags|vehiclegags|activitygags|intromusic|vol|commandsinoutput|devmode|decchar|numpadon}
 #var speech "disabled"
 #if {%volume<100} {#pc 0 volume 100}
 ;Initialising the script files
@@ -27,3 +27,4 @@
 #if {@miscgags = "enabled"} {#load {gags/miscgags.set}}
 #if {@devmode="enabled"} {#load {@scpath/dev.set}}
 #if {%defined(decchar)=0 or %length(@decchar)<1} {#var decchar .}
+#If {@numpadon="enabled"} {#load @scpath/numpad.set}

scripts/numpad.set

@@ -0,0 +1,35 @@
+#key {numpad1} {southwest}
+#key {numpad2} {south}
+#key {numpad3} {southeast}
+#key {numpad4} {west}
+#key {numpad5} {look}
+#key {numpad6} {east}
+#key {numpad7} {northwest}
+#key {numpad8} {north}
+#key {numpad9} {northeast}
+#key {numpad0} {exits}
+#key {Control-NUMPAD1} {southwestup}
+#key {Control-NUMPAD2} {southup}
+#key {Control-NUMPAD3} {southeastup}
+#key {Control-NUMPAD4} {westup}
+#key {Control-NUMPAD6} {eastup}
+#key {Control-NUMPAD7} {northwestup}
+#key {Control-NUMPAD8} {northup}
+#key {Control-NUMPAD9} {northeastup}
+#key {Control-Alt-NUMPAD1} {southwestdown}
+#key {Control-Alt-NUMPAD2} {southdown}
+#key {Control-Alt-NUMPAD3} {southeastdown}
+#key {Control-Alt-NUMPAD4} {westdown}
+#Key {Control-Alt-NUMPAD5} {go}
+#key {Control-Alt-NUMPAD6} {eastdown}
+#key {Control-Alt-NUMPAD7} {northwestdown}
+#key {Control-Alt-NUMPAD8} {northdown}
+#key {Control-Alt-NUMPAD9} {northeastdown}
+#key {NUMPAD*} {in}
+#key {Control-NUMPAD*} {out}
+#Key {NUMPADDASH} {up}
+#Key {NUMPADPLUS} {down}
+#Key {Control-NUMPADDASH} {upstairs}
+#Key {Control-NUMPADPLUS} {downstairs}
+#Key {Control-Alt-NUMPADDASH} {climbup}
+#Key {Control-Alt-NUMPADPLUS} {climbdown}