[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests/mithrilcloak MakingFabric.java, 1.20, 1.21

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/mithrilcloak
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22704/src/games/stendhal/server/maps/quests/mithrilcloak

Modified Files:
	MakingFabric.java 
Log Message:
Pass time to ProducerBehaviour in seconds. Fixes [3597715] "inconsistent production time Vincent Price"


Index: MakingFabric.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/mithrilcloak/MakingFabric.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MakingFabric.java	1 May 2011 19:50:07 -0000	1.20
--- MakingFabric.java	29 Dec 2012 18:22:09 -0000	1.21
***************
*** 126,130 ****
  							+ getProductName()
  							+ " for you. Please be discreet and come back in "
! 							+ TimeUtil.approxTimeUntil((int) ((long)REQUIRED_MINUTES_THREAD * amount * MathHelper.MILLISECONDS_IN_ONE_MINUTE / 1000L)) + ".");
  					return true;
  				}
--- 126,130 ----
  							+ getProductName()
  							+ " for you. Please be discreet and come back in "
! 							+ TimeUtil.approxTimeUntil(REQUIRED_MINUTES_THREAD * amount * MathHelper.SECONDS_IN_ONE_MINUTE) + ".");
  					return true;
  				}
***************
*** 165,169 ****
  		
  		final ProducerBehaviour behaviour = new SpecialProducerBehaviour("make", "silk thread",
! 																		 requiredResources, REQUIRED_MINUTES_THREAD);
  
  		npc.add(ConversationStates.ATTENDING,
--- 165,169 ----
  		
  		final ProducerBehaviour behaviour = new SpecialProducerBehaviour("make", "silk thread",
! 																		 requiredResources, REQUIRED_MINUTES_THREAD * MathHelper.SECONDS_IN_ONE_MINUTE);
  
  		npc.add(ConversationStates.ATTENDING,
***************
*** 204,207 ****
--- 204,208 ----
  				ConversationStates.ATTENDING, null,
  				new ChatAction() {
+ 					@Override
  					public void fire(final Player player, final Sentence sentence, final EventRaiser npc) {
  						behaviour.transactAgreedDeal(currentBehavRes, npc, player);
***************
*** 220,223 ****
--- 221,225 ----
  				ConversationStates.ATTENDING, null,
  				new ChatAction() {
+ 					@Override
  					public void fire(final Player player, final Sentence sentence,
  							final EventRaiser npc) {
***************
*** 232,235 ****
--- 234,238 ----
  			ConversationStates.ATTENDING, null,
  				new ChatAction() {
+ 					@Override
  					public void fire(final Player player, final Sentence sentence,
  							final EventRaiser npc) {
***************
*** 271,274 ****
--- 274,278 ----
  			ConversationStates.IDLE, null,
  				new ChatAction() {
+ 					@Override
  					public void fire(final Player player, final Sentence sentence,
  									 final EventRaiser npc) {
***************
*** 328,331 ****
--- 332,336 ----
  			null,
  			new ChatAction() {
+ 				@Override
  				public void fire(final Player player, final Sentence sentence, final EventRaiser npc) {
  					if (player.isEquipped("silk thread", 40)
***************
*** 353,356 ****
--- 358,362 ----
  						new QuestStateStartsWithCondition(mithrilcloak.getQuestSlot(), "fusingthread;")),
  				ConversationStates.ATTENDING, null, new ChatAction() {
+ 					@Override
  					public void fire(final Player player, final Sentence sentence, final EventRaiser npc) {
  						final String orderString = player.getQuest(mithrilcloak.getQuestSlot());
***************
*** 479,482 ****
--- 485,489 ----
  			null,
  			new ChatAction() {
+ 				@Override
  				public void fire(final Player player, final Sentence sentence, final EventRaiser npc) {
  					if (player.isEquipped("mithril thread", 40)) {
***************
*** 507,510 ****
--- 514,518 ----
  			new QuestStateStartsWithCondition(mithrilcloak.getQuestSlot(), "weavingfabric;"),
  			ConversationStates.ATTENDING, null, new ChatAction() {
+ 				@Override
  				public void fire(final Player player, final Sentence sentence, final EventRaiser npc) {
  					final String[] tokens = player.getQuest(mithrilcloak.getQuestSlot()).split(";");