From: Deluge <ant...@us...> - 2013-05-30 05:29:02
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11026/src/games/stendhal/server/maps/quests Modified Files: RestockFlowerShop.java Log Message: Fixed NPC not responding correctly to "something". Adapted JUnit test. Index: RestockFlowerShop.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/RestockFlowerShop.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** RestockFlowerShop.java 29 May 2013 17:06:08 -0000 1.27 --- RestockFlowerShop.java 30 May 2013 05:28:58 -0000 1.28 *************** *** 145,149 **** // Player asks to be reminded of remaining flowers required ! npc.add(ConversationStates.ANY, Arrays.asList("flower", "remind", "what", "item", "list", "something"), new QuestActiveCondition(QUEST_SLOT), --- 145,149 ---- // Player asks to be reminded of remaining flowers required ! npc.add(ConversationStates.ATTENDING, Arrays.asList("flower", "remind", "what", "item", "list", "something"), new QuestActiveCondition(QUEST_SLOT), *************** *** 152,155 **** --- 152,162 ---- new SayRequiredItemsFromCollectionAction(QUEST_SLOT, "I still need [items]. Did you bring any of those?")); + npc.add(ConversationStates.QUESTION_1, + Arrays.asList("flower", "remind", "what", "item", "list", "something"), + new QuestActiveCondition(QUEST_SLOT), + ConversationStates.QUESTION_1, + null, + new SayRequiredItemsFromCollectionAction(QUEST_SLOT, "I still need [items]. Did you bring any of those?")); + // Player asks to be reminded of remaining flowers required npc.add(ConversationStates.QUESTION_1, |