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

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

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

Modified Files:
	MeetSanta.java 
Log Message:
only give a stocking and hat to players who pass the 'good boy' condition (i.e. no skull)


Index: MeetSanta.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/MeetSanta.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** MeetSanta.java	3 Dec 2012 16:22:46 -0000	1.75
--- MeetSanta.java	8 Dec 2012 19:19:56 -0000	1.76
***************
*** 30,33 ****
--- 30,35 ----
  import games.stendhal.server.entity.npc.condition.AndCondition;
  import games.stendhal.server.entity.npc.condition.GreetingMatchesNameCondition;
+ import games.stendhal.server.entity.npc.condition.NotCondition;
+ import games.stendhal.server.entity.npc.condition.PlayerIsAGoodBoyCondition;
  import games.stendhal.server.entity.npc.condition.QuestCompletedCondition;
  import games.stendhal.server.entity.npc.condition.QuestNotCompletedCondition;
***************
*** 87,91 ****
  					ConversationPhrases.GREETING_MESSAGES,
  					new AndCondition(new GreetingMatchesNameCondition(super.getName()),
! 							new QuestCompletedCondition(QUEST_SLOT)),
  					ConversationStates.IDLE,
  					"Hi again! Good bye, and remember to behave if you want a present next year!",
--- 89,94 ----
  					ConversationPhrases.GREETING_MESSAGES,
  					new AndCondition(new GreetingMatchesNameCondition(super.getName()),
! 							new QuestCompletedCondition(QUEST_SLOT),
!                                                         new PlayerIsAGoodBoyCondition()),
  					ConversationStates.IDLE,
  					"Hi again! Good bye, and remember to behave if you want a present next year!",
***************
*** 109,116 ****
  					ConversationPhrases.GREETING_MESSAGES,
  					new AndCondition(new GreetingMatchesNameCondition(super.getName()),
! 							new QuestNotCompletedCondition(QUEST_SLOT)),
  					ConversationStates.IDLE,
  					"Merry Christmas! I have a present and a hat for you. Good bye, and remember to behave if you want a present next year!",
  					new MultipleActions(reward));
  			}
  		};
--- 112,128 ----
  					ConversationPhrases.GREETING_MESSAGES,
  					new AndCondition(new GreetingMatchesNameCondition(super.getName()),
! 							new QuestNotCompletedCondition(QUEST_SLOT),
!                                                         new PlayerIsAGoodBoyCondition()),
  					ConversationStates.IDLE,
  					"Merry Christmas! I have a present and a hat for you. Good bye, and remember to behave if you want a present next year!",
  					new MultipleActions(reward));
+ 
+ 				add(ConversationStates.IDLE,
+ 					ConversationPhrases.GREETING_MESSAGES,
+ 					new AndCondition(new GreetingMatchesNameCondition(super.getName()),
+                                                         new NotCondition(new PlayerIsAGoodBoyCondition())),
+ 					ConversationStates.IDLE,
+ 					"Ho ho ho! Looks like you haven't been a good this year! Only well behaved children get presents! Seasons greetings!",
+ 					null);
  			}
  		};