added Dumb and DumbNoMore packet classes

aoxp-server/src/main/java/com/ao/data/dao/ini/UserDAOIni.java

@@ -33,6 +33,7 @@
 import org.apache.log4j.Logger;
 import org.ini4j.Ini;
 
+import com.ao.context.ApplicationContext;
 import com.ao.data.dao.AccountDAO;
 import com.ao.data.dao.UserCharacterDAO;
 import com.ao.data.dao.exception.DAOException;
@@ -48,9 +49,11 @@
 import com.ao.model.character.archetype.UserArchetype;
 import com.ao.model.map.City;
 import com.ao.model.map.Heading;
+import com.ao.model.map.Position;
 import com.ao.model.user.Account;
 import com.ao.model.user.AccountImpl;
 import com.ao.model.user.LoggedUser;
+import com.ao.service.MapService;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
@@ -191,7 +194,11 @@ public class UserDAOIni implements AccountDAO, UserCharacterDAO {
 	protected static final int INITIAL_NOBLE_POINTS = 1000;
 
 	private static final Logger logger = Logger.getLogger(UserDAOIni.class);
-
+
+	/*---------FIXME awful workaround to be able to set char's position-----------*/
+	private MapService mapService = ApplicationContext.getInstance(MapService.class);
+    /*----------------------------------------------------------------------------*/
+
 	private String charfilesPath;
 
 	@Inject
@@ -285,6 +292,9 @@ public UserCharacter create(String name, Race race, Gender gender,
 
 		String positionKey = homeland.getMap() + "-" + homeland.getX() + "-" + homeland.getY();
 		chara.put(INIT_HEADER, POSITION_KEY, positionKey );
+
+		Position position= new Position(homeland.getX(), homeland.getY(), mapService.getMap(homeland.getMap()));
+
 		// TODO: Save last ip?
 
 		chara.put(FLAGS_HEADER, BANNED_KEY, 0);
@@ -380,8 +390,8 @@ public UserCharacter create(String name, Race race, Gender gender,
 		}
 
 		// TODO: Update this when hp, mana and hit points get updated!
-		return new LoggedUser(rep, race, gender, archetype.getArchetype(),
-				false, false, false, false, false, false, 0, 0, 0, 0,
+		return new LoggedUser(rep, race, gender, archetype.getArchetype(), homeland, position,
+				false, false, false, false, false, false, false, 0, 0, 0, 0,
 				100, 0, 100, 0, (byte) 1, name, "");
 	}
 
@@ -423,6 +433,18 @@ public UserCharacter load(String username) throws DAOException {
 
 		Archetype archetype = UserArchetype.get(Byte.parseByte(chara.get(INIT_HEADER, ARCHETYPE_KEY))).getArchetype();
 
+		int homeId= Integer.parseInt(chara.get(INIT_HEADER, HOMELAND_KEY));
+
+		City homeland= new City( homeId, mapService.getCity((byte)homeId).getX() , mapService.getCity((byte)homeId).getY());
+
+        String[] stringPos= chara.get(INIT_HEADER, POSITION_KEY).split("-");
+
+        Position position= new Position (
+                Byte.parseByte(stringPos[1]), 
+                Byte.parseByte(stringPos[2]), 
+                mapService.getMap(Integer.parseInt(stringPos[0]))
+                );
+
 		boolean poisoned = chara.get(FLAGS_HEADER, POISONED_KEY).equals("1");
 
 		boolean paralyzed = chara.get(FLAGS_HEADER, PARALYZED_KEY).equals("1");
@@ -450,9 +472,7 @@ public UserCharacter load(String username) throws DAOException {
 		String description = "";
 
 		// TODO : Validate character
-		/* UserCharacter userCharacter = new LoggedUser(reputation, race, gender, archetype, poisoned, paralyzed, immobilized, invisible, mimetized, dumbed, hidden, maxMana, maxHitPoints, mana, hitpoints, thirstiness, hunger, lvl, username, description); */
-
-		return null;
+		return new LoggedUser(reputation, race, gender, archetype, homeland, position, poisoned, paralyzed, immobilized, invisible, mimetized, dumbed, hidden, maxMana, mana, maxHitPoints, hitpoints, 100, thirstiness, 100, hunger, lvl, username, description);
 	}
 
 	private Ini readCharFile(String username) throws DAOException {

aoxp-server/src/main/java/com/ao/data/dao/map/WorldMapDAOImpl.java

@@ -112,7 +112,12 @@ private void loadMap(int id, WorldMap[] maps) {
 			logger.error("Map " + id + " loading failed!", e);
 			throw new RuntimeException(e);
 		}
-
+		try {    
+		    dataInf.close();
+		    dataMap.close();
+
+		} catch (IOException e) {}
+
 		ByteBuffer infBuffer = ByteBuffer.wrap(bufInf);
 		ByteBuffer mapBuffer = ByteBuffer.wrap(bufMap);
 

aoxp-server/src/main/java/com/ao/model/builder/UserCharacterBuilder.java

@@ -14,7 +14,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package com.ao.model.builder;
 
 import java.util.Map;
@@ -44,6 +44,7 @@
  */
 public class UserCharacterBuilder implements Builder<UserCharacter> {
 
+    //TODO we should mention what constitutes a valid name in this message.
 	public static final String INVALID_NAME_ERROR = "El nombre ingresado no es válido.";
 	public static final String INVALID_EMAIL_ERROR = "La dirección de e-mail ingresada no es válida.";
 
@@ -70,6 +71,7 @@ public class UserCharacterBuilder implements Builder<UserCharacter> {
 	protected boolean hidden = false;
 	protected boolean immobilized = false;
 	protected boolean invisible = false;
+	protected boolean mimetized = false;
 	protected byte lvl = 1;
 	protected boolean poisoned = false;
 	protected Guild guild;
@@ -122,6 +124,12 @@ public UserCharacterBuilder withInvisible(boolean invisible) {
 
 		return this;
 	}
+
+	public UserCharacterBuilder withMimetized(boolean mimetized) {
+	    this.mimetized= mimetized;
+
+	    return this;
+	}
 
 	public UserCharacterBuilder withDumbed(boolean dumbed) {
 		this.dumbed = dumbed;
@@ -238,7 +246,7 @@ public UserCharacterBuilder withMana(int minMana, int maxMana) {
 	public UserCharacterBuilder withSkills(Map<Skill, Byte> skills) throws InvalidAttributeValueException {
 		Preconditions.checkContentsNotNull(skills.values());
 
-		for (Skill skill : Skill.VALUES) {
+		for (Skill skill : Skill.values()) {
 			if (!skills.containsKey(skill)) {
 				throw new InvalidAttributeValueException();
 			}
@@ -324,8 +332,8 @@ public UserCharacter build() {
 		Preconditions.checkNotNull(reputation);
 		Preconditions.checkNotNull(position);
 
-		LoggedUser user = new LoggedUser(reputation, race, gender, archetype.getArchetype(), poisoned,
-				paralyzed, immobilized, invisible, dumbed, hidden, maxMana, minMana, maxHp, minHp,
+		LoggedUser user = new LoggedUser(reputation, race, gender, archetype.getArchetype(), homeland, position, poisoned,
+				paralyzed, immobilized, invisible, mimetized, dumbed, hidden, maxMana, minMana, maxHp, minHp,
 				maxThirstiness, minThirstiness, maxHunger, minHunger, lvl, name, description);
 
 		//TODO: Set everything!

aoxp-server/src/main/java/com/ao/model/character/Gender.java

@@ -28,14 +28,14 @@ public enum Gender {
 	/**
 	 * Enum values.
 	 */
-	private static Gender[] values = Gender.values();
+	private static final Gender[] VALUES = Gender.values();
 
 	/**
 	 * Retrieves the gender with the given index.
 	 * @param index The gender index.
 	 * @return The gender.
 	 */
 	public static Gender get(byte index) {
-		return values[index];
+		return VALUES[index];
 	}
 }

aoxp-server/src/main/java/com/ao/model/character/Skill.java

@@ -14,41 +14,59 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 package com.ao.model.character;
 
 /**
  * Defines available skills.
  */
 public enum Skill {
-	LUCK,
-	MAGIC,
-	STEAL,
-	COMBAT_TACTICS,
-	HAND_TO_HAND_COMBAT,
-	MEDITATE,
-	STAB,
-	HIDING,
-	SURVIVE,
-	LUMBER,
-	TRADE,
-	DEFENSE,
-	FISHING,
-	MINING,
-	WOODWORK,
-	IRONWORK,
-	LEADERSHIP,
-	TAME,
-	PROJECTILES,
-	WRESTLING,
-	SAILING;
-
-	/**
-	 * The amount of existing skills.
-	 * 
-	 * TODO: I don't really like this...any better alternative?
-	 */
-	public static final int AMOUNT = Skill.values().length;
-	public static final Skill[] VALUES = Skill.values();
+
+    //LUCK //no existe más
+    MAGIC,
+    STEALING,
+    COMBAT_TACTICS,
+    HAND_TO_HAND_COMBAT,
+    MEDITATION,
+    STABBING,
+    HIDING,
+    SURVIVAL,
+    LUMBER,
+    TRADE,
+    SHIELD_DEFENSE,
+    FISHING,
+    MINING,
+    WOODWORKING,
+    SMITHING,
+    LEADERSHIP,
+    TAMMING,
+    RANGED_COMBAT,
+    WRESTLING,
+    SAILING;
+
+    /**
+     * The amount of existing skills.
+     * 
+     * TODO: I don't really like this...any better alternative?
+     */
+    public static final int AMOUNT = Skill.values().length;
+    private static final Skill[] VALUES = Skill.values();
+
+    /**
+     * Maximum amount of points a character can earn for any given skill
+     */
+    public static final int MAX_SKILL_POINT= 100;
+
+    /**
+     * Retrieves the skill for the given index
+     * @param index the index
+     * @return the skill at the given index
+     */
+    public Skill get(byte index) {
+        //TODO: must ensure index ranges between 0 and AMOUNT(not included)
+        return VALUES[index];
+    }
+
+
 }