[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests ArmorForDagobert.java, 1.27, 1.28 Campfire.java, 1.23, 1.24

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

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

Modified Files:
	ArmorForDagobert.java Campfire.java 
Log Message:
code format

Index: Campfire.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/Campfire.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Campfire.java	10 Sep 2007 13:53:31 -0000	1.23
--- Campfire.java	12 Nov 2007 21:54:01 -0000	1.24
***************
*** 83,88 ****
  			int turnWhenLastBroughtWood;
  			try {
! 				turnWhenLastBroughtWood = Integer.parseInt(player
! 						.getQuest(QUEST_SLOT));
  			} catch (NumberFormatException e) {
  				// compatibility: Old Stendhal version stored "done" on
--- 83,87 ----
  			int turnWhenLastBroughtWood;
  			try {
! 				turnWhenLastBroughtWood = Integer.parseInt(player.getQuest(QUEST_SLOT));
  			} catch (NumberFormatException e) {
  				// compatibility: Old Stendhal version stored "done" on
***************
*** 117,132 ****
  						} 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?");
! 								npc
! 										.setCurrentState(ConversationStates.QUEST_ITEM_BROUGHT);
  							} else {
! 								npc
! 										.say("You're back already? Don't forget that you promised to collect ten pieces of wood for me!");
  							}
  						} else {
  							// TODO: say how many minutes are left.
! 							npc
! 									.say("Oh, I still have plenty of wood from the last time you helped me. Thank you for helping!");
  						}
  					}
--- 116,127 ----
  						} 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?");
! 								npc.setCurrentState(ConversationStates.QUEST_ITEM_BROUGHT);
  							} else {
! 								npc.say("You're back already? Don't forget that you promised to collect ten pieces of wood for me!");
  							}
  						} else {
  							// TODO: say how many minutes are left.
! 							npc.say("Oh, I still have plenty of wood from the last time you helped me. Thank you for helping!");
  						}
  					}
***************
*** 134,181 ****
  
  		npc.add(ConversationStates.ATTENDING,
! 				ConversationPhrases.QUEST_MESSAGES, null,
! 				ConversationStates.QUEST_OFFERED, null,
! 				new SpeakerNPC.ChatAction() {
! 					@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.");
! 							npc.setCurrentState(ConversationStates.ATTENDING);
! 						}
  					}
! 				});
  
  		// player is willing to help
! 		npc
! 				.add(
! 						ConversationStates.QUEST_OFFERED,
! 						ConversationPhrases.YES_MESSAGES,
! 						null,
! 						ConversationStates.ATTENDING,
! 						"Okay. You can find wood in the forest north of here. Come back when you get ten pieces of wood!",
! 						new SpeakerNPC.ChatAction() {
! 							@Override
! 							public void fire(Player player, String text,
! 									SpeakerNPC npc) {
! 								player.setQuest(QUEST_SLOT, "start");
! 							}
! 						});
  
  		// player is not willing to help
! 		npc
! 				.add(
! 						ConversationStates.QUEST_OFFERED,
! 						ConversationPhrases.NO_MESSAGES,
! 						null,
! 						ConversationStates.ATTENDING,
! 						"Oh dear, how am I going to cook all this meat? Perhaps I'll just have to feed it to the animals...",
! 						null);
  	}
  
--- 129,169 ----
  
  		npc.add(ConversationStates.ATTENDING,
! 			ConversationPhrases.QUEST_MESSAGES, null,
! 			ConversationStates.QUEST_OFFERED, null,
! 			new SpeakerNPC.ChatAction() {
! 				@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.");
! 						npc.setCurrentState(ConversationStates.ATTENDING);
  					}
! 				}
! 			});
  
  		// player is willing to help
! 		npc.add(ConversationStates.QUEST_OFFERED,
! 			ConversationPhrases.YES_MESSAGES,
! 			null,
! 			ConversationStates.ATTENDING,
! 			"Okay. You can find wood in the forest north of here. Come back when you get ten pieces of wood!",
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text,
! 						SpeakerNPC npc) {
! 					player.setQuest(QUEST_SLOT, "start");
! 				}
! 			});
  
  		// player is not willing to help
! 		npc.add(ConversationStates.QUEST_OFFERED,
! 			ConversationPhrases.NO_MESSAGES,
! 			null,
! 			ConversationStates.ATTENDING,
! 			"Oh dear, how am I going to cook all this meat? Perhaps I'll just have to feed it to the animals...",
! 			null);
  	}
  
***************
*** 184,227 ****
  
  		npc.add(ConversationStates.QUEST_ITEM_BROUGHT,
! 				ConversationPhrases.YES_MESSAGES, null,
! 				ConversationStates.ATTENDING, null,
! 				new SpeakerNPC.ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 						if (player.drop("wood", REQUIRED_WOOD)) {
! 							player.setQuest(QUEST_SLOT, Integer
! 									.toString(StendhalRPRuleProcessor.get()
! 											.getTurn()));
! 							player.addXP(50);
  
! 							String rewardClass;
! 							if (Rand.throwCoin() == 1) {
! 								rewardClass = "meat";
! 							} else {
! 								rewardClass = "ham";
! 							}
! 							npc.say("Thank you! Here, take some " + rewardClass
! 									+ "!");
! 							EntityManager manager = StendhalRPWorld.get()
! 									.getRuleManager().getEntityManager();
! 							StackableItem reward = (StackableItem) manager
! 									.getItem(rewardClass);
! 							reward.setQuantity(REQUIRED_WOOD);
! 							player.equip(reward, true);
! 							player.notifyWorldAboutChanges();
  						} else {
! 							npc.say("Hey! Where did you put the wood?");
  						}
  					}
! 				});
  
! 		npc
! 				.add(
! 						ConversationStates.QUEST_ITEM_BROUGHT,
! 						ConversationPhrases.NO_MESSAGES,
! 						null,
! 						ConversationStates.ATTENDING,
! 						"Oh... well, I hope you find some quickly; this fire's going to burn out soon!",
! 						null);
  	}
  
--- 172,210 ----
  
  		npc.add(ConversationStates.QUEST_ITEM_BROUGHT,
! 			ConversationPhrases.YES_MESSAGES, null,
! 			ConversationStates.ATTENDING, null,
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text, SpeakerNPC npc) {
! 					if (player.drop("wood", REQUIRED_WOOD)) {
! 						player.setQuest(QUEST_SLOT, Integer.toString(StendhalRPRuleProcessor.get().getTurn()));
! 						player.addXP(50);
  
! 						String rewardClass;
! 						if (Rand.throwCoin() == 1) {
! 							rewardClass = "meat";
  						} else {
! 							rewardClass = "ham";
  						}
+ 						npc.say("Thank you! Here, take some " + rewardClass + "!");
+ 						EntityManager manager = StendhalRPWorld.get()
+ 								.getRuleManager().getEntityManager();
+ 						StackableItem reward = (StackableItem) manager.getItem(rewardClass);
+ 						reward.setQuantity(REQUIRED_WOOD);
+ 						player.equip(reward, true);
+ 						player.notifyWorldAboutChanges();
+ 					} else {
+ 						npc.say("Hey! Where did you put the wood?");
  					}
! 				}
! 			});
  
! 		npc.add(
! 			ConversationStates.QUEST_ITEM_BROUGHT,
! 			ConversationPhrases.NO_MESSAGES,
! 			null,
! 			ConversationStates.ATTENDING,
! 			"Oh... well, I hope you find some quickly; this fire's going to burn out soon!",
! 			null);
  	}
  

Index: ArmorForDagobert.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/ArmorForDagobert.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ArmorForDagobert.java	19 Aug 2007 10:13:37 -0000	1.27
--- ArmorForDagobert.java	12 Nov 2007 21:54:01 -0000	1.28
***************
*** 75,131 ****
  
  		npc.add(ConversationStates.ATTENDING,
! 				ConversationPhrases.QUEST_MESSAGES, null,
! 				ConversationStates.QUEST_OFFERED, null,
! 				new SpeakerNPC.ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 						if (!player.isQuestCompleted(QUEST_SLOT)) {
! 							npc
! 									.say("I'm so afraid of being robbed. I don't have any protection. Do you think you can help me?");
! 						} else {
! 							npc
! 									.say("Thank you very much for the armor, but I don't have any other task for you.");
! 							npc.setCurrentState(ConversationStates.ATTENDING);
! 						}
  					}
! 				});
  
  		// player is willing to help
! 		npc
! 				.add(
! 						ConversationStates.QUEST_OFFERED,
! 						ConversationPhrases.YES_MESSAGES,
! 						null,
! 						ConversationStates.ATTENDING,
! 						"Once I had a nice #leather_cuirass, but it was destroyed during the last robbery. If you find a new one, I'll give you a reward.",
! 						new SpeakerNPC.ChatAction() {
! 							@Override
! 							public void fire(Player player, String text,
! 									SpeakerNPC npc) {
! 								player.setQuest(QUEST_SLOT, "start");
! 							}
! 						});
  
  		// player is not willing to help
  		npc.add(ConversationStates.QUEST_OFFERED,
! 				ConversationPhrases.NO_MESSAGES, null,
! 				ConversationStates.ATTENDING,
! 				"Well, then I guess I'll just duck and cover.",
! 				new SpeakerNPC.ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 						player.setQuest(QUEST_SLOT, "rejected");
! 					}
! 				});
  
  		// player wants to know what a leather_cuirass is
! 		npc
! 				.add(
! 						ConversationStates.ATTENDING,
! 						Arrays.asList("leather_cuirass", "leather", "cuirass"),
! 						null,
! 						ConversationStates.ATTENDING,
! 						"A leather_cuirass is the traditional cyclops armor. Some cyclopes are living in the dungeon deep under the city.",
! 						null);
  	}
  
--- 75,127 ----
  
  		npc.add(ConversationStates.ATTENDING,
! 			ConversationPhrases.QUEST_MESSAGES, null,
! 			ConversationStates.QUEST_OFFERED, null,
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text, SpeakerNPC npc) {
! 					if (!player.isQuestCompleted(QUEST_SLOT)) {
! 						npc.say("I'm so afraid of being robbed. I don't have any protection. Do you think you can help me?");
! 					} else {
! 						npc.say("Thank you very much for the armor, but I don't have any other task for you.");
! 						npc.setCurrentState(ConversationStates.ATTENDING);
  					}
! 				}
! 			});
  
  		// player is willing to help
! 		npc.add(
! 			ConversationStates.QUEST_OFFERED,
! 			ConversationPhrases.YES_MESSAGES,
! 			null,
! 			ConversationStates.ATTENDING,
! 			"Once I had a nice #leather_cuirass, but it was destroyed during the last robbery. If you find a new one, I'll give you a reward.",
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text,
! 						SpeakerNPC npc) {
! 					player.setQuest(QUEST_SLOT, "start");
! 				}
! 			});
  
  		// player is not willing to help
  		npc.add(ConversationStates.QUEST_OFFERED,
! 			ConversationPhrases.NO_MESSAGES, null,
! 			ConversationStates.ATTENDING,
! 			"Well, then I guess I'll just duck and cover.",
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text, SpeakerNPC npc) {
! 					player.setQuest(QUEST_SLOT, "rejected");
! 				}
! 			});
  
  		// player wants to know what a leather_cuirass is
! 		npc.add(
! 			ConversationStates.ATTENDING,
! 			Arrays.asList("leather_cuirass", "leather", "cuirass"),
! 			null,
! 			ConversationStates.ATTENDING,
! 			"A leather_cuirass is the traditional cyclops armor. Some cyclopes are living in the dungeon deep under the city.",
! 			null);
  	}
  
***************
*** 135,200 ****
  		// player returns while quest is still active
  		npc.add(ConversationStates.IDLE, ConversationPhrases.GREETING_MESSAGES,
! 				new SpeakerNPC.ChatCondition() {
! 					@Override
! 					public boolean fire(Player player, String text,
! 							SpeakerNPC npc) {
! 						return player.hasQuest(QUEST_SLOT)
! 								&& player.getQuest(QUEST_SLOT).equals("start");
! 					}
! 				}, ConversationStates.ATTENDING, null,
! 				new SpeakerNPC.ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 						if (player.isEquipped("leather_cuirass")) {
! 							npc
! 									.say("Excuse me, please! I have noticed the leather_cuirass you're carrying. Is it for me?");
! 							npc
! 									.setCurrentState(ConversationStates.QUEST_ITEM_BROUGHT);
! 						} else {
! 							npc
! 									.say("Luckily I haven't been robbed while you were away. I would be glad to receive a leather_cuirass. Anyway, how can I #help you?");
! 						}
  					}
! 				});
  
  		npc.add(
! 				ConversationStates.QUEST_ITEM_BROUGHT,
! 				ConversationPhrases.YES_MESSAGES,
! 				// make sure the player isn't cheating by putting the armor
! 				// away and then saying "yes"
! 				new SpeakerNPC.ChatCondition() {
! 					@Override
! 					public boolean fire(Player player, String text,
! 							SpeakerNPC npc) {
! 						return player.isEquipped("leather_cuirass");
! 					}
! 				}, ConversationStates.ATTENDING, null,
! 				new SpeakerNPC.ChatAction() {
! 					@Override
! 					public void fire(Player player, String text, SpeakerNPC npc) {
! 						player.drop("leather_cuirass");
  
! 						StackableItem money = (StackableItem) StendhalRPWorld
! 								.get().getRuleManager().getEntityManager()
! 								.getItem("money");
! 						money.setQuantity(80);
! 						player.equip(money);
! 						player.addXP(50);
  
! 						player.notifyWorldAboutChanges();
! 						player.setQuest(QUEST_SLOT, "done");
! 						npc
! 								.say("Oh, I am so thankful! Here is some gold I found ... ehm ... somewhere.");
! 					}
! 				});
  
! 		npc
! 				.add(
! 						ConversationStates.QUEST_ITEM_BROUGHT,
! 						ConversationPhrases.NO_MESSAGES,
! 						null,
! 						ConversationStates.ATTENDING,
! 						"Well then, I hope you find another one which you can give to me before I get robbed again.",
! 						null);
  	}
  
--- 131,191 ----
  		// player returns while quest is still active
  		npc.add(ConversationStates.IDLE, ConversationPhrases.GREETING_MESSAGES,
! 			new SpeakerNPC.ChatCondition() {
! 				@Override
! 				public boolean fire(Player player, String text,
! 						SpeakerNPC npc) {
! 					return player.hasQuest(QUEST_SLOT)
! 							&& player.getQuest(QUEST_SLOT).equals("start");
! 				}
! 			}, ConversationStates.ATTENDING, null,
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text, SpeakerNPC npc) {
! 					if (player.isEquipped("leather_cuirass")) {
! 						npc.say("Excuse me, please! I have noticed the leather_cuirass you're carrying. Is it for me?");
! 						npc.setCurrentState(ConversationStates.QUEST_ITEM_BROUGHT);
! 					} else {
! 						npc.say("Luckily I haven't been robbed while you were away. I would be glad to receive a leather_cuirass. Anyway, how can I #help you?");
  					}
! 				}
! 			});
  
  		npc.add(
! 			ConversationStates.QUEST_ITEM_BROUGHT,
! 			ConversationPhrases.YES_MESSAGES,
! 			// make sure the player isn't cheating by putting the armor
! 			// away and then saying "yes"
! 			new SpeakerNPC.ChatCondition() {
! 				@Override
! 				public boolean fire(Player player, String text,
! 						SpeakerNPC npc) {
! 					return player.isEquipped("leather_cuirass");
! 				}
! 			}, ConversationStates.ATTENDING, null,
! 			new SpeakerNPC.ChatAction() {
! 				@Override
! 				public void fire(Player player, String text, SpeakerNPC npc) {
! 					player.drop("leather_cuirass");
  
! 					StackableItem money = (StackableItem) StendhalRPWorld
! 							.get().getRuleManager().getEntityManager()
! 							.getItem("money");
! 					money.setQuantity(80);
! 					player.equip(money);
! 					player.addXP(50);
  
! 					player.notifyWorldAboutChanges();
! 					player.setQuest(QUEST_SLOT, "done");
! 					npc.say("Oh, I am so thankful! Here is some gold I found ... ehm ... somewhere.");
! 				}
! 			});
  
! 		npc.add(
! 			ConversationStates.QUEST_ITEM_BROUGHT,
! 			ConversationPhrases.NO_MESSAGES,
! 			null,
! 			ConversationStates.ATTENDING,
! 			"Well then, I hope you find another one which you can give to me before I get robbed again.",
! 			null);
  	}