[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests MeetHackim.java, 1.34, 1.35 NewsFromHackim.java, 1.40, 1.41

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25759/src/games/stendhal/server/maps/quests

Modified Files:
	MeetHackim.java NewsFromHackim.java 
Log Message:
Fixing Hackim not reacting to 'Xin' keyword after accepting quest  ID: 3022421
also changing armour -> armor since we use american english here.

Index: NewsFromHackim.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/NewsFromHackim.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** NewsFromHackim.java	7 May 2009 14:36:12 -0000	1.40
--- NewsFromHackim.java	28 Jun 2010 20:16:54 -0000	1.41
***************
*** 15,18 ****
--- 15,19 ----
  
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.List;
  
***************
*** 91,99 ****
  		npc.add(
  			ConversationStates.QUEST_OFFERED,
! 			"Xin",
  			null,
  			ConversationStates.QUEST_OFFERED,
  			"You don't know who Xin is? Everybody at the tavern knows Xin. He's the guy who owes beer money to most of the people in Semos! So, will you do it?",
  			null);
  	}
  
--- 92,102 ----
  		npc.add(
  			ConversationStates.QUEST_OFFERED,
! 			Arrays.asList("Xin", "Xin Blanca", "Blanca"),
  			null,
  			ConversationStates.QUEST_OFFERED,
  			"You don't know who Xin is? Everybody at the tavern knows Xin. He's the guy who owes beer money to most of the people in Semos! So, will you do it?",
  			null);
+ 		
+ 		npc.addReply(Arrays.asList("Xin", "Xin Blanca", "Blanca"), "Xin's so cool. I want to work in the tavern too like him but my dad says I have to learn a trade.");
  	}
  
***************
*** 109,115 ****
  					String answer;
  					if (player.isEquipped("leather legs")) {
! 						answer = "Take this set of brand new... oh, you already have leather leg armour. Well, maybe you can sell them off or something.";
  					} else {
! 						answer = "Take this set of brand new leather leg armour! Let me know if you want anything else.";
  					}
  					// player.say("Well, to make a long story short; I know
--- 112,118 ----
  					String answer;
  					if (player.isEquipped("leather legs")) {
! 						answer = "Take this set of brand new... oh, you already have leather leg armor. Well, maybe you can sell them off or something.";
  					} else {
! 						answer = "Take this set of brand new leather leg armor! Let me know if you want anything else.";
  					}
  					// player.say("Well, to make a long story short; I know

Index: MeetHackim.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/MeetHackim.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** MeetHackim.java	9 May 2009 13:11:45 -0000	1.34
--- MeetHackim.java	28 Jun 2010 20:16:54 -0000	1.35
***************
*** 14,17 ****
--- 14,18 ----
  
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.LinkedList;
  import java.util.List;
***************
*** 31,35 ****
  
  	private static final String QUEST_SLOT = "meet_hackim";
! 
  
  
--- 32,36 ----
  
  	private static final String QUEST_SLOT = "meet_hackim";
! 	List<String> yesTrigger;
  
  
***************
*** 71,78 ****
  			"*whisper* Go to the tavern and talk to a man called #Xin #Blanca... he buys and sells equipment that might interest you. Do you want to hear more?",
  			null);
! 
  		npc.add(
  			ConversationStates.INFORMATION_2,
! 			ConversationPhrases.YES_MESSAGES,
  			null,
  			ConversationStates.INFORMATION_3,
--- 72,79 ----
  			"*whisper* Go to the tavern and talk to a man called #Xin #Blanca... he buys and sells equipment that might interest you. Do you want to hear more?",
  			null);
! 		
  		npc.add(
  			ConversationStates.INFORMATION_2,
! 			yesTrigger,
  			null,
  			ConversationStates.INFORMATION_3,
***************
*** 88,92 ****
  		
  		npc.add(ConversationStates.INFORMATION_3,
! 				ConversationPhrases.YES_MESSAGES,
  				new QuestNotCompletedCondition(QUEST_SLOT),
  				ConversationStates.IDLE, 
--- 89,93 ----
  		
  		npc.add(ConversationStates.INFORMATION_3,
! 				yesTrigger,
  				new QuestNotCompletedCondition(QUEST_SLOT),
  				ConversationStates.IDLE, 
***************
*** 95,99 ****
  
  		npc.add(ConversationStates.INFORMATION_3,
! 				ConversationPhrases.YES_MESSAGES, 
  				new QuestCompletedCondition(QUEST_SLOT),
  				ConversationStates.IDLE, 
--- 96,100 ----
  
  		npc.add(ConversationStates.INFORMATION_3,
! 				yesTrigger, 
  				new QuestCompletedCondition(QUEST_SLOT),
  				ConversationStates.IDLE, 
***************
*** 117,121 ****
  	public void addToWorld() {
  		super.addToWorld();
! 
  		prepareHackim();
  	}
--- 118,125 ----
  	public void addToWorld() {
  		super.addToWorld();
! 		yesTrigger = new LinkedList<String>(ConversationPhrases.YES_MESSAGES);
! 		yesTrigger.add("Xin Blanca");
! 		yesTrigger.add("Blanca");
! 		yesTrigger.add("Xin");
  		prepareHackim();
  	}