[Arianne-commits] stendhal/src/games/stendhal/server/actions Look.java,1.1,1.2

[Daniel H. <wik...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28137/src/games/stendhal/server/actions

Modified Files:
	Look.java 
Log Message:
logger for Look.class instead of Use.class
removed unused imports

Index: Look.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/Look.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Look.java	2 May 2006 20:36:33 -0000	1.1
--- Look.java	16 May 2006 21:28:56 -0000	1.2
***************
*** 13,28 ****
  package games.stendhal.server.actions;
  
- 
- import games.stendhal.server.StendhalRPAction;
  import games.stendhal.server.StendhalRPRuleProcessor;
  import games.stendhal.server.StendhalRPZone;
- import games.stendhal.server.events.UseEvent;
- import games.stendhal.server.entity.Chest;
- import games.stendhal.server.entity.item.Corpse;
  import games.stendhal.server.entity.Entity;
- import games.stendhal.server.entity.item.ConsumableItem;
  import games.stendhal.server.entity.Player;
- import games.stendhal.server.entity.Portal;
- import games.stendhal.server.entity.OneWayPortal;
  import marauroa.common.Log4J;
  import marauroa.common.game.RPAction;
--- 13,20 ----
***************
*** 33,139 ****
  import org.apache.log4j.Logger;
  
! public class Look extends ActionListener 
!   {
!   private static final Logger logger = Log4J.getLogger(Use.class);
  
!   public static void register()
!     {
!     StendhalRPRuleProcessor.register("look",new Look());
!     }
  
!   public void onAction(RPWorld world, StendhalRPRuleProcessor rules, Player player, RPAction action)
!     {
!     Log4J.startMethod(logger,"look");
  
!     // When use is casted over something in a slot 
!     if(action.has("baseitem") && action.has("baseobject") && action.has("baseslot"))
!       {
!       StendhalRPZone zone=(StendhalRPZone)world.getRPZone(player.getID());
!         
!       int baseObject=action.getInt("baseobject");
  
!       RPObject.ID baseobjectid=new RPObject.ID(baseObject, zone.getID());
!       if(!zone.has(baseobjectid))
!         {
!         return;
!         }
  
!       RPObject base=zone.get(baseobjectid);
!       if(!(base instanceof Entity))
!         {
!         // Shouldn't reall happen because everything is an entity
!         return;
!         }
  
!       Entity baseEntity=(Entity)base;
!       Entity entity = baseEntity;
  
!       if(baseEntity.hasSlot(action.get("baseslot")))
!         {
!         RPSlot slot=baseEntity.getSlot(action.get("baseslot"));
!         
!         if(slot.size()==0)
!           {
!           return;
!           }
!           
!         RPObject object = null;
!         int item = action.getInt("baseitem");
!         // scan through the slot to find the requested item
!         for(RPObject rpobject : slot)
!           {
!           if(rpobject.getID().getObjectID() == item)
!             {
!             object = rpobject;
!             break;
!             }
!           }
!         
!         // no item found...we take the first one
!         if(object==null)
!           {
!           object = slot.iterator().next();
!           }
!         
!         // It is always an entity
!         entity=(Entity)object;
!         }
!       
!       String name=entity.get("type");
!       if(entity.has("name"))
!         {
!         name=entity.get("name");
!         }     
!       rules.addGameEvent(player.getName(),"look",name);
!       player.setPrivateText(entity.describe());
!       world.modify(player);
!       rules.removePlayerText(player);
!       return;  
!     }
!     // When use is cast over something on the floor
!     else if(action.has("target"))
!       {
!       int usedObject=action.getInt("target");
  
!       StendhalRPZone zone=(StendhalRPZone)world.getRPZone(player.getID());
!       RPObject.ID targetid=new RPObject.ID(usedObject, zone.getID());
!       if(zone.has(targetid))
!         {
!         RPObject object=zone.get(targetid);
!         // It is always an entity
!         Entity entity=(Entity)object;
!         String name=entity.get("type");
!         if(entity.has("name"))
!           {
!           name=entity.get("name");
!           }     
!         rules.addGameEvent(player.getName(),"look",name);
!         player.setPrivateText(entity.describe());
!         world.modify(player);
!         rules.removePlayerText(player);
!         }
!       }
  
!     Log4J.finishMethod(logger,"look");
!     }
!   }
--- 25,118 ----
  import org.apache.log4j.Logger;
  
! public class Look extends ActionListener {
! 	private static final Logger logger = Log4J.getLogger(Look.class);
  
! 	public static void register() {
! 		StendhalRPRuleProcessor.register("look", new Look());
! 	}
  
! 	public void onAction(RPWorld world, StendhalRPRuleProcessor rules,
! 			Player player, RPAction action) {
! 		Log4J.startMethod(logger, "look");
  
! 		// When look is casted over something in a slot
! 		if (action.has("baseitem") && action.has("baseobject") && action.has("baseslot")) {
! 			StendhalRPZone zone = (StendhalRPZone) world.getRPZone(player.getID());
  
! 			int baseObject = action.getInt("baseobject");
  
! 			RPObject.ID baseobjectid = new RPObject.ID(baseObject, zone.getID());
! 			if (!zone.has(baseobjectid)) {
! 				return;
! 			}
  
! 			RPObject base = zone.get(baseobjectid);
! 			if (!(base instanceof Entity)) {
! 				// Shouldn't really happen because everything is an entity
! 				return;
! 			}
  
! 			Entity baseEntity = (Entity) base;
! 			Entity entity = baseEntity;
  
! 			if (baseEntity.hasSlot(action.get("baseslot"))) {
! 				RPSlot slot = baseEntity.getSlot(action.get("baseslot"));
  
! 				if (slot.size() == 0) {
! 					return;
! 				}
! 
! 				RPObject object = null;
! 				int item = action.getInt("baseitem");
! 				// scan through the slot to find the requested item
! 				for (RPObject rpobject : slot) {
! 					if (rpobject.getID().getObjectID() == item) {
! 						object = rpobject;
! 						break;
! 					}
! 				}
! 
! 				// no item found...we take the first one
! 				if (object == null) {
! 					object = slot.iterator().next();
! 				}
! 
! 				// It is always an entity
! 				entity = (Entity) object;
! 			}
! 
! 			String name = entity.get("type");
! 			if (entity.has("name")) {
! 				name = entity.get("name");
! 			}
! 			rules.addGameEvent(player.getName(), "look", name);
! 			player.setPrivateText(entity.describe());
! 			world.modify(player);
! 			rules.removePlayerText(player);
! 			return;
! 		}
! 		// When use is cast over something on the floor
! 		else if (action.has("target")) {
! 			int usedObject = action.getInt("target");
! 
! 			StendhalRPZone zone = (StendhalRPZone) world.getRPZone(player
! 					.getID());
! 			RPObject.ID targetid = new RPObject.ID(usedObject, zone.getID());
! 			if (zone.has(targetid)) {
! 				RPObject object = zone.get(targetid);
! 				// It is always an entity
! 				Entity entity = (Entity) object;
! 				String name = entity.get("type");
! 				if (entity.has("name")) {
! 					name = entity.get("name");
! 				}
! 				rules.addGameEvent(player.getName(), "look", name);
! 				player.setPrivateText(entity.describe());
! 				world.modify(player);
! 				rules.removePlayerText(player);
! 			}
! 		}
! 
! 		Log4J.finishMethod(logger, "look");
! 	}
! }