From: yoriy <yo...@us...> - 2010-06-18 15:42:48
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4166/src/games/stendhal/server/maps/quests Modified Files: WeeklyItemQuest.java Log Message: quest info moved from quests.xml to WeeklyItemQuest class; added return statement in case if quest was rejected. Index: WeeklyItemQuest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/WeeklyItemQuest.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** WeeklyItemQuest.java 14 Jun 2010 12:46:03 -0000 1.37 --- WeeklyItemQuest.java 18 Jun 2010 15:42:40 -0000 1.38 *************** *** 271,279 **** return res; } ! res.add("FIRST_CHAT"); final String questState = player.getQuest(QUEST_SLOT); if ("rejected".equals(questState)) { ! res.add("QUEST_REJECTED"); } if (player.hasQuest(QUEST_SLOT) && !player.isQuestCompleted(QUEST_SLOT)) { final String[] tokens = (questState + ";0;0;0").split(";"); --- 271,281 ---- return res; } ! res.add("I have met Hazel, the curator of Kirdneh museum."); final String questState = player.getQuest(QUEST_SLOT); if ("rejected".equals(questState)) { ! res.add("I do not want to help Kirdneh museum become the greatest in the land."); ! return res; } + res.add("I want to help Kirdneh museum become the greatest in the land."); if (player.hasQuest(QUEST_SLOT) && !player.isQuestCompleted(QUEST_SLOT)) { final String[] tokens = (questState + ";0;0;0").split(";"); *************** *** 285,291 **** } if (!player.isEquipped(questItem, amount)) { ! res.add("QUEST_ACTIVE"); } else { ! res.add("QUEST_UNCLAIMED"); } } --- 287,293 ---- } if (!player.isEquipped(questItem, amount)) { ! res.add("I have been asked to find a rare item for Kirdneh museum."); } else { ! res.add("I have the rare item for Kirdneh museum and need to take it."); } } *************** *** 297,303 **** if (timeRemaining > 0L) { ! res.add("DONE_THIS_WEEK"); } else { ! res.add("DONE_REPEATABLE"); } } --- 299,305 ---- if (timeRemaining > 0L) { ! res.add("I took the valuable item to Hazel within the last 7 days."); } else { ! res.add("I took the valuable item to Hazel and the museum can now afford to send me to find another."); } } *************** *** 308,312 **** public void addToWorld() { super.addToWorld(); ! buildItemsMap(); --- 310,317 ---- public void addToWorld() { super.addToWorld(); ! fillQuestInfo( ! "", ! "", ! true); buildItemsMap(); |