Created Characters Saved In File. Experience Increases After Each Enemy Kill

mderbent · mderbent · commit 28f8dd656887 · 2017-05-29T05:25:54.000+03:00
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ You can find the documentation in doc folder.
 - Actions have high code complexity. Command pattern may be used for the business logic happens in there.
 - Code coverage should be increased.
 - Rooms should have descriptions. When you enter a room, you should see room's description. There should be a bunch of them loaded somewhere and while game was built, these should be appended to the rooms randomly.
-- Characters should be saved in file. Experiences should be saved to that file, too.
+- Characters should be saved in file. Experiences should be saved to that file, too. (DONE)
 - There should be a final room (Boss room if you might call).
 - After final room, there may be some more dungeons (different levels like 3D array) that player may want to visit. Or exit.
 - There may be items in rooms.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 group = 'mad'
-version = '0.1.0-ALPHA'
+version = '0.1.1-ALPHA'
 sourceCompatibility=1.8
 targetCompatibility=1.8
 
diff --git a/src/main/java/mad/rpg/battle/actions/FightAction.java b/src/main/java/mad/rpg/battle/actions/FightAction.java
@@ -2,6 +2,7 @@
 
 import mad.rpg.characters.infos.InfoType;
 import mad.rpg.characters.model.Character;
+import mad.rpg.characters.model.CharacterRepository;
 import mad.rpg.characters.model.HostileCharacter;
 import mad.rpg.characters.stats.Stat;
 import mad.rpg.characters.stats.StatType;
@@ -10,6 +11,8 @@
 import mad.rpg.game.actions.Action;
 import mad.rpg.game.context.Context;
 import mad.rpg.game.events.EventType;
+import mad.rpg.utils.FileDeserializationException;
+import mad.rpg.utils.FileSerializationException;
 import mad.rpg.utils.UtilLocator;
 import mad.rpg.world.model.World;
 
@@ -20,10 +23,12 @@
 
 public class FightAction implements Action {
 
-    Random random;
+    private Random random;
+    private CharacterRepository characterRepository;
 
-    public FightAction() {
+    public FightAction(CharacterRepository characterRepository) {
         random = new Random();
+        this.characterRepository = characterRepository;
     }
 
     @Override
@@ -82,6 +87,14 @@ public void process(Context context) {
                 experienceStat.addValue(experienceCoefficient);
                 String experience = experienceStat.getValue().toString();
 
+                try {
+                    characterRepository.updateStat(player, StatType.EXPERIENCE);
+                } catch (FileDeserializationException e) {
+                    UtilLocator.locate().output().printLine(e.getMessage());
+                } catch (FileSerializationException e) {
+                    UtilLocator.locate().output().printLine(e.getMessage());
+                }
+
                 UtilLocator.locate().output().printLine(String.format(Messages.YOU_DEFEATED_ENEMY, enemyName));
                 UtilLocator.locate().output().printLine(String.format(Messages.YOU_GAINED_EXPERIENCE, experienceCoefficient, experience));
                 UtilLocator.locate().output().printLine(String.format(Messages.YOU_HAVE_HEALTH, playerLastHealth));
diff --git a/src/main/java/mad/rpg/characters/actions/ChooseCharacterAction.java b/src/main/java/mad/rpg/characters/actions/ChooseCharacterAction.java
@@ -4,16 +4,19 @@
 import mad.rpg.characters.infos.InfoType;
 import mad.rpg.characters.model.Character;
 import mad.rpg.characters.model.CharacterRepository;
+import mad.rpg.characters.stats.StatType;
 import mad.rpg.game.Choices;
 import mad.rpg.game.Commands;
 import mad.rpg.game.Messages;
 import mad.rpg.game.actions.Action;
 import mad.rpg.game.context.Context;
 import mad.rpg.game.events.EventType;
+import mad.rpg.utils.FileDeserializationException;
 import mad.rpg.utils.Input;
 import mad.rpg.utils.Output;
 import mad.rpg.utils.UtilLocator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -32,8 +35,20 @@ public void process(Context context) {
         UtilLocator.locate().output().printLine(Messages.CHOOSE_YOUR_CHARACTER);
         UtilLocator.locate().output().printLine(Choices.CREATE_A_CHARACTER_CHOICE);
 
-        List<Info> names = playerRepository
-                .characters()
+        List<Character> characters = new ArrayList<>();
+        try {
+            Boolean hasCharacters = playerRepository.hasCharacters();
+            if(hasCharacters){
+                characters = playerRepository.characters();
+            }
+        } catch (FileDeserializationException e) {
+            UtilLocator.locate().output().printLine(e.getMessage());
+            UtilLocator.locate().output().printLine(Messages.UNHANDLED_OPERATION);
+            context.addEvent(EventType.EXIT_REQUESTED);
+            return;
+        }
+
+        List<Info> names = characters
                 .stream()
                 .map(player -> player.getInfo(InfoType.NAME).get())
                 .collect(Collectors.toList());
@@ -42,7 +57,7 @@ public void process(Context context) {
             UtilLocator.locate().output().printLine((i + 1) + ". " + names.get(i).getValue());
         }
 
-        String receivedInput = UtilLocator.locate().input().choice(0, playerRepository.characters().size(), Arrays.asList(Commands.CREATE_CHARACTER, Commands.EXIT));
+        String receivedInput = UtilLocator.locate().input().choice(0, characters.size(), Arrays.asList(Commands.CREATE_CHARACTER, Commands.EXIT));
 
         if(receivedInput.equals(Commands.EXIT)){
             context.addEvent(EventType.EXIT_REQUESTED);
@@ -55,15 +70,15 @@ public void process(Context context) {
         }
 
         Integer choice = Integer.parseInt(receivedInput);
-        Optional<Character> player = playerRepository.character(choice);
+        Character player = characters.get(choice - 1);
 
-        if(!player.isPresent()){
+        if(player == null){
             UtilLocator.locate().output().printMessage(Messages.CHARACTER_NOT_FOUND);
             return;
         }
 
-        context.withPlayer(player.get());
-        UtilLocator.locate().output().printLine(String.format(Messages.CHARACTER_SELECTED, player.get().getInfo(InfoType.NAME).get().getValue()));
+        context.withPlayer(player);
+        UtilLocator.locate().output().printLine(String.format(Messages.CHARACTER_SELECTED, player.getInfo(InfoType.NAME).get().getValue(), player.getStat(StatType.HEALTH).get().getValue(), player.getStat(StatType.ATTACK_DAMAGE).get().getValue(), player.getStat(StatType.EXPERIENCE).get().getValue()));
         context.addEvent(EventType.CHARACTER_SELECTED);
     }
 
diff --git a/src/main/java/mad/rpg/characters/actions/CreateCharacterAction.java b/src/main/java/mad/rpg/characters/actions/CreateCharacterAction.java
@@ -10,9 +10,7 @@
 import mad.rpg.game.actions.Action;
 import mad.rpg.game.context.Context;
 import mad.rpg.game.events.EventType;
-import mad.rpg.utils.Input;
-import mad.rpg.utils.Output;
-import mad.rpg.utils.UtilLocator;
+import mad.rpg.utils.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -57,7 +55,19 @@ public void process(Context context) {
             return;
         }
 
-        playerRepository.add(new Player(infos, stats));
+        try {
+            playerRepository.add(new Player(infos, stats));
+        } catch (FileDeserializationException e) {
+            UtilLocator.locate().output().printLine(e.getMessage());
+            context.addEvent(EventType.CHARACTER_NOT_CREATED);
+            UtilLocator.locate().output().printLine(Messages.CHARACTER_NOT_ADDED);
+            return;
+        } catch (FileSerializationException e) {
+            UtilLocator.locate().output().printLine(e.getMessage());
+            context.addEvent(EventType.CHARACTER_NOT_CREATED);
+            UtilLocator.locate().output().printLine(Messages.CHARACTER_NOT_ADDED);
+            return;
+        }
 
         context.addEvent(EventType.CHARACTER_CREATED);
         UtilLocator.locate().output().printLine(Messages.CHARACTER_ADDED);
diff --git a/src/main/java/mad/rpg/characters/model/Character.java b/src/main/java/mad/rpg/characters/model/Character.java
@@ -8,6 +8,7 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public interface Character extends Serializable {
 
@@ -18,4 +19,6 @@ public interface Character extends Serializable {
     Optional<Info> getInfo(InfoType infoType);
 
     Optional<Stat> getStat(StatType statType);
+
+    UUID id();
 }
diff --git a/src/main/java/mad/rpg/characters/model/CharacterRepository.java b/src/main/java/mad/rpg/characters/model/CharacterRepository.java
@@ -1,13 +1,20 @@
 package mad.rpg.characters.model;
 
+import mad.rpg.characters.stats.StatType;
+import mad.rpg.utils.FileDeserializationException;
+import mad.rpg.utils.FileSerializationException;
+
 import java.util.List;
 import java.util.Optional;
 
 public interface CharacterRepository {
 
-    CharacterRepository add(Character player);
+    CharacterRepository add(Character player) throws FileDeserializationException, FileSerializationException;
+
+    Boolean hasCharacters() throws FileDeserializationException;
+
+    List<Character> characters() throws FileDeserializationException;
 
-    List<Character> characters();
+    CharacterRepository updateStat(Character player, StatType statType) throws FileDeserializationException, FileSerializationException;
 
-    Optional<Character> character(Integer index);
 }
diff --git a/src/main/java/mad/rpg/characters/model/Enemy.java b/src/main/java/mad/rpg/characters/model/Enemy.java
@@ -7,15 +7,18 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public class Enemy implements HostileCharacter {
 
+    private UUID id;
     private List<Info> infos;
     private List<Stat> stats;
 
     public Enemy(List<Info> infos, List<Stat> stats) {
         this.infos = infos;
         this.stats = stats;
+        id = UUID.randomUUID();
     }
 
     @Override
@@ -48,4 +51,9 @@ public Optional<Stat> getStat(StatType statType) {
                 .findFirst();
     }
 
+    @Override
+    public UUID id() {
+        return id;
+    }
+
 }
diff --git a/src/main/java/mad/rpg/characters/model/Player.java b/src/main/java/mad/rpg/characters/model/Player.java
@@ -7,15 +7,18 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public class Player implements Character {
 
+    private UUID id;
     private List<Info> infos;
     private List<Stat> stats;
 
     public Player(List<Info> infos, List<Stat> stats) {
         this.infos = infos;
         this.stats = stats;
+        id = UUID.randomUUID();
     }
 
     @Override
@@ -47,4 +50,9 @@ public Optional<Stat> getStat(StatType statType) {
                         .equals(statType))
                 .findFirst();
     }
+
+    @Override
+    public UUID id() {
+        return id;
+    }
 }
diff --git a/src/main/java/mad/rpg/characters/model/PlayerRepository.java b/src/main/java/mad/rpg/characters/model/PlayerRepository.java
@@ -1,31 +1,59 @@
 package mad.rpg.characters.model;
 
+import mad.rpg.characters.stats.Stat;
+import mad.rpg.characters.stats.StatType;
+import mad.rpg.game.FileNames;
+import mad.rpg.game.saves.SaveGame;
+import mad.rpg.utils.FileDeserializationException;
+import mad.rpg.utils.FileSerializationException;
+import mad.rpg.utils.UtilLocator;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 public class PlayerRepository implements CharacterRepository {
 
-    List<Character> characters;
-
-    public PlayerRepository() {
-        characters = new ArrayList<>();
-    }
-
     @Override
-    public CharacterRepository add(Character player) {
+    public CharacterRepository add(Character player) throws FileDeserializationException, FileSerializationException {
+        List<Character> characters = new ArrayList<>();
+        if(hasCharacters()){
+            characters = characters();
+        }
         characters.add(player);
+        UtilLocator.locate().fileSerializer().write(characters, FileNames.CHARACTER);
         return this;
     }
 
     @Override
-    public List<Character> characters() {
-        return characters;
+    public Boolean hasCharacters() throws FileDeserializationException {
+        Boolean fileExists = UtilLocator.locate().fileUtil().exists(FileNames.CHARACTER);
+        return fileExists ? UtilLocator.locate().fileDeserializer().read(List.class, FileNames.CHARACTER).size() > 0 : false;
     }
 
     @Override
-    public Optional<Character> character(Integer index) {
-        return characters.stream().skip(index.longValue() - 1).findFirst();
+    public List<Character> characters() throws FileDeserializationException {
+        return UtilLocator.locate().fileDeserializer().read(List.class, FileNames.CHARACTER);
+    }
+
+    @Override
+    public CharacterRepository updateStat(Character player, StatType statType) throws FileDeserializationException, FileSerializationException {
+        List<Character> characters = new ArrayList<>();
+        if(hasCharacters()){
+            characters = characters();
+        }
+        characters
+                .stream()
+                .filter(character -> character.id().equals(player.id()))
+                .forEach(character -> {
+                    Optional<Stat> stat = character.getStat(statType);
+                    if(stat.isPresent()){
+                        stat.get().removeValue(stat.get().getValue());
+                        stat.get().addValue(player.getStat(statType).get().getValue());
+                    }
+                });
+        UtilLocator.locate().fileSerializer().write(characters, FileNames.CHARACTER);
+        return this;
     }
 
 }
diff --git a/src/main/java/mad/rpg/characters/stats/Experience.java b/src/main/java/mad/rpg/characters/stats/Experience.java
@@ -37,7 +37,10 @@ public void addValue(BigDecimal addValue) {
 
     @Override
     public void removeValue(BigDecimal removeValue) {
-        // Nothing to implement
+        if(removeValue == null){
+            return;
+        }
+        statValue = statValue.subtract(removeValue);
     }
 
 }
diff --git a/src/main/java/mad/rpg/game/FileNames.java b/src/main/java/mad/rpg/game/FileNames.java
@@ -3,5 +3,6 @@
 public class FileNames {
 
     public static final String SAVE_GAME = "game.sav";
+    public static final String CHARACTER = "character.sav";
 
 }
diff --git a/src/main/java/mad/rpg/game/Messages.java b/src/main/java/mad/rpg/game/Messages.java
@@ -14,7 +14,7 @@ public class Messages {
     public static final String CHARACTER_NOT_ADDED = "Character not added";
     public static final String SAVE_CHARACTER_PROMPT = "Do you want to save this character? (yes-no)";
     public static final String CHARACTER_NOT_FOUND = "Character not found, please select an existing character.";
-    public static final String CHARACTER_SELECTED = "%s selected";
+    public static final String CHARACTER_SELECTED = "%s selected, health: %s, attack damage: %s, experience: %s";
     public static final String CANT_GO_THAT_WAY = "Can't go that way!";
     public static final String YOU_HAVE_ENTERED_THE_DUNGEON = "You have entered the dungeon...\nYou can explore it by going north, south, east and west.";
     public static final String YOU_ARE_IN_ROOM = "You are in room %s";
diff --git a/src/main/java/mad/rpg/game/actions/GameActionFactory.java b/src/main/java/mad/rpg/game/actions/GameActionFactory.java
@@ -43,7 +43,7 @@ public Action create(StateType stateType) throws StateNotFoundException {
             case EXPLORATION_STATE:
                 return new ExploreAction();
             case BATTLE_STATE:
-                return new FightAction();
+                return new FightAction(playerRepository);
             case GAME_LOADING_STATE:
                 return new LoadGameAction(saveGameRepository);
             case GAME_SAVING_STATE:
diff --git a/src/test/java/mad/rpg/characters/model/PlayerRepositoryTest.java b/src/test/java/mad/rpg/characters/model/PlayerRepositoryTest.java
diff --git a/src/test/java/mad/rpg/characters/model/PlayerTest.java b/src/test/java/mad/rpg/characters/model/PlayerTest.java
diff --git a/src/test/java/mad/rpg/characters/stats/ExperienceTest.java b/src/test/java/mad/rpg/characters/stats/ExperienceTest.java
