[Arianne-commits] stendhal/src/games/stendhal/server/entity/player Player.java, 1.54, 1.55

[Katie <ky...@us...>]

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

Modified Files:
	Player.java 
Log Message:
Elf mayor gives quest to kill dark elves and thing. Reach tunnel from secret room in royal. Reward: ring that reduces your penalty on death by five times.

Index: Player.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/Player.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Player.java	29 Apr 2007 10:02:59 -0000	1.54
--- Player.java	2 May 2007 19:14:40 -0000	1.55
***************
*** 758,766 ****
  		poisonToConsume.clear();
  
! 		// Penalize: Respawn on afterlive zone and 10% less experience
! 		setXP((int) (getXP() * 0.9));
! 		setATKXP((int) (getATKXP() * 0.9));
! 		setDEFXP((int) (getDEFXP() * 0.9));
! 
  		super.onDead(killer, false);
  
--- 758,774 ----
  		poisonToConsume.clear();
  
! 		if(isEquipped("emerald_ring")){
! 		 // Penalize: 2% less experience if wearing that ring
! 		 setXP((int) (getXP() * 0.98));
! 		 setATKXP((int) (getATKXP() * 0.98));
! 	   	 setDEFXP((int) (getDEFXP() * 0.98));			
! 		}
! 		else{
! 		 // Penalize: 10% less experience
! 		 setXP((int) (getXP() * 0.9));
! 		 setATKXP((int) (getATKXP() * 0.9));
! 		 setDEFXP((int) (getDEFXP() * 0.9));
! 		}
! 		
  		super.onDead(killer, false);
  
***************
*** 769,773 ****
  		// After a tangle with the grim reaper, give some karma
  		addKarma(200.0);
! 
  		StendhalRPZone zone = (StendhalRPZone) world.getRPZone("int_afterlife");
  
--- 777,781 ----
  		// After a tangle with the grim reaper, give some karma
  		addKarma(200.0);
!         //		 Penalize: Respawn on afterlive zone and
  		StendhalRPZone zone = (StendhalRPZone) world.getRPZone("int_afterlife");
  
***************
*** 858,862 ****
  		return has("sheep");
  	}
! 
  	public void setSheep(Sheep sheep) {
  		Log4J.startMethod(logger, "setSheep");
--- 866,870 ----
  		return has("sheep");
  	}
! 	
  	public void setSheep(Sheep sheep) {
  		Log4J.startMethod(logger, "setSheep");