[Arianne-commits] stendhal/src/games/stendhal/server/script AdminMaker.java, 1.26, 1.27

[Astrid S. <ast...@us...>]

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

Modified Files:
	AdminMaker.java 
Log Message:
code format

Index: AdminMaker.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/AdminMaker.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AdminMaker.java	14 Aug 2008 05:06:34 -0000	1.26
--- AdminMaker.java	10 Mar 2009 15:51:22 -0000	1.27
***************
*** 34,38 ****
--- 34,49 ----
  
  	private static Logger logger = Logger.getLogger(AdminMaker.class);
+ 	private static final String TELE_QUEST_SLOT = "AdminMakerTele";
  
+ 	private final List<String> itemsSingle = Arrays.asList("rod of the gm",
+ 			"golden shield", "golden armor", "golden cloak",
+ 			"golden helmet", "golden legs", "golden boots",
+ 			"hunter crossbow");
+ 
+ 	private final List<String> itemsStack = Arrays.asList("money",
+ 			"greater potion", "greater antidote", "power arrow",
+ 			"deadly poison");
+ 	
+ 	
  	protected class UpgradeAction implements ChatAction {
  
***************
*** 64,75 ****
  		}
  
- 		private final List<String> itemsSingle = Arrays.asList("rod of the gm",
- 				"golden shield", "golden armor", "golden cloak",
- 				"golden helmet", "golden legs", "golden boots",
- 				"hunter crossbow");
  
- 		private final List<String> itemsStack = Arrays.asList("money",
- 				"greater potion", "greater antidote", "power arrow",
- 				"deadly poison");
  
  		private void equip(final Player player) {
--- 75,79 ----
***************
*** 115,118 ****
--- 119,133 ----
  
  	protected class TeleportAction implements ChatAction {
+ 		private class Destination {
+ 			private final String zone;
+ 			private final int x;
+ 			private final int y;
+ 
+ 			Destination(final String zone, final int x, final int y) {
+ 				this.zone = zone;
+ 				this.x = x;
+ 				this.y = y;
+ 			}
+ 		}
  
  		private final List<Destination> DESTINATIONS = Arrays.asList(
***************
*** 143,148 ****
  		);
  
! 		private static final String TELE_QUEST_SLOT = "AdminMakerTele";
! 
  		private boolean randomTeleport(final Player player) {
  			// Destination selection: random for first, then go in order
--- 158,162 ----
  		);
  
! 	
  		private boolean randomTeleport(final Player player) {
  			// Destination selection: random for first, then go in order
***************
*** 173,188 ****
  		}
  
! 		private class Destination {
! 			private final String zone;
! 			private final int x;
! 			private final int y;
! 
! 			Destination(final String zone, final int x, final int y) {
! 				this.zone = zone;
! 				this.x = x;
! 				this.y = y;
! 			}
! 		}
! 
  		public void fire(final Player player, final Sentence sentence, final SpeakerNPC engine) {
  
--- 187,191 ----
  		}
  
! 	
  		public void fire(final Player player, final Sentence sentence, final SpeakerNPC engine) {
  
***************
*** 213,217 ****
  	public void load(final Player admin, final List<String> args, final ScriptingSandbox sandbox) {
  		super.load(admin, args, sandbox);
! 
  		// Require parameter -Dstendhal.testserver=junk
  		if (System.getProperty("stendhal.testserver") == null) {
--- 216,220 ----
  	public void load(final Player admin, final List<String> args, final ScriptingSandbox sandbox) {
  		super.load(admin, args, sandbox);
! 		
  		// Require parameter -Dstendhal.testserver=junk
  		if (System.getProperty("stendhal.testserver") == null) {
***************
*** 225,233 ****
  		}
  
  		// create npc
  		ScriptingNPC npc;
  		npc = new ScriptingNPC("Admin Maker");
  		npc.setEntityClass("tavernbarmaidnpc");
! 
  		// Place NPC in int_admin_playground on server start
  		final String myZone = "0_semos_city";
--- 228,238 ----
  		}
  
+ 		
+ 		
  		// create npc
  		ScriptingNPC npc;
  		npc = new ScriptingNPC("Admin Maker");
  		npc.setEntityClass("tavernbarmaidnpc");
! 		
  		// Place NPC in int_admin_playground on server start
  		final String myZone = "0_semos_city";