[Arianne-commits] stendhal/src/games/stendhal/server StendhalQuestSystem.java, 1.53, 1.54

[Jose L. C. <ka...@us...>]

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

Modified Files:
	StendhalQuestSystem.java 
Log Message:
Redoo again.. :_(

Index: StendhalQuestSystem.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalQuestSystem.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** StendhalQuestSystem.java	7 Mar 2007 19:56:30 -0000	1.53
--- StendhalQuestSystem.java	7 Mar 2007 19:58:38 -0000	1.54
***************
*** 1,150 ****
! package games.stendhal.server;
! 
! import games.stendhal.server.entity.player.Player;
! import games.stendhal.server.maps.quests.IQuest;
! import games.stendhal.server.maps.quests.QuestInfo;
! import games.stendhal.server.rule.defaultruleset.QuestXMLLoader;
! 
! import java.lang.reflect.Constructor;
! import java.util.LinkedList;
! import java.util.List;
! 
! import marauroa.common.Log4J;
! 
! import org.apache.log4j.Logger;
! 
! public class StendhalQuestSystem {
! 	/** the logger instance. */
! 	private static final Logger logger = Log4J
! 			.getLogger(StendhalQuestSystem.class);
! 
! 	private List<IQuest> quests = new LinkedList<IQuest>();
! 
! 	private QuestXMLLoader questInfos;
! 	private static StendhalQuestSystem stendhalQuestSystem;
! 	
! 	public static StendhalQuestSystem get() {
! 		return stendhalQuestSystem;
! 	}
! 
! 	/**
! 	 * initiales the QuestSystem
! 	 */
! 	public StendhalQuestSystem() {
! 		stendhalQuestSystem = this;
! 		questInfos = QuestXMLLoader.get();
! 
! 		loadQuest("ArmorForDagobert");
! 		loadQuest("BeerForHayunn");
! 		loadQuest("Campfire");
! 		loadQuest("CleanStorageSpace");
! 		loadQuest("CloaksForBario");
! 		loadQuest("CostumeParty");
! 		loadQuest("DailyMonsterQuest");
! 		loadQuest("Deathmatch");
! 		loadQuest("DiceGambling");
! 		loadQuest("HatForMonogenes");
! 		loadQuest("IntroducePlayers");
! 		loadQuest("LookBookforCeryl");
! 		loadQuest("KanmararnSoldiers");
! 		loadQuest("MeetHackim");
! 		loadQuest("McPeglegIOU");
! 		loadQuest("MeetHayunn");
! 		loadQuest("MeetIo");
! 		loadQuest("MeetKetteh");
! 		loadQuest("MeetMonogenes");
! 		loadQuest("MeetNomyr");
! 		// loadQuest("MeetSanta");
! 		loadQuest("MeetZynn");
! 		loadQuest("NewsFromHackim");
! 		loadQuest("OrcishHappyMeal");
! 		loadQuest("PlinksToy");
! 		// loadQuest("ReverseArrow");
! 		// loadQuest("SemosMineTownRevivalWeeks");
! 		loadQuest("SevenCherubs");
! 		loadQuest("SheepGrowing");
! 		loadQuest("ToysCollector");
! 		loadQuest("VampireSword");
! 		loadQuest("WeaponsCollector");
! 		loadQuest("WeaponsCollector2");
! 		loadQuest("ZooFood");
! 	}
! 
! 	private boolean loadQuest(String name) {
! 		try {
! 			Class questClass = Class
! 					.forName("games.stendhal.server.maps.quests." + name);
! 
! 			if (!IQuest.class.isAssignableFrom(questClass)) { 
! 				logger.error("Class " + name + " doesn't implement IQuest interface.");
! 				return false;
! 			}
! 
! 			// Create a new instance.
! 			logger.info("Loading Quest: " + name);
! 			Constructor constr = questClass.getConstructor();
! 			IQuest quest = (IQuest) constr.newInstance();
! 
! 			// init and add to world
! 			quest.init(name);
! 			quest.addToWorld();
! 
! 			quests.add(quest);
! 			return true;
! 		} catch (Exception e) {
! 			logger.warn("Quest(" + name + ") loading failed.", e);
! 			return false;
! 		}
! 	}
! 	
! 	private void dumpQuest(StringBuilder sb, IQuest quest, Player player) {
! 		QuestInfo questInfo = questInfos.get(quest.getName());
! 		sb.append("\t" + questInfo.getTitle() + "\r\n");
! 		List<String> history = quest.getHistory(player);
! 		for (String entry : history) {
! 			String text = questInfo.getHistory().get(entry);
! 			if (text == null) {
! 				text = entry;
! 			}
! 			sb.append("\t\t * " + text + "\r\n");
! 		}
! 		sb.append("\r\n");
! 	}
! 	
! 	public String listQuests(Player player) {
! 		StringBuilder sb = new StringBuilder();
! 		
! 		// Open quests
! 		sb.append("\r\n\r\n");
! 		sb.append("Open Quests\r\n");
! 		sb.append("========\r\n");
! 		for (IQuest quest : quests) {
! 			if (quest.isStarted(player) && !quest.isCompleted(player)) {
! 				dumpQuest(sb, quest, player);
! 			}
! 		}
! 
! 		// Completed Quests
! 		sb.append("\r\n\r\n");
! 		sb.append("Completed Quests\r\n");
! 		sb.append("============\r\n");
! 		for (IQuest quest : quests) {
! 			if (quest.isCompleted(player)) {
! 				dumpQuest(sb, quest, player);
! 			}
! 		}
! 		
! 		return sb.toString();
! 	}
! 
! 	/**
! 	 * does stuff to update quest states on player login
! 	 *
! 	 * @param player Player
! 	 */
! 	public void onPlayerLogin(Player player) {
! 		for (IQuest quest : quests) {
! 			quest.onPlayerLogin(player);
! 		}
! 	}
! }
--- 1,150 ----
! package games.stendhal.server;
! 
! import games.stendhal.server.entity.player.Player;
! import games.stendhal.server.maps.quests.IQuest;
! import games.stendhal.server.maps.quests.QuestInfo;
! import games.stendhal.server.rule.defaultruleset.QuestXMLLoader;
! 
! import java.lang.reflect.Constructor;
! import java.util.LinkedList;
! import java.util.List;
! 
! import marauroa.common.Log4J;
! 
! import org.apache.log4j.Logger;
! 
! public class StendhalQuestSystem {
! 	/** the logger instance. */
! 	private static final Logger logger = Log4J
! 			.getLogger(StendhalQuestSystem.class);
! 
! 	private List<IQuest> quests = new LinkedList<IQuest>();
! 
! 	private QuestXMLLoader questInfos;
! 	private static StendhalQuestSystem stendhalQuestSystem;
! 	
! 	public static StendhalQuestSystem get() {
! 		return stendhalQuestSystem;
! 	}
! 
! 	/**
! 	 * initiales the QuestSystem
! 	 */
! 	public StendhalQuestSystem() {
! 		stendhalQuestSystem = this;
! 		questInfos = QuestXMLLoader.get();
! 
! 		loadQuest("ArmorForDagobert");
! 		loadQuest("BeerForHayunn");
! 		loadQuest("Campfire");
! 		loadQuest("CleanStorageSpace");
! 		loadQuest("CloaksForBario");
! 		loadQuest("CostumeParty");
! 		loadQuest("DailyMonsterQuest");
! 		loadQuest("Deathmatch");
! 		loadQuest("DiceGambling");
! 		loadQuest("HatForMonogenes");
! 		loadQuest("IntroducePlayers");
! 		loadQuest("LookBookforCeryl");
! 		loadQuest("KanmararnSoldiers");
! 		loadQuest("MeetHackim");
! 		loadQuest("McPeglegIOU");
! 		loadQuest("MeetHayunn");
! 		loadQuest("MeetIo");
! 		loadQuest("MeetKetteh");
! 		loadQuest("MeetMonogenes");
! 		loadQuest("MeetNomyr");
! 		// loadQuest("MeetSanta");
! 		loadQuest("MeetZynn");
! 		loadQuest("NewsFromHackim");
! 		loadQuest("OrcishHappyMeal");
! 		loadQuest("PlinksToy");
! 		// loadQuest("ReverseArrow");
! 		// loadQuest("SemosMineTownRevivalWeeks");
! 		loadQuest("SevenCherubs");
! 		loadQuest("SheepGrowing");
! 		loadQuest("ToysCollector");
! 		loadQuest("VampireSword");
! 		loadQuest("WeaponsCollector");
! 		loadQuest("WeaponsCollector2");
! 		loadQuest("ZooFood");
! 	}
! 
! 	private boolean loadQuest(String name) {
! 		try {
! 			Class questClass = Class
! 					.forName("games.stendhal.server.maps.quests." + name);
! 
! 			if (!IQuest.class.isAssignableFrom(questClass)) { 
! 				logger.error("Class " + name + " doesn't implement IQuest interface.");
! 				return false;
! 			}
! 
! 			// Create a new instance.
! 			logger.info("Loading Quest: " + name);
! 			Constructor constr = questClass.getConstructor();
! 			IQuest quest = (IQuest) constr.newInstance();
! 
! 			// init and add to world
! 			quest.init(name);
! 			quest.addToWorld();
! 
! 			quests.add(quest);
! 			return true;
! 		} catch (Exception e) {
! 			logger.warn("Quest(" + name + ") loading failed.", e);
! 			return false;
! 		}
! 	}
! 	
! 	private void dumpQuest(StringBuilder sb, IQuest quest, Player player) {
! 		QuestInfo questInfo = questInfos.get(quest.getName());
! 		sb.append("\t" + questInfo.getTitle() + "\r\n");
! 		List<String> history = quest.getHistory(player);
! 		for (String entry : history) {
! 			String text = questInfo.getHistory().get(entry);
! 			if (text == null) {
! 				text = entry;
! 			}
! 			sb.append("\t\t * " + text + "\r\n");
! 		}
! 		sb.append("\r\n");
! 	}
! 	
! 	public String listQuests(Player player) {
! 		StringBuilder sb = new StringBuilder();
! 		
! 		// Open quests
! 		sb.append("\r\n\r\n");
! 		sb.append("Open Quests\r\n");
! 		sb.append("========\r\n");
! 		for (IQuest quest : quests) {
! 			if (quest.isStarted(player) && !quest.isCompleted(player)) {
! 				dumpQuest(sb, quest, player);
! 			}
! 		}
! 
! 		// Completed Quests
! 		sb.append("\r\n\r\n");
! 		sb.append("Completed Quests\r\n");
! 		sb.append("============\r\n");
! 		for (IQuest quest : quests) {
! 			if (quest.isCompleted(player)) {
! 				dumpQuest(sb, quest, player);
! 			}
! 		}
! 		
! 		return sb.toString();
! 	}
! 
! 	/**
! 	 * does stuff to update quest states on player login
! 	 *
! 	 * @param player Player
! 	 */
! 	public void onPlayerLogin(Player player) {
! 		for (IQuest quest : quests) {
! 			quest.onPlayerLogin(player);
! 		}
! 	}
! }