[Arianne-commits] stendhal/src/games/stendhal/server/actions/admin SupportAnswerAction.java, 1.21, 1.22

[Katie <ky...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2158/src/games/stendhal/server/actions/admin

Modified Files:
	SupportAnswerAction.java 
Log Message:
added $ignore and $spam supportanswer shortcuts, also changed the $abuse shortcut to $notsupport and removed the line about 'abuse of support is not 
tolerated' so we can use it more normally without sounding harsh. updated the help section of /gmhelp support to match


Index: SupportAnswerAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/SupportAnswerAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SupportAnswerAction.java	3 Nov 2009 21:16:38 -0000	1.21
--- SupportAnswerAction.java	8 Nov 2009 22:20:56 -0000	1.22
***************
*** 34,37 ****
--- 34,40 ----
  				} else if ("$faqsocial".equals(reply)) {
  					reply = "Hi, sorry to hear about that. But unfortunately support is not here to help you with social problems unless it gets way out of hand. This issue is discussed further on the stendhal FAQ and how to deal with it is described there. Please read carefully #http://stendhal.game-host.org/wiki/index.php/StendhalFAQ#Player_social_problems - hopefully the rest of your Stendhal experience will be more pleasant.";
+ 				} else if ("$ignore".equals(reply)) {
+ 					reply = "Sorry to hear that you have had some problems with another player. Please try to ignore them. You can use "
+ 						+ "#/ignore #playername to prevent private messages and there is a feature request to extend /ignore to public chat.";
  				} else if ("$faqpvp".equals(reply)) {
  					reply = "Hi, sorry to hear about that. Player attacks are actually within the rules of the game, and it is not something that support gets involved with for that reason. Please read carefully #http://stendhal.game-host.org/wiki/index.php/StendhalFAQ#Player_vs_Player - good luck for the future.";
***************
*** 44,51 ****
  				} else if ("$rules".equals(reply)) {
  					reply = "Please read the Stendhal Rules at #http://stendhal.game-host.org/wiki/index.php/StendhalRuleSystem - thank you.";
! 				} else if ("$abuse".equals(reply)) {
! 					reply = "Sorry, but support is not here for that issue. Please use #http://stendhal.game-host.org and the wiki #http://stendhal.game-host.org/wiki/index.php/Stendhal as information sources. Repeated abuse of the support channel will be punished.";
  				} else {
! 					player.sendPrivateText(reply + " is not a recognised shortcut. Did you mean $faq, $faqsocial, $faqpvp, $wiki, $knownbug, $bugstracker, $rules or $abuse?");
  					// send no support answer message if the shortcut wasn't understood
  					return;
--- 47,56 ----
  				} else if ("$rules".equals(reply)) {
  					reply = "Please read the Stendhal Rules at #http://stendhal.game-host.org/wiki/index.php/StendhalRuleSystem - thank you.";
! 				} else if ("$notsupport".equals(reply)) {
! 					reply = "Sorry, but support cannot help with this issue. Please use #http://stendhal.game-host.org and the wiki #http://stendhal.game-host.org/wiki/index.php/Stendhal as information sources.";
! 				} else if ("$spam".equals(reply)) {
! 					reply = "Repeatedly saying the same thing over and over again is considered spamming, and this is against the rules of the game. Please do not spam, and please read #http://stendhal.game-host.org/wiki/index.php/StendhalRuleSystem, thank you.";
  				} else {
! 					player.sendPrivateText(reply + " is not a recognised shortcut. Did you mean $faq, $faqsocial, $ignore, $faqpvp, $wiki, $knownbug, $bugstracker, $rules, $notsupport or $spam?");
  					// send no support answer message if the shortcut wasn't understood
  					return;