[Arianne-commits] stendhal/src/games/stendhal/server/entity/item/scroll Scroll.java, 1.19, 1.20 InfoStringScroll.java, 1.9, 1.10

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/scroll
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5703/src/games/stendhal/server/entity/item/scroll

Modified Files:
	Scroll.java InfoStringScroll.java 
Log Message:

XPairtise Session: "stackableItem"
Last driver: durkham
Last navigator: madmetzger


Index: Scroll.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/scroll/Scroll.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Scroll.java	26 Jul 2008 23:12:34 -0000	1.19
--- Scroll.java	8 Sep 2008 21:42:54 -0000	1.20
***************
*** 1,116 ****
! /* $Id$
!  /***************************************************************************
!  *                      (C) Copyright 2003 - Marauroa                      *
!  ***************************************************************************
!  ***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  ***************************************************************************/
! package games.stendhal.server.entity.item.scroll;
! 
! import games.stendhal.server.core.events.UseListener;
! import games.stendhal.server.entity.Entity;
! import games.stendhal.server.entity.RPEntity;
! import games.stendhal.server.entity.item.Stackable;
! import games.stendhal.server.entity.item.StackableItem;
! import games.stendhal.server.entity.player.Player;
! 
! import java.util.Map;
! 
! import org.apache.log4j.Logger;
! import marauroa.common.game.RPObject;
! 
! /**
!  * Represents a scroll.
!  */
! public class Scroll extends StackableItem implements UseListener {
! 
! 	private static final Logger logger = Logger.getLogger(Scroll.class);
! 
! 	/**
! 	 * Creates a new scroll.
! 	 * 
! 	 * @param name
! 	 * @param clazz
! 	 * @param subclass
! 	 * @param attributes
! 	 */
! 	public Scroll(final String name, final String clazz, final String subclass,
! 			final Map<String, String> attributes) {
! 		super(name, clazz, subclass, attributes);
! 	}
! 
! 	/**
! 	 * Copy constructor.
! 	 * 
! 	 * @param item
! 	 *            item to copy
! 	 */
! 	public Scroll(final Scroll item) {
! 		super(item);
! 	}
! 
! 	/**
! 	 * Make sure that both are scrolls of the same kind.
! 	 * 
! 	 * @return <code>true</code> if the items have the same class and
! 	 *         subclass.
! 	 */
! 	@Override
! 	public boolean isStackable(final Stackable other) {
! 		final StackableItem otheri = (StackableItem) other;
! 
! 		return (getItemClass().equals(otheri.getItemClass()) && getItemSubclass().equals(
! 				otheri.getItemSubclass()));
! 	}
! 
! 	public final boolean onUsed(final RPEntity user) {
! 		RPObject base = this;
! 
! 		// Find the top container
! 		while (base.isContained()) {
! 			base = base.getContainer();
! 		}
! 
! 		if (user.nextTo((Entity) base)) {
! 			if (useScroll((Player) user)) {
! 				this.removeOne();
! 				user.notifyWorldAboutChanges();
! 			}
! 			return true;
! 		} else {
! 			logger.debug("Scroll is too far away");
! 			return false;
! 		}
! 	}
! 
! 	/**
! 	 * Use a scroll.
! 	 * 
! 	 * @param player
! 	 *            The player using scroll.
! 	 * 
! 	 * @return <code>true</code> if successful, <code>false</code>
! 	 *         otherwise.
! 	 */
! 	protected boolean useScroll(final Player player) {
! 		player.sendPrivateText("What a strange scroll! You can't make heads or tails of it.");
! 		return false;
! 	}
! 
! 	@Override
! 	public String describe() {
! 		String text = super.describe();
! 
! 		final String infostring = getInfoString();
! 
! 		if (infostring != null) {
! 			text += " Upon it is written: " + infostring;
! 		}
! 		return (text);
! 	}
! }
--- 1,101 ----
! /* $Id$
!  /***************************************************************************
!  *                      (C) Copyright 2003 - Marauroa                      *
!  ***************************************************************************
!  ***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  ***************************************************************************/
! package games.stendhal.server.entity.item.scroll;
! 
! import games.stendhal.server.core.events.UseListener;
! import games.stendhal.server.entity.Entity;
! import games.stendhal.server.entity.RPEntity;
! import games.stendhal.server.entity.item.StackableItem;
! import games.stendhal.server.entity.player.Player;
! 
! import java.util.Map;
! 
! import org.apache.log4j.Logger;
! import marauroa.common.game.RPObject;
! 
! /**
!  * Represents a scroll.
!  */
! public class Scroll extends StackableItem implements UseListener {
! 
! 	private static final Logger logger = Logger.getLogger(Scroll.class);
! 
! 	/**
! 	 * Creates a new scroll.
! 	 * 
! 	 * @param name
! 	 * @param clazz
! 	 * @param subclass
! 	 * @param attributes
! 	 */
! 	public Scroll(final String name, final String clazz, final String subclass,
! 			final Map<String, String> attributes) {
! 		super(name, clazz, subclass, attributes);
! 	}
! 
! 	/**
! 	 * Copy constructor.
! 	 * 
! 	 * @param item
! 	 *            item to copy
! 	 */
! 	public Scroll(final Scroll item) {
! 		super(item);
! 	}
! 
! 	public final boolean onUsed(final RPEntity user) {
! 		RPObject base = this;
! 
! 		// Find the top container
! 		while (base.isContained()) {
! 			base = base.getContainer();
! 		}
! 
! 		if (user.nextTo((Entity) base)) {
! 			if (useScroll((Player) user)) {
! 				this.removeOne();
! 				user.notifyWorldAboutChanges();
! 			}
! 			return true;
! 		} else {
! 			logger.debug("Scroll is too far away");
! 			return false;
! 		}
! 	}
! 
! 	/**
! 	 * Use a scroll.
! 	 * 
! 	 * @param player
! 	 *            The player using scroll.
! 	 * 
! 	 * @return <code>true</code> if successful, <code>false</code>
! 	 *         otherwise.
! 	 */
! 	protected boolean useScroll(final Player player) {
! 		player.sendPrivateText("What a strange scroll! You can't make heads or tails of it.");
! 		return false;
! 	}
! 
! 	@Override
! 	public String describe() {
! 		String text = super.describe();
! 
! 		final String infostring = getInfoString();
! 
! 		if (infostring != null) {
! 			text += " Upon it is written: " + infostring;
! 		}
! 		return (text);
! 	}
! }

Index: InfoStringScroll.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/scroll/InfoStringScroll.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InfoStringScroll.java	26 Jul 2008 23:12:34 -0000	1.9
--- InfoStringScroll.java	8 Sep 2008 21:42:54 -0000	1.10
***************
*** 1,68 ****
! /* $Id$
!  /***************************************************************************
!  *                      (C) Copyright 2003 - Marauroa                      *
!  ***************************************************************************
!  ***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  ***************************************************************************/
! package games.stendhal.server.entity.item.scroll;
! 
! import games.stendhal.server.entity.item.Stackable;
! import games.stendhal.server.entity.item.StackableItem;
! 
! import java.util.Map;
! 
! /**
!  * Represents a scroll with a context stackable infostring.
!  */
! public class InfoStringScroll extends Scroll {
! 
! 	/**
! 	 * Creates a new infostring stackable scroll.
! 	 * 
! 	 * @param name
! 	 * @param clazz
! 	 * @param subclass
! 	 * @param attributes
! 	 */
! 	public InfoStringScroll(final String name, final String clazz, final String subclass,
! 			final Map<String, String> attributes) {
! 		super(name, clazz, subclass, attributes);
! 	}
! 
! 	/**
! 	 * Copy constructor.
! 	 * 
! 	 * @param item
! 	 *            item to copy
! 	 */
! 	public InfoStringScroll(final InfoStringScroll item) {
! 		super(item);
! 	}
! 
! 	@Override
! 	public boolean isStackable(final Stackable other) {
! 		final StackableItem otheri = (StackableItem) other;
! 
! 		// Same types?
! 		if (!super.isStackable(other)) {
! 			return false;
! 		}
! 
! 		// scroll can be stacked if they have the same infostring
! 		final String infostring = getInfoString();
! 		final String oinfostring = otheri.getInfoString();
! 
! 		if (infostring != null) {
! 			return infostring.equals(oinfostring);
! 		} else {
! 			// scrolls without infostring can be stacked as well
! 			return (oinfostring == null);
! 		}
! 	}
! }
--- 1,45 ----
! /* $Id$
!  /***************************************************************************
!  *                      (C) Copyright 2003 - Marauroa                      *
!  ***************************************************************************
!  ***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  ***************************************************************************/
! package games.stendhal.server.entity.item.scroll;
! 
! 
! import java.util.Map;
! 
! /**
!  * Represents a scroll with a context stackable infostring.
!  */
! public class InfoStringScroll extends Scroll {
! 
! 	/**
! 	 * Creates a new infostring stackable scroll.
! 	 * 
! 	 * @param name
! 	 * @param clazz
! 	 * @param subclass
! 	 * @param attributes
! 	 */
! 	public InfoStringScroll(final String name, final String clazz, final String subclass,
! 			final Map<String, String> attributes) {
! 		super(name, clazz, subclass, attributes);
! 	}
! 
! 	/**
! 	 * Copy constructor.
! 	 * 
! 	 * @param item
! 	 *            item to copy
! 	 */
! 	public InfoStringScroll(final InfoStringScroll item) {
! 		super(item);
! 	}
! }