[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests MeetSanta.java, 1.35, 1.36

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

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

Modified Files:
	MeetSanta.java 
Log Message:
Santa now gives a hats to hatless players anytime they speak with him. (hatless = not wearing santa hat). I put the 
code in a separate method to keep things tidy. Feel free to tidy up even more if needed.


Index: MeetSanta.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/MeetSanta.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** MeetSanta.java	14 Nov 2007 21:41:24 -0000	1.35
--- MeetSanta.java	14 Nov 2007 22:30:17 -0000	1.36
***************
*** 62,66 ****
  					new QuestCompletedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING,
! 					"Hi again.", null);
  
  				List<SpeakerNPC.ChatAction> reward = new LinkedList<SpeakerNPC.ChatAction>();
--- 62,74 ----
  					new QuestCompletedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING,
! 					"Hi again!",
! 				        new SpeakerNPC.ChatAction() {
! 					    @Override
! 					    public void fire(Player player, String text,
! 							     SpeakerNPC engine) { 
! 						addHat(player);	    
! 					    }
! 					}
! 				    );
  
  				List<SpeakerNPC.ChatAction> reward = new LinkedList<SpeakerNPC.ChatAction>();
***************
*** 68,90 ****
  				reward.add(new SetQuestAction(QUEST_SLOT, "done"));
  				reward.add(new ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 
! 					    // TODO: Put this into an action which can be called 
! 					    // from the other IDLE state as well.
! 				        
! 					    // fetch old outfit as we want to know the current hair
! 					    Outfit oldoutfit = player.getOutfit();
! 					    // all santa hat sprites are at 50 + current hair
! 					    if(oldoutfit.getHair() < 50){
! 						int hatnumber = oldoutfit.getHair() + 50;
! 						// the new outfit only changes the hair, rest is null
! 						Outfit newOutfit = new Outfit(hatnumber, null, null, null);
! 						//put it on, and store old outfit.
! 						player.setOutfit(newOutfit.putOver(oldoutfit), true);
! 					    }
  					}
! 				}
! 					   );
  				add(ConversationStates.IDLE,
  					ConversationPhrases.GREETING_MESSAGES,
--- 76,85 ----
  				reward.add(new SetQuestAction(QUEST_SLOT, "done"));
  				reward.add(new ChatAction() {
! 				      	@Override
! 				        public void fire(Player player, String text, SpeakerNPC npc) {
! 					    addHat(player);
  					}
! 				    }
! 				);
  				add(ConversationStates.IDLE,
  					ConversationPhrases.GREETING_MESSAGES,
***************
*** 109,112 ****
--- 104,121 ----
  	}
  
+         private void addHat(Player player){
+ 	    // fetch old outfit as we want to know the current hair
+ 	    Outfit oldoutfit = player.getOutfit();
+ 	    // all santa hat sprites are at 50 + current hair
+ 	    if(oldoutfit.getHair() < 50){
+ 		int hatnumber = oldoutfit.getHair() + 50;
+ 		// the new outfit only changes the hair, rest is null
+ 		Outfit newOutfit = new Outfit(hatnumber, null, null, null);
+ 		//put it on, and store old outfit.
+ 		player.setOutfit(newOutfit.putOver(oldoutfit), true);
+ 	    }
+ 	}
+ 	
+ 
  	public void onLoggedIn(Player player) {
  	    // is it Christmas?