From: Martin F. <mar...@us...> - 2011-01-07 01:23:06
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/kalavan/citygardens In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1406/src/games/stendhal/server/maps/kalavan/citygardens Modified Files: GardenerNPC.java Log Message: introduce BehaviourResult to split Behaviour definition and parse result Index: GardenerNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/kalavan/citygardens/GardenerNPC.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** GardenerNPC.java 20 Sep 2010 22:02:31 -0000 1.22 --- GardenerNPC.java 7 Jan 2011 01:22:27 -0000 1.23 *************** *** 26,29 **** --- 26,30 ---- import games.stendhal.server.entity.npc.behaviour.adder.ProducerAdder; import games.stendhal.server.entity.npc.behaviour.adder.SellerAdder; + import games.stendhal.server.entity.npc.behaviour.impl.BehaviourResult; import games.stendhal.server.entity.npc.behaviour.impl.ProducerBehaviour; import games.stendhal.server.entity.npc.behaviour.impl.SellerBehaviour; *************** *** 95,99 **** @Override ! public boolean askForResources(final EventRaiser npc, final Player player, final int amount) { if (player.hasQuest(QUEST_SLOT) && player.getQuest(QUEST_SLOT).startsWith("done;")) { // she is eating. number of lunches is in tokens[1] --- 96,102 ---- @Override ! public boolean askForResources(BehaviourResult res, final EventRaiser npc, final Player player) { ! int amount = res.getAmount(); ! if (player.hasQuest(QUEST_SLOT) && player.getQuest(QUEST_SLOT).startsWith("done;")) { // she is eating. number of lunches is in tokens[1] *************** *** 120,124 **** return false; } else { ! setAmount(amount); npc.say("Then I'll want " + getRequiredResourceNamesWithHashes(amount) --- 123,127 ---- return false; } else { ! res.setAmount(amount); npc.say("Then I'll want " + getRequiredResourceNamesWithHashes(amount) *************** *** 127,132 **** } } @Override ! public boolean transactAgreedDeal(final EventRaiser npc, final Player player) { if (getMaximalAmount(player) < amount) { // The player tried to cheat us by placing the resource --- 130,138 ---- } } + @Override ! public boolean transactAgreedDeal(BehaviourResult res, final EventRaiser npc, final Player player) { ! int amount = res.getAmount(); ! if (getMaximalAmount(player) < amount) { // The player tried to cheat us by placing the resource *************** *** 148,153 **** } } @Override ! public void giveProduct(final EventRaiser npc, final Player player) { final String orderString = player.getQuest(QUEST_SLOT); final String[] order = orderString.split(";"); --- 154,160 ---- } } + @Override ! public void giveProduct(final EventRaiser npc, final Player player) { final String orderString = player.getQuest(QUEST_SLOT); final String[] order = orderString.split(";"); |