From: Kimmo R. <ki...@us...> - 2012-05-30 18:50:07
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/script In directory vz-cvs-4.sog:/tmp/cvs-serv32275/src/games/stendhal/server/script Modified Files: AlterQuest.java BugInspect.java FishInspect.java ResetSlot.java ResetTutorial.java Log Message: New NotificationType "SERVER". Use that for most private server messages. Changed some messages generated as result of adminstration action to send messages as SUPPORT. Index: FishInspect.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/FishInspect.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FishInspect.java 19 Sep 2010 02:36:26 -0000 1.5 --- FishInspect.java 30 May 2012 18:50:04 -0000 1.6 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.script; + import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; *************** *** 103,107 **** new GameEvent("fish inspect", "jail", player.getName(), Integer.toString(-1), "possible macro use to get fish").raise(); SingletonRepository.getJail().imprison(player.getName(), player, -1, "possible macro use to get fish"); ! player.sendPrivateText("Please use /support to talk to an admin about your large amount of fish which may have been obtained illegally."); player.notifyWorldAboutChanges(); --- 104,108 ---- new GameEvent("fish inspect", "jail", player.getName(), Integer.toString(-1), "possible macro use to get fish").raise(); SingletonRepository.getJail().imprison(player.getName(), player, -1, "possible macro use to get fish"); ! player.sendPrivateText(NotificationType.SUPPORT, "Please use /support to talk to an admin about your large amount of fish which may have been obtained illegally."); player.notifyWorldAboutChanges(); Index: ResetSlot.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/ResetSlot.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResetSlot.java 31 Dec 2010 10:17:31 -0000 1.3 --- ResetSlot.java 30 May 2012 18:50:04 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.script; + import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.scripting.ScriptImpl; *************** *** 59,63 **** // notify the player ! player.sendPrivateText("Your " + args.get(1) + " state was reset by " + admin.getTitle()); } --- 60,65 ---- // notify the player ! player.sendPrivateText(NotificationType.SUPPORT, ! "Your " + args.get(1) + " state was reset by " + admin.getTitle()); } Index: AlterQuest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/AlterQuest.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AlterQuest.java 19 Sep 2010 02:36:26 -0000 1.11 --- AlterQuest.java 30 May 2012 18:50:04 -0000 1.12 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.script; + import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPRuleProcessor; *************** *** 58,62 **** // notify admin and altered player ! target.sendPrivateText("Admin " + admin.getTitle() + " changed your state of the quest '" + questName + "' from '" + oldQuestState + "' to '" + newQuestState --- 59,63 ---- // notify admin and altered player ! target.sendPrivateText(NotificationType.SUPPORT, "Admin " + admin.getTitle() + " changed your state of the quest '" + questName + "' from '" + oldQuestState + "' to '" + newQuestState Index: ResetTutorial.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/ResetTutorial.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ResetTutorial.java 19 Sep 2010 02:36:26 -0000 1.10 --- ResetTutorial.java 30 May 2012 18:50:04 -0000 1.11 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.script; + import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.scripting.ScriptImpl; *************** *** 51,56 **** // notify the player ! player.sendPrivateText("Your tutorial state was reset by " ! + admin.getTitle()); } } --- 52,57 ---- // notify the player ! player.sendPrivateText(NotificationType.SUPPORT, ! "Your tutorial state was reset by " + admin.getTitle()); } } Index: BugInspect.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/BugInspect.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** BugInspect.java 19 Sep 2010 02:36:26 -0000 1.29 --- BugInspect.java 30 May 2012 18:50:04 -0000 1.30 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.script; + import games.stendhal.common.NotificationType; import games.stendhal.server.core.engine.GameEvent; import games.stendhal.server.core.engine.SingletonRepository; *************** *** 98,102 **** new GameEvent("bug inspect", "jail", player.getName(), Integer.toString(-1), "possible bug abuse").raise(); SingletonRepository.getJail().imprison(player.getName(), player, -1, "possible bug abuse"); ! player.sendPrivateText("Please use /support to talk to an admin about your large amount of items which may have been the result of a bug."); player.notifyWorldAboutChanges(); --- 99,103 ---- new GameEvent("bug inspect", "jail", player.getName(), Integer.toString(-1), "possible bug abuse").raise(); SingletonRepository.getJail().imprison(player.getName(), player, -1, "possible bug abuse"); ! player.sendPrivateText(NotificationType.SUPPORT, "Please use /support to talk to an admin about your large amount of items which may have been the result of a bug."); player.notifyWorldAboutChanges(); |