[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests DailyItemQuest.java, 1.46, 1.47

[yoriy <yo...@us...>]

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

Modified Files:
	DailyItemQuest.java 
Log Message:
quest info moved from quests.xml to DailyItemQuest class. Added return from getHistory() inside check for rejected quest.

Index: DailyItemQuest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/DailyItemQuest.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** DailyItemQuest.java	10 Jun 2010 22:13:19 -0000	1.46
--- DailyItemQuest.java	17 Jun 2010 22:19:48 -0000	1.47
***************
*** 307,315 ****
  			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(";");
--- 307,317 ----
  			return res;
  		}
! 		res.add("!I have met Mayor Chalmers in Ados Townhall");
  		final String questState = player.getQuest(QUEST_SLOT);
  		if ("rejected".equals(questState)) {
! 			res.add("!I do not want to help Ados.");
! 			return res;
! 		}		
! 		//res.add("!I want to help Ados.");
  		if (player.hasQuest(QUEST_SLOT) && !player.isQuestCompleted(QUEST_SLOT)) {
  			final String[] tokens = (questState + ";0;0;0").split(";");
***************
*** 321,327 ****
  			}
  			if (!player.isEquipped(questItem, amount)) {
! 				res.add("QUEST_ACTIVE");
  			} else {
! 				res.add("QUEST_UNCLAIMED");
  			}
  		}
--- 323,329 ----
  			}
  			if (!player.isEquipped(questItem, amount)) {
! 				res.add("!I have been asked to fetch an item to help Ados. I haven't got it yet.");
  			} else {
! 				res.add("!I have found the item to help Ados and need to take it.");
  			}
  		}
***************
*** 333,339 ****
  
  			if (timeRemaining > 0L) {
! 				res.add("DONE_TODAY");
  			} else {
! 				res.add("DONE_REPEATABLE");
  			}
  		}
--- 335,341 ----
  
  			if (timeRemaining > 0L) {
! 				res.add("!I fetched the last item the mayor asked me to find and claimed my reward within the last 24 hours.");
  			} else {
! 				res.add("!I fetched the last item the mayor asked me to find and now Ados needs supplies again.");
  			}
  		}
***************
*** 345,348 ****
--- 347,354 ----
  	public void addToWorld() {
  		super.addToWorld();
+ 		fillQuestInfo(
+ 				"Daily Item Quest",
+ 				"Mayor Chalmers needs supplies for Ados City.",
+ 				true);
  		
  		buildItemsMap();