From: Katie <ky...@us...> - 2009-02-17 23:35:38
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13677/semos/bank Modified Files: CustomerAdvisorNPC.java Log Message: tell the player (using postman) what items got returned to their bank and bag if they left some on the floor in the vault when they logged out or exited using the door, or scrolled out. Index: CustomerAdvisorNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank/CustomerAdvisorNPC.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CustomerAdvisorNPC.java 17 Feb 2009 23:30:43 -0000 1.18 --- CustomerAdvisorNPC.java 17 Feb 2009 23:35:26 -0000 1.19 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.common.Direction; + import games.stendhal.common.Grammar; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; *************** *** 42,50 **** final int oldY) { if(zone.getPlayers().size() == 1) { Set<Item> itemsOnGround = zone.getItemsOnGround(); for (Item item : itemsOnGround) { boolean equippedToBag = DefaultActionManager.getInstance().onEquip((RPEntity) entity, "bag", item); ! if (!equippedToBag) { ! DefaultActionManager.getInstance().onEquip((RPEntity) entity, "bank", item); } } --- 43,69 ---- final int oldY) { if(zone.getPlayers().size() == 1) { + final Player postman = SingletonRepository.getRuleProcessor().getPlayer( + "postman"); Set<Item> itemsOnGround = zone.getItemsOnGround(); for (Item item : itemsOnGround) { boolean equippedToBag = DefaultActionManager.getInstance().onEquip((RPEntity) entity, "bag", item); ! if (equippedToBag) { ! // player may not have been online so use postman to send info message ! if (postman != null) { ! postman.sendPrivateText("tell " + ((RPEntity) entity).getName() + " The " ! + Grammar.quantityplnoun(item.getQuantity(), item.getName()) ! + " which you left on the floor in the vault have been automatically " ! + "returned to your bag."); ! } ! } else { ! boolean equippedToBank = DefaultActionManager.getInstance().onEquip((RPEntity) entity, "bank", item); ! if (equippedToBank) { ! if (postman != null) { ! postman.sendPrivateText("tell " + ((RPEntity) entity).getName() + " The " ! + Grammar.quantityplnoun(item.getQuantity(), item.getName()) ! + " which you left on the floor in the vault have been automatically " ! + "returned to your bank chest." ); ! } ! } } } *************** *** 95,100 **** npc.add(ConversationStates.ANY, "vault", new QuestNotCompletedCondition("armor_dagobert"), ConversationStates.ATTENDING, "Perhaps you could do a #favour for me, and then I will tell you about the private banking vaults.", null); ! // remaining behaviour defined in games.stendhal.server.maps.quests.ArmorForDagobert ! } --- 114,118 ---- npc.add(ConversationStates.ANY, "vault", new QuestNotCompletedCondition("armor_dagobert"), ConversationStates.ATTENDING, "Perhaps you could do a #favour for me, and then I will tell you about the private banking vaults.", null); ! // remaining behaviour defined in games.stendhal.server.maps.quests.ArmorForDagobert } |