[Arianne-commits] stendhal/src/games/stendhal/server/maps/ados DeathmatchEntrance.java, 1.1, 1.2

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/ados
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27850/src/games/stendhal/server/maps/ados

Modified Files:
	DeathmatchEntrance.java 
Log Message:
some cleanup

Index: DeathmatchEntrance.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/ados/DeathmatchEntrance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeathmatchEntrance.java	22 Nov 2006 21:08:48 -0000	1.1
--- DeathmatchEntrance.java	22 Nov 2006 21:17:24 -0000	1.2
***************
*** 5,11 ****
  import games.stendhal.server.StendhalRPZone;
  import games.stendhal.server.entity.Player;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  import games.stendhal.server.pathfinder.Path;
- import games.stendhal.server.scripting.ScriptingNPC;
  
  import java.util.LinkedList;
--- 5,11 ----
  import games.stendhal.server.StendhalRPZone;
  import games.stendhal.server.entity.Player;
+ import games.stendhal.server.entity.npc.ConversationStates;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  import games.stendhal.server.pathfinder.Path;
  
  import java.util.LinkedList;
***************
*** 17,57 ****
  public class DeathmatchEntrance {
  
! 	class JumpToDeathmatchAction extends SpeakerNPC.ChatAction {
! 		public void fire(Player player, String text, SpeakerNPC engine) {
! 			StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("int_semos_deathmatch");
! 			player.teleport(zone, 17, 8, Direction.DOWN, null);			
! 			return;
! 		}
! 	}
! 
! 	public void build() {
! 		String myZone = "0_semos_plains_n";
  		StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("0_ados_swamp");
- 		ScriptingNPC npc=new ScriptingNPC("Deathmatch Recruiter");
- 		npc.put("class", "youngsoldiernpc");
- 		List<Path.Node> path = new LinkedList<Path.Node>();
- 		path.add(new Path.Node(40, 35));
- 		path.add(new Path.Node(40, 84));
- 		path.add(new Path.Node(53, 84));
- 		path.add(new Path.Node(53, 80));
- 		path.add(new Path.Node(84, 80));
- 		path.add(new Path.Node(84, 56));
- 		path.add(new Path.Node(89, 56));
- 		path.add(new Path.Node(89, 37));
- 		path.add(new Path.Node(72, 37));
- 		path.add(new Path.Node(72, 32));
- 		path.add(new Path.Node(50, 32));
- 		path.add(new Path.Node(50, 35));
- 		npc.setPath(path);
- 
- 		npc.behave("greet", "Hey there. You look like a reasonable fighter.");
- 		npc.behave("job", "I'm recruiter for the Semos #deathmatch.");
- 		npc.behave("help", "Have you ever heard of the Semos #deathmatch.");
- 		npc.behave("deathmatch", "The deathmatch is the ultimate challenge for true #heroes.");
- 		npc.behave("heroes", "Are you such a hero? I can take you to the #challenge.");
- 		npc.behave("bye", "I hope you will enjoy the Semos #Deathmatch!");
  		
! 		npc.add (1,"challenge",null,1,null, new JumpToDeathmatchAction());
  
  		npc.set(40, 35);
  		npc.initHP(100);
--- 17,65 ----
  public class DeathmatchEntrance {
  
! 	public void buildRecruiter() {
  		StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("0_ados_swamp");
  		
! 		SpeakerNPC npc = new SpeakerNPC("Deathmatch Recruiter") {
! 			@Override
! 			protected void createPath() {
! 				List<Path.Node> path = new LinkedList<Path.Node>();
! 				path.add(new Path.Node(40, 35));
! 				path.add(new Path.Node(40, 84));
! 				path.add(new Path.Node(53, 84));
! 				path.add(new Path.Node(53, 80));
! 				path.add(new Path.Node(84, 80));
! 				path.add(new Path.Node(84, 56));
! 				path.add(new Path.Node(89, 56));
! 				path.add(new Path.Node(89, 37));
! 				path.add(new Path.Node(72, 37));
! 				path.add(new Path.Node(72, 32));
! 				path.add(new Path.Node(50, 32));
! 				path.add(new Path.Node(50, 35));
! 				setPath(path, false);
! 			}
  
+ 			@Override
+ 			protected void createDialog() {
+ 				addGreeting("Hey there. You look like a reasonable fighter.");
+ 				addJob("I'm recruiter for the Semos #deathmatch.");
+ 				addHelp("Have you ever heard of the Semos #deathmatch.");
+ 				add(ConversationStates.ATTENDING, "deathmatch", null, ConversationStates.ATTENDING, 
+ 					"The deathmatch is the ultimate challenge for true #heroes.", null);
+ 				add(ConversationStates.ATTENDING, "heroes", null, ConversationStates.ATTENDING,
+ 					"Are you such a hero? I can take you to the #challenge.", null);
+ 				addGoodbye("I hope you will enjoy the Semos #Deathmatch!");
+ 				
+ 				add(ConversationStates.ATTENDING, "challenge", null, ConversationStates.ATTENDING,
+ 						null, new SpeakerNPC.ChatAction() {
+ 					@Override
+ 					public void fire(Player player, String text, SpeakerNPC engine) {
+ 						StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("int_semos_deathmatch");
+ 						player.teleport(zone, 17, 8, Direction.DOWN, null);			
+ 					}
+ 				});
+ 			}
+ 		};
+ 
+ 		npc.put("class", "youngsoldiernpc");
  		npc.set(40, 35);
  		npc.initHP(100);