22a1b5a0d7
Merge branch 'WorldNavigation' of https://github.com/EpicKnarvik97/pokemon-cmd into WorldNavigation
2017-11-30 18:41:40 +01:00
9a3a01c082
Added more stuff in test.
...
We are still missing the actual function to place a structure on the map, but we are quite close.
2017-11-30 18:40:13 +01:00
9d949f3926
Delete Run.bat
2017-11-29 16:15:47 +01:00
99dd30975b
Delete Compile.bat
2017-11-29 16:15:40 +01:00
18664c9b17
Updated .gitignore
2017-11-29 16:07:49 +01:00
fc74f55c85
Added more object types.
...
Added Map and Structure. Created a working map int Test.java, but Structures are still not implemented.
2017-11-29 15:50:43 +01:00
ad09ee4b1d
Added a proposal of the new Tile object.
...
This is just a proposal of the new Tile object, an may be changed at any time.
Allowing it to return an integer on onWalk lets us easier do tasks like looking for wild pokemon, from anywhere in the program.
It cannot be used as it is now, but it can be used once we are finished with the other necessary classes.
2017-11-29 10:50:15 +01:00
f857ae1d86
Fixed some error messages.
2017-11-28 15:53:04 +01:00
907b9e165b
Fixed compiling after location change.
...
Fixed compiling.
Added automatic javac compilation before jar generation.
2017-11-28 15:30:39 +01:00
a5e5750362
Update Compile.bat
2017-11-28 14:56:14 +01:00
79ad8fcb4a
Update Game.java
2017-11-28 14:55:44 +01:00
a7dd6c144c
Rename Pokemon.txt to java/config/Pokemon.txt
2017-11-28 14:54:17 +01:00
262a1f48be
Rename Trainer.java to java/Trainer.java
2017-11-28 14:53:45 +01:00
81257d16da
Rename Potion.java to java/Potion.java
2017-11-28 14:53:28 +01:00
89e84cb939
Rename Pokemon.java to java/Pokemon.java
2017-11-28 14:53:08 +01:00
d2fc3b066c
Rename Pokeball.java to java/Pokeball.java
2017-11-28 14:52:50 +01:00
ea6c86b0c2
Rename Inventory.java to java/Inventory.java
2017-11-28 14:52:34 +01:00
7fc73ef2b4
Rename Game.java to java/Game.java
2017-11-28 14:52:16 +01:00
7b8d3b65a6
Rename issue_template.md to docs/issue_template.md
2017-11-28 14:49:05 +01:00
cbeca8eb5f
Added files for compiling as jar.
...
Added a manifest and two bat files to compile and run the software in a single jar file.
Added checking when reading pokemon to read from jar if necessary.
2017-11-28 13:58:53 +01:00
8860f39f2c
Rewrote some methods as non-static.
...
Functions for getting potions, pokeballs and pokemon are now in non-static classes.
This will make it easier to manage other npc trainers in the future.
2017-11-27 20:48:24 +01:00
b39f03c447
Prevented extra newline on invalid integer for potion or pokeball.
2017-11-27 11:19:58 +01:00
666c89fa8f
Fixed some errors and issue #14 .
...
Capturing pokemon now happens inside the Trainer object. usersPokemon is no longer used.
2017-11-27 11:11:31 +01:00
b242cfd183
Create issue_template.md
2017-11-26 17:30:03 +01:00
BuildTools
63859fe4ae
Replaced items with inventory. This makes it easier to validate items and add new items, but we need to remove some code repetition.
2017-11-26 14:27:38 +01:00
948b26edf3
Update README.md
2017-11-26 11:31:12 +01:00
b0229b71a9
Update README.md
2017-11-26 11:30:47 +01:00
1d2de15c8c
Created a trainer class ( #12 )
...
Added a trainer class with a name, a list of pokemon and a list of items. Game.java has been changed to treat the player as a Trainer.
2017-11-25 22:28:17 +01:00
bdb871d35c
Create LICENSE
2017-11-25 15:39:17 +01:00
Marios F
2a6a90ce13
Added gitignore for Java ( #11 )
...
* Added gitignore for Java
* Fixed my awful mistake
2017-11-25 15:28:59 +01:00
f0313f0e04
Update README.md
2017-11-25 10:55:02 +01:00
42ff37ce5f
Uploaded main files
2017-11-24 16:02:57 +01:00
12265045d3
Initial commit
2017-11-24 16:02:07 +01:00
