Player refactor and add data #58

src/com/jpokemon/util/savefilegenerator/PlayerDetailsPanel.java

@@ -43,9 +43,9 @@ public PlayerDetailsPanel(SaveGeneratorWindow sgw) {
   }
 
   public void refresh() {
-    usernameLabel.setText("name: " + parent.getPlayer().name());
-    cashLabel.setText("cash: " + parent.getPlayer().cash());
-    badgeLabel.setText("badges: " + parent.getPlayer().badge());
+    usernameLabel.setText("name: " + parent.getPlayer().getName());
+    cashLabel.setText("cash: " + parent.getPlayer().getCash());
+    badgeLabel.setText("badges: " + parent.getPlayer().getBadgeCount());
   }
 
   private SaveGeneratorWindow parent;

src/com/jpokemon/util/savefilegenerator/PlayerEditorPanel.java

@@ -61,15 +61,15 @@ public void actionPerformed(ActionEvent arg0) {
   private class SetCashHandler implements ActionListener {
     @Override
     public void actionPerformed(ActionEvent arg0) {
-      parent.getPlayer().cash(Integer.parseInt(cashField.getText()));
+      parent.getPlayer().setCash(Integer.parseInt(cashField.getText()));
       parent.refresh();
     }
   }
 
   private class SetBadgeHandler implements ActionListener {
     @Override
     public void actionPerformed(ActionEvent arg0) {
-      parent.getPlayer().badge(Integer.parseInt(badgeField.getText()));
+      parent.getPlayer().setBadgeCount(Integer.parseInt(badgeField.getText()));
       parent.refresh();
     }
   }

src/com/jpokemon/util/savefilegenerator/SaveGeneratorWindow.java

@@ -40,12 +40,12 @@ public void loadOrSetName(String name) {
       }
     }
     else {
-      player.name(name);
+      player.setName(name);
     }
   }
 
   public void savePlayer() {
-    File file = new File(".", player.name() + ".jpkmn");
+    File file = new File(".", player.getName() + ".jpkmn");
 
     try {
       Writer writer = new BufferedWriter(new PrintWriter(file));

src/org/jpokemon/AbstractJPokemonVisitor.java

@@ -19,7 +19,7 @@ public void visit(Player player) {
 
     visit(player.pokedex());
 
-    visit(player.bag());
+    visit(player.getBag());
 
     for (int i = 0; i < PokemonStorageBlock.boxcount; i++) {
       lastUnit = player.box(i);

src/org/jpokemon/action/performer/TransportActionPerformer.java

@@ -9,7 +9,7 @@ public TransportActionPerformer(String data) {
 
   public void execute(Player player) {
     String[] areaAndLocation = getData().split(" ");
-    player.area(Integer.parseInt(areaAndLocation[0]));
+    player.setArea(Integer.parseInt(areaAndLocation[0]));
 
     if (areaAndLocation.length > 1)
       ; // When doing coordinates, do that here

src/org/jpokemon/battle/Reward.java

@@ -45,7 +45,7 @@ public Reward(Slot s) {
     }
 
     if (s.party().awake() == 0) {
-      _defeatMessage = new Message("BATTLE", " defeated " + s.trainer().name(), MessageLevel.MESSAGE);
+      _defeatMessage = new Message("BATTLE", " defeated " + s.trainer().getName(), MessageLevel.MESSAGE);
 
       for (RewardAction rewardAction : RewardAction.get(s.trainer().id())) {
         _actions.addAction(rewardAction);

src/org/jpokemon/battle/turn/ItemTurn.java

@@ -13,7 +13,7 @@ public ItemTurn(Slot user, Slot target, Item item, int targetIndex) {
     _targetIndex = targetIndex;
     _item = item;
 
-    addMessage(slot().trainer().name() + " used " + item.name());
+    addMessage(slot().trainer().getName() + " used " + item.name());
   }
 
   @Override

src/org/jpokemon/battle/turn/SwapTurn.java

@@ -12,7 +12,7 @@ public SwapTurn(Slot user, Slot target, int swapIndex) {
   public void doExecute() {
     slot().party().swap(0, _swapIndex);
 
-    String trainerName = slot().trainer().name();
+    String trainerName = slot().trainer().getName();
     String leaderName = slot().leader().name();
     addMessage(trainerName + " sent out " + leaderName);
   }

src/org/jpokemon/battle/turn/Turn.java

@@ -97,7 +97,7 @@ private void doForcedSwap() {
 
     _user.party().swap(0, swapIndex);
 
-    String trainerName = slot().trainer().name();
+    String trainerName = slot().trainer().getName();
     String leaderName = slot().leader().name();
     addMessage(trainerName + " sent out " + leaderName);
   }

src/org/jpokemon/manager/PlayerManager.java

@@ -87,7 +87,7 @@ public static String loadPlayer(String name) throws ServiceException {
 
   public static String createPlayer(String name, String rivalName) {
     Player player = newPlayer(name = getUniquePlayerName(name));
-    player.name(name);
+    player.setName(name);
     player.record().setRivalName(rivalName);
     messageQueues.put(player, new LinkedList<Message>());
     setActivity(player, OverworldActivity.getInstance());

src/org/jpokemon/manager/component/BattleService.java

@@ -15,7 +15,7 @@ public void handleRequest(JSONObject request) throws ServiceException {
     Activity activity = PlayerManager.getActivity(player);
 
     if (!(activity instanceof BattleActivity))
-      throw new ServiceException("Current activity for " + player.name() + " is not a battle");
+      throw new ServiceException("Current activity for " + player.getName() + " is not a battle");
 
     Battle battle = ((BattleActivity) activity).getBattle();
 

src/org/jpokemon/manager/component/OverworldServer.java

@@ -19,7 +19,7 @@ public OverworldServer(Player player) {
 
   @Override
   public void visit(Player player) {
-    Area area = Map.area(player.area());
+    Area area = Map.area(player.getArea());
 
     npcs_json = new JSONArray();
     for (NPC npc : area.npcs()) {

src/org/jpokemon/manager/component/OverworldService.java

@@ -60,7 +60,7 @@ private void handleBorderRequest(JSONObject request) throws ServiceException {
 
     try {
       if (border.performAction(player)) {
-        player.area(border.getNext());
+        player.setArea(border.getNext());
       }
       else {
         throw new ServiceException("You cannot go that way");
@@ -98,10 +98,10 @@ private void handleSaveRequest(JSONObject request) throws ServiceException {
 
   private Area getArea(JSONObject request) throws ServiceException {
     Player player = getPlayer(request);
-    Area area = Map.area(player.area());
+    Area area = Map.area(player.getArea());
 
     if (area == null)
-      throw new ServiceException("Area number " + player.area() + " not found");
+      throw new ServiceException("Area number " + player.getArea() + " not found");
 
     return area;
   }

src/org/jpokemon/manager/component/StoreServer.java

@@ -25,8 +25,8 @@ public void visit(Player player) {
     Store store = ((StoreActivity) activity).getStore();
 
     try {
-      data().put("area_name", Map.area(player.area()).getName());
-      data().put("cash", player.cash());
+      data().put("area_name", Map.area(player.getArea()).getName());
+      data().put("cash", player.getCash());
       data().put("inventory", inventoryItems = new JSONArray());
     } catch (JSONException e) {
     }

src/org/jpokemon/manager/component/StoreService.java

@@ -28,7 +28,7 @@ public void handleRequest(JSONObject request) throws ServiceException {
     try {
       JSONArray itemChanges = request.getJSONArray("items");
 
-      int runningTotalCash = player.cash();
+      int runningTotalCash = player.getCash();
 
       for (int index = 0; index < itemChanges.length(); index++) {
         JSONObject itemChange = itemChanges.getJSONObject(index);
@@ -72,11 +72,11 @@ public void handleRequest(JSONObject request) throws ServiceException {
         player.item(itemID).add(change);
 
         if (change > 0) {
-          player.cash(player.cash() - change * inventory.getPrice());
+          player.setCash(player.getCash() - change * inventory.getPrice());
         }
         else {
           // Change is negative. Double negative causes addition of money
-          player.cash(player.cash() - change * inventory.getPurchaseprice());
+          player.setCash(player.getCash() - change * inventory.getPurchaseprice());
         }
       }
 

src/org/jpokemon/trainer/Player.java

@@ -1,5 +1,8 @@
 package org.jpokemon.trainer;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.jpokemon.item.Bag;
 import org.jpokemon.item.Item;
 import org.jpokemon.pokedex.Pokedex;
@@ -11,53 +14,136 @@
 public class Player implements PokemonTrainer {
   public static final String XML_NODE_NAME = "player";
 
+  private Bag _bag = new Bag();
+  private String _name, _id, _avatar;
+  private Pokedex _pokedex = new Pokedex();
+  private Record _record = new Record(this);
+  private int _area = 1, _badge, _cash, _x, _y, _xp, _level;
+  private List<String> _unlockedAvatars, _friends, _blocked;
+  private PokemonStorageBlock _storage = new PokemonStorageBlock();
+
   public Player(String id) {
     _id = id;
-    _area = 1;
-
-    _bag = new Bag();
-    _record = new Record(this);
-    _pokedex = new Pokedex();
-    _storage = new PokemonStorageBlock();
   }
 
   public String id() {
     return _id;
   }
 
-  public String name() {
+  public String getName() {
     return _name;
   }
 
-  public void name(String name) {
+  public void setName(String name) {
     _name = name;
   }
 
-  public int area() {
+  public int getCash() {
+    return _cash;
+  }
+
+  public void setCash(int cash) {
+    _cash = cash;
+  }
+
+  public int getExperience() {
+    return _xp;
+  }
+
+  public void setExperience(int xp) {
+    _xp = xp;
+  }
+
+  public String getAvatar() {
+    return _avatar;
+  }
+
+  public void setAvatar(String name) {
+    if (!_unlockedAvatars.contains(name)) {
+      return;
+    }
+    _avatar = name;
+  }
+
+  public List<String> getAvatars() {
+    return Collections.unmodifiableList(_unlockedAvatars);
+  }
+
+  public void addAvatar(String name) {
+    _unlockedAvatars.add(name);
+  }
+
+  public void removeAvatar(String name) {
+    _unlockedAvatars.remove(name);
+  }
+
+  public int getLevel() {
+    return _level;
+  }
+
+  public void setLevel(int level) {
+    _level = level;
+  }
+
+  public int getArea() {
     return _area;
   }
 
-  public void area(int area) {
+  public void setArea(int area) {
     _area = area;
   }
 
-  public int badge() {
-    return _badge;
+  public int getX() {
+    return _x;
   }
 
-  public void badge(int badge) {
-    _badge = badge;
+  public void setX(int x) {
+    _x = x;
   }
 
-  public int cash() {
-    return _cash;
+  public int getY() {
+    return _y;
   }
 
-  public void cash(int cash) {
-    _cash = cash;
+  public void setY(int y) {
+    _y = y;
+  }
+
+  public List<String> getFriends() {
+    return Collections.unmodifiableList(_friends);
+  }
+
+  public void addFriend(String name) {
+    _friends.add(name);
+    removeBlocked(name);
+  }
+
+  public void removeFriend(String name) {
+    _friends.remove(name);
+  }
+
+  public List<String> getBlocked() {
+    return Collections.unmodifiableList(_blocked);
+  }
+
+  public void addBlocked(String name) {
+    _blocked.add(name);
+    removeFriend(name);
+  }
+
+  public void removeBlocked(String name) {
+    _blocked.remove(name);
+  }
+
+  public int getBadgeCount() {
+    return _badge;
+  }
+
+  public void setBadgeCount(int badge) {
+    _badge = badge;
   }
 
-  public Bag bag() {
+  public Bag getBag() {
     return _bag;
   }
 
@@ -85,7 +171,7 @@ public boolean add(Pokemon p) {
     for (PokemonStorageUnit unit : _storage) {
       if (unit.add(p)) {
         _pokedex.own(p.number());
-        p.setTrainerName(name());
+        p.setTrainerName(getName());
         return true;
       }
     }
@@ -141,10 +227,4 @@ public int hashCode() {
     return _id.hashCode();
   }
 
-  private Bag _bag;
-  private Record _record;
-  private Pokedex _pokedex;
-  private String _name, _id;
-  private int _area, _badge, _cash;
-  private PokemonStorageBlock _storage;
 }

src/org/jpokemon/trainer/PokemonTrainer.java

@@ -6,9 +6,9 @@
 public interface PokemonTrainer {
   public String id();
 
-  public String name();
+  public String getName();
 
-  public void name(String s);
+  public void setName(String s);
 
   public PokemonStorageUnit party();
 

src/org/jpokemon/trainer/Record.java

@@ -86,7 +86,7 @@ public String replaceMacros(String s) {
       s = s.replaceAll("\\{rival\\}", _rivalName);
 
     if (player != null)
-      s = s.replaceAll("\\{player\\}", player.name());
+      s = s.replaceAll("\\{player\\}", player.getName());
 
     if (_pokemon != null)
       s = s.replaceAll("\\{starter\\}", _pokemon);