[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests Campfire.java, 1.25, 1.26

[Hendrik <nh...@us...>]

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

Modified Files:
	Campfire.java 
Log Message:
semantic change: Accept wood even if the quest was started longer ago than the repeat timeout.

Index: Campfire.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/Campfire.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Campfire.java	12 Nov 2007 22:23:03 -0000	1.25
--- Campfire.java	12 Nov 2007 22:27:23 -0000	1.26
***************
*** 114,120 ****
  					@Override
  					public void fire(Player player, String text, SpeakerNPC npc) {
! 						if (canStartQuestNow(npc, player)) {
! 							npc.say("Hi! Could you do me a #favor?");
! 						} else if (player.getQuest(QUEST_SLOT).equals("start")) {
  							if (player.isEquipped("wood", REQUIRED_WOOD)) {
  								npc.say("Hi again! You've got wood, I see; do you have those 10 pieces of wood I asked about earlier?");
--- 114,118 ----
  					@Override
  					public void fire(Player player, String text, SpeakerNPC npc) {
! 						if (player.getQuest(QUEST_SLOT).equals("start")) {
  							if (player.isEquipped("wood", REQUIRED_WOOD)) {
  								npc.say("Hi again! You've got wood, I see; do you have those 10 pieces of wood I asked about earlier?");
***************
*** 123,126 ****
--- 121,126 ----
  								npc.say("You're back already? Don't forget that you promised to collect ten pieces of wood for me!");
  							}
+ 						} else if (canStartQuestNow(npc, player)) {
+ 							npc.say("Hi! Could you do me a #favor?");
  						} else {
  							// TODO: say how many minutes are left.
***************
*** 136,143 ****
  				@Override
  				public void fire(Player player, String text, SpeakerNPC npc) {
! 					if (canStartQuestNow(npc, player)) {
! 						npc.say("I need more wood to keep my campfire running, But I can't leave it unattended to go get some! Could you please get some from the forest for me? I need ten pieces.");
! 					} else if (player.getQuest(QUEST_SLOT).equals("start")) {
  						npc.say("You already promised me to bring me some wood! Ten pieces, remember?");
  					} else {
  						npc.say("I don't need any more wood at the moment, but thanks for asking.");
--- 136,143 ----
  				@Override
  				public void fire(Player player, String text, SpeakerNPC npc) {
! 					if (player.getQuest(QUEST_SLOT).equals("start")) {
  						npc.say("You already promised me to bring me some wood! Ten pieces, remember?");
+ 					} else if (canStartQuestNow(npc, player)) {
+ 						npc.say("I need more wood to keep my campfire running, But I can't leave it unattended to go get some! Could you please get some from the forest for me? I need ten pieces.");
  					} else {
  						npc.say("I don't need any more wood at the moment, but thanks for asking.");