[mw-devel] [Git][arthur/mw][master] Remove some outdated/silly/personal gags

Andrew Price welshbyte at sucs.org
Mon Oct 30 12:29:57 GMT 2017


Andrew Price pushed to branch master at Justin Mitchell / mw


Commits:
943d7903 by Andrew Price at 2017-10-30T12:21:46+00:00
Remove some outdated/silly/personal gags

- - - - -


3 changed files:

- src/server/gags.c
- src/server/gagtable.c
- talkhelp/gag


Changes:

=====================================
src/server/gags.c
=====================================
--- a/src/server/gags.c
+++ b/src/server/gags.c
@@ -10,7 +10,6 @@
 #include "talker_privs.h"
 #include "gags.h"
 
-/* local prototypes */
 void gag_normal(char *text);
 void gag_chef(char *text);
 void gag_kraut(char *text);
@@ -22,21 +21,15 @@ void gag_censor(char *text);
 void gag_wibble(char *text);
 void gag_swab(char *text);
 void gag_strfry(char *text);
-void gag_tnarg(char *text);
 void gag_furby(char *text);
 void gag_warez(char *text);
 void gag_bunny(char *text);
 void gag_duck(char *text);
-void gag_saya(char *text);
 void gag_morse(char *text);
-void gag_annoy(char *text);
 void gag_french(char *text);
 void gag_babel(char *text);
 void gag_nosport(char *text);
 void gag_ack(char *text);
-void gag_hazelesque(char *text);
-void gag_pklong(char *text);
-void gag_unreturnable(char *text);
 static char *apply_bork(char *text, const gag_pattern_t *list, int caps);
 
 /****
@@ -88,10 +81,6 @@ GagInfo gaglist[]={
    "You have just been Strfry'd. Your text will now go manky :)",
    "You have been DeStrfry'd. You can now talk normally",
    gag_strfry},
-{"tnarg","Tnarg", "UnTnargian",
-   "You have just been Tnarged. You feil the powwer ov speach sliping away from ewe",
-   "You have been UnTnargian'd. You can now talk normally",
-   gag_tnarg},
 {"furby","Furby", "UnFurby",
    "You have just been Furby'd. There are cries of 'ahh, how cute!' and 'someone shut that thing up!' :)",
    "You have been Un-Furby'd. You're not cute and annoying anymore! :(",
@@ -104,10 +93,6 @@ GagInfo gaglist[]={
    "You have just switched to duck-mode",
    "You are no longer quackers!",
    gag_duck},
-{"saya","Saya", "De-saya",
-   "You will be perpetually eating",
-   "You can now stop eating!",
-   gag_saya},
 {"bunny","Bunny", "UnBunny",
    "You have just switched to bunny-mode",
    "You have stopped being a bunny",
@@ -116,10 +101,6 @@ GagInfo gaglist[]={
    "You have just been taught Morse Code. Pity you forgot the other languages you knew...",
    "You just remembered know to communicate properly! Now stop talking Morse!",
    gag_morse},
-{"annoy","Annoy", "Un-Annoy",
-   "You have just been annoyed.... :)",
-   "You shrug off the annoyance.",
-   gag_annoy},
 {"french","Frenchify", "DeFrenchify",
    "You now speck Onglish leek a fronchman...",
    "Your English improves again...",
@@ -136,18 +117,6 @@ GagInfo gaglist[]={
    "You have been zapped by a ray-gun and turned into a martian",
    "You are human again",
    gag_ack},
-{"hazelesque","Hazelesque","De-Hazelesque",
-	"You have just been switched to Hazelesque mode",
-	"You have just been De-Hazelesqued",
-	gag_hazelesque},
-{"pklong","pklong","De-pklong",
-	"You have just been made to love Disney",
-	"Your love of Disney has faded",
-	gag_pklong},
-{"unreturnable","unreturnable","De-unreturnable",
-    "You have just been made to love node.js and all things hipster...",
-    "Your affinity for javascript slowly fades away and you begin to make rational language choices again...",
-	gag_unreturnable},
 {NULL, NULL, NULL, NULL, NULL, NULL},
 };
 
@@ -399,17 +368,6 @@ void gag_strfry(char *text)
 #endif
 }
 
-static char *duplstr(char *text)
-{
-	char *c;
-	int i;
-	c=(char *)malloc(strlen(text)+1);
-	for (i=0;i<strlen(text);i++)
-		c[i]=tolower(text[i]);
-	c[strlen(text)]=0;
-	return(c);
-}
-
 const char *gag_type(int type)
 {
 	GagInfo *gi = gag_find(type);
@@ -464,37 +422,6 @@ int gag_code(const char *str)
  * the gag filters
  */
 
-/* tnarg dyslexication filter */
-void gag_tnarg(char *text)
-{
-	char *buff = duplstr(text);
-	const char *match_list[] = { "buffy", "willow", "slayer", "vampire",
-				"cordelia", "sex", "cordy", "3-some", "cordie",
-				"cordi", "three-some", "three some", "shag",
-				"lesbian", "sauce", "mayonaise", "cream", NULL };
-	int match = 0;
-	int ptr = 0;
-	char temp[MAXTEXTLENGTH];
-
-	while (match_list[ptr] != NULL)
-	{
-		if (strstr(buff, match_list[ptr]) != NULL)
-		{
-			match = 1;
-			break;
-		}
-		ptr++;
-	}
-	free(buff);
-
-	snprintf(temp, MAXTEXTLENGTH-1, "%s", apply_bork(text, tnarg, 0));
-
-	if (match)
-		snprintf(text, MAXTEXTLENGTH-1, "%s ( Mmmm... Buffy <drooool> )", temp);
-	else
-		snprintf(text, MAXTEXTLENGTH-1, "%s", temp);
-}
-
 /* make you talk like a furby */
 void gag_furby(char *text)
 {
@@ -533,12 +460,6 @@ void gag_duck(char *text)
 	gag_wordrep(text,"quack");
 }
 
-/* turn all words into 'quack' */
-void gag_saya(char *text)
-{
-        gag_wordrep(text,"am ");
-}
-
 static const char *lookup_morse(const char c)
 {
 	switch(toupper(c))
@@ -620,12 +541,6 @@ void gag_morse(char *text)
 	free(out);
 }
 
-/* annoyance filter */
-void gag_annoy(char *text)
-{
-	snprintf(text, MAXTEXTLENGTH-1, "%s", apply_bork(text, annoy, 0));
-}
-
 /* 'allo 'allo 'french' gag */
 void gag_french(char *text)
 {
@@ -644,11 +559,6 @@ void gag_nosport(char *text)
 	snprintf(text, MAXTEXTLENGTH-1, "%s", apply_bork(text, nosport, 0));
 }
 
-void gag_unreturnable(char *text)
-{
-	snprintf(text, MAXTEXTLENGTH-1, "%s", apply_bork(text, unreturnable, 0));
-}
-
 #define MAX_WORDS 30
 
 /* Mars Attacks! */
@@ -764,17 +674,6 @@ void gag_ack(char *text)
     }
 }
 
-void gag_hazelesque(char *text)
-{
-	gag_wordrep(text,"heh ");
-}
-
-void gag_pklong(char *text)
-{
-	gag_wordrep(text,"disney ");
-}
-
-
 /**
  * old style lookup table gag filters
  **/


=====================================
src/server/gagtable.c
=====================================
--- a/src/server/gagtable.c
+++ b/src/server/gagtable.c
@@ -361,125 +361,6 @@ const gag_pattern_t wibble[]={
 {"z","ble"},
 {NULL,NULL}};
 
-const gag_pattern_t annoy[]={
-{ "^xtreme", "ShriekFM" },
-{ "^x-treme", "C-Air" },
-{ "^marlboros$", "nappies" },
-{ "^marlboro$", "nappy" },
-{ "^marlboro's$", "marrowbone" },
-{ "wilder", "w**ker" },
-{ "microsoft", "micro$haft" },
-{ "bill gates", "satan" },
-{ "billgates", "satan" },
-{ "caress", "cuddle" },
-{ "solaris", "SlowArse" },
-{ "eiffel", "Eyefull" },
-{ "^LIS$", "Lesbian Iguana Shaggers" },
-{ "^ACU$", "Archaic Crashing Unit" },
-{ "^L.I.S$", "Lesbian Iguana Shaggers" },
-{ "^A.C.U$", "Archaic Crashing Unit" },
-{ "Swansea Bay", "Swansea Sewage Works" },
-{ "^IE4$", "Internet Exploder 4" },
-{ "Internet Explorer", "Internet Exploder" },
-{ "Netscape", "Nutscrape" },
-{ "^IE$", "Internet Exploder" },
-{ "^IE%", "Internet Exploder " },
-{ "fish", "<censored>" },
-{ "duck", "<censored>" },
-{ "bunny", "<censored>" },
-{ "wibble", "<censored>" },
-{ "fairy nuff", "fairy snuff"},
-{ "fair enough", "furry muff"},
-{ "Chemistry", "Ministry of Funny Smells"},
-{NULL,NULL}};
-
-
-/* This is an actual realword English->Tnarg filter - please do not add 'odd'
- * words to it.  Anything going in here must be based on real Tnargian that is
- * used consistently.
- */
-
-const gag_pattern_t tnarg[]={
-/* change exact words */
-{"^account$","accont"},
-{"^answer$","anser"},
-{"^anyway$","unerway"},
-{"^attach","atach"},
-{"^attractive$","atteve"},
-{"complete","compleat"},
-{"^confidential","coferdental"},
-{"^cookie$","cooky"},
-{"^descr","discr"},
-{"^design$", "desine"},
-{"^designed$", "desinded"},
-{"^devil$","deval"},
-{"^differen","diffen"},
-{"^doh","dol"},
-{"^echo","ehco"},
-{"^episode","episord"},
-{"^examiner","excamer"},
-{"^existence$", "exstents"},
-{"^fairly$","fail"},
-{"^gorilla$","groler"},
-{"^important$","importment"},
-{"^infinite$","infernet"},
-{"^innocent$","insont"},
-{"^labyrinth$","laberath"},
-{"^last$","end"},
-{"^listen", "lisson"},
-{"^manky$","maky"},
-{"^molest","merlast"},
-{"^otherwise$","uther wise"},
-{"^passes$","pases"},
-{"^paste$","paset"},
-{"^picnic$","picknick"},
-{"^predicate","perdiket"},
-{"^rifle", "riffil"},
-{"^scheme$","skeem"},
-{"^screw","scroo"},
-{"^spammed$","spamed"},
-{"^speech$","speach"},
-{"^subject$","subjet"},
-{"^suspended$","spended"},
-{"^syntax$","sintax"},
-{"^terrestrial$","teristial"},
-{"^thought$","thort"},
-{"^times$","time"},
-{"^too$","to"},
-{"^tomorrow$","tomrow"},
-{"^typed$","type"},
-{"^unchanged$","unchange"},
-{"^want","what"},
-{"^wonders$","whandes"},
-{"^wonder$","whander"},
-{"^works$","work"},
-
-
-/*{"^$",""},*/
-/*{"^$",""},*/
-/*{"^$",""},*/
-
-/* odd words out in pattern matching */
-{"^spoke$","spoke"},
-{"^coke$","coke"},
-{"^cough$","coff"},
-{"^light$","light"},
-{"uild","ild"},
-
-/* pattern match replacements */
-{"gain","gian"},
-{"oke","ock"},
-{"ain$","ane"},
-{"oki","ocki"},
-{"^or$","or"},
-{"or$","er"},
-{"oes","ose"},
-{"ough$","uff"},
-{"awn","orn"},
-{"ence$","ents"},
-{"ight$","ite"},
-{NULL,NULL}};
-
 const gag_pattern_t furby[]={
 /* Phrase replacement */
 {"^good morning$","dah a-loh u-tye"},
@@ -1280,7 +1161,6 @@ const gag_pattern_t nosport[]={
 { "^Wales$","Leek"},
 { "^Welsh$","Dragons"},
 
-
 { "^Aussie","XXXX drinker"},
 
 /* things the don't fit anywhere else */
@@ -1291,21 +1171,4 @@ const gag_pattern_t nosport[]={
 { "^sack$","potato carrier"},
 { "^ashes$","embers"}, /* this is the cricket series. */
 
-
 {NULL,NULL}};
-
-const gag_pattern_t unreturnable[]={
-{ "javascript",	"node.js" },
-{ "C++",	"node.js" },
-{ "c++",	"node.js" },
-{ "fortran",	"node.js" },
-{ "pascal",	"node.js" },
-{ "python",	"node.js" },
-{ "java",	"node.js" },
-{ "linux",	"nodeOS" },
-{ "windows",	"nodeOS" },
-{ "debian",	"nodeOS" },
-{ "fedora",	"nodeOS" },
-{ "silver",	"our node.js server" },
-
-{ NULL, NULL} };


=====================================
talkhelp/gag
=====================================
--- a/talkhelp/gag
+++ b/talkhelp/gag
@@ -18,16 +18,14 @@
      FILTER
      Name     Modes  Description
      -------------------------------------------------------------------------
-     annoy    125    Various word/acronym substitutions,  e.g. "fish".
      babel    135    Babelfish (mock computer mistranslation).
      bunny    15     Replace every word with "boing".
-     censor   4      Censors out swearwords.
+     censor   4      Censors out swear words.
      chef     2      Muppets Swedish Chef, Bork Bork Bork!
      duck     1234   Replace every word with "quack".
      french   35     Speck Onglish leek a Fronchman.
      fudd     3      Elmer Fudd style (Be vewy vewy quiet, I'm hunting wabbits).
      furby    134    Start speaking furby WAH!
-     hazelesque 45   Replace every word with "heh".
      jive     13     Ghetto Jive talk.
      kraut    12     Mock german.
      latin    123    Pig Latin.
@@ -35,11 +33,9 @@
      mirror   23     Reverse the sentence.
      morse    25     Speak morse code.
      nosport  235    Be a good sport, sport, and don't mention sport okay?
-     saya     5      Replace every word with "am".
      strfry   124    Randomly screws up your text, so all the chars are in the
                      wrong order.
      swab     24     Reverses the byte-order of the string, to mess it up.
-     tnarg    34     Turn your text into Tnargian.
      warez    234    Speak w/\rez d00dz!
      wibble   14     Scrambles sentences to new and exotic ones.
 



View it on GitLab: https://projects.sucs.org/arthur/mw/commit/943d79034be04a8c40e4b7614a1193c8155605d8

---
View it on GitLab: https://projects.sucs.org/arthur/mw/commit/943d79034be04a8c40e4b7614a1193c8155605d8
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/mw-devel/attachments/20171030/a65c4f31/attachment-0001.html>


More information about the mw-devel mailing list