[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests/piedpiper TPPQuestHelperFunctions.java, 1.3, 1.4 AwaitingPhase.java, 1.18, 1.19

[yoriy <yo...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper
In directory vz-cvs-4.sog:/tmp/cvs-serv27947/src/games/stendhal/server/maps/quests/piedpiper

Modified Files:
	TPPQuestHelperFunctions.java AwaitingPhase.java 
Log Message:
part of piper's setup code moved to helper function

Index: AwaitingPhase.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper/AwaitingPhase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AwaitingPhase.java	30 Jul 2012 11:32:57 -0000	1.18
--- AwaitingPhase.java	30 Jul 2012 12:11:14 -0000	1.19
***************
*** 136,140 ****
  		createPiedPiper();
  	}
! 
  
  	/**
--- 136,158 ----
  		createPiedPiper();
  	}
! 	
! 	
! 	/**
! 	 * function for creating pied piper npc
! 	 */
! 	private void createPiedPiper() {
! 		TPPQuestHelperFunctions.setupPiper(piedpiper);
! 		fullpathin = PathesBuildHelper.getAwaitingPhasePathIn();
! 		fullpathout = PathesBuildHelper.getAwaitingPhasePathOut();
! 		leadNPC();
! 	}
! 	
! 	
! 	/**
! 	 * function will remove piped piper npc object
! 	 */
! 	private void destroyPiedPiper() {
! 		piedpiper.getZone().remove(piedpiper);
! 	}
  
  	/**
***************
*** 217,248 ****
  	public TPP_Phase getPhase() {
  		return TPP_Phase.TPP_AWAITING;
- 	}
- 	
- 	/**
- 	 * function for creating pied piper npc
- 	 */
- 	private void createPiedPiper() {
- 		piedpiper.setEntityClass("holidaymakernpc");
- 		piedpiper.initHP(1000);
- 		piedpiper.setResistance(0);
- 		piedpiper.setVisibility(100);
- 		piedpiper.setAllowToActAlone(true);
- 		piedpiper.add(ConversationStates.IDLE, 
- 							ConversationPhrases.GREETING_MESSAGES, 
- 							new GreetingMatchesNameCondition(piedpiper.getName()), true, 
- 							ConversationStates.IDLE, 
- 							"hello", 
- 							null);
- 		fullpathin = PathesBuildHelper.getAwaitingPhasePathIn();
- 		fullpathout = PathesBuildHelper.getAwaitingPhasePathOut();
- 		leadNPC();
- 	}
- 	
- 	
- 	/**
- 	 * function will remove piped piper npc object
- 	 */
- 	private void destroyPiedPiper() {
- 		piedpiper.getZone().remove(piedpiper);
  	}		
  	
--- 235,238 ----

Index: TPPQuestHelperFunctions.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/piedpiper/TPPQuestHelperFunctions.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TPPQuestHelperFunctions.java	13 Nov 2011 22:41:50 -0000	1.3
--- TPPQuestHelperFunctions.java	30 Jul 2012 12:11:13 -0000	1.4
***************
*** 6,10 ****
--- 6,13 ----
  import games.stendhal.server.core.engine.SingletonRepository;
  import games.stendhal.server.entity.creature.Creature;
+ import games.stendhal.server.entity.npc.ConversationPhrases;
+ import games.stendhal.server.entity.npc.ConversationStates;
  import games.stendhal.server.entity.npc.SpeakerNPC;
+ import games.stendhal.server.entity.npc.condition.GreetingMatchesNameCondition;
  import games.stendhal.server.entity.player.Player;
  
***************
*** 61,64 ****
--- 64,81 ----
  		return(getRats().size());
  	}
+ 	
+ 	public static void setupPiper(SpeakerNPC piedpiper) {
+ 		piedpiper.setEntityClass("holidaymakernpc");
+ 		piedpiper.initHP(1000);
+ 		piedpiper.setResistance(0);
+ 		piedpiper.setVisibility(100);
+ 		piedpiper.setAllowToActAlone(true);
+ 		piedpiper.add(ConversationStates.IDLE, 
+ 							ConversationPhrases.GREETING_MESSAGES, 
+ 							new GreetingMatchesNameCondition(piedpiper.getName()), true, 
+ 							ConversationStates.IDLE, 
+ 							"hello", 
+ 							null);
+ 	}
  }