[Arianne-commits] stendhal/src/games/stendhal/server/maps/semos/tavern/market RemoveOfferHandler.java, 1.4, 1.5 AcceptOfferHandler.java, 1.9, 1.10 ProlongOfferHandler.java, 1.10, 1.11 MarketManagerNPC.java, 1.21, 1.22

[MadMetzger <mad...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market
In directory vz-cvs-4.sog:/tmp/cvs-serv32215/src/games/stendhal/server/maps/semos/tavern/market

Modified Files:
	RemoveOfferHandler.java AcceptOfferHandler.java 
	ProlongOfferHandler.java MarketManagerNPC.java 
Log Message:
get rid of duplicated set of offers and just rely on slot for offers (expired offers will follow)

Index: AcceptOfferHandler.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market/AcceptOfferHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AcceptOfferHandler.java	19 Sep 2010 02:35:25 -0000	1.9
--- AcceptOfferHandler.java	30 Mar 2011 18:47:34 -0000	1.10
***************
*** 101,105 ****
  			} else {
  				// Trade failed for some reason. Check why, and inform the player
! 				if (!m.getOffers().contains(offer)) {
  					int quantity = getQuantity(offer.getItem());
  					npc.say("I'm sorry, but " + Grammar.thatthose(quantity) + " "
--- 101,105 ----
  			} else {
  				// Trade failed for some reason. Check why, and inform the player
! 				if (!m.contains(offer)) {
  					int quantity = getQuantity(offer.getItem());
  					npc.say("I'm sorry, but " + Grammar.thatthose(quantity) + " "

Index: MarketManagerNPC.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market/MarketManagerNPC.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MarketManagerNPC.java	30 Dec 2010 16:09:19 -0000	1.21
--- MarketManagerNPC.java	30 Mar 2011 18:47:34 -0000	1.22
***************
*** 25,28 ****
--- 25,29 ----
  
  public final class MarketManagerNPC extends SpeakerNPC {
+ 	
  	private Map<String,Map<String,Offer>> offerMap = new HashMap<String, Map<String, Offer>>();
  	
***************
*** 41,44 ****
--- 42,47 ----
  	@Override
  	protected void onGoodbye(RPEntity player) {
+ 		//clean the offer map on leaving of a player
+ 		offerMap.clear();
  		setDirection(Direction.DOWN);
  	}

Index: ProlongOfferHandler.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market/ProlongOfferHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ProlongOfferHandler.java	12 Mar 2011 19:56:13 -0000	1.10
--- ProlongOfferHandler.java	30 Mar 2011 18:47:34 -0000	1.11
***************
*** 66,70 ****
  						StringBuilder message = new StringBuilder();
  						
! 						if (TradeCenterZoneConfigurator.getShopFromZone(player.getZone()).getOffers().contains(o)) {
  							message.append("Your offer of ");
  							message.append(Grammar.quantityplnoun(quantity, o.getItem().getName(), "one"));
--- 66,70 ----
  						StringBuilder message = new StringBuilder();
  						
! 						if (TradeCenterZoneConfigurator.getShopFromZone(player.getZone()).contains(o)) {
  							message.append("Your offer of ");
  							message.append(Grammar.quantityplnoun(quantity, o.getItem().getName(), "one"));

Index: RemoveOfferHandler.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market/RemoveOfferHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RemoveOfferHandler.java	19 Sep 2010 02:35:25 -0000	1.4
--- RemoveOfferHandler.java	30 Mar 2011 18:47:34 -0000	1.5
***************
*** 61,65 ****
  						setOffer(o);
  						// Ask for confirmation only if the offer is still active
! 						if (TradeCenterZoneConfigurator.getShopFromZone(player.getZone()).getOffers().contains(o)) {
  							int quantity = getQuantity(o.getItem());
  							npc.say("Do you want to remove your offer of " + Grammar.quantityplnoun(quantity, o.getItem().getName(), "one") + "?");
--- 61,65 ----
  						setOffer(o);
  						// Ask for confirmation only if the offer is still active
! 						if (TradeCenterZoneConfigurator.getShopFromZone(player.getZone()).contains(o)) {
  							int quantity = getQuantity(o.getItem());
  							npc.say("Do you want to remove your offer of " + Grammar.quantityplnoun(quantity, o.getItem().getName(), "one") + "?");