[Arianne-commits] stendhal/tools/newrp Item.java, 1.6, 1.7 Main.java, 1.6, 1.7 RPEntity.java, 1.8, 1.9

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

Update of /cvsroot/arianne/stendhal/tools/newrp
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28789

Modified Files:
	Item.java Main.java RPEntity.java 
Log Message:
Created subclasses for weapons, armors and shields.
Converted weight to int.

Index: Item.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tools/newrp/Item.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Item.java	9 Sep 2007 17:44:06 -0000	1.6
--- Item.java	10 Sep 2007 08:52:03 -0000	1.7
***************
*** 44,48 ****
  	 * How much kg weigth the item.
  	 */
! 	float weight;
  
  	/**
--- 44,48 ----
  	 * How much kg weigth the item.
  	 */
! 	int weight;
  
  	/**
***************
*** 79,83 ****
  	 * @param skill
  	 */
! 	public Item(ItemType type, String name, float weight, Skill skill) {
  		this.type = type;
  		this.name = name;
--- 79,83 ----
  	 * @param skill
  	 */
! 	public Item(ItemType type, String name, int weight, Skill skill) {
  		this.type = type;
  		this.name = name;
***************
*** 107,110 ****
--- 107,146 ----
  		protect.add(new DamageEffect(type, amount));
  	}
+ }
+ 
+ /**
+  * Subclass for weapons.
+  * 
+  * @author miguel
+  *
+  */
+ class Weapon extends Item {
+ 	public Weapon(String name, int weight, Skill skill) {
+ 		super(ItemType.WEAPON, name, weight, skill);
+ 	}
+ }
+ 
+ /**
+  * Subclass for armors.
+  * 
+  * @author miguel
+  *
+  */
+ class Armor extends Item {
+ 	public Armor(String name, int weight, Skill skill) {
+ 		super(ItemType.ARMOR, name, weight, skill);
+ 	}
+ }
  
+ /**
+  * Subclass for shields.
+  * 
+  * @author miguel
+  *
+  */
+ class Shield extends Item {
+ 	public Shield(String name, int weight, Skill skill) {
+ 		super(ItemType.SHIELD, name, weight, skill);
+ 	}
  }
+ 

Index: RPEntity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tools/newrp/RPEntity.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RPEntity.java	10 Sep 2007 08:25:08 -0000	1.8
--- RPEntity.java	10 Sep 2007 08:52:04 -0000	1.9
***************
*** 305,309 ****
  	 */
  	private float getHitQuality(float attitude) {
! 		float quality = dextrexity * (strengh / weapon.weight) * attitude * 100
  				/ 256f;
  		return quality;
--- 305,309 ----
  	 */
  	private float getHitQuality(float attitude) {
! 		float quality = dextrexity * (strengh / (float)weapon.weight) * attitude * 100
  				/ 256f;
  		return quality;
***************
*** 345,349 ****
  	 */
  	private float getDodgeQuality(float attitude) {
! 		float quality = agility * (strengh / armor.weight) * (1 - attitude);
  		return quality;
  	}
--- 345,349 ----
  	 */
  	private float getDodgeQuality(float attitude) {
! 		float quality = agility * (strengh / (float)armor.weight) * (1 - attitude);
  		return quality;
  	}
***************
*** 384,388 ****
  	 */
  	private float getShieldQuality(float attitude) {
! 		float quality = dextrexity * (strengh / shield.weight) * (1 - attitude);
  		return quality;
  	}
--- 384,388 ----
  	 */
  	private float getShieldQuality(float attitude) {
! 		float quality = dextrexity * (strengh / (float)shield.weight) * (1 - attitude);
  		return quality;
  	}

Index: Main.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tools/newrp/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Main.java	9 Sep 2007 17:49:06 -0000	1.6
--- Main.java	10 Sep 2007 08:52:03 -0000	1.7
***************
*** 14,18 ****
  		 * Creates a sword.
  		 */
! 		Item sword = new Item(ItemType.WEAPON, "sword", 4, Skill.SWORDING);
  		sword.setDamage(DamageType.SLASH, 10);
  
--- 14,18 ----
  		 * Creates a sword.
  		 */
! 		Item sword = new Weapon("sword", 4, Skill.SWORDING);
  		sword.setDamage(DamageType.SLASH, 10);
  
***************
*** 20,25 ****
  		 * Creates a leather armor.
  		 */
! 		Item armor = new Item(ItemType.ARMOR, "leather armor", 8,
! 				Skill.LIGHT_ARMOR);
  		armor.setProtection(DamageType.SLASH, 10);
  		armor.setProtection(DamageType.BASH, 15);
--- 20,24 ----
  		 * Creates a leather armor.
  		 */
! 		Item armor = new Armor("leather armor", 8, Skill.LIGHT_ARMOR);
  		armor.setProtection(DamageType.SLASH, 10);
  		armor.setProtection(DamageType.BASH, 15);
***************
*** 29,34 ****
  		 * Creates a shield.
  		 */
! 		Item shield = new Item(ItemType.SHIELD, "leather shield", 10,
! 				Skill.SHIELDING);
  		shield.setProtection(DamageType.SLASH, 10);
  		shield.setProtection(DamageType.BASH, 10);
--- 28,32 ----
  		 * Creates a shield.
  		 */
! 		Item shield = new Shield("leather shield", 10, Skill.SHIELDING);
  		shield.setProtection(DamageType.SLASH, 10);
  		shield.setProtection(DamageType.BASH, 10);