[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests HouseBuying.java, 1.53, 1.54

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22758/src/games/stendhal/server/maps/quests

Modified Files:
	HouseBuying.java 
Log Message:
code format

Index: HouseBuying.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/HouseBuying.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** HouseBuying.java	13 Mar 2009 09:11:37 -0000	1.53
--- HouseBuying.java	13 Mar 2009 09:38:37 -0000	1.54
***************
*** 123,127 ****
  			final String itemName = Integer.toString(number);
  
! 			HousePortal houseportal = getHousePortal(number);
  
  			if (houseportal == null) {
--- 123,127 ----
  			final String itemName = Integer.toString(number);
  
! 			final HousePortal houseportal = getHousePortal(number);
  
  			if (houseportal == null) {
***************
*** 132,136 ****
  			}
  
! 			String owner = houseportal.getOwner();
  			if (owner.length() == 0) {
  				
--- 132,136 ----
  			}
  
! 			final String owner = houseportal.getOwner();
  			if (owner.length() == 0) {
  				
***************
*** 155,159 ****
  
  						// set the time so that the taxman can start harassing the player
! 						long time = System.currentTimeMillis();
  						houseportal.setExpireTime(time);
  						houseportal.changeLock();
--- 155,159 ----
  
  						// set the time so that the taxman can start harassing the player
! 						final long time = System.currentTimeMillis();
  						houseportal.setExpireTime(time);
  						houseportal.changeLock();
***************
*** 177,181 ****
  	}
  
! 	private final int getCost(String location) {
  		// TODO: think how to do this nicely, or remove this TODO
  		if ("ados".equals(location)) {
--- 177,181 ----
  	}
  
! 	private int getCost(final String location) {
  		// TODO: think how to do this nicely, or remove this TODO
  		if ("ados".equals(location)) {
***************
*** 214,218 ****
  				final String doorId = location + " house " + housenumber;
  				final int number = MathHelper.parseInt(housenumber);
! 				HousePortal houseportal = getHousePortal(number);
  
  				if (houseportal == null) {
--- 214,218 ----
  				final String doorId = location + " house " + housenumber;
  				final int number = MathHelper.parseInt(housenumber);
! 				final HousePortal houseportal = getHousePortal(number);
  
  				if (houseportal == null) {
***************
*** 261,266 ****
  			
  			try {
! 				int id = Integer.parseInt(claimedHouse);
! 				HousePortal portal = getHousePortal(id);
  				
  				if (portal != null) { 
--- 261,266 ----
  			
  			try {
! 				final int id = Integer.parseInt(claimedHouse);
! 				final HousePortal portal = getHousePortal(id);
  				
  				if (portal != null) { 
***************
*** 269,273 ****
  					logger.error("Player " + player.getName() + " claims to own a nonexistent house " + id);
  				}
! 			} catch (NumberFormatException e) {
  					logger.error("Invalid number in house slot", e);
  			}
--- 269,273 ----
  					logger.error("Player " + player.getName() + " claims to own a nonexistent house " + id);
  				}
! 			} catch (final NumberFormatException e) {
  					logger.error("Invalid number in house slot", e);
  			}
***************
*** 279,287 ****
  	// this will be ideal for a seller to list all unbought houses
  	// using Grammar.enumerateCollection
! 	private final List<String> getUnboughtHouses() {
! 	    List<String> unbought = new LinkedList<String>();
  		final List<HousePortal> portals =  getHousePortals();
! 		for (HousePortal houseportal : portals) {
! 			String owner = houseportal.getOwner();
  			if (owner.length() == 0) {
  				unbought.add(houseportal.getDoorId());
--- 279,287 ----
  	// this will be ideal for a seller to list all unbought houses
  	// using Grammar.enumerateCollection
! 	private List<String> getUnboughtHouses() {
! 	    final List<String> unbought = new LinkedList<String>();
  		final List<HousePortal> portals =  getHousePortals();
! 		for (final HousePortal houseportal : portals) {
! 			final String owner = houseportal.getOwner();
  			if (owner.length() == 0) {
  				unbought.add(houseportal.getDoorId());
***************
*** 291,298 ****
  	}
  
! 	private final HousePortal getHousePortal(int id) {
  		final List<HousePortal> portals =  getHousePortals();
! 		for (HousePortal houseportal : portals) {
! 			int number = houseportal.getPortalNumber();
  			if (number == id) {
  				return houseportal;
--- 291,298 ----
  	}
  
! 	private HousePortal getHousePortal(final int id) {
  		final List<HousePortal> portals =  getHousePortals();
! 		for (final HousePortal houseportal : portals) {
! 			final int number = houseportal.getPortalNumber();
  			if (number == id) {
  				return houseportal;
***************
*** 331,335 ****
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
--- 331,335 ----
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
***************
*** 345,349 ****
  				// player has not done required quest, hasn't got a house at all
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), new QuestNotCompletedCondition(PRINCESS_QUEST_SLOT)),
  					ConversationStates.ATTENDING, 
--- 345,349 ----
  				// player has not done required quest, hasn't got a house at all
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), new QuestNotCompletedCondition(PRINCESS_QUEST_SLOT)),
  					ConversationStates.ATTENDING, 
***************
*** 357,361 ****
  				// (don't need to check if they have a house, they can't as they're not old enough)
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(
  									 new QuestCompletedCondition(PRINCESS_QUEST_SLOT),
--- 357,361 ----
  				// (don't need to check if they have a house, they can't as they're not old enough)
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(
  									 new QuestCompletedCondition(PRINCESS_QUEST_SLOT),
***************
*** 370,374 ****
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
--- 370,374 ----
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
***************
*** 479,483 ****
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
--- 479,483 ----
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
***************
*** 493,497 ****
  				// player is not old enough
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new NotCondition(new AgeGreaterThanCondition(REQUIRED_AGE)),
  					ConversationStates.ATTENDING,
--- 493,497 ----
  				// player is not old enough
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new NotCondition(new AgeGreaterThanCondition(REQUIRED_AGE)),
  					ConversationStates.ATTENDING,
***************
*** 505,509 ****
  				// player doesn't have a house and is old enough but has not done required quests
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new AgeGreaterThanCondition(REQUIRED_AGE), 
  									 new QuestNotStartedCondition(QUEST_SLOT),
--- 505,509 ----
  				// player doesn't have a house and is old enough but has not done required quests
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new AgeGreaterThanCondition(REQUIRED_AGE), 
  									 new QuestNotStartedCondition(QUEST_SLOT),
***************
*** 524,528 ****
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
--- 524,528 ----
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
***************
*** 615,619 ****
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
--- 615,619 ----
  				// quest slot 'house' is started so player owns a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new QuestStartedCondition(QUEST_SLOT),
  					ConversationStates.ATTENDING, 
***************
*** 629,633 ****
  				// player is not old enough
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new NotCondition(new AgeGreaterThanCondition(REQUIRED_AGE)),
  					ConversationStates.ATTENDING, 
--- 629,633 ----
  				// player is not old enough
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new NotCondition(new AgeGreaterThanCondition(REQUIRED_AGE)),
  					ConversationStates.ATTENDING, 
***************
*** 640,644 ****
  				// player is old enough and hasn't got a house but has not done required quest
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new AgeGreaterThanCondition(REQUIRED_AGE), 
  									 new QuestNotCompletedCondition(KIRDNEH_QUEST_SLOT), 
--- 640,644 ----
  				// player is old enough and hasn't got a house but has not done required quest
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new AgeGreaterThanCondition(REQUIRED_AGE), 
  									 new QuestNotCompletedCondition(KIRDNEH_QUEST_SLOT), 
***************
*** 652,656 ****
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost","house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
--- 652,656 ----
  				// player is eligible to buy a house
  				add(ConversationStates.ATTENDING, 
! 					Arrays.asList("cost", "house"),
  					new AndCondition(new QuestNotStartedCondition(QUEST_SLOT), 
  									 new AgeGreaterThanCondition(REQUIRED_AGE), 
***************
*** 731,742 ****
  			
  			// note we default to a DIFFERENT value than the default house number incase neither found for some bad reasons
! 			int id = MathHelper.parseIntDefault(player.getQuest(QUEST_SLOT), -1);
  			logger.debug("Found that " + name + " owns house " + Integer.toString(id));
  			// Now look for the house portal which matches this and update it to have the player name on it
  			final List<HousePortal> portals =  getHousePortals();
! 			for (HousePortal houseportal : portals) {
! 				String owner = houseportal.getOwner();
  				if ("an unknown owner".equals(owner)) {
! 					int number = houseportal.getPortalNumber();
  					if (number == id) {
  						houseportal.setOwner(name);
--- 731,742 ----
  			
  			// note we default to a DIFFERENT value than the default house number incase neither found for some bad reasons
! 			final int id = MathHelper.parseIntDefault(player.getQuest(QUEST_SLOT), -1);
  			logger.debug("Found that " + name + " owns house " + Integer.toString(id));
  			// Now look for the house portal which matches this and update it to have the player name on it
  			final List<HousePortal> portals =  getHousePortals();
! 			for (final HousePortal houseportal : portals) {
! 				final String owner = houseportal.getOwner();
  				if ("an unknown owner".equals(owner)) {
! 					final int number = houseportal.getPortalNumber();
  					if (number == id) {
  						houseportal.setOwner(name);
***************
*** 757,763 ****
  			final List<Portal> adosportals = ados_city_zone.getPortals();
  			final List<Portal> adosNportals = ados_city_n_zone.getPortals();
! 			final List<List<Portal>> megalist = Arrays.asList(kalavanportals,kirdnehportals,adosportals,adosNportals);
! 			for (List<Portal> zoneportals : megalist) {
! 				for (Portal portal : zoneportals) {
  					if (portal instanceof HousePortal) {
  						allHousePortals.add((HousePortal) portal);
--- 757,763 ----
  			final List<Portal> adosportals = ados_city_zone.getPortals();
  			final List<Portal> adosNportals = ados_city_n_zone.getPortals();
! 			final List<List<Portal>> megalist = Arrays.asList(kalavanportals, kirdnehportals, adosportals, adosNportals);
! 			for (final List<Portal> zoneportals : megalist) {
! 				for (final Portal portal : zoneportals) {
  					if (portal instanceof HousePortal) {
  						allHousePortals.add((HousePortal) portal);