[Arianne-commits] stendhal/src/games/stendhal/client/entity Corpse.java,1.12,1.13 Entity.java,1.25,1.26 Item.java,1.10,1.11 Player.java,1.53,1.54 RPEntity.java,1.39,1.40 Speaker.java,1.6,1.7

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/entity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7853/src/games/stendhal/client/entity

Modified Files:
	Corpse.java Entity.java Item.java Player.java RPEntity.java 
	Speaker.java 
Log Message:
Added XP gaining limitation.

Index: RPEntity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/RPEntity.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** RPEntity.java	14 Nov 2005 18:56:34 -0000	1.39
--- RPEntity.java	13 Dec 2005 20:00:28 -0000	1.40
***************
*** 116,121 ****
      int outfit=object.getInt("outfit");
      
-     System.out.println ("OUTFIT is ("+outfit+")");
-     
      Sprite player=store.getSprite("sprites/outfit/player_base_"+outfit%100+".png");
      player=player.copy();
--- 116,119 ----
***************
*** 195,199 ****
      if(changes.has("xp") && object.has("xp"))
        {
!       if(((changes.getInt("xp") - object.getInt("xp"))>0) &&  distance(client.getPlayer())<15*15)
          {
          damageSprites.add(GameScreen.get().createString("+"+Integer.toString(changes.getInt("xp") - object.getInt("xp")),Color.cyan));
--- 193,197 ----
      if(changes.has("xp") && object.has("xp"))
        {
!       if(/*((changes.getInt("xp") - object.getInt("xp"))>0) &&*/  distance(client.getPlayer())<15*15)
          {
          damageSprites.add(GameScreen.get().createString("+"+Integer.toString(changes.getInt("xp") - object.getInt("xp")),Color.cyan));
***************
*** 251,256 ****
      if(changes.has("dead"))// && (stendhal.showEveryoneXPInfo || getID().equals(client.getPlayer().getID())))
        {
-       System.out.println (getID());
-       if(client.getPlayer()!=null) System.out.println (client.getPlayer().getID());
        client.addEventLine(getName()+" has died. "+getName()+"'s new level is "+getLevel());
        }
--- 249,252 ----
***************
*** 263,267 ****
      if(changes.has("target"))
        {
-       System.out.println ("Stop attacking");
        attacking=false;
        gameObjects.attackStop(this,targetEntity);
--- 259,262 ----
***************
*** 274,278 ****
      if(attacking)
        {
-       System.out.println ("Stop attacking");
        attacking=false;
        gameObjects.attackStop(this,targetEntity);
--- 269,272 ----

Index: Player.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/Player.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Player.java	13 Nov 2005 15:07:00 -0000	1.53
--- Player.java	13 Dec 2005 20:00:28 -0000	1.54
***************
*** 87,91 ****
      if(changes.has("online"))
        {
-       System.out.println (changes.get("online"));
        String[] players=changes.get("online").split(",");
        for(String name: players)
--- 87,90 ----
***************
*** 97,101 ****
      if(changes.has("offline"))
        {
-       System.out.println (changes.get("offline"));
        String[] players=changes.get("offline").split(",");
        for(String name: players)
--- 96,99 ----

Index: Corpse.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/Corpse.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Corpse.java	28 Nov 2005 20:49:25 -0000	1.12
--- Corpse.java	13 Dec 2005 20:00:27 -0000	1.13
***************
*** 93,98 ****
          }
          
-       System.out.println (text+"\t"+clazz);
-         
        StendhalClient.get().addEventLine(text,Color.green);
        gameObjects.addText(this, text, Color.green);
--- 93,96 ----

Index: Entity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/Entity.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Entity.java	13 Nov 2005 15:07:00 -0000	1.25
--- Entity.java	13 Dec 2005 20:00:27 -0000	1.26
***************
*** 192,197 ****
      x += (delta * dx) / 300;
      y += (delta * dy) / 300;
- 
- //    System.out.println (type+"(POS)-->"+x+","+y);
      }	
    
--- 192,195 ----

Index: Item.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/Item.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Item.java	28 Nov 2005 20:49:25 -0000	1.10
--- Item.java	13 Dec 2005 20:00:28 -0000	1.11
***************
*** 103,108 ****
        int id=getID().getObjectID();
        
-       System.out.println (params.length+":"+params);
- 
        if(params.length>0)
          {
--- 103,106 ----

Index: Speaker.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/Speaker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Speaker.java	3 Nov 2005 17:36:12 -0000	1.6
--- Speaker.java	13 Dec 2005 20:00:28 -0000	1.7
***************
*** 72,77 ****
      if(changes.has("dead"))// && (stendhal.showEveryoneXPInfo || getID().equals(client.getPlayer().getID())))
        {
-       System.out.println (getID());
-       if(client.getPlayer()!=null) System.out.println (client.getPlayer().getID());
        client.addEventLine(getName()+" has died. "+getName()+"'s new level is "+getLevel());
        }
--- 72,75 ----